From 311f114d2d3471f0c4d382d84288c6e9147188af Mon Sep 17 00:00:00 2001 From: Weifeng Wang Date: Wed, 20 Mar 2024 00:54:50 +0800 Subject: [PATCH] update deps Signed-off-by: Weifeng Wang --- .../traces/docker-compose.yaml | 3 ++ .../metrics/docker-compose.yaml | 2 +- .../traces/docker-compose.yaml | 3 ++ .../all-in-one/k8s-all-in-one.yaml | 20 +++++------ .../monolithic-mode/logs/k8s-all-in-one.yaml | 20 +++++------ .../logs/loki/k8s-all-in-one.yaml | 20 +++++------ .../logs/loki/kustomization.yaml | 2 +- .../monolithic-mode/logs/loki/values.yaml | 2 ++ .../read-write-mode/logs/k8s-all-in-one.yaml | 36 +++++++++---------- .../logs/loki/k8s-all-in-one.yaml | 36 +++++++++---------- .../logs/loki/kustomization.yaml | 2 +- .../read-write-mode/logs/loki/values.yaml | 2 ++ 12 files changed, 79 insertions(+), 69 deletions(-) diff --git a/docker-compose/microservices-mode/traces/docker-compose.yaml b/docker-compose/microservices-mode/traces/docker-compose.yaml index 84e39b43..1515c98e 100644 --- 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 index 690d91d7..5ce01d48 100644 --- 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 index dd76ae9b..325183eb 100644 --- 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 index 850c0978..42ca244c 100644 --- 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 index 98d6e386..0efdf706 100644 --- 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 index 9a1c324a..bf5751d2 100644 --- 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 index a0ef510b..b9593e5f 100644 --- 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 index 8fd771fb..f4bf083d 100644 --- 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 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 409ff126..7866d8c8 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: 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 @@ -279,7 +279,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 --- @@ -294,7 +294,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 --- @@ -370,7 +370,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-backend namespace: logging-system spec: @@ -425,7 +425,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: @@ -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-read namespace: logging-system spec: @@ -507,7 +507,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-write namespace: logging-system spec: @@ -593,7 +593,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-read namespace: logging-system spec: @@ -611,7 +611,7 @@ spec: template: metadata: annotations: - checksum/config: 7430a2615d8091ff4ca350ecebdb75232244c61d4759a2e5af32d852f243b0b4 + checksum/config: 4b784dc6e910146eb2cf23d51197cad878d86a9344dc6bc303d250c20340fe7e labels: app.kubernetes.io/component: read app.kubernetes.io/instance: loki @@ -705,7 +705,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-backend namespace: logging-system spec: @@ -721,7 +721,7 @@ spec: template: metadata: annotations: - checksum/config: 7430a2615d8091ff4ca350ecebdb75232244c61d4759a2e5af32d852f243b0b4 + checksum/config: 4b784dc6e910146eb2cf23d51197cad878d86a9344dc6bc303d250c20340fe7e labels: app.kubernetes.io/component: backend app.kubernetes.io/instance: loki @@ -842,7 +842,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-write namespace: logging-system spec: @@ -858,7 +858,7 @@ spec: template: metadata: annotations: - checksum/config: 7430a2615d8091ff4ca350ecebdb75232244c61d4759a2e5af32d852f243b0b4 + checksum/config: 4b784dc6e910146eb2cf23d51197cad878d86a9344dc6bc303d250c20340fe7e labels: app.kubernetes.io/component: write app.kubernetes.io/instance: loki @@ -949,7 +949,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-backend namespace: logging-system spec: @@ -969,7 +969,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-read namespace: logging-system spec: @@ -989,7 +989,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-write namespace: logging-system spec: diff --git a/kubernetes/read-write-mode/logs/loki/k8s-all-in-one.yaml b/kubernetes/read-write-mode/logs/loki/k8s-all-in-one.yaml index 5a2a5371..968a649c 100644 --- a/kubernetes/read-write-mode/logs/loki/k8s-all-in-one.yaml +++ b/kubernetes/read-write-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 --- @@ -149,7 +149,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-backend namespace: logging-system spec: @@ -204,7 +204,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: @@ -229,7 +229,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-read namespace: logging-system spec: @@ -286,7 +286,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-write namespace: logging-system spec: @@ -372,7 +372,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-read namespace: logging-system spec: @@ -390,7 +390,7 @@ spec: template: metadata: annotations: - checksum/config: 7430a2615d8091ff4ca350ecebdb75232244c61d4759a2e5af32d852f243b0b4 + checksum/config: 4b784dc6e910146eb2cf23d51197cad878d86a9344dc6bc303d250c20340fe7e labels: app.kubernetes.io/component: read app.kubernetes.io/instance: loki @@ -484,7 +484,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-backend namespace: logging-system spec: @@ -500,7 +500,7 @@ spec: template: metadata: annotations: - checksum/config: 7430a2615d8091ff4ca350ecebdb75232244c61d4759a2e5af32d852f243b0b4 + checksum/config: 4b784dc6e910146eb2cf23d51197cad878d86a9344dc6bc303d250c20340fe7e labels: app.kubernetes.io/component: backend app.kubernetes.io/instance: loki @@ -621,7 +621,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-write namespace: logging-system spec: @@ -637,7 +637,7 @@ spec: template: metadata: annotations: - checksum/config: 7430a2615d8091ff4ca350ecebdb75232244c61d4759a2e5af32d852f243b0b4 + checksum/config: 4b784dc6e910146eb2cf23d51197cad878d86a9344dc6bc303d250c20340fe7e labels: app.kubernetes.io/component: write app.kubernetes.io/instance: loki @@ -728,7 +728,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-backend namespace: logging-system spec: @@ -748,7 +748,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-read namespace: logging-system spec: @@ -768,7 +768,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-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 e82ab1d2..52203c53 100644 --- a/kubernetes/read-write-mode/logs/loki/kustomization.yaml +++ b/kubernetes/read-write-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/read-write-mode/logs/loki/values.yaml b/kubernetes/read-write-mode/logs/loki/values.yaml index 8fd771fb..f4bf083d 100644 --- a/kubernetes/read-write-mode/logs/loki/values.yaml +++ b/kubernetes/read-write-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