Merge branch 'bb-2474/add-fallback-scrape-config' into 'master'

add fallback scrape protocols

Closes #2474

See merge request !5615

(cherry picked from commit cb0861c1)

fe86e48d add fallback scrape protocols
8bcb4c0f add additional config
38613c33 remove global config for fallback
696602a9 put it global for prometheus
981a9816 add fallback to protocol
ca4fcd1e tab corectly
042971b3 remove from registry
a229d7b0 move to root
984cdcee add post render for gitlab-gitlab-exporter serviceMonitor
d230ba30 swap if statement around
5be33a60 only run serviceMonitor post render if monitoring is enabled
8690aac3 spacing

Co-authored-by: Michael Martin <michaelmartin@seed-innovations.com>

chart/templates/gitlab/_postrenderers.tpl

+{{- define "gitlab.serviceMonitorPostRenderers" }}
+- kustomize:
+    patches:
+      - patch: |
+          - op: add
+            path: /spec/fallbackScrapeProtocol
+            value: PrometheusText1.0.0
+        target:
+          kind: ServiceMonitor
+          name: gitlab-gitlab-exporter
+{{- end }}

chart/templates/gitlab/helmrelease.yaml

@@ -41,10 +41,14 @@ spec:
 
 
   {{- toYaml $fluxSettingsGitlab | nindent 2 }}
-
-  {{- if .Values.addons.gitlab.postRenderers }}
+  {{- if or .Values.addons.gitlab.postRenderers .Values.monitoring.enabled }}
   postRenderers:
-  {{ toYaml .Values.addons.gitlab.postRenderers | nindent 4 }}
+  {{- if .Values.monitoring.enabled }}
+  {{ include "gitlab.serviceMonitorPostRenderers" . | nindent 4 }}
+  {{- end }}
+  {{- with .Values.addons.gitlab.postRenderers }}
+  {{ toYaml . | nindent 4 }}
+  {{- end }}
   {{- end }}
   valuesFrom:
     - name: {{ .Release.Name }}-gitlab-values

chart/templates/monitoring/values.yaml

@@ -109,6 +109,7 @@ alertmanager:
     {{- end }}
   {{- if and .Values.istio.enabled (eq (dig "istio" "mtls" "mode" "STRICT" .Values.monitoring.values) "STRICT") }}
   serviceMonitor:
+    fallbackScrapeProtocol: "PrometheusText1.0.0"
     scheme: https
     tlsConfig:
       caFile: /etc/prom-certs/root-cert.pem
@@ -140,6 +141,7 @@ prometheus:
     enabled: true
     {{- if and .Values.istio.enabled (eq (dig "istio" "mtls" "mode" "STRICT" .Values.monitoring.values) "STRICT") }}
     serviceMonitor:
+    fallbackScrapeProtocol: "PrometheusText1.0.0"
       scheme: https
       tlsConfig:
         caFile: /etc/prom-certs/root-cert.pem
@@ -252,6 +254,7 @@ prometheus:
     {{- if .Values.addons.vault.enabled }}
     additionalScrapeConfigs:
     - job_name: vault
+      fallback_scrape_protocol: PrometheusText1.0.0
       metrics_path: /v1/sys/metrics
       params:
         format: ['prometheus']
@@ -280,6 +283,7 @@ prometheus:
     # service then set this appropriately.
     {{- if (dig "globalServiceEndpointMetrics" "enabled" false .Values.monitoring) }}
     - job_name: 'kubernetes-service-endpoints'
+      fallback_scrape_protocol: PrometheusText1.0.0
       kubernetes_sd_configs:
         - role: endpoints
       scheme: https
@@ -333,6 +337,8 @@ prometheus:
     {{- if (dig "globalPodEndpointMetrics" "enabled" false .Values.monitoring) }}
     - job_name: 'kubernetes-pods'
 
+      fallback_scrape_protocol: PrometheusText1.0.0
+
       kubernetes_sd_configs:
         - role: pod