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

compat: Add more host attributes, refactor contacts getter.

This commit is contained in:
Michael Friedrich 2013-10-02 21:09:13 +02:00
parent 972a4f8b9a
commit bfa8cf789b
8 changed files with 122 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
components/compat/statusdatawriter.cpp
View File

@ -270,8 +270,16 @@ void StatusDataWriter::DumpHostObject(std::ostream& fp, const Host::Ptr& host)
{
fp << "define host {" << "\n"
<< "\t" << "host_name" << "\t" << host->GetName() << "\n"
<< "\t" << "display_name" << "\t" << host->GetDisplayName() << "\n"
<< "\t" << "alias" << "\t" << host->GetDisplayName() << "\n";
Dictionary::Ptr macros = host->GetMacros();
if (macros) {
fp << "\t" << "address" << "\t" << macros->Get("address") << "\n"
<< "\t" << "address6" << "\t" << macros->Get("address6") << "\n";
}
std::set<Host::Ptr> parents = host->GetParentHosts();
if (!parents.empty()) {
@ -298,8 +306,31 @@ void StatusDataWriter::DumpHostObject(std::ostream& fp, const Host::Ptr& host)
fp << "\t" << "check_command" << "\t" << "check_" << checkcommand->GetName() << "\n";
EventCommand::Ptr eventcommand = hc->GetEventCommand();
if (eventcommand)
fp << "\t" << "event_handler" << "\t" << "event_" << eventcommand->GetName() << "\n";
if (eventcommand) {
fp << "\t" << "event_handler_enabled" << "\t" << 1 << "\n"
<< "\t" << "event_handler" << "\t" << "event_" << eventcommand->GetName() << "\n";
} else {
fp << "\t" << "event_handler_enabled" << "\t" << 0 << "\n";
}
TimePeriod::Ptr check_period = hc->GetCheckPeriod();
if (check_period)
fp << "\t" << "check_period" << "\t" << check_period->GetName() << "\n";
fp << "\t" << "contacts" << "\t";
DumpNameList(fp, CompatUtility::GetServiceNotificationUsers(hc));
fp << "\n";
fp << "\t" << "contact_groups" << "\t";
DumpNameList(fp, CompatUtility::GetServiceNotificationUserGroups(hc));
fp << "\n";
fp << "\t" << "initial_state" << "\t" << "o" << "\n"
<< "\t" << "low_flap_threshold" << "\t" << hc->GetFlappingThreshold() << "\n"
<< "\t" << "high_flap_threshold" << "\t" << hc->GetFlappingThreshold() << "\n"
<< "\t" << "process_perf_data" << "\t" << 1 << "\n"
<< "\t" << "check_freshness" << "\t" << 1 << "\n";
} else {
fp << "\t" << "check_interval" << "\t" << 60 << "\n"
<< "\t" << "retry_interval" << "\t" << 60 << "\n"
@ -310,6 +341,15 @@ void StatusDataWriter::DumpHostObject(std::ostream& fp, const Host::Ptr& host)
}
/* TODO FIXME
Array::Ptr groups = host->GetGroups();
if (groups) {
fp << "\t" << "hostgroups" << "\t";
DumpNameArray(fp, host->GetGroups());
fp << "\n";
}
*/
DumpCustomAttributes(fp, host);
fp << "\t" << "}" << "\n"
@ -685,6 +725,22 @@ void StatusDataWriter::StatusTimerHandler(void)
}
}
/*
void StatusDataWriter::DumpNameArray(std::ostream& fp, const Array::Ptr& array)
{
bool first = true;
ObjectLock olock(array);
BOOST_FOREACH(const Array::Ptr& obj, array) {
if (!first)
fp << ",";
else
first = false;
fp << obj->GetName();
}
}
*/
void StatusDataWriter::InternalSerialize(const Dictionary::Ptr& bag, int attributeTypes) const
{
DynamicObject::InternalSerialize(bag, attributeTypes);

2
components/compat/statusdatawriter.h
View File

@ -97,6 +97,8 @@ private:
}
}
void DumpNameArray(std::ostream& fp, const Array::Ptr& array);
void DumpServiceStatus(std::ostream& fp, const Service::Ptr& service);
void DumpServiceObject(std::ostream& fp, const Service::Ptr& service);

