diff options
| author | Zuul <zuul@review.openstack.org> | 2018-02-07 20:58:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-02-07 20:58:18 +0000 |
| commit | 46aee0a86424004290249a2d7c37157ab853f994 (patch) | |
| tree | b4782855b01064639fec4b03eabfb04d7a58baf5 | |
| parent | a4c886690074cac2ebbea9e1b77e9a314065ce9b (diff) | |
| parent | 9f7878eed04bfa0f45542d6e005e77f6d89e5b87 (diff) | |
| download | ceilometer-46aee0a86424004290249a2d7c37157ab853f994.tar.gz | |
Merge "add hardware.disk.read|write.* stats"10.0.0
| -rw-r--r-- | ceilometer/hardware/pollsters/data/snmp.yaml | 45 | ||||
| -rw-r--r-- | ceilometer/publisher/data/gnocchi_resources.yaml | 4 | ||||
| -rw-r--r-- | doc/source/admin/telemetry-measurements.rst | 14 | ||||
| -rw-r--r-- | releasenotes/notes/snmp-diskio-samples-fc4b5ed5f19c096c.yaml | 5 |
4 files changed, 68 insertions, 0 deletions
diff --git a/ceilometer/hardware/pollsters/data/snmp.yaml b/ceilometer/hardware/pollsters/data/snmp.yaml index 60f84af1..cc4bbe26 100644 --- a/ceilometer/hardware/pollsters/data/snmp.yaml +++ b/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 diff --git a/ceilometer/publisher/data/gnocchi_resources.yaml b/ceilometer/publisher/data/gnocchi_resources.yaml index f7c297cf..364292d8 100644 --- a/ceilometer/publisher/data/gnocchi_resources.yaml +++ b/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 diff --git a/doc/source/admin/telemetry-measurements.rst b/doc/source/admin/telemetry-measurements.rst index b2f47c08..53d84781 100644 --- a/doc/source/admin/telemetry-measurements.rst +++ b/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 ~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/releasenotes/notes/snmp-diskio-samples-fc4b5ed5f19c096c.yaml b/releasenotes/notes/snmp-diskio-samples-fc4b5ed5f19c096c.yaml new file mode 100644 index 00000000..969e7897 --- /dev/null +++ b/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. |