Skip to content

refactor: clean up code formatting and improve metric filter logic #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 3, 2025
Merged

refactor: clean up code formatting and improve metric filter logic #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9dc0119
refactor: clean up code formatting and improve metric filter logic
kang2453 Apr 3, 2025
7f1c5f5
Merge branch 'cloudforet-io:master' into master
kang2453 Apr 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions pkg/pip_requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
google-auth
google-api-python-client
schematics
grpcio>=1.64.1
schematics
22 changes: 6 additions & 16 deletions src/spaceone/monitoring/connector/google_cloud_connector/google_cloud_monitoring.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ def list_metrics(self, query):
'name': query['name'],
'filter': self.set_metric_filter(metric_filter)
}
# print(f"Filter:{_query.get("filter")}")

for gc_metric in self.list_metric_descriptors(_query):
metric_kind = gc_metric.get('metricKind', '')
Expand Down Expand Up @@ -109,22 +108,17 @@ def list_metrics_time_series(self, metric_query, metric, start, end, period, sta
try:
name = _query['name']
_filter = _query['filter']
# _merge_filter = f"metric.type = starts_with(\"{_filter['metric_type']}\")"
_merge_filter = f'metric.type = "{_filter['metric_type']}"'
_merge_filter = f"metric.type = starts_with(\"{_filter['metric_type']}\")"

or_filter_list = []
for _label in _filter.get('labels', []):
or_filter_list.append(f"{_label['key']} = \"{_label['value']}\"")

# or_merge_filter = ' OR '.join(or_filter_list)
# _metric_filter = ' AND '.join([_merge_filter, or_merge_filter])
or_merge_filter = ' '.join(or_filter_list)
_metric_filter = ' '.join([_merge_filter, or_merge_filter])

or_merge_filter = ' OR '.join(or_filter_list)
_metric_filter = ' AND '.join([_merge_filter, or_merge_filter])

query = self.get_metric_data_query(name, _metric_filter, metric, start, end, period, stat)
_LOGGER.debug(f'[list_metrics_time_series] query: {query}')
# print(f"list_metrics_time_series:{query}")

response = self.client.projects().timeSeries().list(**query).execute()
response_data.update({'unit': response.get('unit')})
Expand Down Expand Up @@ -182,18 +176,14 @@ def get_metric_data_query(name, metric_filter, metric, start, end, period, stat)

@staticmethod
def set_metric_filter(metric_filter):
# _metric_filter = f"metric.type = starts_with(\"{metric_filter['metric_type']}\")"
_metric_filter = f'metric.type : "{metric_filter['metric_type']}" '

_metric_filter = f"metric.type = starts_with(\"{metric_filter['metric_type']}\")"

filter_list = []
for _label in metric_filter.get('labels', []):
filter_list.append(f"{_label['key']} = \"{_label['value']}\"")

# or_merge_filter = ' OR '.join(filter_list)
# _metric_filter = ' AND '.join([_metric_filter, or_merge_filter])
or_merge_filter = ' '.join(filter_list)
_metric_filter = ' '.join([_metric_filter, or_merge_filter])
or_merge_filter = ' OR '.join(filter_list)
_metric_filter = ' AND '.join([_metric_filter, or_merge_filter])

return _metric_filter

Expand Down
13 changes: 6 additions & 7 deletions src/spaceone/monitoring/service/metric_service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,8 @@ def list(self, params):
Returns:
plugin_metrics_response (dict)
"""
metrics_info = self.google_mgr.list_metrics(
params.get('schema', DEFAULT_SCHEMA), params['options'],
params['secret_data'], params['query'])
metrics_info = self.google_mgr.list_metrics(params.get('schema', DEFAULT_SCHEMA), params['options'],
params['secret_data'], params['query'])

return self.metric_mgr.make_metrics_response(metrics_info)

Expand All @@ -62,9 +61,9 @@ def get_data(self, params):
plugin_metric_data_response (dict)
"""
metric_data_info = self.google_mgr.get_metric_data(params.get('schema', DEFAULT_SCHEMA), params['options'],
params['secret_data'],
params['metric_query'], params['metric'],
params['start'], params['end'], params.get('period'),
params.get('stat'))
params['secret_data'],
params['metric_query'], params['metric'],
params['start'], params['end'], params.get('period'),
params.get('stat'))

return self.metric_mgr.make_metric_data_response(metric_data_info)
Loading