Merge "Added Nova Compute CPU metrics to gnocchi_resources.yaml"
This commit is contained in:
commit
a7a6fbf9a9
|
@ -220,3 +220,18 @@ resources:
|
||||||
attributes:
|
attributes:
|
||||||
host_name: resource_metadata.resource_url
|
host_name: resource_metadata.resource_url
|
||||||
device_name: resource_metadata.name
|
device_name: resource_metadata.name
|
||||||
|
|
||||||
|
- resource_type: nova_compute
|
||||||
|
metrics:
|
||||||
|
- 'compute.node.cpu.frequency'
|
||||||
|
- 'compute.node.cpu.idle.percent'
|
||||||
|
- 'compute.node.cpu.idle.time'
|
||||||
|
- 'compute.node.cpu.iowait.percent'
|
||||||
|
- 'compute.node.cpu.iowait.time'
|
||||||
|
- 'compute.node.cpu.kernel.percent'
|
||||||
|
- 'compute.node.cpu.kernel.time'
|
||||||
|
- 'compute.node.cpu.percent'
|
||||||
|
- 'compute.node.cpu.user.percent'
|
||||||
|
- 'compute.node.cpu.user.time'
|
||||||
|
attributes:
|
||||||
|
host_name: resource_metadata.host
|
||||||
|
|
|
@ -120,6 +120,13 @@ resources_update_operations = [
|
||||||
"value": {"type": "string", "min_length": 0, "max_length": 255,
|
"value": {"type": "string", "min_length": 0, "max_length": 255,
|
||||||
"required": True, "options": {'fill': ''}}
|
"required": True, "options": {'fill': ''}}
|
||||||
}]},
|
}]},
|
||||||
|
{"desc": "add nova_compute resource type",
|
||||||
|
"type": "create_resource_type",
|
||||||
|
"resource_type": "nova_compute",
|
||||||
|
"data": [{
|
||||||
|
"attributes": {"host_name": {"type": "string", "min_length": 0,
|
||||||
|
"max_length": 255, "required": True}}
|
||||||
|
}]}
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
|
@ -142,3 +149,10 @@ def upgrade_resource_types(conf):
|
||||||
if first_op['op'] == 'remove' and attrib not in rt['attributes']:
|
if first_op['op'] == 'remove' and attrib not in rt['attributes']:
|
||||||
continue
|
continue
|
||||||
gnocchi.resource_type.update(ops['resource_type'], ops['data'])
|
gnocchi.resource_type.update(ops['resource_type'], ops['data'])
|
||||||
|
elif ops['type'] == 'create_resource_type':
|
||||||
|
try:
|
||||||
|
gnocchi.resource_type.get(name=ops['resource_type'])
|
||||||
|
except gnocchi_exc.ResourceTypeNotFound:
|
||||||
|
rt = {'name': ops['resource_type'],
|
||||||
|
'attributes': ops['data'][0]['attributes']}
|
||||||
|
gnocchi.resource_type.create(resource_type=rt)
|
||||||
|
|
Loading…
Reference in New Issue