From c5b8b799039ac5b8be7b2a3983a28a654630b536 Mon Sep 17 00:00:00 2001
From: gordon chung <gord@live.ca>
Date: Thu, 26 Nov 2015 16:29:59 -0500
Subject: [PATCH] add cpu.delta to gnocchi resources

we added cpu.delta in liberty to capture cputime between polls.
this adds it to the metric list for instance resource.

Change-Id: Ib494f7d119cda370aa8291fd404dad38c0c53817
---
 ceilometer/tests/unit/dispatcher/test_gnocchi.py | 2 +-
 etc/ceilometer/gnocchi_resources.yaml            | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ceilometer/tests/unit/dispatcher/test_gnocchi.py b/ceilometer/tests/unit/dispatcher/test_gnocchi.py
index dd88b0c8e2..6a593e956b 100644
--- a/ceilometer/tests/unit/dispatcher/test_gnocchi.py
+++ b/ceilometer/tests/unit/dispatcher/test_gnocchi.py
@@ -219,7 +219,7 @@ class DispatcherWorkflowTest(base.BaseTestCase,
             metric_names=[
                 'instance', 'disk.root.size', 'disk.ephemeral.size',
                 'memory', 'vcpus', 'memory.usage', 'memory.resident',
-                'cpu', 'cpu_util', 'vcpus', 'disk.read.requests',
+                'cpu', 'cpu.delta', 'cpu_util', 'vcpus', 'disk.read.requests',
                 'disk.read.requests.rate', 'disk.write.requests',
                 'disk.write.requests.rate', 'disk.read.bytes',
                 'disk.read.bytes.rate', 'disk.write.bytes',
diff --git a/etc/ceilometer/gnocchi_resources.yaml b/etc/ceilometer/gnocchi_resources.yaml
index b285dd3d02..5b67b6482b 100644
--- a/etc/ceilometer/gnocchi_resources.yaml
+++ b/etc/ceilometer/gnocchi_resources.yaml
@@ -41,6 +41,7 @@ resources:
       - 'memory.resident'
       - 'vcpus'
       - 'cpu'
+      - 'cpu.delta'
       - 'cpu_util'
       - 'disk.root.size'
       - 'disk.ephemeral.size'