feat: add support for ServiceMonitors (#117)

Co-authored-by: Max Rosin <[email protected]>

charts/generic/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: generic
 description: A chart for generic applications. Use this if you need to deploy something without wanting to build a fully fledged new helm chart.
 type: application
-version: 3.7.0
+version: 3.8.0
 maintainers:
   - name: morremeyer
   - name: ekeih

charts/generic/README.md

@@ -1,6 +1,6 @@
 # generic
 
-![Version: 3.7.0](https://img.shields.io/badge/Version-3.7.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+![Version: 3.8.0](https://img.shields.io/badge/Version-3.8.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
 A chart for generic applications. Use this if you need to deploy something without wanting to build a fully fledged new helm chart.
 
@@ -152,5 +152,13 @@ If you have environment variables set from ConfigMaps or Secrets, check out `env
 | serviceAccount.annotations | object | `{}` | Annotations to add to the service account |
 | serviceAccount.create | bool | `true` | Specifies whether a service account should be created |
 | serviceAccount.name | string | `""` | The name of the service account to use. If not set and create is true, a name is generated using the fullname template. |
+| serviceMonitors[0] | object | `{"additionalLabels":{},"enabled":false,"interval":"1m","jobLabel":"","name":"","path":"/metrics","port":"http","scrapeTimeout":"10s"}` | If a ServiceMonitor should be deployed. Needs the CRD installed |
+| serviceMonitors[0].additionalLabels | object | `{}` | Additional labels for the ServiceMonitor resource |
+| serviceMonitors[0].interval | string | `"1m"` | How often to scrape |
+| serviceMonitors[0].jobLabel | string | `""` | The label 'job' in prometheus. Defaults to the release name |
+| serviceMonitors[0].name | string | `""` | Name of the resource, defaults to the release name |
+| serviceMonitors[0].path | string | `"/metrics"` | The path of the metrics endpoint |
+| serviceMonitors[0].port | string | `"http"` | The port to scrape |
+| serviceMonitors[0].scrapeTimeout | string | `"10s"` | Timeout for scraping |
 | startupProbe | string | `nil` | Configure a startup probe for the pod |
 | tolerations | list | `[]` |  |

charts/generic/templates/servicemonitor.yaml

@@ -0,0 +1,32 @@
+{{- range .Values.serviceMonitors -}}
+{{- if .enabled }}
+---
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: {{ .name | default (include "generic.fullname" $) }}
+  namespace: {{ $.Release.Namespace }}
+  labels:
+    {{- include "generic.labels" $ | nindent 4 }}
+  {{- with .additionalLabels }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  jobLabel: {{ .jobLabel | default $.Release.Name }}
+  namespaceSelector:
+    matchNames:
+      - {{ $.Release.Namespace }}
+  selector:
+    matchLabels:
+      {{- include "generic.selectorLabels" $ | nindent 6 }}
+  endpoints:
+    - port: {{ .port }}
+      path: {{ .path }}
+      {{- with .interval }}
+      interval: {{ . }}
+      {{- end }}
+      {{- with .scrapeTimeout }}
+      scrapeTimeout: {{ . }}
+      {{- end }}
+{{- end }}
+{{- end }}

charts/generic/values.yaml

@@ -149,6 +149,24 @@ autoscaling:
   targetCPUUtilizationPercentage: 80
   # targetMemoryUtilizationPercentage: 80
 
+serviceMonitors:
+    # -- If a ServiceMonitor should be deployed. Needs the CRD installed
+  - enabled: false
+    # -- Name of the resource, defaults to the release name
+    name: ""
+    # -- Additional labels for the ServiceMonitor resource
+    additionalLabels: {}
+    # -- How often to scrape
+    interval: 1m
+    # -- Timeout for scraping
+    scrapeTimeout: 10s
+    # -- The port to scrape
+    port: http
+    # -- The path of the metrics endpoint
+    path: /metrics
+    # -- The label 'job' in prometheus. Defaults to the release name
+    jobLabel: ""
+
 nodeSelector: {}
 
 tolerations: []