From: Sebastian Wagner <sewagner@redhat.com>
Date: Mon, 30 Aug 2021 10:23:13 +0000 (+0200)
Subject: doc/cephadm: monitoring: move "deploying w/o" up
X-Git-Tag: v16.2.7~67^2~85
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a833a1eb25d0c4c6bea6d5fc2dfdb5d51bf707ae;p=ceph.git

doc/cephadm: monitoring: move "deploying w/o" up

Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit 5aa5fea8ee3e57e7636627031f651113a1d31cb4)
---

diff --git a/doc/cephadm/monitoring.rst b/doc/cephadm/monitoring.rst
index 2fdf8ffc3886..b1c2a8fe5061 100644
--- a/doc/cephadm/monitoring.rst
+++ b/doc/cephadm/monitoring.rst
@@ -291,22 +291,8 @@ Example
   # reconfig the prometheus service
   ceph orch reconfig prometheus
 
-Disabling monitoring
---------------------
-
-To disable monitoring and remove the software that supports it, run the following commands:
-
-.. code-block:: console
-
-  $ ceph orch rm grafana
-  $ ceph orch rm prometheus --force   # this will delete metrics data collected so far
-  $ ceph orch rm node-exporter
-  $ ceph orch rm alertmanager
-  $ ceph mgr module disable prometheus
-
-
-Deploying monitoring manually
------------------------------
+Deploying monitoring without cephadm
+------------------------------------
 
 If you have an existing prometheus monitoring infrastructure, or would like
 to manage it yourself, you need to configure it to integrate with your Ceph
@@ -325,6 +311,19 @@ cluster.
 
 * To enable dashboard integration with Grafana, see :ref:`dashboard-grafana`.
 
+Disabling monitoring
+--------------------
+
+To disable monitoring and remove the software that supports it, run the following commands:
+
+.. code-block:: console
+
+  $ ceph orch rm grafana
+  $ ceph orch rm prometheus --force   # this will delete metrics data collected so far
+  $ ceph orch rm node-exporter
+  $ ceph orch rm alertmanager
+  $ ceph mgr module disable prometheus
+
 Enabling RBD-Image monitoring
 ---------------------------------