--- kubernetes/apps/monitoring/loki/app Kustomization: monitoring/loki OCIRepository: monitoring/loki

+++ kubernetes/apps/monitoring/loki/app Kustomization: monitoring/loki OCIRepository: monitoring/loki

@@ -11,9 +11,9 @@

 spec:
   interval: 5m
   layerSelector:
     mediaType: application/vnd.cncf.helm.chart.content.v1.tar+gzip
     operation: copy
   ref:
-    tag: 6.31.0
+    tag: 6.32.0
   url: oci://ghcr.io/grafana/helm-charts/loki
 

--- HelmRelease: monitoring/loki ConfigMap: monitoring/loki-gateway

+++ HelmRelease: monitoring/loki ConfigMap: monitoring/loki-gateway

@@ -17,15 +17,23 @@

     \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\n  server {\n    listen\
-    \             8080;\n    listen             [::]:8080;\n\n    location = / {\n\
-    \      return 200 'OK';\n      auth_basic off;\n    }\n\n    ########################################################\n\
+    \  resolver kube-dns.kube-system.svc.cluster.local.;\n  \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  # 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  proxy_set_header Upgrade $http_upgrade;\n  proxy_set_header Connection \"\
+    upgrade\";\n\n  server {\n    listen             8080;\n    listen           \
+    \  [::]:8080;\n\n    location = / {\n      return 200 'OK';\n      auth_basic\
+    \ off;\n    }\n\n    ########################################################\n\
     \    # Configure backend targets\n    location ^~ /ui {\n      proxy_pass    \
     \   http://loki.monitoring.svc.cluster.local:3100$request_uri;\n    }\n\n    #\
     \ Distributor\n    location = /api/prom/push {\n      proxy_pass       http://loki.monitoring.svc.cluster.local:3100$request_uri;\n\
     \    }\n    location = /loki/api/v1/push {\n      proxy_pass       http://loki.monitoring.svc.cluster.local:3100$request_uri;\n\
     \    }\n    location = /distributor/ring {\n      proxy_pass       http://loki.monitoring.svc.cluster.local:3100$request_uri;\n\
     \    }\n    location = /otlp/v1/logs {\n      proxy_pass       http://loki.monitoring.svc.cluster.local:3100$request_uri;\n\
@@ -50,22 +58,13 @@

     \    # IndexGateway\n    location = /indexgateway/ring {\n      proxy_pass   \
     \    http://loki.monitoring.svc.cluster.local:3100$request_uri;\n    }\n\n   \
     \ # QueryScheduler\n    location = /scheduler/ring {\n      proxy_pass       http://loki.monitoring.svc.cluster.local:3100$request_uri;\n\
     \    }\n\n    # Config\n    location = /config {\n      proxy_pass       http://loki.monitoring.svc.cluster.local:3100$request_uri;\n\
     \    }\n\n\n    # QueryFrontend, Querier\n    location = /api/prom/tail {\n  \
     \    proxy_pass       http://loki.monitoring.svc.cluster.local:3100$request_uri;\n\
-    \      proxy_set_header Upgrade $http_upgrade;\n      proxy_set_header Connection\
-    \ \"upgrade\";\n    }\n    location = /loki/api/v1/tail {\n      proxy_pass  \
-    \     http://loki.monitoring.svc.cluster.local:3100$request_uri;\n      proxy_set_header\
-    \ Upgrade $http_upgrade;\n      proxy_set_header Connection \"upgrade\";\n   \
-    \ }\n    location ^~ /api/prom/ {\n      proxy_pass       http://loki.monitoring.svc.cluster.local:3100$request_uri;\n\
+    \    }\n    location = /loki/api/v1/tail {\n      proxy_pass       http://loki.monitoring.svc.cluster.local:3100$request_uri;\n\
+    \    }\n    location ^~ /api/prom/ {\n      proxy_pass       http://loki.monitoring.svc.cluster.local:3100$request_uri;\n\
     \    }\n    location = /api/prom {\n      internal;        # to suppress 301\n\
-    \    }\n    # if the X-Query-Tags header is empty, set a noop= without a value\
-    \ as empty values are not logged\n    set $query_tags $http_x_query_tags;\n  \
-    \  if ($query_tags !~* '') {\n      set $query_tags \"noop=\";\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      proxy_pass       http://loki.monitoring.svc.cluster.local:3100$request_uri;\n\
+    \    }\n    location ^~ /loki/api/v1/ {\n      proxy_pass       http://loki.monitoring.svc.cluster.local:3100$request_uri;\n\
     \    }\n    location = /loki/api/v1 {\n      internal;        # to suppress 301\n\
     \    }\n  }\n}\n"
 
--- HelmRelease: monitoring/loki Deployment: monitoring/loki-gateway

+++ HelmRelease: monitoring/loki Deployment: monitoring/loki-gateway

@@ -32,13 +32,13 @@

         runAsGroup: 101
         runAsNonRoot: true
         runAsUser: 101
       terminationGracePeriodSeconds: 30
       containers:
       - name: nginx
-        image: docker.io/nginxinc/nginx-unprivileged:1.28-alpine
+        image: docker.io/nginxinc/nginx-unprivileged:1.29-alpine
         imagePullPolicy: IfNotPresent
         ports:
         - name: http-metrics
           containerPort: 8080
           protocol: TCP
         readinessProbe:
--- HelmRelease: monitoring/loki StatefulSet: monitoring/loki

+++ HelmRelease: monitoring/loki StatefulSet: monitoring/loki

@@ -72,13 +72,13 @@

             - ALL
           readOnlyRootFilesystem: true
         volumeMounts:
         - name: sc-rules-volume
           mountPath: /rules/fake
       - name: loki
-        image: docker.io/grafana/loki:3.5.1
+        image: docker.io/grafana/loki:3.5.2
         imagePullPolicy: IfNotPresent
         args:
         - -config.file=/etc/loki/config/config.yaml
         - -target=all
         ports:
         - name: http-metrics