Fix probes and internal metrics configuration (#408)

charts/telegraf/Chart.yaml

 apiVersion: v2
 name: telegraf
-version: 1.8.10
-appVersion: 1.21.1
+version: 1.8.11
+appVersion: 1.21.2
 deprecated: false
 description: Telegraf is an agent written in Go for collecting, processing, aggregating, and writing metrics.
 keywords:

charts/telegraf/ci/default-values.yaml

+# Default values only, no overrides

charts/telegraf/ci/metrics-health-enabled-values.yaml

+metrics:
+  health:
+    enabled: true

charts/telegraf/templates/_helpers.tpl

@@ -532,3 +532,22 @@ Create the name of the service account to use
     {{ default "default" .Values.serviceAccount.name }}
 {{- end -}}
 {{- end -}}
+
+{{/*
+Get health configuration
+*/}}
+{{- define "telegraf.health" -}}
+{{- if .Values.metrics.health.enabled -}}
+    {{- .Values.metrics.health | toYaml -}}
+{{- else -}}
+    {{- $health := dict -}}
+    {{- range $objectKey, $objectValue := .Values.config.outputs }}
+        {{- range $key, $value := . -}}
+        {{- if eq $key "health" -}}
+            {{- $health = $value -}}
+        {{- end -}}
+        {{- end -}}
+    {{- end }}
+    {{- $health | toYaml -}}
+{{- end -}}
+{{- end -}}

charts/telegraf/templates/configmap.yaml

@@ -13,14 +13,16 @@ data:
     {{ template "outputs" .Values.config.outputs }}
     {{- if .Values.metrics.health.enabled }}
     [[outputs.health]]
-      service_address = "http://:8888"
+      service_address = "{{ .Values.metrics.health.service_address }}"
       namepass = ["internal_write"]
       [[outputs.health.compares]]
         field = "buffer_size"
-        lt = {{ .Values.metrics.health.threshold }}
+        lt = {{ .Values.metrics.health.threshold | int64 }}.0
       [[outputs.health.contains]]
         field = "buffer_size"
     {{- end }}
     {{ template "inputs" .Values.config.inputs -}}
+    {{- if .Values.metrics.internal.enabled }}
     [[inputs.internal]]
-      collect_memstats = {{ .Values.metrics.collect_memstats }}
+      collect_memstats = {{ or .Values.metrics.internal.collect_memstats (.Values.metrics.collect_memstats | default false) }}
+    {{- end }}

charts/telegraf/templates/deployment.yaml

@@ -77,20 +77,20 @@ spec:
         {{ end }}
         {{ end }}
         {{ end }}
-        {{- range $objectKey, $objectValue := .Values.config.outputs }}
-        {{- range $key, $value := . -}}
-        {{- $tp := typeOf $value -}}
-        {{- if eq $key "health" }}
+        {{- $health := include "telegraf.health" . | fromYaml }}
+        {{- with $health }}
+        startupProbe:
+          httpGet:
+            path: /
+            port: {{ trimPrefix "http://:" .service_address | int64 }}
         livenessProbe:
           httpGet:
             path: /
-            port: {{ trimPrefix "http://:" $value.service_address | int64 }}
+            port: {{ trimPrefix "http://:" .service_address | int64 }}
         readinessProbe:
           httpGet:
             path: /
-            port: {{ trimPrefix "http://:" $value.service_address | int64 }}
-        {{- end }}
-        {{- end }}
+            port: {{ trimPrefix "http://:" .service_address | int64 }}
         {{- end }}
       {{- if .Values.imagePullSecrets }}
       imagePullSecrets:

charts/telegraf/templates/service.yaml

@@ -12,9 +12,10 @@ metadata:
 spec:
   type: {{ .Values.service.type }}
   ports:
-  {{- if .Values.metrics.health.enabled }}
-  - port: 8888
-    targetPort: 8888
+  {{- $health := include "telegraf.health" . | fromYaml }}
+  {{- with $health }}
+  - port: {{ trimPrefix "http://:" .service_address | int64 }}
+    targetPort: {{ trimPrefix "http://:" .service_address | int64 }}
     name: "health"
   {{- end }}
   {{- range $objectKey, $objectValue := .Values.config.inputs }}

charts/telegraf/values.yaml

@@ -170,7 +170,10 @@ config:
 metrics:
   health:
     enabled: false
+    service_address: "http://:8888"
     threshold: 5000.0
+  internal:
+    enabled: true
     collect_memstats: false
 
 # Lifecycle hooks