Merge pull request #4 from velothump/servicemonitor

Prometheus ServiceMonitor support

charts/trickster/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: 1.1
 description: Trickster is an HTTP Reverse Proxy Cache and time series query accelerator.
 name: trickster
-version: 1.5.0
+version: 1.6.0
 home: https://github.com/tricksterproxy/trickster
 icon: https://helm.tricksterproxy.io/img/trickster-horizontal.png
 sources:

charts/trickster/templates/servicemonitor.yaml

@@ -0,0 +1,27 @@
+{{- if .Values.prometheus.serviceMonitor.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: {{ template "trickster.fullname" . }}
+  namespace: {{ .Release.Namespace | quote }}
+  labels:
+    {{- include "trickster.labels" . | nindent 4 }}
+{{- if .Values.prometheus.serviceMonitor.labels }}
+{{ toYaml .Values.prometheus.serviceMonitor.labels | indent 4 }}
+{{- end }}
+spec:
+  jobLabel: {{ template "trickster.name" . }}
+  selector:
+    matchLabels:
+    {{- include "trickster.labels" . | nindent 4 }}
+{{- if .Values.service.labels }}
+{{ toYaml .Values.service.labels | indent 4 }}
+{{- end }}
+  namespaceSelector:
+    matchNames:
+      - {{ .Release.Namespace | quote }}
+  endpoints:
+  - port: http-metrics
+    path: {{ .Values.service.metricsPort }}
+    interval: {{ .Values.prometheus.serviceMonitor.interval }}
+{{- end }}

charts/trickster/values.yaml

@@ -518,6 +518,12 @@ profiler:
 
 prometheusScrape: false
 
+prometheus:
+  serviceMonitor:
+    enabled: false
+    interval: 30s
+    labels: {}
+
 # Number of trickster replicas desired
 ## Use a StatefulSet if replicaCount needs to be greater than 1 (see below)
 replicaCount: 1