Merge pull request #5925 from Icinga/fix/missing-variable-name

[icinga2] / lib / methods / clusterzonechecktask.cpp

diff --git a/lib/methods/clusterzonechecktask.cpp b/lib/methods/clusterzonechecktask.cpp
index b31444547947e551120aefb7c62069ca083beda2..635f7fc8c3e07cce729647cc7ff00d0a54870ca3 100644 (file)
--- a/lib/methods/clusterzonechecktask.cpp
+++ b/lib/methods/clusterzonechecktask.cpp
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Icinga 2                                                                   *
- * Copyright (C) 2012-2016 Icinga Development Team (https://www.icinga.org/)  *
+ * Copyright (C) 2012-2018 Icinga Development Team (https://www.icinga.com/)  *
  *                                                                            *
  * This program is free software; you can redistribute it and/or              *
  * modify it under the terms of the GNU General Public License                *
@@ -20,20 +20,19 @@
 #include "methods/clusterzonechecktask.hpp"
 #include "icinga/checkcommand.hpp"
 #include "icinga/macroprocessor.hpp"
-#include "icinga/perfdatavalue.hpp"
 #include "remote/apilistener.hpp"
 #include "remote/endpoint.hpp"
 #include "remote/zone.hpp"
 #include "base/function.hpp"
 #include "base/utility.hpp"
-#include <boost/foreach.hpp>
+#include "base/perfdatavalue.hpp"
 
 using namespace icinga;
 
-REGISTER_SCRIPTFUNCTION_NS(Internal, ClusterZoneCheck, &ClusterZoneCheckTask::ScriptFunc);
+REGISTER_SCRIPTFUNCTION_NS(Internal, ClusterZoneCheck, &ClusterZoneCheckTask::ScriptFunc, "checkable:cr:resolvedMacros:useResolvedMacros");
 
 void ClusterZoneCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr,
-    const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros)
+       const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros)
 {
        ApiListener::Ptr listener = ApiListener::GetInstance();
 
@@ -53,22 +52,22 @@ void ClusterZoneCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const Che
 
        MacroProcessor::ResolverList resolvers;
        if (service)
-               resolvers.push_back(std::make_pair("service", service));
-       resolvers.push_back(std::make_pair("host", host));
-       resolvers.push_back(std::make_pair("command", commandObj));
-       resolvers.push_back(std::make_pair("icinga", IcingaApplication::GetInstance()));
+               resolvers.emplace_back("service", service);
+       resolvers.emplace_back("host", host);
+       resolvers.emplace_back("command", commandObj);
+       resolvers.emplace_back("icinga", IcingaApplication::GetInstance());
 
        String zoneName = MacroProcessor::ResolveMacros("$cluster_zone$", resolvers, checkable->GetLastCheckResult(),
-           NULL, MacroProcessor::EscapeCallback(), resolvedMacros, useResolvedMacros);
+               nullptr, MacroProcessor::EscapeCallback(), resolvedMacros, useResolvedMacros);
 
        String missingLagWarning;
        String missingLagCritical;
 
        double lagWarning = MacroProcessor::ResolveMacros("$cluster_lag_warning$", resolvers, checkable->GetLastCheckResult(),
-           &missingLagWarning, MacroProcessor::EscapeCallback(), resolvedMacros, useResolvedMacros);
+               &missingLagWarning, MacroProcessor::EscapeCallback(), resolvedMacros, useResolvedMacros);
 
        double lagCritical = MacroProcessor::ResolveMacros("$cluster_lag_critical$", resolvers, checkable->GetLastCheckResult(),
-           &missingLagCritical, MacroProcessor::EscapeCallback(), resolvedMacros, useResolvedMacros);
+               &missingLagCritical, MacroProcessor::EscapeCallback(), resolvedMacros, useResolvedMacros);
 
        if (resolvedMacros && !useResolvedMacros)
                return;
@@ -92,7 +91,14 @@ void ClusterZoneCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const Che
        bool connected = false;
        double zoneLag = 0;
 
-       BOOST_FOREACH(const Endpoint::Ptr& endpoint, zone->GetEndpoints()) {
+       double lastMessageSent = 0;
+       double lastMessageReceived = 0;
+       double messagesSentPerSecond = 0;
+       double messagesReceivedPerSecond = 0;
+       double bytesSentPerSecond = 0;
+       double bytesReceivedPerSecond = 0;
+
+       for (const Endpoint::Ptr& endpoint : zone->GetEndpoints()) {
                if (endpoint->GetConnected())
                        connected = true;
 
@@ -100,6 +106,17 @@ void ClusterZoneCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const Che
 
                if (eplag > 0 && eplag > zoneLag)
                        zoneLag = eplag;
+
+               if (endpoint->GetLastMessageSent() > lastMessageSent)
+                       lastMessageSent = endpoint->GetLastMessageSent();
+
+               if (endpoint->GetLastMessageReceived() > lastMessageReceived)
+                       lastMessageReceived = endpoint->GetLastMessageReceived();
+
+               messagesSentPerSecond += endpoint->GetMessagesSentPerSecond();
+               messagesReceivedPerSecond += endpoint->GetMessagesReceivedPerSecond();
+               bytesSentPerSecond += endpoint->GetBytesSentPerSecond();
+               bytesReceivedPerSecond += endpoint->GetBytesReceivedPerSecond();
        }
 
        if (!connected) {
@@ -114,15 +131,21 @@ void ClusterZoneCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const Che
        if (missingLagCritical.IsEmpty() && zoneLag > lagCritical) {
                cr->SetState(ServiceCritical);
                cr->SetOutput("Zone '" + zoneName + "' is connected. Log lag: " + Utility::FormatDuration(zoneLag)
-                   + " greater than critical threshold: " + Utility::FormatDuration(lagCritical));
+                       + " greater than critical threshold: " + Utility::FormatDuration(lagCritical));
        } else if (missingLagWarning.IsEmpty() && zoneLag > lagWarning) {
                cr->SetState(ServiceWarning);
                cr->SetOutput("Zone '" + zoneName + "' is connected. Log lag: " + Utility::FormatDuration(zoneLag)
-                   + " greater than warning threshold: " + Utility::FormatDuration(lagWarning));
+                       + " greater than warning threshold: " + Utility::FormatDuration(lagWarning));
        }
 
        Array::Ptr perfdata = new Array();
        perfdata->Add(new PerfdataValue("slave_lag", zoneLag, false, "s", lagWarning, lagCritical));
+       perfdata->Add(new PerfdataValue("last_messages_sent", lastMessageSent));
+       perfdata->Add(new PerfdataValue("last_messages_received", lastMessageReceived));
+       perfdata->Add(new PerfdataValue("sum_messages_sent_per_second", messagesSentPerSecond));
+       perfdata->Add(new PerfdataValue("sum_messages_received_per_second", messagesReceivedPerSecond));
+       perfdata->Add(new PerfdataValue("sum_bytes_sent_per_second", bytesSentPerSecond));
+       perfdata->Add(new PerfdataValue("sum_bytes_received_per_second", bytesReceivedPerSecond));
        cr->SetPerformanceData(perfdata);
 
        checkable->ProcessCheckResult(cr);