summaryrefslogtreecommitdiffstats
path: root/python.d/haproxy.chart.py
diff options
context:
space:
mode:
authorLennart Weller <lhw@ring0.de>2017-09-17 22:17:33 +0000
committerLennart Weller <lhw@ring0.de>2017-09-17 22:17:33 +0000
commit6aaf5ba7ed0980c14bdc554fc8839a2126455ed5 (patch)
tree6161925716661486e7f47c479668a9487b039d83 /python.d/haproxy.chart.py
parentNew upstream version 1.7.0+dfsg (diff)
downloadnetdata-6aaf5ba7ed0980c14bdc554fc8839a2126455ed5.tar.xz
netdata-6aaf5ba7ed0980c14bdc554fc8839a2126455ed5.zip
New upstream version 1.8.0+dfsgupstream/1.8.0+dfsg
Diffstat (limited to '')
-rw-r--r--python.d/haproxy.chart.py16
1 files changed, 11 insertions, 5 deletions
diff --git a/python.d/haproxy.chart.py b/python.d/haproxy.chart.py
index 67a6f7821..a9ee66650 100644
--- a/python.d/haproxy.chart.py
+++ b/python.d/haproxy.chart.py
@@ -2,7 +2,6 @@
# Description: haproxy netdata python.d module
# Author: l2isbad
-from base import UrlService, SocketService
from collections import defaultdict
from re import compile as re_compile
@@ -11,6 +10,8 @@ try:
except ImportError:
from urllib.parse import urlparse
+from base import UrlService, SocketService
+
# default module values (can be overridden per job in `config`)
# update_every = 2
priority = 60000
@@ -73,7 +74,8 @@ METRICS = {'bin': {'algorithm': 'incremental', 'divisor': 1024},
'scur': {'algorithm': 'absolute', 'divisor': 1},
'qcur': {'algorithm': 'absolute', 'divisor': 1}}
-REGEX = dict(url=re_compile(r'idle = (?P<idle>[0-9]+)'), socket=re_compile(r'Idle_pct: (?P<idle>[0-9]+)'))
+REGEX = dict(url=re_compile(r'idle = (?P<idle>[0-9]+)'),
+ socket=re_compile(r'Idle_pct: (?P<idle>[0-9]+)'))
class Service(UrlService, SocketService):
@@ -81,11 +83,15 @@ class Service(UrlService, SocketService):
if 'socket' in configuration:
SocketService.__init__(self, configuration=configuration, name=name)
self.poll = SocketService
- self.options_ = dict(regex=REGEX['socket'], stat='show stat\n', info='show info\n')
+ self.options_ = dict(regex=REGEX['socket'],
+ stat='show stat\n'.encode(),
+ info='show info\n'.encode())
else:
UrlService.__init__(self, configuration=configuration, name=name)
self.poll = UrlService
- self.options_ = dict(regex=REGEX['url'], stat=self.url, info=url_remove_params(self.url))
+ self.options_ = dict(regex=REGEX['url'],
+ stat=self.url,
+ info=url_remove_params(self.url))
self.order = ORDER
self.definitions = CHARTS
@@ -208,4 +214,4 @@ def server_down(server, backend_name):
def url_remove_params(url):
parsed = urlparse(url or str())
- return '%s://%s%s' % (parsed.scheme, parsed.netloc, parsed.path)
+ return '{scheme}://{netloc}{path}'.format(scheme=parsed.scheme, netloc=parsed.netloc, path=parsed.path)