]> granicus.if.org Git - icinga2/commitdiff
StatusDataWriter: Fix dependency relations.
authorMichael Friedrich <michael.friedrich@netways.de>
Tue, 6 May 2014 14:10:33 +0000 (16:10 +0200)
committerMichael Friedrich <michael.friedrich@netways.de>
Tue, 6 May 2014 14:10:33 +0000 (16:10 +0200)
Fixes #6131

components/compat/statusdatawriter.cpp

index 2b2f0320cb84d33ed74c13df54bbc3391cd276fa..fda98fe4b28fdb2f2aa9ee53418b65e762b1b542 100644 (file)
@@ -731,6 +731,7 @@ void StatusDataWriter::UpdateObjectsCache(void)
 
                String criteria = boost::algorithm::join(failure_criteria, ",");
 
+               /* Icinga 1.x only allows host->host, service->service dependencies */
                if (!child_service && !parent_service) {
                        objectfp << "define hostdependency {" "\n"
                                    "\t" "dependent_host_name" "\t" << child_host->GetName() << "\n"
@@ -739,7 +740,7 @@ void StatusDataWriter::UpdateObjectsCache(void)
                                    "\t" "notification_failure_criteria" "\t" << criteria << "\n"
                                    "\t" "}" "\n"
                                    "\n";
-               } else {
+               } else if (child_service && parent_service){
 
                        objectfp << "define servicedependency {" "\n"
                                    "\t" "dependent_host_name" "\t" << child_service->GetHost()->GetName() << "\n"