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 682ef848b7)
(cherry picked from commit a3511cbed6)
(cherry picked from commit 90ef42ef6e)
(cherry picked from commit d502884411)
This commit is contained in:
Takashi Kajinami 2021-01-15 14:51:43 +09:00
parent e2a260f4ab
commit ec536b2cbd
4 changed files with 15 additions and 14 deletions

View File

@ -21,10 +21,10 @@ class ceilometer::params {
'network.incoming.packets', 'network.incoming.packets',
'network.outgoing.bytes', 'network.outgoing.bytes',
'network.outgoing.packets', 'network.outgoing.packets',
'disk.read.bytes', 'disk.device.read.bytes',
'disk.read.requests', 'disk.device.read.requests',
'disk.write.bytes', 'disk.device.write.bytes',
'disk.write.requests', 'disk.device.write.requests',
'volume.size', 'volume.size',
'volume.snapshot.size', 'volume.snapshot.size',
'volume.backup.size', 'volume.backup.size',

View File

@ -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.

View File

@ -115,10 +115,10 @@ sources:
- network.incoming.packets - network.incoming.packets
- network.outgoing.bytes - network.outgoing.bytes
- network.outgoing.packets - network.outgoing.packets
- disk.read.bytes - disk.device.read.bytes
- disk.read.requests - disk.device.read.requests
- disk.write.bytes - disk.device.write.bytes
- disk.write.requests - disk.device.write.requests
- volume.size - volume.size
- volume.snapshot.size - volume.snapshot.size
- volume.backup.size - volume.backup.size

View File

@ -13,10 +13,6 @@ sources:
- cpu_delta_sink - cpu_delta_sink
- name: disk_source - name: disk_source
meters: meters:
- "disk.read.bytes"
- "disk.read.requests"
- "disk.write.bytes"
- "disk.write.requests"
- "disk.device.read.bytes" - "disk.device.read.bytes"
- "disk.device.read.requests" - "disk.device.read.requests"
- "disk.device.write.bytes" - "disk.device.write.bytes"
@ -68,11 +64,11 @@ sinks:
parameters: parameters:
source: source:
map_from: map_from:
name: "(disk\\.device|disk)\\.(read|write)\\.(bytes|requests)" name: "disk\\.device\\.(read|write)\\.(bytes|requests)"
unit: "(B|request)" unit: "(B|request)"
target: target:
map_to: map_to:
name: "\\1.\\2.\\3.rate" name: "disk.device.\\1.\\2.rate"
unit: "\\1/s" unit: "\\1/s"
type: "gauge" type: "gauge"
publishers: publishers: