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

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

See merge request platform-one/big-bang/bigbang!1342

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" . }}

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" . }}