From ed9563b63fdc85f16b95f9daee311f26e21a391e Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Tue, 19 Jan 2021 21:56:17 +0900 Subject: [PATCH] Remove transformers from pipeline.yaml This change removes usage of transformers from pipeline.yaml because support of transofermer was already removed from ceilometer[1]. [1] 9db5c6c9bfc66018aeb78c4a262e1bfa9b326798 Backport note: This backport patch includes the subsequent change[2] to fix the wrong file mentioned in the release note file. [2] d27fbd3fed472a51670393a4a295ba6b16a35bea Closes-Bug: #1912345 Change-Id: Ibadafdf86f5ce581c9084a5e00784eefa7d28cab (cherry picked from commit 5b8f5d0490f43f43a62cee9718c75290e30473cf) (cherry picked from commit 815d7033dbe6f5c3dde1128ce6aecc4048eb09cb) --- .../notes/bug-1912345-cd3db2d4c03bec17.yaml | 6 ++ templates/pipeline.yaml.erb | 81 ------------------- 2 files changed, 6 insertions(+), 81 deletions(-) create mode 100644 releasenotes/notes/bug-1912345-cd3db2d4c03bec17.yaml diff --git a/releasenotes/notes/bug-1912345-cd3db2d4c03bec17.yaml b/releasenotes/notes/bug-1912345-cd3db2d4c03bec17.yaml new file mode 100644 index 0000000..8844e81 --- /dev/null +++ b/releasenotes/notes/bug-1912345-cd3db2d4c03bec17.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + The template file which is used to create pipeline.yaml when manage_pipeline + is true was updated, and no longer includes usage of transfomer feature + because this feature was already removed from ceilometer. diff --git a/templates/pipeline.yaml.erb b/templates/pipeline.yaml.erb index d4e67ea..f87a83e 100644 --- a/templates/pipeline.yaml.erb +++ b/templates/pipeline.yaml.erb @@ -5,89 +5,8 @@ sources: - "*" sinks: - meter_sink - - name: cpu_source - meters: - - "cpu" - sinks: - - cpu_sink - - cpu_delta_sink - - name: disk_source - meters: - - "disk.device.read.bytes" - - "disk.device.read.requests" - - "disk.device.write.bytes" - - "disk.device.write.requests" - sinks: - - disk_sink - - name: network_source - meters: - - "network.incoming.bytes" - - "network.incoming.packets" - - "network.outgoing.bytes" - - "network.outgoing.packets" - sinks: - - network_sink sinks: - name: meter_sink - transformers: - publishers: -<% @pipeline_publishers.each do |publisher| -%> - - <%= publisher %> -<% end -%> - - name: cpu_sink - transformers: - - name: "rate_of_change" - parameters: - target: - name: "cpu_util" - unit: "%" - type: "gauge" - scale: "100.0 / (10**9 * (resource_metadata.cpu_number or 1))" - publishers: -<% @pipeline_publishers.each do |publisher| -%> - - <%= publisher %> -<% end -%> - - name: cpu_delta_sink - transformers: - - name: "delta" - parameters: - target: - name: "cpu.delta" - growth_only: True - publishers: -<% @pipeline_publishers.each do |publisher| -%> - - <%= publisher %> -<% end -%> - - name: disk_sink - transformers: - - name: "rate_of_change" - parameters: - source: - map_from: - name: "disk\\.device\\.(read|write)\\.(bytes|requests)" - unit: "(B|request)" - target: - map_to: - name: "disk.device.\\1.\\2.rate" - unit: "\\1/s" - type: "gauge" - publishers: -<% @pipeline_publishers.each do |publisher| -%> - - <%= publisher %> -<% end -%> - - name: network_sink - transformers: - - name: "rate_of_change" - parameters: - source: - map_from: - name: "network\\.(incoming|outgoing)\\.(bytes|packets)" - unit: "(B|packet)" - target: - map_to: - name: "network.\\1.\\2.rate" - unit: "\\1/s" - type: "gauge" publishers: <% @pipeline_publishers.each do |publisher| -%> - <%= publisher %> -- 2.45.2