From a408ccd1791ba758ddaa81d1e1f3be9250623bd0 Mon Sep 17 00:00:00 2001 From: Jeremy Pugh Date: Wed, 19 Oct 2016 16:08:09 -0700 Subject: [PATCH] dd missing memory.resident to NOVA_METERS memory.resident is missing from NOVA_METERS list. This causes the wrong metadata format for alarms on this meter if a heat stack is used to create it. Basically, you will see the query in the alarm generated by the heatstack will incorrect be set to metadata.metering.stack instead of metadata.user_metadata.stack. Change-Id: Ic95f8c98c020627c6c5322c905cbf1c160d8445b Closes-Bug: #1623680 --- heat/engine/resources/alarm_base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/heat/engine/resources/alarm_base.py b/heat/engine/resources/alarm_base.py index b5ab041109..7a02f2d472 100644 --- a/heat/engine/resources/alarm_base.py +++ b/heat/engine/resources/alarm_base.py @@ -137,7 +137,7 @@ common_properties_schema = { } -NOVA_METERS = ['instance', 'memory', 'memory.usage', +NOVA_METERS = ['instance', 'memory', 'memory.usage', 'memory.resident', 'cpu', 'cpu_util', 'vcpus', 'disk.read.requests', 'disk.read.requests.rate', 'disk.write.requests', 'disk.write.requests.rate',