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

Merge pull request #7652 from Icinga/bugfix/icingadb-output-null

Browse Source 
IcingaDB#SendStatusUpdate(): don't always set icinga:history:stream:state#{,long_}output
This commit is contained in:
Noah Hilverling 2019-11-27 14:29:26 +01:00 committed by GitHub
commit 0652aa0a6f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lib/icingadb/icingadb-objects.cpp
View File

@ -90,19 +90,6 @@ void IcingaDB::ConfigStaticInitialize()
Checkable::OnFlappingChanged.connect(&IcingaDB::FlappingChangedHandler); Checkable::OnFlappingChanged.connect(&IcingaDB::FlappingChangedHandler);
} }
static std::pair<String, String> SplitOutput(String output)
{
String longOutput;
auto pos (output.Find("\n"));
if (pos != String::NPos) {
longOutput = output.SubStr(pos + 1u);
output.erase(output.Begin() + pos, output.End());
}
return {std::move(output), std::move(longOutput)};
}
void IcingaDB::UpdateAllConfigObjects() void IcingaDB::UpdateAllConfigObjects()
{ {
double startTime = Utility::GetTime(); double startTime = Utility::GetTime();
@ -1171,8 +1158,6 @@ void IcingaDB::SendStatusUpdate(const ConfigObject::Ptr& object, const CheckResu
m_Rcon->FireAndForgetQuery(std::move(streamadd)); m_Rcon->FireAndForgetQuery(std::move(streamadd));
auto output (SplitOutput(cr ? cr->GetOutput() : ""));
int hard_state; int hard_state;
if (!cr) { if (!cr) {
hard_state = 99; hard_state = 99;
@ -1190,8 +1175,6 @@ void IcingaDB::SendStatusUpdate(const ConfigObject::Ptr& object, const CheckResu
"attempt", Convert::ToString(checkable->GetCheckAttempt()), "attempt", Convert::ToString(checkable->GetCheckAttempt()),
"previous_soft_state", Convert::ToString(GetPreviousState(checkable, service, StateTypeSoft)), "previous_soft_state", Convert::ToString(GetPreviousState(checkable, service, StateTypeSoft)),
"previous_hard_state", Convert::ToString(GetPreviousState(checkable, service, StateTypeHard)), "previous_hard_state", Convert::ToString(GetPreviousState(checkable, service, StateTypeHard)),
"output", Utility::ValidateUTF8(std::move(output.first)),
"long_output", Utility::ValidateUTF8(std::move(output.second)),
"max_check_attempts", Convert::ToString(checkable->GetMaxCheckAttempts()), "max_check_attempts", Convert::ToString(checkable->GetMaxCheckAttempts()),
"event_time", Convert::ToString(TimestampToMilliseconds(cr ? cr->GetExecutionEnd() : Utility::GetTime())), "event_time", Convert::ToString(TimestampToMilliseconds(cr ? cr->GetExecutionEnd() : Utility::GetTime())),
"event_id", Utility::NewUniqueID(), "event_id", Utility::NewUniqueID(),
@ -1199,6 +1182,19 @@ void IcingaDB::SendStatusUpdate(const ConfigObject::Ptr& object, const CheckResu
}); });
if (cr) { if (cr) {
auto output (cr->GetOutput());
auto pos (output.Find("\n"));
if (pos != String::NPos) {
auto longOutput (output.SubStr(pos + 1u));
output.erase(output.Begin() + pos, output.End());
xAdd.emplace_back("long_output");
xAdd.emplace_back(Utility::ValidateUTF8(std::move(longOutput)));
}
xAdd.emplace_back("output");
xAdd.emplace_back(Utility::ValidateUTF8(std::move(output)));
xAdd.emplace_back("check_source"); xAdd.emplace_back("check_source");
xAdd.emplace_back(cr->GetCheckSource()); xAdd.emplace_back(cr->GetCheckSource());
} }