Skip to content

Commit

Permalink
Remove cache configuration for Loki bloom gateways in Helm and Kubern…
Browse files Browse the repository at this point in the history
…etes manifests

Signed-off-by: Weifeng Wang <[email protected]>
  • Loading branch information
qclaogui committed Feb 18, 2025
1 parent ef1271d commit ae621aa
Show file tree
Hide file tree
Showing 12 changed files with 25 additions and 96 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 0 additions & 6 deletions docker-compose/common/config/loki/monolithic-mode-logs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 0 additions & 6 deletions docker-compose/common/config/loki/read-write-mode-logs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
32 changes: 13 additions & 19 deletions kubernetes/microservices-mode/logs/k8s-all-in-one.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 0 additions & 6 deletions kubernetes/microservices-mode/logs/loki/configs/loki.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 2 additions & 8 deletions kubernetes/microservices-mode/traces/k8s-all-in-one.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
10 changes: 2 additions & 8 deletions kubernetes/monolithic-mode/all-in-one/k8s-all-in-one.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
10 changes: 2 additions & 8 deletions kubernetes/monolithic-mode/logs/k8s-all-in-one.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 0 additions & 6 deletions kubernetes/monolithic-mode/logs/loki/configs/loki.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 2 additions & 8 deletions kubernetes/monolithic-mode/traces/k8s-all-in-one.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
14 changes: 4 additions & 10 deletions kubernetes/read-write-mode/logs/k8s-all-in-one.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 0 additions & 6 deletions kubernetes/read-write-mode/logs/loki/configs/loki.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit ae621aa

Please sign in to comment.