Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +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 #618
* [ENHANCEMENT] Run overrides-exporter with high availability #557
* [ENHANCEMENT] Persist subchart #572
* [ENHANCEMENT] Expose query frontend GRPC port on service for ruler #574
Expand Down
2 changes: 1 addition & 1 deletion templates/ruler/ruler-dep.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,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.alertmanagerFullname" . }}-headless.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}/api/prom/alertmanager/"
{{- else }}
Expand Down
Loading