diff options
author | Costa Tsaousis (ktsaou) <costa@tsaousis.gr> | 2016-12-23 23:09:46 +0200 |
---|---|---|
committer | Costa Tsaousis (ktsaou) <costa@tsaousis.gr> | 2016-12-23 23:09:46 +0200 |
commit | fc0109c6aa0c62b86208653a1d1b1b73391e8729 (patch) | |
tree | e7465637894d95a7af048240f0ecec0b35c6a0a7 /python.d | |
parent | 2d9da64be959c1904ebb5d5309c543b094bc3d6c (diff) |
fixed bug in nginx_log module where the reported values were defined as incremental but returned as absolute
Diffstat (limited to 'python.d')
-rw-r--r-- | python.d/nginx_log.chart.py | 34 |
1 files changed, 22 insertions, 12 deletions
diff --git a/python.d/nginx_log.chart.py b/python.d/nginx_log.chart.py index 16a9d95713..ef964a5654 100644 --- a/python.d/nginx_log.chart.py +++ b/python.d/nginx_log.chart.py @@ -15,9 +15,11 @@ CHARTS = { 'options': [None, 'nginx status codes', 'requests/s', 'requests', 'nginx_log.codes', 'stacked'], 'lines': [ ["2xx", None, "incremental"], + ["5xx", None, "incremental"], ["3xx", None, "incremental"], ["4xx", None, "incremental"], - ["5xx", None, "incremental"] + ["1xx", None, "incremental"], + ["other", None, "incremental"] ]} } @@ -33,21 +35,26 @@ class Service(LogService): #pattern = r'(?:" )([0-9][0-9][0-9]) ?' self.regex = re.compile(pattern) + self.data = { + '1xx': 0, + '2xx': 0, + '3xx': 0, + '4xx': 0, + '5xx': 0, + 'other': 0 + } + def _get_data(self): """ Parse new log lines :return: dict """ - data = {'2xx': 0, - '3xx': 0, - '4xx': 0, - '5xx': 0} try: raw = self._get_raw_data() if raw is None: return None elif not raw: - return data + return self.data except (ValueError, AttributeError): return None @@ -60,13 +67,16 @@ class Service(LogService): continue if beginning == '2': - data["2xx"] += 1 + self.data["2xx"] += 1 elif beginning == '3': - data["3xx"] += 1 + self.data["3xx"] += 1 elif beginning == '4': - data["4xx"] += 1 + self.data["4xx"] += 1 elif beginning == '5': - data["5xx"] += 1 - - return data + self.data["5xx"] += 1 + elif beginning == '1': + self.data["1xx"] += 1 + else: + self.data["other"] += 1 + return self.data |