Merge "doc: remove mention of combination alarms"

This commit is contained in:
Zuul 2017-10-30 21:34:53 +00:00 committed by Gerrit Code Review
commit 8589a6f2fc
1 changed files with 0 additions and 13 deletions

View File

@ -58,19 +58,6 @@ Composite rule alarms
Composite alarms enable users to define an alarm with multiple triggering
conditions, using a combination of ``and`` and ``or`` relations.
Combination rule alarms
-----------------------
.. note::
Combination alarms are deprecated as of Newton for composite alarms.
Combination alarm functionality is removed in Pike.
The Telemetry service also supports the concept of a meta-alarm, which
aggregates over the current state of a set of underlying basic alarms
combined via a logical operator (``and`` or ``or``).
Alarm dimensioning
~~~~~~~~~~~~~~~~~~