Alerting: Fix for data source filter on cloud rules.

[soniaAguilarPeiron]

What is this feature?

This PR fix data source filter not working for cloud rules.
The bug was introduced by this PR

Who is this feature for?

All users.

Special notes for your reviewer:

After the fix:

fix-filter.mp4

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.

[JohnnyQQQQ]

I’m not working on the front end, but could we add a regression test to ensure we don't break this again in the future?

[soniaAguilarPeiron]

I’m not working on the front end, but could we add a regression test to ensure we don't break this again in the future?

💯

[VikaCep]

LGTM! I agree it would be great to add a test for it :)

[soniaAguilarPeiron]

test added @JohnnyQQQQ @VikaCep ✅

[grafana-delivery-bot]

The backport to v10.2.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-79327-to-v10.2.x origin/v10.2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x e6f2de51a3e190832c8b2cd4fc4db2b7a2ee917b

When the conflicts are resolved, stage and commit the changes:

git add . && git cherry-pick --continue

If you have the GitHub CLI installed:

# Push the branch to GitHub:
git push --set-upstream origin backport-79327-to-v10.2.x
# Create the PR body template
PR_BODY=$(gh pr view 79327 --json body --template 'Backport e6f2de51a3e190832c8b2cd4fc4db2b7a2ee917b from #79327{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title "[v10.2.x] Alerting: Fix for data source filter on cloud rules." --body-file - --label "type/bug" --label "area/alerting" --label "area/frontend" --label "add to changelog" --label "backport" --base v10.2.x --milestone 10.2.x --web

Or, if you don't have the GitHub CLI installed (we recommend you install it!):

# Push the branch to GitHub:
git push --set-upstream origin backport-79327-to-v10.2.x

# Create a pull request where the `base` branch is `v10.2.x` and the `compare`/`head` branch is `backport-79327-to-v10.2.x`.

# Remove the local backport branch
git switch main
git branch -D backport-79327-to-v10.2.x

[grafana-delivery-bot]

The backport to v9.2.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-79327-to-v9.2.x origin/v9.2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x e6f2de51a3e190832c8b2cd4fc4db2b7a2ee917b

When the conflicts are resolved, stage and commit the changes:

git add . && git cherry-pick --continue

If you have the GitHub CLI installed:

# Push the branch to GitHub:
git push --set-upstream origin backport-79327-to-v9.2.x
# Create the PR body template
PR_BODY=$(gh pr view 79327 --json body --template 'Backport e6f2de51a3e190832c8b2cd4fc4db2b7a2ee917b from #79327{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title "[v9.2.x] Alerting: Fix for data source filter on cloud rules." --body-file - --label "type/bug" --label "area/alerting" --label "area/frontend" --label "add to changelog" --label "no-backport" --label "backport" --base v9.2.x --milestone 9.2.x --web

Or, if you don't have the GitHub CLI installed (we recommend you install it!):

# Push the branch to GitHub:
git push --set-upstream origin backport-79327-to-v9.2.x

# Create a pull request where the `base` branch is `v9.2.x` and the `compare`/`head` branch is `backport-79327-to-v9.2.x`.

# Remove the local backport branch
git switch main
git branch -D backport-79327-to-v9.2.x

[grafana-delivery-bot]

The backport to v10.2.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-79327-to-v10.2.x origin/v10.2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x e6f2de51a3e190832c8b2cd4fc4db2b7a2ee917b

When the conflicts are resolved, stage and commit the changes:

git add . && git cherry-pick --continue

If you have the GitHub CLI installed:

# Push the branch to GitHub:
git push --set-upstream origin backport-79327-to-v10.2.x
# Create the PR body template
PR_BODY=$(gh pr view 79327 --json body --template 'Backport e6f2de51a3e190832c8b2cd4fc4db2b7a2ee917b from #79327{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title "[v10.2.x] Alerting: Fix for data source filter on cloud rules." --body-file - --label "type/bug" --label "area/alerting" --label "area/frontend" --label "add to changelog" --label "backport" --base v10.2.x --milestone 10.2.x --web

Or, if you don't have the GitHub CLI installed (we recommend you install it!):

# Push the branch to GitHub:
git push --set-upstream origin backport-79327-to-v10.2.x

# Create a pull request where the `base` branch is `v10.2.x` and the `compare`/`head` branch is `backport-79327-to-v10.2.x`.

# Remove the local backport branch
git switch main
git branch -D backport-79327-to-v10.2.x

[grafana-delivery-bot]

The backport to v9.4.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-79327-to-v9.4.x origin/v9.4.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x e6f2de51a3e190832c8b2cd4fc4db2b7a2ee917b

When the conflicts are resolved, stage and commit the changes:

git add . && git cherry-pick --continue

If you have the GitHub CLI installed:

# Push the branch to GitHub:
git push --set-upstream origin backport-79327-to-v9.4.x
# Create the PR body template
PR_BODY=$(gh pr view 79327 --json body --template 'Backport e6f2de51a3e190832c8b2cd4fc4db2b7a2ee917b from #79327{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title "[v9.4.x] Alerting: Fix for data source filter on cloud rules." --body-file - --label "type/bug" --label "area/alerting" --label "area/frontend" --label "add to changelog" --label "backport" --base v9.4.x --milestone 9.4.x --web

Or, if you don't have the GitHub CLI installed (we recommend you install it!):

# Push the branch to GitHub:
git push --set-upstream origin backport-79327-to-v9.4.x

# Create a pull request where the `base` branch is `v9.4.x` and the `compare`/`head` branch is `backport-79327-to-v9.4.x`.

# Remove the local backport branch
git switch main
git branch -D backport-79327-to-v9.4.x

[grafana-delivery-bot]

The backport to v10.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-79327-to-v10.1.x origin/v10.1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x e6f2de51a3e190832c8b2cd4fc4db2b7a2ee917b

When the conflicts are resolved, stage and commit the changes:

git add . && git cherry-pick --continue

If you have the GitHub CLI installed:

# Push the branch to GitHub:
git push --set-upstream origin backport-79327-to-v10.1.x
# Create the PR body template
PR_BODY=$(gh pr view 79327 --json body --template 'Backport e6f2de51a3e190832c8b2cd4fc4db2b7a2ee917b from #79327{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title "[v10.1.x] Alerting: Fix for data source filter on cloud rules." --body-file - --label "type/bug" --label "area/alerting" --label "area/frontend" --label "add to changelog" --label "backport" --base v10.1.x --milestone 10.1.x --web

Or, if you don't have the GitHub CLI installed (we recommend you install it!):

# Push the branch to GitHub:
git push --set-upstream origin backport-79327-to-v10.1.x

# Create a pull request where the `base` branch is `v10.1.x` and the `compare`/`head` branch is `backport-79327-to-v10.1.x`.

# Remove the local backport branch
git switch main
git branch -D backport-79327-to-v10.1.x