use lists instead of dicts for inputs & outputs in telegraf-s

influxdata · Aug 10, 2018 · 80ced53 · 80ced53
1 parent f4763f9
commit 80ced53
Show file tree

Hide file tree

Showing 8 changed files with 158 additions and 127 deletions.
diff --git a/telegraf-s/Chart.yaml b/telegraf-s/Chart.yaml
@@ -1,5 +1,5 @@
 name: telegraf-s
-version: 1.7.2
+version: 1.8.0
 description: Telegraf is an agent written in Go for collecting, processing, aggregating, and writing metrics.
 keywords:
 - telegraf

diff --git a/telegraf-s/README.md b/telegraf-s/README.md
@@ -56,6 +56,21 @@ Alternatively, a YAML file that specifies the values for the above parameters ca
 $ helm install --name my-release -f values.yaml stable/telegraf
 ```
 
+Outputs and inputs are configured as arrays of key/value dictionaries. Additional examples and defaults can be found in [values.yaml](values.yaml)
+Example:
+```
+outputs:
+  - influxdb:
+      urls: []
+        # - "http://influxdb-influxdb.tick:8086"
+      database: "telegraf"
+inputs:
+  - cpu:
+      percpu: false
+      totalcpu: true
+  - system:
+```
+
 > **Tip**: You can use the default [values.yaml](values.yaml)
 
 ## Telegraf Configuration

diff --git a/telegraf-s/templates/NOTES.txt b/telegraf-s/templates/NOTES.txt
@@ -2,14 +2,13 @@ To open a shell session in the container running Telegraf run the following:
 
 - kubectl exec -i -t --namespace {{ .Release.Namespace }} $(kubectl get pods --namespace {{ .Release.Namespace }} -l app={{ template "fullname" . }} -o jsonpath='{.items[0].metadata.name}') /bin/sh
 
-To tail the logs for a Telegraf pod run the following:
+To tail the logs for a Telegraf pod in the Daemonset run the following:
 
-- kubectl logs -f --namespace {{ .Release.Namespace }} $(kubectl get pods --namespace {{ .Release.Namespace }} -l app={{ template "fullname" . }} -o jsonpath='{ .items[0].metadata.name }')
+- kubectl logs -f --namespace {{ .Release.Namespace }} $(kubectl get pods --namespace {{ .Release.Namespace }} -l app={{ template "fullname" . }}-ds -o jsonpath='{ .items[0].metadata.name }')
 
-{{- if empty .Values.config.outputs.influxdb.urls }}
+{{- if eq .Values.service.type "LoadBalancer" }}
 
-Need to set an InfluxDB url for either s daemonset to deploy this instance:
-
-.Values.config.outputs.influxdb.urls
+To watch for the LoadBalancer IP run the following
 
+- kubectl get svc -w --namespace {{ .Release.Namespace }} -l app={{ template "fullname" . }}
 {{- end }}
diff --git a/telegraf-s/templates/_helpers.tpl b/telegraf-s/templates/_helpers.tpl
@@ -50,9 +50,12 @@ We truncate at 24 chars because some Kubernetes name fields are limited to this
 {{- end -}}
 
 {{- define "outputs" -}}
+{{- range $outputIdx, $configObject := . -}}
 {{- range $output, $config := . }}
     [[outputs.{{ $output }}]]
   {{- if $config }}
+  {{- $tp := typeOf $config -}}
+  {{- if eq $tp "map[string]interface {}" -}}
     {{- range $key, $value := $config -}}
       {{- $tp := typeOf $value }}
       {{- if eq $tp "string"}}
@@ -83,13 +86,19 @@ We truncate at 24 chars because some Kubernetes name fields are limited to this
       {{- end }}
     {{- end }}
   {{- end }}
+  {{- end }}
+  {{- end }}
 {{- end }}
 {{- end -}}
 
 {{- define "inputs" -}}
-{{- range $input, $config := . -}}
+{{- range $inputIdx, $configObject := . -}}
+    {{- range $input, $config := . -}}
+
     [[inputs.{{- $input }}]]
-      {{- if $config -}}
+    {{- if $config -}}
+    {{- $tp := typeOf $config -}}
+    {{- if eq $tp "map[string]interface {}" -}}
         {{- range $key, $value := $config -}}
           {{- $tp := typeOf $value -}}
           {{- if eq $tp "string" }}
@@ -158,7 +167,9 @@ We truncate at 24 chars because some Kubernetes name fields are limited to this
               {{- end }}
             {{- end }}
           {{- end }}
-        {{- end }}
-      {{- end }}
+          {{- end }}
+    {{- end }}
+    {{- end }}
     {{ end }}
+{{- end }}
 {{- end -}}
diff --git a/telegraf-s/templates/configmap.yaml b/telegraf-s/templates/configmap.yaml
@@ -1,4 +1,3 @@
-{{- if gt (len .Values.config.outputs.influxdb.urls) 0 }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -13,5 +12,4 @@ data:
     {{ template "global_tags" .Values.config.global_tags }}
     {{ template "agent" .Values.config.agent }}
     {{ template "outputs" .Values.config.outputs }}
-    {{ template "inputs" .Values.config.inputs -}}
-{{- end -}}
+    {{ template "inputs" .Values.config.inputs -}}
diff --git a/telegraf-s/templates/deployment.yaml b/telegraf-s/templates/deployment.yaml
@@ -1,4 +1,3 @@
-{{- if gt (len .Values.config.outputs.influxdb.urls) 0 }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -37,4 +36,3 @@ spec:
       - name: config
         configMap:
           name: {{ template "fullname" . }}
-{{- end -}}
diff --git a/telegraf-s/templates/service.yaml b/telegraf-s/templates/service.yaml
@@ -1,14 +1,17 @@
 {{- if .Values.service.enabled -}}
+{{- if .Values.service.enabled -}}
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ template "fullname" . }}
+  name: {{ template "fullname" . }}-s
   labels:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
 spec:
   type: {{ .Values.service.type }}
   ports:
-  {{- range $key, $value := .Values.config.inputs }}
+  {{- range $objectKey, $objectValue := .Values.config.inputs }}
+  {{- range $key, $value := . -}}
+    {{- $tp := typeOf $value -}}
     {{- if eq $key "http_listener" }}
   - port: {{ trimPrefix ":" $value.service_address | int64 }}
     targetPort: {{ trimPrefix ":" $value.service_address | int64 }}
@@ -36,7 +39,9 @@ spec:
     targetPort: {{ trimPrefix ":" $value.service_address | int64 }}
     name: "webhooks"
     {{- end }}
+  {{- end -}}
   {{- end }}
   selector:
-    app: {{ template "fullname" . }}
+    app: {{ template "fullname"  .}}-s
+{{- end -}}
 {{- end -}}