From 1f53be84d6e81d990a1576f112c0dd92a74c5ab0 Mon Sep 17 00:00:00 2001
From: Michele Tartara <mtartara@google.com>
Date: Mon, 28 Jan 2013 14:36:53 +0100
Subject: [PATCH] Add instance status collector to mon-collector man page

Add a section related to the new collector.

Also, fix some formatting issue (white spaces, line longer than 80 chars)
in the DRBD collector section.

Signed-off-by: Michele Tartara <mtartara@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>
---
 man/mon-collector.rst | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/man/mon-collector.rst b/man/mon-collector.rst
index aea881200..d985117aa 100644
--- a/man/mon-collector.rst
+++ b/man/mon-collector.rst
@@ -24,16 +24,14 @@ collector to be run.
 When executed, ``mon-collector`` will run the specified collector and will
 print its output to stdout, in JSON format.
 
-
-
-
 COLLECTORS
 ----------
 
 DRBD
 ~~~~
 
-| drbd [ [ **-s** | **\--drbd-status** ] = *status-file* ] [ [ **-p** | **\--drbd-pairing**] = *pairing-file* ]
+| drbd [ [ **-s** | **\--drbd-status** ] = *status-file* ] [ [ **-p** |
+  **\--drbd-pairing**] = *pairing-file* ]
 
 Collects the information about the version and status of the DRBD kernel
 module, and of the disks it is managing.
@@ -51,3 +49,21 @@ The options that can be passed to the DRBD collector are as follows:
 -p *pairing-file*, \--drbd-pairing=*pairing-file*
   Read the information about the pairing between instances and DRBD minors
   from the specified file instead of asking the Confd servers for them.
+
+INSTANCE STATUS
+~~~~~~~~~~~~~~~
+
+| inst-status-xen [ [ **-a** | **\--address** ] = *ip-address* ] [ [ **-p** |
+  **\--port** ] = *port-number* ]
+
+Collects the information about the status of the instances of the current node.
+In order to perform this task, it needs to connect to the ConfD daemon to fetch
+some configuration information. The following parameters allow the user to
+specify the position where the daemon is listening, in case it's not the default
+one:
+
+-a *ip-address*, \--address=*ip-address*
+  The IP address the ConfD daemon is listening on.
+
+-p *port-number*, \--port=*port-number*
+  The port the ConfD deamon is listening on.
-- 
GitLab