From 23118517e2c6a561416eb381de4aa9fc15037cc2 Mon Sep 17 00:00:00 2001
From: Weifeng Wang <qclaogui@gmail.com>
Date: Wed, 24 Jul 2024 18:54:29 +0800
Subject: [PATCH] regenerates k8s manifests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Weifeng Wang <qclaogui@gmail.com>

Update LGTMP stack dependency Helm charts

Signed-off-by: 🤖QC Owl App[bot] <165384878+qc-owl-app[bot]@users.noreply.github.com>

regenerates k8s manifests

Signed-off-by: Weifeng Wang <qclaogui@gmail.com>

update Pyroscope API

Signed-off-by: Weifeng Wang <qclaogui@gmail.com>
---
 .../common/compose-include/minio.yaml         |  2 +-
 docker-compose/common/config/.env             |  2 +-
 .../config/pyroscope/gateway_pyroscope.conf   | 13 ++++
 .../manifests/k8s-all-in-one.yaml             | 38 +++++------
 .../minio-tenant/configs/add-sm-minio.yaml    | 12 ++++
 .../manifests/k8s-all-in-one.yaml             | 14 +++-
 .../logs/k8s-all-in-one.yaml                  | 50 +++++++-------
 .../logs/loki/kustomization.yaml              |  2 +-
 .../microservices-mode/logs/loki/values.yaml  | 10 +--
 .../traces/k8s-all-in-one.yaml                | 66 +++++++++----------
 .../traces/tempo-distributed/values.yaml      |  3 +-
 .../read-write-mode/logs/k8s-all-in-one.yaml  | 28 ++++----
 .../logs/loki/kustomization.yaml              |  2 +-
 .../read-write-mode/logs/loki/values.yaml     | 10 +--
 14 files changed, 144 insertions(+), 108 deletions(-)

diff --git a/docker-compose/common/compose-include/minio.yaml b/docker-compose/common/compose-include/minio.yaml
index 823af962..1c6ef519 100644
--- a/docker-compose/common/compose-include/minio.yaml
+++ b/docker-compose/common/compose-include/minio.yaml
@@ -10,7 +10,7 @@ services:
       metrics.grafana.com/port: 9000
       metrics.grafana.com/interval: 15s
       metrics.grafana.com/timeout: 10s
-    image: ${MINIO_IMAGE:-docker.io/minio/minio:RELEASE.2024-06-22T05-26-45Z}
+    image: ${MINIO_IMAGE:-docker.io/minio/minio:RELEASE.2024-07-16T23-46-41Z}
     entrypoint:
       - sh
       - -euc
diff --git a/docker-compose/common/config/.env b/docker-compose/common/config/.env
index babd3c54..219990b9 100644
--- a/docker-compose/common/config/.env
+++ b/docker-compose/common/config/.env
@@ -6,7 +6,7 @@ MIMIR_IMAGE=grafana/mimir-alpine:2.13.0
 MIMIRTOOL_IMAGE=grafana/mimirtool:2.13.0
 PYROSCOPE_IMAGE=grafana/pyroscope:1.6.1
 NGINX_IMAGE=nginxinc/nginx-unprivileged:1.25-alpine
-MINIO_IMAGE=minio/minio:RELEASE.2024-06-22T05-26-45Z
+MINIO_IMAGE=minio/minio:RELEASE.2024-07-16T23-46-41Z
 MEMCACHED_IMAGE=memcached:1.6.27-alpine
 MEMCACHED_EXPORTER_IMAGE=prom/memcached-exporter:v0.14.3
 INBUCKET_IMAGE=inbucket/inbucket:3.0.4
\ No newline at end of file
diff --git a/docker-compose/common/config/pyroscope/gateway_pyroscope.conf b/docker-compose/common/config/pyroscope/gateway_pyroscope.conf
index 150c5db2..76ee34fe 100644
--- a/docker-compose/common/config/pyroscope/gateway_pyroscope.conf
+++ b/docker-compose/common/config/pyroscope/gateway_pyroscope.conf
@@ -16,4 +16,17 @@ server {
     location /querier.v1.QuerierService {
       proxy_pass      http://${PYROSCOPE_QUERY_FRONTEND_HOST}:4040$request_uri;
     }
+
+    location /settings.v1.SettingsService/Get {
+      proxy_pass      http://${PYROSCOPE_QUERY_FRONTEND_HOST}:4040$request_uri;
+    }
+    location /settings.v1.SettingsService/Set {
+      proxy_pass      http://${PYROSCOPE_QUERY_FRONTEND_HOST}:4040$request_uri;
+    }
+    location /pyroscope/render {
+      proxy_pass      http://${PYROSCOPE_QUERY_FRONTEND_HOST}:4040$request_uri;
+    }
+    location /pyroscope/render-diff {
+      proxy_pass      http://${PYROSCOPE_QUERY_FRONTEND_HOST}:4040$request_uri;
+    }
 }
\ No newline at end of file
diff --git a/kubernetes/common/minio-operator/manifests/k8s-all-in-one.yaml b/kubernetes/common/minio-operator/manifests/k8s-all-in-one.yaml
index 06698827..11f64d7f 100644
--- a/kubernetes/common/minio-operator/manifests/k8s-all-in-one.yaml
+++ b/kubernetes/common/minio-operator/manifests/k8s-all-in-one.yaml
@@ -8,7 +8,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.15.0
-    operator.min.io/version: v6.0.0
+    operator.min.io/version: v6.0.1
   name: miniojobs.job.min.io
 spec:
   group: job.min.io
