Merge branch 'master' into dependabot/go_modules/go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp-1.43.0

Signed-off-by: Friedrich Gonzalez <1517449+friedrichg@users.noreply.github.com>

Author: friedrichg

CHANGELOG.md

@@ -1,7 +1,11 @@
 # Changelog
 
 ## master / unreleased
+<<<<<<< dependabot/go_modules/go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp-1.43.0
 * [CHANGE] Tracing: gRPC upgrade to 1.80.0 causes OTLP trace exporter `pick_first` policy to randomly shuffle endpoints by default. Connections to OTLP collectors behind DNS will now spread across instances instead of always connecting to the first one. #7405
+=======
+* [FEATURE] Ruler: Add per-tenant `ruler_alert_generator_url_template` runtime config option to customize alert generator URLs using Go templates. Supports Grafana Explore, Perses, and other UIs. #7302
+>>>>>>> master
 * [FEATURE] Distributor: Add experimental `-distributor.enable-start-timestamp` flag for Prometheus Remote Write 2.0. When enabled, `StartTimestamp (ST)` is ingested. #7371
 * [FEATURE] Memberlist: Add `-memberlist.cluster-label` and `-memberlist.cluster-label-verification-disabled` to prevent accidental cross-cluster gossip joins and support rolling label rollout. #7385
 * [FEATURE] Querier: Add timeout classification to classify query timeouts as 4XX (user error) or 5XX (system error) based on phase timing. When enabled, queries that spend most of their time in PromQL evaluation return `422 Unprocessable Entity` instead of `503 Service Unavailable`. #7374

docs/configuration/config-file-reference.md

@@ -4388,6 +4388,16 @@ query_rejection:
 # external labels for alerting rules
 [ruler_external_labels: <map of string (labelName) to string (labelValue)> | default = []]
 
+# Per-tenant external URL for the ruler. If set, it overrides the global
+# -ruler.external.url for this tenant's alert notifications.
+[ruler_external_url: <string> | default = ""]
+
+# Go text/template for alert generator URLs. Available variables: .ExternalURL
+# (resolved external URL) and .Expression (PromQL expression). Built-in
+# functions like urlquery are available. If empty, uses default Prometheus
+# /graph format.
+[ruler_alert_generator_url_template: <string> | default = ""]
+
 # Enable to allow rules to be evaluated with data from a single zone, if other
 # zones are not available.
 [rules_partial_data: <boolean> | default = false]

docs/getting-started/.env

@@ -2,4 +2,4 @@ CORTEX_VERSION=v1.20.1
 GRAFANA_VERSION=10.4.2
 PROMETHEUS_VERSION=v3.2.1
 SEAWEEDFS_VERSION=3.67
-PERSES_VERSION=v0.49-distroless-debug
+PERSES_VERSION=v0.53.1-distroless-debug

docs/getting-started/cortex-config.yaml

@@ -82,6 +82,14 @@ frontend_worker:
 # https://cortexmetrics.io/docs/configuration/configuration-file/#ruler_config
 ruler:
   enable_api: true
+  external_url: http://localhost:9009
+  alertmanager_url: http://localhost:9009/alertmanager
+
+# Per-tenant runtime configuration (hot-reloaded without restart).
+# This file configures per-tenant overrides such as custom alert generator
+# URL templates for Grafana, Perses, or any metrics explorer.
+runtime_config:
+  file: /config/runtime-config.yaml
 
 # https://cortexmetrics.io/docs/configuration/configuration-file/#ruler_storage_config
 ruler_storage:

docs/getting-started/docker-compose.yaml

@@ -17,6 +17,7 @@ services:
       - -config.file=/config/cortex-config.yaml
     volumes:
       - ./cortex-config.yaml:/config/cortex-config.yaml:ro
+      - ./runtime-config.yaml:/config/runtime-config.yaml:ro
     ports:
       - "9009:9009"
     healthcheck:
@@ -47,6 +48,8 @@ services:
     volumes:
       - ./perses/config.yaml:/etc/perses/config/config.yaml:ro
       - ./perses/datasource.yaml:/etc/perses/resources/datasource.yaml:ro
+      - ./perses/datasource-tenant-a.yaml:/etc/perses/resources/datasource-tenant-a.yaml:ro
+      - ./perses/datasource-tenant-b.yaml:/etc/perses/resources/datasource-tenant-b.yaml:ro
       - ./perses/project.yaml:/etc/perses/resources/project.yaml:ro
       - ./perses/dashboards/cortex-writes.yaml:/etc/perses/resources/cortex-writes.yaml:ro
   prometheus:

docs/getting-started/grafana-datasource-docker.yaml

@@ -5,6 +5,7 @@ apiVersion: 1
 datasources:
   - name: Cortex
     type: prometheus
+    uid: cortex
     access: proxy
     orgId: 1
     url: http://cortex:9009/api/prom
@@ -22,6 +23,7 @@ datasources:
     isDefault: true
   - name: Tenant A
     type: prometheus
+    uid: tenant-a
     access: proxy
     orgId: 1
     url: http://cortex:9009/api/prom
@@ -71,3 +73,25 @@ datasources:
     secureJsonData:
       httpHeaderValue1: cortex
     version: 1
+  - orgId: 1
+    name: Tenant A Alertmanager
+    type: alertmanager
+    access: proxy
+    url: http://cortex:9009/
+    jsonData:
+      httpHeaderName1: X-Scope-OrgID
+      implementation: cortex
+    secureJsonData:
+      httpHeaderValue1: tenant-a
+    version: 1
+  - orgId: 1
+    name: Tenant B Alertmanager
+    type: alertmanager
+    access: proxy
+    url: http://cortex:9009/
+    jsonData:
+      httpHeaderName1: X-Scope-OrgID
+      implementation: cortex
+    secureJsonData:
+      httpHeaderValue1: tenant-b
+    version: 1

docs/getting-started/perses/config.yaml

@@ -8,14 +8,19 @@ security:
 database:
   file:
     extension: yaml
-    folder: /perses
+    folder: /tmp/perses-data
 
 schemas:
   datasources_path: /etc/perses/cue/schemas/datasources
   interval: 5m
   panels_path: /etc/perses/cue/schemas/panels
   queries_path: /etc/perses/cue/schemas/queries
   variables_path: /etc/perses/cue/schemas/variables
+
+frontend:
+  explorer:
+    enable: true
+
 provisioning:
   folders:
     - /etc/perses/resources

docs/getting-started/perses/dashboards/cortex-writes.yaml

@@ -4,7 +4,7 @@ metadata:
     createdAt: 2025-03-24T19:15:47.468680767Z
     updatedAt: 2025-03-24T19:43:53.000136362Z
     version: 12
-    project: default
+    project: cortex
 spec:
     display:
         name: Cortex / Writes

docs/getting-started/perses/datasource-tenant-a.yaml

@@ -0,0 +1,14 @@
+kind: GlobalDatasource
+metadata:
+  name: TenantA
+spec:
+  default: false
+  plugin:
+    kind: PrometheusDatasource
+    spec:
+      proxy:
+        kind: HTTPProxy
+        spec:
+          url: http://cortex:9009/api/prom
+          headers:
+            X-Scope-OrgID: tenant-a

docs/getting-started/perses/datasource-tenant-b.yaml

@@ -0,0 +1,14 @@
+kind: GlobalDatasource
+metadata:
+  name: TenantB
+spec:
+  default: false
+  plugin:
+    kind: PrometheusDatasource
+    spec:
+      proxy:
+        kind: HTTPProxy
+        spec:
+          url: http://cortex:9009/api/prom
+          headers:
+            X-Scope-OrgID: tenant-b