Change namespace 'ceilometer' to 'aodh'
Change namespace of some files to '*aodh*' instead of '*ceilometer*'. Blueprint migrate-to-use-aodh-for-alarms Change-Id: I2c4d565ded5f9f7146b23479acd2702f976b8833
This commit is contained in:
parent
26bab914a0
commit
8a4df57c37
@ -481,8 +481,8 @@ Delete
|
||||
|
||||
For this to work for a particular resource, the `entity` and
|
||||
`default_client_name` attributes must be overridden in the resource
|
||||
implementation. For example, `entity` of Ceilometer Alarm should equals
|
||||
to "alarms" and `default_client_name` to "ceilometer".
|
||||
implementation. For example, `entity` of Aodh Alarm should equals
|
||||
to "alarm" and `default_client_name` to "aodh".
|
||||
|
||||
.. py:function:: handle_delete_snapshot(self, snapshot)
|
||||
|
||||
|
@ -50,7 +50,7 @@ heat processes will be launched in `screen` with the labels prefixed with `h-`.
|
||||
|
||||
Configure DevStack to enable ceilometer and aodh (if using alarms)
|
||||
------------------------------------------------------------------
|
||||
To use ceilometer alarms you need to enable ceilometer and aodh in devstack.
|
||||
To use aodh alarms you need to enable ceilometer and aodh in devstack.
|
||||
Adding the following lines to `[[local|localrc]]` section of `local.conf`
|
||||
will enable the services::
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
HeatTemplateFormatVersion: '2012-12-12'
|
||||
Description: AWS::CloudWatch::Alarm using Ceilometer.
|
||||
Description: AWS::CloudWatch::Alarm using Aodh.
|
||||
Parameters:
|
||||
AlarmDescription:
|
||||
Type: String
|
||||
@ -47,16 +47,16 @@ Parameters:
|
||||
|
||||
Mappings:
|
||||
ComparisonOperatorMap:
|
||||
LessThanOrEqualToThreshold: {Ceilometer: le}
|
||||
LessThanThreshold: {Ceilometer: lt}
|
||||
GreaterThanThreshold: {Ceilometer: gt}
|
||||
GreaterThanOrEqualToThreshold: {Ceilometer: ge}
|
||||
LessThanOrEqualToThreshold: {Aodh: le}
|
||||
LessThanThreshold: {Aodh: lt}
|
||||
GreaterThanThreshold: {Aodh: gt}
|
||||
GreaterThanOrEqualToThreshold: {Aodh: ge}
|
||||
StatisticMap:
|
||||
SampleCount: {Ceilometer: count}
|
||||
Average: {Ceilometer: avg}
|
||||
Sum: {Ceilometer: sum}
|
||||
Minimum: {Ceilometer: min}
|
||||
Maximum: {Ceilometer: max}
|
||||
SampleCount: {Aodh: count}
|
||||
Average: {Aodh: avg}
|
||||
Sum: {Aodh: sum}
|
||||
Minimum: {Aodh: min}
|
||||
Maximum: {Aodh: max}
|
||||
|
||||
Resources:
|
||||
__alarm__:
|
||||
@ -80,8 +80,8 @@ Resources:
|
||||
insufficient_data_actions:
|
||||
Ref: InsufficientDataActions
|
||||
statistic:
|
||||
"Fn::FindInMap": [StatisticMap, {Ref: Statistic}, Ceilometer]
|
||||
"Fn::FindInMap": [StatisticMap, {Ref: Statistic}, Aodh]
|
||||
comparison_operator:
|
||||
"Fn::FindInMap": [ComparisonOperatorMap, {Ref: ComparisonOperator}, Ceilometer]
|
||||
"Fn::FindInMap": [ComparisonOperatorMap, {Ref: ComparisonOperator}, Aodh]
|
||||
matching_metadata:
|
||||
"Fn::MemberListToMap": [Name, Value, {Ref: Dimensions}]
|
||||
|
@ -22,7 +22,7 @@ from heat.common import exception
|
||||
from heat.common import template_format
|
||||
from heat.engine.clients.os import aodh
|
||||
from heat.engine.clients.os import ceilometer
|
||||
from heat.engine.resources.openstack.ceilometer import alarm
|
||||
from heat.engine.resources.openstack.aodh import alarm
|
||||
from heat.engine import rsrc_defn
|
||||
from heat.engine import scheduler
|
||||
from heat.engine import stack as parser
|
@ -17,7 +17,7 @@ import mox
|
||||
from heat.common import exception
|
||||
from heat.common import template_format
|
||||
from heat.engine.clients.os import aodh
|
||||
from heat.engine.resources.openstack.ceilometer.gnocchi import (
|
||||
from heat.engine.resources.openstack.aodh.gnocchi import (
|
||||
alarm as gnocchi)
|
||||
from heat.engine import scheduler
|
||||
from heat.tests import common
|
Loading…
Reference in New Issue
Block a user