Merge pull request #42 from techops-services/common-servicemonitor

Add ServiceMonitor template to common Helm chart

.gitignore

@@ -0,0 +1 @@
+.DS_Store

charts/common/Chart.yaml

@@ -15,11 +15,11 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.0.36
+version: 0.0.37
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.0.36"
+appVersion: "0.0.37"
 icon: https://cncf-branding.netlify.app/img/projects/helm/horizontal/color/helm-horizontal-color.png

charts/common/templates/servicemonitor.yaml

@@ -0,0 +1,52 @@
+{{- if and .Values.serviceMonitor.enabled .Values.service }}
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: {{ include "common.fullname" . }}
+  {{- if .Values.serviceMonitor.namespace }}
+  namespace: {{ .Values.serviceMonitor.namespace }}
+  {{- else }}
+  namespace: {{ .Release.Namespace }}
+  {{- end }}
+  labels:
+    {{- include "common.labels" . | nindent 4 }}
+    {{- with .Values.serviceMonitor.additionalLabels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+spec:
+  endpoints:
+    - port: {{ .Values.serviceMonitor.port }}
+      {{- if .Values.serviceMonitor.path }}
+      path: {{ .Values.serviceMonitor.path }}
+      {{- end }}
+      {{- if .Values.serviceMonitor.interval }}
+      interval: {{ .Values.serviceMonitor.interval }}
+      {{- end }}
+      {{- if .Values.serviceMonitor.scrapeTimeout }}
+      scrapeTimeout: {{ .Values.serviceMonitor.scrapeTimeout }}
+      {{- end }}
+      {{- if .Values.serviceMonitor.scheme }}
+      scheme: {{ .Values.serviceMonitor.scheme }}
+      {{- end }}
+      {{- with .Values.serviceMonitor.tlsConfig }}
+      tlsConfig:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.serviceMonitor.relabelings }}
+      relabelings:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.serviceMonitor.metricRelabelings }}
+      metricRelabelings:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+  selector:
+    matchLabels:
+      {{- include "common.selectorLabels" . | nindent 6 }}
+  namespaceSelector:
+    matchNames:
+      - {{ .Release.Namespace }}
+  {{- with .Values.serviceMonitor.spec }}
+  {{- toYaml . | nindent 2 }}
+  {{- end }}
+{{- end }} 

charts/common/values.yaml

@@ -290,3 +290,30 @@ env:
 #     type: parameterStore
 #     name: example-db
 #     parameter_name: DB_PASSWORD
+
+serviceMonitor:
+  enabled: false
+  # The label used by the Prometheus Operator to discover ServiceMonitors
+  additionalLabels: {}
+    # release: prometheus-operator
+  # Namespace where ServiceMonitor resource will be created
+  namespace: ""
+  # Interval at which metrics should be scraped
+  interval: 30s
+  # Timeout for scraping
+  scrapeTimeout: 10s
+  # The path at which metrics are exposed
+  path: /metrics
+  # The port name or number to scrape metrics from
+  port: metrics
+  # Additional relabeling configurations
+  relabelings: []
+  # Additional metric relabeling configurations
+  metricRelabelings: []
+  # Scheme to use for scraping
+  scheme: http
+  # TLS configuration for scraping
+  tlsConfig: {}
+    # insecureSkipVerify: true
+  # Additional ServiceMonitor specifications
+  spec: {}