From: Takashi Kajinami <tkajinam@redhat.com>
Date: Tue, 19 Jan 2021 12:56:17 +0000 (+0900)
Subject: Remove transformers from pipeline.yaml
X-Git-Tag: 18.3.0~3^2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=5b8f5d0490f43f43a62cee9718c75290e30473cf;p=puppet-modules%2Fpuppet-ceilometer.git

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

Change-Id: Ibadafdf86f5ce581c9084a5e00784eefa7d28cab
---

diff --git a/releasenotes/notes/bug-1912345-cd3db2d4c03bec17.yaml b/releasenotes/notes/bug-1912345-cd3db2d4c03bec17.yaml
new file mode 100644
index 0000000..6a89d11
--- /dev/null
+++ b/releasenotes/notes/bug-1912345-cd3db2d4c03bec17.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    The template file which is used to create polling.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 %>