diff --git a/chart/templates/gitlab/_postrenderers.tpl b/chart/templates/gitlab/_postrenderers.tpl new file mode 100644 index 0000000000000000000000000000000000000000..ed4b03e2aa41cac103042965577a5882497a9144 --- /dev/null +++ b/chart/templates/gitlab/_postrenderers.tpl @@ -0,0 +1,11 @@ +{{- define "gitlab.serviceMonitorPostRenderers" }} +- kustomize: + patches: + - patch: | + - op: add + path: /spec/fallbackScrapeProtocol + value: PrometheusText1.0.0 + target: + kind: ServiceMonitor + name: gitlab-gitlab-exporter +{{- end }} diff --git a/chart/templates/gitlab/helmrelease.yaml b/chart/templates/gitlab/helmrelease.yaml index 624ac57f17a31f6f5b68da50d322dc5925597aae..10fdbbd15042149ce0acef9c59ae1f2521b9f39f 100644 --- a/chart/templates/gitlab/helmrelease.yaml +++ b/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 diff --git a/chart/templates/monitoring/values.yaml b/chart/templates/monitoring/values.yaml index 0c557a211e4d0718ed308d682fcbdf2e4268734a..ef5113ae44eddbd85dbb481e37ca33b768ab4988 100644 --- a/chart/templates/monitoring/values.yaml +++ b/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 @@ -254,6 +256,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'] @@ -282,6 +285,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 @@ -335,6 +339,8 @@ prometheus: {{- if (dig "globalPodEndpointMetrics" "enabled" false .Values.monitoring) }} - job_name: 'kubernetes-pods' + fallback_scrape_protocol: PrometheusText1.0.0 + kubernetes_sd_configs: - role: pod