@@ -1084,7 +1084,7 @@ spec:
                   x-kubernetes-map-type: atomic
                 type: array
               mcImage:
-                default: quay.io/minio/mc:RELEASE.2024-07-11T18-01-28Z
+                default: quay.io/minio/mc:RELEASE.2024-07-16T23-46-41Z
                 type: string
               securityContext:
                 properties:
@@ -1209,7 +1209,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.15.0
-    operator.min.io/version: v6.0.0
+    operator.min.io/version: v6.0.1
   name: policybindings.sts.min.io
 spec:
   group: sts.min.io
@@ -1342,7 +1342,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.15.0
-    operator.min.io/version: v6.0.0
+    operator.min.io/version: v6.0.1
   name: tenants.minio.min.io
 spec:
   group: minio.min.io
@@ -7012,8 +7012,8 @@ kind: ServiceAccount
 metadata:
   labels:
     app.kubernetes.io/managed-by: Helm
-    app.kubernetes.io/version: v6.0.0
-    helm.sh/chart: operator-6.0.0
+    app.kubernetes.io/version: v6.0.1
+    helm.sh/chart: operator-6.0.1
   name: minio-operator
   namespace: minio-system
 ---
@@ -7022,8 +7022,8 @@ kind: ClusterRole
 metadata:
   labels:
     app.kubernetes.io/managed-by: Helm
-    app.kubernetes.io/version: v6.0.0
-    helm.sh/chart: operator-6.0.0
+    app.kubernetes.io/version: v6.0.1
+    helm.sh/chart: operator-6.0.1
   name: minio-operator-role
 rules:
 - apiGroups:
@@ -7206,8 +7206,8 @@ kind: ClusterRoleBinding
 metadata:
   labels:
     app.kubernetes.io/managed-by: Helm
-    app.kubernetes.io/version: v6.0.0
-    helm.sh/chart: operator-6.0.0
+    app.kubernetes.io/version: v6.0.1
+    helm.sh/chart: operator-6.0.1
   name: minio-operator-binding
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -7223,8 +7223,8 @@ kind: Service
 metadata:
   labels:
     app.kubernetes.io/managed-by: Helm
-    app.kubernetes.io/version: v6.0.0
-    helm.sh/chart: operator-6.0.0
+    app.kubernetes.io/version: v6.0.1
+    helm.sh/chart: operator-6.0.1
   name: operator
   namespace: minio-system
 spec:
@@ -7242,8 +7242,8 @@ kind: Service
 metadata:
   labels:
     app.kubernetes.io/managed-by: Helm
-    app.kubernetes.io/version: v6.0.0
-    helm.sh/chart: operator-6.0.0
+    app.kubernetes.io/version: v6.0.1
+    helm.sh/chart: operator-6.0.1
   name: sts
   namespace: minio-system
 spec:
@@ -7260,8 +7260,8 @@ kind: Deployment
 metadata:
   labels:
     app.kubernetes.io/managed-by: Helm
-    app.kubernetes.io/version: v6.0.0
-    helm.sh/chart: operator-6.0.0
+    app.kubernetes.io/version: v6.0.1
+    helm.sh/chart: operator-6.0.1
   name: minio-operator
   namespace: minio-system
 spec:
@@ -7276,8 +7276,8 @@ spec:
         app.kubernetes.io/instance: operator
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: operator
-        app.kubernetes.io/version: v6.0.0
-        helm.sh/chart: operator-6.0.0
+        app.kubernetes.io/version: v6.0.1
+        helm.sh/chart: operator-6.0.1
     spec:
       affinity:
         podAntiAffinity:
@@ -7297,7 +7297,7 @@ spec:
           value: "on"
         - name: OPERATOR_STS_AUTO_TLS_ENABLED
           value: "off"
-        image: quay.io/minio/operator:v6.0.0
+        image: quay.io/minio/operator:v6.0.1
         imagePullPolicy: IfNotPresent
         name: operator
         resources:
diff --git a/kubernetes/common/minio-tenant/configs/add-sm-minio.yaml b/kubernetes/common/minio-tenant/configs/add-sm-minio.yaml
index 1fafaa05..bbedaf03 100644
--- a/kubernetes/common/minio-tenant/configs/add-sm-minio.yaml
+++ b/kubernetes/common/minio-tenant/configs/add-sm-minio.yaml
@@ -19,6 +19,10 @@ spec:
       - pod
       regex: ".*-0$"
       action: keep
+    - sourceLabels:
+      - service
+      regex: "minio"
+      action: keep
     scheme: https
     tlsConfig:
       insecureSkipVerify: true
@@ -29,6 +33,10 @@ spec:
       sourceLabels:
       - job
       targetLabel: job
+    - sourceLabels:
+      - service
+      regex: "minio"
+      action: keep
     scheme: https
     tlsConfig:
       insecureSkipVerify: true
@@ -39,6 +47,10 @@ spec:
       sourceLabels:
       - job
       targetLabel: job
+    - sourceLabels:
+      - service
+      regex: "minio"
+      action: keep
     scheme: https
     tlsConfig:
       insecureSkipVerify: true
diff --git a/kubernetes/common/minio-tenant/manifests/k8s-all-in-one.yaml b/kubernetes/common/minio-tenant/manifests/k8s-all-in-one.yaml
index 9a5c59f3..a5c008b6 100644
--- a/kubernetes/common/minio-tenant/manifests/k8s-all-in-one.yaml
+++ b/kubernetes/common/minio-tenant/manifests/k8s-all-in-one.yaml
@@ -71,7 +71,7 @@ spec:
   features:
     bucketDNS: false
     enableSFTP: false
