Merge branch 'bb/remove-fallback-2.44.x' into 'master'

remove fallbackScrapeProtocol fixes, reset monitoring

See merge request !5629

(cherry picked from commit 203ce916)

b5ddb416 remove fallbackScrapeProtocol fixes, reset monitoring
51ac5208 remove whitespace
e5f6b730 remove fallbackScrapeProtocol from prometheus values
18c8a9dd somehow flux settings got removed as well
7733bd4d another whitespace issue

Co-authored-by: Joe Foster <joefoster@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,14 +41,9 @@ spec:
 
 
   {{- toYaml $fluxSettingsGitlab | nindent 2 }}
-  {{- if or .Values.addons.gitlab.postRenderers .Values.monitoring.enabled }}
+  {{- if .Values.addons.gitlab.postRenderers }}
   postRenderers:
-  {{- if .Values.monitoring.enabled }}
-  {{ include "gitlab.serviceMonitorPostRenderers" . | nindent 4 }}
-  {{- end }}
-  {{- with .Values.addons.gitlab.postRenderers }}
-  {{ toYaml . | nindent 4 }}
-  {{- end }}
+  {{ toYaml .Values.addons.gitlab.postRenderers | nindent 4 }}
   {{- end }}
   valuesFrom:
     - name: {{ .Release.Name }}-gitlab-values

chart/templates/monitoring/values.yaml

@@ -109,7 +109,6 @@ 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
@@ -141,7 +140,6 @@ 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
@@ -254,7 +252,6 @@ prometheus:
     {{- if .Values.addons.vault.enabled }}
     additionalScrapeConfigs:
     - job_name: vault
-      fallback_scrape_protocol: PrometheusText1.0.0
       metrics_path: /v1/sys/metrics
       params:
         format: ['prometheus']
@@ -283,7 +280,6 @@ 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
@@ -337,7 +333,6 @@ prometheus:
     {{- if (dig "globalPodEndpointMetrics" "enabled" false .Values.monitoring) }}
     - job_name: 'kubernetes-pods'
 
-      fallback_scrape_protocol: PrometheusText1.0.0
 
       kubernetes_sd_configs:
         - role: pod

chart/values.yaml

@@ -878,11 +878,11 @@ monitoring:
   git:
     repo: https://repo1.dso.mil/big-bang/product/packages/monitoring.git
     path: "./chart"
-    tag: "67.9.0-bb.0"
+    tag: "62.4.0-bb.1"
   helmRepo:
     repoName: "registry1"
     chartName: "monitoring"
-    tag: "67.9.0-bb.0"
+    tag: "62.4.0-bb.1"
 
   # -- Flux reconciliation overrides specifically for the Monitoring Package
   flux: