Enable namespace labels propagation (#824)

Enable namespace labels propagation

Author: fmesen

helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-logging/templates/configMap.yaml

@@ -281,9 +281,14 @@ data:
  {{- end }}
  # set the splunk_index field to the value found in the pod splunk.com/index annotations. if not set, use namespace annotation, or default to the default_index
  splunk_index ${record.dig("kubernetes", "annotations", "splunk.com/index."+record.dig("kubernetes","container_name")) ? record.dig("kubernetes", "annotations", "splunk.com/index."+record.dig("kubernetes","container_name")) : record.dig("kubernetes", "annotations", "splunk.com/index") ? record.dig("kubernetes", "annotations", "splunk.com/index") : record.dig("kubernetes", "namespace_annotations", "splunk.com/index") ? (record["kubernetes"]["namespace_annotations"]["splunk.com/index"]) : ("{{ or .Values.splunk.hec.indexName .Values.global.splunk.hec.indexName | default "main"}}")}
+ {{- $root := . }}
  {{- range .Values.k8sMetadata.podLabels }}
+ {{- if $root.Values.k8sMetadata.propagate_namespace_labels }} 
+ label_{{ . }} ${record.dig("kubernetes","labels","{{ . }}") ? record.dig("kubernetes","labels","{{ . }}") : record.dig("kubernetes","namespace_labels","{{ . }}")}
+ {{- else }}
  label_{{ . }} ${record.dig("kubernetes","labels","{{ . }}")}
  {{- end }}
+ {{- end }}
  exclude_list ${record.dig("kubernetes", "annotations", "splunk.com/exclude") ? record.dig("kubernetes", "annotations", "splunk.com/exclude") : record.dig("kubernetes", "namespace_annotations", "splunk.com/exclude") ? (record["kubernetes"]["namespace_annotations"]["splunk.com/exclude"]) : ("false")}
  {{- if .Values.customMetadata }}
  {{- range .Values.customMetadata }}

helm-chart/splunk-connect-for-kubernetes/charts/splunk-kubernetes-logging/values.yaml

@@ -58,6 +58,8 @@ k8sMetadata:
  - release
  watch: true
  cache_ttl: 3600
+ # Boolean to propagate listed labels also from namespace if none is found in pod
+ propagate_namespace_labels: false
 
 sourcetypePrefix: "kube"
 

helm-chart/splunk-connect-for-kubernetes/values.yaml

@@ -127,6 +127,8 @@ splunk-kubernetes-logging:
  - release
  watch: true
  cache_ttl: 3600
+ # Boolean to propagate listed labels also from namespace if none is found in pod
+ propagate_namespace_labels: false
 
  sourcetypePrefix: "kube"