UnreachableParent: Don't include intermediate parents..

..if they're unreachable themselves
Icinga · Oct 8, 2024 · 61dfa18 · 61dfa18
1 parent b8498c7
commit 61dfa18
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/library/Icingadb/Model/UnreachableParent.php b/library/Icingadb/Model/UnreachableParent.php
@@ -96,10 +96,14 @@ public static function on(Connection $db, Model $root = null): Query
             self::selectNodes($db, $root),
             'unreachable_parent',
             true
-        )->where([
-            'unreachable_parent.level > ?' => 0,
-            'unreachable_parent.is_group_member = ?' => 0
-        ]);
+        );
+
+        $query->filter(Filter::all(
+            Filter::greaterThan('level', 0),
+            Filter::equal('is_group_member', 0),
+            Filter::unequal('host.state.is_reachable', 'n'),
+            Filter::unequal('service.state.is_reachable', 'n')
+        ));
 
         return $query;
     }