summaryrefslogtreecommitdiff
path: root/ceilometer/meter
diff options
context:
space:
mode:
authorgordon chung <gord@live.ca>2016-03-13 15:27:22 -0400
committergordon chung <gord@live.ca>2016-03-13 15:27:22 -0400
commit815fcc0a10516edc1502d927f239581e5614f48c (patch)
treead7c599fdf4dae93e1b5848d403949b8f0cf0f55 /ceilometer/meter
parent2a2223968e6eb4e7498738b350d7a74ab1cfd249 (diff)
downloadceilometer-815fcc0a10516edc1502d927f239581e5614f48c.tar.gz
change dns and trove notifications to declarative
we can calculate the same metric using declarative plugins Change-Id: I48bba69025552e2a337161716ae731bf5a28ba84
Diffstat (limited to 'ceilometer/meter')
-rw-r--r--ceilometer/meter/data/meters.yaml34
-rw-r--r--ceilometer/meter/notifications.py1
2 files changed, 35 insertions, 0 deletions
diff --git a/ceilometer/meter/data/meters.yaml b/ceilometer/meter/data/meters.yaml
index 3bbd8b20..119acc0f 100644
--- a/ceilometer/meter/data/meters.yaml
+++ b/ceilometer/meter/data/meters.yaml
@@ -263,6 +263,40 @@ metric:
host: $.publisher_id
source: $.payload.metrics[?(@.name='cpu.percent')].source
+ # DNS
+ - name: 'dns.domain.exists'
+ event_type: 'dns.domain.exists'
+ type: 'cumulative'
+ unit: 's'
+ volume:
+ fields: [$.payload.audit_period_beginning, $.payload.audit_period_ending]
+ plugin: 'timedelta'
+ project_id: $.payload.tenant_id
+ resource_id: $.payload.id
+ user_id: $._context_user
+ metadata:
+ status: $.payload.status
+ pool_id: $.payload.pool_id
+ host: $.publisher_id
+
+ # Trove
+ - name: 'trove.instance.exists'
+ event_type: 'trove.instance.exists'
+ type: 'cumulative'
+ unit: 's'
+ volume:
+ fields: [$.payload.audit_period_beginning, $.payload.audit_period_ending]
+ plugin: 'timedelta'
+ project_id: $.payload.tenant_id
+ resource_id: $.payload.instance_id
+ user_id: $.payload.user_id
+ metadata:
+ nova_instance_id: $.payload.nova_instance_id
+ state: $.payload.state
+ service_id: $.payload.service_id
+ instance_type: $.payload.instance_type
+ instance_type_id: $.payload.instance_type_id
+
# NOTE: non-metric meters are generally events/existence meters
# These are DEPRECATED in current release and expected to be
diff --git a/ceilometer/meter/notifications.py b/ceilometer/meter/notifications.py
index 4104f679..80646c04 100644
--- a/ceilometer/meter/notifications.py
+++ b/ceilometer/meter/notifications.py
@@ -223,6 +223,7 @@ class ProcessMeterNotifications(plugin_base.NotificationBase):
conf.magnetodb_control_exchange,
conf.ceilometer_control_exchange,
conf.magnum_control_exchange,
+ conf.dns_control_exchange,
]
for exchange in exchanges: