Skip to content

Conversation

@AgnesToulet
Copy link
Contributor

What is this feature?
In this PR that introduces SSL support for the renderer, we missed that the RendererCallbackURL was actually always set in settings.go and this leads to issues for users not needing the SSL support (see grafana/grafana-image-renderer#617).

Why do we need this feature?
We never intended the change above to be a breaking change, the image renderer should continue working for all users without any change on their side.

Who is this feature for?
Image renderer users (plugin mode)

Which issue(s) does this PR fix?:

Fixes grafana/grafana-image-renderer#617

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.

Copy link
Contributor

@evictorero evictorero left a comment

Choose a reason for hiding this comment

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

Tested with plugin (http and https) and remote render and works as expected.
I left some comments to improve legibility and discuss posible improvements.

@AgnesToulet AgnesToulet merged commit d7c554c into main Apr 11, 2025
39 checks passed
@AgnesToulet AgnesToulet deleted the agnestoulet/fix-renderer-callback-url branch April 11, 2025 13:34
@AgnesToulet AgnesToulet added the backport v11.6.x Mark PR for automatic backport to v11.6.x label Apr 11, 2025
@grafana-delivery-bot
Copy link
Contributor

The backport to release-11.6.1 failed:

error pushing: error running command 'git push origin backport-103787-to-release-11.6.1'
error: exit status 1
stdout: 
stderr: remote: fatal error in commit_refs        
To https://github.com/grafana/grafana.git
 ! [remote rejected]         backport-103787-to-release-11.6.1 -> backport-103787-to-release-11.6.1 (failure)
error: failed to push some refs to 'https://github.com/grafana/grafana.git'

To backport manually, run these commands in your terminal:

git fetch
git switch --create backport-103787-to-release-11.6.1 origin/release-11.6.1
git cherry-pick -x d7c554c25e614fd353436aa5db20a0fcb88bcb52

Resolve the conflicts, then add the changes and run git cherry-pick --continue:

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

If you have the GitHub CLI installed:

git push --set-upstream origin backport-103787-to-release-11.6.1
PR_BODY=$(gh pr view 103787 --json body --template 'Backport d7c554c25e614fd353436aa5db20a0fcb88bcb52 from #103787{{ "\\n\\n---\\n\\n" }}{{ index . "body" }}')
echo "${PR_BODY}" | gh pr create --title '[release-11.6.1] Renderer: Fix regression on callback URL in plugin mode' --body-file - --label 'backport' --label '' --label 'type/bug' --label 'area/backend' --label 'add to changelog' --label 'area/image-rendering' --base release-11.6.1 --web

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

git push --set-upstream origin backport-103787-to-release-11.6.1

And open a pull request where the base branch is release-11.6.1 and the compare/head branch is backport-103787-to-release-11.6.1

AgnesToulet added a commit that referenced this pull request Apr 11, 2025
* Renderer: Fix regression on callback URL in plugin mode

* cleanup

* refactor to not mutate cfg object

* apply review feedback

(cherry picked from commit d7c554c)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Rendering fails after update of Grafana to 11.6.0

2 participants