diff --git a/charts/base-cluster/templates/monitoring/logs/loki.yaml b/charts/base-cluster/templates/monitoring/logs/loki.yaml index d104f26932..475ea824c3 100644 --- a/charts/base-cluster/templates/monitoring/logs/loki.yaml +++ b/charts/base-cluster/templates/monitoring/logs/loki.yaml @@ -9,7 +9,7 @@ metadata: app.kubernetes.io/part-of: monitoring spec: chart: - spec: {{- include "base-cluster.helm.chartSpec" (dict "repo" "grafana" "chart" "loki" "context" $) | nindent 6 }} + spec: {{- include "base-cluster.helm.chartSpec" (dict "repo" "grafana-community" "chart" "loki" "context" $) | nindent 6 }} interval: 1h driftDetection: mode: enabled @@ -23,9 +23,9 @@ spec: values: {{- if .Values.global.imageRegistry }} global: - registry: {{ $.Values.global.imageRegistry }} + imageRegistry: {{ $.Values.global.imageRegistry }} {{- end }} - deploymentMode: SingleBinary + deploymentMode: Monolithic lokiCanary: enabled: false test: diff --git a/charts/base-cluster/values.yaml b/charts/base-cluster/values.yaml index be0ab3112b..80b46159e9 100644 --- a/charts/base-cluster/values.yaml +++ b/charts/base-cluster/values.yaml @@ -123,14 +123,14 @@ global: grafana: url: https://grafana.github.io/helm-charts charts: - loki: 6.55.0 alloy: 1.8.0 condition: "{{ .Values.monitoring.prometheus.enabled }}" grafana-community: url: https://grafana-community.github.io/helm-charts charts: + loki: 13.2.3 tempo: 2.1.0 - condition: "{{ and .Values.monitoring.prometheus.enabled .Values.monitoring.tracing.enabled }}" + condition: "{{ and .Values.monitoring.prometheus.enabled (or .Values.monitoring.tracing.enabled .Values.monitoring.loki.enabled) }}" external-dns: url: https://kubernetes-sigs.github.io/external-dns charts: