545200dd22
As the events API gets fleshed out and more robust, it will become increasingly necessary to ensure that the database schema modeling events has the ability to quickly retrieve a list of event types. With the current schema having a foreign key from event to unique_name (the monolithic generic string key lookup table), in order to get a simple list of event types, one needs to do the following: SELECT DISTINCT e.unique_name FROM event; Not only is this inefficient, but the readability of the model and database schema suffers from the generalization of the unique name field relationship. With this patch, a new event_type table is added to the schema to allow for quick and easy lookups of event types like so: SELECT id, desc FROM event_type; This will lead to future ability to categorize event types with ease. Instead of adding columns to the monolithic unique_name table, we would only need to add a foreign key relationship to the new event_type table tying the event_type to a future event_type_class table... This patch also renames "event_name" to "event_type" everywhere to avoid confusion. Change-Id: I6e630ec534f16ba1bb9370d1859ae7640fc6b05b Partial-Bug: 1211015
147 lines
4.7 KiB
Python
147 lines
4.7 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.
|
|
"""Storage backend management
|
|
"""
|
|
|
|
import urlparse
|
|
|
|
from oslo.config import cfg
|
|
from stevedore import driver
|
|
|
|
from ceilometer.openstack.common import log
|
|
from ceilometer import service
|
|
from ceilometer import utils
|
|
|
|
|
|
LOG = log.getLogger(__name__)
|
|
|
|
STORAGE_ENGINE_NAMESPACE = 'ceilometer.storage'
|
|
|
|
OLD_STORAGE_OPTS = [
|
|
cfg.StrOpt('database_connection',
|
|
secret=True,
|
|
default=None,
|
|
help='DEPRECATED - Database connection string',
|
|
),
|
|
]
|
|
|
|
cfg.CONF.register_opts(OLD_STORAGE_OPTS)
|
|
|
|
|
|
STORAGE_OPTS = [
|
|
cfg.IntOpt('time_to_live',
|
|
default=-1,
|
|
help="""number of seconds that samples are kept
|
|
in the database for (<= 0 means forever)"""),
|
|
]
|
|
|
|
cfg.CONF.register_opts(STORAGE_OPTS, group='database')
|
|
|
|
cfg.CONF.import_opt('connection',
|
|
'ceilometer.openstack.common.db.sqlalchemy.session',
|
|
group='database')
|
|
|
|
|
|
class StorageBadVersion(Exception):
|
|
"""Error raised when the storage backend version is not good enough."""
|
|
|
|
|
|
def get_engine(conf):
|
|
"""Load the configured engine and return an instance."""
|
|
if conf.database_connection:
|
|
conf.set_override('connection', conf.database_connection,
|
|
group='database')
|
|
engine_name = urlparse.urlparse(conf.database.connection).scheme
|
|
LOG.debug('looking for %r driver in %r',
|
|
engine_name, STORAGE_ENGINE_NAMESPACE)
|
|
mgr = driver.DriverManager(STORAGE_ENGINE_NAMESPACE,
|
|
engine_name,
|
|
invoke_on_load=True)
|
|
return mgr.driver
|
|
|
|
|
|
def get_connection(conf):
|
|
"""Return an open connection to the database."""
|
|
return get_engine(conf).get_connection(conf)
|
|
|
|
|
|
class SampleFilter(object):
|
|
"""Holds the properties for building a query from a meter/sample filter.
|
|
|
|
:param user: The sample owner.
|
|
:param project: The sample project.
|
|
:param start: Earliest time point in the request.
|
|
:param start_timestamp_op: Earliest timestamp operation in the request.
|
|
:param end: Latest time point in the request.
|
|
:param end_timestamp_op: Latest timestamp operation in the request.
|
|
:param resource: Optional filter for resource id.
|
|
:param meter: Optional filter for meter type using the meter name.
|
|
:param source: Optional source filter.
|
|
:param metaquery: Optional filter on the metadata
|
|
"""
|
|
def __init__(self, user=None, project=None,
|
|
start=None, start_timestamp_op=None,
|
|
end=None, end_timestamp_op=None,
|
|
resource=None, meter=None,
|
|
source=None, metaquery={}):
|
|
self.user = user
|
|
self.project = project
|
|
self.start = utils.sanitize_timestamp(start)
|
|
self.start_timestamp_op = start_timestamp_op
|
|
self.end = utils.sanitize_timestamp(end)
|
|
self.end_timestamp_op = end_timestamp_op
|
|
self.resource = resource
|
|
self.meter = meter
|
|
self.source = source
|
|
self.metaquery = metaquery
|
|
|
|
|
|
class EventFilter(object):
|
|
"""Properties for building an Event query.
|
|
|
|
:param start: UTC start datetime (mandatory)
|
|
:param end: UTC end datetime (mandatory)
|
|
:param event_type: the name of the event. None for all.
|
|
:param traits: the trait filter dict, all of which are optional
|
|
{'key': <key>,
|
|
't_string': <value>,
|
|
't_int': <value>,
|
|
't_datetime': <value>
|
|
't_float': <value>}
|
|
currently, only one trait dict is supported.
|
|
"""
|
|
|
|
def __init__(self, start, end, event_type=None, traits={}):
|
|
self.start = utils.sanitize_timestamp(start)
|
|
self.end = utils.sanitize_timestamp(end)
|
|
self.event_type = event_type
|
|
self.traits = traits
|
|
|
|
|
|
def dbsync():
|
|
service.prepare_service()
|
|
get_connection(cfg.CONF).upgrade()
|
|
|
|
|
|
def expirer():
|
|
service.prepare_service()
|
|
LOG.debug("Clearing expired metering data")
|
|
storage_conn = get_connection(cfg.CONF)
|
|
storage_conn.clear_expired_metering_data(
|
|
cfg.CONF.database.time_to_live)
|