tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-26 15:14:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix performance data processing in GelfWriter feature

Browse Source 
Includes fixes for possible crashes on empty check results.

fixes #4666
This commit is contained in:
Michael Friedrich 2017-05-15 13:46:43 +02:00
parent b1d54cd020
commit 2338db5f6a
1 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
lib/perfdata/gelfwriter.cpp
View File

@ -99,7 +99,7 @@ void GelfWriter::CheckResultHandler(const Checkable::Ptr& checkable, const Check
Host::Ptr host; Host::Ptr host;
Service::Ptr service; Service::Ptr service;
tie(host, service) = GetHostService(checkable); tie(host, service) = GetHostService(checkable);
double ts = cr->GetExecutionEnd(); double ts = Utility::GetTime();
Dictionary::Ptr fields = new Dictionary(); Dictionary::Ptr fields = new Dictionary();
@ -120,17 +120,18 @@ void GelfWriter::CheckResultHandler(const Checkable::Ptr& checkable, const Check
fields->Set("_current_check_attempt", checkable->GetCheckAttempt()); fields->Set("_current_check_attempt", checkable->GetCheckAttempt());
fields->Set("_max_check_attempts", checkable->GetMaxCheckAttempts()); fields->Set("_max_check_attempts", checkable->GetMaxCheckAttempts());
fields->Set("_latency", cr->CalculateLatency()); fields->Set("_reachable", checkable->IsReachable());
fields->Set("_execution_time", cr->CalculateExecutionTime());
fields->Set("_reachable", checkable->IsReachable());
if (cr) { if (cr) {
fields->Set("_latency", cr->CalculateLatency());
fields->Set("_execution_time", cr->CalculateExecutionTime());
fields->Set("short_message", CompatUtility::GetCheckResultOutput(cr)); fields->Set("short_message", CompatUtility::GetCheckResultOutput(cr));
fields->Set("full_message", cr->GetOutput()); fields->Set("full_message", cr->GetOutput());
fields->Set("_check_source", cr->GetCheckSource()); fields->Set("_check_source", cr->GetCheckSource());
ts = cr->GetExecutionEnd();
} }
if (GetEnableSendPerfdata()) { if (cr && GetEnableSendPerfdata()) {
Array::Ptr perfdata = cr->GetPerformanceData(); Array::Ptr perfdata = cr->GetPerformanceData();
if (perfdata) { if (perfdata) {
@ -143,29 +144,29 @@ void GelfWriter::CheckResultHandler(const Checkable::Ptr& checkable, const Check
else { else {
try { try {
pdv = PerfdataValue::Parse(val); pdv = PerfdataValue::Parse(val);
String escaped_key = pdv->GetLabel();
boost::replace_all(escaped_key, " ", "_");
boost::replace_all(escaped_key, ".", "_");
boost::replace_all(escaped_key, "\\", "_");
boost::algorithm::replace_all(escaped_key, "::", ".");
fields->Set("_" + escaped_key, pdv->GetValue());
if (pdv->GetMin())
fields->Set("_" + escaped_key + "_min", pdv->GetMin());
if (pdv->GetMax())
fields->Set("_" + escaped_key + "_max", pdv->GetMax());
if (pdv->GetWarn())
fields->Set("_" + escaped_key + "_warn", pdv->GetWarn());
if (pdv->GetCrit())
fields->Set("_" + escaped_key + "_crit", pdv->GetCrit());
} catch (const std::exception&) { } catch (const std::exception&) {
Log(LogWarning, "GelfWriter") Log(LogWarning, "GelfWriter")
<< "Ignoring invalid perfdata value: '" << val << "' for object '" << "Ignoring invalid perfdata value: '" << val << "' for object '"
<< checkable-GetName() << "'."; << checkable->GetName() << "'.";
} }
} }
String escaped_key = pdv->GetLabel();
boost::replace_all(escaped_key, " ", "_");
boost::replace_all(escaped_key, ".", "_");
boost::replace_all(escaped_key, "\\", "_");
boost::algorithm::replace_all(escaped_key, "::", ".");
fields->Set("_" + escaped_key, pdv->GetValue());
if (pdv->GetMin())
fields->Set("_" + escaped_key + "_min", pdv->GetMin());
if (pdv->GetMax())
fields->Set("_" + escaped_key + "_max", pdv->GetMax());
if (pdv->GetWarn())
fields->Set("_" + escaped_key + "_warn", pdv->GetWarn());
if (pdv->GetCrit())
fields->Set("_" + escaped_key + "_crit", pdv->GetCrit());
} }
} }
} }
@ -185,7 +186,7 @@ void GelfWriter::NotificationToUserHandler(const Notification::Ptr& notification
Host::Ptr host; Host::Ptr host;
Service::Ptr service; Service::Ptr service;
tie(host, service) = GetHostService(checkable); tie(host, service) = GetHostService(checkable);
double ts = cr->GetExecutionEnd(); double ts = Utility::GetTime();
String notification_type_str = Notification::NotificationTypeToString(notification_type); String notification_type_str = Notification::NotificationTypeToString(notification_type);
@ -197,8 +198,10 @@ void GelfWriter::NotificationToUserHandler(const Notification::Ptr& notification
String output; String output;
if (cr) if (cr) {
output = CompatUtility::GetCheckResultOutput(cr); output = CompatUtility::GetCheckResultOutput(cr);
ts = cr->GetExecutionEnd();
}
Dictionary::Ptr fields = new Dictionary(); Dictionary::Ptr fields = new Dictionary();
@ -231,7 +234,7 @@ void GelfWriter::StateChangeHandler(const Checkable::Ptr& checkable, const Check
Host::Ptr host; Host::Ptr host;
Service::Ptr service; Service::Ptr service;
tie(host, service) = GetHostService(checkable); tie(host, service) = GetHostService(checkable);
double ts = cr->GetExecutionEnd(); double ts = Utility::GetTime();
Dictionary::Ptr fields = new Dictionary(); Dictionary::Ptr fields = new Dictionary();
@ -255,6 +258,7 @@ void GelfWriter::StateChangeHandler(const Checkable::Ptr& checkable, const Check
fields->Set("short_message", CompatUtility::GetCheckResultOutput(cr)); fields->Set("short_message", CompatUtility::GetCheckResultOutput(cr));
fields->Set("full_message", cr->GetOutput()); fields->Set("full_message", cr->GetOutput());
fields->Set("_check_source", cr->GetCheckSource()); fields->Set("_check_source", cr->GetCheckSource());
ts = cr->GetExecutionEnd();
} }
SendLogMessage(ComposeGelfMessage(fields, GetSource(), ts)); SendLogMessage(ComposeGelfMessage(fields, GetSource(), ts));