diff options
| author | Mehdi Abaakouk <sileht@redhat.com> | 2015-08-26 07:50:57 +0200 |
|---|---|---|
| committer | Mehdi Abaakouk <sileht@redhat.com> | 2016-06-24 09:07:12 +0200 |
| commit | c940ccc964be455dedd73128e2ba2bae85aabaea (patch) | |
| tree | ac0a99995f774f299d082f63e81a71a11b391d10 /etc | |
| parent | f096d184d677bba01e50fc3323cb9b864bf18ee1 (diff) | |
| download | ceilometer-c940ccc964be455dedd73128e2ba2bae85aabaea.tar.gz | |
gnocchi: use events to end Gnocchi resource
This change introduces a way to handle resources with the events
subsystem.
Also this need to be supported for type of resource.
To support it, etc/ceilometer/gnocchi_resources.yaml need to be
updated to add which event creates/updates/deletes the resource and
the mapping between event traits and gnocchi resource attributes.
This change adds the code to handle and the support for the 'instance'
and 'image' resource.
Only the delete event is support for now.
Related-bug: #1483634
Change-Id: Icd77137a74bccb5b2be078f206f153f0e9aa86c5
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/ceilometer/event_definitions.yaml | 4 | ||||
| -rw-r--r-- | etc/ceilometer/gnocchi_resources.yaml | 13 |
2 files changed, 15 insertions, 2 deletions
diff --git a/etc/ceilometer/event_definitions.yaml b/etc/ceilometer/event_definitions.yaml index 784b4060..f7a93c24 100644 --- a/etc/ceilometer/event_definitions.yaml +++ b/etc/ceilometer/event_definitions.yaml @@ -1,5 +1,5 @@ --- -- event_type: compute.instance.* +- event_type: 'compute.instance.*' traits: &instance_traits tenant_id: fields: payload.tenant_id @@ -96,7 +96,7 @@ fields: payload.image_id host: fields: payload.host -- event_type: ['image.update', 'image.upload', 'image.delete'] +- event_type: ['image.create', 'image.update', 'image.upload', 'image.delete'] traits: &glance_crud project_id: fields: payload.owner diff --git a/etc/ceilometer/gnocchi_resources.yaml b/etc/ceilometer/gnocchi_resources.yaml index 88b81541..7608b49a 100644 --- a/etc/ceilometer/gnocchi_resources.yaml +++ b/etc/ceilometer/gnocchi_resources.yaml @@ -64,6 +64,16 @@ resources: display_name: resource_metadata.display_name flavor_id: resource_metadata.(instance_flavor_id|(flavor.id)) server_group: resource_metadata.user_metadata.server_group + event_delete: compute.instance.delete.start + event_attributes: + id: instance_id + event_associated_resources: + instance_network_interface: + query: '{"=": {"instance_id": "%s"}}' + fields: [id] + instance_disk: + query: '{"=": {"instance_id": "%s"}}' + fields: [id] - resource_type: instance_network_interface metrics: @@ -108,6 +118,9 @@ resources: name: resource_metadata.name container_format: resource_metadata.container_format disk_format: resource_metadata.disk_format + event_delete: image.delete + event_attributes: + id: resource_id - resource_type: ipmi metrics: |