feat: add servicemonitor options

Signed-off-by: Dov Devers <renaud-dov.devers@diabolocom.com>

Author: Renaud-Dov

charts/coredns/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: coredns
-version: 1.45.2
+version: 1.46.0
 appVersion: 1.13.1
 home: https://coredns.io
 icon: https://coredns.io/images/CoreDNS_Colour_Horizontal.png
@@ -20,4 +20,4 @@ type: application
 annotations:
   artifacthub.io/changes: |
     - kind: added
-      description: Add configurable dnsPolicy for deployment
+      description: Add scrapeTimeout, scheme, honorLabels, tlsConfig, relabelings, and metricRelabelings options to ServiceMonitor endpoint

charts/coredns/README.md

@@ -126,6 +126,12 @@ The command removes all the Kubernetes components associated with the chart and
 | `prometheus.monitor.additionalLabels`          | Additional labels that can be used so ServiceMonitor will be discovered by Prometheus                                                     | {}                                                           |
 | `prometheus.monitor.namespace`                 | Selector to select which namespaces the Endpoints objects are discovered from.                                                            | `""`                                                         |
 | `prometheus.monitor.interval`                  | Scrape interval for polling the metrics endpoint. (E.g. "30s")                                                                            | `""`                                                         |
+| `prometheus.monitor.scrapeTimeout`             | Timeout for each scrape request. (E.g. "10s")                                                                                             | `""`                                                         |
+| `prometheus.monitor.scheme`                    | HTTP scheme used for scraping. (`http` or `https`)                                                                                        | `""`                                                         |
+| `prometheus.monitor.honorLabels`               | Honor labels from the target when scraping                                                                                                | `false`                                                      |
+| `prometheus.monitor.tlsConfig`                 | TLS configuration for the metrics endpoint (e.g. `insecureSkipVerify`, certificates)                                                     | `{}`                                                         |
+| `prometheus.monitor.relabelings`               | List of target relabeling rules applied before scraping                                                                                   | `[]`                                                         |
+| `prometheus.monitor.metricRelabelings`         | List of metric relabeling rules applied after scraping                                                                                    | `[]`                                                         |
 | `prometheus.monitor.selector`                  | Service selector                                                                                                                          | `{}`                                                         |
 | `service.clusterIP`                            | IP address to assign to service                                                                                                           | `""`                                                         |
 | `service.clusterIPs`                           | IP addresses to assign to service                                                                                                         | `[]`                                                         |

charts/coredns/templates/servicemonitor.yaml

@@ -37,4 +37,25 @@ spec:
       {{- if .Values.prometheus.monitor.interval }}
       interval: {{ .Values.prometheus.monitor.interval }}
       {{- end }}
+      {{- if .Values.prometheus.monitor.scrapeTimeout }}
+      scrapeTimeout: {{ .Values.prometheus.monitor.scrapeTimeout }}
+      {{- end }}
+      {{- if .Values.prometheus.monitor.scheme }}
+      scheme: {{ .Values.prometheus.monitor.scheme }}
+      {{- end }}
+      {{- if .Values.prometheus.monitor.honorLabels }}
+      honorLabels: {{ .Values.prometheus.monitor.honorLabels }}
+      {{- end }}
+      {{- with .Values.prometheus.monitor.tlsConfig }}
+      tlsConfig:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.prometheus.monitor.relabelings }}
+      relabelings:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.prometheus.monitor.metricRelabelings }}
+      metricRelabelings:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
 {{- end }}

charts/coredns/tests/servicemonitor_test.yaml

@@ -12,6 +12,18 @@ set:
       enabled: true
       namespace: monitoring
       interval: 15s
+      scrapeTimeout: 10s
+      scheme: https
+      honorLabels: true
+      tlsConfig:
+        insecureSkipVerify: true
+      relabelings:
+        - sourceLabels: [__address__]
+          targetLabel: instance
+      metricRelabelings:
+        - sourceLabels: [__name__]
+          regex: coredns_dns_request_duration_seconds.*
+          action: keep
       additionalLabels:
         team: infra
       selector:
@@ -62,3 +74,27 @@ tests:
       - equal:
           path: spec.endpoints[0].interval
           value: 15s
+
+      - equal:
+          path: spec.endpoints[0].scrapeTimeout
+          value: 10s
+
+      - equal:
+          path: spec.endpoints[0].scheme
+          value: https
+
+      - equal:
+          path: spec.endpoints[0].honorLabels
+          value: true
+
+      - equal:
+          path: spec.endpoints[0].tlsConfig.insecureSkipVerify
+          value: true
+
+      - equal:
+          path: spec.endpoints[0].relabelings[0].targetLabel
+          value: instance
+
+      - equal:
+          path: spec.endpoints[0].metricRelabelings[0].action
+          value: keep

charts/coredns/values.yaml

@@ -50,6 +50,12 @@ prometheus:
     additionalLabels: {}
     namespace: ""
     interval: ""
+    scrapeTimeout: ""
+    scheme: ""
+    honorLabels: false
+    tlsConfig: {}
+    relabelings: []
+    metricRelabelings: []
     selector: {}
 
 service: