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 87cd759ff8957a6cbd23ef174cbdc7939ff056d5..635f7fc8c3e07cce729647cc7ff00d0a54870ca3 100644 (file)
--- a/lib/methods/clusterzonechecktask.cpp
+++ b/lib/methods/clusterzonechecktask.cpp
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Icinga 2                                                                   *
- * Copyright (C) 2012-2017 Icinga Development Team (https://www.icinga.com/)  *
+ * 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                *
@@ -32,7 +32,7 @@ using namespace icinga;
 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();
 
@@ -58,16 +58,16 @@ void ClusterZoneCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const Che
        resolvers.emplace_back("icinga", IcingaApplication::GetInstance());
 
        String zoneName = MacroProcessor::ResolveMacros("$cluster_zone$", resolvers, checkable->GetLastCheckResult(),
-           nullptr, 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;
@@ -131,11 +131,11 @@ 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();