Merge "[doc] fix word usage of composite alarm"

This commit is contained in:
Zuul 2017-11-20 15:21:34 +00:00 committed by Gerrit Code Review
commit b59f5732a4

View File

@ -219,8 +219,8 @@ time-constraint
Composite alarm Composite alarm
``````````````` ```````````````
An example of creating a combination alarm, based on the combined An example of creating a composite alarm, based on the composite of
state of two underlying alarms: two basic rules:
.. code-block:: console .. code-block:: console
@ -235,10 +235,10 @@ state of two underlying alarms:
"resource_type": "instance", "aggregation_method": "last"}]}' \ "resource_type": "instance", "aggregation_method": "last"}]}' \
--alarm-action 'http://example.org/notify' --alarm-action 'http://example.org/notify'
This creates an alarm that will fire when either one of two underlying This creates an alarm that will fire when either of two basic rules
alarms transition into the alarm state. The notification in this case meets the condition. The notification in this case is a webhook call.
is a webhook call. Any number of underlying alarms can be combined in Any number of basic rules can be composed into a composite rule this
this way, using either ``and`` or ``or``. Additionally, combinations way, using either ``and`` or ``or``. Additionally, composite rules
can contain nested conditions: can contain nested conditions:
.. note:: .. note::