Merge "gnocchi: enable event_dispatcher in devstack and doc"

devstack/plugin.sh

@@ -250,7 +250,7 @@ function _ceilometer_configure_storage_backend {
     elif [ "$CEILOMETER_BACKEND" = 'gnocchi' ] ; then
         gnocchi_url=$(gnocchi_service_url)
         iniset $CEILOMETER_CONF DEFAULT meter_dispatchers gnocchi
-        iniset $CEILOMETER_CONF DEFAULT event_dispatchers ""
+        iniset $CEILOMETER_CONF DEFAULT event_dispatchers gnocchi
         # NOTE(gordc): set higher retry in case gnocchi is started after ceilometer on a slow machine
         iniset $CEILOMETER_CONF storage max_retries 20
         # NOTE(gordc): set batching to better handle recording on a slow machine

doc/source/install/custom.rst

@@ -133,6 +133,7 @@ For Gnocchi dispatcher, the following configuration settings should be added::
 
     [DEFAULT]
     meter_dispatchers = gnocchi
+    event_dispatchers = gnocchi
 
     [dispatcher_gnocchi]
     archive_policy = low

doc/source/install/dbreco.rst

@@ -84,6 +84,7 @@ backend::
   [DEFAULT]
   meter_dispatchers=database
   meter_dispatchers=gnocchi
+  event_dispatchers=gnocchi
 
 .. _Gnocchi: http://gnocchi.xyz
 .. _here: https://docs.google.com/presentation/d/1PefouoeMVd27p2OGDfNQpx18mY-Wk5l0P1Ke2Vt5LwA/edit?usp=sharing

doc/source/install/manual.rst

@@ -45,7 +45,7 @@ Gnocchi
 
      [DEFAULT]
      meter_dispatchers = gnocchi
-     event_dispatchers =
+     event_dispatchers = gnocchi
 
      [dispatcher_gnocchi]
      filter_service_activity = False # Enable if using swift backend