From d502884411343c862cf056fc2bf25ec6342548dc Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Fri, 15 Jan 2021 14:51:43 +0900
Subject: [PATCH] Replace disk.* meters by disk.device.* meters

The disk.* meters have already removed from ceilometer[1] and we
should use the disk.device.* meters instead.

[1] f7b1218b8e26a0f9a5924a15b029a961413cc40a

Closes-Bug: #1911852
Change-Id: I9dcf128951cc23a0c8c8e589c42a352a94b3c8df
(cherry picked from commit 682ef848b7ecfd417f1160a7da496742fff4d9f3)
(cherry picked from commit a3511cbed6ca4bfa00d766f60344ed44655d81d7)
(cherry picked from commit 90ef42ef6e4be9594c709f249572f5c8e8a285de)
---
 manifests/params.pp                                  | 8 ++++----
 releasenotes/notes/bug-1911852-283ca913d7c7e818.yaml | 5 +++++
 spec/classes/ceilometer_agent_polling_spec.rb        | 8 ++++----
 templates/pipeline.yaml.erb                          | 8 ++------
 4 files changed, 15 insertions(+), 14 deletions(-)
 create mode 100644 releasenotes/notes/bug-1911852-283ca913d7c7e818.yaml

diff --git a/manifests/params.pp b/manifests/params.pp
index 9cce6497..de904518 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -21,10 +21,10 @@ class ceilometer::params {
     'network.incoming.packets',
     'network.outgoing.bytes',
     'network.outgoing.packets',
-    'disk.read.bytes',
-    'disk.read.requests',
-    'disk.write.bytes',
-    'disk.write.requests',
+    'disk.device.read.bytes',
+    'disk.device.read.requests',
+    'disk.device.write.bytes',
+    'disk.device.write.requests',
     'volume.size',
     'volume.snapshot.size',
     'volume.backup.size',
diff --git a/releasenotes/notes/bug-1911852-283ca913d7c7e818.yaml b/releasenotes/notes/bug-1911852-283ca913d7c7e818.yaml
new file mode 100644
index 00000000..003839c3
--- /dev/null
+++ b/releasenotes/notes/bug-1911852-283ca913d7c7e818.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Now the default meters use disk.device metrics instead of disk metrics,
+    so that disk performance data can be captured by default.
diff --git a/spec/classes/ceilometer_agent_polling_spec.rb b/spec/classes/ceilometer_agent_polling_spec.rb
index 4e257554..cb51d190 100644
--- a/spec/classes/ceilometer_agent_polling_spec.rb
+++ b/spec/classes/ceilometer_agent_polling_spec.rb
@@ -115,10 +115,10 @@ sources:
         - network.incoming.packets
         - network.outgoing.bytes
         - network.outgoing.packets
-        - disk.read.bytes
-        - disk.read.requests
-        - disk.write.bytes
-        - disk.write.requests
+        - disk.device.read.bytes
+        - disk.device.read.requests
+        - disk.device.write.bytes
+        - disk.device.write.requests
         - volume.size
         - volume.snapshot.size
         - volume.backup.size
diff --git a/templates/pipeline.yaml.erb b/templates/pipeline.yaml.erb
index c5c41beb..d4e67ea3 100644
--- a/templates/pipeline.yaml.erb
+++ b/templates/pipeline.yaml.erb
@@ -13,10 +13,6 @@ sources:
           - cpu_delta_sink
     - name: disk_source
       meters:
-          - "disk.read.bytes"
-          - "disk.read.requests"
-          - "disk.write.bytes"
-          - "disk.write.requests"
           - "disk.device.read.bytes"
           - "disk.device.read.requests"
           - "disk.device.write.bytes"
@@ -68,11 +64,11 @@ sinks:
             parameters:
                 source:
                     map_from:
-                        name: "(disk\\.device|disk)\\.(read|write)\\.(bytes|requests)"
+                        name: "disk\\.device\\.(read|write)\\.(bytes|requests)"
                         unit: "(B|request)"
                 target:
                     map_to:
-                        name: "\\1.\\2.\\3.rate"
+                        name: "disk.device.\\1.\\2.rate"
                         unit: "\\1/s"
                     type: "gauge"
       publishers: