Added metrics key to enable/disable internal metrics and minor bug fixes for influxdb2 (#237)

charts/influxdb2/Chart.yaml

 apiVersion: v2
-appVersion: 2.0.0-rc
+appVersion: 2.0.2
 
 name: influxdb2
 description: A Helm chart for InfluxDB v2
 home: https://www.influxdata.com/products/influxdb-overview/influxdb-2-0/
 type: application
-version: 1.0.11
+version: 1.0.12
 maintainers:
   - name: rawkode
     email: rawkode@influxdata.com
   - name: gitirabassi
     email: giacomo@influxdata.com
+icon: https://avatars0.githubusercontent.com/u/5713248?s=200&v=4

charts/influxdb2/templates/job-setup-admin.yaml

@@ -16,7 +16,7 @@ spec:
     spec:
       containers:
       - name: {{ template "influxdb.fullname" . }}-create-admin-user
-        image: "{{ .Values.image.repository }}:{{ .Chart.AppVersion }}"
+        image: "{{ .Values.image.repository }}:v{{ .Chart.AppVersion }}"
         env:
           - name: INFLUXDB_PASSWORD
             valueFrom:

charts/influxdb2/templates/persistent-volume-claim.yaml

@@ -5,6 +5,8 @@ metadata:
   name: "{{- if not (empty .Values.persistence.name) }}{{ .Values.persistence.name }}{{- else }}{{ template "influxdb.fullname" . }}{{- end }}"
   labels:
     {{- include "influxdb.labels" . | nindent 4 }}
+  annotations:
+    helm.sh/resource-policy: "keep"
 spec:
   accessModes:
     - {{ .Values.persistence.accessMode | quote }}

charts/influxdb2/templates/statefulset.yaml

@@ -30,12 +30,16 @@ spec:
         {{- end }}
       containers:
         - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ .Chart.AppVersion }}"
+          image: "{{ .Values.image.repository }}:v{{ .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - name: http
               containerPort: 8086
               protocol: TCP
+          {{- if .Values.securityContext }}
+          securityContext:
+            {{ toYaml .Values.securityContext | nindent 12 }}
+          {{- end }}
           livenessProbe:
             httpGet:
               path: /health

charts/influxdb2/values.yaml

@@ -23,6 +23,8 @@ tolerations: []
 
 affinity: {}
 
+securityContext: {}
+
 ## Create default user through Kubernetes job
 ## Defaults indicated below
 ##

charts/telegraf/Chart.yaml

-apiVersion: v1
+apiVersion: v2
 name: telegraf
-version: 1.7.32
+version: 1.7.33
 appVersion: 1.16
 deprecated: false
 description: Telegraf is an agent written in Go for collecting, processing, aggregating, and writing metrics.
@@ -17,4 +17,4 @@ maintainers:
     email: rawkode@influxdata.com
   - name: gitirabassi
     email: giacomo@influxdata.com
-engine: gotpl
+icon: https://avatars0.githubusercontent.com/u/5713248?s=200&v=4

charts/telegraf/templates/configmap.yaml

@@ -11,6 +11,7 @@ data:
     {{ template "processors" .Values.config.processors }}
     {{ template "aggregators" .Values.config.aggregators }}
     {{ template "outputs" .Values.config.outputs }}
+    {{- if .Values.metrics.health.enabled }}
     [[outputs.health]]
       service_address = "http://:8888"
       [[outputs.health.compares]]
@@ -19,5 +20,6 @@ data:
       [[outputs.health.contains]]
         field = "buffer_size"
     {{ template "inputs" .Values.config.inputs -}}
+    {{- end }}
     [[inputs.internal]]
-      collect_memstats = false
+      collect_memstats = {{ .Values.metrics.collect_memstats }}

charts/telegraf/templates/service.yaml

@@ -12,9 +12,11 @@ metadata:
 spec:
   type: {{ .Values.service.type }}
   ports:
+  {{- if .Values.metrics.health.enabled }}
   - port: 8888
     targetPort: 8888
     name: "health"
+  {{- end }}
   {{- range $objectKey, $objectValue := .Values.config.inputs }}
   {{- range $key, $value := . -}}
     {{- $tp := typeOf $value -}}

charts/telegraf/values.yaml

@@ -159,6 +159,11 @@ config:
         allowed_pending_messages: 10000
         percentile_limit: 1000
 
+metrics:
+  health:
+    enabled: false
+  collect_memstats: false
+
 # Lifecycle hooks
 # hooks:
 #   postStart: ["/bin/sh", "-c", "echo Telegraf started"]