]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
mgr/dashboard,prometheus: fix handling of server_addr 43631/head
authorScott Shambarger <devel@shambarger.net>
Sun, 8 Aug 2021 20:10:15 +0000 (13:10 -0700)
committerAvan Thakkar <athakkar@redhat.com>
Sat, 23 Oct 2021 12:00:48 +0000 (17:30 +0530)
commit2d45c8fc841ee0e13bddeea1660f514200b1973f
tree6c60c530c936f94a30a0334f493bca3f4126ecdd
parent7879cd16a7aa354d4121719a8e19b4e59da59c81
mgr/dashboard,prometheus: fix handling of server_addr

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: 157a7b4183dbd888f106c613a758409d7e07b917
Fixes: http://tracker.ceph.com/issues/52002
Signed-off-by: Scott Shambarger <devel@shambarger.net>
(cherry picked from commit de9743244ddfe6715d9f39f9ece227bb0634bac2)
src/pybind/mgr/dashboard/module.py
src/pybind/mgr/prometheus/module.py