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

scenes: update to v4.14.0: opt-in to useQueriesAsFilterForOptions #87244

Merged
merged 2 commits into from
May 3, 2024

Conversation

darrenjaneczek
Copy link
Contributor

@darrenjaneczek darrenjaneczek commented May 2, 2024

With updating the scenes library, dashboards must now explicitly opt in to useQueriesAsFilterForOptions.
We want to ensure we opt into this all the time for the new scenes dashboards.
We do not want this behavior for certain scenes apps, like "Explore Metrics"

Updating the library to require opt-in for useQueriesAsFilterForOptions fixes a bug in "Explore Metrics" which prevents the adhoc filter varible from being able to select keys and values once the sample panels in the select metrics scene have been initialized.

Depends on:

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.

@darrenjaneczek darrenjaneczek added type/bug no-changelog Skip including change in changelog/release notes backport v11.0.x Mark PR for automatic backport to v11.0.x labels May 2, 2024
@darrenjaneczek darrenjaneczek self-assigned this May 2, 2024
@grafana-delivery-bot grafana-delivery-bot bot added this to the 11.1.x milestone May 2, 2024
Copy link
Contributor

This PR must be merged before a backport PR will be created.

1 similar comment
Copy link
Contributor

This PR must be merged before a backport PR will be created.

@darrenjaneczek darrenjaneczek marked this pull request as ready for review May 3, 2024 15:24
@darrenjaneczek darrenjaneczek requested review from a team as code owners May 3, 2024 15:24
@darrenjaneczek darrenjaneczek requested review from axelavargas, mdvictor and kaydelaney and removed request for a team May 3, 2024 15:24
@darrenjaneczek darrenjaneczek changed the title update scenes: opt-in to useQueriesAsFilterForOptions scenes: update to v4.14.0: opt-in to useQueriesAsFilterForOptions May 3, 2024
With updating the scenes library, dashboards must now explicitly
opt in to `useQueriesAsFilterForOptions`.
@darrenjaneczek darrenjaneczek force-pushed the darrenjaneczek/opt-in-adhoc-filter-use-queries branch from 270cb1c to cc69046 Compare May 3, 2024 15:32
@darrenjaneczek darrenjaneczek enabled auto-merge (squash) May 3, 2024 15:46
@darrenjaneczek darrenjaneczek merged commit 5b424ed into main May 3, 2024
16 checks passed
@darrenjaneczek darrenjaneczek deleted the darrenjaneczek/opt-in-adhoc-filter-use-queries branch May 3, 2024 15:47
Copy link
Contributor

The backport to v11.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-87244-to-v11.0.x origin/v11.0.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 5b424ed6bb0bf8f3494d2c74e5d18ce9880512d8

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-87244-to-v11.0.x
# Create the PR body template
PR_BODY=$(gh pr view 87244 --json body --template 'Backport 5b424ed6bb0bf8f3494d2c74e5d18ce9880512d8 from #87244{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title "[v11.0.x] scenes: update to v4.14.0: opt-in to `useQueriesAsFilterForOptions`" --body-file - --label "type/bug" --label "area/frontend" --label "no-changelog" --label "backport" --base v11.0.x --milestone 11.0.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-87244-to-v11.0.x

# Create a pull request where the `base` branch is `v11.0.x` and the `compare`/`head` branch is `backport-87244-to-v11.0.x`.

# Remove the local backport branch
git switch main
git branch -D backport-87244-to-v11.0.x

@grafana-delivery-bot grafana-delivery-bot bot added the backport-failed Failed to generate backport PR. Please resolve conflicts and create one manually. label May 3, 2024
darrenjaneczek added a commit that referenced this pull request May 3, 2024
…87244)

* fix: opt-in to `useQueriesAsFilterForOptions`

With updating the scenes library, dashboards must now explicitly
opt in to `useQueriesAsFilterForOptions`.

(cherry picked from commit 5b424ed)
darrenjaneczek added a commit that referenced this pull request May 3, 2024
scenes: update to v4.14.0: opt-in to `useQueriesAsFilterForOptions` (#87244)

* fix: opt-in to `useQueriesAsFilterForOptions`

With updating the scenes library, dashboards must now explicitly
opt in to `useQueriesAsFilterForOptions`.

(cherry picked from commit 5b424ed)
@kevinwcyu kevinwcyu modified the milestones: 11.1.x, 11.1.0 Jun 21, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/frontend backport v11.0.x Mark PR for automatic backport to v11.0.x backport-failed Failed to generate backport PR. Please resolve conflicts and create one manually. no-changelog Skip including change in changelog/release notes type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants