]> arthur.barton.de Git - netdata.git/commitdiff
web_log plugin: PerUrlReq chart dimensions must be unique
authorIlya <ilyamaschenko@gmail.com>
Thu, 16 Feb 2017 04:05:13 +0000 (13:05 +0900)
committerIlya <ilyamaschenko@gmail.com>
Thu, 16 Feb 2017 04:05:13 +0000 (13:05 +0900)
python.d/web_log.chart.py

index 815ae3829c2e8b91b54cb9c3275d21ab2e3db3ba..e49fe80248c4ae4004adb35b9cb8b2e3a0286637 100644 (file)
@@ -400,12 +400,12 @@ class Service(LogService):
         if self.url_pattern:
             self.definitions['requests_per_url'] = {'options': [None, 'Requests Per Url', 'requests/s',
                                                                 'urls', 'web_log.requests_per_url', 'stacked'],
-                                                    'lines': [['other_url', 'other', 'incremental']]}
+                                                    'lines': [['pur_other', 'other', 'incremental']]}
             for elem in self.url_pattern:
-                self.definitions['requests_per_url']['lines'].append([elem.description, elem.description,
+                self.definitions['requests_per_url']['lines'].append([elem.description, elem.description[4:],
                                                                       'incremental'])
                 self.data.update({elem.description: 0})
-            self.data.update({'other_url': 0})
+            self.data.update({'pur_other': 0})
         else:
             self.order.remove('requests_per_url')
 
@@ -529,7 +529,7 @@ class Service(LogService):
                 match = True
                 break
         if not match:
-            self.data['other_url'] += 1
+            self.data['pur_other'] += 1
 
     def _get_data_statuses(self, code):
         """
@@ -607,7 +607,7 @@ def check_req_per_url_pattern(url_pattern):
     for dimension, regex in url_pattern.items():
         valid_pattern = is_valid_pattern(regex)
         if isinstance(dimension, str) and valid_pattern:
-            result.append(NAMED_URL_PATTERN(description=dimension, pattern=valid_pattern))
+            result.append(NAMED_URL_PATTERN(description='_'.join(['pur', dimension]), pattern=valid_pattern))
 
     return result or None