New version with _*

rspamd

@@ -4,24 +4,45 @@ import os
 import re
 import shlex
 import sys
+import time
 
-CONFIG="""\
-multigraph rspamd_actions
+def avg_scantime(scantimes):
+    total = [float(t) for t in scantimes if t]
+    return sum(total) / len(total)
+
+
+def storage2name(name):
+    return re.sub('[\.\- ]', '_', name)
+
+
+CONFIGS = {
+        'actions': [
+            lambda data: '''\
 graph_title Rspamd actions
 graph_vlabel mails
 graph_args --base 1000 -l 0
 graph_category antispam
 graph_scale yes
-reject.label Rejection
-soft_reject.label Soft rejection
-rewrite_subject.label Rewrite subject
-add_header.label Set headers
-greylist.label Graylist
-no_action.label No action
 scanned.label Scanned/total
 learned.label Learned
-
-multigraph rspamd_result
+%s''' %     (
+                '\n'.join(['%s.label %s' % (action.replace(' ', '_'),
+                                            action.title())
+                           for action in data['actions']])
+            ),
+            lambda data: '''\
+scanned.value %d
+learned.value %d
+%s''' %     (
+                data['scanned'],
+                data['learned'],
+                '\n'.join(['%s.value %d' % (action.replace(' ', '_'),
+                                            value)
+                           for action, value in data['actions'].items()])
+            ),
+        ],
+        'results': [
+            '''\
 graph_title Rspamd results
 graph_vlabel mails
 graph_args --base 1000 -l 0
@@ -29,117 +50,166 @@ graph_category antispam
 graph_scale yes
 spam.label Spams
 ham.label Ham
-
-multigraph rspamd_scantime
+''',
+            lambda data: '''\
+spam.value %d
+ham.value %d''' % (data['spam_count'], data['ham_count']),
+        ],
+        'scantime': [
+            '''\
 graph_title Rspamd scantime
 graph_args --base 1000 -l 0
 graph_category antispam
 graph_scale yes
 graph_vlabel seconds
 scantime.label Average scantime
-
-multigraph rspamd_uptime
+''',
+            lambda data: '''\
+scantime.value %f''' % avg_scantime(data['scan_times']),
+        ],
+        'uptime': [
+            '''\
 graph_title Rspamd uptime
 graph_args --base 1000 -l 0
 graph_category antispam
 graph_scale no
 graph_vlabel uptime in days
 uptime.label uptime
-uptime.label uptime
-
-multigraph rspamd_memory
+''',
+            lambda data: 'uptime.value %f' % (data['uptime']/(3600*24)),
+        ],
+        'memory_usage': [
+            '''\
 graph_title Rspamd memory usage
 graph_args --base 1024 -l 0
 graph_category antispam
 graph_scale yes
 graph_vlabel bytes
 memory.label Memory usage
-
-multigraph rspamd_connections
+''',
+            lambda data: 'memory.value %d' % data['bytes_allocated'],
+        ],
+        'memory_stats': [
+            '''\
+graph_title Rspamd memory stats
+graph_args --base 1000 -l 0
+graph_category antispam
+graph_scale yes
+pools_allocated.label Pools allocated
+pools_freed.label Pools freed
+chunks_allocated.label Chunks allocated
+chunks_freed.label Chunks freed
+shared_chunks_allocated.label Shared chunks allocated
+''',
+            lambda data: '''\
+pools_allocated.value %d
+pools_freed.value %d
+chunks_allocated.value %d
+chunks_freed.value %d
+shared_chunks_allocated.value %d''' % (data['pools_allocated'], data['pools_freed'],
+                                       data['chunks_allocated'], data['chunks_freed'],
+                                       data['shared_chunks_allocated']),
+        ],
+        'connections': [
+            '''\
 graph_title Rspamd connections
 graph_args --base 1000 -l 0
 graph_category antispam
 graph_scale yes
 graph_vlabel connections
 connections.label opened connections
-
-multigraph rspamd_ctrl_connections
+''',
+            lambda data: 'connections.value %d' % data['connections'],
+        ],
+        'ctrl_connections': [
+            '''\
 graph_title Rspamd control connections count
 graph_args --base 1000 -l 0
 graph_category antispam
 graph_scale yes
 graph_vlabel connections
 connections.label control connections count
-"""
-
-def storage2name(name):
-    return re.sub('[\.\- ]', '_', name)
-
-rspamc='/usr/bin/rspamc'
-# TODO check env for rspamc path
-cmd = shlex.join([rspamc, '--json', 'stat'])
-
-with os.popen(cmd, mode='r') as pipe:
-    data = json.loads(pipe.read())
-
-
-if len(sys.argv) > 1 and sys.argv[1] == 'config':
-    print(CONFIG)
-    print('''multigraph rspamd_statfiles
+''',
+            lambda data: 'connections.value %d' % data['control_connections'],
+        ],
+        'statfiles': [
+            lambda data:'''\
 graph_title rspamd bayes statfiles
 graph_args --base 1000 -l 0
 graph_scale yes
-graph_vlabel learned mails''')
-    for stat in data['statfiles']:
-        sym = stat['symbol']
-        print(f'learned_{sym}.label {sym} learned')
-        print(f'users_{sym}.label {sym} users')
-    print()
-
-    print('''multigraph rspamd_fuzzy_hash
+graph_vlabel learned mails
+%s''' % (
+            '\n'.join(['''learned_{sym}.label {sym} learned
+users_{sym}.label {sym} users'''.format(sym=stat['symbol'])
+                       for stat in data['statfiles']])
+        ),
+            lambda data: '\n'.join('''\
+learned_{sym}.value {lv}
+users_{sym}.value {uv}'''.format(sym=stat['symbol'], lv=stat['revision'], uv=stat['users']) for stat in data['statfiles']),
+        ],
+        'fuzzy_hashes': [
+            lambda data:'''\
 graph_title rspamd fuzzy hases storage
 graph_args --base 1000 -l 0
 graph_scale yes
-graph_vlabel hashes''')
-    for storage in data['fuzzy_hashes']:
-        storage_name = storage2name(storage)
-        print(f'{storage_name}.label {storage}')
-    exit(0)
-
-print('multigraph rspamd_actions')
-for action, value in data['actions'].items():
-    print('%s.value %d' % (action.replace(' ', '_'), value))
-print('scanned.value %d' % data['scanned'])
-print('learned.value %d' % data['learned'])
-
-print('multigraph rspamd_result')
-print('spam.value %d' % data['spam_count'])
-print('ham.value %d' % data['ham_count'])
-
-print('multigraph rspamd_scantime')
-scantimes = [float(t) for t in data['scan_times'] if t]
-scantime = sum(scantimes) / len(scantimes)
-print('scantime.value %f' % scantime)
-
-print('multigraph rspamd_uptime')
-print('uptime.value %f' % (data['uptime']/(3600*24)))
-
-print('multigraph rspamd_memory')
-print('memory.value %d' % data['bytes_allocated'])
-
-print('multigraph rspamd_connections')
-print('connections.value %d' % data['connections'])
-
-print('multigraph rspamd_ctrl_connections')
-print('connections.value %d' % data['control_connections'])
-
-print('multigraph rspamd_statfiles')
-for stat in data['statfiles']:
-    sym = stat['symbol']
-    print(f'learned_{sym}.value %d' % stat['revision'])
-    print(f'users_{sym}.value %d' % stat['users'])
-
-print('multigraph rspamd_fuzzy_hash')
-for storage, count in data['fuzzy_hashes'].items():
-    storage_name = storage2name(storage)
-    print(f'{storage_name}.value %d' % count)
+graph_vlabel hashes
+%s''' % (
+            '\n'.join(['%s.label %s' % (storage2name(storage), storage)
+                       for storage in data['fuzzy_hashes']])
+        ),
+            lambda data: '\n'.join(['%s.value %d' % (storage2name(storage), count)
+                                    for storage, count in data['fuzzy_hashes'].items()]),
+        ],
+}
+
+
+def main(argv, environ):
+    # TODO check env for rspamc path
+    rspamc = environ.get('rspamc', '/usr/bin/rspamc')
+    cache_file = environ.get('cache_file', '/tmp/munin_rspamd.cache')
+    cache_time = int(environ.get('cache_time', 60 * 4))
+
+    rspamc_cmd = shlex.join([rspamc, '--json', 'stat'])
+
+    data = None
+    if os.path.exists(cache_file):
+        cache_stat = os.stat(cache_file)
+        if cache_stat.st_mtime > time.time() - cache_time:
+            with open(cache_file, 'r') as cache:
+                try:
+                    data = json.loads(cache.read())
+                except json.JSONDecodeError:
+                    pass
+
+    if data is None:
+        with open(cache_file, 'w') as cache:
+            with os.popen(rspamc_cmd, mode='r') as pipe:
+                data = pipe.read()
+                cache.write(data)
+                data = json.loads(data)
+
+
+    spl = argv[0].split('_')[1:]
+    if len(spl) == 0:
+        raise NameError('Valid commands are : %s' % (','.join(CONFIGS.keys())))
+    cmd = '_'.join(spl)
+    if cmd not in CONFIGS:
+        raise NameError('Unknown command %r valid commands are : %s' % (cmd, ','.join(CONFIGS.keys())))
+
+    CONFIG = CONFIGS[cmd][0]
+    ACT = CONFIGS[cmd][1]
+
+    if len(argv) > 1 and argv[1] == 'config':
+        if not isinstance(CONFIG, str):
+            CONFIG = CONFIG(data)
+        return CONFIG
+    else:
+        return ACT(data)
+
+
+if __name__ == '__main__':
+    try:
+        print(main(sys.argv[0], os.environ))
+    except Exception as expt:
+        print(expt)
+