minor fixes for dovecot and hddtemp
Costa Tsaousis (ktsaou) committed
Nov 12, 2016 at 13:43 UTC
c2c0dcc86422d9073d8866347b912cadc84fddb9
2 files changed
+22
-22
python.d/dovecot.chart.py
+21
-21
@@ -13,75 +13,75 @@ retries = 60
13
ORDER = ['sessions', 'logins', 'commands',
14
'faults',
15
'context_switches',
16
- 'disk', 'bytes', 'syscalls',
16
+ 'io', 'net', 'syscalls',
17
'lookup', 'cache',
18
'auth', 'auth_cache']
19
20
CHARTS = {
21
'sessions': {
22
- 'options': [None, "active sessions", 'number', 'IMAP', 'dovecot.sessions', 'line'],
22
+ 'options': [None, "Dovecot Active Sessions", 'number', 'sessions', 'dovecot.sessions', 'line'],
23
'lines': [
24
['num_connected_sessions', 'active sessions', 'absolute']
25
]},
26
'logins': {
27
- 'options': [None, "logins", 'number', 'IMAP', 'dovecot.logins', 'line'],
27
+ 'options': [None, "Dovecot Logins", 'number', 'logins', 'dovecot.logins', 'line'],
28
'lines': [
29
['num_logins', 'logins', 'absolute']
30
]},
31
'commands': {
32
- 'options': [None, "commands", "commands", 'IMAP', 'dovecot.commands', 'line'],
32
+ 'options': [None, "Dovecot Commands", "commands", 'commands', 'dovecot.commands', 'line'],
33
'lines': [
34
['num_cmds', 'commands', 'absolute']
35
]},
36
'faults': {
37
- 'options': [None, "faults", "faults", 'Faults', 'dovecot.faults', 'line'],
37
+ 'options': [None, "Dovecot Page Faults", "faults", 'page faults', 'dovecot.faults', 'line'],
38
'lines': [
39
['min_faults', 'minor', 'absolute'],
40
['maj_faults', 'major', 'absolute']
41
]},
42
'context_switches': {
43
- 'options': [None, "context switches", '', 'Context Switches', 'dovecot.context_switches', 'line'],
43
+ 'options': [None, "Dovecot Context Switches", '', 'context switches', 'dovecot.context_switches', 'line'],
44
'lines': [
45
['vol_cs', 'volountary', 'absolute'],
46
['invol_cs', 'involountary', 'absolute']
47
]},
48
- 'disk': {
49
- 'options': [None, "disk", 'bytes/s', 'Reads and Writes', 'dovecot.disk', 'line'],
48
+ 'io': {
49
+ 'options': [None, "Dovecot Disk I/O", 'kilobytes/s', 'disk', 'dovecot.io', 'area'],
50
'lines': [
51
- ['disk_input', 'read', 'incremental'],
52
- ['disk_output', 'write', 'incremental']
51
+ ['disk_input', 'read', 'incremental', 1, 1024],
52
+ ['disk_output', 'write', 'incremental', -1, 1024]
53
]},
54
- 'bytes': {
55
- 'options': [None, "bytes", 'bytes/s', 'Reads and Writes', 'dovecot.bytes', 'line'],
54
+ 'net': {
55
+ 'options': [None, "Dovecot Network Bandwidth", 'kilobits/s', 'network', 'dovecot.net', 'area'],
56
'lines': [
57
- ['read_bytes', 'read', 'incremental'],
58
- ['write_bytes', 'write', 'incremental']
57
+ ['read_bytes', 'read', 'incremental', 8, 1024],
58
+ ['write_bytes', 'write', 'incremental', -8, 1024]
59
]},
60
'syscalls': {
61
- 'options': [None, "number of syscalls", 'syscalls/s', 'Reads and Writes', 'dovecot.syscalls', 'line'],
61
+ 'options': [None, "Dovecot Number of SysCalls", 'syscalls/s', 'system', 'dovecot.syscalls', 'line'],
62
'lines': [
63
['read_count', 'read', 'incremental'],
64
['write_count', 'write', 'incremental']
65
]},
66
'lookup': {
67
- 'options': [None, "lookups", 'number/s', 'Mail', 'dovecot.lookup', 'line'],
67
+ 'options': [None, "Dovecot Lookups", 'number/s', 'lookups', 'dovecot.lookup', 'stacked'],
68
'lines': [
69
['mail_lookup_path', 'path', 'incremental'],
70
['mail_lookup_attr', 'attr', 'incremental']
71
]},
72
'cache': {
73
- 'options': [None, "hits", 'hits/s', 'Mail', 'dovecot.cache', 'line'],
73
+ 'options': [None, "Dovecot Cache Hits", 'hits/s', 'cache', 'dovecot.cache', 'line'],
74
'lines': [
75
['mail_cache_hits', 'hits', 'incremental']
76
]},
77
'auth': {
78
- 'options': [None, "attempts", 'attempts', 'Authentication', 'dovecot.auth', 'stacked'],
78
+ 'options': [None, "Dovecot Authentications", 'attempts', 'logins', 'dovecot.auth', 'stacked'],
79
'lines': [
80
- ['auth_successes', 'success', 'absolute'],
81
- ['auth_failures', 'failure', 'absolute']
80
+ ['auth_successes', 'ok', 'absolute'],
81
+ ['auth_failures', 'failed', 'absolute']
82
]},
83
'auth_cache': {
84
- 'options': [None, "cache", 'number', 'Authentication', 'dovecot.auth_cache', 'stacked'],
84
+ 'options': [None, "Dovecot Authentication Cache", 'number', 'cache', 'dovecot.auth_cache', 'stacked'],
85
'lines': [
86
['auth_cache_hits', 'hit', 'absolute'],
87
['auth_cache_misses', 'miss', 'absolute']
python.d/hddtemp.chart.py
+1
-1
@@ -23,7 +23,7 @@ ORDER = ['temperatures']
23
24
CHARTS = {
25
'temperatures': {
26
- 'options': ['disks_temp', 'temperature', 'Celsius', 'Disks temperature', 'hddtemp.temperatures', 'line'],
26
+ 'options': ['disks_temp', 'Disks Temperatures', 'Celsius', 'Disks temperature', 'hddtemp.temperatures', 'line'],
27
'lines': [
28
# lines are created dynamically in `check()` method
29
]}