tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-25 14:44:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

DB IDO: Add missing dependency attributes.

Browse Source 
Fixes #5745
This commit is contained in:
Michael Friedrich 2014-04-23 10:33:30 +02:00
parent 951c61ed16
commit cdd5c0a716
2 changed files with 41 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/db_ido/hostdbobject.cpp
View File

@ -24,6 +24,7 @@
#include "icinga/host.h" #include "icinga/host.h"
#include "icinga/service.h" #include "icinga/service.h"
#include "icinga/notification.h" #include "icinga/notification.h"
#include "icinga/dependency.h"
#include "icinga/checkcommand.h" #include "icinga/checkcommand.h"
#include "icinga/eventcommand.h" #include "icinga/eventcommand.h"
#include "icinga/compatutility.h" #include "icinga/compatutility.h"
@ -174,7 +175,7 @@ void HostDbObject::OnConfigUpdate(void)
{ {
Host::Ptr host = static_pointer_cast<Host>(GetObject()); Host::Ptr host = static_pointer_cast<Host>(GetObject());
/* parents, host dependencies */ /* parents */
BOOST_FOREACH(const Checkable::Ptr& checkable, host->GetParents()) { BOOST_FOREACH(const Checkable::Ptr& checkable, host->GetParents()) {
Host::Ptr parent = dynamic_pointer_cast<Host>(checkable); Host::Ptr parent = dynamic_pointer_cast<Host>(checkable);
@ -195,11 +196,28 @@ void HostDbObject::OnConfigUpdate(void)
query1.Category = DbCatConfig; query1.Category = DbCatConfig;
query1.Fields = fields1; query1.Fields = fields1;
OnQuery(query1); OnQuery(query1);
}
/* host dependencies */
Log(LogDebug, "db_ido", "host dependencies for '" + host->GetName() + "'");
BOOST_FOREACH(const Dependency::Ptr& dep, host->GetDependencies()) {
Checkable::Ptr parent = dep->GetParent();
if (!parent)
continue;
int state_filter = dep->GetStateFilter();
Log(LogDebug, "db_ido", "parent host: " + parent->GetName());
/* host dependencies */
Dictionary::Ptr fields2 = make_shared<Dictionary>(); Dictionary::Ptr fields2 = make_shared<Dictionary>();
fields2->Set("host_object_id", parent); fields2->Set("host_object_id", parent);
fields2->Set("dependent_host_object_id", host); fields2->Set("dependent_host_object_id", host);
fields2->Set("inherits_parent", 1);
fields2->Set("timeperiod_object_id", dep->GetPeriod());
fields2->Set("fail_on_up", (state_filter & StateFilterUp) ? 1 : 0);
fields2->Set("fail_on_down", (state_filter & StateFilterDown) ? 1 : 0);
fields2->Set("instance_id", 0); /* DbConnection class fills in real ID */ fields2->Set("instance_id", 0); /* DbConnection class fills in real ID */
DbQuery query2; DbQuery query2;

33
lib/db_ido/servicedbobject.cpp
View File

@ -28,6 +28,7 @@
#include "base/utility.h" #include "base/utility.h"
#include "remote/endpoint.h" #include "remote/endpoint.h"
#include "icinga/notification.h" #include "icinga/notification.h"
#include "icinga/dependency.h"
#include "icinga/checkcommand.h" #include "icinga/checkcommand.h"
#include "icinga/eventcommand.h" #include "icinga/eventcommand.h"
#include "icinga/externalcommandprocessor.h" #include "icinga/externalcommandprocessor.h"
@ -176,26 +177,34 @@ void ServiceDbObject::OnConfigUpdate(void)
/* service dependencies */ /* service dependencies */
Log(LogDebug, "db_ido", "service dependencies for '" + service->GetName() + "'"); Log(LogDebug, "db_ido", "service dependencies for '" + service->GetName() + "'");
BOOST_FOREACH(const Checkable::Ptr& checkable, service->GetParents()) { BOOST_FOREACH(const Dependency::Ptr& dep, service->GetDependencies()) {
Service::Ptr parent = dynamic_pointer_cast<Service>(checkable); Checkable::Ptr parent = dep->GetParent();
if (!parent) if (!parent)
continue; continue;
Log(LogDebug, "db_ido", "service parents: " + parent->GetName()); Log(LogDebug, "db_ido", "service parents: " + parent->GetName());
/* service dependencies */ int state_filter = dep->GetStateFilter();
Dictionary::Ptr fields1 = make_shared<Dictionary>();
fields1->Set("service_object_id", parent);
fields1->Set("dependent_service_object_id", service);
fields1->Set("instance_id", 0); /* DbConnection class fills in real ID */
DbQuery query1; /* service dependencies */
query1.Table = GetType()->GetTable() + "dependencies"; Dictionary::Ptr fields1 = make_shared<Dictionary>();
query1.Type = DbQueryInsert; fields1->Set("service_object_id", parent);
fields1->Set("dependent_service_object_id", service);
fields1->Set("inherits_parent", 1);
fields1->Set("timeperiod_object_id", dep->GetPeriod());
fields1->Set("fail_on_ok", (state_filter & StateFilterOK) ? 1 : 0);
fields1->Set("fail_on_warning", (state_filter & StateFilterWarning) ? 1 : 0);
fields1->Set("fail_on_critical", (state_filter & StateFilterCritical) ? 1 : 0);
fields1->Set("fail_on_unknown", (state_filter & StateFilterUnknown) ? 1 : 0);
fields1->Set("instance_id", 0); /* DbConnection class fills in real ID */
DbQuery query1;
query1.Table = GetType()->GetTable() + "dependencies";
query1.Type = DbQueryInsert;
query1.Category = DbCatConfig; query1.Category = DbCatConfig;
query1.Fields = fields1; query1.Fields = fields1;
OnQuery(query1); OnQuery(query1);
} }
/* service contacts, contactgroups */ /* service contacts, contactgroups */