TemplateSrv: Backportable version of 90808 #90816
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Hello @dprokop!
Please, if the current pull request addresses a bug fix, label it with the |
|
This PR must be merged before a backport PR will be created. |
ivanortegaalba
approved these changes
Jul 23, 2024
|
The backport to To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-90816-to-v11.1.x origin/v11.1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 6849a6b86b40a09cf2a46860e40724ecd60903f6When the conflicts are resolved, stage and commit the changes: If you have the GitHub CLI installed: # Push the branch to GitHub:
git push --set-upstream origin backport-90816-to-v11.1.x
# Create the PR body template
PR_BODY=$(gh pr view 90816 --json body --template 'Backport 6849a6b86b40a09cf2a46860e40724ecd60903f6 from #90816{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title '[v11.1.x] TemplateSrv: Backportable version of 90808' --body-file - --label 'type/bug' --label 'area/dashboard/templating' --label 'area/frontend' --label 'no-changelog' --label 'backport' --base v11.1.x --milestone 11.1.x --webOr, 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-90816-to-v11.1.x
# Create a pull request where the `base` branch is `v11.1.x` and the `compare`/`head` branch is `backport-90816-to-v11.1.x`.
# Remove the local backport branch
git switch main
git branch -D backport-90816-to-v11.1.x |
dprokop
added a commit
that referenced
this pull request
Jul 23, 2024
* TemplateSrv: Add test case for SafeSerializableSceneObject * Update dashboard data source to use scoped vars scene object valueOf * 11.1.x Backportable version of 90808 * lint (cherry picked from commit 6849a6b)
dprokop
added a commit
that referenced
this pull request
Jul 23, 2024
dprokop
added a commit
that referenced
this pull request
Jul 23, 2024
* TemplateSrv: Add test case for SafeSerializableSceneObject * Update dashboard data source to use scoped vars scene object valueOf * 11.1.x Backportable version of 90808 * lint
dprokop
added a commit
that referenced
this pull request
Jul 23, 2024
TemplateSrv: Backportable version of 90808 (#90816) * TemplateSrv: Add test case for SafeSerializableSceneObject * Update dashboard data source to use scoped vars scene object valueOf * 11.1.x Backportable version of 90808 * lint
dprokop
added a commit
that referenced
this pull request
Jul 23, 2024
TemplateSrv: Backportable version of 90808 (#90833) TemplateSrv: Backportable version of 90808 (#90816) * TemplateSrv: Add test case for SafeSerializableSceneObject * Update dashboard data source to use scoped vars scene object valueOf * 11.1.x Backportable version of 90808 * lint (cherry picked from commit 2e5b41c)
obetomuniz
added a commit
that referenced
this pull request
Jul 23, 2024
…acker * main: (191 commits) Update dependency react-use to v17.5.1 Docs: Updates to the Query management in Explore page (#90541) Update dependency msw to v2.3.3 Update dependency rc-tree to v5.8.8 TemplateSrv: Backportable version of 90808 (#90833) run prettier Update dependency prettier to v3.3.3 OpenAPI: Document the `/api/health` endpoint (#88203) Revert "TemplateSrv: Backportable version of 90808 (#90816)" (#90831) notifications: Fix flaky SMTP tests (#90801) Chore: Remove deprecated layout components from Plugins Platform (#88523) TemplateSrv: Backportable version of 90808 (#90816) Pin Nav Items: Add tracking for pinned items clicks (#90803) Update dependency postcss to v8.4.39 DashboardScenes: TemplateSrv should return timeRange from scenes if context found (#90735) Update dependency ol-ext to v4.0.21 Update dependency msw to v2.3.2 Graphite: Ensure all Graphite query references are interpolated (#90566) Tracing: Add regex support for span filters (#89885) Chore: Migrate `_dashboard` SCSS styles to emotion (#90604) ...
dprokop
added a commit
that referenced
this pull request
Aug 1, 2024
TemplateSrv: Backportable version of 90808 (#90833) TemplateSrv: Backportable version of 90808 (#90816) * TemplateSrv: Add test case for SafeSerializableSceneObject * Update dashboard data source to use scoped vars scene object valueOf * 11.1.x Backportable version of 90808 * lint (cherry picked from commit 2e5b41c)
dprokop
added a commit
that referenced
this pull request
Aug 14, 2024
* TemplateSrv: Backportable version of 90808 (#90833) TemplateSrv: Backportable version of 90808 (#90816) * TemplateSrv: Add test case for SafeSerializableSceneObject * Update dashboard data source to use scoped vars scene object valueOf * 11.1.x Backportable version of 90808 * lint (cherry picked from commit 2e5b41c) * betterer
giorgioatmerqury
pushed a commit
to cybermerqury/grafana
that referenced
this pull request
Aug 21, 2024
* TemplateSrv: Add test case for SafeSerializableSceneObject * Update dashboard data source to use scoped vars scene object valueOf * 11.1.x Backportable version of 90808 * lint
giorgioatmerqury
pushed a commit
to cybermerqury/grafana
that referenced
this pull request
Aug 21, 2024
…rafana#90831) This reverts commit 6849a6b.
giorgioatmerqury
pushed a commit
to cybermerqury/grafana
that referenced
this pull request
Aug 21, 2024
TemplateSrv: Backportable version of 90808 (grafana#90816) * TemplateSrv: Add test case for SafeSerializableSceneObject * Update dashboard data source to use scoped vars scene object valueOf * 11.1.x Backportable version of 90808 * lint
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is the same thing as #90808, but without tests case that requires scenes 5.6.x. It's created to backport this to 11.1.x so that scenes apps using scenes 5.6.x can be run agains Grafana 11.1.x