Fix issues from testing mysql.chart.py + change method name
paulfantom committed
Jul 2, 2016 at 20:05 UTC
a8319219b7299144f43053376be8a199a25cbd0c
6 files changed
+11
-75
python.d/apache.chart.py
+1
-1
@@ -86,7 +86,7 @@ class Service(UrlService):
86
"ConnsAsyncClosing": 'closing',
87
"ConnsAsyncWriting": 'writing'}
88
89
- def _formatted_data(self):
89
+ def _format_data(self):
90
"""
91
Format data received from http request
92
:return: dict
python.d/apache_cache.chart.py
+1
-1
@@ -28,7 +28,7 @@ class Service(LogService):
28
self.order = ORDER
29
self.definitions = CHARTS
30
31
- def _formatted_data(self):
31
+ def _format_data(self):
32
"""
33
Parse new log lines
34
:return: dict
python.d/mysql.chart.py
+3
-67
@@ -153,8 +153,8 @@ CHARTS = {
153
["Innodb_data_written", "write", "incremental", -1, 1024]
154
]},
155
'innodb_io_ops': {
156
- 'lines': [None, 'mysql InnoDB I/O Operations', 'operations/s', 'innodb', 'mysql.innodb_io_ops', 'line'],
157
- 'options': [
156
+ 'options': [None, 'mysql InnoDB I/O Operations', 'operations/s', 'innodb', 'mysql.innodb_io_ops', 'line'],
157
+ 'lines': [
158
["Innodb_data_reads", "reads"],
159
["Innodb_data_writes", "writes", "incremental", -1, 1],
160
["Innodb_data_fsyncs", "fsyncs"]
@@ -358,7 +358,7 @@ class Service(SimpleService):
358
self.error(NAME + " has problem connecting to server:", e)
359
raise RuntimeError
360
361
- def _get_data(self):
361
+ def _format_data(self):
362
"""
363
Get raw data from MySQL server
364
:return: dict
@@ -380,9 +380,6 @@ class Service(SimpleService):
380
381
return dict(raw_data)
382
383
- def _formatted_data(self):
384
- return self._get_data()
385
-
383
def check(self):
384
"""
385
Check if service is able to connect to server
@@ -394,64 +391,3 @@ class Service(SimpleService):
391
except RuntimeError:
392
self.connection = None
393
return False
397
-
398
- # def create(self):
399
- # """
400
- # Create graphs
401
- # :return: boolean
402
- # """
403
- # for name in ORDER:
404
- # self.defs[name] = []
405
- # for line in CHARTS[name][1]:
406
- # self.defs[name].append(line[0])
407
- #
408
- # idx = 0
409
- # data = self._get_data()
410
- # if data is None:
411
- # return False
412
- # for name in ORDER:
413
- # header = "CHART mysql_" + \
414
- # str(self.name) + "." + \
415
- # name + " " + \
416
- # CHARTS[name][0] + " " + \
417
- # str(self.priority + idx) + " " + \
418
- # str(self.update_every)
419
- # content = ""
420
- # # check if server has this data point
421
- # for line in CHARTS[name][1]:
422
- # if line[0] in data:
423
- # content += "DIMENSION " + line[0] + " " + line[1] + "\n"
424
- # if len(content) > 0:
425
- # print(header)
426
- # print(content)
427
- # idx += 1
428
- #
429
- # if idx == 0:
430
- # return False
431
- # return True
432
- #
433
- # def update(self, interval):
434
- # """
435
- # Update data on graphs
436
- # :param interval: int
437
- # :return: boolean
438
- # """
439
- # data = self._get_data()
440
- # if data is None:
441
- # return False
442
- # try:
443
- # data['Thread cache misses'] = int(int(data['Threads_created']) * 10000 / int(data['Connections']))
444
- # except Exception:
445
- # pass
446
- # for chart, dimensions in self.defs.items():
447
- # header = "BEGIN mysql_" + str(self.name) + "." + chart + " " + str(interval) + '\n'
448
- # lines = ""
449
- # for d in dimensions:
450
- # try:
451
- # lines += "SET " + d + " = " + data[d] + '\n'
452
- # except KeyError:
453
- # pass
454
- # if len(lines) > 0:
455
- # print(header + lines + "END")
456
- #
457
- # return True
python.d/nginx.chart.py
+1
-1
@@ -55,7 +55,7 @@ class Service(UrlService):
55
self.order = ORDER
56
self.definitions = CHARTS
57
58
- def _formatted_data(self):
58
+ def _format_data(self):
59
"""
60
Format data received from http request
61
:return: dict
python.d/phpfpm.chart.py
+1
-1
@@ -56,7 +56,7 @@ class Service(UrlService):
56
"max children reached": 'reached',
57
"slow requests": 'slow'}
58
59
- def _formatted_data(self):
59
+ def _format_data(self):
60
"""
61
Format data received from http request
62
:return: dict
python.d/python_modules/base.py
+4
-4
@@ -310,7 +310,7 @@ class SimpleService(BaseService):
310
"""
311
return ""
312
313
- def _formatted_data(self):
313
+ def _format_data(self):
314
"""
315
Format data received from http request
316
:return: dict
@@ -328,7 +328,7 @@ class SimpleService(BaseService):
328
Create charts
329
:return: boolean
330
"""
331
- data = self._formatted_data()
331
+ data = self._format_data()
332
if data is None:
333
return False
334
@@ -351,7 +351,7 @@ class SimpleService(BaseService):
351
:param interval: int
352
:return: boolean
353
"""
354
- data = self._formatted_data()
354
+ data = self._format_data()
355
if data is None:
356
return False
357
@@ -412,7 +412,7 @@ class UrlService(SimpleService):
412
except (KeyError, TypeError):
413
pass
414
415
- if self._formatted_data() is not None:
415
+ if self._format_data() is not None:
416
return True
417
else:
418
return False