From 2066094cdba1746fcb2d56a4e45c8f2063811975 Mon Sep 17 00:00:00 2001 From: Colin Hemmings Date: Mon, 18 Feb 2019 17:53:05 +0000 Subject: [PATCH] Remove random conversion to utc when calculating epoch for cloudwatch metrics --- aws-ec2/collectors/aws-ec2.py | 2 +- aws-elb/collectors/aws-elb.py | 2 +- aws-rds/collectors/aws-rds.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/aws-ec2/collectors/aws-ec2.py b/aws-ec2/collectors/aws-ec2.py index 64aca44..8851d5c 100644 --- a/aws-ec2/collectors/aws-ec2.py +++ b/aws-ec2/collectors/aws-ec2.py @@ -177,7 +177,7 @@ def collect(self, _): metric_name = "aws." + metric['Id'] if len(metric['Values']) > 0: value = metric['Values'][-1] - ts = int(metric['Timestamps'][-1].utcnow().timestamp() * 1000) + ts = int(metric['Timestamps'][-1].timestamp() * 1000) if metric['Id'] == 'ec2_cpuutilization_max': self.sample('sys.cpu.pct', value, diff --git a/aws-elb/collectors/aws-elb.py b/aws-elb/collectors/aws-elb.py index e2176e0..f9b2d0b 100644 --- a/aws-elb/collectors/aws-elb.py +++ b/aws-elb/collectors/aws-elb.py @@ -177,7 +177,7 @@ def collect(self, _): metric_name = "aws." + metric['Id'] if len(metric['Values']) > 0: value = metric['Values'][-1] - ts = int(metric['Timestamps'][-1].utcnow().timestamp() * 1000) + ts = int(metric['Timestamps'][-1].timestamp() * 1000) self.sample(metric_name, value, timestamp=ts, diff --git a/aws-rds/collectors/aws-rds.py b/aws-rds/collectors/aws-rds.py index 560febf..b2afe83 100644 --- a/aws-rds/collectors/aws-rds.py +++ b/aws-rds/collectors/aws-rds.py @@ -186,7 +186,7 @@ def collect(self, _): metric_name = "aws." + metric['Id'] if len(metric['Values']) > 0: value = metric['Values'][-1] - ts = int(metric['Timestamps'][-1].utcnow().timestamp() * 1000) + ts = int(metric['Timestamps'][-1].timestamp() * 1000) self.sample(metric_name, value, timestamp=ts,