Health Check: Sanitize perfdata.

Refs #5664

diff --git a/components/checker/checkercomponent.cpp b/components/checker/checkercomponent.cpp
index f0ec43f5515d0d0681b0bcec1ae723ab6c224869..2d3bbff77fc902aa4115fb63d3781ac8a2c91ed4 100644 (file)
--- a/components/checker/checkercomponent.cpp
+++ b/components/checker/checkercomponent.cpp
@@ -25,6 +25,7 @@
 #include "base/utility.h"
 #include "base/logger_fwd.h"
 #include "base/exception.h"
+#include "base/convert.h"
 #include "base/statsfunction.h"
 #include <boost/foreach.hpp>
 
@@ -49,8 +50,8 @@ Value CheckerComponent::StatsFunc(Dictionary::Ptr& status, Dictionary::Ptr& perf
                nodes->Set(checker->GetName(), stats);
 
                String perfdata_prefix = "checkercomponent_" + checker->GetName() + "_";
-               perfdata->Set(perfdata_prefix + "idle", idle);
-               perfdata->Set(perfdata_prefix + "pending", pending);
+               perfdata->Set(perfdata_prefix + "idle", Convert::ToDouble(idle));
+               perfdata->Set(perfdata_prefix + "pending", Convert::ToDouble(pending));
        }
 
        status->Set("checkercomponent", nodes);

diff --git a/components/cluster/clusterlistener.cpp b/components/cluster/clusterlistener.cpp
index cc146774e2f52fb0c444762329b2bf273e2a035a..2914966c4fc71c72029e95e72d21dc8715ad7667 100644 (file)
--- a/components/cluster/clusterlistener.cpp
+++ b/components/cluster/clusterlistener.cpp
@@ -1625,8 +1625,8 @@ std::pair<Dictionary::Ptr, Dictionary::Ptr> ClusterListener::GetClusterStatus(vo
        status->Set("not_conn_endpoints", not_connected_endpoints);
 
        perfdata->Set("num_endpoints", count_endpoints);
-       perfdata->Set("num_conn_endpoints", connected_endpoints->GetLength());
-       perfdata->Set("num_not_conn_endpoints", not_connected_endpoints->GetLength());
+       perfdata->Set("num_conn_endpoints", Convert::ToDouble(connected_endpoints->GetLength()));
+       perfdata->Set("num_not_conn_endpoints", Convert::ToDouble(not_connected_endpoints->GetLength()));
 
        return std::make_pair(status, perfdata);
 }

diff --git a/components/db_ido_mysql/idomysqlconnection.cpp b/components/db_ido_mysql/idomysqlconnection.cpp
index 9485ae2d2aa580f0a1e4be12fe982f795771b14b..bd8938f64d2451c7c27bb749d4da4f1e20f6227e 100644 (file)
--- a/components/db_ido_mysql/idomysqlconnection.cpp
+++ b/components/db_ido_mysql/idomysqlconnection.cpp
@@ -52,7 +52,7 @@ Value IdoMysqlConnection::StatsFunc(Dictionary::Ptr& status, Dictionary::Ptr& pe
 
                nodes->Set(idomysqlconnection->GetName(), stats);
 
-               perfdata->Set("idomysqlconnection_" + idomysqlconnection->GetName() + "_query_queue_items", items);
+               perfdata->Set("idomysqlconnection_" + idomysqlconnection->GetName() + "_query_queue_items", Convert::ToDouble(items));
        }
 
        status->Set("idomysqlconnection", nodes);

diff --git a/components/db_ido_pgsql/idopgsqlconnection.cpp b/components/db_ido_pgsql/idopgsqlconnection.cpp
index d8ae808b2b609560b10c9ec3b7d0b515597e6c5d..43917dff00772f850b721db66727fd21b21bf602 100644 (file)
--- a/components/db_ido_pgsql/idopgsqlconnection.cpp
+++ b/components/db_ido_pgsql/idopgsqlconnection.cpp
@@ -54,7 +54,7 @@ Value IdoPgsqlConnection::StatsFunc(Dictionary::Ptr& status, Dictionary::Ptr& pe
 
                nodes->Set(idopgsqlconnection->GetName(), stats);
 
-               perfdata->Set("idopgsqlconnection_" + idopgsqlconnection->GetName() + "_query_queue_items", items);
+               perfdata->Set("idopgsqlconnection_" + idopgsqlconnection->GetName() + "_query_queue_items", Convert::ToDouble(items));
        }
 
        status->Set("idopgsqlconnection", nodes);

diff --git a/components/livestatus/listener.cpp b/components/livestatus/listener.cpp
index f9b704f44c2ef05c7acda27f45b5fe509f17b73c..dd04eacf735cf3cdba9f6ed449271fbdd92b0fbc 100644 (file)
--- a/components/livestatus/listener.cpp
+++ b/components/livestatus/listener.cpp
@@ -53,7 +53,7 @@ Value LivestatusListener::StatsFunc(Dictionary::Ptr& status, Dictionary::Ptr& pe
 
                nodes->Set(livestatuslistener->GetName(), stats);
 
-               perfdata->Set("livestatuslistener_" + livestatuslistener->GetName() + "_connections", l_Connections);
+               perfdata->Set("livestatuslistener_" + livestatuslistener->GetName() + "_connections", Convert::ToDouble(l_Connections));
        }
 
        status->Set("livestatuslistener", nodes);

diff --git a/lib/methods/nullchecktask.cpp b/lib/methods/nullchecktask.cpp
index cf17dd940340225b7ad51b930331058ab13e7d9b..3f621e78f66b623fb7754b0d32ed620bc76aa7a8 100644 (file)
--- a/lib/methods/nullchecktask.cpp
+++ b/lib/methods/nullchecktask.cpp
@@ -36,7 +36,7 @@ CheckResult::Ptr NullCheckTask::ScriptFunc(const Service::Ptr&)
        output += Utility::GetHostName();
 
        Dictionary::Ptr perfdata = make_shared<Dictionary>();
-       perfdata->Set("time", Utility::GetTime());
+       perfdata->Set("time", Convert::ToDouble(Utility::GetTime()));
 
        CheckResult::Ptr cr = make_shared<CheckResult>();
        cr->SetOutput(output);

diff --git a/lib/methods/randomchecktask.cpp b/lib/methods/randomchecktask.cpp
index 555139f19a84c2fb9f3131e99790b5ab4e31e35e..8aa90dee326fdf19244a02847390a110d9e3a43e 100644 (file)
--- a/lib/methods/randomchecktask.cpp
+++ b/lib/methods/randomchecktask.cpp
@@ -37,7 +37,7 @@ CheckResult::Ptr RandomCheckTask::ScriptFunc(const Service::Ptr&)
        output += Utility::GetHostName();
 
        Dictionary::Ptr perfdata = make_shared<Dictionary>();
-       perfdata->Set("time", Utility::GetTime());
+       perfdata->Set("time", Convert::ToDouble(Utility::GetTime()));
 
        CheckResult::Ptr cr = make_shared<CheckResult>();
        cr->SetOutput(output);