[icinga-checkins] icinga.org: icinga2/master: Fix min/max execution_time

git at icinga.org git at icinga.org
Tue Jul 26 09:56:32 CEST 2016


Module: icinga2
Branch: master
Commit: 54eb9540b1cfa521aa229e4811e716fae6266089
URL:    https://git.icinga.org/?p=icinga2.git;a=commit;h=54eb9540b1cfa521aa229e4811e716fae6266089

Author: Rune Darrud <theflyingcorpse at gmail.com>
Date:   Mon Jul 25 17:28:24 2016 +0200

Fix min/max execution_time

fixes #12225

Signed-off-by: Gunnar Beutner <gunnar.beutner at netways.de>

---

 lib/icinga/cib.cpp              |    4 ++--
 lib/methods/icingachecktask.cpp |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/icinga/cib.cpp b/lib/icinga/cib.cpp
index 1ea4233..e8724c5 100644
--- a/lib/icinga/cib.cpp
+++ b/lib/icinga/cib.cpp
@@ -312,8 +312,8 @@ void CIB::StatsFunc(const Dictionary::Ptr& status, const Array::Ptr& perfdata) {
 	status->Set("min_latency", scs.min_latency);
 	status->Set("max_latency", scs.max_latency);
 	status->Set("avg_latency", scs.avg_latency);
-	status->Set("min_execution_time", scs.min_latency);
-	status->Set("max_execution_time", scs.max_latency);
+	status->Set("min_execution_time", scs.min_execution_time);
+	status->Set("max_execution_time", scs.max_execution_time);
 	status->Set("avg_execution_time", scs.avg_execution_time);
 
 	ServiceStatistics ss = CalculateServiceStats();
diff --git a/lib/methods/icingachecktask.cpp b/lib/methods/icingachecktask.cpp
index 89642a3..d39705d 100644
--- a/lib/methods/icingachecktask.cpp
+++ b/lib/methods/icingachecktask.cpp
@@ -68,8 +68,8 @@ void IcingaCheckTask::ScriptFunc(const Checkable::Ptr& service, const CheckResul
 	perfdata->Add(new PerfdataValue("min_latency", scs.min_latency));
 	perfdata->Add(new PerfdataValue("max_latency", scs.max_latency));
 	perfdata->Add(new PerfdataValue("avg_latency", scs.avg_latency));
-	perfdata->Add(new PerfdataValue("min_execution_time", scs.min_latency));
-	perfdata->Add(new PerfdataValue("max_execution_time", scs.max_latency));
+	perfdata->Add(new PerfdataValue("min_execution_time", scs.min_execution_time));
+	perfdata->Add(new PerfdataValue("max_execution_time", scs.max_execution_time));
 	perfdata->Add(new PerfdataValue("avg_execution_time", scs.avg_execution_time));
 
 	ServiceStatistics ss = CIB::CalculateServiceStats();



More information about the icinga-checkins mailing list