openstack
/
aodh
Code Issues Proposed changes

[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
This commit is contained in:
astacksu 2017-10-20 16:39:51 +08:00 committed by SU, HAO-CHEN
parent bee1aeaa3f
commit ac9f645cbf
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
doc/source/admin/telemetry-alarms.rst
View File

@ -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::