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

objects.cache: Implement service dependencies

Browse Source 
Fixes #3639
This commit is contained in:
Gunnar Beutner 2013-02-06 22:41:40 +01:00
parent 41e10c83be
commit a64fa1b994
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
components/compat/compatcomponent.cpp
View File

@ -36,7 +36,7 @@ String CompatComponent::GetStatusPath(void) const
{ {
Value statusPath = GetConfig()->Get("status_path"); Value statusPath = GetConfig()->Get("status_path");
if (statusPath.IsEmpty()) if (statusPath.IsEmpty())
return Application::GetLocalStateDir() + "/cache/status.dat"; return Application::GetLocalStateDir() + "/cache/icinga2/status.dat";
else else
return statusPath; return statusPath;
} }
@ -50,7 +50,7 @@ String CompatComponent::GetObjectsPath(void) const
{ {
Value objectsPath = GetConfig()->Get("objects_path"); Value objectsPath = GetConfig()->Get("objects_path");
if (objectsPath.IsEmpty()) if (objectsPath.IsEmpty())
return Application::GetLocalStateDir() + "/cache/objects.cache"; return Application::GetLocalStateDir() + "/cache/icinga2/objects.cache";
else else
return objectsPath; return objectsPath;
} }
@ -384,6 +384,27 @@ void CompatComponent::DumpServiceObject(ofstream& fp, const Service::Ptr& servic
<< "\t" << "passive_checks_enabled" << "\t" << (service->GetEnablePassiveChecks() ? 1 : 0) << "\n" << "\t" << "passive_checks_enabled" << "\t" << (service->GetEnablePassiveChecks() ? 1 : 0) << "\n"
<< "\t" << "}" << "\n" << "\t" << "}" << "\n"
<< "\n"; << "\n";
Dictionary::Ptr dependencies = boost::make_shared<Dictionary>();
service->GetDependenciesRecursive(dependencies);
Value dependency;
BOOST_FOREACH(tie(tuples::ignore, dependency), dependencies) {
Service::Ptr depService = Service::GetByName(dependency);
/* ignore ourselves */
if (depService->GetName() == service->GetName())
continue;
fp << "define servicedependency {" << "\n"
<< "\t" << "dependent_host_name" << "\t" << service->GetHost()->GetName() << "\n"
<< "\t" << "dependent_service_description" << "\t" << service->GetName() << "\n"
<< "\t" << "host_name" << "\t" << depService->GetHost()->GetName() << "\n"
<< "\t" << "service_description" << "\t" << depService->GetName() << "\n"
<< "\t" << "execution_failure_criteria" << "\t" << "n" << "\n"
<< "\t" << "}" << "\n"
<< "\n";
}
} }
/** /**