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 alertmanager config change introduced in #344 #359

Merged
merged 1 commit into from
Jul 22, 2021

Conversation

pracucci
Copy link
Collaborator

What this PR does:
#344 introduced a change which is conflicting with https://github.com/grafana/jsonnet-libs/tree/master/enterprise-metrics. Long story short, this PR keeps the same change done in #344 but fixing the conflict and the config drift due to the -- prefixed flags.

Which issue(s) this PR fixes:
N/A

Checklist

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

Signed-off-by: Marco Pracucci <marco@pracucci.com>
@pracucci pracucci requested a review from a team as a code owner July 22, 2021 13:59
@pracucci pracucci merged commit b1f797a into main Jul 22, 2021
@pracucci pracucci deleted the fix-alertmanager-drift branch July 22, 2021 14:00
simonswine pushed a commit to grafana/mimir that referenced this pull request Dec 20, 2021
…anager-drift

Fix alertmanager config change introduced in grafana/cortex-jsonnet#344
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants