diff options
author | Ilya Mashchenko <ilyamaschenko@gmail.com> | 2018-12-17 18:50:20 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-12-17 18:50:20 +0300 |
commit | 97b32703c63569812ef6652d8a8ab3a75f21990d (patch) | |
tree | 46bc67e074e839a9c1ecda640487d7102d16715d /collectors/python.d.plugin/ovpn_status_log/ovpn_status_log.chart.py | |
parent | 7ad91b8f9a840f7d8364a78dd396524c642ec786 (diff) |
[python] make units compliant with IEC standard (#4995)
* apache units fix
* beanstalk
* bind_rndc
* boinc
* ceph
* chrony
* couchdb
* dns_query
* dnsdist
* dockerd
* dovecot
* elasticsearch by @vlvkobal <3
* example
* exim
* fail2ban
* freeradius minor fixes
* freeradius minor fixes
* freeradius minor fixes
* go_expvar
* haproxy
* hddtemp
* httpcheck
* icecast
* ipfs
* isc_dhcpd
* litespeed
* logind
* megacli
* memcached
* mongodb
* monit
* mysql
* nginx
* nginx_plus
* nsd
* ntpd
* nvidia_smi
* openldap
* ovpn_status
* phpfm
* portcheck
* postfix
* postgres
* powerdns
* proxysql
* puppet
* rabbitmq
* redis
* restroshare
* samba
* sensors
* smartdlog
* spigotmc
* springboot
* squid
* retroshare
* tomcat
* retroshare
* tor
* traefik
* traefik
* unbound
* uwsgi
* varnish
* w1sensor
* web_log
* ok codacy
* retroshare
* ipfs
Diffstat (limited to 'collectors/python.d.plugin/ovpn_status_log/ovpn_status_log.chart.py')
-rw-r--r-- | collectors/python.d.plugin/ovpn_status_log/ovpn_status_log.chart.py | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/collectors/python.d.plugin/ovpn_status_log/ovpn_status_log.chart.py b/collectors/python.d.plugin/ovpn_status_log/ovpn_status_log.chart.py index e0119af436..dc7a6002e4 100644 --- a/collectors/python.d.plugin/ovpn_status_log/ovpn_status_log.chart.py +++ b/collectors/python.d.plugin/ovpn_status_log/ovpn_status_log.chart.py @@ -3,14 +3,18 @@ # Author: l2isbad # SPDX-License-Identifier: GPL-3.0-or-later -from re import compile as r_compile +import re from bases.FrameworkServices.SimpleService import SimpleService -priority = 60000 + update_every = 10 -ORDER = ['users', 'traffic'] +ORDER = [ + 'users', + 'traffic', +] + CHARTS = { 'users': { 'options': [None, 'OpenVPN Active Users', 'active users', 'users', 'openvpn_status.users', 'line'], @@ -19,15 +23,20 @@ CHARTS = { ] }, 'traffic': { - 'options': [None, 'OpenVPN Traffic', 'KB/s', 'traffic', 'openvpn_status.traffic', 'area'], + 'options': [None, 'OpenVPN Traffic', 'KiB/s', 'traffic', 'openvpn_status.traffic', 'area'], 'lines': [ - ['bytes_in', 'in', 'incremental', 1, 1 << 10], ['bytes_out', 'out', 'incremental', 1, -1 << 10] + ['bytes_in', 'in', 'incremental', 1, 1 << 10], + ['bytes_out', 'out', 'incremental', -1, 1 << 10] ] } } -TLS_REGEX = r_compile(r'(?:[0-9a-f]+:[0-9a-f:]+|(?:\d{1,3}(?:\.\d{1,3}){3}(?::\d+)?)) (?P<bytes_in>\d+) (?P<bytes_out>\d+)') -STATIC_KEY_REGEX = r_compile(r'TCP/[A-Z]+ (?P<direction>(?:read|write)) bytes,(?P<bytes>\d+)') +TLS_REGEX = re.compile( + r'(?:[0-9a-f]+:[0-9a-f:]+|(?:\d{1,3}(?:\.\d{1,3}){3}(?::\d+)?)) (?P<bytes_in>\d+) (?P<bytes_out>\d+)' +) +STATIC_KEY_REGEX = re.compile( + r'TCP/[A-Z]+ (?P<direction>(?:read|write)) bytes,(?P<bytes>\d+)' +) class Service(SimpleService): |