Skip to content

Commit 73f4f7d

Browse files
committed
SUMO-238205: Modified sumo metric query
1 parent 59185b0 commit 73f4f7d

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

EventHubs/tests/test_eventhub_metrics.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,13 @@ def test_04_sumo_query_record_count(self):
6060
expected_record_count = 10
6161
result = self.fetch_sumo_MetrixQuery_results(query, relative_time_in_minutes)
6262
#sample: {"error":false,"errorMessage":null,"errorInstanceId":null,"errorKey":null,"keyedErrors":[],"response":[{"rowId":"A","results":[{"metric":{"dimensions":[{"key":"metric","value":"count"}],"algoId":1},"horAggs":{"min":1.0,"max":17.0,"avg":2.0,"sum":32.0,"count":16,"latest":1.0},"datapoints":{"timestamp":[],"value":[],"outlierParams":[],"max":[],"min":[],"avg":[],"count":[],"isFilled":[]}}]}],"queryInfo":{"startTime":1711710360000,"endTime":1711710460000,"desiredQuantizationInSecs":{"empty":false,"defined":true},"actualQuantizationInSecs":1,"sessionIdStr":""}}
63+
self.assertFalse(result['error'],
64+
f"Metrix sumo query failed with error message {result['errorMessage']}")
6365
try:
6466
if result['error']:
6567
record_count = 0
6668
else:
67-
record_count = len(result['response'][0]['results'][0]['datapoints']['value'])
69+
record_count = result['response'][0]['results'][0]['datapoints']['value'][0]
6870
except Exception:
6971
record_count = 0
7072
self.assertTrue(record_count == expected_record_count,

test_utils/basetest.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -304,13 +304,12 @@ def fetch_sumo_query_results(cls, query='_sourceCategory="azure_br_logs" | count
304304
@classmethod
305305
def fetch_sumo_MetrixQuery_results(cls, query='_sourceCategory="azure_br_logs" | count', relative_time_in_minutes=15):
306306

307-
toTime = datetime.utcnow()
307+
toTime = datetime.now()
308308
fromTime = toTime + timedelta(minutes=-1*relative_time_in_minutes)
309309

310310
cls.logger.info(
311311
f"query: {query}, fromTime: {fromTime.isoformat(timespec='seconds')}, toTime: {toTime.isoformat(timespec='seconds')}")
312312

313-
# def search_metrics(self, query, fromTime=None, toTime=None, requestedDataPoints=600, maxDataPoints=800)
314-
search_result = cls.sumologic_cli.search_metrics(query, fromTime, toTime)
313+
search_result = cls.sumologic_cli.search_metrics(query, int(fromTime.timestamp())*1000, int(toTime.timestamp())*1000)
315314
cls.logger.info(f"source result: {search_result}")
316315
return search_result

0 commit comments

Comments
 (0)