feat(cortex-nginx): optional override push endpoint (#522)

* feat(cortex-nginx): provide optional override push endpoint

Signed-off-by: locmai <[email protected]>

* chore: update README.md and CHANGELOG.md

Signed-off-by: locmai <[email protected]>

* fix: make it DRY and elegant

Signed-off-by: locmai <[email protected]>

---------

Signed-off-by: locmai <[email protected]>

Author: locmai

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## master / unreleased
 
 * [DEPENDENCY] Update quay.io/cortexproject/cortex Docker tag to v1.19.0 #521
+* [ENHANCEMENT] Add `nginx.config.override_push_endpoint` field to override push endpoint in the nginx configuration #522
 
 ## 2.5.0 / 2025-01-17
 

README.md

@@ -440,6 +440,7 @@ Kubernetes: `^1.19.0-0`
 | nginx.​config.​dnsTTL | string | `"15s"` | Including the valid parameter to the `resolver` directive to re-resolve names every `dnsTTL` seconds/minutes |
 | nginx.​config.​httpSnippet | string | `""` | arbitrary snippet to inject in the http { } section of the nginx config |
 | nginx.​config.​mainSnippet | string | `""` | arbitrary snippet to inject in the top section of the nginx config |
+| nginx.​config.​override_push_endpoint | string | `""` |  |
 | nginx.​config.​serverSnippet | string | `""` | arbitrary snippet to inject in the server { } section of the nginx config |
 | nginx.​config.​setHeaders | object | `{}` |  |
 | nginx.​config.​upstream_protocol | string | `"http"` | protocol for the communication with the upstream |

templates/nginx/nginx-config.yaml

@@ -87,16 +87,16 @@ data:
         location = /all_user_stats {
           proxy_pass      {{ .Values.nginx.config.upstream_protocol }}://{{ template "cortex.fullname" . }}-distributor.{{ $rootDomain }}$request_uri;
         }
-
+        {{- $push_endpoint := .Values.nginx.config.override_push_endpoint | default (printf "%s://%s-distributor.%s" .Values.nginx.config.upstream_protocol (include "cortex.fullname" .) $rootDomain) }}
+        # Push API endpoints
         location = /api/prom/push {
-          proxy_pass      {{ .Values.nginx.config.upstream_protocol }}://{{ template "cortex.fullname" . }}-distributor.{{ $rootDomain }}$request_uri;
+          proxy_pass      {{ $push_endpoint }}$request_uri;
         }
 
         ## New Remote write API. Ref: https://cortexmetrics.io/docs/api/#remote-write
         location = /api/v1/push {
-          proxy_pass      {{ .Values.nginx.config.upstream_protocol }}://{{ template "cortex.fullname" . }}-distributor.{{ $rootDomain }}$request_uri;
+          proxy_pass      {{ $push_endpoint }}$request_uri;
         }
-
         {{- end }}
 
         {{- if .Values.alertmanager.enabled }}

values.yaml

@@ -1239,6 +1239,10 @@ nginx:
     dnsTTL: "15s"
     # -- Enables all access logs from nginx, otherwise ignores 2XX and 3XX status codes
     verboseLogging: true
+
+    ## -- Optional: Override the URL for push endpoints (/api/prom/push and /api/v1/push)
+    ## If not specified, the default URL will be used, corresponding to the distributor service URL
+    override_push_endpoint: ""
   image:
     repository: nginx
     tag: 1.23