[kube-prometheus-stack] Added fallbackScrapeProtocol option to additionalServiceMonitors and additionalPodMonitors (#5108)

Co-authored-by: zeritti <47476160+zeritti@users.noreply.github.com>
Co-authored-by: Duncan Schulze <13733349+duncaan@users.noreply.github.com>
Co-authored-by: Alexandre Joris <alexandre.joris@qonto.co>
Co-authored-by: Ilia Lazebnik <Ilia.lazebnik@gmail.com>

Author: 5 people

charts/kube-prometheus-stack/Chart.yaml

@@ -23,7 +23,7 @@ name: kube-prometheus-stack
 sources:
   - https://github.com/prometheus-community/helm-charts
   - https://github.com/prometheus-operator/kube-prometheus
-version: 67.6.0
+version: 67.7.0
 appVersion: v0.79.2
 kubeVersion: ">=1.19.0-0"
 home: https://github.com/prometheus-operator/kube-prometheus

charts/kube-prometheus-stack/templates/prometheus/podmonitors.yaml

@@ -34,5 +34,8 @@ items:
     {{- if .sampleLimit }}
       sampleLimit: {{ .sampleLimit }}
     {{- end }}
+    {{- if .fallbackScrapeProtocol }}
+      fallbackScrapeProtocol: {{ .fallbackScrapeProtocol }}
+    {{- end }}
 {{- end }}
 {{- end }}

charts/kube-prometheus-stack/templates/prometheus/servicemonitors.yaml

@@ -43,5 +43,8 @@ items:
       relabelings:
 {{ toYaml .relabelings | indent 8 }}
     {{- end }}
+    {{- if .fallbackScrapeProtocol }}
+      fallbackScrapeProtocol: {{ .fallbackScrapeProtocol }}
+    {{- end }}
 {{- end }}
 {{- end }}

charts/kube-prometheus-stack/values.yaml

@@ -4424,6 +4424,11 @@ prometheus:
     #   replacement: $1
     #   action: replace
 
+    ## Fallback scrape protocol used by Prometheus for scraping metrics
+    ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api.md#monitoring.coreos.com/v1.ScrapeProtocol
+    ##
+    # fallbackScrapeProtocol: ""
+
   additionalPodMonitors: []
   ## Name of the PodMonitor to create
   ##
@@ -4479,6 +4484,11 @@ prometheus:
     ##
     # podMetricsEndpoints: []
 
+    ## Fallback scrape protocol used by Prometheus for scraping metrics
+    ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api.md#monitoring.coreos.com/v1.ScrapeProtocol
+    ##
+    # fallbackScrapeProtocol: ""
+
 ## Configuration for thanosRuler
 ## ref: https://thanos.io/tip/components/rule.md/
 ##