openstack
/
panko
Code Issues Proposed changes

gnocchi: cleanup instance resource definition 

Change-Id: I5f953217f616e1c2d62d884fd808746c65a66436
This commit is contained in:
Mehdi Abaakouk 2015-08-27 10:50:19 +02:00
parent 92fb620127
commit ecc6ad8854
3 changed files with 38 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ceilometer/dispatcher/gnocchi.py
View File

@ -291,6 +291,8 @@ class GnocchiDispatcher(dispatcher.Base):
LOG.warn("metric %s is not handled by gnocchi" % LOG.warn("metric %s is not handled by gnocchi" %
metric_name) metric_name)
continue continue
if rd.cfg.get("ignore"):
continue
resource_type = rd.cfg['resource_type'] resource_type = rd.cfg['resource_type']
resource = { resource = {

15
ceilometer/tests/unit/dispatcher/test_gnocchi.py
View File

@ -239,19 +239,8 @@ class DispatcherWorkflowTest(base.BaseTestCase,
'disk.read.requests.rate', 'disk.write.requests', 'disk.read.requests.rate', 'disk.write.requests',
'disk.write.requests.rate', 'disk.read.bytes', 'disk.write.requests.rate', 'disk.read.bytes',
'disk.read.bytes.rate', 'disk.write.bytes', 'disk.read.bytes.rate', 'disk.write.bytes',
'disk.write.bytes.rate', 'disk.device.read.requests', 'disk.write.bytes.rate', 'disk.latency', 'disk.iops',
'disk.device.read.requests.rate', 'disk.device.write.requests', 'disk.capacity', 'disk.allocation', 'disk.usage'],
'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',
'network.outgoing.packets.rate',
'network.incoming.packets.rate', 'network.outgoing.packets',
'network.incoming.packets', 'network.outgoing.bytes.rate',
'network.incoming.bytes.rate', 'network.outgoing.bytes',
'network.incoming.bytes'],
resource_type='instance')), resource_type='instance')),
('hardware.ipmi.node.power', dict( ('hardware.ipmi.node.power', dict(
sample={ sample={

56
etc/ceilometer/gnocchi_resources.yaml
View File

@ -36,15 +36,14 @@ resources:
- resource_type: instance - resource_type: instance
metrics: metrics:
- 'instance' - 'instance'
- 'disk.root.size'
- 'disk.ephemeral.size'
- 'memory' - 'memory'
- 'memory.usage' - 'memory.usage'
- 'memory.resident' - 'memory.resident'
- 'vcpus' - 'vcpus'
- 'cpu' - 'cpu'
- 'cpu_util' - 'cpu_util'
- 'vcpus' - 'disk.root.size'
- 'disk.ephemeral.size'
- 'disk.read.requests' - 'disk.read.requests'
- 'disk.read.requests.rate' - 'disk.read.requests.rate'
- 'disk.write.requests' - 'disk.write.requests'
@ -53,24 +52,23 @@ resources:
- 'disk.read.bytes.rate' - 'disk.read.bytes.rate'
- 'disk.write.bytes' - 'disk.write.bytes'
- 'disk.write.bytes.rate' - '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.latency'
- 'disk.iops' - 'disk.iops'
- 'disk.device.latency'
- 'disk.device.iops'
- 'disk.capacity' - 'disk.capacity'
- 'disk.allocation' - 'disk.allocation'
- 'disk.usage' - 'disk.usage'
- 'disk.device.capacity' attributes:
- 'disk.device.allocation' host: resource_metadata.host
- 'disk.device.usage' 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.outgoing.packets.rate'
- 'network.incoming.packets.rate' - 'network.incoming.packets.rate'
- 'network.outgoing.packets' - 'network.outgoing.packets'
@ -79,12 +77,26 @@ resources:
- 'network.incoming.bytes.rate' - 'network.incoming.bytes.rate'
- 'network.outgoing.bytes' - 'network.outgoing.bytes'
- 'network.incoming.bytes' - 'network.incoming.bytes'
attributes:
host: resource_metadata.host
image_ref: resource_metadata.image_ref_url # NOTE(sileht): We are not able the create this resource yet
display_name: resource_metadata.display_name # The resource id looks like: 1880d27c-678f-45bf-98ce-12e21e52a1c7-hdd
flavor_id: resource_metadata.(instance_flavor_id|(flavor.id)) - resource_type: instance-disk
server_group: resource_metadata.user_metadata.server_group 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 - resource_type: image
metrics: metrics: