
This is a squashed commit of work done by Doug and myself. Thanks Doug! Author: Angus Salkeld <asalkeld@redhat.com> Add a Statistics class Note this is a bit different to the spec (http://wiki.openstack.org/Ceilometer/blueprints/APIv2) As wsme doen't really like different types been returned from the same method. I have: GET /v2/meters/<meter> - raw samples GET /v2/meters/<meter>/statistics - for the stats Make the error reporting better for invalid fields Try and protect from passing in the wrong arguments into the db api Also get_resources() takes start/stop_timestamp not start/stop. Fix most of the duration test cases (overlapping ones are still broken) Add some log messages to warn of unimplemented queries Fix the start/end timestamp passed into calc_duration() Make the query op default to 'eq' Fix v2 event list paths Remove v2 list projects tests Re-Add the duration Implement get_meter_statistics() for sqlalchemy. Add tests for get_meter_statistics() Fix the latest pep8 1.4 issues Author: Doug Hellmann <doug.hellmann@dreamhost.com> fixme comment Fix duration calculation fix event listing tests remove obsolete list tests update resource listing tests remove obsolete list tests fix max statistics tests for projects fix max tests for resource queries fix tests for stats using project filter Fix sum tests for resource queries Fix the statistics calculation in the mongo driver to handle getting no data back from the query. Update the queries in the test code. enable logging for wsme in the tests to help with debugging always include all query fields to keep values aligned only include the start and end timestamp keywords wanted by the EventFilter update url used in acl tests update tests for listing meters convert prints to logging calls and add a few todo/fixme notes add some debugging and error checking to _query_to_kwargs add q argument to get_json() to make it easier to pass queries to the service do not stub out controller we have deleted fix whitespace issues to make pep8 happy Change-Id: I1b9a4c26fb8cc74ae1a002f93b84db05d0b20192 Blueprint: api-aggregate-average Blueprint: api-server-pecan-wsme
182 lines
5.6 KiB
Python
182 lines
5.6 KiB
Python
# -*- encoding: utf-8 -*-
|
|
#
|
|
# Copyright © 2012 New Dream Network, LLC (DreamHost)
|
|
#
|
|
# Author: Doug Hellmann <doug.hellmann@dreamhost.com>
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
"""Base classes for storage engines
|
|
"""
|
|
|
|
import abc
|
|
|
|
from ceilometer.openstack.common import log
|
|
|
|
LOG = log.getLogger(__name__)
|
|
|
|
|
|
class StorageEngine(object):
|
|
"""Base class for storage engines.
|
|
"""
|
|
|
|
__metaclass__ = abc.ABCMeta
|
|
|
|
@abc.abstractmethod
|
|
def register_opts(self, conf):
|
|
"""Register any configuration options used by this engine.
|
|
"""
|
|
|
|
@abc.abstractmethod
|
|
def get_connection(self, conf):
|
|
"""Return a Connection instance based on the configuration settings.
|
|
"""
|
|
|
|
|
|
class Connection(object):
|
|
"""Base class for storage system connections.
|
|
"""
|
|
|
|
__metaclass__ = abc.ABCMeta
|
|
|
|
@abc.abstractmethod
|
|
def __init__(self, conf):
|
|
"""Constructor"""
|
|
|
|
@abc.abstractmethod
|
|
def upgrade(self, version=None):
|
|
"""Migrate the database to `version` or the most recent version."""
|
|
|
|
@abc.abstractmethod
|
|
def record_metering_data(self, data):
|
|
"""Write the data to the backend storage system.
|
|
|
|
:param data: a dictionary such as returned by
|
|
ceilometer.meter.meter_message_from_counter
|
|
|
|
All timestamps must be naive utc datetime object.
|
|
"""
|
|
|
|
@abc.abstractmethod
|
|
def get_users(self, source=None):
|
|
"""Return an iterable of user id strings.
|
|
|
|
:param source: Optional source filter.
|
|
"""
|
|
|
|
@abc.abstractmethod
|
|
def get_projects(self, source=None):
|
|
"""Return an iterable of project id strings.
|
|
|
|
:param source: Optional source filter.
|
|
"""
|
|
|
|
@abc.abstractmethod
|
|
def get_resources(self, user=None, project=None, source=None,
|
|
start_timestamp=None, end_timestamp=None,
|
|
metaquery={}, resource=None):
|
|
"""Return an iterable of dictionaries containing resource information.
|
|
|
|
{ 'resource_id': UUID of the resource,
|
|
'project_id': UUID of project owning the resource,
|
|
'user_id': UUID of user owning the resource,
|
|
'timestamp': UTC datetime of last update to the resource,
|
|
'metadata': most current metadata for the resource,
|
|
'meter': list of the meters reporting data for the resource,
|
|
}
|
|
|
|
: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.
|
|
:param metaquery: Optional dict with metadata to match on.
|
|
:param resource: Optional resource filter.
|
|
"""
|
|
|
|
@abc.abstractmethod
|
|
def get_meters(self, user=None, project=None, resource=None, source=None,
|
|
metaquery={}):
|
|
"""Return an iterable of dictionaries containing meter information.
|
|
|
|
{ 'name': name of the meter,
|
|
'type': type of the meter (guage, counter),
|
|
'unit': unit of the meter,
|
|
'resource_id': UUID of the resource,
|
|
'project_id': UUID of project owning the resource,
|
|
'user_id': UUID of user owning the resource,
|
|
}
|
|
|
|
:param user: Optional ID for user that owns the resource.
|
|
:param project: Optional ID for project that owns the resource.
|
|
:param resource: Optional resource filter.
|
|
:param source: Optional source filter.
|
|
:param metaquery: Optional dict with metadata to match on.
|
|
"""
|
|
|
|
@abc.abstractmethod
|
|
def get_raw_events(self, event_filter):
|
|
"""Return an iterable of raw event data as created by
|
|
:func:`ceilometer.meter.meter_message_from_counter`.
|
|
"""
|
|
|
|
@abc.abstractmethod
|
|
def get_volume_sum(self, event_filter):
|
|
"""Return the sum of the volume field for the events
|
|
described by the query parameters.
|
|
|
|
The filter must have a meter value set.
|
|
|
|
{ 'resource_id': UUID string for the resource,
|
|
'value': The sum for the volume.
|
|
}
|
|
"""
|
|
|
|
@abc.abstractmethod
|
|
def get_volume_max(self, event_filter):
|
|
"""Return the maximum of the volume field for the events
|
|
described by the query parameters.
|
|
|
|
The filter must have a meter value set.
|
|
|
|
{ 'resource_id': UUID string for the resource,
|
|
'value': The max for the volume.
|
|
}
|
|
"""
|
|
|
|
@abc.abstractmethod
|
|
def get_event_interval(self, event_filter):
|
|
"""Return the min and max timestamps from events,
|
|
using the event_filter to limit the events seen.
|
|
|
|
( datetime.datetime(), datetime.datetime() )
|
|
"""
|
|
|
|
@abc.abstractmethod
|
|
def get_meter_statistics(self, event_filter):
|
|
"""Return a dictionary containing meter statistics.
|
|
described by the query parameters.
|
|
|
|
The filter must have a meter value set.
|
|
|
|
{ 'min':
|
|
'max':
|
|
'avg':
|
|
'sum':
|
|
'count':
|
|
'duration':
|
|
'duration_start':
|
|
'duration_end':
|
|
}
|
|
|
|
"""
|