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

manifests/params.pp

@@ -23,10 +23,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',

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.

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

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: