@cryptotaxi247 / netdata-1 / commits / 5377fc698

web_log plugin: "other" dimension to response statuses chart added

Ilya committed Feb 13, 2017 at 22:26 UTC 5377fc698d5998c6f26eda4ccb9fa9636eef5190
1 file changed +12 -8
python.d/web_log.chart.py
+12 -8
@@ -71,10 +71,11 @@ CHARTS = {
71 'options': [None, 'Response Statuses', 'requests/s', 'responses', 'web_log.response_statuses',
72 'stacked'],
73 'lines': [
74 - ['successful_requests', 'successful', 'incremental', 1, 1],
75 - ['redirects', None, 'incremental', 1, 1],
74 + ['successful_requests', 'success', 'incremental', 1, 1],
75 + ['server_errors', 'error', 'incremental', 1, 1],
76 + ['redirects', 'redirect', 'incremental', 1, 1],
77 ['bad_requests', 'bad', 'incremental', 1, 1],
77 - ['server_errors', None, 'incremental', 1, 1]
78 + ['other_requests', 'other', 'incremental', 1, 1]
79 ]}
80 }
81
@@ -103,7 +104,7 @@ class Service(LogService):
104 'resp_time_avg': 0, 'unique_cur_ipv4': 0, 'unique_cur_ipv6': 0, '2xx': 0,
105 '5xx': 0, '3xx': 0, '4xx': 0, '1xx': 0, '0xx': 0, 'unmatched': 0, 'req_ipv4': 0,
106 'req_ipv6': 0, 'unique_tot_ipv4': 0, 'unique_tot_ipv6': 0, 'successful_requests': 0,
106 - 'redirects': 0, 'bad_requests': 0, 'server_errors': 0}
107 + 'redirects': 0, 'bad_requests': 0, 'server_errors': 0, 'other_requests': 0}
108
109 def check(self):
110 if not self.log_path:
@@ -401,14 +402,17 @@ class Service(LogService):
402 :param code: str: response status code. Ex.: '202', '499'
403 :return:
404 """
404 - if code[0] == '2' or code == '304' or code[0] == '1':
405 + code_class = code[0]
406 + if code_class == '2' or code == '304' or code_class == '1':
407 self.data['successful_requests'] += 1
406 - elif code[0] == '3':
408 + elif code_class == '3':
409 self.data['redirects'] += 1
408 - elif code[0] == '4':
410 + elif code_class == '4':
411 self.data['bad_requests'] += 1
410 - elif code[0] == '5':
412 + elif code_class == '5':
413 self.data['server_errors'] += 1
414 + else:
415 + self.data['other_requests'] += 1
416
417
418 def address_not_in_pool(pool, address, pool_size):