[newrelic-logging] add labels to metrics output to enable entity synthesis

charts/newrelic-logging/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 description: A Helm chart to deploy New Relic Kubernetes Logging as a DaemonSet, supporting both Linux and Windows nodes and containers
 name: newrelic-logging
-version: 1.23.5
+version: 1.23.6
 appVersion: 2.1.0
 home: https://github.com/newrelic/kubernetes-logging
 icon: https://newrelic.com/assets/newrelic/source/NewRelic-logo-square.svg

charts/newrelic-logging/templates/_helpers.tpl

@@ -178,6 +178,16 @@ https://log-api.newrelic.com/log/v1
 {{- end -}}
 {{- end -}}
 
+
+{{/*
+Creates labels required for entity synthesis to be put as part of prometheus_remote_write configuration
+*/}}
+{{- define "newrelic-logging.entitySynthesis.labels" -}}
+{{- printf "add_label            cluster_name %s" (include "newrelic-logging.cluster" .) | nindent 8 -}}
+{{- printf "add_label            namespace %s" .Release.Namespace | nindent 8 -}}
+{{- printf "add_label            daemonset_name %s" (include "newrelic-logging.fullname" .) | nindent 8 -}}
+{{- end -}}
+
 {{/*
 Returns metricsHost
 */}}

charts/newrelic-logging/templates/configmap.yaml

@@ -30,7 +30,8 @@ data:
       {{- .Values.fluentBit.config.extraOutputs | nindent 4}}
     {{- end }}
     {{- if and (.Values.fluentBit.sendMetrics) (.Values.fluentBit.config.metricInstrumentation) }}
-      {{- .Values.fluentBit.config.metricInstrumentation | nindent 4}}
+      {{- .Values.fluentBit.config.metricInstrumentation | nindent 4 -}}
+      {{ include "newrelic-logging.entitySynthesis.labels" . }}
     {{- end }}
   parsers.conf: |
   {{- if .Values.fluentBit.config.parsers }}

charts/newrelic-logging/tests/fluentbit_entity_synthesis_labels_include_test.yaml

@@ -0,0 +1,63 @@
+suite: test fluent-bit entity synthesis labels include
+templates:
+  - templates/configmap.yaml
+release:
+  name: my-release
+  namespace: my-namespace
+tests:
+  - it: "additional labels for entity synthesis are included when sendMetrics is set to true"
+    templates:
+      - templates/configmap.yaml
+    set:
+      fluentBit:
+        sendMetrics: true
+        config:
+          metricInstrumentation: |
+            [OUTPUT]
+                Name                 prometheus_remote_write
+                Match                fb_metrics
+                Alias                fb-metrics-forwarder
+                Host                 ${METRICS_HOST}
+                Port                 443
+                Uri                  /prometheus/v1/write?prometheus_server=${CLUSTER_NAME}
+                Header               Authorization Bearer ${LICENSE_KEY}
+                Tls                  On
+                # Windows pods using prometheus_remote_write currently have issues if TLS verify is On
+                Tls.verify           Off
+                # User-defined labels
+                add_label            app fluent-bit
+                add_label            pod_name ${HOSTNAME}
+                add_label            node_name ${NODE_NAME}
+                add_label            source kubernetes   
+    asserts:
+      - matchRegex:
+          path: data["fluent-bit.conf"]
+          pattern: (?s)add_label\s+cluster_name \n\s*add_label\s+namespace my-namespace\n\s*add_label\s+daemonset_name my-release-newrelic-logging
+  - it: "additional labels for entity synthesis are not included when sendMetrics is set to false"
+    templates:
+      - templates/configmap.yaml
+    set:
+      fluentBit:
+        sendMetrics: false
+        config:
+          metricInstrumentation: |
+            [OUTPUT]
+                Name                 prometheus_remote_write
+                Match                fb_metrics
+                Alias                fb-metrics-forwarder
+                Host                 ${METRICS_HOST}
+                Port                 443
+                Uri                  /prometheus/v1/write?prometheus_server=${CLUSTER_NAME}
+                Header               Authorization Bearer ${LICENSE_KEY}
+                Tls                  On
+                # Windows pods using prometheus_remote_write currently have issues if TLS verify is On
+                Tls.verify           Off
+                # User-defined labels
+                add_label            app fluent-bit
+                add_label            pod_name ${HOSTNAME}
+                add_label            node_name ${NODE_NAME}
+                add_label            source kubernetes   
+    asserts:
+      - notMatchRegex:
+          path: data["fluent-bit.conf"]
+          pattern: (?s)add_label\s+cluster_name \n\s*add_label\s+namespace my-namespace\n\s*add_label\s+daemonset_name my-release-newrelic-logging

charts/newrelic-logging/values.yaml

@@ -212,7 +212,6 @@ fluentBit:
           Tls.verify           Off
           # User-defined labels
           add_label            app fluent-bit
-          add_label            cluster_name "${CLUSTER_NAME}"
           add_label            pod_name ${HOSTNAME}
           add_label            node_name ${NODE_NAME}
           add_label            source kubernetes