Skip to content

Commit 84fb236

Browse files
friedrichgkd7lxl
andauthored
Disable alertmanager URL in ruler if alertmanager is disabled (#618)
* Disable alertmanager URL in ruler if alertmanager is disabled Signed-off-by: Friedrich Gonzalez <1517449+friedrichg@users.noreply.github.com> * Update CHANGELOG.md Co-authored-by: Tom Hayward <thayward@infoblox.com> Signed-off-by: Friedrich Gonzalez <1517449+friedrichg@users.noreply.github.com> --------- Signed-off-by: Friedrich Gonzalez <1517449+friedrichg@users.noreply.github.com> Co-authored-by: Tom Hayward <thayward@infoblox.com>
1 parent 9b903f3 commit 84fb236

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
* [CHANGE] Use default value for num_tokens in ingester configuration #544
3232
* [BUGFIX] Fix discovering memcached instances #551
3333
* [BUGFIX] Fix restarting query-schedulers when config changes #559
34+
* [BUGFIX] Don't configure alertmanager in ruler if alertmanager is disabled #618
3435
* [ENHANCEMENT] Run overrides-exporter with high availability #557
3536
* [ENHANCEMENT] Persist subchart #572
3637
* [ENHANCEMENT] Expose query frontend GRPC port on service for ruler #574

templates/ruler/ruler-dep.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ spec:
121121
args:
122122
- "-target=ruler"
123123
- "-config.file=/etc/cortex/cortex.yaml"
124-
{{- if not .Values.config.ruler.alertmanager_url }}
124+
{{- if and .Values.alertmanager.enabled (not .Values.config.ruler.alertmanager_url) }}
125125
{{- if .Values.config.ruler.enable_alertmanager_discovery }}
126126
- "-ruler.alertmanager-url=http://_http-metrics._tcp.{{ template "cortex.alertmanagerFullname" . }}-headless.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}/api/prom/alertmanager/"
127127
{{- else }}

0 commit comments

Comments
 (0)