UNCLASSIFIED - NO CUI

Skip to content
Snippets Groups Projects
Commit 14c66641 authored by Micah Nagel's avatar Micah Nagel
Browse files

Merge branch 'service-monitor-loki' into 'master'

Update chart/templates/logging/loki/values.yaml

See merge request platform-one/big-bang/bigbang!1342
parents 0a607cd7 fc086950
No related branches found
No related tags found
3 merge requests!1658Draft: Merge branch 'tempo_tracing_updates' into 'master',!1386Master,!1342Update chart/templates/logging/loki/values.yaml
Pipeline #687076 passed with warnings
......@@ -22,6 +22,9 @@ networkPolicies:
monitoring:
enabled: {{ .Values.monitoring.enabled }}
serviceMonitor:
enabled: {{ .Values.monitoring.enabled }}
{{- if .Values.istio.enabled }}
podAnnotations:
{{ include "istioAnnotation" . }}
......
......@@ -17,6 +17,12 @@ openshift: {{ .Values.openshift }}
istio:
enabled: {{ .Values.istio.enabled }}
serviceMonitor:
enabled: {{ .Values.monitoring.enabled }}
monitoring:
enabled: {{ .Values.monitoring.enabled }}
{{- if .Values.istio.enabled }}
podAnnotations:
{{ include "istioAnnotation" . }}
......
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