Merge pull request #35106 from p-se/wip-pse-cephadm-custom-monitoring-images

author Sebastian Wagner <sebastian.wagner@suse.com>

Wed, 27 May 2020 16:12:05 +0000 (18:12 +0200)

committer GitHub <noreply@github.com>

Wed, 27 May 2020 16:12:05 +0000 (18:12 +0200)
author Sebastian Wagner <sebastian.wagner@suse.com>
Wed, 27 May 2020 16:12:05 +0000 (18:12 +0200)
committer GitHub <noreply@github.com>
Wed, 27 May 2020 16:12:05 +0000 (18:12 +0200)
diff --cc doc/cephadm/monitoring.rst
Simple merge
diff --cc src/cephadm/cephadm
Simple merge
diff --cc src/pybind/mgr/cephadm/module.py
Simple merge
author	Sebastian Wagner <sebastian.wagner@suse.com>
	Wed, 27 May 2020 16:12:05 +0000 (18:12 +0200)
committer	GitHub <noreply@github.com>
	Wed, 27 May 2020 16:12:05 +0000 (18:12 +0200)
		1	2
doc/cephadm/monitoring.rst	patch \|	diff1 \|	diff2 \|	blob \| history
src/cephadm/cephadm	patch \|	diff1 \|	diff2 \|	blob \| history
src/pybind/mgr/cephadm/module.py	patch \|	diff1 \|	diff2 \|	blob \| history