From 6b0318e9c783fc22bded875cbe3a298feb1b5de8 Mon Sep 17 00:00:00 2001 From: zhang-shaoman Date: Thu, 31 Oct 2019 19:21:52 +0800 Subject: [PATCH] support events Events are valuable for understanding system state, so we need to continue to support them. Change-Id: I15f2675a3538c38c834284e1c73decebff5521ed --- ceilometer/event/converter.py | 3 --- ceilometer/pipeline/base.py | 1 - ceilometer/pipeline/data/event_pipeline.yaml | 2 +- doc/source/admin/telemetry-events.rst | 3 --- doc/source/contributor/events.rst | 5 ----- 5 files changed, 1 insertion(+), 13 deletions(-) diff --git a/ceilometer/event/converter.py b/ceilometer/event/converter.py index 30e8754340..d83f985df4 100644 --- a/ceilometer/event/converter.py +++ b/ceilometer/event/converter.py @@ -27,17 +27,14 @@ from ceilometer.i18n import _ OPTS = [ cfg.StrOpt('definitions_cfg_file', default="event_definitions.yaml", - deprecated_for_removal=True, help="Configuration file for event definitions." ), cfg.BoolOpt('drop_unmatched_notifications', default=False, - deprecated_for_removal=True, help='Drop notifications if no event definition matches. ' '(Otherwise, we convert them with just the default traits)'), cfg.MultiStrOpt('store_raw', default=[], - deprecated_for_removal=True, help='Store the raw notification for select priority ' 'levels (info and/or error). By default, raw details are ' 'not captured.') diff --git a/ceilometer/pipeline/base.py b/ceilometer/pipeline/base.py index 3acd94e19c..0a84052dc0 100644 --- a/ceilometer/pipeline/base.py +++ b/ceilometer/pipeline/base.py @@ -31,7 +31,6 @@ OPTS = [ ), cfg.StrOpt('event_pipeline_cfg_file', default="event_pipeline.yaml", - deprecated_for_removal=True, help="Configuration file for event pipeline definition." ), ] diff --git a/ceilometer/pipeline/data/event_pipeline.yaml b/ceilometer/pipeline/data/event_pipeline.yaml index 250746feb6..59b999f49c 100644 --- a/ceilometer/pipeline/data/event_pipeline.yaml +++ b/ceilometer/pipeline/data/event_pipeline.yaml @@ -8,4 +8,4 @@ sources: sinks: - name: event_sink publishers: - - gnocchi:// + - panko:// diff --git a/doc/source/admin/telemetry-events.rst b/doc/source/admin/telemetry-events.rst index ea1575ce50..657378c240 100644 --- a/doc/source/admin/telemetry-events.rst +++ b/doc/source/admin/telemetry-events.rst @@ -6,9 +6,6 @@ In addition to meters, the Telemetry service collects events triggered within an OpenStack environment. This section provides a brief summary of the events format in the Telemetry service. -.. warning:: - Events support is deprecated. - While a sample represents a single, numeric datapoint within a time-series, an event is a broader concept that represents the state of a resource at a point in time. The state may be described using various diff --git a/doc/source/contributor/events.rst b/doc/source/contributor/events.rst index b73fbbea39..bdaefa39b1 100644 --- a/doc/source/contributor/events.rst +++ b/doc/source/contributor/events.rst @@ -25,11 +25,6 @@ Events vs. Samples In addition to Meters, and related Sample data, Ceilometer can also process Events. - -.. warning:: - Events support is deprecated. - - While a Sample represents a single numeric datapoint, driving a Meter that represents the changes in that value over time, an Event represents the state of an object in an OpenStack service (such as an Instance in Nova, or an Image