Skip to content

Add support for the comparison filters of Google Monitoring API #2234

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
rimey merged 4 commits into from
Sep 2, 2016
+51 −1
Merged

Add support for the comparison filters of Google Monitoring API #2234

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b31d7f6
Add support for the comparison filters of Google Monitoring API
maxkuzkin Sep 1, 2016
ddb6829
Added unit tests to validate added comparison operators
maxkuzkin Sep 1, 2016
c5bf033
PR improvements as suggested by Ken Rimey
maxkuzkin Sep 2, 2016
e0522e7
fixed doctoring indentation levels
maxkuzkin Sep 2, 2016
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
12 changes: 11 additions & 1 deletion gcloud/monitoring/query.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -637,7 +637,9 @@ def _build_label_filter(category, *args, **kwargs):
continue

suffix = None
if key.endswith('_prefix') or key.endswith('_suffix'):
ends = ['_prefix', '_suffix', '_greater', '_greaterequal',
'_less', '_lessequal']
if key.endswith(tuple(ends)):

This comment was marked as spam.

Sign in to view

key, suffix = key.rsplit('_', 1)

if category == 'resource' and key == 'resource_type':
Expand All @@ -649,6 +651,14 @@ def _build_label_filter(category, *args, **kwargs):
term = '{key} = starts_with("{value}")'
elif suffix == 'suffix':
term = '{key} = ends_with("{value}")'
elif suffix == 'greater':
term = '{key} > {value}'
elif suffix == 'greaterequal':
term = '{key} >= {value}'
elif suffix == 'less':
term = '{key} < {value}'
elif suffix == 'lessequal':
term = '{key} <= {value}'
else:
term = '{key} = "{value}"'

Expand Down
22 changes: 22 additions & 0 deletions gcloud/monitoring/test_query.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -557,6 +557,28 @@ def test_metric_labels(self):
)
self.assertEqual(actual, expected)

def test_metric_label_response_code_greater_less(self):
actual = self._callFUT(
'metric',
response_code_greater=500,
response_code_less=600)
expected = (
'metric.label.response_code < 600'
' AND metric.label.response_code > 500'
)
self.assertEqual(actual, expected)

def test_metric_label_response_code_greater_less_equal(self):
actual = self._callFUT(
'metric',
response_code_greaterequal=500,
response_code_lessequal=600)
expected = (
'metric.label.response_code <= 600'
' AND metric.label.response_code >= 500'
)
self.assertEqual(actual, expected)

def test_resource_labels(self):
actual = self._callFUT(
'resource',
Expand Down