Deprecate IcingaStatusWriter feature

fixes #8741

diff --git a/doc/6-object-types.md b/doc/6-object-types.md
index cbf1c87e94001443b62b60adf1a0fc3e4d1bc523..7239e6ba1825c4567dcac17fd60b1d8a8f3a7b88 100644 (file)
--- 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 4e28287f6d9288b450f5325fa9edb2f5d086422e..579227305796df765695b33ecec086e74bbde486 100644 (file)
--- 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 44e8f3c8c7a374ab55263b44a29f20552c5c208b..12b211b85f8e0ee19920a5b583baba9289a22658 100644 (file)
--- 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));