Support custom nodeLabels for all gatherMethods of feature-pod-logs

Originally custom nodeLabels have only be support for gatherMethod
'filelog'. This commits adds support of other gatherTypes as well.

Signed-off-by: Matthias Baur <[email protected]>

Author: baurmatt

charts/k8s-monitoring/charts/feature-pod-logs/README.md

@@ -53,7 +53,7 @@ Be sure perform actual integration testing in a live environment in the main [k8
 | namespaceAnnotations | object | `{}` | Log labels to set with values copied from the Kubernetes Namespace annotations. Only used for "filelog" gather method. Format: `<log_label>: <kubernetes_namespace_annotation>`. |
 | namespaceLabels | object | `{}` | Log labels to set with values copied from the Kubernetes Namespace labels. Only used for "filelog" gather method. Format: `<log_label>: <kubernetes_namespace_label>`. |
 | nodeAnnotations | object | `{}` | Log labels to set with values copied from the Kubernetes Node annotations. Only used for "filelog" gather method. Format: `<log_label>: <kubernetes_node_annotation>`. |
-| nodeLabels | object | `{}` | Log labels to set with values copied from the Kubernetes Node labels. Only used for "filelog" gather method. Format: `<log_label>: <kubernetes_node_label>`. |
+| nodeLabels | object | `{}` | Log labels to set with values copied from the Kubernetes Node labels. Format: `<log_label>: <kubernetes_node_label>`. |
 | staticLabels | object | `{}` | Log labels to set with static values. |
 | staticLabelsFrom | object | `{}` | Log labels to set with static values, not quoted so it can reference config components. |
 

charts/k8s-monitoring/charts/feature-pod-logs/templates/_nodes_common.tpl

@@ -7,6 +7,7 @@
 {{- $attachMetadata = or $attachMetadata .Values.nodeLabels.nodeOS -}}
 {{- $attachMetadata = or $attachMetadata .Values.nodeLabels.nodeArchitecture -}}
 {{- $attachMetadata = or $attachMetadata .Values.nodeLabels.instanceType -}}
+{{- $attachMetadata = or $attachMetadata (gt (keys .Values.nodeLabels | len) 0) -}}
 {{- if eq $attachMetadata true }}
 attach_metadata {
   node = true
@@ -99,4 +100,11 @@ rule {
   target_label = "instance_type"
 }
 {{- end }}
+{{- range $attribute, $label := (omit .Values.nodeLabels "nodePool" "region" "availabilityZone" "nodeRole" "nodeOS" "nodeArchitecture" "instanceType")}}
+
+rule {
+  source_labels = [{{ $label | quote }}]
+  target_label = {{ $attribute | quote }}
+}
+{{- end }}
 {{- end }}

charts/k8s-monitoring/charts/feature-pod-logs/values.yaml

@@ -27,7 +27,6 @@ labels:
   app_kubernetes_io_name: app.kubernetes.io/name
 
 # -- Log labels to set with values copied from the Kubernetes Node labels.
-# Only used for "filelog" gather method.
 # Format: `<log_label>: <kubernetes_node_label>`.
 # @section -- Log Processing
 nodeLabels: {}