Commit Graph

14 Commits

Author SHA1 Message Date
Sage Weil
611c8949fa Merge PR #26547 into master
* refs/pull/26547/head:
	Added validation of zabbix_host to support hostnames, IPv4 and IPv6.
	mgr/zabbix: Documentation added.
	mgr/zabbix: Adds possibility to send data to multiple zabbix servers.

Reviewed-by: Wido den Hollander <wido@42on.com>
2019-06-03 15:45:42 -05:00
slivik
c5e74c9f29 Added validation of zabbix_host to support hostnames, IPv4 and IPv6.
Changed exception logging.
Doc typo fixed.

Signed-off-by: slivik <jakub.sliva@gmail.com>
2019-05-21 15:53:17 +02:00
Gregory Farnum
6dbe49605e
Merge pull request #26152 from noonedeadpunk/mgr/zabbix_discovery
mgr/zabbix Added pools discovery and per-pool statistics

Reviewed-by: Wido den Hollander <wido@42on.com>
2019-05-06 13:15:54 -07:00
Lenz Grimmer
c3149421bc doc: Replaced "plugin" with "module" in the Mgr documentation
The documentation currently refers to Ceph Manager Modules as
"plugins" in many places, while the command line interface uses
"module" to enable/disable modules. Replaced all occurences
of "plugin" with "module" in the docs, to avoid confusion and to
be in alignment with the CLI. Also fixed the capitalizations of some
module chapters.

Fixes: https://tracker.ceph.com/issues/38481
Signed-off-by: Lenz Grimmer <lgrimmer@suse.com>
2019-02-27 13:49:47 +01:00
Dmitriy Rabotjagov
0d03028732 mgr/zabbix Changed application_prototype naming convention
application_prototypes were named not as obvious as they could be,
so changed them from "Ceph {#CRUSH_RULE}" to "Ceph CRUSH [{#CRUSH_RULE}]"
to make name of crush policy more visable and easier to select by regexp.

Also discoverable items have been removed from regular Ceph application

Signed-off-by: Dmitriy Rabotjagov <noonedeadpunk@ya.ru>
2019-02-26 12:20:26 +02:00
slivik
96c6cb4e4e mgr/zabbix: Documentation added.
Signed-off-by: slivik <jakub.sliva@gmail.com>
2019-02-25 14:36:28 +01:00
Dmitriy Rabotjagov
4f7f73b3fa mgr/zabbix Implemets pools discovery and per-pool statistics
This commit adds possibility for zabbix mgr plugin to discover
ceph pools and send to zabbix not only generalized
but also pool-related data.

These metrics are pretty important, as it gives possibility
to collect data what exact pool uses most of the iops or diskspace

Signed-off-by: Dmitriy Rabotjagov <noonedeadpunk@ya.ru>
2019-01-25 21:14:03 +02:00
Wido den Hollander
a17177044e
doc: Update mgr/zabbix plugin documentation with link to Zabbix template
Signed-off-by: Wido den Hollander <wido@42on.com>
2018-10-26 13:45:02 +02:00
Wido den Hollander
2281bfd54d
mgr/zabbix: Use fsid as identifier with Zabbix if none is set
Users can still override this parameter, but by default the fsid
of the cluster will be used to send data to Zabbix.

This makes it even easier to use the Zabbix module.

Signed-off-by: Wido den Hollander <wido@42on.com>
2017-12-19 13:53:48 +01:00
Wido den Hollander
e7e9c6de52
doc: Updated documentation for Zabbix Mgr module
Signed-off-by: Wido den Hollander <wido@42on.com>
2017-10-17 15:53:47 +02:00
Wido den Hollander
ef5ff0e4b9
doc: Update mgr doc on how to enable Zabbix module
Signed-off-by: Wido den Hollander <wido@42on.com>
2017-08-07 10:03:10 +02:00
Sage Weil
4eb1a518e3 mon: 'config-key put' -> 'config-key set'
Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-26 14:10:08 -04:00
Dan Mick
c40c254cc6 doc/mgr/zabbix.rst: fix subheadings, add subsubheadings
(otherwise subheadings appear as top-level items in the TOC, because
they're marked just like the title)

Signed-off-by: Dan Mick <dan.mick@redhat.com>
2017-07-20 20:09:05 -07:00
Wido den Hollander
bcf3a7edcb
mgr: Zabbix monitoring module
This ceph-mgr module will pull various values from the Ceph cluster
and send them to a Zabbix Server using zabbix_sender.

This requires the zabbix_sender executable to be present on the system
running ceph-mgr as it will be invoked to send data to Zabbix.

A Zabbix template can be found in this directory which can be used
to easily get data from your Ceph cluster into Zabbix.

More information is available in the README file found in the module's
directory.

Signed-off-by: Wido den Hollander <wido@42on.com>
2017-07-05 11:06:19 +02:00