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.

Sign up for GitHub

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

Jump to bottom

[v9.5.x] Alerting: Fix provenance guard checks for Alertmanager configuration to not cause panic when compared nested objects #69092

Merged
merged 1 commit into from May 25, 2023
Merged

[v9.5.x] Alerting: Fix provenance guard checks for Alertmanager configuration to not cause panic when compared nested objects #69092

merged 1 commit into from May 25, 2023

Conversation

grafanabot
Copy link
Contributor

Backport e002604 from #69009

@yuri-tceretian @grafanabot
Alerting: Fix provenance guard checks for Alertmanager configuration …
d482d57 
…to not cause panic when compared nested objects (#69009)

* fix current settings parsed as new
* replace map comparison with cmp.Diff and log the diff

(cherry picked from commit e002604)
@grafanabot grafanabot requested a review from a team as a code owner May 25, 2023 15:42
@grafanabot grafanabot added backport A backport PR no-changelog Skip including change in changelog/release notes type/bug area/backend labels May 25, 2023
@yuri-tceretian yuri-tceretian added this to the 9.5.x milestone May 25, 2023
@yuri-tceretian yuri-tceretian enabled auto-merge (squash) May 25, 2023 15:46
@yuri-tceretian yuri-tceretian merged commit adbcf7d into v9.5.x May 25, 2023
17 checks passed
@yuri-tceretian yuri-tceretian deleted the backport-69009-to-v9.5.x branch May 25, 2023 16:00
@zerok zerok removed the no-changelog Skip including change in changelog/release notes label Jun 29, 2023
@zerok zerok modified the milestones: 9.5.x, 9.5.6 Jun 30, 2023
@zerok zerok modified the milestones: 9.5.6, 9.5.x, 9.5.7 Jul 17, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yuri-tceretian yuri-tceretian yuri-tceretian approved these changes

Assignees
No one assigned
Labels
add to changelog area/backend backport A backport PR type/bug
Projects
None yet
Milestone
9.5.7
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@grafanabot @yuri-tceretian @zerok @torkelo