summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorgong yong sheng <gong.yongsheng@99cloud.net>2016-09-27 08:50:56 +0000
committerMehdi Abaakouk <sileht@redhat.com>2016-10-07 22:51:34 +0200
commitbc073f7592250b13450c566470576d0cbc5a0ec4 (patch)
tree42999adb075d955f1e56eae561566eb190a19dc2 /etc
parentdb2c252b2ddf1907c75a5a52eedf923572d99aa8 (diff)
downloadceilometer-bc073f7592250b13450c566470576d0cbc5a0ec4.tar.gz
make gnocchi event dispatcher work
The gnocchi event dispatcher have been broken by two major changes because of no tests coverage (requests->gnocchiclient and panko refactoring) To fix that: * the event dispatcher class derive the base event dispatcher class. * Use correct gnocchi client method to search resources. * Use correct gnocchi client method to update resources. * Since record_event received a raw notification now and no more the event, we change the parsing codetoo. * And obviously add a test ! Change-Id: I94b7393d79e495c5101225b4097c7073978ca7d7 Co-Authored-By: Mehdi Abaakouk <sileht@redhat.com> Closes-bug: 1627928
Diffstat (limited to 'etc')
-rw-r--r--etc/ceilometer/gnocchi_resources.yaml12
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: