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

Update chart/templates/logging/loki/values.yaml See merge request platform-one/big-bang/bigbang!1342

Merge branch 'service-monitor-loki' into 'master'
14c66641 · Micah Nagel · 0a607cd7 · fc086950 · 14c66641 · 14c66641
Commit 14c66641 authored 3 years ago by Micah Nagel
--- a/chart/templates/logging/loki/values.yaml
+++ b/chart/templates/logging/loki/values.yaml
@@ -22,6 +22,9 @@ networkPolicies:
 monitoring:
  enabled: {{ .Values.monitoring.enabled }}   

+serviceMonitor:
+  enabled: {{ .Values.monitoring.enabled }}
+
 {{- if .Values.istio.enabled }}
 podAnnotations:
  {{ include "istioAnnotation" . }}

--- a/chart/templates/logging/promtail/values.yaml
+++ b/chart/templates/logging/promtail/values.yaml
@@ -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" . }}