Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Conversation

dprokop
Copy link
Contributor

@dprokop dprokop commented Jul 23, 2024

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

@dprokop dprokop added no-changelog Skip including change in changelog/release notes backport v11.1.x Mark PR for automatic backport to v11.1.x labels Jul 23, 2024
@dprokop dprokop requested review from a team and grafanabot as code owners July 23, 2024 09:52
@dprokop dprokop requested review from kaydelaney and removed request for a team July 23, 2024 09:52
@github-actions github-actions bot added this to the 11.2.x milestone Jul 23, 2024
Copy link
Contributor

Hello @dprokop!
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!

Copy link
Contributor

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

@dprokop dprokop merged commit 6849a6b into main Jul 23, 2024
@dprokop dprokop deleted the safe-serializable-compat-backportable branch July 23, 2024 12:05
Copy link
Contributor

The backport to v11.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-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 6849a6b86b40a09cf2a46860e40724ecd60903f6

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-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 --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-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

@grafana-delivery-bot grafana-delivery-bot bot added the backport-failed Failed to generate backport PR. Please resolve conflicts and create one manually. label 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

(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
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 (#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 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 Jul 31, 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

(cherry picked from commit 2e5b41c)
dprokop added a commit that referenced this pull request Jul 31, 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

(cherry picked from commit 2e5b41c)
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
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
@aangelisc aangelisc modified the milestones: 11.2.x, 11.2.0 Aug 21, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/dashboard/templating area/frontend backport v11.1.x Mark PR for automatic backport to v11.1.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.

3 participants