]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
mgr/dashboard,prometheus: fix handling of server_addr 42716/head
authorScott Shambarger <devel@shambarger.net>
Sun, 8 Aug 2021 20:10:15 +0000 (13:10 -0700)
committerScott Shambarger <devel@shambarger.net>
Tue, 14 Sep 2021 17:31:12 +0000 (10:31 -0700)
commitde9743244ddfe6715d9f39f9ece227bb0634bac2
treed80c0096c7c0b6aa822a13f2695820001ea13744
parent569368a2fce356044eec80006239a172e3243e5d
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>
src/pybind/mgr/dashboard/module.py
src/pybind/mgr/prometheus/module.py