]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
mgr/dashboard: enable different URL for users of browser to Grafana 38761/head
authorPatrick Seidensal <pseidensal@suse.com>
Tue, 3 Nov 2020 12:47:23 +0000 (13:47 +0100)
committerPatrick Seidensal <patrick@nawracay.de>
Wed, 13 Jan 2021 14:24:38 +0000 (15:24 +0100)
commit56f304d31b154d87362620f08046720a3e0f3203
tree0df88f64ffd881b3499f3aca4f93b55a9379d63f
parent2eacca1efb80d3af604f7e9be47cd3ad5d9bc63e
mgr/dashboard: enable different URL for users of browser to Grafana

Fixes: https://tracker.ceph.com/issues/47386
Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
(cherry picked from commit 676f82923d875cfe9528a401963c09f29a6de7f4)

Conflicts:
        doc/mgr/dashboard.rst
        src/pybind/mgr/dashboard/controllers/grafana.py

Resolved some trivial conflicts and replaced the heading of the newly
added section in the documentation to another level, as the
documentation between master and octopus differs quite much.
doc/cephadm/monitoring.rst
doc/mgr/dashboard.rst
src/pybind/mgr/dashboard/controllers/grafana.py
src/pybind/mgr/dashboard/settings.py