-  image: quay.io/minio/minio:RELEASE.2024-07-13T01-46-15Z
+  image: quay.io/minio/minio:RELEASE.2024-07-16T23-46-41Z
   imagePullPolicy: IfNotPresent
   mountPath: /export
   podManagementPolicy: Parallel
@@ -112,6 +112,10 @@ spec:
       regex: .*-0$
       sourceLabels:
       - pod
+    - action: keep
+      regex: minio
+      sourceLabels:
+      - service
     scheme: https
     tlsConfig:
       insecureSkipVerify: true
@@ -122,6 +126,10 @@ spec:
       sourceLabels:
       - job
       targetLabel: job
+    - action: keep
+      regex: minio
+      sourceLabels:
+      - service
     scheme: https
     tlsConfig:
       insecureSkipVerify: true
@@ -132,6 +140,10 @@ spec:
       sourceLabels:
       - job
       targetLabel: job
+    - action: keep
+      regex: minio
+      sourceLabels:
+      - service
     scheme: https
     tlsConfig:
       insecureSkipVerify: true
diff --git a/kubernetes/microservices-mode/logs/k8s-all-in-one.yaml b/kubernetes/microservices-mode/logs/k8s-all-in-one.yaml
index b5fc2962..8110e46b 100644
--- a/kubernetes/microservices-mode/logs/k8s-all-in-one.yaml
+++ b/kubernetes/microservices-mode/logs/k8s-all-in-one.yaml
@@ -12,7 +12,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: loki
     app.kubernetes.io/version: 3.1.0
-    helm.sh/chart: loki-6.7.1
+    helm.sh/chart: loki-6.7.3
   name: loki
   namespace: logging-system
 ---
@@ -332,7 +332,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: loki
     app.kubernetes.io/version: 3.1.0
-    helm.sh/chart: loki-6.7.1
+    helm.sh/chart: loki-6.7.3
   name: loki-runtime
   namespace: logging-system
 ---
@@ -4812,7 +4812,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: loki
     app.kubernetes.io/version: 3.1.0
-    helm.sh/chart: loki-6.7.1
+    helm.sh/chart: loki-6.7.3
   name: loki-distributed-compactor
   namespace: logging-system
 spec:
@@ -4840,7 +4840,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: loki
     app.kubernetes.io/version: 3.1.0
-    helm.sh/chart: loki-6.7.1
+    helm.sh/chart: loki-6.7.3
   name: loki-distributed-distributor
   namespace: logging-system
 spec:
@@ -4896,7 +4896,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: loki
     app.kubernetes.io/version: 3.1.0
-    helm.sh/chart: loki-6.7.1
+    helm.sh/chart: loki-6.7.3
   name: loki-distributed-index-gateway
   namespace: logging-system
 spec:
@@ -4951,7 +4951,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: loki
     app.kubernetes.io/version: 3.1.0
-    helm.sh/chart: loki-6.7.1
+    helm.sh/chart: loki-6.7.3
   name: loki-distributed-ingester
   namespace: logging-system
 spec:
@@ -5006,7 +5006,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: loki
     app.kubernetes.io/version: 3.1.0
-    helm.sh/chart: loki-6.7.1
+    helm.sh/chart: loki-6.7.3
   name: loki-distributed-querier
   namespace: logging-system
 spec:
@@ -5034,7 +5034,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: loki
     app.kubernetes.io/version: 3.1.0
-    helm.sh/chart: loki-6.7.1
+    helm.sh/chart: loki-6.7.3
   name: loki-distributed-query-frontend
   namespace: logging-system
 spec:
@@ -5067,7 +5067,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: loki
     app.kubernetes.io/version: 3.1.0
-    helm.sh/chart: loki-6.7.1
+    helm.sh/chart: loki-6.7.3
     prometheus.io/service-monitor: "false"
   name: loki-distributed-query-frontend-headless
   namespace: logging-system
@@ -5102,7 +5102,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: loki
     app.kubernetes.io/version: 3.1.0
-    helm.sh/chart: loki-6.7.1
+    helm.sh/chart: loki-6.7.3
   name: loki-distributed-query-scheduler
   namespace: logging-system
 spec:
@@ -5157,7 +5157,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: loki
     app.kubernetes.io/version: 3.1.0
-    helm.sh/chart: loki-6.7.1
+    helm.sh/chart: loki-6.7.3
   name: loki-memberlist
   namespace: logging-system
 spec:
@@ -5314,7 +5314,7 @@ metadata:
     app.kubernetes.io/name: loki
     app.kubernetes.io/part-of: memberlist
     app.kubernetes.io/version: 3.1.0
-    helm.sh/chart: loki-6.7.1
+    helm.sh/chart: loki-6.7.3
   name: loki-distributed-distributor
   namespace: logging-system
 spec:
@@ -5414,7 +5414,7 @@ metadata:
     app.kubernetes.io/name: loki
     app.kubernetes.io/part-of: memberlist
     app.kubernetes.io/version: 3.1.0
-    helm.sh/chart: loki-6.7.1
+    helm.sh/chart: loki-6.7.3
   name: loki-distributed-querier
   namespace: logging-system
 spec:
@@ -5524,7 +5524,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: loki
     app.kubernetes.io/version: 3.1.0
-    helm.sh/chart: loki-6.7.1
+    helm.sh/chart: loki-6.7.3
   name: loki-distributed-query-frontend
   namespace: logging-system
 spec:
