k8s/apps
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix namespace names

Browse Source
This commit is contained in:
Philip Haupt
2025-11-14 23:04:42 +01:00
parent c3f7df57f2
commit 695630b8c8
4 changed files with 480 additions and 374 deletions
Download Patch File Download Diff File Expand all files Collapse all files

144
grafana-loki/main.yaml
View File

@@ -8,7 +8,7 @@ metadata:
app.kubernetes.io/version: 3.5.7
helm.sh/chart: loki-6.46.0
name: loki
namespace: loki
namespace: grafana-loki
---
apiVersion: v1
automountServiceAccountToken: true
@@ -21,7 +21,7 @@ metadata:
app.kubernetes.io/version: 3.5.7
helm.sh/chart: loki-6.46.0
name: loki-canary
namespace: loki
namespace: grafana-loki
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
@@ -59,7 +59,7 @@ roleRef:
subjects:
- kind: ServiceAccount
name: loki
namespace: loki
namespace: grafana-loki
---
apiVersion: v1
data:
@@ -68,11 +68,11 @@ data:
auth_enabled: true
bloom_build:
builder:
planner_address: loki-backend-headless.loki.svc.cluster.local:9095
planner_address: loki-backend-headless.grafana-loki.svc.cluster.local:9095
enabled: false
bloom_gateway:
client:
addresses: dnssrvnoa+_grpc._tcp.loki-backend-headless.loki.svc.cluster.local
addresses: dnssrvnoa+_grpc._tcp.loki-backend-headless.grafana-loki.svc.cluster.local
enabled: false
chunk_store_config:
chunk_cache_config:
@@ -85,12 +85,12 @@ data:
batch_size: 4
parallelism: 5
memcached_client:
addresses: dnssrvnoa+_memcached-client._tcp.loki-chunks-cache.loki.svc.cluster.local
addresses: dnssrvnoa+_memcached-client._tcp.loki-chunks-cache.grafana-loki.svc.cluster.local
consistent_hash: true
max_idle_conns: 72
timeout: 2000ms
common:
compactor_grpc_address: 'loki-backend.loki.svc.cluster.local:9095'
compactor_grpc_address: 'loki-backend.grafana-loki.svc.cluster.local:9095'
path_prefix: /var/loki
replication_factor: 3
storage:
@@ -119,7 +119,7 @@ data:
volume_enabled: true
memberlist:
join_members:
- loki-memberlist.loki.svc.cluster.local
- loki-memberlist.grafana-loki.svc.cluster.local
pattern_ingester:
enabled: false
query_range:
@@ -133,7 +133,7 @@ data:
writeback_size_limit: 500MB
default_validity: 12h
memcached_client:
addresses: dnssrvnoa+_memcached-client._tcp.loki-results-cache.loki.svc.cluster.local
addresses: dnssrvnoa+_memcached-client._tcp.loki-results-cache.grafana-loki.svc.cluster.local
consistent_hash: true
timeout: 500ms
update_interval: 1m
@@ -172,14 +172,14 @@ data:
working_directory: /var/loki/data/bloomshipper
boltdb_shipper:
index_gateway_client:
server_address: dns+loki-backend-headless.loki.svc.cluster.local:9095
server_address: dns+loki-backend-headless.grafana-loki.svc.cluster.local:9095
hedging:
at: 250ms
max_per_second: 20
up_to: 3
tsdb_shipper:
index_gateway_client:
server_address: dns+loki-backend-headless.loki.svc.cluster.local:9095
server_address: dns+loki-backend-headless.grafana-loki.svc.cluster.local:9095
use_thanos_objstore: false
tracing:
enabled: false
@@ -191,7 +191,7 @@ metadata:
app.kubernetes.io/version: 3.5.7
helm.sh/chart: loki-6.46.0
name: loki
namespace: loki
namespace: grafana-loki
---
apiVersion: v1
data:
@@ -213,45 +213,45 @@ data:
\ listen [::]:8080;\n\n location = / {\n \n return
200 'OK';\n auth_basic off;\n }\n\n ########################################################\n
\ # Configure backend targets\n location ^~ /ui {\n \n proxy_pass
\ http://loki-read.loki.svc.cluster.local:3100$request_uri;\n }\n\n #
Distributor\n location = /api/prom/push {\n \n proxy_pass http://loki-write.loki.svc.cluster.local:3100$request_uri;\n
\ }\n location = /loki/api/v1/push {\n \n proxy_pass http://loki-write.loki.svc.cluster.local:3100$request_uri;\n
\ }\n location = /distributor/ring {\n \n proxy_pass http://loki-write.loki.svc.cluster.local:3100$request_uri;\n
\ }\n location = /otlp/v1/logs {\n \n proxy_pass http://loki-write.loki.svc.cluster.local:3100$request_uri;\n
\ }\n\n # Ingester\n location = /flush {\n \n proxy_pass http://loki-write.loki.svc.cluster.local:3100$request_uri;\n
\ }\n location ^~ /ingester/ {\n \n proxy_pass http://loki-write.loki.svc.cluster.local:3100$request_uri;\n
\ http://loki-read.grafana-loki.svc.cluster.local:3100$request_uri;\n }\n\n
\ # Distributor\n location = /api/prom/push {\n \n proxy_pass http://loki-write.grafana-loki.svc.cluster.local:3100$request_uri;\n
\ }\n location = /loki/api/v1/push {\n \n proxy_pass http://loki-write.grafana-loki.svc.cluster.local:3100$request_uri;\n
\ }\n location = /distributor/ring {\n \n proxy_pass http://loki-write.grafana-loki.svc.cluster.local:3100$request_uri;\n
\ }\n location = /otlp/v1/logs {\n \n proxy_pass http://loki-write.grafana-loki.svc.cluster.local:3100$request_uri;\n
\ }\n\n # Ingester\n location = /flush {\n \n proxy_pass http://loki-write.grafana-loki.svc.cluster.local:3100$request_uri;\n
\ }\n location ^~ /ingester/ {\n \n proxy_pass http://loki-write.grafana-loki.svc.cluster.local:3100$request_uri;\n
\ }\n location = /ingester {\n \n internal; # to suppress
301\n }\n\n # Ring\n location = /ring {\n \n proxy_pass http://loki-write.loki.svc.cluster.local:3100$request_uri;\n
301\n }\n\n # Ring\n location = /ring {\n \n proxy_pass http://loki-write.grafana-loki.svc.cluster.local:3100$request_uri;\n
\ }\n\n # MemberListKV\n location = /memberlist {\n \n proxy_pass
\ http://loki-write.loki.svc.cluster.local:3100$request_uri;\n }\n\n #
Ruler\n location = /ruler/ring {\n \n proxy_pass http://loki-backend.loki.svc.cluster.local:3100$request_uri;\n
\ }\n location = /api/prom/rules {\n \n proxy_pass http://loki-backend.loki.svc.cluster.local:3100$request_uri;\n
\ }\n location ^~ /api/prom/rules/ {\n \n proxy_pass http://loki-backend.loki.svc.cluster.local:3100$request_uri;\n
\ }\n location = /loki/api/v1/rules {\n \n proxy_pass http://loki-backend.loki.svc.cluster.local:3100$request_uri;\n
\ }\n location ^~ /loki/api/v1/rules/ {\n \n proxy_pass http://loki-backend.loki.svc.cluster.local:3100$request_uri;\n
\ }\n location = /prometheus/api/v1/alerts {\n \n proxy_pass http://loki-backend.loki.svc.cluster.local:3100$request_uri;\n
\ }\n location = /prometheus/api/v1/rules {\n \n proxy_pass http://loki-backend.loki.svc.cluster.local:3100$request_uri;\n
\ http://loki-write.grafana-loki.svc.cluster.local:3100$request_uri;\n }\n\n
\ # Ruler\n location = /ruler/ring {\n \n proxy_pass http://loki-backend.grafana-loki.svc.cluster.local:3100$request_uri;\n
\ }\n location = /api/prom/rules {\n \n proxy_pass http://loki-backend.grafana-loki.svc.cluster.local:3100$request_uri;\n
\ }\n location ^~ /api/prom/rules/ {\n \n proxy_pass http://loki-backend.grafana-loki.svc.cluster.local:3100$request_uri;\n
\ }\n location = /loki/api/v1/rules {\n \n proxy_pass http://loki-backend.grafana-loki.svc.cluster.local:3100$request_uri;\n
\ }\n location ^~ /loki/api/v1/rules/ {\n \n proxy_pass http://loki-backend.grafana-loki.svc.cluster.local:3100$request_uri;\n
\ }\n location = /prometheus/api/v1/alerts {\n \n proxy_pass http://loki-backend.grafana-loki.svc.cluster.local:3100$request_uri;\n
\ }\n location = /prometheus/api/v1/rules {\n \n proxy_pass http://loki-backend.grafana-loki.svc.cluster.local:3100$request_uri;\n
\ }\n\n # Compactor\n location = /compactor/ring {\n \n proxy_pass
\ http://loki-backend.loki.svc.cluster.local:3100$request_uri;\n }\n location
= /loki/api/v1/delete {\n \n proxy_pass http://loki-backend.loki.svc.cluster.local:3100$request_uri;\n
\ http://loki-backend.grafana-loki.svc.cluster.local:3100$request_uri;\n
\ }\n location = /loki/api/v1/delete {\n \n proxy_pass http://loki-backend.grafana-loki.svc.cluster.local:3100$request_uri;\n
\ }\n location = /loki/api/v1/cache/generation_numbers {\n \n proxy_pass
\ http://loki-backend.loki.svc.cluster.local:3100$request_uri;\n }\n\n
\ # IndexGateway\n location = /indexgateway/ring {\n \n proxy_pass
\ http://loki-backend.loki.svc.cluster.local:3100$request_uri;\n }\n\n
\ # QueryScheduler\n location = /scheduler/ring {\n \n proxy_pass
\ http://loki-backend.loki.svc.cluster.local:3100$request_uri;\n }\n\n
\ # Config\n location = /config {\n \n proxy_pass http://loki-write.loki.svc.cluster.local:3100$request_uri;\n
\ http://loki-backend.grafana-loki.svc.cluster.local:3100$request_uri;\n
\ }\n\n # IndexGateway\n location = /indexgateway/ring {\n \n proxy_pass
\ http://loki-backend.grafana-loki.svc.cluster.local:3100$request_uri;\n
\ }\n\n # QueryScheduler\n location = /scheduler/ring {\n \n proxy_pass
\ http://loki-backend.grafana-loki.svc.cluster.local:3100$request_uri;\n
\ }\n\n # Config\n location = /config {\n \n proxy_pass http://loki-write.grafana-loki.svc.cluster.local:3100$request_uri;\n
\ }\n\n\n # QueryFrontend, Querier\n location = /api/prom/tail {\n proxy_set_header
Upgrade $http_upgrade;\n proxy_set_header Connection \"upgrade\";\n \n
\ proxy_pass http://loki-read.loki.svc.cluster.local:3100$request_uri;\n
\ proxy_pass http://loki-read.grafana-loki.svc.cluster.local:3100$request_uri;\n
\ }\n location = /loki/api/v1/tail {\n proxy_set_header Upgrade $http_upgrade;\n
\ proxy_set_header Connection \"upgrade\";\n \n proxy_pass http://loki-read.loki.svc.cluster.local:3100$request_uri;\n
\ }\n location ^~ /api/prom/ {\n \n proxy_pass http://loki-read.loki.svc.cluster.local:3100$request_uri;\n
\ proxy_set_header Connection \"upgrade\";\n \n proxy_pass http://loki-read.grafana-loki.svc.cluster.local:3100$request_uri;\n
\ }\n location ^~ /api/prom/ {\n \n proxy_pass http://loki-read.grafana-loki.svc.cluster.local:3100$request_uri;\n
\ }\n location = /api/prom {\n \n internal; # to suppress
301\n }\n location ^~ /loki/api/v1/ {\n # pass custom headers set by
Grafana as X-Query-Tags which are logged as key/value pairs in metrics.go log
messages\n proxy_set_header X-Query-Tags \"${query_tags},user=${http_x_grafana_user},dashboard_id=${http_x_dashboard_uid},dashboard_title=${http_x_dashboard_title},panel_id=${http_x_panel_id},panel_title=${http_x_panel_title},source_rule_uid=${http_x_rule_uid},rule_name=${http_x_rule_name},rule_folder=${http_x_rule_folder},rule_version=${http_x_rule_version},rule_source=${http_x_rule_source},rule_type=${http_x_rule_type}\";\n
\ \n proxy_pass http://loki-read.loki.svc.cluster.local:3100$request_uri;\n
\ \n proxy_pass http://loki-read.grafana-loki.svc.cluster.local:3100$request_uri;\n
\ }\n location = /loki/api/v1 {\n \n internal; # to suppress
301\n }\n }\n}\n"
kind: ConfigMap
@@ -263,7 +263,7 @@ metadata:
app.kubernetes.io/version: 3.5.7
helm.sh/chart: loki-6.46.0
name: loki-gateway
namespace: loki
namespace: grafana-loki
---
apiVersion: v1
data:
@@ -277,7 +277,7 @@ metadata:
app.kubernetes.io/version: 3.5.7
helm.sh/chart: loki-6.46.0
name: loki-runtime
namespace: loki
namespace: grafana-loki
---
apiVersion: v1
kind: Service
@@ -289,7 +289,7 @@ metadata:
app.kubernetes.io/version: 3.5.7
helm.sh/chart: loki-6.46.0
name: loki-backend
namespace: loki
namespace: grafana-loki
spec:
ports:
- name: http-metrics
@@ -316,7 +316,7 @@ metadata:
prometheus.io/service-monitor: "false"
variant: headless
name: loki-backend-headless
namespace: loki
namespace: grafana-loki
spec:
clusterIP: None
ports:
@@ -345,7 +345,7 @@ metadata:
app.kubernetes.io/version: 3.5.7
helm.sh/chart: loki-6.46.0
name: loki-canary
namespace: loki
namespace: grafana-loki
spec:
ports:
- name: http-metrics
@@ -368,7 +368,7 @@ metadata:
app.kubernetes.io/version: 3.5.7
helm.sh/chart: loki-6.46.0
name: loki-chunks-cache
namespace: loki
namespace: grafana-loki
spec:
clusterIP: None
ports:
@@ -395,7 +395,7 @@ metadata:
helm.sh/chart: loki-6.46.0
prometheus.io/service-monitor: "false"
name: loki-gateway
namespace: loki
namespace: grafana-loki
spec:
ports:
- name: http-metrics
@@ -417,7 +417,7 @@ metadata:
app.kubernetes.io/version: 3.5.7
helm.sh/chart: loki-6.46.0
name: loki-memberlist
namespace: loki
namespace: grafana-loki
spec:
clusterIP: None
ports:
@@ -440,7 +440,7 @@ metadata:
app.kubernetes.io/name: loki
prometheus.io/service-monitor: "false"
name: loki-query-scheduler-discovery
namespace: loki
namespace: grafana-loki
spec:
clusterIP: None
ports:
@@ -469,7 +469,7 @@ metadata:
app.kubernetes.io/version: 3.5.7
helm.sh/chart: loki-6.46.0
name: loki-read
namespace: loki
namespace: grafana-loki
spec:
ports:
- name: http-metrics
@@ -496,7 +496,7 @@ metadata:
prometheus.io/service-monitor: "false"
variant: headless
name: loki-read-headless
namespace: loki
namespace: grafana-loki
spec:
clusterIP: None
ports:
@@ -525,7 +525,7 @@ metadata:
app.kubernetes.io/version: 3.5.7
helm.sh/chart: loki-6.46.0
name: loki-results-cache
namespace: loki
namespace: grafana-loki
spec:
clusterIP: None
ports:
@@ -551,7 +551,7 @@ metadata:
app.kubernetes.io/version: 3.5.7
helm.sh/chart: loki-6.46.0
name: loki-write
namespace: loki
namespace: grafana-loki
spec:
ports:
- name: http-metrics
@@ -578,7 +578,7 @@ metadata:
prometheus.io/service-monitor: "false"
variant: headless
name: loki-write-headless
namespace: loki
namespace: grafana-loki
spec:
clusterIP: None
ports:
@@ -607,7 +607,7 @@ metadata:
app.kubernetes.io/version: 3.5.7
helm.sh/chart: loki-6.46.0
name: loki-gateway
namespace: loki
namespace: grafana-loki
spec:
replicas: 1
revisionHistoryLimit: 10
@@ -621,7 +621,7 @@ spec:
template:
metadata:
annotations:
checksum/config: 551f2f0b8c3a57d612deebdb6e46ed5e64807c15eebb972a030549402e4e6183
checksum/config: 0bfd916d9c3159bef2fd8bad76d4e85a76b49ad1889d4aa25d93b16b27050c56
labels:
app.kubernetes.io/component: gateway
app.kubernetes.io/instance: loki
@@ -692,7 +692,7 @@ metadata:
app.kubernetes.io/version: 3.5.7
helm.sh/chart: loki-6.46.0
name: loki-read
namespace: loki
namespace: grafana-loki
spec:
replicas: 3
revisionHistoryLimit: 10
@@ -708,7 +708,7 @@ spec:
template:
metadata:
annotations:
checksum/config: a2fb9c19d9a78713b80fde0284ce0fb688151b2279ac622ecdbc55d9015069c7
checksum/config: 2208614b99a31f48a1436641a701107d60d563c7d716864eee13d617a1fe7964
labels:
app.kubernetes.io/component: read
app.kubernetes.io/instance: loki
@@ -730,7 +730,7 @@ spec:
- -config.file=/etc/loki/config/config.yaml
- -target=read
- -legacy-read-mode=false
- -common.compactor-grpc-address=loki-backend.loki.svc.cluster.local:9095
- -common.compactor-grpc-address=loki-backend.grafana-loki.svc.cluster.local:9095
- -config.expand-env=true
env:
- name: AWS_ACCESS_KEY_ID
@@ -814,7 +814,7 @@ metadata:
app.kubernetes.io/version: 3.5.7
helm.sh/chart: loki-6.46.0
name: loki-backend
namespace: loki
namespace: grafana-loki
spec:
persistentVolumeClaimRetentionPolicy:
whenDeleted: Delete
@@ -831,7 +831,7 @@ spec:
template:
metadata:
annotations:
checksum/config: a2fb9c19d9a78713b80fde0284ce0fb688151b2279ac622ecdbc55d9015069c7
checksum/config: 2208614b99a31f48a1436641a701107d60d563c7d716864eee13d617a1fe7964
kubectl.kubernetes.io/default-container: loki
labels:
app.kubernetes.io/component: backend
@@ -983,7 +983,7 @@ metadata:
helm.sh/chart: loki-6.46.0
name: memcached-chunks-cache
name: loki-chunks-cache
namespace: loki
namespace: grafana-loki
spec:
podManagementPolicy: Parallel
replicas: 1
@@ -1115,7 +1115,7 @@ metadata:
helm.sh/chart: loki-6.46.0
name: memcached-results-cache
name: loki-results-cache
namespace: loki
namespace: grafana-loki
spec:
podManagementPolicy: Parallel
replicas: 1
@@ -1247,7 +1247,7 @@ metadata:
app.kubernetes.io/version: 3.5.7
helm.sh/chart: loki-6.46.0
name: loki-write
namespace: loki
namespace: grafana-loki
spec:
podManagementPolicy: Parallel
replicas: 3
@@ -1261,7 +1261,7 @@ spec:
template:
metadata:
annotations:
checksum/config: a2fb9c19d9a78713b80fde0284ce0fb688151b2279ac622ecdbc55d9015069c7
checksum/config: 2208614b99a31f48a1436641a701107d60d563c7d716864eee13d617a1fe7964
labels:
app.kubernetes.io/component: write
app.kubernetes.io/instance: loki
@@ -1376,7 +1376,7 @@ metadata:
app.kubernetes.io/version: 3.5.7
helm.sh/chart: loki-6.46.0
name: loki-backend
namespace: loki
namespace: grafana-loki
spec:
maxUnavailable: 1
selector:
@@ -1395,7 +1395,7 @@ metadata:
app.kubernetes.io/version: 3.5.7
helm.sh/chart: loki-6.46.0
name: loki-read
namespace: loki
namespace: grafana-loki
spec:
maxUnavailable: 1
selector:
@@ -1414,7 +1414,7 @@ metadata:
app.kubernetes.io/version: 3.5.7
helm.sh/chart: loki-6.46.0
name: loki-write
namespace: loki
namespace: grafana-loki
spec:
maxUnavailable: 1
selector:
@@ -1433,7 +1433,7 @@ metadata:
app.kubernetes.io/version: 3.5.7
helm.sh/chart: loki-6.46.0
name: loki-canary
namespace: loki
namespace: grafana-loki
spec:
selector:
matchLabels:
@@ -1449,7 +1449,7 @@ spec:
spec:
containers:
- args:
- -addr=loki-gateway.loki.svc.cluster.local.:80
- -addr=loki-gateway.grafana-loki.svc.cluster.local.:80
- -labelname=pod
- -labelvalue=$(POD_NAME)
- -user=self-monitoring
@@ -1505,14 +1505,14 @@ metadata:
app.kubernetes.io/version: 3.5.7
helm.sh/chart: loki-6.46.0
name: loki-helm-test
namespace: loki
namespace: grafana-loki
spec:
containers:
- args:
- -test.v
env:
- name: CANARY_SERVICE_ADDRESS
value: http://loki-canary.loki.svc.cluster.local:3500/metrics
value: http://loki-canary.grafana-loki.svc.cluster.local:3500/metrics
- name: CANARY_PROMETHEUS_ADDRESS
value: ""
- name: CANARY_TEST_TIMEOUT

2
grafana-loki/src/kustomization.yaml
View File

@@ -8,5 +8,5 @@ helmCharts:
version: 6.46.0
releaseName: loki
includeCRDs: true
namespace: loki
namespace: grafana-loki
valuesFile: values.yaml