Emma Foley 4f1d999665 COLLECTD_CUSTOMIZE_UNITS -> COLLECTD_CUSTOM_UNITS
- Change the config variable name.
  - The config variable no longer references ceilometer.
  - It is now clearer that the config variable is for all plugins
  - The variable is a noun instead of a verb, so it's clearer that
    this is something to define, instead of a boolean.

- Update docs
  - Added a clarification on the format of the custom unit definition.
  - Corrected incorrect reference to COLLECTD_CEILOMETER_UNITS in
    devstackGSG.rst and usage.rst

Closes-Bug: #1656877
Change-Id: Ie688397242d57cf0fee6629fafb89afd8899a599
2017-01-16 16:18:50 +00:00

32 lines
1.0 KiB
Plaintext

# General settings
COLLECTD_CEILOMETER_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && cd .. && pwd )
COLLECTD_BATCH_SIZE=${COLLECTD_BATCH_SIZE:-1}
COLLECTD_INSTALL=${COLLECTD_INSTALL:-True}
COLLECTD_CONF_DIR=${COLLECTD_CONF_DIR:-''}
COLLECTD_CEILOMETER_VERBOSE=${COLLECTD_CEILOMETER_VERBOSE:-False}
# Configurations for Collectd LogFile plugin
COLLECTD_LOG_FILE=${COLLECTD_LOG_FILE:-$LOGDIR/collectd.log}
COLLECTD_LOG_LEVEL=${COLLECTD_LOG_LEVEL:-info}
# Ceilometer connection info.
CEILOMETER_URL_TYPE=${CEILOMETER_URL_TYPE:-internalURL}
CEILOMETER_TIMEOUT=${CEILOMETER_TIMEOUT:-1000}
# Auth info
OS_AUTH_URL="$KEYSTONE_SERVICE_URI/v$IDENTITY_API_VERSION"
OS_IDENTITY_API_VERSION=${IDENTITY_API_VERSION:-3}
# Fall back to default conf dir if option is unset
if [ -z $COLLECTD_CONF_DIR ]; then
if is_ubuntu; then
COLLECTD_CONF_DIR=/etc/collectd/collectd.conf.d
elif is_fedora; then
COLLECTD_CONF_DIR=/etc/collectd.d
fi
fi
#Custom units feature
COLLECTD_CEILOMETER_UNITS=${COLLECTD_CUSTOM_UNITS:-none}