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

Merge branch 'master' into bugfix/1615-cloudwatch-statistics

Browse source
This commit is contained in:
Steve Pulec 2018-05-29 22:19:25 -04:00 • committed by GitHub
commit 69587c151c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
22 changed files with 310 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

7
moto/cloudwatch/models.py
View file

@ -229,8 +229,13 @@ class CloudWatchBackend(BaseBackend):
def put_metric_data(self, namespace, metric_data):
for metric_member in metric_data:
# Preserve "datetime" for get_metric_statistics comparisons
timestamp = metric_member.get('Timestamp')
if timestamp is not None and type(timestamp) != datetime:
timestamp = datetime.strptime(timestamp, '%Y-%m-%dT%H:%M:%S.%fZ')
timestamp = timestamp.replace(tzinfo=tzutc())
self.metric_data.append(MetricDatum(
namespace, metric_member['MetricName'], float(metric_member.get('Value', 0)), metric_member.get('Dimensions.member', _EMPTY_LIST), metric_member.get('Timestamp')))
namespace, metric_member['MetricName'], float(metric_member.get('Value', 0)), metric_member.get('Dimensions.member', _EMPTY_LIST), timestamp))
def get_metric_statistics(self, namespace, metric_name, start_time, end_time, period, stats):
period_delta = timedelta(seconds=period)

2
moto/cloudwatch/responses.py
View file

@ -272,7 +272,7 @@ GET_METRIC_STATISTICS_TEMPLATE = """<GetMetricStatisticsResponse xmlns="http://m
</ResponseMetadata>
<GetMetricStatisticsResult>
<Label> {{ label }} </Label>
<Label>{{ label }}</Label>
<Datapoints>
{% for datapoint in datapoints %}
<Datapoint>