Merge "add hardware.disk.read|write.* stats"

ceilometer/hardware/pollsters/data/snmp.yaml

@@ -1,4 +1,6 @@
 ---
+# see http://www.circitor.fr/Mibs/Html/U/UCD-SNMP-MIB.php for reference.
+# http://www.circitor.fr/Mibs/Html/U/UCD-DISKIO-MIB.php for disk metrics
 
 metric:
 # cpu
@@ -59,6 +61,49 @@ metric:
           type: "int"
           metadata: *disk_metadata
           post_op: "_post_op_disk"
+
+    - name: hardware.disk.read.bytes
+      unit: B
+      type: gauge
+      snmp_inspector:
+          matching_type: "type_prefix"
+          oid:  "1.3.6.1.4.1.2021.13.15.1.1.3"
+          type: "int"
+          metadata: &diskio_metadata
+              device:
+                  oid: "1.3.6.1.4.1.2021.13.15.1.1.2"
+          post_op: "_post_op_disk"
+
+    - name: hardware.disk.write.bytes
+      unit: B
+      type: gauge
+      snmp_inspector:
+          matching_type: "type_prefix"
+          oid:  "1.3.6.1.4.1.2021.13.15.1.1.4"
+          type: "int"
+          <<: *diskio_metadata
+          post_op: "_post_op_disk"
+
+    - name: hardware.disk.read.requests
+      unit: requests
+      type: gauge
+      snmp_inspector:
+          matching_type: "type_prefix"
+          oid:  "1.3.6.1.4.1.2021.13.15.1.1.5"
+          type: "int"
+          <<: *diskio_metadata
+          post_op: "_post_op_disk"
+
+    - name: hardware.disk.write.requests
+      unit: requests
+      type: gauge
+      snmp_inspector:
+          matching_type: "type_prefix"
+          oid:  "1.3.6.1.4.1.2021.13.15.1.1.6"
+          type: "int"
+          <<: *diskio_metadata
+          post_op: "_post_op_disk"
+
 # memory
     - name: hardware.memory.total
       unit: KB

ceilometer/publisher/data/gnocchi_resources.yaml

@@ -228,6 +228,10 @@ resources:
     metrics:
       - 'hardware.disk.size.total'
       - 'hardware.disk.size.used'
+      - 'hardware.disk.read.bytes'
+      - 'hardware.disk.write.bytes'
+      - 'hardware.disk.read.requests'
+      - 'hardware.disk.write.requests'
     attributes:
       host_name: resource_metadata.resource_url
       device_name: resource_metadata.device

doc/source/admin/telemetry-measurements.rst

@@ -618,6 +618,20 @@ SNMP:
 | hardware.system_st\ | Gauge | %    | host ID  | Pollster | CPU idle percen\ |
 | ats.cpu.idle        |       |      |          |          | tage             |
 +---------------------+-------+------+----------+----------+------------------+
+| **Meters added in the Queens release**                                      |
++---------------------+-------+------+----------+----------+------------------+
+| hardware.disk.read.\| Gauge | B    | disk ID  | Pollster | Bytes read from  |
+| bytes               |       |      |          |          | device since boot|
++---------------------+-------+------+----------+----------+------------------+
+| hardware.disk.write\| Gauge | B    | disk ID  | Pollster | Bytes written to |
+| .bytes              |       |      |          |          | device since boot|
++---------------------+-------+------+----------+----------+------------------+
+| hardware.disk.read.\| Gauge | requ\| disk ID  | Pollster | Read requests to |
+| requests            |       | ests |          |          | device since boot|
++---------------------+-------+------+----------+----------+------------------+
+| hardware.disk.write\| Gauge | requ\| disk ID  | Pollster | Write requests to|
+| .requests           |       | ests |          |          | device since boot|
++---------------------+-------+------+----------+----------+------------------+
 
 OpenStack Image service
 ~~~~~~~~~~~~~~~~~~~~~~~

releasenotes/notes/snmp-diskio-samples-fc4b5ed5f19c096c.yaml

@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    Add hardware.disk.read.* and hardware.disk.write.* metrics to capture
+    diskio details.