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: Fix DatasourceUID and RefID missing for DatasourceNoData alerts #66733

Merged
merged 2 commits into from Apr 20, 2023

Conversation

grobinson-grafana
Copy link
Contributor

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

Which issue(s) does this PR fix?:

This commit fixes a bug where DatasourceUID and RefID annotations are missing for DatasourceNoData alerts in Grafana 9.5. This bug affects datasource plugins that have moved to using the data plane contract.

This bug appears to have been introduced in #62254 which updates the Prometheus plugin to send back no data data frames as documented in the data plane contract.

Fixes #66629

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 add to changelog backport v9.5.x Bot will automatically open backport PR labels Apr 18, 2023
@grobinson-grafana grobinson-grafana added this to the 9.5.x milestone Apr 18, 2023
@grobinson-grafana grobinson-grafana self-assigned this Apr 18, 2023
@grobinson-grafana grobinson-grafana requested a review from a team as a code owner April 18, 2023 09:37
@grafanabot
Copy link
Contributor

Hello @grobinson-grafana!
Backport pull requests need to be either:

  • Pull requests which address bugs,
  • Urgent fixes which need product approval, in order to get merged,
  • Docs changes.

Please, if the current pull request addresses a bug fix, label it with the type/bug label.
If it already has the product approval, please add the product-approved label. For docs changes, please add the type/docs label.
If the pull request modifies CI behaviour, please add the type/ci label.
If none of the above applies, please consider removing the backport label and target the next major/minor release.
Thanks!

@grobinson-grafana
Copy link
Contributor Author

The lack of unit tests is because this function isn't even tested. I'm going to create the tests for this in another PR and then rebase main onto this when those tests are committed.

…erts

This commit fixes a bug where DatasourceUID and RefID annotations are
missing for DatasourceNoData alerts in Grafana 9.5. This bug affects
datasource plugins that have moved to using the data plane contract.
@gotjosh
Copy link
Contributor

gotjosh commented Apr 20, 2023

Tagging @itsmylife, @kylebrandt and @ryantxu (for an FYI) as this was introduced in #62254.

We're happy to review other changes you make around this area as you implement more of the data plane contract on other data sources t to ensure we're not affected. We promise not to slow you down and review promptly 🙏

Copy link
Contributor

@yuri-tceretian yuri-tceretian left a comment

Choose a reason for hiding this comment

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

LGTM

@grobinson-grafana grobinson-grafana merged commit 35342a3 into main Apr 20, 2023
12 checks passed
@grobinson-grafana grobinson-grafana deleted the grobinson/66629 branch April 20, 2023 13:38
grafanabot pushed a commit that referenced this pull request Apr 20, 2023
…erts (#66733)

This commit fixes a bug where DatasourceUID and RefID annotations are
missing for DatasourceNoData alerts in Grafana 9.5. This bug affects
datasource plugins that have moved to using the data plane contract.

(cherry picked from commit 35342a3)
grobinson-grafana added a commit that referenced this pull request Apr 20, 2023
…NoData alerts (#66962)

Alerting: Fix DatasourceUID and RefID missing for DatasourceNoData alerts (#66733)

This commit fixes a bug where DatasourceUID and RefID annotations are
missing for DatasourceNoData alerts in Grafana 9.5. This bug affects
datasource plugins that have moved to using the data plane contract.

(cherry picked from commit 35342a3)

Co-authored-by: George Robinson <george.robinson@grafana.com>
mdvictor pushed a commit that referenced this pull request Apr 21, 2023
…erts (#66733)

This commit fixes a bug where DatasourceUID and RefID annotations are
missing for DatasourceNoData alerts in Grafana 9.5. This bug affects
datasource plugins that have moved to using the data plane contract.
@guicaulada guicaulada modified the milestones: 9.5.x, 9.5.0 Apr 24, 2023
@zerok zerok modified the milestones: 9.5.0, 10.0.0 May 4, 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
Labels
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

Datasource UID and Ref ID missing for DatasourceNoData alerts in Grafana 9.5
8 participants