diff --git a/charts/meta-monitoring/templates/grafana/mimir-dahboards-5.yaml b/charts/meta-monitoring/templates/grafana/mimir-dashboards-5.yaml similarity index 100% rename from charts/meta-monitoring/templates/grafana/mimir-dahboards-5.yaml rename to charts/meta-monitoring/templates/grafana/mimir-dashboards-5.yaml diff --git a/charts/meta-monitoring/templates/ruler/ruler.yaml b/charts/meta-monitoring/templates/ruler/ruler.yaml index 2f805e3..99fafb8 100644 --- a/charts/meta-monitoring/templates/ruler/ruler.yaml +++ b/charts/meta-monitoring/templates/ruler/ruler.yaml @@ -1,3 +1,4 @@ +{{- if .Values.local.metrics.enabled }} {{- if or (or .Values.dashboards.logs.enabled .Values.dashboards.metrics.enabled) .Values.dashboards.traces.enabled }} apiVersion: apps/v1 kind: Deployment @@ -91,8 +92,6 @@ spec: runAsUser: 10001 seccompProfile: type: RuntimeDefault - serviceAccount: meta-mimir - serviceAccountName: meta-mimir terminationGracePeriodSeconds: 180 topologySpreadConstraints: - labelSelector: @@ -124,3 +123,4 @@ spec: name: rules name: rules {{- end }} +{{- end }} diff --git a/charts/meta-monitoring/templates/ruler/rules-configmap.yaml b/charts/meta-monitoring/templates/ruler/rules-configmap.yaml index c3396ef..c2cb34a 100644 --- a/charts/meta-monitoring/templates/ruler/rules-configmap.yaml +++ b/charts/meta-monitoring/templates/ruler/rules-configmap.yaml @@ -1,3 +1,4 @@ +{{- if .Values.local.metrics.enabled }} {{- if or (or .Values.dashboards.logs.enabled .Values.dashboards.metrics.enabled) .Values.dashboards.traces.enabled }} --- apiVersion: v1 @@ -16,3 +17,4 @@ data: {{ ($.Files.Glob "src/rules/tempo-rules.yaml").AsConfig | indent 2 }} {{- end }} {{- end }} +{{- end }}