diff --git a/CHANGELOG.md b/CHANGELOG.md index 372ad6a7..0c5ece5e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/cortex/alertmanager.libsonnet b/cortex/alertmanager.libsonnet index 832ef34d..6c5e82cc 100644 --- a/cortex/alertmanager.libsonnet +++ b/cortex/alertmanager.libsonnet @@ -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, @@ -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')]