Merge pull request #3206 from rsicart/rsi/loki-distributed-force-ngin…

…x-resolve-dns-proxy-pass [loki-distributed] fix: force nginx gateway to resolve upstream hostname on missing locations
grafana · Aug 12, 2024 · 3d188c3 · 3d188c3
2 parents d50fcf1 + 648d633
commit 3d188c3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/charts/loki-distributed/Chart.yaml b/charts/loki-distributed/Chart.yaml
@@ -3,7 +3,7 @@ name: loki-distributed
 description: Helm chart for Grafana Loki in microservices mode
 type: application
 appVersion: 2.9.8
-version: 0.79.2
+version: 0.79.3
 home: https://grafana.github.io/helm-charts
 sources:
   - https://github.com/grafana/loki

diff --git a/charts/loki-distributed/README.md b/charts/loki-distributed/README.md
@@ -1,6 +1,6 @@
 # loki-distributed
 
-![Version: 0.79.2](https://img.shields.io/badge/Version-0.79.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.8](https://img.shields.io/badge/AppVersion-2.9.8-informational?style=flat-square)
+![Version: 0.79.3](https://img.shields.io/badge/Version-0.79.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.8](https://img.shields.io/badge/AppVersion-2.9.8-informational?style=flat-square)
 
 Helm chart for Grafana Loki in microservices mode
 

diff --git a/charts/loki-distributed/values.yaml b/charts/loki-distributed/values.yaml
@@ -1284,16 +1284,20 @@ gateway:
 
           # Ruler
           location ~ /prometheus/api/v1/alerts.* {
-            proxy_pass       http://{{ include "loki.rulerFullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.global.clusterDomain }}:3100$request_uri;
+            set $prometheus_api_v1_alerts_backend http://{{ include "loki.rulerFullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.global.clusterDomain }};
+            proxy_pass       $prometheus_api_v1_alerts_backend:3100$request_uri;
           }
           location ~ /prometheus/api/v1/rules.* {
-            proxy_pass       http://{{ include "loki.rulerFullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.global.clusterDomain }}:3100$request_uri;
+            set $prometheus_api_v1_rules_backend http://{{ include "loki.rulerFullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.global.clusterDomain }};
+            proxy_pass       $prometheus_api_v1_rules_backend:3100$request_uri;
           }
           location ~ /api/prom/rules.* {
-            proxy_pass       http://{{ include "loki.rulerFullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.global.clusterDomain }}:3100$request_uri;
+            set $api_prom_rules_backend http://{{ include "loki.rulerFullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.global.clusterDomain }};
+            proxy_pass       $api_prom_rules_backend:3100$request_uri;
           }
           location ~ /api/prom/alerts.* {
-            proxy_pass       http://{{ include "loki.rulerFullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.global.clusterDomain }}:3100$request_uri;
+            set $api_prom_alerts_backend http://{{ include "loki.rulerFullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.global.clusterDomain }};
+            proxy_pass       $api_prom_alerts_backend:3100$request_uri;
           }
 
           location ~ /api/prom/.* {