catalin/moto
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Cloudwatch get metric data return by period (#3626)

Browse source 
* Cloudwatch get metric data return by period

- addresses https://github.com/localstack/localstack/issues/3493

* fix lint issues

* remove unused import

* added test cases for min max and average
This commit is contained in:
Rahul Ranjan 2021-02-02 14:38:53 +05:30 • committed by GitHub
commit 78a5661093
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 120 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

57
moto/cloudwatch/models.py
View file

@ -388,39 +388,62 @@ class CloudWatchBackend(BaseBackend):
)
)
def get_metric_data(self, queries, start_time, end_time):
def get_metric_data(
self, queries, start_time, end_time, scan_by="TimestampAscending"
):
period_data = [
md for md in self.metric_data if start_time <= md.timestamp <= end_time
]
results = []
for query in queries:
period_start_time = start_time
query_ns = query["metric_stat._metric._namespace"]
query_name = query["metric_stat._metric._metric_name"]
query_data = [
md
for md in period_data
if md.namespace == query_ns and md.name == query_name
]
metric_values = [m.value for m in query_data]
delta = timedelta(seconds=int(query["metric_stat._period"]))
result_vals = []
timestamps = []
stat = query["metric_stat._stat"]
if len(metric_values) > 0:
if stat == "Average":
result_vals.append(sum(metric_values) / len(metric_values))
elif stat == "Minimum":
result_vals.append(min(metric_values))
elif stat == "Maximum":
result_vals.append(max(metric_values))
elif stat == "Sum":
result_vals.append(sum(metric_values))
while period_start_time <= end_time:
period_end_time = period_start_time + delta
period_md = [
period_md
for period_md in period_data
if period_start_time <= period_md.timestamp < period_end_time
]
query_period_data = [
md
for md in period_md
if md.namespace == query_ns and md.name == query_name
]
metric_values = [m.value for m in query_period_data]
if len(metric_values) > 0:
if stat == "Average":
result_vals.append(sum(metric_values) / len(metric_values))
elif stat == "Minimum":
result_vals.append(min(metric_values))
elif stat == "Maximum":
result_vals.append(max(metric_values))
elif stat == "Sum":
result_vals.append(sum(metric_values))
timestamps.append(
iso_8601_datetime_without_milliseconds(period_start_time)
)
period_start_time += delta
if scan_by == "TimestampDescending" and len(timestamps) > 0:
timestamps.reverse()
result_vals.reverse()
label = query["metric_stat._metric._metric_name"] + " " + stat
results.append(
{
"id": query["id"],
"label": label,
"vals": result_vals,
"timestamps": [datetime.now() for _ in result_vals],
"timestamps": timestamps,
}
)
return results

4
moto/cloudwatch/responses.py
View file

@ -128,9 +128,11 @@ class CloudWatchResponse(BaseResponse):
def get_metric_data(self):
start = dtparse(self._get_param("StartTime"))
end = dtparse(self._get_param("EndTime"))
scan_by = self._get_param("ScanBy")
queries = self._get_list_prefix("MetricDataQueries.member")
results = self.cloudwatch_backend.get_metric_data(
start_time=start, end_time=end, queries=queries
start_time=start, end_time=end, queries=queries, scan_by=scan_by
)
template = self.response_template(GET_METRIC_DATA_TEMPLATE)