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.

Sign up for GitHub

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

Jump to bottom

Fix Grafana proxy configuration #38

Merged
merged 1 commit into from
May 19, 2022
Merged

Fix Grafana proxy configuration #38

merged 1 commit into from
May 19, 2022

Conversation

avlitman
Copy link
Member

There is a grafana update in version 7.5.15 used on CS8.
We need to pass the original Host and Origin headers from the client request to Grafana.

Signed-off-by: Aviv Litman alitman@redhat.com

@avlitman
Copy link
Member Author

/ost basic-suite-master el8stream

@avlitman avlitman requested a review from mwperina May 18, 2022 16:32
mwperina
mwperina requested changes May 18, 2022
View reviewed changes
Copy link
Member

@mwperina mwperina left a comment

Choose a reason for hiding this comment

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

The change itself looks good to me, please check if it works not only with the new grafana versions 7.5.15 but also with older 7.5.11. And if so, we should also handle upgrade (during engine-setup we need to check if ProxyPreserveHost on line exists in the file and if not, then the file needs to be updated).

@mwperina mwperina requested a review from didib May 18, 2022 17:38
didib
didib approved these changes May 19, 2022
View reviewed changes
Copy link
Member

@didib didib left a comment

Choose a reason for hiding this comment

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

Looks good to me, from packaging/setup POV. I didn't investigate the actual issue nor do I know all the implications of using ProxyPreserveHost.

@didib
Copy link
Member

didib commented May 19, 2022

"Looks good to me" means: I checked the relevant code and it seems like it should work also on upgrades. Please verify this.

@avlitman
Copy link
Member Author

please check if it works not only with the new grafana versions 7.5.15 but also with older 7.5.11.

Verified on rhel8 Grafana 7.5.11

@avlitman
Copy link
Member Author

avlitman commented May 19, 2022 •
edited
Loading

we should also handle upgrade (during engine-setup we need to check if ProxyPreserveHost on line exists in the file and if not, then the file needs to be updated).

Verified on upstream+downstream upgrades, engine-setup recreates the file (the only steps needed is to upgrade and run engine-setup).

@avlitman avlitman requested a review from mwperina May 19, 2022 12:53
mwperina
mwperina approved these changes May 19, 2022
View reviewed changes
Copy link
Member

@mwperina mwperina left a comment

Choose a reason for hiding this comment

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

+1

@avlitman
Fix Grafana proxy configuration
a9b3218 
There is a grafana update in version 7.5.15 used on CS8.
We need to pass the original Host and Origin headers from the client request to Grafana.

Signed-off-by: Aviv Litman <alitman@redhat.com>
@avlitman avlitman merged commit 8d837b5 into oVirt:master May 19, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@didib didib didib approved these changes

@mwperina mwperina mwperina approved these changes

@michalskrivanek michalskrivanek michalskrivanek approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@avlitman @didib @mwperina @michalskrivanek