fix(helm): ServiceMonitor namespace override (#563)

* fix issue with ServiceMonitor namespace * update values.yaml with serviceMonitor.namespace * bump version https://github.com/burningalchemist/sql_exporter/actions/runs/10002245265/job/27649175837#step:9:34 * run `make gen_docs`
burningalchemist · Jul 19, 2024 · 8ce8744 · 8ce8744
1 parent e716263
commit 8ce8744
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/helm/Chart.yaml b/helm/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: sql-exporter
 description: Database-agnostic SQL exporter for Prometheus
 type: application
-version: 0.6.0
+version: 0.6.1
 appVersion: 0.15.0
 keywords:
   - exporter

diff --git a/helm/README.md b/helm/README.md
@@ -1,6 +1,6 @@
 # sql-exporter
 
-![Version: 0.6.0](https://img.shields.io/badge/Version-0.6.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.15.0](https://img.shields.io/badge/AppVersion-0.15.0-informational?style=flat-square)
+![Version: 0.6.1](https://img.shields.io/badge/Version-0.6.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.15.0](https://img.shields.io/badge/AppVersion-0.15.0-informational?style=flat-square)
 
 Database-agnostic SQL exporter for Prometheus
 
@@ -56,6 +56,7 @@ helm install sql_exporter/sql-exporter
 | serviceMonitor.interval | string | `"15s"` | ServiceMonitor interval |
 | serviceMonitor.path | string | `"/metrics"` | ServiceMonitor path |
 | serviceMonitor.metricRelabelings | object | `{}` | ServiceMonitor metric relabelings |
+| serviceMonitor.namespace | string | `nil` | ServiceMonitor namespace override (default is .Release.Namespace) |
 | serviceMonitor.scrapeTimeout | string | `nil` | ServiceMonitor scrape timeout |
 
 ### Configuration

diff --git a/helm/templates/servicemonitor.yaml b/helm/templates/servicemonitor.yaml
@@ -34,5 +34,9 @@ spec:
       {{- end }}
   namespaceSelector:
     matchNames:
+    {{- if .Values.serviceMonitor.namespace }}
+    - {{ .Values.serviceMonitor.namespace }}
+    {{- else }}
     - {{ .Release.Namespace }}
+    {{- end }}
 {{- end }}
diff --git a/helm/values.yaml b/helm/values.yaml
@@ -79,6 +79,8 @@ serviceMonitor:
   # scrapeTimeout: 10s
   # -- ServiceMonitor metric relabelings
   metricRelabelings: {}
+  # -- ServiceMonitor namespace override (default is .Release.Namespace)
+  namespace: ~
 # Additional env variables
 # - kind should be either Secret or ConfigMap
 # - name is the name of the Secret or ConfigMap that should be used