[stable/graphite]: allow customizing of statsd configurations. (#7352)

* [stable/graphite]: fix indentation of resources block. * [stable/graphite]: fix indentation of probe blocks. * [stable/graphite]: allow custom statsd configurations. * [stable/graphite]: bump chart version. * [stable/graphite]: configure statsd server interface. Signed-off-by: Shai Katz <shai@soluto.com>
helm · Aug 28, 2018 · d9d7f89 · d9d7f89
1 parent 194f5da
commit d9d7f89
Show file tree

Hide file tree

Showing 6 changed files with 71 additions and 16 deletions.
diff --git a/stable/graphite/Chart.yaml b/stable/graphite/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
-version: 0.1.0
+version: 0.1.1
 appVersion: "1.1.3"
 description: Graphite metrics server
 name: graphite

diff --git a/stable/graphite/README.md b/stable/graphite/README.md
@@ -58,7 +58,9 @@ The following table lists the configurable parameters of the Graphite chart and
 | `nodeSelector`                 | NodeSelector                                 | `{}`                                   |
 | `tolerations`                  | Tolerations                                  | `[]`                                   |
 | `affinity`                     | Affinity                                     | `{}`                                   |
-| `configMaps`                   | All Config files                             | see values.yaml                        |
+| `configMaps`                   | Graphite Config files                        | see values.yaml                        |
+| `statsdConfigMaps`             | StatsD Config files                          | see values.yaml                        |
+| `statsd.interface`             | StatsD server interface, `TCP` or `UDP`      | `UDP`                                  |
 
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example:

diff --git a/stable/graphite/templates/deployment.yaml b/stable/graphite/templates/deployment.yaml
@@ -42,37 +42,47 @@ spec:
         - name: aggregate-pickl
           containerPort: 2024
         - name: statsd
+          protocol: {{ .Values.statsd.interface }}
           containerPort: 8125
         - name: statsd-admin
           containerPort: 8126
-          livenessProbe:
-            httpGet:
-              path: /
-              port: graphite-gui
-          readinessProbe:
-            httpGet:
-              path: /
-              port: graphite-gui
-          resources:
+        env:
+        - name: "STATSD_INTERFACE"
+          value: {{ .Values.statsd.interface | lower }}
+        livenessProbe:
+          httpGet:
+            path: /
+            port: graphite-gui
+        readinessProbe:
+          httpGet:
+            path: /
+            port: graphite-gui
+        resources:
+{{ toYaml .Values.resources | indent 10 }}
         volumeMounts:
           - name: {{ template "graphite.fullname" . }}-configmap
             mountPath: /opt/graphite/conf/
+          - name: {{ template "graphite.fullname" . }}-statsd-configmap
+            subPath: config_tcp.js
+            mountPath: /opt/statsd/config_tcp.js
+          - name: {{ template "graphite.fullname" . }}-statsd-configmap
+            subPath: config_udp.js
+            mountPath: /opt/statsd/config_udp.js
           - name: {{ template "graphite.fullname" . }}-pvc
             mountPath: /opt/graphite/storage/
       volumes:
         - name: {{ template "graphite.fullname" . }}-configmap
           configMap:
             name: {{ template "graphite.fullname" . }}-configmap
+        - name: {{ template "graphite.fullname" . }}-statsd-configmap
+          configMap:
+            name: {{ template "graphite.fullname" . }}-statsd-configmap
         - name: {{ template "graphite.fullname" . }}-pvc
 {{- if .Values.persistence.enabled }}
           persistentVolumeClaim:
             claimName: {{ if .Values.persistence.existingClaim }}{{ .Values.persistence.existingClaim }}{{- else }}{{ template "graphite.fullname" . }}-pvc{{- end }}
 {{- else }}
           emptyDir: {}
-{{- end }}
-{{- if .Values.resources }}
-        resources:
-{{ toYaml .Values.resources | indent 10 }}
 {{- end }}
     {{- with .Values.nodeSelector }}
       nodeSelector:

diff --git a/stable/graphite/templates/service.yaml b/stable/graphite/templates/service.yaml
@@ -34,7 +34,7 @@ spec:
       protocol: TCP
     - name: statsd
       port: 8125
-      protocol: TCP
+      protocol: {{ .Values.statsd.interface }}
     - name: statsd-admin
       port: 8126
       protocol: TCP

diff --git a/stable/graphite/templates/statsd-configmap.yaml b/stable/graphite/templates/statsd-configmap.yaml
@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ template "graphite.fullname" . }}-statsd-configmap
+  labels:
+    app: {{ template "graphite.name" . }}
+    chart: {{ template "graphite.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+data:
+{{- range $key, $value := .Values.statsdConfigMaps }}
+  {{ $key }}: |-
+{{ $value | indent 4 }}
+{{- end }}
diff --git a/stable/graphite/values.yaml b/stable/graphite/values.yaml
@@ -992,3 +992,32 @@ configMaps:
     # missing, all metrics will pass through.
     # This file is reloaded automatically when changes are made
     .*
+
+statsdConfigMaps:
+  config_tcp.js: |-
+    {
+      "graphiteHost": "127.0.0.1",
+      "graphitePort": 2003,
+      "port": 8125,
+      "flushInterval": 10000,
+      "servers": [{
+        "server": "./servers/tcp",
+        "address": "0.0.0.0",
+        "port": 8125
+      }]
+    }
+  config_udp.js: |-
+    {
+      "graphiteHost": "127.0.0.1",
+      "graphitePort": 2003,
+      "port": 8125,
+      "flushInterval": 10000,
+      "servers": [{
+        "server": "./servers/udp",
+        "address": "0.0.0.0",
+        "port": 8125
+      }]
+    }
+
+statsd:
+  interface: UDP