web_log module fixes (rename chart method)
lgz committed
Nov 3, 2017 at 00:40 UTC
76cdc6ae9ee1b56e10635d5535310cb743a02174
1 file changed
+13
-13
python.d/web_log.chart.py
+13
-13
@@ -639,18 +639,18 @@ class Web:
639
# requests per http method
640
if match_dict.get('method'):
641
if match_dict['method'] not in self.data:
642
- self.charts['http_method'].add_dimension_and_push_chart([match_dict['method'],
643
- match_dict['method'],
644
- 'incremental'])
642
+ self.charts['http_method'].add_dimension([match_dict['method'],
643
+ match_dict['method'],
644
+ 'incremental'])
645
self.data[match_dict['method']] = 0
646
self.data[match_dict['method']] += 1
647
# requests per http version
648
if match_dict.get('http_version'):
649
dim_id = match_dict['http_version'].replace('.', '_')
650
if dim_id not in self.data:
651
- self.charts['http_version'].add_dimension_and_push_chart([dim_id,
652
- match_dict['http_version'],
653
- 'incremental'])
651
+ self.charts['http_version'].add_dimension([dim_id,
652
+ match_dict['http_version'],
653
+ 'incremental'])
654
self.data[dim_id] = 0
655
self.data[dim_id] += 1
656
@@ -662,12 +662,12 @@ class Web:
662
"""
663
if code not in self.data:
664
if self.configuration.get('detailed_response_aggregate', True):
665
- self.charts['detailed_response_codes'].add_dimension_and_push_chart([code, code, 'incremental'])
665
+ self.charts['detailed_response_codes'].add_dimension([code, code, 'incremental'])
666
self.data[code] = 0
667
else:
668
code_index = int(code[0]) if int(code[0]) < 6 else 6
669
chart_key = 'detailed_response_codes' + DET_RESP_AGGR[code_index]
670
- self.charts[chart_key].add_dimension_and_push_chart([code, code, 'incremental'])
670
+ self.charts[chart_key].add_dimension([code, code, 'incremental'])
671
self.data[code] = 0
672
self.data[code] += 1
673
@@ -835,9 +835,9 @@ class Squid:
835
dimension_id = values['func_dim_id'](match[key]) if values['func_dim_id'] else match[key]
836
if dimension_id not in self.data:
837
dimension = values['func_dim'](match[key]) if values['func_dim'] else dimension_id
838
- self.charts[values['chart']].add_dimension_and_push_chart([dimension_id,
839
- dimension,
840
- 'incremental'])
838
+ self.charts[values['chart']].add_dimension([dimension_id,
839
+ dimension,
840
+ 'incremental'])
841
self.data[dimension_id] = 0
842
self.data[dimension_id] += 1
843
else:
@@ -872,7 +872,7 @@ class Squid:
872
:return:
873
"""
874
if code not in self.data:
875
- self.charts['squid_code'].add_dimension_and_push_chart([code, code, 'incremental'])
875
+ self.charts['squid_code'].add_dimension([code, code, 'incremental'])
876
self.data[code] = 0
877
self.data[code] += 1
878
@@ -883,7 +883,7 @@ class Squid:
883
continue
884
dimension_id = '_'.join(['code_detailed', tag])
885
if dimension_id not in self.data:
886
- self.charts[chart_key].add_dimension_and_push_chart([dimension_id, tag, 'incremental'])
886
+ self.charts[chart_key].add_dimension([dimension_id, tag, 'incremental'])
887
self.data[dimension_id] = 0
888
self.data[dimension_id] += 1
889