diff options
| author | Zuul <zuul@review.openstack.org> | 2019-04-18 04:01:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-04-18 04:01:48 +0000 |
| commit | 40b354142a5c74c7a4bd1ad4e6d6030aa697ec1e (patch) | |
| tree | c98a19d5c41412acbc7aea5aab542425daf33478 /ceilometer | |
| parent | 3c5ce4d92305b8b0b35a31a9669a4e700f163c30 (diff) | |
| parent | 643f7b5702d6ab676c80a86ef0c730524742b97f (diff) | |
| download | ceilometer-40b354142a5c74c7a4bd1ad4e6d6030aa697ec1e.tar.gz | |
Merge "Fixes KeyError on volume create/delete"
Diffstat (limited to 'ceilometer')
| -rw-r--r-- | ceilometer/data/meters.d/meters.yaml | 2 | ||||
| -rw-r--r-- | ceilometer/pipeline/data/event_definitions.yaml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ceilometer/data/meters.d/meters.yaml b/ceilometer/data/meters.d/meters.yaml index d368734c..1b39d622 100644 --- a/ceilometer/data/meters.d/meters.yaml +++ b/ceilometer/data/meters.d/meters.yaml @@ -128,7 +128,7 @@ metric: metadata: display_name: $.payload.display_name volume_type: $.payload.volume_type - image_id: $.payload.glance_metadata[?key=image_id][0].value + image_id: $.payload.glance_metadata[?key=image_id].value instance_id: $.payload.volume_attachment[0].server_id - name: 'snapshot.size' diff --git a/ceilometer/pipeline/data/event_definitions.yaml b/ceilometer/pipeline/data/event_definitions.yaml index b77183a9..e03f5dad 100644 --- a/ceilometer/pipeline/data/event_definitions.yaml +++ b/ceilometer/pipeline/data/event_definitions.yaml @@ -86,7 +86,7 @@ created_at: fields: payload.created_at image_id: - fields: payload.glance_metadata[?key=image_id][0].value + fields: payload.glance_metadata[?key=image_id].value instance_id: fields: payload.volume_attachment[0].server_id - event_type: ['volume.exists', 'volume.create.*', 'volume.delete.*', 'volume.resize.*', 'volume.attach.*', 'volume.detach.*', 'volume.update.*'] |