summaryrefslogtreecommitdiff
path: root/devstack
diff options
context:
space:
mode:
authorHanxi Liu <hanxi.liu@easystack.cn>2017-01-22 12:01:25 +0800
committerHanxi Liu <hanxi.liu@easystack.cn>2017-02-09 10:24:43 +0800
commit11191a4612e424c02a5d90a1337141c26f79c098 (patch)
treef5a639d441619ae47784ca3e0fab9449dfe76c18 /devstack
parent6b7a3605107a020c2408d398751d130dbf953bd2 (diff)
downloadceilometer-11191a4612e424c02a5d90a1337141c26f79c098.tar.gz
Deprecate collector
To optimise performance, We have to update ceilometer architecture. The most important step is to deprecate collector. From now on, we can configure multiple publishers in pipeline for pushing data to internal or external system. Highlight using multiple dispatchers. Change pipeline publisher and disable ceilometer-collector by default. Co-Authored-By: gordon chung <gord@live.ca> Change-Id: I25a6e0b9221844adb4412f1829d9e290b6e198a3
Diffstat (limited to 'devstack')
-rw-r--r--devstack/plugin.sh7
-rw-r--r--devstack/settings2
2 files changed, 7 insertions, 2 deletions
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index dbeb60c1..25cce1e4 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -267,9 +267,16 @@ function _ceilometer_configure_storage_backend {
die $LINENO "Unable to configure unknown CEILOMETER_BACKEND $CEILOMETER_BACKEND"
fi
+ if [ "$CEILOMETER_BACKEND" = 'mysql' ] || [ "$CEILOMETER_BACKEND" = 'postgresql' ] || [ "$CEILOMETER_BACKEND" = 'mongodb' ]; then
+ sed -i 's/gnocchi:\/\//database:\/\//g' $CEILOMETER_CONF_DIR/event_pipeline.yaml $CEILOMETER_CONF_DIR/pipeline.yaml
+ fi
+
# configure panko
if is_service_enabled panko-api; then
iniadd $CEILOMETER_CONF DEFAULT event_dispatchers panko
+ if ! grep -q 'panko' $CEILOMETER_CONF_DIR/event_pipeline.yaml ; then
+ echo ' - direct://?dispatcher=panko' >> $CEILOMETER_CONF_DIR/event_pipeline.yaml
+ fi
fi
_ceilometer_drop_database
diff --git a/devstack/settings b/devstack/settings
index d8ad97d5..f82513f2 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -3,8 +3,6 @@
enable_service ceilometer-acompute ceilometer-acentral
# Notification Agent
enable_service ceilometer-anotification
-# Data Collector
-enable_service ceilometer-collector
# Default directories
CEILOMETER_DIR=$DEST/ceilometer