diff --git a/docs/sources/installation/helm/reference.md b/docs/sources/installation/helm/reference.md index 582cc3110d..98b6ee60f1 100644 --- a/docs/sources/installation/helm/reference.md +++ b/docs/sources/installation/helm/reference.md @@ -1968,6 +1968,7 @@ null
 {
   "annotations": {},
+  "enabled": true,
   "labels": {},
   "remoteWrite": null
 }
@@ -1981,6 +1982,15 @@ null
 			
 {}
 
+ + + + monitoring.serviceMonitor.metricsInstance.enabled + bool + If enabled, MetricsInstance resources for Grafana Agent Operator are created +
+true
+
diff --git a/production/helm/loki/templates/monitoring/metrics-instance.yaml b/production/helm/loki/templates/monitoring/metrics-instance.yaml index b7205dcb22..014b21a4c6 100644 --- a/production/helm/loki/templates/monitoring/metrics-instance.yaml +++ b/production/helm/loki/templates/monitoring/metrics-instance.yaml @@ -1,4 +1,4 @@ -{{- if .Values.monitoring.serviceMonitor.enabled }} +{{- if and .Values.monitoring.serviceMonitor.enabled .Values.monitoring.serviceMonitor.metricsInstance.enabled }} {{- with .Values.monitoring.serviceMonitor.metricsInstance }} apiVersion: monitoring.grafana.com/v1alpha1 kind: MetricsInstance diff --git a/production/helm/loki/values.yaml b/production/helm/loki/values.yaml index ecd64d046c..8e1522d85c 100644 --- a/production/helm/loki/values.yaml +++ b/production/helm/loki/values.yaml @@ -633,6 +633,8 @@ monitoring: tlsConfig: null # -- If defined, will create a MetricsInstance for the Grafana Agent Operator. metricsInstance: + # -- If enabled, MetricsInstance resources for Grafana Agent Operator are created + enabled: true # -- MerticsInstance annotations annotations: {} # -- Additional MatricsInstance labels