import 15.2.0 Octopus source

[ceph.git] / ceph / doc / mgr / zabbix.rst

diff --git a/ceph/doc/mgr/zabbix.rst b/ceph/doc/mgr/zabbix.rst
index 1aa3ebfcf7e57488e551e04bf9036cf5608f5399..e0671462524179db8b6bb7c3a417934583c5a655 100644 (file)
--- a/ceph/doc/mgr/zabbix.rst
+++ b/ceph/doc/mgr/zabbix.rst
@@ -68,6 +68,7 @@ Additional configuration keys which can be configured and their default values:
 - zabbix_port: 10051
 - zabbix_sender: /usr/bin/zabbix_sender
 - interval: 60
+- discovery_interval: 100
 
 Configuration keys
 ^^^^^^^^^^^^^^^^^^^
@@ -95,7 +96,7 @@ The current configuration of the module can also be shown:
 
 Template
 ^^^^^^^^
-A `template <https://raw.githubusercontent.com/ceph/ceph/9c54334b615362e0a60442c2f41849ed630598ab/src/pybind/mgr/zabbix/zabbix_template.xml>`_. 
+A `template <https://raw.githubusercontent.com/ceph/ceph/master/src/pybind/mgr/zabbix/zabbix_template.xml>`_. 
 (XML) to be used on the Zabbix server can be found in the source directory of the module.
 
 This template contains all items and a few triggers. You can customize the triggers afterwards to fit your needs.
@@ -129,6 +130,14 @@ This can be done with this command:
 
 The module will now send its latest data to the Zabbix server.
 
+Items discovery is accomplished also via zabbix_sender, and runs every `discovery_interval * interval` seconds. If you wish to launch discovery 
+manually, this can be done with this command:
+
+::
+
+    ceph zabbix discovery
+
+
 Debugging
 ---------
 
@@ -141,4 +150,4 @@ ceph-mgr and check the logs.
         debug mgr = 20
 
 With logging set to debug for the manager the module will print various logging
-lines prefixed with *mgr[zabbix]* for easy filtering.
\ No newline at end of file
+lines prefixed with *mgr[zabbix]* for easy filtering.