diff --git a/manifests/params.pp b/manifests/params.pp
index 0386c6df..1456db04 100644
--- a/manifests/params.pp
+++ b/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',
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 e5867ff3..fcb32778 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: