Enforce outputs.health and inputs.internal, fix service as health no longer in config.ouputs.

charts/telegraf/README.md

@@ -39,30 +39,6 @@ helm uninstall telegraf
 
 The command removes all the Kubernetes components associated with the chart and deletes the release.
 
-## livenessProve, readinessProbe and health service
-
-Be sure to have at least these inputs and outputs enabled so that readinessProbe and livenessProbe can work as expected and that the health service endpoint is correctly set up:
-
-```yaml
-[...]
-
-config:
-  [...]
-  outputs:
-    - health:
-        service_address: "http://:8888"
-        compares:
-          field: buffer_size
-          lt: 5000.0
-        contains:
-          field: buffer_size
-  [...]
-  inputs:
-    - internal:
-        collect_memstats: false
-  [...]
-```
-
 ## Configuration
 
 The default configuration parameters are listed in `values.yaml`.

charts/telegraf/templates/configmap.yaml

@@ -14,4 +14,13 @@ data:
     {{ template "processors" .Values.config.processors }}
     {{ template "aggregators" .Values.config.aggregators }}
     {{ template "outputs" .Values.config.outputs }}
+    [[outputs.health]]
+      service_address = "http://:8888"
+      [[outputs.health.compares]]
+        field = "buffer_size"
+        lt = 5000.0
+      [[outputs.health.contains]]
+        field = "buffer_size"
     {{ template "inputs" .Values.config.inputs -}}
+    [[inputs.internal]]
+      collect_memstats = false

charts/telegraf/templates/service.yaml

@@ -15,16 +15,9 @@ metadata:
 spec:
   type: {{ .Values.service.type }}
   ports:
-  {{- range $objectKey, $objectValue := .Values.config.outputs }}
-  {{- range $key, $value := . -}}
-  {{- $tp := typeOf $value -}}
-  {{- if eq $key "health" }}
-  - port: {{ trimPrefix "http://:" $value.service_address | int64 }}
-    targetPort: {{ trimPrefix "http://:" $value.service_address | int64 }}
+  - port: 8888
+    targetPort: 8888
     name: "health"
-    {{- end }}
-  {{- end }}
-  {{- end }}
   {{- range $objectKey, $objectValue := .Values.config.inputs }}
   {{- range $key, $value := . -}}
     {{- $tp := typeOf $value -}}

charts/telegraf/values.yaml

@@ -110,20 +110,11 @@ config:
             problem: 2
             critical: 3
   outputs:
-    - health:
-        service_address: "http://:8888"
-        compares:
-          field: buffer_size
-          lt: 5000.0
-        contains:
-          field: buffer_size
     - influxdb:
         urls:
           - "http://influxdb.monitoring.svc:8086"
         database: "telegraf"
   inputs:
-    - internal:
-        collect_memstats: false
     - statsd:
         service_address: ":8125"
         percentiles: