From ae621aadecb6904e51ac789c7b2876f06a61d97e Mon Sep 17 00:00:00 2001 From: Weifeng Wang Date: Tue, 18 Feb 2025 19:06:42 +0800 Subject: [PATCH] Remove cache configuration for Loki bloom gateways in Helm and Kubernetes manifests Signed-off-by: Weifeng Wang --- .../config/loki/microservices-mode-logs.yaml | 5 --- .../config/loki/monolithic-mode-logs.yaml | 6 ---- .../config/loki/read-write-mode-logs.yaml | 6 ---- .../logs/k8s-all-in-one.yaml | 32 ++++++++----------- .../logs/loki/configs/loki.yaml | 6 ---- .../traces/k8s-all-in-one.yaml | 10 ++---- .../all-in-one/k8s-all-in-one.yaml | 10 ++---- .../monolithic-mode/logs/k8s-all-in-one.yaml | 10 ++---- .../logs/loki/configs/loki.yaml | 6 ---- .../traces/k8s-all-in-one.yaml | 10 ++---- .../read-write-mode/logs/k8s-all-in-one.yaml | 14 +++----- .../logs/loki/configs/loki.yaml | 6 ---- 12 files changed, 25 insertions(+), 96 deletions(-) diff --git a/docker-compose/common/config/loki/microservices-mode-logs.yaml b/docker-compose/common/config/loki/microservices-mode-logs.yaml index 66111cf2..bc606d7a 100644 --- a/docker-compose/common/config/loki/microservices-mode-logs.yaml +++ b/docker-compose/common/config/loki/microservices-mode-logs.yaml @@ -38,11 +38,6 @@ bloom_gateway: enabled: true client: addresses: bloom-gateway:9095 - cache_results: true - results_cache: - cache: - memcached_client: - addresses: "dns+memcached:11211" compactor: working_directory: /loki/compactor diff --git a/docker-compose/common/config/loki/monolithic-mode-logs.yaml b/docker-compose/common/config/loki/monolithic-mode-logs.yaml index d6d4c3db..10389350 100644 --- a/docker-compose/common/config/loki/monolithic-mode-logs.yaml +++ b/docker-compose/common/config/loki/monolithic-mode-logs.yaml @@ -33,12 +33,6 @@ bloom_gateway: enabled: true client: addresses: "dns+loki:9095" - cache_results: true - results_cache: - cache: - memcached_client: - addresses: "dns+memcached:11211" - index_gateway: mode: simple diff --git a/docker-compose/common/config/loki/read-write-mode-logs.yaml b/docker-compose/common/config/loki/read-write-mode-logs.yaml index 7408d3c6..6d13dc3d 100644 --- a/docker-compose/common/config/loki/read-write-mode-logs.yaml +++ b/docker-compose/common/config/loki/read-write-mode-logs.yaml @@ -30,12 +30,6 @@ bloom_gateway: enabled: true client: addresses: "dns+loki-backend:9095" - cache_results: true - results_cache: - cache: - memcached_client: - addresses: "dns+memcached:11211" - frontend: scheduler_address: loki-backend:9095 diff --git a/kubernetes/microservices-mode/logs/k8s-all-in-one.yaml b/kubernetes/microservices-mode/logs/k8s-all-in-one.yaml index 64347f33..4ec9c4eb 100644 --- a/kubernetes/microservices-mode/logs/k8s-all-in-one.yaml +++ b/kubernetes/microservices-mode/logs/k8s-all-in-one.yaml @@ -259,12 +259,6 @@ data: client: addresses: dns:///loki-distributed-bloom-gateway-headless.logging-system.svc.cluster.local:9095 # addresses: dnssrvnoa+_grpc._tcp.loki-distributed-bloom-gateway-headless.logging-system.svc.cluster.local:9095 - cache_results: true - results_cache: - cache: - memcached_client: - addresses: "dns+memcached.memcached-system.svc.cluster.local:11211" - compactor: working_directory: /var/loki/compactor @@ -348,7 +342,7 @@ data: addresses: "dns+memcached.memcached-system.svc.cluster.local:11211" kind: ConfigMap metadata: - name: loki-config-d28hgtmbd5 + name: loki-config-b5ffgthh7h namespace: logging-system --- apiVersion: v1 @@ -5531,7 +5525,7 @@ spec: items: - key: config.yaml path: config.yaml - name: loki-config-d28hgtmbd5 + name: loki-config-b5ffgthh7h name: config - configMap: name: loki-runtime @@ -5636,7 +5630,7 @@ spec: items: - key: config.yaml path: config.yaml - name: loki-config-d28hgtmbd5 + name: loki-config-b5ffgthh7h name: config - configMap: name: loki-runtime @@ -5746,7 +5740,7 @@ spec: items: - key: config.yaml path: config.yaml - name: loki-config-d28hgtmbd5 + name: loki-config-b5ffgthh7h name: config - configMap: name: loki-runtime @@ -5847,7 +5841,7 @@ spec: items: - key: config.yaml path: config.yaml - name: loki-config-d28hgtmbd5 + name: loki-config-b5ffgthh7h name: config - configMap: name: loki-runtime @@ -5946,7 +5940,7 @@ spec: items: - key: config.yaml path: config.yaml - name: loki-config-d28hgtmbd5 + name: loki-config-b5ffgthh7h name: config - configMap: name: loki-runtime @@ -6133,7 +6127,7 @@ spec: items: - key: config.yaml path: config.yaml - name: loki-config-d28hgtmbd5 + name: loki-config-b5ffgthh7h name: config - configMap: name: loki-runtime @@ -6240,7 +6234,7 @@ spec: items: - key: config.yaml path: config.yaml - name: loki-config-d28hgtmbd5 + name: loki-config-b5ffgthh7h name: config - configMap: name: loki-runtime @@ -6348,7 +6342,7 @@ spec: items: - key: config.yaml path: config.yaml - name: loki-config-d28hgtmbd5 + name: loki-config-b5ffgthh7h name: config - configMap: name: loki-runtime @@ -6452,7 +6446,7 @@ spec: items: - key: config.yaml path: config.yaml - name: loki-config-d28hgtmbd5 + name: loki-config-b5ffgthh7h name: config - configMap: name: loki-runtime @@ -6562,7 +6556,7 @@ spec: items: - key: config.yaml path: config.yaml - name: loki-config-d28hgtmbd5 + name: loki-config-b5ffgthh7h name: config - configMap: name: loki-runtime @@ -6668,7 +6662,7 @@ spec: items: - key: config.yaml path: config.yaml - name: loki-config-d28hgtmbd5 + name: loki-config-b5ffgthh7h name: config - configMap: name: loki-runtime @@ -6774,7 +6768,7 @@ spec: items: - key: config.yaml path: config.yaml - name: loki-config-d28hgtmbd5 + name: loki-config-b5ffgthh7h name: config - configMap: name: loki-runtime diff --git a/kubernetes/microservices-mode/logs/loki/configs/loki.yaml b/kubernetes/microservices-mode/logs/loki/configs/loki.yaml index b3051e91..892bbfe4 100644 --- a/kubernetes/microservices-mode/logs/loki/configs/loki.yaml +++ b/kubernetes/microservices-mode/logs/loki/configs/loki.yaml @@ -37,12 +37,6 @@ bloom_gateway: client: addresses: dns:///loki-distributed-bloom-gateway-headless.logging-system.svc.cluster.local:9095 # addresses: dnssrvnoa+_grpc._tcp.loki-distributed-bloom-gateway-headless.logging-system.svc.cluster.local:9095 - cache_results: true - results_cache: - cache: - memcached_client: - addresses: "dns+memcached.memcached-system.svc.cluster.local:11211" - compactor: working_directory: /var/loki/compactor diff --git a/kubernetes/microservices-mode/traces/k8s-all-in-one.yaml b/kubernetes/microservices-mode/traces/k8s-all-in-one.yaml index 74063903..680aa654 100644 --- a/kubernetes/microservices-mode/traces/k8s-all-in-one.yaml +++ b/kubernetes/microservices-mode/traces/k8s-all-in-one.yaml @@ -441,12 +441,6 @@ data: enabled: true client: addresses: "dns+loki.logging-system.svc.cluster.local:9095" - cache_results: true - results_cache: - cache: - memcached_client: - addresses: "dns+memcached.memcached-system.svc.cluster.local:11211" - index_gateway: mode: simple @@ -521,7 +515,7 @@ metadata: app.kubernetes.io/managed-by: Kustomize app.kubernetes.io/name: loki app.kubernetes.io/version: 3.3.0 - name: loki-config-mfd4kh44h4 + name: loki-config-bt2mcfthd2 namespace: logging-system --- apiVersion: v1 @@ -6600,7 +6594,7 @@ spec: items: - key: config.yaml path: config.yaml - name: loki-config-mfd4kh44h4 + name: loki-config-bt2mcfthd2 name: config - configMap: name: loki-runtime-9599m5k6h2 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 a3b0b0ca..0f110626 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 @@ -776,12 +776,6 @@ data: enabled: true client: addresses: "dns+loki.logging-system.svc.cluster.local:9095" - cache_results: true - results_cache: - cache: - memcached_client: - addresses: "dns+memcached.memcached-system.svc.cluster.local:11211" - index_gateway: mode: simple @@ -856,7 +850,7 @@ metadata: app.kubernetes.io/managed-by: Kustomize app.kubernetes.io/name: loki app.kubernetes.io/version: 3.3.0 - name: loki-config-mfd4kh44h4 + name: loki-config-bt2mcfthd2 namespace: logging-system --- apiVersion: v1 @@ -6268,7 +6262,7 @@ spec: items: - key: config.yaml path: config.yaml - name: loki-config-mfd4kh44h4 + name: loki-config-bt2mcfthd2 name: config - configMap: name: loki-runtime-9599m5k6h2 diff --git a/kubernetes/monolithic-mode/logs/k8s-all-in-one.yaml b/kubernetes/monolithic-mode/logs/k8s-all-in-one.yaml index 67b271c1..d3a88127 100644 --- a/kubernetes/monolithic-mode/logs/k8s-all-in-one.yaml +++ b/kubernetes/monolithic-mode/logs/k8s-all-in-one.yaml @@ -250,12 +250,6 @@ data: enabled: true client: addresses: "dns+loki.logging-system.svc.cluster.local:9095" - cache_results: true - results_cache: - cache: - memcached_client: - addresses: "dns+memcached.memcached-system.svc.cluster.local:11211" - index_gateway: mode: simple @@ -330,7 +324,7 @@ metadata: app.kubernetes.io/managed-by: Kustomize app.kubernetes.io/name: loki app.kubernetes.io/version: 3.3.0 - name: loki-config-mfd4kh44h4 + name: loki-config-bt2mcfthd2 namespace: logging-system --- apiVersion: v1 @@ -5236,7 +5230,7 @@ spec: items: - key: config.yaml path: config.yaml - name: loki-config-mfd4kh44h4 + name: loki-config-bt2mcfthd2 name: config - configMap: name: loki-runtime-9599m5k6h2 diff --git a/kubernetes/monolithic-mode/logs/loki/configs/loki.yaml b/kubernetes/monolithic-mode/logs/loki/configs/loki.yaml index b2c6caca..596a3076 100644 --- a/kubernetes/monolithic-mode/logs/loki/configs/loki.yaml +++ b/kubernetes/monolithic-mode/logs/loki/configs/loki.yaml @@ -32,12 +32,6 @@ bloom_gateway: enabled: true client: addresses: "dns+loki.logging-system.svc.cluster.local:9095" - cache_results: true - results_cache: - cache: - memcached_client: - addresses: "dns+memcached.memcached-system.svc.cluster.local:11211" - index_gateway: mode: simple diff --git a/kubernetes/monolithic-mode/traces/k8s-all-in-one.yaml b/kubernetes/monolithic-mode/traces/k8s-all-in-one.yaml index 32dc18ab..a5fae7e0 100644 --- a/kubernetes/monolithic-mode/traces/k8s-all-in-one.yaml +++ b/kubernetes/monolithic-mode/traces/k8s-all-in-one.yaml @@ -430,12 +430,6 @@ data: enabled: true client: addresses: "dns+loki.logging-system.svc.cluster.local:9095" - cache_results: true - results_cache: - cache: - memcached_client: - addresses: "dns+memcached.memcached-system.svc.cluster.local:11211" - index_gateway: mode: simple @@ -510,7 +504,7 @@ metadata: app.kubernetes.io/managed-by: Kustomize app.kubernetes.io/name: loki app.kubernetes.io/version: 3.3.0 - name: loki-config-mfd4kh44h4 + name: loki-config-bt2mcfthd2 namespace: logging-system --- apiVersion: v1 @@ -5663,7 +5657,7 @@ spec: items: - key: config.yaml path: config.yaml - name: loki-config-mfd4kh44h4 + name: loki-config-bt2mcfthd2 name: config - configMap: name: loki-runtime-9599m5k6h2 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 7d22e966..543ad519 100644 --- a/kubernetes/read-write-mode/logs/k8s-all-in-one.yaml +++ b/kubernetes/read-write-mode/logs/k8s-all-in-one.yaml @@ -255,12 +255,6 @@ data: enabled: true client: addresses: "dns+loki-backend.logging-system.svc.cluster.local:9095" - cache_results: true - results_cache: - cache: - memcached_client: - addresses: "dns+memcached.memcached-system.svc.cluster.local:11211" - frontend: scheduler_address: loki-query-scheduler-discovery.logging-system.svc.cluster.local:9095 @@ -336,7 +330,7 @@ data: addresses: "dns+memcached.memcached-system.svc.cluster.local:11211" kind: ConfigMap metadata: - name: loki-config-ckhbb85kc5 + name: loki-config-k765f7mf8c namespace: logging-system --- apiVersion: v1 @@ -5299,7 +5293,7 @@ spec: items: - key: config.yaml path: config.yaml - name: loki-config-ckhbb85kc5 + name: loki-config-k765f7mf8c name: config - configMap: name: loki-runtime @@ -5521,7 +5515,7 @@ spec: items: - key: config.yaml path: config.yaml - name: loki-config-ckhbb85kc5 + name: loki-config-k765f7mf8c name: config - configMap: name: loki-runtime @@ -5630,7 +5624,7 @@ spec: items: - key: config.yaml path: config.yaml - name: loki-config-ckhbb85kc5 + name: loki-config-k765f7mf8c name: config - configMap: name: loki-runtime diff --git a/kubernetes/read-write-mode/logs/loki/configs/loki.yaml b/kubernetes/read-write-mode/logs/loki/configs/loki.yaml index 499bc27c..aca6126b 100644 --- a/kubernetes/read-write-mode/logs/loki/configs/loki.yaml +++ b/kubernetes/read-write-mode/logs/loki/configs/loki.yaml @@ -32,12 +32,6 @@ bloom_gateway: enabled: true client: addresses: "dns+loki-backend.logging-system.svc.cluster.local:9095" - cache_results: true - results_cache: - cache: - memcached_client: - addresses: "dns+memcached.memcached-system.svc.cluster.local:11211" - frontend: scheduler_address: loki-query-scheduler-discovery.logging-system.svc.cluster.local:9095