From b3832a6177d52359ccf4bed84371b390fc175d29 Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Thu, 19 Oct 2017 16:09:46 +0200 Subject: [PATCH] doc: remove mention of combination alarms They are gone. Change-Id: Ie22204f8ae38687e371cd069424dec562b9d99d7 --- doc/source/admin/telemetry-alarms.rst | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/doc/source/admin/telemetry-alarms.rst b/doc/source/admin/telemetry-alarms.rst index 2c99b7c1c..1177276f8 100644 --- a/doc/source/admin/telemetry-alarms.rst +++ b/doc/source/admin/telemetry-alarms.rst @@ -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 ~~~~~~~~~~~~~~~~~~