From: Michael Friedrich <michael.friedrich@netways.de>
Date: Mon, 14 Sep 2015 08:36:06 +0000 (+0200)
Subject: Deprecate IcingaStatusWriter feature
X-Git-Tag: v2.4.0~325
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fcf2f0ef5d66c1b555b7c91cb64ff2fd7ce37d8f;p=icinga2

Deprecate IcingaStatusWriter feature

fixes #8741
---

diff --git a/doc/6-object-types.md b/doc/6-object-types.md
index cbf1c87e9..7239e6ba1 100644
--- a/doc/6-object-types.md
+++ b/doc/6-object-types.md
@@ -555,6 +555,10 @@ Configuration Attributes:
 
 ## <a id="objecttype-icingastatuswriter"></a> IcingaStatusWriter
 
+> **Note**
+>
+> This feature was deprecated in 2.4 and will be removed in future releases.
+
 The IcingaStatusWriter feature periodically dumps the current status
 and performance data from Icinga 2 and all registered features into
 a defined JSON file.
diff --git a/etc/icinga2/features-available/icingastatus.conf b/etc/icinga2/features-available/icingastatus.conf
index 4e28287f6..579227305 100644
--- a/etc/icinga2/features-available/icingastatus.conf
+++ b/etc/icinga2/features-available/icingastatus.conf
@@ -4,5 +4,7 @@
  * all registered features into a defined JSON file.
  */
 
+/* NOTE: This feature was deprecated in 2.4 and will be removed in future releases. */
+
 object IcingaStatusWriter "icinga-status" { }
 
diff --git a/lib/icinga/icingastatuswriter.cpp b/lib/icinga/icingastatuswriter.cpp
index 44e8f3c8c..12b211b85 100644
--- a/lib/icinga/icingastatuswriter.cpp
+++ b/lib/icinga/icingastatuswriter.cpp
@@ -60,6 +60,9 @@ void IcingaStatusWriter::Start(void)
 {
 	ObjectImpl<IcingaStatusWriter>::Start();
 
+	/* TODO: remove in versions > 2.4 */
+	Log(LogWarning, "IcingaStatusWriter", "This feature was deprecated in 2.4 and will be removed in future Icinga 2 releases.");
+
 	m_StatusTimer = new Timer();
 	m_StatusTimer->SetInterval(GetUpdateInterval());
 	m_StatusTimer->OnTimerExpired.connect(boost::bind(&IcingaStatusWriter::StatusTimerHandler, this));