tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-04-08 17:05:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Health Check: Sanitize perfdata.

Browse Source 
Refs #5664
This commit is contained in:
Michael Friedrich 2014-03-10 18:01:26 +01:00
parent 3df6ed786f
commit 09d6b6fefa
7 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
components/checker/checkercomponent.cpp
View File

@ -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);

4
components/cluster/clusterlistener.cpp
View File

@ -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);
}

2
components/db_ido_mysql/idomysqlconnection.cpp
View File

@ -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);

2
components/db_ido_pgsql/idopgsqlconnection.cpp
View File

@ -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);

2
components/livestatus/listener.cpp
View File

@ -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);

2
lib/methods/nullchecktask.cpp
View File

@ -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);

2
lib/methods/randomchecktask.cpp
View File

@ -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);