From f5253bbb7ecc42e7d32f8a046288266a4193d2d7 Mon Sep 17 00:00:00 2001 From: Friedrich Gonzalez <1517449+friedrichg@users.noreply.github.com> Date: Thu, 16 Apr 2026 13:22:06 -0700 Subject: [PATCH 1/2] Disable alertmanager URL in ruler if alertmanager is disabled Signed-off-by: Friedrich Gonzalez <1517449+friedrichg@users.noreply.github.com> --- CHANGELOG.md | 1 + templates/ruler/ruler-dep.yaml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e52acd65..10aab15f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ * [CHANGE] Use default value for num_tokens in ingester configuration #544 * [BUGFIX] Fix discovering memcached instances #551 * [BUGFIX] Fix restarting query-schedulers when config changes #559 +* [BUGFIX] Don't configure alertmanager in ruler if alertmanager is disabled * [ENHANCEMENT] Run overrides-exporter with high availability #557 * [DEPENDENCY] Update kiwigrid/k8s-sidecar docker tag to v1.30.5 #531 diff --git a/templates/ruler/ruler-dep.yaml b/templates/ruler/ruler-dep.yaml index 4cf31f58..067ef85c 100644 --- a/templates/ruler/ruler-dep.yaml +++ b/templates/ruler/ruler-dep.yaml @@ -105,7 +105,7 @@ spec: args: - "-target=ruler" - "-config.file=/etc/cortex/cortex.yaml" - {{- if not .Values.config.ruler.alertmanager_url }} + {{- if and .Values.alertmanager.enabled (not .Values.config.ruler.alertmanager_url) }} {{- if .Values.config.ruler.enable_alertmanager_discovery }} - "-ruler.alertmanager-url=http://_http-metrics._tcp.{{ template "cortex.name" . }}-alertmanager-headless.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}/api/prom/alertmanager/" {{- else }} From 9b314944fa0881d5ead714c3ddf7db05224902be Mon Sep 17 00:00:00 2001 From: Friedrich Gonzalez <1517449+friedrichg@users.noreply.github.com> Date: Fri, 17 Apr 2026 18:29:34 -0700 Subject: [PATCH 2/2] Update CHANGELOG.md Co-authored-by: Tom Hayward Signed-off-by: Friedrich Gonzalez <1517449+friedrichg@users.noreply.github.com> --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a8903be4..f6da0cab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,7 +31,7 @@ * [CHANGE] Use default value for num_tokens in ingester configuration #544 * [BUGFIX] Fix discovering memcached instances #551 * [BUGFIX] Fix restarting query-schedulers when config changes #559 -* [BUGFIX] Don't configure alertmanager in ruler if alertmanager is disabled +* [BUGFIX] Don't configure alertmanager in ruler if alertmanager is disabled #618 * [ENHANCEMENT] Run overrides-exporter with high availability #557 * [ENHANCEMENT] Persist subchart #572 * [ENHANCEMENT] Expose query frontend GRPC port on service for ruler #574