@@ -5622,7 +5622,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: loki
     app.kubernetes.io/version: 3.1.0
-    helm.sh/chart: loki-6.7.1
+    helm.sh/chart: loki-6.7.3
   name: loki-distributed-query-scheduler
   namespace: logging-system
 spec:
@@ -5805,7 +5805,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: loki
     app.kubernetes.io/version: 3.1.0
-    helm.sh/chart: loki-6.7.1
+    helm.sh/chart: loki-6.7.3
   name: loki-distributed-bloom-compactor
   namespace: logging-system
 spec:
@@ -5913,7 +5913,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: loki
     app.kubernetes.io/version: 3.1.0
-    helm.sh/chart: loki-6.7.1
+    helm.sh/chart: loki-6.7.3
   name: loki-distributed-bloom-gateway
   namespace: logging-system
 spec:
@@ -6022,7 +6022,7 @@ metadata:
     app.kubernetes.io/name: loki
     app.kubernetes.io/part-of: memberlist
     app.kubernetes.io/version: 3.1.0
-    helm.sh/chart: loki-6.7.1
+    helm.sh/chart: loki-6.7.3
   name: loki-distributed-compactor
   namespace: logging-system
 spec:
@@ -6128,7 +6128,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: loki
     app.kubernetes.io/version: 3.1.0
-    helm.sh/chart: loki-6.7.1
+    helm.sh/chart: loki-6.7.3
   name: loki-distributed-index-gateway
   namespace: logging-system
 spec:
@@ -6232,7 +6232,7 @@ metadata:
     app.kubernetes.io/name: loki
     app.kubernetes.io/part-of: memberlist
     app.kubernetes.io/version: 3.1.0
-    helm.sh/chart: loki-6.7.1
+    helm.sh/chart: loki-6.7.3
   name: loki-distributed-ingester
   namespace: logging-system
 spec:
@@ -6341,7 +6341,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: loki
     app.kubernetes.io/version: 3.1.0
-    helm.sh/chart: loki-6.7.1
+    helm.sh/chart: loki-6.7.3
   name: loki-distributed-pattern-ingester
   namespace: logging-system
 spec:
@@ -6448,7 +6448,7 @@ metadata:
     app.kubernetes.io/name: loki
     app.kubernetes.io/part-of: memberlist
     app.kubernetes.io/version: 3.1.0
-    helm.sh/chart: loki-6.7.1
+    helm.sh/chart: loki-6.7.3
   name: loki-distributed-ruler
   namespace: logging-system
 spec:
@@ -6677,7 +6677,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: loki
     app.kubernetes.io/version: 3.1.0
-    helm.sh/chart: loki-6.7.1
+    helm.sh/chart: loki-6.7.3
   name: loki-distributed-distributor
   namespace: logging-system
 spec:
@@ -6697,7 +6697,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: loki
     app.kubernetes.io/version: 3.1.0
-    helm.sh/chart: loki-6.7.1
+    helm.sh/chart: loki-6.7.3
   name: loki-distributed-ingester
   namespace: logging-system
 spec:
@@ -6722,7 +6722,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: loki
     app.kubernetes.io/version: 3.1.0
-    helm.sh/chart: loki-6.7.1
+    helm.sh/chart: loki-6.7.3
   name: loki-distributed-querier
   namespace: logging-system
 spec:
diff --git a/kubernetes/microservices-mode/logs/loki/kustomization.yaml b/kubernetes/microservices-mode/logs/loki/kustomization.yaml
index 6fc8d893..f9be6f54 100644
--- a/kubernetes/microservices-mode/logs/loki/kustomization.yaml
+++ b/kubernetes/microservices-mode/logs/loki/kustomization.yaml
@@ -3,7 +3,7 @@ kind: Kustomization
 namespace: logging-system
 helmCharts:
 - name: loki
-  version: 6.7.2
+  version: 6.7.3
   repo: https://grafana.github.io/helm-charts
   releaseName: loki-distributed
   namespace: logging-system
diff --git a/kubernetes/microservices-mode/logs/loki/values.yaml b/kubernetes/microservices-mode/logs/loki/values.yaml
index 9de6584c..4f27bd13 100644
--- a/kubernetes/microservices-mode/logs/loki/values.yaml
+++ b/kubernetes/microservices-mode/logs/loki/values.yaml
@@ -3222,7 +3222,7 @@ monitoring:
     # -- Labels for the dashboards ConfigMap
     labels:
       grafana_dashboard: "1"
-  # Recording rules for monitoring Loki, required for some dashboards
+  # -- DEPRECATED Recording rules for monitoring Loki, required for some dashboards
   rules:
     # -- If enabled, create PrometheusRule resource with Loki recording rules
     enabled: false
@@ -3252,7 +3252,7 @@ monitoring:
     #       expr: sum(rate(loki_request_duration_seconds_bucket[1m])) by (le, job, route)
     #     - record: node_namespace_pod_container:container_cpu_usage_seconds_total:sum_rate
     #       expr: sum(rate(container_cpu_usage_seconds_total[1m])) by (node, namespace, pod, container)
-  # ServiceMonitor configuration
+  #  -- DEPRECATED ServiceMonitor configuration
   serviceMonitor:
     # -- If enabled, ServiceMonitor resources for Prometheus Operator are created
     enabled: false
@@ -3288,7 +3288,7 @@ monitoring:
       labels: {}
       # -- If defined a MetricsInstance will be created to remote write metrics.
       remoteWrite: null
