diff --git a/clusters/cl01tl/manifests/loki/ClusterRole-loki-clusterrole.yaml b/clusters/cl01tl/manifests/loki/ClusterRole-loki-clusterrole.yaml index 144d5d38f..3555cc833 100644 --- a/clusters/cl01tl/manifests/loki/ClusterRole-loki-clusterrole.yaml +++ b/clusters/cl01tl/manifests/loki/ClusterRole-loki-clusterrole.yaml @@ -2,10 +2,10 @@ kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: labels: - helm.sh/chart: loki-6.53.0 + helm.sh/chart: loki-6.55.0 app.kubernetes.io/name: loki app.kubernetes.io/instance: loki - app.kubernetes.io/version: "3.6.5" + app.kubernetes.io/version: "3.6.7" name: loki-clusterrole rules: - apiGroups: [""] diff --git a/clusters/cl01tl/manifests/loki/ClusterRoleBinding-loki-clusterrolebinding.yaml b/clusters/cl01tl/manifests/loki/ClusterRoleBinding-loki-clusterrolebinding.yaml index e18fed921..915ce6ad7 100644 --- a/clusters/cl01tl/manifests/loki/ClusterRoleBinding-loki-clusterrolebinding.yaml +++ b/clusters/cl01tl/manifests/loki/ClusterRoleBinding-loki-clusterrolebinding.yaml @@ -3,10 +3,10 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: loki-clusterrolebinding labels: - helm.sh/chart: loki-6.53.0 + helm.sh/chart: loki-6.55.0 app.kubernetes.io/name: loki app.kubernetes.io/instance: loki - app.kubernetes.io/version: "3.6.5" + app.kubernetes.io/version: "3.6.7" subjects: - kind: ServiceAccount name: loki diff --git a/clusters/cl01tl/manifests/loki/ConfigMap-loki-gateway.yaml b/clusters/cl01tl/manifests/loki/ConfigMap-loki-gateway.yaml index 65d4fa809..5c9fd27ee 100644 --- a/clusters/cl01tl/manifests/loki/ConfigMap-loki-gateway.yaml +++ b/clusters/cl01tl/manifests/loki/ConfigMap-loki-gateway.yaml @@ -4,10 +4,10 @@ metadata: name: loki-gateway namespace: loki labels: - helm.sh/chart: loki-6.53.0 + helm.sh/chart: loki-6.55.0 app.kubernetes.io/name: loki app.kubernetes.io/instance: loki - app.kubernetes.io/version: "3.6.5" + app.kubernetes.io/version: "3.6.7" app.kubernetes.io/component: gateway data: nginx.conf: "worker_processes 5; ## Default: 1\nerror_log /dev/stderr;\npid /tmp/nginx.pid;\nworker_rlimit_nofile 8192;\n\nevents {\n worker_connections 4096; ## Default: 1024\n}\n\nhttp {\n client_body_temp_path /tmp/client_temp;\n proxy_temp_path /tmp/proxy_temp_path;\n fastcgi_temp_path /tmp/fastcgi_temp;\n uwsgi_temp_path /tmp/uwsgi_temp;\n scgi_temp_path /tmp/scgi_temp;\n\n client_max_body_size 4M;\n\n proxy_read_timeout 600; ## 10 minutes\n proxy_send_timeout 600;\n proxy_connect_timeout 600;\n\n proxy_http_version 1.1;\n\n default_type application/octet-stream;\n log_format main '$remote_addr - $remote_user [$time_local] $status '\n '\"$request\" $body_bytes_sent \"$http_referer\" '\n '\"$http_user_agent\" \"$http_x_forwarded_for\"';\n access_log /dev/stderr main;\n\n sendfile on;\n tcp_nopush on;\n resolver kube-dns.kube-system.svc.cluster.local.;\n\n # if the X-Query-Tags header is empty, set a noop= without a value as empty values are not logged\n map $http_x_query_tags $query_tags {\n \"\" \"noop=\"; # When header is empty, set noop=\n default $http_x_query_tags; # Otherwise, preserve the original value\n }\n\n server {\n listen 8080;\n 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.loki.svc.cluster.local:3100$request_uri;\n }\n\n # Distributor\n location = /api/prom/push {\n \n proxy_pass http://loki.loki.svc.cluster.local:3100$request_uri;\n }\n location = /loki/api/v1/push {\n \n proxy_pass http://loki.loki.svc.cluster.local:3100$request_uri;\n }\n location = /distributor/ring {\n \n proxy_pass http://loki.loki.svc.cluster.local:3100$request_uri;\n }\n location = /otlp/v1/logs {\n \n proxy_pass http://loki.loki.svc.cluster.local:3100$request_uri;\n }\n\n # Ingester\n location = /flush {\n \n proxy_pass http://loki.loki.svc.cluster.local:3100$request_uri;\n }\n location ^~ /ingester/ {\n \n proxy_pass http://loki.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.loki.svc.cluster.local:3100$request_uri;\n }\n\n # MemberListKV\n location = /memberlist {\n \n proxy_pass http://loki.loki.svc.cluster.local:3100$request_uri;\n }\n\n # Ruler\n location = /ruler/ring {\n \n proxy_pass http://loki.loki.svc.cluster.local:3100$request_uri;\n }\n location = /api/prom/rules {\n \n proxy_pass http://loki.loki.svc.cluster.local:3100$request_uri;\n }\n location ^~ /api/prom/rules/ {\n \n proxy_pass http://loki.loki.svc.cluster.local:3100$request_uri;\n }\n location = /loki/api/v1/rules {\n \n proxy_pass http://loki.loki.svc.cluster.local:3100$request_uri;\n }\n location ^~ /loki/api/v1/rules/ {\n \n proxy_pass http://loki.loki.svc.cluster.local:3100$request_uri;\n }\n location = /prometheus/api/v1/alerts {\n \n proxy_pass http://loki.loki.svc.cluster.local:3100$request_uri;\n }\n location = /prometheus/api/v1/rules {\n \n proxy_pass http://loki.loki.svc.cluster.local:3100$request_uri;\n }\n\n # Compactor\n location = /compactor/ring {\n \n proxy_pass http://loki.loki.svc.cluster.local:3100$request_uri;\n }\n location = /loki/api/v1/delete {\n \n proxy_pass http://loki.loki.svc.cluster.local:3100$request_uri;\n }\n location = /loki/api/v1/cache/generation_numbers {\n \n proxy_pass http://loki.loki.svc.cluster.local:3100$request_uri;\n }\n\n # IndexGateway\n location = /indexgateway/ring {\n \n proxy_pass http://loki.loki.svc.cluster.local:3100$request_uri;\n }\n\n # QueryScheduler\n location = /scheduler/ring {\n \n proxy_pass http://loki.loki.svc.cluster.local:3100$request_uri;\n }\n\n # Config\n location = /config {\n \n proxy_pass http://loki.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.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.loki.svc.cluster.local:3100$request_uri;\n }\n location ^~ /api/prom/ {\n \n proxy_pass http://loki.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.loki.svc.cluster.local:3100$request_uri;\n }\n location = /loki/api/v1 {\n \n internal; # to suppress 301\n }\n }\n}\n" diff --git a/clusters/cl01tl/manifests/loki/ConfigMap-loki-runtime.yaml b/clusters/cl01tl/manifests/loki/ConfigMap-loki-runtime.yaml index 0f441bc5b..01b22c4f6 100644 --- a/clusters/cl01tl/manifests/loki/ConfigMap-loki-runtime.yaml +++ b/clusters/cl01tl/manifests/loki/ConfigMap-loki-runtime.yaml @@ -4,10 +4,10 @@ metadata: name: loki-runtime namespace: loki labels: - helm.sh/chart: loki-6.53.0 + helm.sh/chart: loki-6.55.0 app.kubernetes.io/name: loki app.kubernetes.io/instance: loki - app.kubernetes.io/version: "3.6.5" + app.kubernetes.io/version: "3.6.7" data: runtime-config.yaml: | {} diff --git a/clusters/cl01tl/manifests/loki/ConfigMap-loki.yaml b/clusters/cl01tl/manifests/loki/ConfigMap-loki.yaml index f2b89870c..e12f58d9a 100644 --- a/clusters/cl01tl/manifests/loki/ConfigMap-loki.yaml +++ b/clusters/cl01tl/manifests/loki/ConfigMap-loki.yaml @@ -4,10 +4,10 @@ metadata: name: loki namespace: loki labels: - helm.sh/chart: loki-6.53.0 + helm.sh/chart: loki-6.55.0 app.kubernetes.io/name: loki app.kubernetes.io/instance: loki - app.kubernetes.io/version: "3.6.5" + app.kubernetes.io/version: "3.6.7" data: config.yaml: |2 diff --git a/clusters/cl01tl/manifests/loki/DaemonSet-loki-canary.yaml b/clusters/cl01tl/manifests/loki/DaemonSet-loki-canary.yaml index 14090d13d..605c7aef8 100644 --- a/clusters/cl01tl/manifests/loki/DaemonSet-loki-canary.yaml +++ b/clusters/cl01tl/manifests/loki/DaemonSet-loki-canary.yaml @@ -4,10 +4,10 @@ metadata: name: loki-canary namespace: loki labels: - helm.sh/chart: loki-6.53.0 + helm.sh/chart: loki-6.55.0 app.kubernetes.io/name: loki app.kubernetes.io/instance: loki - app.kubernetes.io/version: "3.6.5" + app.kubernetes.io/version: "3.6.7" app.kubernetes.io/component: canary spec: selector: @@ -35,7 +35,7 @@ spec: runAsUser: 10001 containers: - name: loki-canary - image: docker.io/grafana/loki-canary:3.6.5 + image: docker.io/grafana/loki-canary:3.6.7 imagePullPolicy: IfNotPresent args: - -addr=loki-gateway.loki.svc.cluster.local.:80 diff --git a/clusters/cl01tl/manifests/loki/Deployment-loki-gateway.yaml b/clusters/cl01tl/manifests/loki/Deployment-loki-gateway.yaml index 5a23ef994..cdf48fe26 100644 --- a/clusters/cl01tl/manifests/loki/Deployment-loki-gateway.yaml +++ b/clusters/cl01tl/manifests/loki/Deployment-loki-gateway.yaml @@ -4,10 +4,10 @@ metadata: name: loki-gateway namespace: loki labels: - helm.sh/chart: loki-6.53.0 + helm.sh/chart: loki-6.55.0 app.kubernetes.io/name: loki app.kubernetes.io/instance: loki - app.kubernetes.io/version: "3.6.5" + app.kubernetes.io/version: "3.6.7" app.kubernetes.io/component: gateway spec: replicas: 1 diff --git a/clusters/cl01tl/manifests/loki/Pod-loki-helm-test.yaml b/clusters/cl01tl/manifests/loki/Pod-loki-helm-test.yaml index 36058726b..fb905727d 100644 --- a/clusters/cl01tl/manifests/loki/Pod-loki-helm-test.yaml +++ b/clusters/cl01tl/manifests/loki/Pod-loki-helm-test.yaml @@ -4,10 +4,10 @@ metadata: name: "loki-helm-test" namespace: loki labels: - helm.sh/chart: loki-6.53.0 + helm.sh/chart: loki-6.55.0 app.kubernetes.io/name: loki app.kubernetes.io/instance: loki - app.kubernetes.io/version: "3.6.5" + app.kubernetes.io/version: "3.6.7" app.kubernetes.io/component: helm-test annotations: "helm.sh/hook": test diff --git a/clusters/cl01tl/manifests/loki/Service-loki-canary.yaml b/clusters/cl01tl/manifests/loki/Service-loki-canary.yaml index 638f5c40f..05c108e0e 100644 --- a/clusters/cl01tl/manifests/loki/Service-loki-canary.yaml +++ b/clusters/cl01tl/manifests/loki/Service-loki-canary.yaml @@ -4,10 +4,10 @@ metadata: name: loki-canary namespace: loki labels: - helm.sh/chart: loki-6.53.0 + helm.sh/chart: loki-6.55.0 app.kubernetes.io/name: loki app.kubernetes.io/instance: loki - app.kubernetes.io/version: "3.6.5" + app.kubernetes.io/version: "3.6.7" app.kubernetes.io/component: canary annotations: spec: diff --git a/clusters/cl01tl/manifests/loki/Service-loki-chunks-cache.yaml b/clusters/cl01tl/manifests/loki/Service-loki-chunks-cache.yaml index a54eb6b73..e11e77cde 100644 --- a/clusters/cl01tl/manifests/loki/Service-loki-chunks-cache.yaml +++ b/clusters/cl01tl/manifests/loki/Service-loki-chunks-cache.yaml @@ -3,10 +3,10 @@ kind: Service metadata: name: loki-chunks-cache labels: - helm.sh/chart: loki-6.53.0 + helm.sh/chart: loki-6.55.0 app.kubernetes.io/name: loki app.kubernetes.io/instance: loki - app.kubernetes.io/version: "3.6.5" + app.kubernetes.io/version: "3.6.7" app.kubernetes.io/component: "memcached-chunks-cache" annotations: {} namespace: "loki" diff --git a/clusters/cl01tl/manifests/loki/Service-loki-gateway.yaml b/clusters/cl01tl/manifests/loki/Service-loki-gateway.yaml index 1a60809f5..e76a1c56a 100644 --- a/clusters/cl01tl/manifests/loki/Service-loki-gateway.yaml +++ b/clusters/cl01tl/manifests/loki/Service-loki-gateway.yaml @@ -4,10 +4,10 @@ metadata: name: loki-gateway namespace: loki labels: - helm.sh/chart: loki-6.53.0 + helm.sh/chart: loki-6.55.0 app.kubernetes.io/name: loki app.kubernetes.io/instance: loki - app.kubernetes.io/version: "3.6.5" + app.kubernetes.io/version: "3.6.7" app.kubernetes.io/component: gateway prometheus.io/service-monitor: "false" annotations: diff --git a/clusters/cl01tl/manifests/loki/Service-loki-headless.yaml b/clusters/cl01tl/manifests/loki/Service-loki-headless.yaml index c100c2b87..ff58b51dd 100644 --- a/clusters/cl01tl/manifests/loki/Service-loki-headless.yaml +++ b/clusters/cl01tl/manifests/loki/Service-loki-headless.yaml @@ -4,10 +4,10 @@ metadata: name: loki-headless namespace: loki labels: - helm.sh/chart: loki-6.53.0 + helm.sh/chart: loki-6.55.0 app.kubernetes.io/name: loki app.kubernetes.io/instance: loki - app.kubernetes.io/version: "3.6.5" + app.kubernetes.io/version: "3.6.7" variant: headless prometheus.io/service-monitor: "false" annotations: diff --git a/clusters/cl01tl/manifests/loki/Service-loki-memberlist.yaml b/clusters/cl01tl/manifests/loki/Service-loki-memberlist.yaml index 2e53c9a44..7dfa8e78d 100644 --- a/clusters/cl01tl/manifests/loki/Service-loki-memberlist.yaml +++ b/clusters/cl01tl/manifests/loki/Service-loki-memberlist.yaml @@ -4,10 +4,10 @@ metadata: name: loki-memberlist namespace: loki labels: - helm.sh/chart: loki-6.53.0 + helm.sh/chart: loki-6.55.0 app.kubernetes.io/name: loki app.kubernetes.io/instance: loki - app.kubernetes.io/version: "3.6.5" + app.kubernetes.io/version: "3.6.7" annotations: spec: type: ClusterIP diff --git a/clusters/cl01tl/manifests/loki/Service-loki-results-cache.yaml b/clusters/cl01tl/manifests/loki/Service-loki-results-cache.yaml index 34eda366b..1e09f93bd 100644 --- a/clusters/cl01tl/manifests/loki/Service-loki-results-cache.yaml +++ b/clusters/cl01tl/manifests/loki/Service-loki-results-cache.yaml @@ -3,10 +3,10 @@ kind: Service metadata: name: loki-results-cache labels: - helm.sh/chart: loki-6.53.0 + helm.sh/chart: loki-6.55.0 app.kubernetes.io/name: loki app.kubernetes.io/instance: loki - app.kubernetes.io/version: "3.6.5" + app.kubernetes.io/version: "3.6.7" app.kubernetes.io/component: "memcached-results-cache" annotations: {} namespace: "loki" diff --git a/clusters/cl01tl/manifests/loki/Service-loki.yaml b/clusters/cl01tl/manifests/loki/Service-loki.yaml index 13fdfe3c9..7932bd841 100644 --- a/clusters/cl01tl/manifests/loki/Service-loki.yaml +++ b/clusters/cl01tl/manifests/loki/Service-loki.yaml @@ -4,10 +4,10 @@ metadata: name: loki namespace: loki labels: - helm.sh/chart: loki-6.53.0 + helm.sh/chart: loki-6.55.0 app.kubernetes.io/name: loki app.kubernetes.io/instance: loki - app.kubernetes.io/version: "3.6.5" + app.kubernetes.io/version: "3.6.7" annotations: spec: type: ClusterIP diff --git a/clusters/cl01tl/manifests/loki/ServiceAccount-loki-canary.yaml b/clusters/cl01tl/manifests/loki/ServiceAccount-loki-canary.yaml index 83a25dbd6..8ac5ed1d1 100644 --- a/clusters/cl01tl/manifests/loki/ServiceAccount-loki-canary.yaml +++ b/clusters/cl01tl/manifests/loki/ServiceAccount-loki-canary.yaml @@ -4,9 +4,9 @@ metadata: name: loki-canary namespace: loki labels: - helm.sh/chart: loki-6.53.0 + helm.sh/chart: loki-6.55.0 app.kubernetes.io/name: loki app.kubernetes.io/instance: loki - app.kubernetes.io/version: "3.6.5" + app.kubernetes.io/version: "3.6.7" app.kubernetes.io/component: canary automountServiceAccountToken: true diff --git a/clusters/cl01tl/manifests/loki/ServiceAccount-loki.yaml b/clusters/cl01tl/manifests/loki/ServiceAccount-loki.yaml index 779fe396a..e1a8c4fa2 100644 --- a/clusters/cl01tl/manifests/loki/ServiceAccount-loki.yaml +++ b/clusters/cl01tl/manifests/loki/ServiceAccount-loki.yaml @@ -4,8 +4,8 @@ metadata: name: loki namespace: loki labels: - helm.sh/chart: loki-6.53.0 + helm.sh/chart: loki-6.55.0 app.kubernetes.io/name: loki app.kubernetes.io/instance: loki - app.kubernetes.io/version: "3.6.5" + app.kubernetes.io/version: "3.6.7" automountServiceAccountToken: true diff --git a/clusters/cl01tl/manifests/loki/StatefulSet-loki-chunks-cache.yaml b/clusters/cl01tl/manifests/loki/StatefulSet-loki-chunks-cache.yaml index f61b4f0ad..a2b35d6b9 100644 --- a/clusters/cl01tl/manifests/loki/StatefulSet-loki-chunks-cache.yaml +++ b/clusters/cl01tl/manifests/loki/StatefulSet-loki-chunks-cache.yaml @@ -3,10 +3,10 @@ kind: StatefulSet metadata: name: loki-chunks-cache labels: - helm.sh/chart: loki-6.53.0 + helm.sh/chart: loki-6.55.0 app.kubernetes.io/name: loki app.kubernetes.io/instance: loki - app.kubernetes.io/version: "3.6.5" + app.kubernetes.io/version: "3.6.7" app.kubernetes.io/component: "memcached-chunks-cache" name: "memcached-chunks-cache" annotations: {} diff --git a/clusters/cl01tl/manifests/loki/StatefulSet-loki-results-cache.yaml b/clusters/cl01tl/manifests/loki/StatefulSet-loki-results-cache.yaml index 97971c1b6..2d8c9a8e7 100644 --- a/clusters/cl01tl/manifests/loki/StatefulSet-loki-results-cache.yaml +++ b/clusters/cl01tl/manifests/loki/StatefulSet-loki-results-cache.yaml @@ -3,10 +3,10 @@ kind: StatefulSet metadata: name: loki-results-cache labels: - helm.sh/chart: loki-6.53.0 + helm.sh/chart: loki-6.55.0 app.kubernetes.io/name: loki app.kubernetes.io/instance: loki - app.kubernetes.io/version: "3.6.5" + app.kubernetes.io/version: "3.6.7" app.kubernetes.io/component: "memcached-results-cache" name: "memcached-results-cache" annotations: {} diff --git a/clusters/cl01tl/manifests/loki/StatefulSet-loki.yaml b/clusters/cl01tl/manifests/loki/StatefulSet-loki.yaml index d83ff6bae..c58929f25 100644 --- a/clusters/cl01tl/manifests/loki/StatefulSet-loki.yaml +++ b/clusters/cl01tl/manifests/loki/StatefulSet-loki.yaml @@ -4,10 +4,10 @@ metadata: name: loki namespace: loki labels: - helm.sh/chart: loki-6.53.0 + helm.sh/chart: loki-6.55.0 app.kubernetes.io/name: loki app.kubernetes.io/instance: loki - app.kubernetes.io/version: "3.6.5" + app.kubernetes.io/version: "3.6.7" app.kubernetes.io/component: single-binary app.kubernetes.io/part-of: memberlist spec: @@ -50,7 +50,7 @@ spec: terminationGracePeriodSeconds: 30 containers: - name: loki - image: docker.io/grafana/loki:3.6.5 + image: docker.io/grafana/loki:3.6.7 imagePullPolicy: IfNotPresent args: - -config.file=/etc/loki/config/config.yaml @@ -93,7 +93,7 @@ spec: mountPath: "/rules" resources: {} - name: loki-sc-rules - image: docker.io/kiwigrid/k8s-sidecar:1.30.9 + image: docker.io/kiwigrid/k8s-sidecar:2.5.0 imagePullPolicy: IfNotPresent env: - name: METHOD @@ -117,6 +117,8 @@ spec: - ALL readOnlyRootFilesystem: true volumeMounts: + - name: tmp + mountPath: /tmp - name: sc-rules-volume mountPath: "/rules" affinity: