summaryrefslogtreecommitdiff
path: root/ceilometer/meter
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-09-04 01:31:33 +0000
committerGerrit Code Review <review@openstack.org>2015-09-04 01:31:33 +0000
commit75437406e1d74fe8a63cc6f64eaa92ed3eb6d1ef (patch)
treede8727c057095532bce55366f0b8cebd7227ca40 /ceilometer/meter
parent1499ab88b5b437c45b5d345ea8ce1dc61cd060c4 (diff)
parent12c9668c67ce3927708f555ff9e443ac5307fc4e (diff)
downloadceilometer-75437406e1d74fe8a63cc6f64eaa92ed3eb6d1ef.tar.gz
Merge "fix metadata for compute cpu notifications"
Diffstat (limited to 'ceilometer/meter')
-rw-r--r--ceilometer/meter/data/meters.yaml50
1 files changed, 50 insertions, 0 deletions
diff --git a/ceilometer/meter/data/meters.yaml b/ceilometer/meter/data/meters.yaml
index 44843dd9..63394cf8 100644
--- a/ceilometer/meter/data/meters.yaml
+++ b/ceilometer/meter/data/meters.yaml
@@ -139,6 +139,11 @@ metric:
unit: 'MHz'
volume: $.payload.metrics[?(@.name='cpu.frequency')].value
resource_id: $.payload.host + "_" + $.payload.nodename
+ timestamp: $.payload.metrics[?(@.name='cpu.frequency')].timestamp
+ metadata:
+ event_type: $.event_type
+ host: $.publisher_id
+ source: $.payload.metrics[?(@.name='cpu.frequency')].source
- name: 'compute.node.cpu.user.time'
event_type: 'compute.metrics.update'
@@ -146,6 +151,11 @@ metric:
unit: 'ns'
volume: $.payload.metrics[?(@.name='cpu.user.time')].value
resource_id: $.payload.host + "_" + $.payload.nodename
+ timestamp: $.payload.metrics[?(@.name='cpu.user.time')].timestamp
+ metadata:
+ event_type: $.event_type
+ host: $.publisher_id
+ source: $.payload.metrics[?(@.name='cpu.user.time')].source
- name: 'compute.node.cpu.kernel.time'
event_type: 'compute.metrics.update'
@@ -153,6 +163,11 @@ metric:
unit: 'ns'
volume: $.payload.metrics[?(@.name='cpu.kernel.time')].value
resource_id: $.payload.host + "_" + $.payload.nodename
+ timestamp: $.payload.metrics[?(@.name='cpu.kernel.time')].timestamp
+ metadata:
+ event_type: $.event_type
+ host: $.publisher_id
+ source: $.payload.metrics[?(@.name='cpu.kernel.time')].source
- name: 'compute.node.cpu.idle.time'
event_type: 'compute.metrics.update'
@@ -160,6 +175,11 @@ metric:
unit: 'ns'
volume: $.payload.metrics[?(@.name='cpu.idle.time')].value
resource_id: $.payload.host + "_" + $.payload.nodename
+ timestamp: $.payload.metrics[?(@.name='cpu.idle.time')].timestamp
+ metadata:
+ event_type: $.event_type
+ host: $.publisher_id
+ source: $.payload.metrics[?(@.name='cpu.idle.time')].source
- name: 'compute.node.cpu.iowait.time'
event_type: 'compute.metrics.update'
@@ -167,6 +187,11 @@ metric:
unit: 'ns'
volume: $.payload.metrics[?(@.name='cpu.iowait.time')].value
resource_id: $.payload.host + "_" + $.payload.nodename
+ timestamp: $.payload.metrics[?(@.name='cpu.iowait.time')].timestamp
+ metadata:
+ event_type: $.event_type
+ host: $.publisher_id
+ source: $.payload.metrics[?(@.name='cpu.iowait.time')].source
- name: 'compute.node.cpu.kernel.percent'
event_type: 'compute.metrics.update'
@@ -174,6 +199,11 @@ metric:
unit: 'percent'
volume: $.payload.metrics[?(@.name='cpu.kernel.percent')].value * 100
resource_id: $.payload.host + "_" + $.payload.nodename
+ timestamp: $.payload.metrics[?(@.name='cpu.kernel.percent')].timestamp
+ metadata:
+ event_type: $.event_type
+ host: $.publisher_id
+ source: $.payload.metrics[?(@.name='cpu.kernel.percent')].source
- name: 'compute.node.cpu.idle.percent'
event_type: 'compute.metrics.update'
@@ -181,6 +211,11 @@ metric:
unit: 'percent'
volume: $.payload.metrics[?(@.name='cpu.idle.percent')].value * 100
resource_id: $.payload.host + "_" + $.payload.nodename
+ timestamp: $.payload.metrics[?(@.name='cpu.idle.percent')].timestamp
+ metadata:
+ event_type: $.event_type
+ host: $.publisher_id
+ source: $.payload.metrics[?(@.name='cpu.idle.percent')].source
- name: 'compute.node.cpu.user.percent'
event_type: 'compute.metrics.update'
@@ -188,6 +223,11 @@ metric:
unit: 'percent'
volume: $.payload.metrics[?(@.name='cpu.user.percent')].value * 100
resource_id: $.payload.host + "_" + $.payload.nodename
+ timestamp: $.payload.metrics[?(@.name='cpu.user.percent')].timestamp
+ metadata:
+ event_type: $.event_type
+ host: $.publisher_id
+ source: $.payload.metrics[?(@.name='cpu.user.percent')].source
- name: 'compute.node.cpu.iowait.percent'
event_type: 'compute.metrics.update'
@@ -195,6 +235,11 @@ metric:
unit: 'percent'
volume: $.payload.metrics[?(@.name='cpu.iowait.percent')].value * 100
resource_id: $.payload.host + "_" + $.payload.nodename
+ timestamp: $.payload.metrics[?(@.name='cpu.iowait.percent')].timestamp
+ metadata:
+ event_type: $.event_type
+ host: $.publisher_id
+ source: $.payload.metrics[?(@.name='cpu.iowait.percent')].source
- name: 'compute.node.cpu.percent'
event_type: 'compute.metrics.update'
@@ -202,6 +247,11 @@ metric:
unit: 'percent'
volume: $.payload.metrics[?(@.name='cpu.percent')].value * 100
resource_id: $.payload.host + "_" + $.payload.nodename
+ timestamp: $.payload.metrics[?(@.name='cpu.percent')].timestamp
+ metadata:
+ event_type: $.event_type
+ host: $.publisher_id
+ source: $.payload.metrics[?(@.name='cpu.percent')].source
# NOTE: non-metric meters are generally events/existence meters