Merge branch 'PR-108' into 'master'

PR-108

See merge request !5877

chart/templates/grafana/values.yaml

@@ -305,7 +305,6 @@ extraSecretMounts:
 {{- if .Values.monitoring.enabled }}
 serviceMonitor:
   enabled: true
-{{- end }}
 {{- if $istioInjection }}
   scheme: https
   tlsConfig:
@@ -315,6 +314,7 @@ serviceMonitor:
     insecureSkipVerify: true  # Prometheus does not support Istio security naming, thus skip verifying target pod certificate
 {{- end }}
 {{- end }}
+{{- end }}
 
 {{- /* This function merges defaults in lists from above into overlays */ -}}
 {{- /* The end user will not have to replicate `prometheus.prometheusSpec.additionalScrapeConfigs` or `grafana.extraSecretMounts` from above when providing an overlay */ -}}