diff options
| author | xialinjuan <ljxiash@cn.ibm.com> | 2016-03-28 02:48:53 +0800 |
|---|---|---|
| committer | gord chung <gord@live.ca> | 2016-11-02 16:12:11 +0000 |
| commit | f7f9f836b950ba6d169e9e3048739339af68d185 (patch) | |
| tree | 1cacec4ed446407a2687085b2abd50f06c37ddda | |
| parent | b4fa1597c802465922f125dede50d29de562d7b7 (diff) | |
| download | ceilometer-f7f9f836b950ba6d169e9e3048739339af68d185.tar.gz | |
Add more verbosity for gnocchi_resources.yaml
For gnocchi_resource.yaml, make it have the same behavior like
we have for notification-meters defined in meters.yaml.
Make it fallback to some default gnocchi_resources.yaml file exactly
like we do for meters.yaml.
Closes-Bug: #1542184
Change-Id: I19814c5be02871419cca8035ced3d22a0feaacbc
| -rw-r--r-- | ceilometer/declarative.py | 4 | ||||
| -rw-r--r-- | ceilometer/dispatcher/data/gnocchi_resources.yaml (renamed from etc/ceilometer/gnocchi_resources.yaml) | 0 | ||||
| -rw-r--r-- | ceilometer/dispatcher/gnocchi.py | 5 | ||||
| -rw-r--r-- | devstack/plugin.sh | 3 |
4 files changed, 7 insertions, 5 deletions
diff --git a/ceilometer/declarative.py b/ceilometer/declarative.py index 5ebe26f7..694946c2 100644 --- a/ceilometer/declarative.py +++ b/ceilometer/declarative.py @@ -151,7 +151,7 @@ def load_definitions(conf, defaults, config_file, fallback_file=None): if not os.path.exists(config_file): config_file = conf.find_file(config_file) if not config_file and fallback_file is not None: - LOG.debug("No Definitions configuration file found!" + LOG.debug("No Definitions configuration file found! " "Using default config.") config_file = fallback_file @@ -179,7 +179,7 @@ def load_definitions(conf, defaults, config_file, fallback_file=None): raise else: - LOG.debug("No Definitions configuration file found!" + LOG.debug("No Definitions configuration file found! " "Using default config.") definition_cfg = defaults diff --git a/etc/ceilometer/gnocchi_resources.yaml b/ceilometer/dispatcher/data/gnocchi_resources.yaml index 25920322..25920322 100644 --- a/etc/ceilometer/gnocchi_resources.yaml +++ b/ceilometer/dispatcher/data/gnocchi_resources.yaml diff --git a/ceilometer/dispatcher/gnocchi.py b/ceilometer/dispatcher/gnocchi.py index 14919350..a771f0b1 100644 --- a/ceilometer/dispatcher/gnocchi.py +++ b/ceilometer/dispatcher/gnocchi.py @@ -16,6 +16,7 @@ from collections import defaultdict import hashlib import itertools import operator +import pkg_resources import re import threading import uuid @@ -252,7 +253,9 @@ class GnocchiDispatcher(dispatcher.MeterDispatcherBase, plugin_manager = extension.ExtensionManager( namespace='ceilometer.event.trait_plugin') data = declarative.load_definitions( - conf, {}, conf.dispatcher_gnocchi.resources_definition_file) + conf, {}, conf.dispatcher_gnocchi.resources_definition_file, + pkg_resources.resource_filename(__name__, + "data/gnocchi_resources.yaml")) resource_defs = [] for resource in data.get('resources', []): try: diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 5a9b8b10..889ea869 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -300,8 +300,7 @@ function configure_ceilometer { # ceilometer.conf settings that have already been made. # Anyway, explicit is better than implicit. for conffile in policy.json api_paste.ini pipeline.yaml \ - event_definitions.yaml event_pipeline.yaml \ - gnocchi_resources.yaml; do + event_definitions.yaml event_pipeline.yaml; do cp $CEILOMETER_DIR/etc/ceilometer/$conffile $CEILOMETER_CONF_DIR done |