kill collector

Change-Id: I7720d20eab345a7835d57fac573332eca0e7d11e

4 files changed, 7 insertions, 16 deletions

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 8aa6b53a..70923fad 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -296,9 +296,6 @@ function _ceilometer_configure_storage_backend {
     elif [ "$CEILOMETER_BACKEND" = 'mongodb' ] ; then
         iniset $CEILOMETER_CONF database metering_connection mongodb://localhost:27017/ceilometer
     elif [ "$CEILOMETER_BACKEND" = 'gnocchi' ] ; then
-        # NOTE(gordc): set batching to better handle recording on a slow machine
-        iniset $CEILOMETER_CONF collector batch_size 50
-        iniset $CEILOMETER_CONF collector batch_timeout 5
         sed -i "s/gnocchi:\/\//gnocchi:\/\/?archive_policy=${GNOCCHI_ARCHIVE_POLICY}\&filter_project=gnocchi_swift/" $CEILOMETER_CONF_DIR/event_pipeline.yaml $CEILOMETER_CONF_DIR/pipeline.yaml
     else
         die $LINENO "Unable to configure unknown CEILOMETER_BACKEND $CEILOMETER_BACKEND"
@@ -379,10 +376,6 @@ function configure_ceilometer {
         _ceilometer_configure_storage_backend
     fi
 
-    if is_service_enabled ceilometer-collector; then
-        iniset $CEILOMETER_CONF collector workers $API_WORKERS
-    fi
-
     if [[ "$VIRT_DRIVER" = 'vsphere' ]]; then
         iniset $CEILOMETER_CONF DEFAULT hypervisor_inspector vsphere
         iniset $CEILOMETER_CONF vmware host_ip "$VMWAREAPI_IP"
@@ -481,12 +474,11 @@ function start_ceilometer {
         tail_log ceilometer-api /var/log/$APACHE_NAME/ceilometer_access.log
     fi
 
-    # run the notification agent/collector after restarting apache as it needs
+    # run the notification agent after restarting apache as it needs
     # operational keystone if using gnocchi
     run_process ceilometer-anotification "$CEILOMETER_BIN_DIR/ceilometer-agent-notification --config-file $CEILOMETER_CONF"
-    run_process ceilometer-collector "$CEILOMETER_BIN_DIR/ceilometer-collector --config-file $CEILOMETER_CONF"
 
-    # Start the compute agent late to allow time for the collector to
+    # Start the compute agent late to allow time for the notification agent to
     # fully wake up and connect to the message bus. See bug #1355809
     if [[ "$VIRT_DRIVER" = 'libvirt' ]]; then
         run_process ceilometer-acompute "$CEILOMETER_BIN_DIR/ceilometer-polling --polling-namespaces compute --config-file $CEILOMETER_CONF" $LIBVIRT_GROUP
@@ -508,7 +500,7 @@ function stop_ceilometer {
     fi
 
     # Kill the ceilometer screen windows
-    for serv in ceilometer-acompute ceilometer-acentral ceilometer-aipmi ceilometer-anotification ceilometer-collector; do
+    for serv in ceilometer-acompute ceilometer-acentral ceilometer-aipmi ceilometer-anotification; do
         stop_process $serv
     done
 }
diff --git a/devstack/upgrade/settings b/devstack/upgrade/settings
index 6a2dad94..bd7a20b8 100644
--- a/devstack/upgrade/settings
+++ b/devstack/upgrade/settings
@@ -1,7 +1,7 @@
 register_project_for_upgrade ceilometer
 
 devstack_localrc base enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer
-devstack_localrc base enable_service ceilometer-acompute ceilometer-acentral ceilometer-aipmi ceilometer-anotification ceilometer-collector ceilometer-api tempest
+devstack_localrc base enable_service ceilometer-acompute ceilometer-acentral ceilometer-aipmi ceilometer-anotification ceilometer-api tempest
 
 devstack_localrc target enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer
-devstack_localrc target enable_service ceilometer-acompute ceilometer-acentral ceilometer-aipmi ceilometer-anotification ceilometer-collector ceilometer-api tempest
+devstack_localrc target enable_service ceilometer-acompute ceilometer-acentral ceilometer-aipmi ceilometer-anotification ceilometer-api tempest
diff --git a/devstack/upgrade/shutdown.sh b/devstack/upgrade/shutdown.sh
index ec0e692b..615a3737 100755
--- a/devstack/upgrade/shutdown.sh
+++ b/devstack/upgrade/shutdown.sh
@@ -22,6 +22,6 @@ stop_ceilometer
 
 # ensure everything is stopped
 
-SERVICES_DOWN="ceilometer-acompute ceilometer-acentral ceilometer-aipmi ceilometer-anotification ceilometer-collector ceilometer-api"
+SERVICES_DOWN="ceilometer-acompute ceilometer-acentral ceilometer-aipmi ceilometer-anotification ceilometer-api"
 
 ensure_services_stopped $SERVICES_DOWN
diff --git a/devstack/upgrade/upgrade.sh b/devstack/upgrade/upgrade.sh
index 929d0ead..12fef542 100755
--- a/devstack/upgrade/upgrade.sh
+++ b/devstack/upgrade/upgrade.sh
@@ -80,8 +80,7 @@ start_ceilometer
 ensure_services_started "ceilometer-polling --polling-namespaces compute" \
                         "ceilometer-polling --polling-namespaces central" \
                         ceilometer-agent-notification \
-                        ceilometer-api \
-                        ceilometer-collector
+                        ceilometer-api
 
 # Save mongodb state (replace with snapshot)
 if grep -q 'connection *= *mongo' /etc/ceilometer/ceilometer.conf; then