9
components/livestatus/hoststable.cpp
View File

@ -1088,11 +1088,9 @@ Value HostsTable::ContactsAccessor(const Value& row)
if (!hc)
return Empty;
Array::Ptr contacts = CompatUtility::GetServiceNotificationUsers(hc);
Array::Ptr contact_names = boost::make_shared<Array>();
ObjectLock olock(contacts);
BOOST_FOREACH(const User::Ptr& user, contacts) {
BOOST_FOREACH(const User::Ptr& user, CompatUtility::GetServiceNotificationUsers(hc)) {
contact_names->Add(user->GetName());
}
@ -1589,12 +1587,9 @@ Value HostsTable::ContactGroupsAccessor(const Value& row)
if (!hc)
return Empty;
Array::Ptr contactgroups = CompatUtility::GetServiceNotificationUserGroups(hc);
Array::Ptr contactgroup_names = boost::make_shared<Array>();
ObjectLock olock(contactgroups);
BOOST_FOREACH(const UserGroup::Ptr& usergroup, contactgroups) {
BOOST_FOREACH(const UserGroup::Ptr& usergroup, CompatUtility::GetServiceNotificationUserGroups(hc)) {
contactgroup_names->Add(usergroup->GetName());
}

9
components/livestatus/servicestable.cpp
View File

@ -751,11 +751,9 @@ Value ServicesTable::InNotificationPeriodAccessor(const Value& row)
Value ServicesTable::ContactsAccessor(const Value& row)
{
Array::Ptr contacts = CompatUtility::GetServiceNotificationUsers(static_cast<Service::Ptr>(row));
Array::Ptr contact_names = boost::make_shared<Array>();
ObjectLock olock(contacts);
BOOST_FOREACH(const User::Ptr& user, contacts) {
BOOST_FOREACH(const User::Ptr& user, CompatUtility::GetServiceNotificationUsers(static_cast<Service::Ptr>(row))) {
contact_names->Add(user->GetName());
}
@ -1010,12 +1008,9 @@ Value ServicesTable::GroupsAccessor(const Value& row)
Value ServicesTable::ContactGroupsAccessor(const Value& row)
{
Array::Ptr contactgroups = CompatUtility::GetServiceNotificationUserGroups(static_cast<Service::Ptr>(row));
Array::Ptr contactgroup_names = boost::make_shared<Array>();
ObjectLock olock(contactgroups);
BOOST_FOREACH(const UserGroup::Ptr& usergroup, contactgroups) {
BOOST_FOREACH(const UserGroup::Ptr& usergroup, CompatUtility::GetServiceNotificationUserGroups(static_cast<Service::Ptr>(row))) {
contactgroup_names->Add(usergroup->GetName());
}

57
lib/db_ido/hostdbobject.cpp
View File

@ -240,45 +240,38 @@ void HostDbObject::OnConfigUpdate(void)
Service::Ptr service = host->GetCheckService();
if (service) {
Array::Ptr contacts = CompatUtility::GetServiceNotificationUsers(service);
Log(LogDebug, "db_ido", "host contacts: " + host->GetName() + " length: " + Convert::ToString(contacts->GetLength()));
Log(LogDebug, "db_ido", "host contacts: " + host->GetName());
{
ObjectLock olock(contacts);
BOOST_FOREACH(const User::Ptr& user, contacts) {
Log(LogDebug, "db_ido", "host contacts: " + user->GetName());
BOOST_FOREACH(const User::Ptr& user, CompatUtility::GetServiceNotificationUsers(service)) {
Log(LogDebug, "db_ido", "host contacts: " + user->GetName());
Dictionary::Ptr fields_contact = boost::make_shared<Dictionary>();
fields_contact->Set("host_id", DbValue::FromObjectInsertID(host));
fields_contact->Set("contact_object_id", user);
fields_contact->Set("instance_id", 0); /* DbConnection class fills in real ID */
Dictionary::Ptr fields_contact = boost::make_shared<Dictionary>();
fields_contact->Set("host_id", DbValue::FromObjectInsertID(host));
fields_contact->Set("contact_object_id", user);
fields_contact->Set("instance_id", 0); /* DbConnection class fills in real ID */
DbQuery query_contact;
query_contact.Table = GetType()->GetTable() + "_contacts";
query_contact.Type = DbQueryInsert;
query_contact.Fields = fields_contact;
OnQuery(query_contact);
}
DbQuery query_contact;
query_contact.Table = GetType()->GetTable() + "_contacts";
query_contact.Type = DbQueryInsert;
query_contact.Fields = fields_contact;
OnQuery(query_contact);
}
Array::Ptr contactgroups = CompatUtility::GetServiceNotificationUserGroups(service);
Log(LogDebug, "db_ido", "host contactgroups: " + host->GetName() + " length: " + Convert::ToString(contactgroups->GetLength()));
{
ObjectLock olock(contactgroups);
BOOST_FOREACH(const UserGroup::Ptr& usergroup, contactgroups) {
Log(LogDebug, "db_ido", "host contactgroups: " + usergroup->GetName());
Log(LogDebug, "db_ido", "host contactgroups: " + host->GetName());
Dictionary::Ptr fields_contact = boost::make_shared<Dictionary>();
fields_contact->Set("host_id", DbValue::FromObjectInsertID(host));
fields_contact->Set("contactgroup_object_id", usergroup);
fields_contact->Set("instance_id", 0); /* DbConnection class fills in real ID */
BOOST_FOREACH(const UserGroup::Ptr& usergroup, CompatUtility::GetServiceNotificationUserGroups(service)) {
Log(LogDebug, "db_ido", "host contactgroups: " + usergroup->GetName());
DbQuery query_contact;
query_contact.Table = GetType()->GetTable() + "_contactgroups";
query_contact.Type = DbQueryInsert;
query_contact.Fields = fields_contact;
OnQuery(query_contact);
}
Dictionary::Ptr fields_contact = boost::make_shared<Dictionary>();
fields_contact->Set("host_id", DbValue::FromObjectInsertID(host));
fields_contact->Set("contactgroup_object_id", usergroup);
fields_contact->Set("instance_id", 0); /* DbConnection class fills in real ID */
DbQuery query_contact;
query_contact.Table = GetType()->GetTable() + "_contactgroups";
query_contact.Type = DbQueryInsert;
query_contact.Fields = fields_contact;
OnQuery(query_contact);
}
}

57
lib/db_ido/servicedbobject.cpp
View File

@ -237,45 +237,38 @@ void ServiceDbObject::OnConfigUpdate(void)
}
/* service contacts, contactgroups */
Array::Ptr contacts = CompatUtility::GetServiceNotificationUsers(service);
Log(LogDebug, "db_ido", "service contacts: " + service->GetName() + " length: " + Convert::ToString(contacts->GetLength()));
Log(LogDebug, "db_ido", "service contacts: " + service->GetName());
{
ObjectLock olock(contacts);
BOOST_FOREACH(const User::Ptr& user, contacts) {
Log(LogDebug, "db_ido", "service contacts: " + user->GetName());
BOOST_FOREACH(const User::Ptr& user, CompatUtility::GetServiceNotificationUsers(service)) {
Log(LogDebug, "db_ido", "service contacts: " + user->GetName());
Dictionary::Ptr fields_contact = boost::make_shared<Dictionary>();
fields_contact->Set("service_id", DbValue::FromObjectInsertID(service));
fields_contact->Set("contact_object_id", user);
fields_contact->Set("instance_id", 0); /* DbConnection class fills in real ID */
Dictionary::Ptr fields_contact = boost::make_shared<Dictionary>();
fields_contact->Set("service_id", DbValue::FromObjectInsertID(service));
fields_contact->Set("contact_object_id", user);
fields_contact->Set("instance_id", 0); /* DbConnection class fills in real ID */
DbQuery query_contact;
query_contact.Table = GetType()->GetTable() + "_contacts";
query_contact.Type = DbQueryInsert;
query_contact.Fields = fields_contact;
OnQuery(query_contact);
}
DbQuery query_contact;
query_contact.Table = GetType()->GetTable() + "_contacts";
query_contact.Type = DbQueryInsert;
query_contact.Fields = fields_contact;
OnQuery(query_contact);
}
Array::Ptr contactgroups = CompatUtility::GetServiceNotificationUserGroups(service);
Log(LogDebug, "db_ido", "service contactgroups: " + service->GetName() + " length: " + Convert::ToString(contactgroups->GetLength()));
{
ObjectLock olock(contactgroups);
BOOST_FOREACH(const UserGroup::Ptr& usergroup, contactgroups) {
Log(LogDebug, "db_ido", "service contactgroups: " + usergroup->GetName());
Log(LogDebug, "db_ido", "service contactgroups: " + service->GetName());
Dictionary::Ptr fields_contact = boost::make_shared<Dictionary>();
fields_contact->Set("service_id", DbValue::FromObjectInsertID(service));
fields_contact->Set("contactgroup_object_id", usergroup);
fields_contact->Set("instance_id", 0); /* DbConnection class fills in real ID */
BOOST_FOREACH(const UserGroup::Ptr& usergroup, CompatUtility::GetServiceNotificationUserGroups(service)) {
Log(LogDebug, "db_ido", "service contactgroups: " + usergroup->GetName());
DbQuery query_contact;
query_contact.Table = GetType()->GetTable() + "_contactgroups";
query_contact.Type = DbQueryInsert;
query_contact.Fields = fields_contact;
OnQuery(query_contact);
}
Dictionary::Ptr fields_contact = boost::make_shared<Dictionary>();
fields_contact->Set("service_id", DbValue::FromObjectInsertID(service));
fields_contact->Set("contactgroup_object_id", usergroup);
fields_contact->Set("instance_id", 0); /* DbConnection class fills in real ID */
DbQuery query_contact;
query_contact.Table = GetType()->GetTable() + "_contactgroups";
query_contact.Type = DbQueryInsert;
query_contact.Fields = fields_contact;
OnQuery(query_contact);
}
/* custom variables */

18
lib/icinga/compatutility.cpp
View File

@ -483,12 +483,11 @@ Dictionary::Ptr CompatUtility::GetCustomVariableConfig(const DynamicObject::Ptr&
return customvars;
}
Value CompatUtility::GetServiceNotificationUsers(const Service::Ptr& service)
std::set<User::Ptr> 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);
@ -503,27 +502,22 @@ Value CompatUtility::GetServiceNotificationUsers(const Service::Ptr& service)
}
}
BOOST_FOREACH(const User::Ptr& user, allUsers) {
contacts->Add(user);
}
return contacts;
return allUsers;
}
Value CompatUtility::GetServiceNotificationUserGroups(const Service::Ptr& service)
std::set<UserGroup::Ptr> CompatUtility::GetServiceNotificationUserGroups(const Service::Ptr& service)
{
std::set<UserGroup::Ptr> usergroups;
/* 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);
usergroups.insert(ug);
}
}
return contactgroups;
return usergroups;
}
Dictionary::Ptr CompatUtility::GetCheckResultOutput(const Dictionary::Ptr& cr)

4
lib/icinga/compatutility.h
View File

@ -56,8 +56,8 @@ public:
static Dictionary::Ptr GetCustomVariableConfig(const DynamicObject::Ptr& object);
static Value GetServiceNotificationUsers(const Service::Ptr& service);
static Value GetServiceNotificationUserGroups(const Service::Ptr& service);
static std::set<User::Ptr> GetServiceNotificationUsers(const Service::Ptr& service);
static std::set<UserGroup::Ptr> GetServiceNotificationUserGroups(const Service::Ptr& service);
static Dictionary::Ptr GetCheckResultOutput(const Dictionary::Ptr& cr);
static String GetCheckResultPerfdata(const Dictionary::Ptr& cr);