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 default query's data source when no default datasource specified #55435

Merged
merged 3 commits into from Sep 20, 2022

Conversation

konrad147
Copy link
Contributor

What this PR does / why we need it:
This PR fixes the default query's data source when there is no data source marked as default

@konrad147 konrad147 added area/alerting Grafana Alerting area/frontend backport v9.0.x backport v9.1.x Bot will automatically open backport PR labels Sep 20, 2022
@konrad147 konrad147 added this to the 9.1.6 milestone Sep 20, 2022
@konrad147 konrad147 self-assigned this Sep 20, 2022
@konrad147 konrad147 requested a review from a team as a code owner September 20, 2022 07:08
@grafanabot
Copy link
Contributor

@grafanabot
Copy link
Contributor

@konrad147 konrad147 changed the title Alerting: Fix default query when no default datasource specified Alerting: Fix default query's data source when no default datasource specified Sep 20, 2022
@konrad147 konrad147 merged commit 20e6e0d into main Sep 20, 2022
@konrad147 konrad147 deleted the alerting/fix-default-data-source branch September 20, 2022 08:43
Copy link
Member

@soniaAguilarPeiron soniaAguilarPeiron left a comment

Choose a reason for hiding this comment

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

LGTM! 🎉

@grafanabot
Copy link
Contributor

The backport to v9.0.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-55435-to-v9.0.x origin/v9.0.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 20e6e0d59392e5a03b7ceb54bf7d16134a5f1484
# Push it to GitHub
git push --set-upstream origin backport-55435-to-v9.0.x
git switch main
# Remove the local backport branch
git branch -D backport-55435-to-v9.0.x

Then, create a pull request where the base branch is v9.0.x and the compare/head branch is backport-55435-to-v9.0.x.

@grafanabot
Copy link
Contributor

The backport to v9.1.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-55435-to-v9.1.x origin/v9.1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 20e6e0d59392e5a03b7ceb54bf7d16134a5f1484
# Push it to GitHub
git push --set-upstream origin backport-55435-to-v9.1.x
git switch main
# Remove the local backport branch
git branch -D backport-55435-to-v9.1.x

Then, create a pull request where the base branch is v9.1.x and the compare/head branch is backport-55435-to-v9.1.x.

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

4 participants