Merge pull request #38761 from p-se/wip-48607-octopus

author Nathan Cutler <presnypreklad@gmail.com>

Fri, 22 Jan 2021 17:52:16 +0000 (18:52 +0100)

committer GitHub <noreply@github.com>

Fri, 22 Jan 2021 17:52:16 +0000 (18:52 +0100)
author Nathan Cutler <presnypreklad@gmail.com>
Fri, 22 Jan 2021 17:52:16 +0000 (18:52 +0100)
committer GitHub <noreply@github.com>
Fri, 22 Jan 2021 17:52:16 +0000 (18:52 +0100)
diff --cc doc/cephadm/monitoring.rst
Simple merge
diff --cc doc/mgr/dashboard.rst
Simple merge
diff --cc src/pybind/mgr/dashboard/settings.py
Simple merge
author	Nathan Cutler <presnypreklad@gmail.com>
	Fri, 22 Jan 2021 17:52:16 +0000 (18:52 +0100)
committer	GitHub <noreply@github.com>
	Fri, 22 Jan 2021 17:52:16 +0000 (18:52 +0100)
		1	2
doc/cephadm/monitoring.rst	patch \|	diff1 \|	diff2 \|	blob \| history
doc/mgr/dashboard.rst	patch \|	diff1 \|	diff2 \|	blob \| history
src/pybind/mgr/dashboard/settings.py	patch \|	diff1 \|	diff2 \|	blob \| history