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

[v10.3.x] Alerting: Add two sets of provisioning actions for rules and notifications #87665

Merged
merged 1 commit into from
May 13, 2024
Merged

[v10.3.x] Alerting: Add two sets of provisioning actions for rules and notifications #87665

merged 1 commit into from
May 13, 2024

Conversation

yuri-tceretian
Copy link
Contributor

Backport 356a295 from #87149

@yuri-tceretian
Alerting: Add two sets of provisioning actions for rules and notifica…
0437287 
…tions (#87149)

(cherry picked from commit 356a295)

# Conflicts:
#	pkg/services/accesscontrol/models.go
#	pkg/services/ngalert/accesscontrol.go
#	pkg/services/ngalert/api/authorization.go
#	pkg/services/ngalert/provisioning/accesscontrol.go
#	pkg/services/ngalert/provisioning/accesscontrol_test.go
@yuri-tceretian yuri-tceretian added backport A backport PR no-changelog Skip including change in changelog/release notes labels May 10, 2024
@yuri-tceretian yuri-tceretian requested review from a team as code owners May 10, 2024 21:06
@yuri-tceretian yuri-tceretian requested review from rwwiv, JacobsonMT and grobinson-grafana and removed request for a team May 10, 2024 21:06
@grafana-delivery-bot grafana-delivery-bot bot added this to the 10.3.x milestone May 10, 2024
@fabrizio-grafana fabrizio-grafana modified the milestones: 10.3.x, 10.4.x May 13, 2024
@yuri-tceretian yuri-tceretian modified the milestones: 10.4.x, 10.3.x May 13, 2024
rwwiv
rwwiv approved these changes May 13, 2024
View reviewed changes
Copy link
Contributor

@rwwiv rwwiv left a comment

Choose a reason for hiding this comment

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

👍

@yuri-tceretian yuri-tceretian merged commit a31f358 into v10.3.x May 13, 2024
24 checks passed
@yuri-tceretian yuri-tceretian deleted the backport-87149-to-v10.3.x branch May 13, 2024 16:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rwwiv rwwiv rwwiv approved these changes

@JacobsonMT JacobsonMT Awaiting requested review from JacobsonMT JacobsonMT is a code owner automatically assigned from grafana/alerting-backend-product

@grobinson-grafana grobinson-grafana Awaiting requested review from grobinson-grafana grobinson-grafana is a code owner automatically assigned from grafana/alerting-backend-product

Assignees
No one assigned
Labels
area/backend backport A backport PR no-changelog Skip including change in changelog/release notes
Projects
None yet
Milestone
10.3.x
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@yuri-tceretian @rwwiv @fabrizio-grafana