diff options
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/ceilometer/README-ceilometer.conf.txt | 4 | ||||
| -rw-r--r-- | etc/ceilometer/event_definitions.yaml | 4 | ||||
| -rw-r--r-- | etc/ceilometer/gnocchi_resources.yaml | 13 |
3 files changed, 15 insertions, 6 deletions
diff --git a/etc/ceilometer/README-ceilometer.conf.txt b/etc/ceilometer/README-ceilometer.conf.txt deleted file mode 100644 index db6d857e..00000000 --- a/etc/ceilometer/README-ceilometer.conf.txt +++ /dev/null @@ -1,4 +0,0 @@ -To generate the sample ceilometer.conf file, run the following -command from the top-level ceilometer directory: - -tox -egenconfig
\ No newline at end of file diff --git a/etc/ceilometer/event_definitions.yaml b/etc/ceilometer/event_definitions.yaml index 6fef5936..cc304c5f 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: |