rabbitmq_plugin: added to makefiles and minor fixes
Ilya committed
May 13, 2017 at 16:13 UTC
90e226453591d6a939537153706093047157b215
3 files changed
+14
-6
conf.d/Makefile.am
+1
@@ -49,6 +49,7 @@ dist_pythonconfig_DATA = \
49
python.d/phpfpm.conf \
50
python.d/postfix.conf \
51
python.d/postgres.conf \
52
+ python.d/rabbitmq.conf \
53
python.d/redis.conf \
54
python.d/retroshare.conf \
55
python.d/samba.conf \
python.d/Makefile.am
+1
@@ -39,6 +39,7 @@ dist_python_DATA = \
39
phpfpm.chart.py \
40
postfix.chart.py \
41
postgres.chart.py \
42
+ rabbitmq.chart.py \
43
redis.chart.py \
44
retroshare.chart.py \
45
samba.chart.py \
python.d/rabbitmq.chart.py
+12
-6
@@ -13,7 +13,6 @@ from collections import namedtuple
13
from json import loads
14
15
# default module values (can be overridden per job in `config`)
16
-# update_every = 2
16
update_every = 1
17
priority = 60000
18
retries = 60
@@ -23,7 +22,8 @@ METHODS = namedtuple('METHODS', ['get_data_function', 'url', 'stats'])
22
NODE_STATS = [('fd_used', None),
23
('mem_used', None),
24
('sockets_used', None),
26
- ('proc_used', None)
25
+ ('proc_used', None),
26
+ ('disk_free', None)
27
]
28
OVERVIEW_STATS = [('object_totals.channels', None),
29
('object_totals.consumers', None),
@@ -38,7 +38,7 @@ OVERVIEW_STATS = [('object_totals.channels', None),
38
('message_stats.publish', None)
39
]
40
ORDER = ['queued_messages', 'message_rates', 'global_counts',
41
- 'file_descriptors', 'memory', 'sockets', 'processes']
41
+ 'file_descriptors', 'socket_descriptors', 'erlang_processes', 'memory', 'disk_space']
42
43
CHARTS = {
44
'file_descriptors': {
@@ -53,13 +53,19 @@ CHARTS = {
53
'lines': [
54
['mem_used', 'used', 'absolute', 1, 1024 << 10]
55
]},
56
- 'sockets': {
57
- 'options': [None, 'Sockets', 'sockets', 'overview',
56
+ 'disk_space': {
57
+ 'options': [None, 'Disk Space', 'GB', 'overview',
58
+ 'rabbitmq.disk_space', 'line'],
59
+ 'lines': [
60
+ ['disk_free', 'free', 'absolute', 1, 1024 ** 3]
61
+ ]},
62
+ 'socket_descriptors': {
63
+ 'options': [None, 'Socket Descriptors', 'descriptors', 'overview',
64
'rabbitmq.sockets', 'line'],
65
'lines': [
66
['sockets_used', 'used', 'absolute']
67
]},
62
- 'processes': {
68
+ 'erlang_processes': {
69
'options': [None, 'Erlang Processes', 'processes', 'overview',
70
'rabbitmq.processes', 'line'],
71
'lines': [