diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-09-04 04:58:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-09-04 04:58:11 +0000 |
| commit | f20e063e6388593c71a89ccad2f2feec56f6576a (patch) | |
| tree | 322db5aa4cd9d4f29b9258641696f97425dee66a /etc | |
| parent | 75437406e1d74fe8a63cc6f64eaa92ed3eb6d1ef (diff) | |
| parent | ecc6ad8854df3bc53830c29174710c1e8d942864 (diff) | |
| download | ceilometer-f20e063e6388593c71a89ccad2f2feec56f6576a.tar.gz | |
Merge "gnocchi: cleanup instance resource definition"
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/ceilometer/gnocchi_resources.yaml | 56 |
1 files changed, 34 insertions, 22 deletions
diff --git a/etc/ceilometer/gnocchi_resources.yaml b/etc/ceilometer/gnocchi_resources.yaml index b1b43873..81448cd7 100644 --- a/etc/ceilometer/gnocchi_resources.yaml +++ b/etc/ceilometer/gnocchi_resources.yaml @@ -36,15 +36,14 @@ resources: - resource_type: instance metrics: - 'instance' - - 'disk.root.size' - - 'disk.ephemeral.size' - 'memory' - 'memory.usage' - 'memory.resident' - 'vcpus' - 'cpu' - 'cpu_util' - - 'vcpus' + - 'disk.root.size' + - 'disk.ephemeral.size' - 'disk.read.requests' - 'disk.read.requests.rate' - 'disk.write.requests' @@ -53,24 +52,23 @@ resources: - 'disk.read.bytes.rate' - 'disk.write.bytes' - 'disk.write.bytes.rate' - - 'disk.device.read.requests' - - 'disk.device.read.requests.rate' - - 'disk.device.write.requests' - - 'disk.device.write.requests.rate' - - 'disk.device.read.bytes' - - 'disk.device.read.bytes.rate' - - 'disk.device.write.bytes' - - 'disk.device.write.bytes.rate' - 'disk.latency' - 'disk.iops' - - 'disk.device.latency' - - 'disk.device.iops' - 'disk.capacity' - 'disk.allocation' - 'disk.usage' - - 'disk.device.capacity' - - 'disk.device.allocation' - - 'disk.device.usage' + attributes: + host: resource_metadata.host + image_ref: resource_metadata.image_ref_url + display_name: resource_metadata.display_name + flavor_id: resource_metadata.(instance_flavor_id|(flavor.id)) + server_group: resource_metadata.user_metadata.server_group + +# NOTE(sileht): We are not able the create this resource yet +# The resource id looks like: instance-00000001-1880d27c-678f-45bf-98ce-12e21e52a1c7-tap5f58854d-9d + - resource_type: instance-network + ignore: true + metrics: - 'network.outgoing.packets.rate' - 'network.incoming.packets.rate' - 'network.outgoing.packets' @@ -79,12 +77,26 @@ resources: - 'network.incoming.bytes.rate' - 'network.outgoing.bytes' - 'network.incoming.bytes' - attributes: - host: resource_metadata.host - image_ref: resource_metadata.image_ref_url - display_name: resource_metadata.display_name - flavor_id: resource_metadata.(instance_flavor_id|(flavor.id)) - server_group: resource_metadata.user_metadata.server_group + + +# NOTE(sileht): We are not able the create this resource yet +# The resource id looks like: 1880d27c-678f-45bf-98ce-12e21e52a1c7-hdd + - resource_type: instance-disk + ignore: true + metrics: + - 'disk.device.read.requests' + - 'disk.device.read.requests.rate' + - 'disk.device.write.requests' + - 'disk.device.write.requests.rate' + - 'disk.device.read.bytes' + - 'disk.device.read.bytes.rate' + - 'disk.device.write.bytes' + - 'disk.device.write.bytes.rate' + - 'disk.device.latency' + - 'disk.device.iops' + - 'disk.device.capacity' + - 'disk.device.allocation' + - 'disk.device.usage' - resource_type: image metrics: |