web_log plugin: http_code renamed to detailed_response_codes; lower priority of squid_code and move hier_code to the new family
Ilya committed
May 30, 2017 at 11:44 UTC
9b28b2f3c6ba4b567ba8cfa93baed71e10c58a12
1 file changed
+14
-11
python.d/web_log.chart.py
+14
-11
@@ -19,7 +19,7 @@ ORDER_WEB = ['response_statuses', 'response_codes', 'bandwidth', 'response_time'
19
'requests_per_user_defined', 'http_method', 'http_version', 'requests_per_ipproto',
20
'clients', 'clients_all']
21
22
-ORDER_SQUID = ['response_statuses', 'response_codes', 'squid_code', 'http_code',
22
+ORDER_SQUID = ['response_statuses', 'response_codes', 'detailed_response_codes', 'squid_code',
23
'hier_code', 'bytes', 'duration', 'method', 'clients']
24
25
CHARTS_WEB = {
@@ -151,14 +151,14 @@ CHARTS_SQUID = {
151
'responses/s', 'responses', 'web_log.squid_responses_squid_code', 'stacked'],
152
'lines': [
153
]},
154
- 'http_code': {
155
- 'options': [None, 'Responses Per HTTP Code',
156
- 'responses/s', 'responses', 'web_log.squid_responses_http_code', 'stacked'],
154
+ 'detailed_response_codes': {
155
+ 'options': [None, 'Detailed Response Codes',
156
+ 'responses/s', 'responses', 'web_log.squid_detailed_response_codes', 'stacked'],
157
'lines': [
158
]},
159
'hier_code': {
160
'options': [None, 'Responses Per Hierarchy Code',
161
- 'responses/s', 'responses', 'web_log.squid_responses_hier_code', 'stacked'],
161
+ 'responses/s', 'hierarchy', 'web_log.squid_responses_hier_code', 'stacked'],
162
'lines': [
163
]},
164
'method': {
@@ -179,7 +179,10 @@ NAMED_PATTERN = namedtuple('PATTERN', ['description', 'pattern'])
179
180
DET_RESP_AGGR = ['', '_1xx', '_2xx', '_3xx', '_4xx', '_5xx', '_Other']
181
182
-SQUID_DYNAMIC = ('squid_code', 'http_code', 'hier_code', 'method')
182
+SQUID_DYNAMIC = dict(squid_code='squid_code',
183
+ http_code='detailed_response_codes',
184
+ hier_code='hier_code',
185
+ method='method')
186
187
188
class Service(LogService):
@@ -761,12 +764,12 @@ class Squid(Mixin):
764
self.data['unique_' + proto] += 1
765
unique_ip.add(match['client_address'])
766
764
- for elem in SQUID_DYNAMIC:
765
- if match[elem] not in self.data:
766
- self.add_new_dimension(dimension_id=match[elem],
767
- chart_key=elem)
767
+ for key, chart_key in SQUID_DYNAMIC.items():
768
+ if match[key] not in self.data:
769
+ self.add_new_dimension(dimension_id=match[key],
770
+ chart_key=chart_key)
771
else:
769
- self.data[match[elem]] += 1
772
+ self.data[match[key]] += 1
773
else:
774
self.data['unmatched'] += 1
775