From: Takashi Kajinami Date: Thu, 24 Mar 2022 16:43:07 +0000 (+0900) Subject: Remove unused "transformers" field from event pipeline configuration X-Git-Tag: 20.3.0^2 X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=72235236a171ae114f0196e27063db500ab710d8;p=puppet-modules%2Fpuppet-ceilometer.git Remove unused "transformers" field from event pipeline configuration Transformer was already removed from ceilometer by [1]. This field was removed from the example configuration file when transformer was deprecated[2]. [1] 9db5c6c9bfc66018aeb78c4a262e1bfa9b326798 [2] 1dcbd607df0696101b40f77d7721489679ebe0ba Change-Id: I012d3f960d2a562c2735e7b5c1e408a3a1addb70 --- diff --git a/spec/classes/ceilometer_agent_notification_spec.rb b/spec/classes/ceilometer_agent_notification_spec.rb index 4872009..16bc811 100644 --- a/spec/classes/ceilometer_agent_notification_spec.rb +++ b/spec/classes/ceilometer_agent_notification_spec.rb @@ -27,8 +27,8 @@ describe 'ceilometer::agent::notification' do end let :params do - { :manage_service => true, - :enabled => true } + { :manage_service => true, + :enabled => true } end shared_examples_for 'ceilometer-agent-notification' do @@ -125,7 +125,6 @@ describe 'ceilometer::agent::notification' do " - event_sink", "sinks:", " - name: event_sink", - " transformers:", " publishers:", " - gnocchi://", ])} @@ -148,7 +147,6 @@ describe 'ceilometer::agent::notification' do " - event_sink", "sinks:", " - name: event_sink", - " transformers:", " publishers:", " - notifier://", " - notifier://?topic=alarm.all", @@ -165,9 +163,8 @@ describe 'ceilometer::agent::notification' do 'sinks' => ['my_event_sink'], ], 'sinks' => [ - 'name' => 'my_event_sink', - 'transformers' => [], - 'publishers' => ['gnocchi://'], + 'name' => 'my_event_sink', + 'publishers' => ['gnocchi://'], ], } )} @@ -182,7 +179,6 @@ sources: - my_event_sink sinks: - name: my_event_sink - transformers: [] publishers: - gnocchi:// ', @@ -219,9 +215,8 @@ sinks: 'sinks' => ['my_sink'], ], 'sinks' => [ - 'name' => 'my_sink', - 'transformers' => [], - 'publishers' => ['gnocchi://'], + 'name' => 'my_sink', + 'publishers' => ['gnocchi://'], ], } )} @@ -236,7 +231,6 @@ sources: - my_sink sinks: - name: my_sink - transformers: [] publishers: - gnocchi:// ', diff --git a/templates/event_pipeline.yaml.erb b/templates/event_pipeline.yaml.erb index 9a46fbf..39c2f66 100644 --- a/templates/event_pipeline.yaml.erb +++ b/templates/event_pipeline.yaml.erb @@ -7,7 +7,6 @@ sources: - event_sink sinks: - name: event_sink - transformers: publishers: <% @event_pipeline_publishers.each do |publisher| -%> - <%= publisher %>