diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-10-10 07:47:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-10-10 07:47:27 +0000 |
| commit | dccacb394246661112bdc9aab9466add27ec6e29 (patch) | |
| tree | 789704fe34e3b3096a38f92ff91b20ffcbd86c07 /etc | |
| parent | 1a27bd8fef9e4f94b8f30731a0189a639f358a55 (diff) | |
| parent | bc073f7592250b13450c566470576d0cbc5a0ec4 (diff) | |
| download | ceilometer-dccacb394246661112bdc9aab9466add27ec6e29.tar.gz | |
Merge "make gnocchi event dispatcher work"
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/ceilometer/gnocchi_resources.yaml | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/etc/ceilometer/gnocchi_resources.yaml b/etc/ceilometer/gnocchi_resources.yaml index 7608b49a..25920322 100644 --- a/etc/ceilometer/gnocchi_resources.yaml +++ b/etc/ceilometer/gnocchi_resources.yaml @@ -66,14 +66,10 @@ resources: server_group: resource_metadata.user_metadata.server_group event_delete: compute.instance.delete.start event_attributes: - id: instance_id + id: payload.instance_id event_associated_resources: - instance_network_interface: - query: '{"=": {"instance_id": "%s"}}' - fields: [id] - instance_disk: - query: '{"=": {"instance_id": "%s"}}' - fields: [id] + instance_network_interface: '{"=": {"instance_id": "%s"}}' + instance_disk: '{"=": {"instance_id": "%s"}}' - resource_type: instance_network_interface metrics: @@ -120,7 +116,7 @@ resources: disk_format: resource_metadata.disk_format event_delete: image.delete event_attributes: - id: resource_id + id: payload.resource_id - resource_type: ipmi metrics: |