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

compatutility: Add contact(group) getters.

Browse Source 
refs #4735
This commit is contained in:
Michael Friedrich 2013-10-01 15:37:50 +02:00
parent de8522f500
commit b2f13c37e4
4 changed files with 52 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
components/livestatus/hoststable.cpp
View File

@ -25,6 +25,7 @@
#include "icinga/timeperiod.h" #include "icinga/timeperiod.h"
#include "icinga/macroprocessor.h" #include "icinga/macroprocessor.h"
#include "icinga/icingaapplication.h" #include "icinga/icingaapplication.h"
#include "icinga/compatutility.h"
#include "base/dynamictype.h" #include "base/dynamictype.h"
#include "base/objectlock.h" #include "base/objectlock.h"
#include "base/convert.h" #include "base/convert.h"
@ -1087,28 +1088,7 @@ Value HostsTable::ContactsAccessor(const Value& row)
if (!hc) if (!hc)
return Empty; return Empty;
std::set<User::Ptr> allUsers; return CompatUtility::GetServiceNotificationUsers(hc);
std::set<User::Ptr> users;
Array::Ptr contacts = boost::make_shared<Array>();
BOOST_FOREACH(const Notification::Ptr& notification, hc->GetNotifications()) {
ObjectLock olock(notification);
users = notification->GetUsers();
std::copy(users.begin(), users.end(), std::inserter(allUsers, allUsers.begin()));
BOOST_FOREACH(const UserGroup::Ptr& ug, notification->GetUserGroups()) {
std::set<User::Ptr> members = ug->GetMembers();
std::copy(members.begin(), members.end(), std::inserter(allUsers, allUsers.begin()));
}
}
BOOST_FOREACH(const User::Ptr& user, allUsers) {
contacts->Add(user->GetName());
}
return contacts;
} }
Value HostsTable::DowntimesAccessor(const Value& row) Value HostsTable::DowntimesAccessor(const Value& row)
@ -1601,18 +1581,7 @@ Value HostsTable::ContactGroupsAccessor(const Value& row)
if (!hc) if (!hc)
return Empty; return Empty;
/* XXX Service -> Notifications -> UserGroups */ return CompatUtility::GetServiceNotificationUserGroups(hc);
Array::Ptr contactgroups = boost::make_shared<Array>();
BOOST_FOREACH(const Notification::Ptr& notification, hc->GetNotifications()) {
ObjectLock olock(notification);
BOOST_FOREACH(const UserGroup::Ptr& ug, notification->GetUserGroups()) {
contactgroups->Add(ug->GetName());
}
}
return contactgroups;
} }
Value HostsTable::ServicesAccessor(const Value& row) Value HostsTable::ServicesAccessor(const Value& row)

38
components/livestatus/servicestable.cpp
View File

