x/collectd-openstack-plugins
Code Issues Proposed changes

Add separate verbose config options

Browse Source 
Add the following to allow plugin verbosity to be configured separately
  - Add COLLECTD_GNOCCHI_VERBOSE
  - Add COLLECTD_AODH_VERBOSE
  - Set both default to the same value of what
    COLLECTD_CEILOMETER_VERBOSE
  - Update documentation
  - Make changes to sample local.conf file

Change-Id: Ie072cdb42f6075860dbcb5fdab96f3f160139ec2
Closes-Bug: #1676489
This commit is contained in:
Thaynara Silva 2017-03-27 09:21:02 +00:00
parent 2899c9d3e5
commit 8d6804e9db
4 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devstack/libs/collectd
View File

@ -144,7 +144,7 @@ function adapt_collectd_conf {
# Configure collectd-gnocchi-plugin.conf
sudo sed -i 's|ModulePath.*$|ModulePath "'$COLLECTD_CEILOMETER_DIR'"|g' $COLLECTD_CONF_DIR/collectd-gnocchi-plugin.conf
sudo sed -i 's|VERBOSE.*$|VERBOSE '$COLLECTD_CEILOMETER_VERBOSE'|g' $COLLECTD_CONF_DIR/collectd-gnocchi-plugin.conf
sudo sed -i 's|VERBOSE.*$|VERBOSE '$COLLECTD_GNOCCHI_VERBOSE'|g' $COLLECTD_CONF_DIR/collectd-gnocchi-plugin.conf
sudo sed -i 's|BATCH_SIZE.*$|BATCH_SIZE "'$COLLECTD_BATCH_SIZE'"|g' $COLLECTD_CONF_DIR/collectd-gnocchi-plugin.conf
sudo sed -i 's|OS_AUTH_URL.*$|OS_AUTH_URL "'$OS_AUTH_URL'"|g' $COLLECTD_CONF_DIR/collectd-gnocchi-plugin.conf
sudo sed -i 's|CEILOMETER_URL_TYPE.*$|CEILOMETER_URL_TYPE "'$CEILOMETER_URL_TYPE'"|g' $COLLECTD_CONF_DIR/collectd-gnocchi-plugin.conf
@ -161,7 +161,7 @@ function adapt_collectd_conf {
# Configure collectd-aodh-plugin.conf
sudo sed -i 's|ModulePath.*$|ModulePath "'$COLLECTD_CEILOMETER_DIR'"|g' $COLLECTD_CONF_DIR/collectd-aodh-plugin.conf
sudo sed -i 's|VERBOSE.*$|VERBOSE '$COLLECTD_CEILOMETER_VERBOSE'|g' $COLLECTD_CONF_DIR/collectd-aodh-plugin.conf
sudo sed -i 's|VERBOSE.*$|VERBOSE '$COLLECTD_AODH_VERBOSE'|g' $COLLECTD_CONF_DIR/collectd-aodh-plugin.conf
sudo sed -i 's|OS_AUTH_URL.*$|OS_AUTH_URL "'$OS_AUTH_URL'"|g' $COLLECTD_CONF_DIR/collectd-aodh-plugin.conf
sudo sed -i 's|CEILOMETER_URL_TYPE.*$|CEILOMETER_URL_TYPE "'$CEILOMETER_URL_TYPE'"|g' $COLLECTD_CONF_DIR/collectd-aodh-plugin.conf
sudo sed -i 's|CEILOMETER_TIMEOUT.*$|CEILOMETER_TIMEOUT "'$CEILOMETER_TIMEOUT'"|g' $COLLECTD_CONF_DIR/collectd-aodh-plugin.conf

2
devstack/settings
View File

@ -12,6 +12,8 @@ COLLECTD_REPO=${COLLECTD_REPO:-'https://github.com/collectd/collectd.git'}
COLLECTD_PREFIX=${COLLECTD_PREFIX:-'/usr'}
COLLECTD_CEILOMETER_VERBOSE=$(trueorfalse False COLLECTD_CEILOMETER_VERBOSE)
COLLECTD_GNOCCHI_VERBOSE=$(trueorfalse COLLECTD_CEILOMETER_VERBOSE COLLECTD_GNOCCHI_VERBOSE)
COLLECTD_AODH_VERBOSE=$(trueorfalse COLLECTD_CEILOMETER_VERBOSE COLLECTD_AODH_VERBOSE)
COLLECTD_CEILOMETER_ENABLED=$(trueorfalse False COLLECTD_CEILOMETER_ENABLED)
COLLECTD_GNOCCHI_ENABLED=$(trueorfalse True COLLECTD_GNOCCHI_ENABLED)

29
doc/source/usage.rst
View File

@ -47,14 +47,6 @@ CEILOMETER_TIMEOUT
Sets the ceilometer's request timeout. The value is passed in milliseconds.
Default: 1000 i.e. 1 sec.
COLLECTD_CEILOMETER_VERBOSE
(True|False) Set this to True to make collectd-{ceilometer,gnocchi}
debugging messages visible as info messagges. This is useful when running
the plugin inside a collectd compiled without debug message support.
Default: False
COLLECTD_LOG_FILE
(file) The path of the collectd log file.
Default: /opt/stack/logs/collectd.log
@ -94,12 +86,31 @@ COLLECTD_GNOCCHI_ENABLED
Default: True
COLLECTD_AODH_ENABLED
(True|False) Toggles whether collectd-aodh-plugin is enabled.
Default: False
COLLECTD_CEILOMETER_VERBOSE
(True|False) Set this to True to make collectd-ceilometer debugging messages
visible as info messages. This is useful when running the plugin inside a
collectd compiled without debug message support.
Default: False
COLLECTD_GNOCCHI_VERBOSE
(True|False) Set this to True to make collectd-gnocchi debugging messages
visible as info messages. This is useful when running the plugin inside a
collectd compiled without debug message support.
Default: $COLLECTD_CEILOMETER_VERBOSE
COLLECTD_AODH_VERBOSE
(True|False) Set this to True to make collectd-aodh debugging messages
visible as info messages. This is useful when running the plugin inside
a collectd compiled without debug message support.
Default: $COLLECTD_CEILOMETER_VERBOSE
COLLECTD_INSTALL_TYPE
(source|binary) Specify whether the collectd installation should use the

7
releasenotes/notes/bug-1676489-77bbb9522192a82a.yaml Normal file
View File

@ -0,0 +1,7 @@
---
fixes:
- Fixes 'bug 1676489 https://bugs.launchpad.net/collectd-ceilometer-plugin/+bug/1676489'
Added new variables COLLECTD_GNOCCHI_VERBOSE and COLLECTD_AODH_VERBOSE, that now allow
the verbosity of the plugins to be configured separately. They default to the same value
as COLLECTD_CEILOMETER_VERBOSE. Included information on the
verbosity options in usage.rst.