@cryptotaxi247 / netdata-1 / commits / df7846307

haproxy_plugin: get data via UrlService bugfix

Ilya committed Mar 23, 2017 at 15:24 UTC df784630704b481901c5f476cdbbde4c5e2e4a69
1 file changed +83 -80
python.d/haproxy.chart.py
+83 -80
@@ -13,43 +13,44 @@ retries = 60
13 ORDER = ['fbin', 'fbout', 'fscur', 'fqcur', 'bbin', 'bbout', 'bscur', 'bqcur', 'health_sdown', 'health_bdown']
14 CHARTS = {
15 'fbin': {
16 - 'options': [None, "Kilobytes in", "kilobytes in/s", 'Frontend', 'haproxy_f.bin', 'line'],
16 + 'options': [None, "Kilobytes In", "KB/s", 'frontend', 'haproxy_f.bin', 'line'],
17 'lines': [
18 ]},
19 'fbout': {
20 - 'options': [None, "Kilobytes out", "kilobytes out/s", 'Frontend', 'haproxy_f.bout', 'line'],
20 + 'options': [None, "Kilobytes Out", "KB/s", 'frontend', 'haproxy_f.bout', 'line'],
21 'lines': [
22 ]},
23 'fscur': {
24 - 'options': [None, "Sessions active", "sessions", 'Frontend', 'haproxy_f.scur', 'line'],
24 + 'options': [None, "Sessions Active", "sessions", 'frontend', 'haproxy_f.scur', 'line'],
25 'lines': [
26 ]},
27 'fqcur': {
28 - 'options': [None, "Session in queue", "sessions", 'Frontend', 'haproxy_f.qcur', 'line'],
28 + 'options': [None, "Session In Queue", "sessions", 'frontend', 'haproxy_f.qcur', 'line'],
29 'lines': [
30 ]},
31 'bbin': {
32 - 'options': [None, "Kilobytes in", "kilobytes in/s", 'Backend', 'haproxy_b.bin', 'line'],
32 + 'options': [None, "Kilobytes In", "KB/s", 'backend', 'haproxy_b.bin', 'line'],
33 'lines': [
34 ]},
35 'bbout': {
36 - 'options': [None, "Kilobytes out", "kilobytes out/s", 'Backend', 'haproxy_b.bout', 'line'],
36 + 'options': [None, "Kilobytes Out", "KB/s", 'backend', 'haproxy_b.bout', 'line'],
37 'lines': [
38 ]},
39 'bscur': {
40 - 'options': [None, "Sessions active", "sessions", 'Backend', 'haproxy_b.scur', 'line'],
40 + 'options': [None, "Sessions Active", "sessions", 'backend', 'haproxy_b.scur', 'line'],
41 'lines': [
42 ]},
43 'bqcur': {
44 - 'options': [None, "Sessions in queue", "sessions", 'Backend', 'haproxy_b.qcur', 'line'],
44 + 'options': [None, "Sessions In Queue", "sessions", 'backend', 'haproxy_b.qcur', 'line'],
45 'lines': [
46 ]},
47 'health_sdown': {
48 - 'options': [None, "Number of servers in backend in DOWN state", "failed servers", 'Health', 'haproxy_hs.down', 'line'],
48 + 'options': [None, "Backend Servers In DOWN State", "failed servers", 'health',
49 + 'haproxy_hs.down', 'line'],
50 'lines': [
51 ]},
52 'health_bdown': {
52 - 'options': [None, "Is backend alive? 1 = DOWN", "failed backend", 'Health', 'haproxy_hb.down', 'line'],
53 + 'options': [None, "Is backend alive? 1 = DOWN", "failed backend", 'health', 'haproxy_hb.down', 'line'],
54 'lines': [
55 ]}
56 }
@@ -57,61 +58,68 @@ CHARTS = {
58
59 class Service(UrlService, SocketService):
60 def __init__(self, configuration=None, name=None):
60 - SocketService.__init__(self, configuration=configuration, name=name)
61 - self.user = self.configuration.get('user')
62 - self.password = self.configuration.get('pass')
63 - self.request = 'show stat\n'
64 - self.poll_method = (UrlService, SocketService)
61 + if 'socket' in configuration:
62 + SocketService.__init__(self, configuration=configuration, name=name)
63 + self.poll_method = SocketService
64 + self.request = 'show stat\n'
65 + else:
66 + UrlService.__init__(self, configuration=configuration, name=name)
67 + self.poll_method = UrlService
68 self.order = ORDER
69 + self.definitions = CHARTS
70 self.order_front = [_ for _ in ORDER if _.startswith('f')]
71 self.order_back = [_ for _ in ORDER if _.startswith('b')]
68 - self.definitions = CHARTS
72 self.charts = True
73
74 def check(self):
72 - if self.configuration.get('url'):
73 - self.poll_method = self.poll_method[0]
74 - url = self.configuration.get('url')
75 - if not url.endswith(';csv;norefresh'):
76 - self.error('Bad url(%s). Must be http://<ip.address>:<port>/<url>;csv;norefresh' % url)
77 - return False
78 - elif self.configuration.get('socket'):
79 - self.poll_method = self.poll_method[1]
80 - else:
81 - self.error('No configuration is specified')
82 - return False
75
76 if self.poll_method.check(self):
85 - self.info('Plugin was started succesfully. We are using %s.' % self.poll_method.__name__)
77 + self.info('Plugin was started successfully. We are using %s.' % self.poll_method.__name__)
78 return True
79 + else:
80 + return False
81
82 def create_charts(self, front_ends, back_ends):
89 - for _ in range(len(front_ends)):
90 - self.definitions['fbin']['lines'].append(['_'.join(['fbin', front_ends[_]['# pxname']]), front_ends[_]['# pxname'], 'incremental', 1, 1024])
91 - self.definitions['fbout']['lines'].append(['_'.join(['fbout', front_ends[_]['# pxname']]), front_ends[_]['# pxname'], 'incremental', 1, 1024])
92 - self.definitions['fscur']['lines'].append(['_'.join(['fscur', front_ends[_]['# pxname']]), front_ends[_]['# pxname'], 'absolute'])
93 - self.definitions['fqcur']['lines'].append(['_'.join(['fqcur', front_ends[_]['# pxname']]), front_ends[_]['# pxname'], 'absolute'])
94 -
95 - for _ in range(len(back_ends)):
96 - self.definitions['bbin']['lines'].append(['_'.join(['bbin', back_ends[_]['# pxname']]), back_ends[_]['# pxname'], 'incremental', 1, 1024])
97 - self.definitions['bbout']['lines'].append(['_'.join(['bbout', back_ends[_]['# pxname']]), back_ends[_]['# pxname'], 'incremental', 1, 1024])
98 - self.definitions['bscur']['lines'].append(['_'.join(['bscur', back_ends[_]['# pxname']]), back_ends[_]['# pxname'], 'absolute'])
99 - self.definitions['bqcur']['lines'].append(['_'.join(['bqcur', back_ends[_]['# pxname']]), back_ends[_]['# pxname'], 'absolute'])
100 - self.definitions['health_sdown']['lines'].append(['_'.join(['hsdown', back_ends[_]['# pxname']]), back_ends[_]['# pxname'], 'absolute'])
101 - self.definitions['health_bdown']['lines'].append(['_'.join(['hbdown', back_ends[_]['# pxname']]), back_ends[_]['# pxname'], 'absolute'])
102 -
83 + for _ in enumerate(front_ends):
84 + idx = _[0]
85 + self.definitions['fbin']['lines'].append(['_'.join(['fbin', front_ends[idx]['# pxname']]),
86 + front_ends[idx]['# pxname'], 'incremental', 1, 1024])
87 + self.definitions['fbout']['lines'].append(['_'.join(['fbout', front_ends[idx]['# pxname']]),
88 + front_ends[idx]['# pxname'], 'incremental', 1, 1024])
89 + self.definitions['fscur']['lines'].append(['_'.join(['fscur', front_ends[idx]['# pxname']]),
90 + front_ends[idx]['# pxname'], 'absolute'])
91 + self.definitions['fqcur']['lines'].append(['_'.join(['fqcur', front_ends[idx]['# pxname']]),
92 + front_ends[idx]['# pxname'], 'absolute'])
93 +
94 + for _ in enumerate(back_ends):
95 + idx = _[0]
96 + self.definitions['bbin']['lines'].append(['_'.join(['bbin', back_ends[idx]['# pxname']]),
97 + back_ends[idx]['# pxname'], 'incremental', 1, 1024])
98 + self.definitions['bbout']['lines'].append(['_'.join(['bbout', back_ends[idx]['# pxname']]),
99 + back_ends[idx]['# pxname'], 'incremental', 1, 1024])
100 + self.definitions['bscur']['lines'].append(['_'.join(['bscur', back_ends[idx]['# pxname']]),
101 + back_ends[idx]['# pxname'], 'absolute'])
102 + self.definitions['bqcur']['lines'].append(['_'.join(['bqcur', back_ends[idx]['# pxname']]),
103 + back_ends[idx]['# pxname'], 'absolute'])
104 + self.definitions['health_sdown']['lines'].append(['_'.join(['hsdown', back_ends[idx]['# pxname']]),
105 + back_ends[idx]['# pxname'], 'absolute'])
106 + self.definitions['health_bdown']['lines'].append(['_'.join(['hbdown', back_ends[idx]['# pxname']]),
107 + back_ends[idx]['# pxname'], 'absolute'])
108 +
109 def _get_data(self):
110 """
111 Format data received from http request
112 :return: dict
113 """
108 - try:
109 - raw_data = self.poll_method._get_raw_data(self).splitlines()
110 - except Exception as e:
111 - self.error(str(e))
114 + raw_data = self.poll_method._get_raw_data(self)
115 +
116 + if not raw_data:
117 return None
118 + else:
119 + raw_data = raw_data.splitlines()
120
114 - all_instances = [dict(zip(raw_data[0].split(','), raw_data[_].split(','))) for _ in range(1, len(raw_data))]
121 + all_instances = [dict(zip(raw_data[0].split(','),
122 + raw_data[_].split(','))) for _ in range(1, len(raw_data))]
123
124 back_ends = list(filter(is_backend, all_instances))
125 front_ends = list(filter(is_frontend, all_instances))
@@ -124,21 +132,26 @@ class Service(UrlService, SocketService):
132 to_netdata = dict()
133
134 for frontend in front_ends:
127 - for _ in self.order_front:
128 - to_netdata.update({'_'.join([_, frontend['# pxname']]): int(frontend[_[1:]]) if frontend.get(_[1:]) else 0})
135 + for idx in self.order_front:
136 + to_netdata.update({'_'.join([idx, frontend['# pxname']]):
137 + int(frontend[idx[1:]]) if frontend.get(idx[1:]) else 0})
138
139 for backend in back_ends:
131 - for _ in self.order_back:
132 - to_netdata.update({'_'.join([_, backend['# pxname']]): int(backend[_[1:]]) if backend.get(_[1:]) else 0})
140 + for idx in self.order_back:
141 + to_netdata.update({'_'.join([idx, backend['# pxname']]):
142 + int(backend[idx[1:]]) if backend.get(idx[1:]) else 0})
143
134 - for _ in range(len(back_ends)):
135 - to_netdata.update({'_'.join(['hsdown', back_ends[_]['# pxname']]):
136 - len([server for server in servers if is_server_down(server, back_ends, _)])})
137 - to_netdata.update({'_'.join(['hbdown', back_ends[_]['# pxname']]): 1 if is_backend_down(back_ends, _) else 0})
144 + for _ in enumerate(back_ends):
145 + idx = _[0]
146 + to_netdata.update({'_'.join(['hsdown', back_ends[idx]['# pxname']]):
147 + len([server for server in servers if is_server_down(server, back_ends, idx)])})
148 + to_netdata.update({'_'.join(['hbdown', back_ends[idx]['# pxname']]):
149 + 1 if is_backend_down(back_ends, idx) else 0})
150
151 return to_netdata
152
141 - def _check_raw_data(self, data):
153 + @staticmethod
154 + def _check_raw_data(data):
155 """
156 Check if all data has been gathered from socket
157 :param data: str
@@ -146,32 +159,22 @@ class Service(UrlService, SocketService):
159 """
160 return not bool(data)
161
162 +
163 def is_backend(backend):
150 - try:
151 - return backend['svname'] == 'BACKEND' and backend['# pxname'] != 'stats'
152 - except Exception:
153 - return False
164 + return backend.get('svname') == 'BACKEND' and backend.get('# pxname') != 'stats'
165 +
166
167 def is_frontend(frontend):
156 - try:
157 - return frontend['svname'] == 'FRONTEND' and frontend['# pxname'] != 'stats'
158 - except Exception:
159 - return False
168 + return frontend.get('svname') == 'FRONTEND' and frontend.get('# pxname') != 'stats'
169 +
170
171 def is_server(server):
162 - try:
163 - return not server['svname'].startswith(('FRONTEND', 'BACKEND'))
164 - except Exception:
165 - return False
166 -
167 -def is_server_down(server, back_ends, _):
168 - try:
169 - return server['# pxname'] == back_ends[_]['# pxname'] and server['status'] == 'DOWN'
170 - except Exception:
171 - return False
172 -
173 -def is_backend_down(back_ends, _):
174 - try:
175 - return back_ends[_]['status'] == 'DOWN'
176 - except Exception:
177 - return False
172 + return not server.get('svname', '').startswith(('FRONTEND', 'BACKEND'))
173 +
174 +
175 +def is_server_down(server, back_ends, idx):
176 + return server.get('# pxname') == back_ends[idx].get('# pxname') and server.get('status') == 'DOWN'
177 +
178 +
179 +def is_backend_down(back_ends, idx):
180 + return back_ends[idx].get('status') == 'DOWN'