update deps

Signed-off-by: Weifeng Wang <[email protected]>
qclaogui · Mar 19, 2024 · 311f114 · 311f114
1 parent 65287d9
commit 311f114
Show file tree

Hide file tree

Showing 12 changed files with 79 additions and 69 deletions.
diff --git a/docker-compose/microservices-mode/traces/docker-compose.yaml b/docker-compose/microservices-mode/traces/docker-compose.yaml
@@ -21,6 +21,9 @@ x-environment: &jaeger-environment
 
 services:
   gateway:
+    # https://github.com/qclaogui/codelab-monitoring/blob/main/docker-compose/common/config/agent-flow/modules/docker/README.md
+    labels:
+      metrics.agent.grafana.com/scrape: false
     depends_on:
       distributor:
         condition: service_healthy

diff --git a/docker-compose/monolithic-mode/metrics/docker-compose.yaml b/docker-compose/monolithic-mode/metrics/docker-compose.yaml
@@ -16,7 +16,7 @@ services:
   gateway:
     # https://github.com/qclaogui/codelab-monitoring/blob/main/docker-compose/common/config/agent-flow/modules/docker/README.md
     labels:
-      - metrics.agent.grafana.com/scrape=false
+      metrics.agent.grafana.com/scrape: false
     depends_on:
       mimir:
         condition: service_healthy

diff --git a/docker-compose/monolithic-mode/traces/docker-compose.yaml b/docker-compose/monolithic-mode/traces/docker-compose.yaml
@@ -21,6 +21,9 @@ x-environment: &jaeger-environment
 
 services:
   gateway:
+    # https://github.com/qclaogui/codelab-monitoring/blob/main/docker-compose/common/config/agent-flow/modules/docker/README.md
+    labels:
+      metrics.agent.grafana.com/scrape: false
     depends_on:
       tempo:
         condition: service_healthy

diff --git a/kubernetes/monolithic-mode/all-in-one/k8s-all-in-one.yaml b/kubernetes/monolithic-mode/all-in-one/k8s-all-in-one.yaml
@@ -22,7 +22,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: loki
     app.kubernetes.io/version: 2.9.4
-    helm.sh/chart: loki-5.44.1
+    helm.sh/chart: loki-5.45.0
   name: loki
   namespace: logging-system
 ---
@@ -97,7 +97,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: loki
     app.kubernetes.io/version: 2.9.4
-    helm.sh/chart: loki-5.44.1
+    helm.sh/chart: loki-5.45.0
   name: loki-clusterrole
 rules:
 - apiGroups:
@@ -138,7 +138,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: loki
     app.kubernetes.io/version: 2.9.4
-    helm.sh/chart: loki-5.44.1
+    helm.sh/chart: loki-5.45.0
   name: loki-clusterrolebinding
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -435,7 +435,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: loki
     app.kubernetes.io/version: 2.9.4
-    helm.sh/chart: loki-5.44.1
+    helm.sh/chart: loki-5.45.0
   name: loki-config
   namespace: logging-system
 ---
@@ -450,7 +450,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: loki
     app.kubernetes.io/version: 2.9.4
-    helm.sh/chart: loki-5.44.1
+    helm.sh/chart: loki-5.45.0
   name: loki-runtime
   namespace: logging-system
 ---
@@ -62993,7 +62993,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: loki
     app.kubernetes.io/version: 2.9.4
-    helm.sh/chart: loki-5.44.1
+    helm.sh/chart: loki-5.45.0
   name: loki
   namespace: logging-system
 spec:
@@ -63020,7 +63020,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: loki
     app.kubernetes.io/version: 2.9.4
-    helm.sh/chart: loki-5.44.1
+    helm.sh/chart: loki-5.45.0
     prometheus.io/service-monitor: "false"
     variant: headless
   name: loki-headless
@@ -63044,7 +63044,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: loki
     app.kubernetes.io/version: 2.9.4
-    helm.sh/chart: loki-5.44.1
+    helm.sh/chart: loki-5.45.0
   name: loki-memberlist
   namespace: logging-system
 spec:
@@ -63343,7 +63343,7 @@ metadata:
     app.kubernetes.io/name: loki
     app.kubernetes.io/part-of: memberlist
     app.kubernetes.io/version: 2.9.4
-    helm.sh/chart: loki-5.44.1
+    helm.sh/chart: loki-5.45.0
   name: loki
   namespace: logging-system
 spec:
@@ -63362,7 +63362,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: ae3ef906aff98a752fbddccee75e4da6bf991ea3d446453ea2a021674c5641b7
+        checksum/config: 70a9c125cca36cf73a10ad98186beebdc3e457f9dddd2bfddecca526495f212f
         logs.agent.grafana.com/scrub-level: info
         profiles.grafana.com/cpu.port_name: http-metrics
         profiles.grafana.com/cpu.scrape: "false"

diff --git a/kubernetes/monolithic-mode/logs/k8s-all-in-one.yaml b/kubernetes/monolithic-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: 2.9.4
-    helm.sh/chart: loki-5.44.1
+    helm.sh/chart: loki-5.45.0
   name: loki
   namespace: logging-system
 ---
@@ -24,7 +24,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: loki
     app.kubernetes.io/version: 2.9.4
-    helm.sh/chart: loki-5.44.1
+    helm.sh/chart: loki-5.45.0
   name: loki-clusterrole
 rules:
 - apiGroups:
@@ -45,7 +45,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: loki
     app.kubernetes.io/version: 2.9.4
-    helm.sh/chart: loki-5.44.1
+    helm.sh/chart: loki-5.45.0
   name: loki-clusterrolebinding
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -140,7 +140,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: loki
     app.kubernetes.io/version: 2.9.4
