Merge branch 'main' into main

prometheus-community · Oct 3, 2023 · c47c11f · c47c11f
2 parents 369c37e + 57c9e02
commit c47c11f
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 2 deletions.
diff --git a/charts/prometheus-adapter/Chart.yaml b/charts/prometheus-adapter/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: prometheus-adapter
-version: 4.6.0
+version: 4.7.0
 appVersion: v0.11.1
 description: A Helm chart for k8s prometheus adapter
 home: https://github.com/kubernetes-sigs/prometheus-adapter

diff --git a/charts/prometheus-adapter/templates/deployment.yaml b/charts/prometheus-adapter/templates/deployment.yaml
@@ -82,6 +82,10 @@ spec:
         readinessProbe:
           {{- toYaml . | nindent 10 }}
         {{- end }}
+        {{- with .Values.startupProbe }}
+        startupProbe:
+          {{- toYaml . | nindent 10 }}
+        {{- end }}
         {{- if .Values.resources }}
         resources:
           {{- toYaml .Values.resources | nindent 10 }}

diff --git a/charts/prometheus-adapter/values.yaml b/charts/prometheus-adapter/values.yaml
@@ -113,6 +113,10 @@ readinessProbe:
   initialDelaySeconds: 30
   timeoutSeconds: 5
 
+# Configure startup probe
+# Use if prometheus-adapter takes a long time to finish startup e.g. polling a lot of API versions in cluster
+startupProbe: {}
+
 rules:
   default: true
 

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: 1.8.0
+version: 1.8.1
 appVersion: v0.21.0
 home: https://github.com/prometheus/snmp_exporter
 sources:

diff --git a/charts/prometheus-snmp-exporter/templates/servicemonitor.yaml b/charts/prometheus-snmp-exporter/templates/servicemonitor.yaml
@@ -30,12 +30,15 @@ spec:
       - sourceLabels: [instance]
         targetLabel: instance
         replacement: {{ .target }}
+        action: replace
       - sourceLabels: [target]
         targetLabel: target
         replacement: {{ .name }}
+        action: replace
         {{- range $targetLabel, $replacement := .additionalMetricsRelabels | default $.Values.serviceMonitor.additionalMetricsRelabels }}
       - targetLabel: {{ $targetLabel }}
         replacement: {{ $replacement }}
+        action: replace
         {{- end }}
     {{- if (or .relabelings $.Values.serviceMonitor.relabelings) }}
     relabelings: