From 20b7c395badfdc5f050165196b069f045354e62a Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Fri, 6 Nov 2020 12:31:10 +0100 Subject: [PATCH] Relativize future removals of deprecated features ... as (of course) we won't remove them as long as it's easier than not removing them. --- doc/09-object-types.md | 10 +++++----- doc/10-icinga-template-library.md | 2 +- doc/14-features.md | 10 +++++----- lib/compat/checkresultreader.cpp | 2 +- lib/compat/compatlogger.cpp | 2 +- lib/compat/externalcommandlistener.cpp | 2 +- lib/compat/statusdatawriter.cpp | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/doc/09-object-types.md b/doc/09-object-types.md index b1dfc4993..38105716c 100644 --- a/doc/09-object-types.md +++ b/doc/09-object-types.md @@ -1152,7 +1152,7 @@ to help existing Icinga 1.x users and might be useful for migration scenarios. > **Note** > -> This feature is DEPRECATED and will be removed in future releases. +> This feature is DEPRECATED and may be removed in future releases. > Check the [roadmap](https://github.com/Icinga/icinga2/milestones). Example: @@ -1176,7 +1176,7 @@ This configuration object is available as [compatlog feature](14-features.md#com > **Note** > -> This feature is DEPRECATED and will be removed in future releases. +> This feature is DEPRECATED and may be removed in future releases. > Check the [roadmap](https://github.com/Icinga/icinga2/milestones). Example: @@ -1253,7 +1253,7 @@ This configuration object is available as [command feature](14-features.md#exter > **Note** > -> This feature is DEPRECATED and will be removed in future releases. +> This feature is DEPRECATED and may be removed in future releases. > Check the [roadmap](https://github.com/Icinga/icinga2/milestones). Example: @@ -1663,7 +1663,7 @@ This configuration object is available as [livestatus feature](14-features.md#se > **Note** > -> This feature is DEPRECATED and will be removed in future releases. +> This feature is DEPRECATED and may be removed in future releases. > Check the [roadmap](https://github.com/Icinga/icinga2/milestones). Examples: @@ -1783,7 +1783,7 @@ This configuration object is available as [statusdata feature](14-features.md#st > **Note** > -> This feature is DEPRECATED and will be removed in future releases. +> This feature is DEPRECATED and may be removed in future releases. > Check the [roadmap](https://github.com/Icinga/icinga2/milestones). Example: diff --git a/doc/10-icinga-template-library.md b/doc/10-icinga-template-library.md index a5131bc35..ab5b085a4 100644 --- a/doc/10-icinga-template-library.md +++ b/doc/10-icinga-template-library.md @@ -1513,7 +1513,7 @@ uptime_since | **Optional.** Show last boot in yyyy-mm-dd HH:MM:SS format (ou > > These plugins are DEPRECATED in favor of our > [PowerShell Plugins](https://github.com/Icinga/icinga-powershell-plugins) -> and will be removed in a future release. +> and may be removed in a future release. > Check the [roadmap](https://github.com/Icinga/icinga2/milestones). To allow a basic monitoring of Windows clients Icinga 2 comes with a set of Windows only plugins. While trying to mirror the functionalities of their linux cousins from the monitoring-plugins package, the differences between Windows and Linux are too big to be able use the same CheckCommands for both systems. diff --git a/doc/14-features.md b/doc/14-features.md index 9835e723b..5eaef93d2 100644 --- a/doc/14-features.md +++ b/doc/14-features.md @@ -922,7 +922,7 @@ is running on. > **Note** > -> This feature is DEPRECATED and will be removed in future releases. +> This feature is DEPRECATED and may be removed in future releases. > Check the [roadmap](https://github.com/Icinga/icinga2/milestones). Icinga 1.x writes object configuration data and status data in a cyclic @@ -941,7 +941,7 @@ you can safely disable this feature. > **Note** > -> This feature is DEPRECATED and will be removed in future releases. +> This feature is DEPRECATED and may be removed in future releases. > Check the [roadmap](https://github.com/Icinga/icinga2/milestones). The Icinga 1.x log format is considered being the `Compat Log` @@ -972,7 +972,7 @@ in `/var/log/icinga2/compat`. Rotated log files are moved into > **Note** > -> This feature is DEPRECATED and will be removed in future releases. +> This feature is DEPRECATED and may be removed in future releases. > Check the [roadmap](https://github.com/Icinga/icinga2/milestones). Icinga 2 provides an external command pipe for processing commands @@ -1012,7 +1012,7 @@ on the [Icinga 1.x documentation](https://docs.icinga.com/latest/en/extcommands2 > **Note** > -> This feature is DEPRECATED and will be removed in future releases. +> This feature is DEPRECATED and may be removed in future releases. > Check the [roadmap](https://github.com/Icinga/icinga2/milestones). Icinga 1.x writes its check result files to a temporary spool directory @@ -1038,7 +1038,7 @@ object CheckResultReader "reader" { > **Note** > -> This feature is DEPRECATED and will be removed in future releases. +> This feature is DEPRECATED and may be removed in future releases. > Check the [roadmap](https://github.com/Icinga/icinga2/milestones). The [MK Livestatus](https://mathias-kettner.de/checkmk_livestatus.html) project diff --git a/lib/compat/checkresultreader.cpp b/lib/compat/checkresultreader.cpp index 2b3f05ccd..4943b17c6 100644 --- a/lib/compat/checkresultreader.cpp +++ b/lib/compat/checkresultreader.cpp @@ -45,7 +45,7 @@ void CheckResultReader::Start(bool runtimeCreated) << "'" << GetName() << "' started."; Log(LogWarning, "CheckResultReader") - << "This feature is DEPRECATED and will be removed in future releases. Check the roadmap at https://github.com/Icinga/icinga2/milestones"; + << "This feature is DEPRECATED and may be removed in future releases. Check the roadmap at https://github.com/Icinga/icinga2/milestones"; #ifndef _WIN32 m_ReadTimer = new Timer(); diff --git a/lib/compat/compatlogger.cpp b/lib/compat/compatlogger.cpp index 2e44f7727..df66092a7 100644 --- a/lib/compat/compatlogger.cpp +++ b/lib/compat/compatlogger.cpp @@ -47,7 +47,7 @@ void CompatLogger::Start(bool runtimeCreated) << "'" << GetName() << "' started."; Log(LogWarning, "CompatLogger") - << "This feature is DEPRECATED and will be removed in future releases. Check the roadmap at https://github.com/Icinga/icinga2/milestones"; + << "This feature is DEPRECATED and may be removed in future releases. Check the roadmap at https://github.com/Icinga/icinga2/milestones"; Checkable::OnNewCheckResult.connect(std::bind(&CompatLogger::CheckResultHandler, this, _1, _2)); Checkable::OnNotificationSentToUser.connect(std::bind(&CompatLogger::NotificationSentHandler, this, _1, _2, _3, _4, _5, _6, _7, _8)); diff --git a/lib/compat/externalcommandlistener.cpp b/lib/compat/externalcommandlistener.cpp index d5bdd63b5..297a24e73 100644 --- a/lib/compat/externalcommandlistener.cpp +++ b/lib/compat/externalcommandlistener.cpp @@ -37,7 +37,7 @@ void ExternalCommandListener::Start(bool runtimeCreated) << "'" << GetName() << "' started."; Log(LogWarning, "ExternalCommandListener") - << "This feature is DEPRECATED and will be removed in future releases. Check the roadmap at https://github.com/Icinga/icinga2/milestones"; + << "This feature is DEPRECATED and may be removed in future releases. Check the roadmap at https://github.com/Icinga/icinga2/milestones"; #ifndef _WIN32 m_CommandThread = std::thread(std::bind(&ExternalCommandListener::CommandPipeThread, this, GetCommandPath())); m_CommandThread.detach(); diff --git a/lib/compat/statusdatawriter.cpp b/lib/compat/statusdatawriter.cpp index 5a0f136bf..4108752fb 100644 --- a/lib/compat/statusdatawriter.cpp +++ b/lib/compat/statusdatawriter.cpp @@ -60,7 +60,7 @@ void StatusDataWriter::Start(bool runtimeCreated) << "'" << GetName() << "' started."; Log(LogWarning, "StatusDataWriter") - << "This feature is DEPRECATED and will be removed in future releases. Check the roadmap at https://github.com/Icinga/icinga2/milestones"; + << "This feature is DEPRECATED and may be removed in future releases. Check the roadmap at https://github.com/Icinga/icinga2/milestones"; m_ObjectsCacheOutdated = true;