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

ido: Add missing check_type for host/service status tables. 

refs #4380
This commit is contained in:
Michael Friedrich 2013-08-09 12:35:42 +02:00
parent c34540676e
commit d562e98779
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/icinga/compatutility.cpp
View File

@ -268,6 +268,7 @@ Dictionary::Ptr CompatUtility::GetServiceStatusAttributes(const Service::Ptr& se
attr->Set("plugin_output", output); attr->Set("plugin_output", output);
attr->Set("long_plugin_output", long_output); attr->Set("long_plugin_output", long_output);
attr->Set("performance_data", perfdata); attr->Set("performance_data", perfdata);
attr->Set("check_type", (service->GetEnableActiveChecks() ? 1 : 0));
attr->Set("last_check", schedule_end); attr->Set("last_check", schedule_end);
attr->Set("next_check", service->GetNextCheck()); attr->Set("next_check", service->GetNextCheck());
attr->Set("current_attempt", service->GetCurrentCheckAttempt()); attr->Set("current_attempt", service->GetCurrentCheckAttempt());

2
lib/ido/hostdbobject.cpp
View File

@ -144,7 +144,7 @@ Dictionary::Ptr HostDbObject::GetStatusFields(void) const
fields->Set("max_check_attempts", attrs->Get("max_attempts")); fields->Set("max_check_attempts", attrs->Get("max_attempts"));
fields->Set("last_check", DbValue::FromTimestamp(attrs->Get("last_check"))); fields->Set("last_check", DbValue::FromTimestamp(attrs->Get("last_check")));
fields->Set("next_check", DbValue::FromTimestamp(attrs->Get("next_check"))); fields->Set("next_check", DbValue::FromTimestamp(attrs->Get("next_check")));
fields->Set("check_type", Empty); fields->Set("check_type", attrs->Get("check_type"));
fields->Set("last_state_change", DbValue::FromTimestamp(attrs->Get("last_state_change"))); fields->Set("last_state_change", DbValue::FromTimestamp(attrs->Get("last_state_change")));
fields->Set("last_hard_state_change", DbValue::FromTimestamp(attrs->Get("last_hard_state_change"))); fields->Set("last_hard_state_change", DbValue::FromTimestamp(attrs->Get("last_hard_state_change")));
fields->Set("last_time_up", DbValue::FromTimestamp(attrs->Get("last_time_up"))); fields->Set("last_time_up", DbValue::FromTimestamp(attrs->Get("last_time_up")));

2
lib/ido/servicedbobject.cpp
View File

@ -135,7 +135,7 @@ Dictionary::Ptr ServiceDbObject::GetStatusFields(void) const
fields->Set("max_check_attempts", attrs->Get("max_attempts")); fields->Set("max_check_attempts", attrs->Get("max_attempts"));
fields->Set("last_check", DbValue::FromTimestamp(attrs->Get("last_check"))); fields->Set("last_check", DbValue::FromTimestamp(attrs->Get("last_check")));
fields->Set("next_check", DbValue::FromTimestamp(attrs->Get("next_check"))); fields->Set("next_check", DbValue::FromTimestamp(attrs->Get("next_check")));
fields->Set("check_type", Empty); fields->Set("check_type", attrs->Get("check_type"));
fields->Set("last_state_change", DbValue::FromTimestamp(attrs->Get("last_state_change"))); fields->Set("last_state_change", DbValue::FromTimestamp(attrs->Get("last_state_change")));
fields->Set("last_hard_state_change", DbValue::FromTimestamp(attrs->Get("last_hard_state_change"))); fields->Set("last_hard_state_change", DbValue::FromTimestamp(attrs->Get("last_hard_state_change")));
fields->Set("last_time_ok", DbValue::FromTimestamp(attrs->Get("last_time_ok"))); fields->Set("last_time_ok", DbValue::FromTimestamp(attrs->Get("last_time_ok")));