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/nginx_plus/nginx_plus.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/nginx_plus/nginx_plus.chart.py')
-rw-r--r-- | collectors/python.d.plugin/nginx_plus/nginx_plus.chart.py | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/collectors/python.d.plugin/nginx_plus/nginx_plus.chart.py b/collectors/python.d.plugin/nginx_plus/nginx_plus.chart.py index cc827c7590..3082fdbe77 100644 --- a/collectors/python.d.plugin/nginx_plus/nginx_plus.chart.py +++ b/collectors/python.d.plugin/nginx_plus/nginx_plus.chart.py @@ -16,11 +16,7 @@ except ImportError: from bases.FrameworkServices.UrlService import UrlService -# default module values (can be overridden per job in `config`) -update_every = 1 -priority = 60000 -# charts order (can be overridden if you want less charts, or different order) ORDER = [ 'requests_total', 'requests_current', @@ -75,7 +71,7 @@ CHARTS = { ] }, 'ssl_memory_usage': { - 'options': [None, 'Memory Usage', '%', 'ssl', 'nginx_plus.ssl_memory_usage', 'area'], + 'options': [None, 'Memory Usage', 'percentage', 'ssl', 'nginx_plus.ssl_memory_usage', 'area'], 'lines': [ ['ssl_memory_usage', 'usage', 'absolute', 1, 100] ] @@ -94,7 +90,7 @@ def cache_charts(cache): charts = OrderedDict() charts['{0}_traffic'.format(cache.name)] = { - 'options': [None, 'Traffic', 'KB', family, 'nginx_plus.cache_traffic', 'stacked'], + 'options': [None, 'Traffic', 'KiB', family, 'nginx_plus.cache_traffic', 'stacked'], 'lines': [ ['_'.join([cache.name, 'hit_bytes']), 'served', 'absolute', 1, 1024], ['_'.join([cache.name, 'miss_bytes_written']), 'written', 'absolute', 1, 1024], @@ -102,7 +98,7 @@ def cache_charts(cache): ] } charts['{0}_memory_usage'.format(cache.name)] = { - 'options': [None, 'Memory Usage', '%', family, 'nginx_plus.cache_memory_usage', 'area'], + 'options': [None, 'Memory Usage', 'percentage', family, 'nginx_plus.cache_memory_usage', 'area'], 'lines': [ ['_'.join([cache.name, 'memory_usage']), 'usage', 'absolute', 1, 100], ] @@ -199,7 +195,8 @@ def web_upstream_charts(wu): 'lines': dimensions('active') } charts['web_upstream_{name}_connections_usage'.format(name=wu.name)] = { - 'options': [None, 'Peers Connections Usage', '%', family, 'nginx_plus.web_upstream_connections_usage', 'line'], + 'options': [None, 'Peers Connections Usage', 'percentage', family, + 'nginx_plus.web_upstream_connections_usage', 'line'], 'lines': dimensions('connections_usage', d=100) } # Traffic @@ -222,7 +219,7 @@ def web_upstream_charts(wu): # Response Time for peer in wu: charts['web_upstream_{0}_{1}_timings'.format(wu.name, peer.server)] = { - 'options': [None, 'Peer "{0}" Timings'.format(peer.real_server), 'ms', family, + 'options': [None, 'Peer "{0}" Timings'.format(peer.real_server), 'milliseconds', family, 'nginx_plus.web_upstream_peer_timings', 'line'], 'lines': [ ['_'.join([wu.name, peer.server, 'header_time']), 'header'], @@ -231,7 +228,7 @@ def web_upstream_charts(wu): } # Memory Usage charts['web_upstream_{name}_memory_usage'.format(name=wu.name)] = { - 'options': [None, 'Memory Usage', '%', family, 'nginx_plus.web_upstream_memory_usage', 'area'], + 'options': [None, 'Memory Usage', 'percentage', family, 'nginx_plus.web_upstream_memory_usage', 'area'], 'lines': [ ['_'.join([wu.name, 'memory_usage']), 'usage', 'absolute', 1, 100] ] |