openstack/ceilometer
Code Issues Proposed changes

Merge "Add more verbosity for gnocchi_resources.yaml"

Browse Source
This commit is contained in:
Jenkins 2016-11-07 16:25:42 +00:00 committed by Gerrit Code Review
commit a4490abd8f
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ceilometer/declarative.py
View File

@ -151,7 +151,7 @@ def load_definitions(conf, defaults, config_file, fallback_file=None):
if not os.path.exists(config_file): if not os.path.exists(config_file):
config_file = conf.find_file(config_file) config_file = conf.find_file(config_file)
if not config_file and fallback_file is not None: 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.") "Using default config.")
config_file = fallback_file config_file = fallback_file
@ -179,7 +179,7 @@ def load_definitions(conf, defaults, config_file, fallback_file=None):
raise raise
else: else:
LOG.debug("No Definitions configuration file found!" LOG.debug("No Definitions configuration file found! "
"Using default config.") "Using default config.")
definition_cfg = defaults definition_cfg = defaults

0
etc/ceilometer/gnocchi_resources.yaml → ceilometer/dispatcher/data/gnocchi_resources.yaml
View File

5
ceilometer/dispatcher/gnocchi.py
View File

@ -16,6 +16,7 @@ from collections import defaultdict
import hashlib import hashlib
import itertools import itertools
import operator import operator
import pkg_resources
import re import re
import threading import threading
import uuid import uuid
@ -252,7 +253,9 @@ class GnocchiDispatcher(dispatcher.MeterDispatcherBase,
plugin_manager = extension.ExtensionManager( plugin_manager = extension.ExtensionManager(
namespace='ceilometer.event.trait_plugin') namespace='ceilometer.event.trait_plugin')
data = declarative.load_definitions( 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 = [] resource_defs = []
for resource in data.get('resources', []): for resource in data.get('resources', []):
try: try:

3
devstack/plugin.sh
View File

@ -300,8 +300,7 @@ function configure_ceilometer {
# ceilometer.conf settings that have already been made. # ceilometer.conf settings that have already been made.
# Anyway, explicit is better than implicit. # Anyway, explicit is better than implicit.
for conffile in policy.json api_paste.ini pipeline.yaml \ for conffile in policy.json api_paste.ini pipeline.yaml \
event_definitions.yaml event_pipeline.yaml \ event_definitions.yaml event_pipeline.yaml; do
gnocchi_resources.yaml; do
cp $CEILOMETER_DIR/etc/ceilometer/$conffile $CEILOMETER_CONF_DIR cp $CEILOMETER_DIR/etc/ceilometer/$conffile $CEILOMETER_CONF_DIR
done done