diff --git a/helm-chart/splunk-kubernetes-logging/examples/use_logs.yaml b/helm-chart/splunk-kubernetes-logging/examples/use_logs.yaml index 4a6788fa..3b2ae186 100644 --- a/helm-chart/splunk-kubernetes-logging/examples/use_logs.yaml +++ b/helm-chart/splunk-kubernetes-logging/examples/use_logs.yaml @@ -3,8 +3,6 @@ splunk: token: 11111111-2222-3333-4444-555555555555 host: 12.34.56.78 -clusterName: "MY_CLUSTER" - logs: # we want to read logs for `kube-apiserver` from a log file other then from the container logs kube-apiserver: diff --git a/helm-chart/splunk-kubernetes-logging/templates/_helpers.tpl b/helm-chart/splunk-kubernetes-logging/templates/_helpers.tpl index 44b8e999..cff71740 100644 --- a/helm-chart/splunk-kubernetes-logging/templates/_helpers.tpl +++ b/helm-chart/splunk-kubernetes-logging/templates/_helpers.tpl @@ -92,9 +92,6 @@ def extract_container_info: | .namespace = $parts[1] | .container_name = ($cparts[:-1] | join("-")) | .container_id = ($cparts[-1] | rtrimstr(".log")) - {{- if .Values.clusterName }} - | .cluster_name = "{{ .Values.clusterName }}" - {{- end }} | .; .record | extract_container_info | .sourcetype = (find_sourcetype(.pod; .container_name) // "kube:container:\(.container_name)") diff --git a/helm-chart/splunk-kubernetes-logging/templates/configMap.yaml b/helm-chart/splunk-kubernetes-logging/templates/configMap.yaml index cd2fc74b..48e4d856 100644 --- a/helm-chart/splunk-kubernetes-logging/templates/configMap.yaml +++ b/helm-chart/splunk-kubernetes-logging/templates/configMap.yaml @@ -228,9 +228,6 @@ data: namespace container_name container_id - {{- if .Values.clusterName }} - cluster_name - {{- end }} @type memory diff --git a/helm-chart/splunk-kubernetes-logging/values.yaml b/helm-chart/splunk-kubernetes-logging/values.yaml index 4c00978a..a4bd9156 100644 --- a/helm-chart/splunk-kubernetes-logging/values.yaml +++ b/helm-chart/splunk-kubernetes-logging/values.yaml @@ -16,10 +16,6 @@ global: insecureSSL: false -# If clusterName is set, a cluster_name field will be added to the log output -clusterName: - - # logLevel is to set log level of the Splunk log collector. Avaiable values are: # * trace # * debug diff --git a/manifests/splunk-kubernetes-logging/configMap.yaml b/manifests/splunk-kubernetes-logging/configMap.yaml index 6873658e..986cf7af 100644 --- a/manifests/splunk-kubernetes-logging/configMap.yaml +++ b/manifests/splunk-kubernetes-logging/configMap.yaml @@ -219,7 +219,6 @@ data: namespace container_name container_id - cluster_name @type memory