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

Alerting: Update grafana/alerting to 4f09f51 #67329

Merged
merged 1 commit into from
Apr 27, 2023

Conversation

grobinson-grafana
Copy link
Contributor

@grobinson-grafana grobinson-grafana commented Apr 26, 2023

What is this feature?

This pull request updates grafana/alerting to 4f09f51 to fix prometheus/alertmanager#3278.

Why do we need this feature?

[Add a description of the problem the feature is trying to solve.]

Who is this feature for?

[Add information on what kind of user the feature is for.]

Which issue(s) does this PR fix?:

Fixes #

Special notes for your reviewer:

Please check that:

  • It works as expected from a user's perspective.
  • If this is a pre-GA feature, it is behind a feature toggle.
  • The docs are updated, and if this is a notable improvement, it's added to our What's New doc.

@grobinson-grafana grobinson-grafana added this to the 10.0.x milestone Apr 26, 2023
@grobinson-grafana grobinson-grafana requested a review from a team April 26, 2023 21:02
@grobinson-grafana grobinson-grafana requested a review from a team as a code owner April 26, 2023 21:02
@grobinson-grafana grobinson-grafana self-assigned this Apr 26, 2023
@grobinson-grafana grobinson-grafana requested review from zserge, suntala and yangkb09 and removed request for a team April 26, 2023 21:02
@JacobsonMT
Copy link
Member

Should we go straight to grafana/alerting@5828396?

@gotjosh
Copy link
Contributor

gotjosh commented Apr 27, 2023

I can just make a second PR.

Agree with Matt here, not sure I see a reason for a second PR when grafana/alerting@5828396 is fairly trivial.

@grobinson-grafana
Copy link
Contributor Author

Perhaps I didn't explain the reasoning well the first time around 🙁

The reason I wanted to create two separate PRs is so we can have a 1:1 relationship between the issue and the fix.

issue1 -> fix1
issue2 -> fix2

If we do both in the same PR we have this:

issue1 -> fix1and2
issue2 -> fix1and2

I wanted to have the former so if or when we go back and look at the issues it's super clear to see which PRs fixed it, rather than having a shared PR that fixes a number of different bugs all at the same time.

@grobinson-grafana
Copy link
Contributor Author

Thanks! I had to rebase main to fix a conflict in go.sum.

@grobinson-grafana grobinson-grafana enabled auto-merge (squash) April 27, 2023 20:41
@grobinson-grafana grobinson-grafana merged commit d3bfaf5 into main Apr 27, 2023
@grobinson-grafana grobinson-grafana deleted the grobinson/update-alerting-2 branch April 27, 2023 20:45
@zerok zerok modified the milestones: 10.0.x, 10.0.0 May 2, 2023
@zerok zerok modified the milestones: 10.0.0, 10.0.0-preview May 31, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

None yet

5 participants