Merge branch 'main' into opencost

prometheus-community · Oct 17, 2023 · 7b72416 · 7b72416
2 parents 89658bf + 30dada6
commit 7b72416
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 19 deletions.
diff --git a/charts/kube-prometheus-stack/Chart.yaml b/charts/kube-prometheus-stack/Chart.yaml
@@ -21,7 +21,7 @@ name: kube-prometheus-stack
 sources:
   - https://github.com/prometheus-community/helm-charts
   - https://github.com/prometheus-operator/kube-prometheus
-version: 51.9.0
+version: 51.9.1
 appVersion: v0.68.0
 kubeVersion: ">=1.19.0-0"
 home: https://github.com/prometheus-operator/kube-prometheus

diff --git a/charts/kube-prometheus-stack/templates/alertmanager/servicemonitor.yaml b/charts/kube-prometheus-stack/templates/alertmanager/servicemonitor.yaml
@@ -52,15 +52,7 @@ spec:
     {{- if .Values.alertmanager.serviceMonitor.proxyUrl }}
     proxyUrl: {{ .Values.alertmanager.serviceMonitor.proxyUrl}}
     {{- end }}
-    {{- if .Values.alertmanager.serviceMonitor.scheme }}
-    scheme: {{ .Values.alertmanager.serviceMonitor.scheme }}
-    {{- end }}
-    {{- if .Values.alertmanager.serviceMonitor.bearerTokenFile }}
-    bearerTokenFile: {{ .Values.alertmanager.serviceMonitor.bearerTokenFile }}
-    {{- end }}
-    {{- if .Values.alertmanager.serviceMonitor.tlsConfig }}
-    tlsConfig: {{- toYaml .Values.alertmanager.serviceMonitor.tlsConfig | nindent 6 }}
-    {{- end }}
+    scheme: http
     path: "/metrics"
     {{- if .Values.alertmanager.serviceMonitor.metricRelabelings }}
     metricRelabelings: {{- tpl (toYaml .Values.alertmanager.serviceMonitor.metricRelabelings | nindent 6) . }}

diff --git a/charts/kube-prometheus-stack/templates/prometheus/servicemonitor.yaml b/charts/kube-prometheus-stack/templates/prometheus/servicemonitor.yaml
@@ -45,15 +45,7 @@ spec:
     {{- if .Values.prometheus.serviceMonitor.interval }}
     interval: {{ .Values.prometheus.serviceMonitor.interval }}
     {{- end }}
-    {{- if .Values.prometheus.serviceMonitor.scheme }}
-    scheme: {{ .Values.prometheus.serviceMonitor.scheme }}
-    {{- end }}
-    {{- if .Values.prometheus.serviceMonitor.tlsConfig }}
-    tlsConfig: {{- toYaml .Values.prometheus.serviceMonitor.tlsConfig | nindent 6 }}
-    {{- end }}
-    {{- if .Values.prometheus.serviceMonitor.bearerTokenFile }}
-    bearerTokenFile: {{ .Values.prometheus.serviceMonitor.bearerTokenFile }}
-    {{- end }}
+    scheme: http
     path: "/metrics"
     {{- if .Values.prometheus.serviceMonitor.metricRelabelings }}
     metricRelabelings: {{- tpl (toYaml .Values.prometheus.serviceMonitor.metricRelabelings | nindent 6) . }}