UNCLASSIFIED - NO CUI

Skip to content
Snippets Groups Projects
Commit e6e35d26 authored by Blair Bowden's avatar Blair Bowden :race_car: Committed by Michael Martin
Browse files

add fallback scrape protocols

parent fa978707
No related branches found
No related tags found
1 merge request!5615add fallback scrape protocols
{{- define "gitlab.serviceMonitorPostRenderers" }}
- kustomize:
patches:
- patch: |
- op: add
path: /spec/fallbackScrapeProtocol
value: PrometheusText1.0.0
target:
kind: ServiceMonitor
name: gitlab-gitlab-exporter
{{- end }}
......@@ -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
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment