openstack/deb-aodh
Code Issues Proposed changes

Add date range parameters to resource API

Browse Source 
Allow the caller to query for resources updated within a certain
time range. Changes the storage engine API as well as the web
API.

Also includes a fix for the event date range query, which was
broken when both start and end values were used.

Change-Id: Ic482ea647ad07553a6621ba84ed76cf10d534652
Signed-off-by: Doug Hellmann <doug.hellmann@dreamhost.com>
This commit is contained in:
Doug Hellmann
2012-08-15 20:18:44 -04:00
parent 039f3d893d
commit 7b18eef521
5 changed files with 113 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
ceilometer/storage/impl_mongodb.py
View File

@@ -83,6 +83,20 @@ class MongoDBStorage(base.StorageEngine):
return Connection(conf)
def make_timestamp_range(start, end):
"""Given two possible datetimes, create the query
document to find timestamps within that range
using $gte for the lower bound and $lt for the
upper bound.
"""
ts_range = {}
if start:
ts_range['$gte'] = start
if end:
ts_range['$lt'] = end
return ts_range
def make_query_from_filter(event_filter, require_meter=True):
"""Return a query dictionary based on the settings in the filter.
@@ -102,10 +116,10 @@ def make_query_from_filter(event_filter, require_meter=True):
elif require_meter:
raise RuntimeError('Missing required meter specifier')
if event_filter.start:
q['timestamp'] = {'$gte': event_filter.start}
if event_filter.end:
q['timestamp'] = {'$lt': event_filter.end}
ts_range = make_timestamp_range(event_filter.start, event_filter.end)
if ts_range:
q['timestamp'] = ts_range
if event_filter.resource:
q['resource_id'] = event_filter.resource
if event_filter.source:
@@ -263,7 +277,8 @@ class Connection(base.Connection):
q['source'] = source
return sorted(self.db.project.find(q).distinct('_id'))
def get_resources(self, user=None, project=None, source=None):
def get_resources(self, user=None, project=None, source=None,
start_timestamp=None, end_timestamp=None):
"""Return an iterable of dictionaries containing resource information.
{ 'resource_id': UUID of the resource,
@@ -274,9 +289,11 @@ class Connection(base.Connection):
'meter': list of the meters reporting data for the resource,
}
:param user: Optional resource owner.
:param project: Optional resource owner.
:param user: Optional ID for user that owns the resource.
:param project: Optional ID for project that owns the resource.
:param source: Optional source filter.
:param start_timestamp: Optional modified timestamp start range.
:param end_timestamp: Optional modified timestamp end range.
"""
q = {}
if user is not None:
@@ -285,6 +302,21 @@ class Connection(base.Connection):
q['project_id'] = project
if source is not None:
q['source'] = source
# FIXME(dhellmann): This may not perform very well,
# but doing any better will require changing the database
# schema and that will need more thought than I have time
# to put into it today.
if start_timestamp or end_timestamp:
# Look for resources matching the above criteria and with
# events in the time range we care about, then change the
# resource query to return just those resources by id.
ts_range = make_timestamp_range(start_timestamp, end_timestamp)
if ts_range:
q['timestamp'] = ts_range
resource_ids = self.db.meter.find(q).distinct('resource_id')
# Overwrite the query to just filter on the ids
# we have discovered to be interesting.
q = {'_id': {'$in': resource_ids}}
for resource in self.db.resource.find(q):
r = {}
r.update(resource)
@@ -295,7 +327,8 @@ class Connection(base.Connection):
yield r
def get_raw_events(self, event_filter):
"""Return an iterable of event data.
"""Return an iterable of raw event data as created by
:func:`ceilometer.meter.meter_message_from_counter`.
"""
q = make_query_from_filter(event_filter, require_meter=False)
events = self.db.meter.find(q)