[prometheus-snmp-exporter] add selfMonitor

Signed-off-by: Taro Kitano <[email protected]>
prometheus-community · Oct 15, 2024 · 510e524 · 510e524
1 parent 0529c10
commit 510e524
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 2 deletions.
diff --git a/charts/prometheus-snmp-exporter/Chart.yaml b/charts/prometheus-snmp-exporter/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: Prometheus SNMP Exporter
 name: prometheus-snmp-exporter
-version: 5.5.1
+version: 5.6.0
 appVersion: v0.26.0
 home: https://github.com/prometheus/snmp_exporter
 sources:

diff --git a/charts/prometheus-snmp-exporter/templates/_helpers.tpl b/charts/prometheus-snmp-exporter/templates/_helpers.tpl
@@ -73,6 +73,6 @@ Namespace override
   {{- if .Values.namespaceOverride -}}
     {{- .Values.namespaceOverride -}}
   {{- else -}}
-    {{- .Release.namespace -}}
+    {{- .Release.Namespace -}}
   {{- end -}}
 {{- end -}}
diff --git a/charts/prometheus-snmp-exporter/templates/selfservicemonitor.yaml b/charts/prometheus-snmp-exporter/templates/selfservicemonitor.yaml
@@ -0,0 +1,42 @@
+{{- if .Values.serviceMonitor.selfMonitor.enabled }}
+---
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: {{ template "prometheus-snmp-exporter.fullname" $ }}
+  namespace: {{ template "prometheus-snmp-exporter.namespace" $ }}
+  labels:
+    {{- include "prometheus-snmp-exporter.labels" $ | nindent 4 }}
+    {{- if .Values.serviceMonitor.selfMonitor.labels  }}
+    {{- toYaml (.Values.serviceMonitor.selfMonitor.labels) | nindent 4 }}
+    {{- end }}
+spec:
+  endpoints:
+  - path: {{ .Values.serviceMonitor.selfMonitor.path }}
+    interval: {{ .Values.serviceMonitor.selfMonitor.interval }}
+    scrapeTimeout: {{ .Values.serviceMonitor.selfMonitor.scrapeTimeout }}
+    scheme: {{ .Values.serviceMonitor.selfMonitor.scheme }}
+    {{- with .Values.serviceMonitor.selfMonitor.port }}
+    port: {{ . }}
+    {{- end }}
+    {{- if .Values.serviceMonitor.selfMonitor.additionalMetricsRelabels }}
+    metricRelabelings:
+      {{- toYaml .Values.serviceMonitor.selfMonitor.additionalMetricsRelabels | nindent 6 }}
+    {{- end }}  
+    {{- if .Values.serviceMonitor.selfMonitor.tlsConfig }}
+    tlsConfig:
+      {{- toYaml .Values.serviceMonitor.selfMonitor.tlsConfig | nindent 6 }}
+    {{- end }}
+    {{- if .Values.serviceMonitor.selfMonitor.additionalRelabeling }}
+    relabelings:
+      {{- toYaml .Values.serviceMonitor.selfMonitor.additionalRelabeling | nindent 6 }}
+    {{- end }}
+  jobLabel: "{{ .Release.Name }}"
+  selector:
+    matchLabels:
+      {{- include "prometheus-snmp-exporter.selectorLabels" $ | nindent 6 }}
+  namespaceSelector:
+    matchNames:
+      - {{ template "prometheus-snmp-exporter.namespace" $ }}
+
+{{- end }}
diff --git a/charts/prometheus-snmp-exporter/values.yaml b/charts/prometheus-snmp-exporter/values.yaml
@@ -237,6 +237,19 @@ serviceMonitor:
     # Metrics relabelings. Overrides value set in serviceMonitor.additionalMetricsRelabelConfigs
     #   additionalMetricsRelabelConfigs: []
 
+  ## If true, a ServiceMonitor CRD is created for snmp-exporter itself
+  ##
+  selfMonitor:
+    enabled: false
+    additionalMetricsRelabels: {}
+    additionalRelabeling: []
+    labels: {}
+    path: /metrics
+    scheme: http
+    tlsConfig: {}
+    interval: 30s
+    scrapeTimeout: 30s
+
 # Extra manifests to deploy as an array
 extraManifests: []
   # - |