summaryrefslogtreecommitdiff
path: root/ceilometer/sample.py
diff options
context:
space:
mode:
authorgordon chung <gord@live.ca>2015-08-20 18:05:37 -0400
committerChris Dent <chdent@redhat.com>2015-08-26 07:59:46 +0000
commit537959e4fe47b21b9dfc4cc13eb79c85c84dc751 (patch)
tree785252b8479d9e2cf7e0638cba3527b6ea3a2046 /ceilometer/sample.py
parentd7428b7c3873bb47683c4f4d547fce138b79a74b (diff)
downloadceilometer-537959e4fe47b21b9dfc4cc13eb79c85c84dc751.tar.gz
support custom timestamp
this patch allows us to define timstamp field. the default remains oslo.messaging timestamp located at message['timestamp'] Change-Id: I27768b22bcfd9744b3542f171ebea5c63423496d Implements: blueprint declarative-notifications
Diffstat (limited to 'ceilometer/sample.py')
-rw-r--r--ceilometer/sample.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/ceilometer/sample.py b/ceilometer/sample.py
index 06f70f2d..bcdd2fd8 100644
--- a/ceilometer/sample.py
+++ b/ceilometer/sample.py
@@ -82,11 +82,12 @@ class Sample(object):
@classmethod
def from_notification(cls, name, type, volume, unit,
user_id, project_id, resource_id,
- message, source=None):
+ message, timestamp=None, source=None):
metadata = (copy.copy(message['payload'])
if isinstance(message['payload'], dict) else {})
metadata['event_type'] = message['event_type']
metadata['host'] = message['publisher_id']
+ ts = timestamp if timestamp else message['timestamp']
return cls(name=name,
type=type,
volume=volume,
@@ -94,7 +95,7 @@ class Sample(object):
user_id=user_id,
project_id=project_id,
resource_id=resource_id,
- timestamp=message['timestamp'],
+ timestamp=ts,
resource_metadata=metadata,
source=source)