Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Validate alertmanager storage configuration when sharding enabled. #4162

Merged
merged 2 commits into from
May 11, 2021

Conversation

stevesg
Copy link
Contributor

@stevesg stevesg commented May 6, 2021

What this PR does:

Storing the "fullstate" objects is not implemented for the "local" and
"configdb" storage backend types, or for the legacy storage
configuration. Check that these are not given when sharding is enabled.

Checklist

  • Tests updated
  • Documentation added
  • CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX]

Storing the "fullstate" objects is not implemented for the "local" and
"configdb" storage backend types, or for the legacy storage
configuration. Check that these are not given when sharding is enabled.

Signed-off-by: Steve Simpson <[email protected]>
Copy link
Contributor

@pracucci pracucci left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good job! I left a couple of nits.

@@ -250,7 +247,7 @@ func TestAlertmanagerSharding(t *testing.T) {
require.NoError(t, err)
defer s.Close()

flags := mergeFlags(AlertmanagerFlags(), AlertmanagerS3Flags(testCfg.legacyAlertStore))
flags := mergeFlags(AlertmanagerFlags(), AlertmanagerS3Flags(false))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note to other reviewers: this integration test was working anyway for the legacy alertstore because it doesn't test storing/loading state to/from storage.

Copy link
Contributor

@pstibrany pstibrany left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks.

Signed-off-by: Steve Simpson <[email protected]>
@pracucci pracucci merged commit 35ccd29 into cortexproject:master May 11, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants