Skip to content

Commit

Permalink
Mount overrides configmap to alertmanager too
Browse files Browse the repository at this point in the history
Signed-off-by: Marco Pracucci <[email protected]>
  • Loading branch information
pracucci committed May 27, 2021
1 parent 88092d4 commit c6d4b83
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
## master / unreleased

* [CHANGE] `namespace` template variable in dashboards now only selects namespaces for selected clusters. #311
* [CHANGE] Alertmanager: mounted overrides configmap to alertmanager too. #315
* [BUGFIX] Fixed `CortexIngesterHasNotShippedBlocks` alert false positive in case an ingester instance had ingested samples in the past, then no traffic was received for a long period and then it started receiving samples again. #308

## 1.9.0 / 2021-05-18
Expand Down
2 changes: 2 additions & 0 deletions cortex/alertmanager.libsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
{
target: 'alertmanager',
'log.level': 'debug',
'runtime-config.file': '/etc/cortex/overrides.yaml',
'experimental.alertmanager.enable-api': 'true',
'alertmanager.storage.path': '/data',
'alertmanager.web.external-url': '%s/alertmanager' % $._config.external_url,
Expand Down Expand Up @@ -87,6 +88,7 @@
statefulSet.mixin.spec.template.spec.securityContext.withRunAsUser(0) +
statefulSet.mixin.spec.updateStrategy.withType('RollingUpdate') +
statefulSet.mixin.spec.template.spec.withTerminationGracePeriodSeconds(900) +
$.util.configVolumeMount($._config.overrides_configmap, '/etc/cortex') +
statefulSet.mixin.spec.template.spec.withVolumesMixin(
if hasFallbackConfig then
[volume.fromConfigMap('alertmanager-fallback-config', 'alertmanager-fallback-config')]
Expand Down

0 comments on commit c6d4b83

Please sign in to comment.