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

livestatus: contacts table fixes (ignore special custom attr) 

refs #4372
This commit is contained in:
Michael Friedrich 2013-07-16 14:56:32 +02:00
parent d5579d9e2f
commit 32a1f50116
1 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
components/livestatus/contactstable.cpp
View File

@ -141,7 +141,7 @@ Value ContactsTable::InHostNotificationPeriodAccessor(const Value& row)
if (!timeperiod) if (!timeperiod)
return Empty; return Empty;
return timeperiod->IsInside(Utility::GetTime()); return (timeperiod->IsInside(Utility::GetTime()) ? 1 : 0);
} }
Value ContactsTable::InServiceNotificationPeriodAccessor(const Value& row) Value ContactsTable::InServiceNotificationPeriodAccessor(const Value& row)
@ -151,7 +151,7 @@ Value ContactsTable::InServiceNotificationPeriodAccessor(const Value& row)
if (!timeperiod) if (!timeperiod)
return Empty; return Empty;
return timeperiod->IsInside(Utility::GetTime()); return (timeperiod->IsInside(Utility::GetTime()) ? 1 : 0);
} }
Value ContactsTable::CustomVariableNamesAccessor(const Value& row) Value ContactsTable::CustomVariableNamesAccessor(const Value& row)
@ -167,6 +167,15 @@ Value ContactsTable::CustomVariableNamesAccessor(const Value& row)
String key; String key;
Value value; Value value;
BOOST_FOREACH(boost::tie(key, value), custom) { BOOST_FOREACH(boost::tie(key, value), custom) {
if (key == "notes" ||
key == "action_url" ||
key == "notes_url" ||
key == "icon_image" ||
key == "icon_image_alt" ||
key == "statusmap_image" ||
key == "2d_coords")
continue;
cv->Add(key); cv->Add(key);
} }
@ -186,6 +195,15 @@ Value ContactsTable::CustomVariableValuesAccessor(const Value& row)
String key; String key;
Value value; Value value;
BOOST_FOREACH(boost::tie(key, value), custom) { BOOST_FOREACH(boost::tie(key, value), custom) {
if (key == "notes" ||
key == "action_url" ||
key == "notes_url" ||
key == "icon_image" ||
key == "icon_image_alt" ||
key == "statusmap_image" ||
key == "2d_coords")
continue;
cv->Add(value); cv->Add(value);
} }
@ -205,6 +223,15 @@ Value ContactsTable::CustomVariablesAccessor(const Value& row)
String key; String key;
Value value; Value value;
BOOST_FOREACH(boost::tie(key, value), custom) { BOOST_FOREACH(boost::tie(key, value), custom) {
if (key == "notes" ||
key == "action_url" ||
key == "notes_url" ||
key == "icon_image" ||
key == "icon_image_alt" ||
key == "statusmap_image" ||
key == "2d_coords")
continue;
Array::Ptr key_val = boost::make_shared<Array>(); Array::Ptr key_val = boost::make_shared<Array>();
key_val->Add(key); key_val->Add(key);
key_val->Add(value); key_val->Add(value);