@ -25,6 +25,7 @@
#include "icinga/timeperiod.h" #include "icinga/timeperiod.h"
#include "icinga/macroprocessor.h" #include "icinga/macroprocessor.h"
#include "icinga/icingaapplication.h" #include "icinga/icingaapplication.h"
#include "icinga/compatutility.h"
#include "base/dynamictype.h" #include "base/dynamictype.h"
#include "base/objectlock.h" #include "base/objectlock.h"
#include "base/convert.h" #include "base/convert.h"
@ -750,29 +751,7 @@ Value ServicesTable::InNotificationPeriodAccessor(const Value& row)
Value ServicesTable::ContactsAccessor(const Value& row) Value ServicesTable::ContactsAccessor(const Value& row)
{ {
/* XXX Service -> Notifications -> (Users + UserGroups -> Users) */ return CompatUtility::GetServiceNotificationUsers(static_cast<Service::Ptr>(row));
std::set<User::Ptr> allUsers;
std::set<User::Ptr> users;
Array::Ptr contacts = boost::make_shared<Array>();
BOOST_FOREACH(const Notification::Ptr& notification, static_cast<Service::Ptr>(row)->GetNotifications()) {
ObjectLock olock(notification);
users = notification->GetUsers();
std::copy(users.begin(), users.end(), std::inserter(allUsers, allUsers.begin()));
BOOST_FOREACH(const UserGroup::Ptr& ug, notification->GetUserGroups()) {
std::set<User::Ptr> members = ug->GetMembers();
std::copy(members.begin(), members.end(), std::inserter(allUsers, allUsers.begin()));
}
}
BOOST_FOREACH(const User::Ptr& user, allUsers) {
contacts->Add(user->GetName());
}
return contacts;
} }
Value ServicesTable::DowntimesAccessor(const Value& row) Value ServicesTable::DowntimesAccessor(const Value& row)
@ -1023,18 +1002,7 @@ Value ServicesTable::GroupsAccessor(const Value& row)
Value ServicesTable::ContactGroupsAccessor(const Value& row) Value ServicesTable::ContactGroupsAccessor(const Value& row)
{ {
/* XXX Service -> Notifications -> UserGroups */ return CompatUtility::GetServiceNotificationUserGroups(static_cast<Service::Ptr>(row));
Array::Ptr contactgroups = boost::make_shared<Array>();
BOOST_FOREACH(const Notification::Ptr& notification, static_cast<Service::Ptr>(row)->GetNotifications()) {
ObjectLock olock(notification);
BOOST_FOREACH(const UserGroup::Ptr& ug, notification->GetUserGroups()) {
contactgroups->Add(ug->GetName());
}
}
return contactgroups;
} }

43
lib/icinga/compatutility.cpp
View File

@ -483,6 +483,49 @@ Dictionary::Ptr CompatUtility::GetCustomVariableConfig(const DynamicObject::Ptr&
return customvars; return customvars;
} }
Value CompatUtility::GetServiceNotificationUsers(const Service::Ptr& service)
{
/* Service -> Notifications -> (Users + UserGroups -> Users) */
std::set<User::Ptr> allUsers;
std::set<User::Ptr> users;
Array::Ptr contacts = boost::make_shared<Array>();
BOOST_FOREACH(const Notification::Ptr& notification, service->GetNotifications()) {
ObjectLock olock(notification);
users = notification->GetUsers();
std::copy(users.begin(), users.end(), std::inserter(allUsers, allUsers.begin()));
BOOST_FOREACH(const UserGroup::Ptr& ug, notification->GetUserGroups()) {
std::set<User::Ptr> members = ug->GetMembers();
std::copy(members.begin(), members.end(), std::inserter(allUsers, allUsers.begin()));
}
}
BOOST_FOREACH(const User::Ptr& user, allUsers) {
contacts->Add(user->GetName());
}
return contacts;
}
Value CompatUtility::GetServiceNotificationUserGroups(const Service::Ptr& service)
{
/* Service -> Notifications -> UserGroups */
Array::Ptr contactgroups = boost::make_shared<Array>();
BOOST_FOREACH(const Notification::Ptr& notification, service->GetNotifications()) {
ObjectLock olock(notification);
BOOST_FOREACH(const UserGroup::Ptr& ug, notification->GetUserGroups()) {
contactgroups->Add(ug->GetName());
}
}
return contactgroups;
}
Dictionary::Ptr CompatUtility::GetCheckResultOutput(const Dictionary::Ptr& cr) Dictionary::Ptr CompatUtility::GetCheckResultOutput(const Dictionary::Ptr& cr)
{ {
if (!cr) if (!cr)

3
lib/icinga/compatutility.h
View File

@ -56,6 +56,9 @@ public:
static Dictionary::Ptr GetCustomVariableConfig(const DynamicObject::Ptr& object); static Dictionary::Ptr GetCustomVariableConfig(const DynamicObject::Ptr& object);
static Value GetServiceNotificationUsers(const Service::Ptr& service);
static Value GetServiceNotificationUserGroups(const Service::Ptr& service);
static Dictionary::Ptr GetCheckResultOutput(const Dictionary::Ptr& cr); static Dictionary::Ptr GetCheckResultOutput(const Dictionary::Ptr& cr);
static String GetCheckResultPerfdata(const Dictionary::Ptr& cr); static String GetCheckResultPerfdata(const Dictionary::Ptr& cr);