Indicate a warning in the 'icinga' check when cluster stage validation failed

- success: clear the last failed attribute
- failed: populate it with the output and current timestamp

This can be used to highlight this in the 'icinga' check task.
Since 2.9 we don't have problems with circular library dependencies
with just one linked binary, therefore it is safe to include libremote
in libmethods here.

diff --git a/lib/methods/icingachecktask.cpp b/lib/methods/icingachecktask.cpp
index 52213889e2f91466c05f7c2dc7ca715b9443e149..fa598d487362d7ce11440cfd6eec329dcbeb6578 100644 (file)
--- a/lib/methods/icingachecktask.cpp
+++ b/lib/methods/icingachecktask.cpp
@@ -8,6 +8,7 @@
 #include "icinga/icingaapplication.hpp"
 #include "icinga/clusterevents.hpp"
 #include "icinga/checkable.hpp"
+#include "remote/apilistener.hpp"
 #include "base/application.hpp"
 #include "base/objectlock.hpp"
 #include "base/utility.hpp"
@@ -157,6 +158,20 @@ void IcingaCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const CheckRes
                cr->SetState(ServiceWarning);
        }
 
+       /* Indicate a warning when the last synced config caused a stage validation error. */
+       ApiListener::Ptr listener = ApiListener::GetInstance();
+
+       if (listener) {
+               Dictionary::Ptr validationResult = listener->GetLastFailedZonesStageValidation();
+
+               if (validationResult) {
+                       output += "; Last zone sync stage validation failed at "
+                               + Utility::FormatDateTime("%Y-%m-%d %H:%M:%S %z", validationResult->Get("ts"));
+
+                       cr->SetState(ServiceWarning);
+               }
+       }
+
        /* Extract the version number of the running Icinga2 instance.
         * We assume that appVersion will allways be something like 'v2.10.1-8-gaebe6da' and we want to extract '2.10.1'.
         */

diff --git a/lib/remote/apilistener-filesync.cpp b/lib/remote/apilistener-filesync.cpp
index 68625a4b794e5d3551465e13e33bee54c7f98b03..e4ed1f3106f85c00d3f29713bc53fe9cf56888c8 100644 (file)
--- a/lib/remote/apilistener-filesync.cpp
+++ b/lib/remote/apilistener-filesync.cpp
@@ -414,17 +414,25 @@ void ApiListener::TryActivateZonesStageCallback(const ProcessResult& pr,
                        Utility::CopyFile(stagePath, currentPath);
                }
 
-               Application::RequestRestart();
-       } else {
-               Log(LogCritical, "ApiListener")
-                       << "Config validation failed for staged cluster config sync in '" << GetApiZonesStageDir()
-                       << "'. Aborting. Logs: '" << logFile << "'";
-
                ApiListener::Ptr listener = ApiListener::GetInstance();
 
                if (listener)
-                       listener->UpdateLastFailedZonesStageValidation(pr.Output);
+                       listener->ClearLastFailedZonesStageValidation();
+
+               Application::RequestRestart();
+
+               return;
        }
+
+       /* Error case. */
+       Log(LogCritical, "ApiListener")
+               << "Config validation failed for staged cluster config sync in '" << GetApiZonesStageDir()
+               << "'. Aborting. Logs: '" << logFile << "'";
+
+       ApiListener::Ptr listener = ApiListener::GetInstance();
+
+       if (listener)
+               listener->UpdateLastFailedZonesStageValidation(pr.Output);
 }
 
 void ApiListener::AsyncTryActivateZonesStage(const String& stageConfigDir, const String& currentConfigDir,
@@ -464,3 +472,8 @@ void ApiListener::UpdateLastFailedZonesStageValidation(const String& log)
 
        SetLastFailedZonesStageValidation(lastFailedZonesStageValidation);
 }
+
+void ApiListener::ClearLastFailedZonesStageValidation()
+{
+       SetLastFailedZonesStageValidation(Dictionary::Ptr());
+}

diff --git a/lib/remote/apilistener.hpp b/lib/remote/apilistener.hpp
index 3be03f96d9cd29979e8124992865f2b441a8c9ee..59e73ec96cf352a9e5d48c664225a7a7e5812776 100644 (file)
--- a/lib/remote/apilistener.hpp
+++ b/lib/remote/apilistener.hpp
@@ -188,6 +188,7 @@ private:
                const std::vector<String>& relativePaths);
 
        void UpdateLastFailedZonesStageValidation(const String& log);
+       void ClearLastFailedZonesStageValidation();
 
        /* configsync */
        void UpdateConfigObject(const ConfigObject::Ptr& object, const MessageOrigin::Ptr& origin,