-  # Self monitoring determines whether Loki should scrape its own logs.
+  # -- DEPRECATED Self monitoring determines whether Loki should scrape its own logs.
   # This feature currently relies on the Grafana Agent Operator being installed,
   # which is installed by default using the grafana-agent-operator sub-chart.
   # It will create custom resources for GrafanaAgent, LogsInstance, and PodLogs to configure
@@ -3304,9 +3304,9 @@ monitoring:
       # -- Namespace to create additional tenant token secret in. Useful if your Grafana instance
       # is in a separate namespace. Token will still be created in the canary namespace.
       secretNamespace: "{{ .Release.Namespace }}"
-    # Grafana Agent configuration
+    # -- DEPRECATED Grafana Agent configuration
     grafanaAgent:
-      # -- Controls whether to install the Grafana Agent Operator and its CRDs.
+      # -- DEPRECATED Controls whether to install the Grafana Agent Operator and its CRDs.
       # Note that helm will not install CRDs if this flag is enabled during an upgrade.
       # In that case install the CRDs manually from https://github.com/grafana/agent/tree/main/production/operator/crds
       installOperator: false
diff --git a/kubernetes/microservices-mode/traces/k8s-all-in-one.yaml b/kubernetes/microservices-mode/traces/k8s-all-in-one.yaml
index 00dfde2b..4f79fd99 100644
--- a/kubernetes/microservices-mode/traces/k8s-all-in-one.yaml
+++ b/kubernetes/microservices-mode/traces/k8s-all-in-one.yaml
@@ -62,7 +62,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: tempo
     app.kubernetes.io/version: 2.5.0
-    helm.sh/chart: tempo-distributed-1.15.1
+    helm.sh/chart: tempo-distributed-1.15.2
   name: tempo-distributed
   namespace: tracing-system
 ---
@@ -5073,7 +5073,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: tempo
     app.kubernetes.io/version: 2.5.0
-    helm.sh/chart: tempo-distributed-1.15.1
+    helm.sh/chart: tempo-distributed-1.15.2
   name: tempo-distributed-config
   namespace: tracing-system
 ---
@@ -5089,7 +5089,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: tempo
     app.kubernetes.io/version: 2.5.0
-    helm.sh/chart: tempo-distributed-1.15.1
+    helm.sh/chart: tempo-distributed-1.15.2
   name: tempo-distributed-runtime
   namespace: tracing-system
 ---
@@ -5380,7 +5380,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: tempo
     app.kubernetes.io/version: 2.5.0
-    helm.sh/chart: tempo-distributed-1.15.1
+    helm.sh/chart: tempo-distributed-1.15.2
   name: tempo-distributed-compactor
   namespace: tracing-system
 spec:
@@ -5404,7 +5404,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: tempo
     app.kubernetes.io/version: 2.5.0
-    helm.sh/chart: tempo-distributed-1.15.1
+    helm.sh/chart: tempo-distributed-1.15.2
   name: tempo-distributed-distributor
   namespace: tracing-system
 spec:
@@ -5443,7 +5443,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: tempo
     app.kubernetes.io/version: 2.5.0
-    helm.sh/chart: tempo-distributed-1.15.1
+    helm.sh/chart: tempo-distributed-1.15.2
     prometheus.io/service-monitor: "false"
   name: tempo-distributed-distributor-discovery
   namespace: tracing-system
@@ -5480,7 +5480,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: tempo
     app.kubernetes.io/version: 2.5.0
-    helm.sh/chart: tempo-distributed-1.15.1
+    helm.sh/chart: tempo-distributed-1.15.2
   name: tempo-distributed-gossip-ring
   namespace: tracing-system
 spec:
@@ -5506,7 +5506,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: tempo
     app.kubernetes.io/version: 2.5.0
-    helm.sh/chart: tempo-distributed-1.15.1
+    helm.sh/chart: tempo-distributed-1.15.2
   name: tempo-distributed-ingester
   namespace: tracing-system
 spec:
@@ -5533,7 +5533,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: tempo
     app.kubernetes.io/version: 2.5.0
-    helm.sh/chart: tempo-distributed-1.15.1
+    helm.sh/chart: tempo-distributed-1.15.2
     prometheus.io/service-monitor: "false"
   name: tempo-distributed-ingester-discovery
   namespace: tracing-system
@@ -5564,7 +5564,7 @@ metadata:
     app.kubernetes.io/name: tempo
     app.kubernetes.io/part-of: memberlist
     app.kubernetes.io/version: 2.5.0
-    helm.sh/chart: tempo-distributed-1.15.1
+    helm.sh/chart: tempo-distributed-1.15.2
   name: tempo-distributed-metrics-generator
   namespace: tracing-system
 spec:
@@ -5592,7 +5592,7 @@ metadata:
     app.kubernetes.io/name: tempo
     app.kubernetes.io/part-of: memberlist
     app.kubernetes.io/version: 2.5.0
-    helm.sh/chart: tempo-distributed-1.15.1
+    helm.sh/chart: tempo-distributed-1.15.2
     prometheus.io/service-monitor: "false"
   name: tempo-distributed-metrics-generator-discovery
   namespace: tracing-system
@@ -5622,7 +5622,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: tempo
     app.kubernetes.io/version: 2.5.0
-    helm.sh/chart: tempo-distributed-1.15.1
+    helm.sh/chart: tempo-distributed-1.15.2
   name: tempo-distributed-querier
   namespace: tracing-system
 spec:
