|
@@ -1051,7 +1051,7 @@ class MetricPluginMixin(object):
|
|
counter_data = {}
|
|
counter_data = {}
|
|
count = 0
|
|
count = 0
|
|
if hasattr(self, '_' + metric_name + '_count_initialize'):
|
|
if hasattr(self, '_' + metric_name + '_count_initialize'):
|
|
- (count, counter_data) = self.__getattribute__('_' + metric_name + '_count_initialize')(data, alias, region)
|
|
|
|
|
|
+ (count, counter_data) = self.__getattribute__('_' + metric_name + '_count_initialize')(alias, data, region)
|
|
for marker in data.iterate_markers(
|
|
for marker in data.iterate_markers(
|
|
filter_group = field_data[1],
|
|
filter_group = field_data[1],
|
|
region_id = region.get_id(),
|
|
region_id = region.get_id(),
|
|
@@ -1059,8 +1059,8 @@ class MetricPluginMixin(object):
|
|
merge=field_data[3]):
|
|
merge=field_data[3]):
|
|
begin = marker.get_offset_begin()
|
|
begin = marker.get_offset_begin()
|
|
end = marker.get_offset_end()
|
|
end = marker.get_offset_end()
|
|
- for m in pattern_to_search.finditer(text, begin, end):
|
|
|
|
- count = counter_callback(data, alias, text, begin, end, m, count, counter_data, region, marker)
|
|
|
|
|
|
+ for match in pattern_to_search.finditer(text, begin, end):
|
|
|
|
+ count = counter_callback(alias, data, region, marker, match, count, counter_data)
|
|
region.set_data(namespace, metric_name, count)
|
|
region.set_data(namespace, metric_name, count)
|
|
else:
|
|
else:
|
|
for region in data.iterate_regions(filter_group=field_data[5]):
|
|
for region in data.iterate_regions(filter_group=field_data[5]):
|