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

Add debug log entries for dependencies. 

Refs #5872
This commit is contained in:
Michael Friedrich 2014-05-03 21:02:19 +02:00
parent 56bdf820b7
commit ddfccf3188
5 changed files with 41 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/compat/statusdatawriter.cpp
View File

@ -696,8 +696,10 @@ void StatusDataWriter::UpdateObjectsCache(void)
BOOST_FOREACH(const Dependency::Ptr& dep, DynamicType::GetObjects<Dependency>()) { BOOST_FOREACH(const Dependency::Ptr& dep, DynamicType::GetObjects<Dependency>()) {
Checkable::Ptr parent = dep->GetParent(); Checkable::Ptr parent = dep->GetParent();
if (!parent) if (!parent) {
Log(LogDebug, "compat", "Missing parent for dependency '" + dep->GetName() + "'.");
continue; continue;
}
Host::Ptr parent_host; Host::Ptr parent_host;
Service::Ptr parent_service; Service::Ptr parent_service;
@ -705,8 +707,10 @@ void StatusDataWriter::UpdateObjectsCache(void)
Checkable::Ptr child = dep->GetChild(); Checkable::Ptr child = dep->GetChild();
if (!child) if (!child) {
continue; continue;
Log(LogDebug, "compat", "Missing child for dependency '" + dep->GetName() + "'.");
}
Host::Ptr child_host; Host::Ptr child_host;
Service::Ptr child_service; Service::Ptr child_service;

4
lib/db_ido/hostdbobject.cpp
View File

@ -204,8 +204,10 @@ void HostDbObject::OnConfigUpdate(void)
BOOST_FOREACH(const Dependency::Ptr& dep, host->GetDependencies()) { BOOST_FOREACH(const Dependency::Ptr& dep, host->GetDependencies()) {
Checkable::Ptr parent = dep->GetParent(); Checkable::Ptr parent = dep->GetParent();
if (!parent) if (!parent) {
Log(LogDebug, "db_ido", "Missing parent for dependency '" + dep->GetName() + "'.");
continue; continue;
}
int state_filter = dep->GetStateFilter(); int state_filter = dep->GetStateFilter();

4
lib/db_ido/servicedbobject.cpp
View File

@ -180,8 +180,10 @@ void ServiceDbObject::OnConfigUpdate(void)
BOOST_FOREACH(const Dependency::Ptr& dep, service->GetDependencies()) { BOOST_FOREACH(const Dependency::Ptr& dep, service->GetDependencies()) {
Checkable::Ptr parent = dep->GetParent(); Checkable::Ptr parent = dep->GetParent();
if (!parent) if (!parent) {
Log(LogDebug, "db_ido", "Missing parent for dependency '" + dep->GetName() + "'.");
continue; continue;
}
Log(LogDebug, "db_ido", "service parents: " + parent->GetName()); Log(LogDebug, "db_ido", "service parents: " + parent->GetName());

7
lib/icinga/dependency.cpp
View File

@ -168,10 +168,13 @@ Checkable::Ptr Dependency::GetParent(void) const
if (!host) if (!host)
return Service::Ptr(); return Service::Ptr();
if (GetParentServiceName().IsEmpty()) if (GetParentServiceName().IsEmpty()) {
Log(LogDebug, "icinga", "Dependency '" + GetName() + "' parent host '" + GetParentHostName() + ".");
return host; return host;
else } else {
Log(LogDebug, "icinga", "Dependency '" + GetName() + "' parent host '" + GetParentHostName() + "' service '" + GetParentServiceName() + "' .");
return host->GetServiceByShortName(GetParentServiceName()); return host->GetServiceByShortName(GetParentServiceName());
}
} }
TimePeriod::Ptr Dependency::GetPeriod(void) const TimePeriod::Ptr Dependency::GetPeriod(void) const

30
test/config/5872.conf
View File

@ -30,25 +30,43 @@ object Host "5872-switch" {
address = "192.168.1.2", address = "192.168.1.2",
} }
apply Dependency "5872-switch" to Host { apply Dependency "5872-host-switch" to Host {
child_host_name = "5872-switch"
parent_host_name = "5872-router" parent_host_name = "5872-router"
disable_checks = true disable_checks = true
assign where host.name == "5872-switch" assign where host.name == "5872-switch"
} }
apply Dependency "5872-pc" to Host { apply Dependency "5872-host-pc" to Host {
child_host_name = "5872-pc"
parent_host_name = "5872-switch" parent_host_name = "5872-switch"
disable_checks = true disable_checks = true
assign where host.name == "5872-pc" assign where host.name == "5872-pc"
} }
apply Dependency "5872-server" to Host { apply Dependency "5872-host-server" to Host {
child_host_name = "5872-server"
parent_host_name = "5872-switch" parent_host_name = "5872-switch"
disable_checks = true disable_checks = true
assign where host.name == "5872-server" assign where host.name == "5872-server"
} }
apply Dependency "5872-service-switch" to Service {
parent_host_name = "5872-router"
parent_service_name = "5872-ping4"
disable_checks = true
assign where host.name == "5872-switch"
}
apply Dependency "5872-service-pc" to Service {
parent_host_name = "5872-switch"
parent_service_name = "5872-ping4"
disable_checks = true
assign where host.name == "5872-pc"
}
apply Dependency "5872-service-server" to Service {
parent_host_name = "5872-switch"
parent_service_name = "5872-ping4"
states = [ Warning, Critical ]
disable_checks = true
assign where host.name == "5872-server"
}