]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
mgr/dashboard: enable different URL for users of browser to Grafana 39136/head
authorPatrick Seidensal <pseidensal@suse.com>
Tue, 3 Nov 2020 12:47:23 +0000 (13:47 +0100)
committerPatrick Seidensal <patrick@nawracay.de>
Mon, 1 Feb 2021 12:39:02 +0000 (13:39 +0100)
commitbe5be4d7db8098f48a40a1e479b7782c44752b0c
treefa0e90f8bf20817e39d18f4852bc483a7b7832f4
parent9743ed991c7282b299a36c28d635ff251bdee338
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.

(cherry picked from commit 56f304d31b154d87362620f08046720a3e0f3203)

Conflicts:

Removed cephadm documentation from cherry-picked commit as cephadm is
not part of Ceph Nautilus.

Removed paragraph that mentioned cephadm in dashboard documentation.
doc/mgr/dashboard.rst
src/pybind/mgr/dashboard/controllers/grafana.py
src/pybind/mgr/dashboard/settings.py