tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GelfWriter: Change _state to human-readable string 

refs #7619
This commit is contained in:
Michael Friedrich 2014-11-12 17:58:13 +01:00
parent 07c9701b83
commit 43267d7759
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/perfdata/gelfwriter.cpp
View File

@ -100,7 +100,7 @@ void GelfWriter::CheckResultHandler(const Checkable::Ptr& checkable, const Check
fields->Set("_hostname", host->GetName()); fields->Set("_hostname", host->GetName());
fields->Set("_type", "CHECK RESULT"); fields->Set("_type", "CHECK RESULT");
fields->Set("_state", service ? static_cast<int>(service->GetState()) : static_cast<int>(host->GetState())); fields->Set("_state", service ? Service::StateToString(service->GetState()) : Host::StateToString(host->GetState()));
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());
@ -151,7 +151,7 @@ void GelfWriter::NotificationToUserHandler(const Notification::Ptr& notification
fields->Set("short_message", "(" << (host->IsReachable() ? Host::StateToString(host->GetState()) : "UNREACHABLE") << ")"); fields->Set("short_message", "(" << (host->IsReachable() ? Host::StateToString(host->GetState()) : "UNREACHABLE") << ")");
} }
fields->Set("_state", service ? static_cast<int>(service->GetState()) : static_cast<int>(host->GetState())); fields->Set("_state", service ? Service::StateToString(service->GetState()) : Host::StateToString(host->GetState()));
fields->Set("_hostname", host->GetName()); fields->Set("_hostname", host->GetName());
fields->Set("_command", command_name); fields->Set("_command", command_name);
@ -174,7 +174,7 @@ void GelfWriter::StateChangeHandler(const Checkable::Ptr& checkable, const Check
Dictionary::Ptr fields = new Dictionary(); Dictionary::Ptr fields = new Dictionary();
fields->Set("_state", service ? static_cast<int>(service->GetState()) : static_cast<int>(host->GetState())); fields->Set("_state", service ? Service::StateToString(service->GetState()) : Host::StateToString(host->GetState()));
fields->Set("_type", "STATE CHANGE"); fields->Set("_type", "STATE CHANGE");
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());