feat: moved entity synthesis labels to helpers file

newrelic · Dec 18, 2024 · 6c3ebf5 · 6c3ebf5
1 parent 15c4614
commit 6c3ebf5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/charts/newrelic-logging/templates/_helpers.tpl b/charts/newrelic-logging/templates/_helpers.tpl
@@ -178,6 +178,15 @@ https://log-api.newrelic.com/log/v1
 {{- end -}}
 {{- end -}}
 
+
+{{/*
+Create labels required for entity synthesis to be put as part of prometheus_remote_write configuration
+*/}}
+{{- define "newrelic-logging.entitySynthesis.labels" -}}
+{{- printf "add_label            namespace %s" .Release.Namespace | nindent 8 -}}
+{{- printf "add_label            helm_release_name %s" .Release.Name | nindent 8 -}}
+{{- end -}}
+
 {{/*
 Returns metricsHost
 */}}

diff --git a/charts/newrelic-logging/templates/configmap.yaml b/charts/newrelic-logging/templates/configmap.yaml
@@ -30,9 +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}}
-    {{ printf "add_label            namespace %s" .Release.Namespace | nindent 8}}
-    {{ printf "add_label            helm_release_name %s" .Release.Name | nindent 8}}
+      {{- .Values.fluentBit.config.metricInstrumentation | nindent 4 -}}
+      {{ include "newrelic-logging.entitySynthesis.labels" . }}
     {{- end }}
   parsers.conf: |
   {{- if .Values.fluentBit.config.parsers }}