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

Fix sanity check done on configured filesystem directories when running Alertmanager in microservices mode #2947

Merged
merged 2 commits into from
Sep 14, 2022

Conversation

pracucci
Copy link
Collaborator

What this PR does

See: #2867 (comment)

Which issue(s) this PR fixes or relates to

Fixes #2867

Checklist

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

…ng Alertmanager in microservices mode

Signed-off-by: Marco Pracucci <marco@pracucci.com>
Signed-off-by: Marco Pracucci <marco@pracucci.com>
@pracucci pracucci changed the title Fix 2867 Fix sanity check done on configured filesystem directories when running Alertmanager in microservices mode Sep 14, 2022
Copy link
Member

@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. Release-2.3 has the same bug, may it's worth backporting there.

@pracucci pracucci merged commit bfad6ac into main Sep 14, 2022
@pracucci pracucci deleted the fix-2867 branch September 14, 2022 09:28
@grafanabot
Copy link
Contributor

The backport to release-2.3 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-2947-to-release-2.3 origin/release-2.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x bfad6ac77de4aaf8ec39a081bb374be3e9042071
# Push it to GitHub
git push --set-upstream origin backport-2947-to-release-2.3
git switch main
# Remove the local backport branch
git branch -D backport-2947-to-release-2.3

Then, create a pull request where the base branch is release-2.3 and the compare/head branch is backport-2947-to-release-2.3.

pracucci added a commit that referenced this pull request Sep 14, 2022
…ng Alertmanager in microservices mode (#2947)

* Fix sanity check done on configured filesystem directories when running Alertmanager in microservices mode

Signed-off-by: Marco Pracucci <marco@pracucci.com>

* Added CHANGELOG entry

Signed-off-by: Marco Pracucci <marco@pracucci.com>

Signed-off-by: Marco Pracucci <marco@pracucci.com>
(cherry picked from commit bfad6ac)
pracucci added a commit that referenced this pull request Sep 14, 2022
…ng Alertmanager in microservices mode (#2947) (#2948)

* Fix sanity check done on configured filesystem directories when running Alertmanager in microservices mode

Signed-off-by: Marco Pracucci <marco@pracucci.com>

* Added CHANGELOG entry

Signed-off-by: Marco Pracucci <marco@pracucci.com>

Signed-off-by: Marco Pracucci <marco@pracucci.com>
(cherry picked from commit bfad6ac)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Alertmanager config validation fails with valid settings
3 participants