@@ -5649,7 +5649,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: tempo
     app.kubernetes.io/version: 2.5.0
-    helm.sh/chart: tempo-distributed-1.15.1
+    helm.sh/chart: tempo-distributed-1.15.2
   name: tempo-distributed-query-frontend
   namespace: tracing-system
 spec:
@@ -5676,7 +5676,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: tempo
     app.kubernetes.io/version: 2.5.0
-    helm.sh/chart: tempo-distributed-1.15.1
+    helm.sh/chart: tempo-distributed-1.15.2
   name: tempo-distributed-query-frontend-discovery
   namespace: tracing-system
 spec:
@@ -5795,7 +5795,7 @@ metadata:
     app.kubernetes.io/name: tempo
     app.kubernetes.io/part-of: memberlist
     app.kubernetes.io/version: 2.5.0
-    helm.sh/chart: tempo-distributed-1.15.1
+    helm.sh/chart: tempo-distributed-1.15.2
   name: tempo-distributed-compactor
   namespace: tracing-system
 spec:
@@ -5814,7 +5814,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: e3c1fbc2be9f5e19fc6a9d7c8bc505232d5f8794f4079e22b53fa4cfb7a9eef0
+        checksum/config: 8d33763fc175a1828e1aa1238a0fe1663834bffd4e526190468d0f8168091145
         logs.grafana.com/scrape: "true"
         profiles.grafana.com/cpu.port_name: http-metrics
         profiles.grafana.com/cpu.scrape: "true"
@@ -5829,7 +5829,7 @@ spec:
         app.kubernetes.io/name: tempo
         app.kubernetes.io/part-of: memberlist
         app.kubernetes.io/version: 2.5.0
-        helm.sh/chart: tempo-distributed-1.15.1
+        helm.sh/chart: tempo-distributed-1.15.2
     spec:
       containers:
       - args:
@@ -5896,7 +5896,7 @@ metadata:
     app.kubernetes.io/name: tempo
     app.kubernetes.io/part-of: memberlist
     app.kubernetes.io/version: 2.5.0
-    helm.sh/chart: tempo-distributed-1.15.1
+    helm.sh/chart: tempo-distributed-1.15.2
   name: tempo-distributed-distributor
   namespace: tracing-system
 spec:
@@ -5911,7 +5911,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: e3c1fbc2be9f5e19fc6a9d7c8bc505232d5f8794f4079e22b53fa4cfb7a9eef0
+        checksum/config: 8d33763fc175a1828e1aa1238a0fe1663834bffd4e526190468d0f8168091145
         logs.grafana.com/scrape: "true"
         profiles.grafana.com/cpu.port_name: http-metrics
         profiles.grafana.com/cpu.scrape: "true"
@@ -5926,7 +5926,7 @@ spec:
         app.kubernetes.io/name: tempo
         app.kubernetes.io/part-of: memberlist
         app.kubernetes.io/version: 2.5.0
-        helm.sh/chart: tempo-distributed-1.15.1
+        helm.sh/chart: tempo-distributed-1.15.2
     spec:
       affinity:
         podAntiAffinity:
@@ -6033,7 +6033,7 @@ metadata:
     app.kubernetes.io/name: tempo
     app.kubernetes.io/part-of: memberlist
     app.kubernetes.io/version: 2.5.0
-    helm.sh/chart: tempo-distributed-1.15.1
+    helm.sh/chart: tempo-distributed-1.15.2
   name: tempo-distributed-metrics-generator
   namespace: tracing-system
 spec:
@@ -6048,7 +6048,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: e3c1fbc2be9f5e19fc6a9d7c8bc505232d5f8794f4079e22b53fa4cfb7a9eef0
+        checksum/config: 8d33763fc175a1828e1aa1238a0fe1663834bffd4e526190468d0f8168091145
         logs.grafana.com/scrape: "true"
         profiles.grafana.com/cpu.port_name: http-metrics
         profiles.grafana.com/cpu.scrape: "true"
@@ -6063,7 +6063,7 @@ spec:
         app.kubernetes.io/name: tempo
         app.kubernetes.io/part-of: memberlist
         app.kubernetes.io/version: 2.5.0
-        helm.sh/chart: tempo-distributed-1.15.1
+        helm.sh/chart: tempo-distributed-1.15.2
     spec:
       affinity:
         podAntiAffinity:
@@ -6161,7 +6161,7 @@ metadata:
     app.kubernetes.io/name: tempo
     app.kubernetes.io/part-of: memberlist
     app.kubernetes.io/version: 2.5.0
-    helm.sh/chart: tempo-distributed-1.15.1
+    helm.sh/chart: tempo-distributed-1.15.2
   name: tempo-distributed-querier
   namespace: tracing-system
 spec:
@@ -6180,7 +6180,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: e3c1fbc2be9f5e19fc6a9d7c8bc505232d5f8794f4079e22b53fa4cfb7a9eef0
+        checksum/config: 8d33763fc175a1828e1aa1238a0fe1663834bffd4e526190468d0f8168091145
         logs.grafana.com/scrape: "true"
         profiles.grafana.com/cpu.port_name: http-metrics
         profiles.grafana.com/cpu.scrape: "true"
@@ -6195,7 +6195,7 @@ spec:
         app.kubernetes.io/name: tempo
         app.kubernetes.io/part-of: memberlist
         app.kubernetes.io/version: 2.5.0
-        helm.sh/chart: tempo-distributed-1.15.1
+        helm.sh/chart: tempo-distributed-1.15.2
     spec:
       affinity:
         podAntiAffinity:
@@ -6295,7 +6295,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: tempo
     app.kubernetes.io/version: 2.5.0
-    helm.sh/chart: tempo-distributed-1.15.1
+    helm.sh/chart: tempo-distributed-1.15.2
   name: tempo-distributed-query-frontend
   namespace: tracing-system
 spec:
@@ -6314,7 +6314,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: e3c1fbc2be9f5e19fc6a9d7c8bc505232d5f8794f4079e22b53fa4cfb7a9eef0
+        checksum/config: 8d33763fc175a1828e1aa1238a0fe1663834bffd4e526190468d0f8168091145
         logs.grafana.com/scrape: "true"
         profiles.grafana.com/cpu.port_name: http-metrics
         profiles.grafana.com/cpu.scrape: "true"
@@ -6328,7 +6328,7 @@ spec:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: tempo
         app.kubernetes.io/version: 2.5.0
-        helm.sh/chart: tempo-distributed-1.15.1
+        helm.sh/chart: tempo-distributed-1.15.2
     spec:
       affinity:
         podAntiAffinity:
@@ -6670,7 +6670,7 @@ metadata:
     app.kubernetes.io/name: tempo
     app.kubernetes.io/part-of: memberlist
     app.kubernetes.io/version: 2.5.0
-    helm.sh/chart: tempo-distributed-1.15.1
+    helm.sh/chart: tempo-distributed-1.15.2
   name: tempo-distributed-ingester
   namespace: tracing-system
 spec:
@@ -6685,7 +6685,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: e3c1fbc2be9f5e19fc6a9d7c8bc505232d5f8794f4079e22b53fa4cfb7a9eef0
+        checksum/config: 8d33763fc175a1828e1aa1238a0fe1663834bffd4e526190468d0f8168091145
         logs.grafana.com/scrape: "true"
         profiles.grafana.com/cpu.port_name: http-metrics
         profiles.grafana.com/cpu.scrape: "true"
@@ -6700,7 +6700,7 @@ spec:
         app.kubernetes.io/name: tempo
         app.kubernetes.io/part-of: memberlist
         app.kubernetes.io/version: 2.5.0
-        helm.sh/chart: tempo-distributed-1.15.1
+        helm.sh/chart: tempo-distributed-1.15.2
     spec:
       affinity:
         podAntiAffinity:
@@ -6807,7 +6807,7 @@ metadata:
     app.kubernetes.io/name: tempo
     app.kubernetes.io/part-of: memberlist
     app.kubernetes.io/version: 2.5.0
-    helm.sh/chart: tempo-distributed-1.15.1
+    helm.sh/chart: tempo-distributed-1.15.2
   name: tempo-distributed-ingester
   namespace: tracing-system
 spec:
diff --git a/kubernetes/microservices-mode/traces/tempo-distributed/values.yaml b/kubernetes/microservices-mode/traces/tempo-distributed/values.yaml
index 39f57bb6..f370f409 100644
--- a/kubernetes/microservices-mode/traces/tempo-distributed/values.yaml
+++ b/kubernetes/microservices-mode/traces/tempo-distributed/values.yaml
@@ -1436,8 +1436,7 @@ global_overrides:
   per_tenant_override_config: /runtime-config/overrides.yaml
 
 # Per tenants overrides
-overrides: |
-  overrides: {}
+overrides: {}
 
 # memcached is for all of the Tempo pieces to coordinate with each other.
 # you can use your self memcacherd by set enable: false and host + service
diff --git a/kubernetes/read-write-mode/logs/k8s-all-in-one.yaml b/kubernetes/read-write-mode/logs/k8s-all-in-one.yaml
index 9ba80f39..3a6ba7cf 100644
--- a/kubernetes/read-write-mode/logs/k8s-all-in-one.yaml
+++ b/kubernetes/read-write-mode/logs/k8s-all-in-one.yaml
@@ -12,7 +12,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: loki
     app.kubernetes.io/version: 3.1.0
-    helm.sh/chart: loki-6.7.1
+    helm.sh/chart: loki-6.7.3
   name: loki
   namespace: logging-system
 ---
@@ -154,7 +154,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: loki
     app.kubernetes.io/version: 3.1.0
-    helm.sh/chart: loki-6.7.1
+    helm.sh/chart: loki-6.7.3
   name: loki-clusterrole
 rules:
 - apiGroups:
@@ -196,7 +196,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: loki
     app.kubernetes.io/version: 3.1.0
-    helm.sh/chart: loki-6.7.1
+    helm.sh/chart: loki-6.7.3
   name: loki-clusterrolebinding
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -365,7 +365,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: loki
     app.kubernetes.io/version: 3.1.0
-    helm.sh/chart: loki-6.7.1
+    helm.sh/chart: loki-6.7.3
   name: loki-runtime
   namespace: logging-system
 ---
@@ -4819,7 +4819,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: loki
     app.kubernetes.io/version: 3.1.0
-    helm.sh/chart: loki-6.7.1
+    helm.sh/chart: loki-6.7.3
   name: loki-backend
   namespace: logging-system
 spec:
@@ -4874,7 +4874,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: loki
     app.kubernetes.io/version: 3.1.0
-    helm.sh/chart: loki-6.7.1
+    helm.sh/chart: loki-6.7.3
   name: loki-memberlist
   namespace: logging-system
 spec:
@@ -4927,7 +4927,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: loki
     app.kubernetes.io/version: 3.1.0
