Merge pull request #48489 from rkachach/fix_issue_57816

author Adam King <47704447+adk3798@users.noreply.github.com>

Wed, 7 Dec 2022 15:20:56 +0000 (10:20 -0500)

committer GitHub <noreply@github.com>

Wed, 7 Dec 2022 15:20:56 +0000 (10:20 -0500)
author Adam King <47704447+adk3798@users.noreply.github.com>
Wed, 7 Dec 2022 15:20:56 +0000 (10:20 -0500)
committer GitHub <noreply@github.com>
Wed, 7 Dec 2022 15:20:56 +0000 (10:20 -0500)
diff --cc doc/cephadm/services/monitoring.rst

index 0841dc8933f24213781bf71a558da8d447682d73,4ffde25d5fa02b7d6bf37b43f2456546735dfd31..226f0748e0c564565a569ef7a3be1fe962e2af1c
--- 1/doc/cephadm/services/monitoring.rst
--- 2/doc/cephadm/services/monitoring.rst
+++ b/doc/cephadm/services/monitoring.rst
@@@ -124,9 -125,8 +125,10 @@@ example spec file
       - 192.169.142.0/24
       spec:
         port: 4200
+       protocol: http
   
+ +.. _cephadm_monitoring-images:
+ +
   Using custom images
   ~~~~~~~~~~~~~~~~~~~
   
diff --cc src/pybind/mgr/cephadm/module.py
Simple merge
author	Adam King <47704447+adk3798@users.noreply.github.com>
	Wed, 7 Dec 2022 15:20:56 +0000 (10:20 -0500)
committer	GitHub <noreply@github.com>
	Wed, 7 Dec 2022 15:20:56 +0000 (10:20 -0500)
		1	2
doc/cephadm/services/monitoring.rst	patch \|	diff1 \|	diff2 \|	blob \| history
src/pybind/mgr/cephadm/module.py	patch \|	diff1 \|	diff2 \|	blob \| history