From 643f7b5702d6ab676c80a86ef0c730524742b97f Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotjagov Date: Wed, 7 Nov 2018 15:43:22 +0200 Subject: [PATCH] Fixes KeyError on volume create/delete Seems, that cinder changed format of notifications in rocky, as image_id in glance_metadata is not a list anymore. Due to this bug agent-notification get stuck and info about volume delete was not delivered to gnocchi. Change-Id: Id5a2b3e1fb9aed3e620c8b0e9ffb9cf1a447fea8 Closes-Bug: 1801348 --- ceilometer/data/meters.d/meters.yaml | 2 +- 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 d368734c44..1b39d6224d 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 eaac600f54..07eb447160 100644 --- a/ceilometer/pipeline/data/event_definitions.yaml +++ b/ceilometer/pipeline/data/event_definitions.yaml @@ -82,7 +82,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.*']