From ac9f645cbfdf883d82504a3ae226f95aaeeccafa Mon Sep 17 00:00:00 2001 From: astacksu Date: Fri, 20 Oct 2017 16:39:51 +0800 Subject: [PATCH] [doc] fix word usage of composite alarm some explanations of composite alarm creation use 'combination', which might cause confusion with the deprecated combination alarm. Change-Id: I928baf72968c8ed38d29923e8ce7b092c44bd954 --- doc/source/admin/telemetry-alarms.rst | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/source/admin/telemetry-alarms.rst b/doc/source/admin/telemetry-alarms.rst index 2c99b7c1c..fbb859d78 100644 --- a/doc/source/admin/telemetry-alarms.rst +++ b/doc/source/admin/telemetry-alarms.rst @@ -232,8 +232,8 @@ time-constraint Composite alarm ``````````````` -An example of creating a combination alarm, based on the combined -state of two underlying alarms: +An example of creating a composite alarm, based on the composite of +two basic rules: .. code-block:: console @@ -248,10 +248,10 @@ state of two underlying alarms: "resource_type": "instance", "aggregation_method": "last"}]}' \ --alarm-action 'http://example.org/notify' -This creates an alarm that will fire when either one of two underlying -alarms transition into the alarm state. The notification in this case -is a webhook call. Any number of underlying alarms can be combined in -this way, using either ``and`` or ``or``. Additionally, combinations +This creates an alarm that will fire when either of two basic rules +meets the condition. The notification in this case is a webhook call. +Any number of basic rules can be composed into a composite rule this +way, using either ``and`` or ``or``. Additionally, composite rules can contain nested conditions: .. note::