From cc92f49cb2cc1c5d449d12e3773d22c12343c7b5 Mon Sep 17 00:00:00 2001
From: Martin Baillie <martinbaillie@users.noreply.github.com>
Date: Thu, 8 Aug 2019 01:23:47 +1000
Subject: [PATCH] Add promtail ServiceMonitor and headless Service (#856)

These are optional objects guarded by `serviceMonitor.enabled`.

Chart minor version also receives a bump.
---
 .../promtail/templates/service-headless.yaml  | 22 +++++++++++++++++
 .../promtail/templates/servicemonitor.yaml    | 24 +++++++++++++++++++
 production/helm/promtail/values.yaml          |  4 ++++
 3 files changed, 50 insertions(+)
 create mode 100644 production/helm/promtail/templates/service-headless.yaml
 create mode 100644 production/helm/promtail/templates/servicemonitor.yaml

diff --git a/production/helm/promtail/templates/service-headless.yaml b/production/helm/promtail/templates/service-headless.yaml
new file mode 100644
index 000000000000..f5f52365aa6e
--- /dev/null
+++ b/production/helm/promtail/templates/service-headless.yaml
@@ -0,0 +1,22 @@
+{{- if .Values.serviceMonitor.enabled }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ template "promtail.fullname" . }}-headless
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app: {{ template "promtail.name" . }}
+    chart: {{ template "promtail.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  clusterIP: None
+  ports:
+    - port: {{ .Values.config.server.http_listen_port }}
+      protocol: TCP
+      name: http-metrics
+      targetPort: http-metrics
+  selector:
+    app: {{ template "promtail.name" . }}
+    release: {{ .Release.Name }}
+{{- end }}
diff --git a/production/helm/promtail/templates/servicemonitor.yaml b/production/helm/promtail/templates/servicemonitor.yaml
new file mode 100644
index 000000000000..cd3fe02715ba
--- /dev/null
+++ b/production/helm/promtail/templates/servicemonitor.yaml
@@ -0,0 +1,24 @@
+{{- if .Values.serviceMonitor.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: {{ template "promtail.fullname" . }}
+  labels:
+    app: {{ template "promtail.name" . }}
+    chart: {{ template "promtail.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  selector:
+    matchLabels:
+      app: {{ template "promtail.name" . }}
+      release: {{ .Release.Name | quote }}
+  namespaceSelector:
+    matchNames:
+      - {{ .Release.Namespace | quote }}
+  endpoints:
+  - port: http-metrics
+    {{- if .Values.serviceMonitor.interval }}
+    interval: {{ .Values.serviceMonitor.interval }}
+    {{- end }}
+{{- end }}
diff --git a/production/helm/promtail/values.yaml b/production/helm/promtail/values.yaml
index 8c74282d30c1..2b0065f19dff 100644
--- a/production/helm/promtail/values.yaml
+++ b/production/helm/promtail/values.yaml
@@ -124,3 +124,7 @@ config:
   target_config:
     # Period to resync directories being watched and files being tailed
     sync_period: 10s
+
+serviceMonitor:
+  enabled: false
+  interval: ""