-    helm.sh/chart: loki-6.7.1
+    helm.sh/chart: loki-6.7.3
   name: loki-read
   namespace: logging-system
 spec:
@@ -4984,7 +4984,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: loki
     app.kubernetes.io/version: 3.1.0
-    helm.sh/chart: loki-6.7.1
+    helm.sh/chart: loki-6.7.3
   name: loki-write
   namespace: logging-system
 spec:
@@ -5173,7 +5173,7 @@ metadata:
     app.kubernetes.io/name: loki
     app.kubernetes.io/part-of: memberlist
     app.kubernetes.io/version: 3.1.0
-    helm.sh/chart: loki-6.7.1
+    helm.sh/chart: loki-6.7.3
   name: loki-read
   namespace: logging-system
 spec:
@@ -5368,7 +5368,7 @@ metadata:
     app.kubernetes.io/name: loki
     app.kubernetes.io/part-of: memberlist
     app.kubernetes.io/version: 3.1.0
-    helm.sh/chart: loki-6.7.1
+    helm.sh/chart: loki-6.7.3
   name: loki-backend
   namespace: logging-system
 spec:
@@ -5503,7 +5503,7 @@ metadata:
     app.kubernetes.io/name: loki
     app.kubernetes.io/part-of: memberlist
     app.kubernetes.io/version: 3.1.0
-    helm.sh/chart: loki-6.7.1
+    helm.sh/chart: loki-6.7.3
   name: loki-write
   namespace: logging-system
 spec:
@@ -5734,7 +5734,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: loki
     app.kubernetes.io/version: 3.1.0
-    helm.sh/chart: loki-6.7.1
+    helm.sh/chart: loki-6.7.3
   name: loki-backend
   namespace: logging-system
 spec:
@@ -5754,7 +5754,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: loki
     app.kubernetes.io/version: 3.1.0
-    helm.sh/chart: loki-6.7.1
+    helm.sh/chart: loki-6.7.3
   name: loki-read
   namespace: logging-system
 spec:
@@ -5774,7 +5774,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: loki
     app.kubernetes.io/version: 3.1.0
-    helm.sh/chart: loki-6.7.1
+    helm.sh/chart: loki-6.7.3
   name: loki-write
   namespace: logging-system
 spec:
diff --git a/kubernetes/read-write-mode/logs/loki/kustomization.yaml b/kubernetes/read-write-mode/logs/loki/kustomization.yaml
index 8ee557b1..f66ae6b3 100644
--- a/kubernetes/read-write-mode/logs/loki/kustomization.yaml
+++ b/kubernetes/read-write-mode/logs/loki/kustomization.yaml
@@ -3,7 +3,7 @@ kind: Kustomization
 namespace: logging-system
 helmCharts:
 - name: loki
-  version: 6.7.2
+  version: 6.7.3
   repo: https://grafana.github.io/helm-charts
   releaseName: loki
   namespace: logging-system
diff --git a/kubernetes/read-write-mode/logs/loki/values.yaml b/kubernetes/read-write-mode/logs/loki/values.yaml
index 9de6584c..4f27bd13 100644
--- a/kubernetes/read-write-mode/logs/loki/values.yaml
+++ b/kubernetes/read-write-mode/logs/loki/values.yaml
@@ -3222,7 +3222,7 @@ monitoring:
     # -- Labels for the dashboards ConfigMap
     labels:
       grafana_dashboard: "1"
-  # Recording rules for monitoring Loki, required for some dashboards
+  # -- DEPRECATED Recording rules for monitoring Loki, required for some dashboards
   rules:
     # -- If enabled, create PrometheusRule resource with Loki recording rules
     enabled: false
@@ -3252,7 +3252,7 @@ monitoring:
     #       expr: sum(rate(loki_request_duration_seconds_bucket[1m])) by (le, job, route)
     #     - record: node_namespace_pod_container:container_cpu_usage_seconds_total:sum_rate
     #       expr: sum(rate(container_cpu_usage_seconds_total[1m])) by (node, namespace, pod, container)
-  # ServiceMonitor configuration
+  #  -- DEPRECATED ServiceMonitor configuration
   serviceMonitor:
     # -- If enabled, ServiceMonitor resources for Prometheus Operator are created
     enabled: false
@@ -3288,7 +3288,7 @@ monitoring:
       labels: {}
       # -- If defined a MetricsInstance will be created to remote write metrics.
       remoteWrite: null
-  # Self monitoring determines whether Loki should scrape its own logs.
+  # -- DEPRECATED Self monitoring determines whether Loki should scrape its own logs.
   # This feature currently relies on the Grafana Agent Operator being installed,
   # which is installed by default using the grafana-agent-operator sub-chart.
   # It will create custom resources for GrafanaAgent, LogsInstance, and PodLogs to configure
@@ -3304,9 +3304,9 @@ monitoring:
       # -- Namespace to create additional tenant token secret in. Useful if your Grafana instance
       # is in a separate namespace. Token will still be created in the canary namespace.
       secretNamespace: "{{ .Release.Namespace }}"
-    # Grafana Agent configuration
+    # -- DEPRECATED Grafana Agent configuration
     grafanaAgent:
-      # -- Controls whether to install the Grafana Agent Operator and its CRDs.
+      # -- DEPRECATED Controls whether to install the Grafana Agent Operator and its CRDs.
       # Note that helm will not install CRDs if this flag is enabled during an upgrade.
       # In that case install the CRDs manually from https://github.com/grafana/agent/tree/main/production/operator/crds
       installOperator: false