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

Merge alert group static labels to integration labels #5262

Merged
merged 20 commits into from
Nov 28, 2024

Conversation

Ferril
Copy link
Member

@Ferril Ferril commented Nov 18, 2024

What this PR does

  • Adds migration to merge static labels to integration labels. On creating new static label in UI saves it as integration label.
  • Removes "inheritable" option for integration labels. All integration labels will be inheritable.
    This PR should be merged together with frontend changes.

Which issue(s) this PR closes

Related to https://github.com/grafana/oncall-private/issues/2973

Checklist

  • Unit, integration, and e2e (if applicable) tests updated
  • Documentation added (or pr:no public docs PR label added if not required)
  • Added the relevant release notes label (see labels prefixed w/ release:). These labels dictate how your PR will
    show up in the autogenerated release notes.

@Ferril Ferril requested a review from a team as a code owner November 18, 2024 10:43
@Ferril Ferril changed the title Merge static labels to integration labels Merge alert group static labels to integration labels Nov 18, 2024
@Konstantinov-Innokentii
Copy link
Member

@Ferril Thanks! Frontend changes are going to live in this PR as well, right?

@Ferril Ferril requested review from a team as code owners November 18, 2024 10:50
@Ferril Ferril added the release:patch PR will be added to "Other Changes" section of release notes label Nov 18, 2024
@Ferril
Copy link
Member Author

Ferril commented Nov 18, 2024

@Ferril Thanks! Frontend changes are going to live in this PR as well, right?

Not sure how it works now. Better to ask @brojd 😅

Copy link
Contributor

@joeyorlando joeyorlando left a comment

Choose a reason for hiding this comment

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

LGTM 👍 the demo in the frontend PR looks 🔥 (UX seems much simpler)

Copy link
Contributor

Choose a reason for hiding this comment

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

nit I would include the ..._db.py second migration file in the engine/apps/labels directory and just add a comment at the top saying that we'll move it to the engine/apps/labels/migrations directory in a future PR/release

@Ferril Ferril enabled auto-merge November 28, 2024 15:36
@Ferril Ferril added this pull request to the merge queue Nov 28, 2024
Merged via the queue into dev with commit 4826291 Nov 28, 2024
26 checks passed
@Ferril Ferril deleted the julia/merge-static-and-integration-labels branch November 28, 2024 15:55
@mrbaowei
Copy link

It seems that the Grafana Oncall OSS version still cannot use the label feature, is that correct?

@joeyorlando
Copy link
Contributor

@mrbaowei correct, this is a Grafana Cloud only feature

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release:patch PR will be added to "Other Changes" section of release notes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants