diff options
| author | Julien Danjou <julien@danjou.info> | 2016-09-09 14:27:50 +0200 |
|---|---|---|
| committer | Julien Danjou <julien@danjou.info> | 2016-09-13 11:29:19 +0200 |
| commit | 7f8f6cccd644abcd2bdbf3d4cfe52997b40d0490 (patch) | |
| tree | a916b6b14bbfd02f8f4e4c56d969055281cb644a /devstack | |
| parent | 5c05c047a67f88698a83fdaa8d8f5d7a7f07b195 (diff) | |
| download | ceilometer-7f8f6cccd644abcd2bdbf3d4cfe52997b40d0490.tar.gz | |
Remove store_events options
The current option is misnamed, as it does not enable any storing but
just the processing of events from the notification agent to the
collector.
This means that even if you set event_dispatchers=panko and forget to
set store_events=true, nothing will happen.
This patch enable the event processing as soon as something is
configured in the pipeline.
Change-Id: I5a906684f6371b0548ac08cacc13aa238f780f78
Diffstat (limited to 'devstack')
| -rw-r--r-- | devstack/plugin.sh | 5 | ||||
| -rw-r--r-- | devstack/settings | 1 |
2 files changed, 0 insertions, 6 deletions
diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 91f57d9c..bb73c000 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -36,7 +36,6 @@ # CEILOMETER_PIPELINE_INTERVAL: Seconds between pipeline processing runs. Default 600. # CEILOMETER_BACKEND: Database backend (e.g. 'mysql', 'mongodb', 'es') # CEILOMETER_COORDINATION_URL: URL for group membership service provided by tooz. -# CEILOMETER_EVENTS: Set to True to enable event collection # CEILOMETER_EVENT_ALARM: Set to True to enable publisher for event alarming # Save trace setting @@ -251,9 +250,7 @@ function _ceilometer_configure_storage_backend { elif [ "$CEILOMETER_BACKEND" = 'gnocchi' ] ; then gnocchi_url=$(gnocchi_service_url) iniset $CEILOMETER_CONF DEFAULT meter_dispatchers gnocchi - # FIXME(sileht): We shouldn't load event_dispatchers if store_event is False iniset $CEILOMETER_CONF DEFAULT event_dispatchers "" - iniset $CEILOMETER_CONF notification store_events False # 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 @@ -327,8 +324,6 @@ function configure_ceilometer { configure_auth_token_middleware $CEILOMETER_CONF ceilometer $CEILOMETER_AUTH_CACHE_DIR - iniset $CEILOMETER_CONF notification store_events $CEILOMETER_EVENTS - # Configure storage if is_service_enabled ceilometer-collector ceilometer-api; then _ceilometer_configure_storage_backend diff --git a/devstack/settings b/devstack/settings index 3dae8bdf..441300bb 100644 --- a/devstack/settings +++ b/devstack/settings @@ -29,7 +29,6 @@ CEILOMETER_USE_MOD_WSGI=${CEILOMETER_USE_MOD_WSGI:-${ENABLE_HTTPD_MOD_WSGI_SERVI # To enable OSprofiler change value of this variable to "notifications,profiler" CEILOMETER_NOTIFICATION_TOPICS=${CEILOMETER_NOTIFICATION_TOPICS:-notifications} -CEILOMETER_EVENTS=${CEILOMETER_EVENTS:-True} CEILOMETER_COORDINATION_URL=${CEILOMETER_COORDINATION_URL:-redis://localhost:6379} CEILOMETER_PIPELINE_INTERVAL=${CEILOMETER_PIPELINE_INTERVAL:-} |