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

pacific: mgr/dashboard,prometheus: fix handling of server_addr #43631

Merged
merged 1 commit into from Nov 4, 2021

Conversation

avanthakkar
Copy link
Contributor

backport tracker: https://tracker.ceph.com/issues/52803


backport of #42716
parent tracker: https://tracker.ceph.com/issues/52002

this backport was staged using ceph-backport.sh version 16.0.0.6848
find the latest version at https://github.com/ceph/ceph/blob/master/src/script/ceph-backport.sh

Commit 157a7b4 corrected the URI published by dashboard/prometheus
to use get_mgr_ip() if the address was the wildcard (eg ::).
However, the change also affected the cherrypy server.socket_host
config value, so the modules could no longer bind to a wildcard.

This patch corrects the commit to not affect the cherrypy config.

It also further corrects the dashboard URI fix to handle the 0.0.0.0
wildcard case (prometheus already had this behavior).

Fixes: 157a7b4
Fixes: http://tracker.ceph.com/issues/52002
Signed-off-by: Scott Shambarger <devel@shambarger.net>
(cherry picked from commit de97432)
@avanthakkar avanthakkar requested a review from a team as a code owner October 23, 2021 12:01
@avanthakkar avanthakkar requested review from pereman2 and aaSharma14 and removed request for a team October 23, 2021 12:01
@avanthakkar avanthakkar added this to the pacific milestone Oct 23, 2021
@avanthakkar avanthakkar added this to In progress in Dashboard via automation Oct 23, 2021
@avanthakkar avanthakkar added the backport: no-conflicts Backport without conflicts label Oct 23, 2021
Dashboard automation moved this from In progress to Reviewer approved Oct 25, 2021
@epuertat epuertat merged commit a5b2cc8 into ceph:pacific Nov 4, 2021
Dashboard automation moved this from Reviewer approved to Done Nov 4, 2021
@epuertat epuertat deleted the wip-52803-pacific branch November 4, 2021 09:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
Archived in project
Dashboard
  
Done
4 participants