Skip to content

Commit 31ae118

Browse files
committed
Comments.
Signed-off-by: Peter Štibraný <[email protected]>
1 parent 3ca9ac9 commit 31ae118

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
## master / unreleased
44

55
* [CHANGE] Alertmanager now removes local files after Alertmanager is no longer running for removed or resharded user. #3910
6-
* [CHANGE] Alertmanager now stores local files in per-tenant folders. Files stored by Alertmanager previously are migrated to new hierarchy. #3910
6+
* [CHANGE] Alertmanager now stores local files in per-tenant folders. Files stored by Alertmanager previously are migrated to new hierarchy. Support for this migration will be removed in Cortex 1.10. #3910
77
* [ENHANCEMENT] Ruler: optimized `<prefix>/api/v1/rules` and `<prefix>/api/v1/alerts` when ruler sharding is enabled. #3916
88
* [ENHANCEMENT] Ruler: added the following metrics when ruler sharding is enabled: #3916
99
* `cortex_ruler_clients`

pkg/alertmanager/multitenant.go

+4-1
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,8 @@ func (am *MultitenantAlertmanager) starting(ctx context.Context) (err error) {
507507
return nil
508508
}
509509

510-
// migrateStateFilesToPerTenantDirectories migrate any existing configuration from old place to new hierarchy.
510+
// migrateStateFilesToPerTenantDirectories migrates any existing configuration from old place to new hierarchy.
511+
// TODO: Remove in Cortex 1.10.
511512
func (am *MultitenantAlertmanager) migrateStateFilesToPerTenantDirectories() error {
512513
migrate := func(from, to string) error {
513514
level.Info(am.logger).Log("msg", "migrating AM state", "from", from, "to", to)
@@ -1106,6 +1107,8 @@ func (am *MultitenantAlertmanager) deleteUnusedLocalUserState() {
11061107
}
11071108
}
11081109

1110+
// getPerUserDirectories returns map of users to their directories (full path). Only users with local
1111+
// directory are returned.
11091112
func (am *MultitenantAlertmanager) getPerUserDirectories() map[string]string {
11101113
files, err := ioutil.ReadDir(am.cfg.DataDir)
11111114
if err != nil {

0 commit comments

Comments
 (0)