-    helm.sh/chart: loki-5.44.1
+    helm.sh/chart: loki-5.45.0
   name: loki-config
   namespace: logging-system
 ---
@@ -155,7 +155,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: loki
     app.kubernetes.io/version: 2.9.4
-    helm.sh/chart: loki-5.44.1
+    helm.sh/chart: loki-5.45.0
   name: loki-runtime
   namespace: logging-system
 ---
@@ -230,7 +230,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: loki
     app.kubernetes.io/version: 2.9.4
-    helm.sh/chart: loki-5.44.1
+    helm.sh/chart: loki-5.45.0
   name: loki
   namespace: logging-system
 spec:
@@ -257,7 +257,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: loki
     app.kubernetes.io/version: 2.9.4
-    helm.sh/chart: loki-5.44.1
+    helm.sh/chart: loki-5.45.0
     prometheus.io/service-monitor: "false"
     variant: headless
   name: loki-headless
@@ -281,7 +281,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: loki
     app.kubernetes.io/version: 2.9.4
-    helm.sh/chart: loki-5.44.1
+    helm.sh/chart: loki-5.45.0
   name: loki-memberlist
   namespace: logging-system
 spec:
@@ -307,7 +307,7 @@ metadata:
     app.kubernetes.io/name: loki
     app.kubernetes.io/part-of: memberlist
     app.kubernetes.io/version: 2.9.4
-    helm.sh/chart: loki-5.44.1
+    helm.sh/chart: loki-5.45.0
   name: loki
   namespace: logging-system
 spec:
@@ -326,7 +326,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: ae3ef906aff98a752fbddccee75e4da6bf991ea3d446453ea2a021674c5641b7
+        checksum/config: 70a9c125cca36cf73a10ad98186beebdc3e457f9dddd2bfddecca526495f212f
         logs.agent.grafana.com/scrub-level: info
         profiles.grafana.com/cpu.port_name: http-metrics
         profiles.grafana.com/cpu.scrape: "false"

diff --git a/kubernetes/monolithic-mode/logs/loki/k8s-all-in-one.yaml b/kubernetes/monolithic-mode/logs/loki/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: 2.9.4
-    helm.sh/chart: loki-5.44.1
+    helm.sh/chart: loki-5.45.0
   name: loki
   namespace: logging-system
 ---
@@ -24,7 +24,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: loki
     app.kubernetes.io/version: 2.9.4
-    helm.sh/chart: loki-5.44.1
+    helm.sh/chart: loki-5.45.0
   name: loki-clusterrole
 rules:
 - apiGroups:
@@ -45,7 +45,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: loki
     app.kubernetes.io/version: 2.9.4
-    helm.sh/chart: loki-5.44.1
+    helm.sh/chart: loki-5.45.0
   name: loki-clusterrolebinding
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -121,7 +121,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: loki
     app.kubernetes.io/version: 2.9.4
-    helm.sh/chart: loki-5.44.1
+    helm.sh/chart: loki-5.45.0
   name: loki-config
   namespace: logging-system
 ---
@@ -136,7 +136,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: loki
     app.kubernetes.io/version: 2.9.4
-    helm.sh/chart: loki-5.44.1
+    helm.sh/chart: loki-5.45.0
   name: loki-runtime
   namespace: logging-system
 ---
@@ -148,7 +148,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: loki
     app.kubernetes.io/version: 2.9.4
-    helm.sh/chart: loki-5.44.1
+    helm.sh/chart: loki-5.45.0
   name: loki
   namespace: logging-system
 spec:
@@ -175,7 +175,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: loki
     app.kubernetes.io/version: 2.9.4
-    helm.sh/chart: loki-5.44.1
+    helm.sh/chart: loki-5.45.0
     prometheus.io/service-monitor: "false"
     variant: headless
   name: loki-headless
@@ -199,7 +199,7 @@ metadata:
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: loki
     app.kubernetes.io/version: 2.9.4
-    helm.sh/chart: loki-5.44.1
+    helm.sh/chart: loki-5.45.0
   name: loki-memberlist
   namespace: logging-system
 spec:
@@ -225,7 +225,7 @@ metadata:
     app.kubernetes.io/name: loki
     app.kubernetes.io/part-of: memberlist
     app.kubernetes.io/version: 2.9.4
-    helm.sh/chart: loki-5.44.1
+    helm.sh/chart: loki-5.45.0
   name: loki
   namespace: logging-system
 spec:
@@ -244,7 +244,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: ae3ef906aff98a752fbddccee75e4da6bf991ea3d446453ea2a021674c5641b7
+        checksum/config: 70a9c125cca36cf73a10ad98186beebdc3e457f9dddd2bfddecca526495f212f
         logs.agent.grafana.com/scrub-level: info
         profiles.grafana.com/cpu.port_name: http-metrics
         profiles.grafana.com/cpu.scrape: "false"

diff --git a/kubernetes/monolithic-mode/logs/loki/kustomization.yaml b/kubernetes/monolithic-mode/logs/loki/kustomization.yaml
@@ -5,7 +5,7 @@ namespace: logging-system
 
 helmCharts:
 - name: loki
-  version: 5.44.1
+  version: 5.45.0
   repo: https://grafana.github.io/helm-charts
   releaseName: loki
   namespace: logging-system

diff --git a/kubernetes/monolithic-mode/logs/loki/values.yaml b/kubernetes/monolithic-mode/logs/loki/values.yaml
@@ -993,6 +993,8 @@ read:
   legacyReadTarget: false
   # -- Additional CLI args for the read
   extraArgs: []
+  # -- Containers to add to the read pods
+  extraContainers: []
   # -- Environment variables to add to the read pods
   extraEnv: []
   # -- Environment variables from secrets or configmaps to add to the read pods