Fixes #5020

Icinga · Jun 22, 2023 · db9888b · db9888b
1 parent 59fc7dd
commit db9888b
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimeendhistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimeendhistoryQuery.php
@@ -29,7 +29,9 @@ protected function requireFilterColumns(Filter $filter)
     protected function joinBaseTables()
     {
         parent::joinBaseTables(true);
-        $this->select->where("hdh.actual_end_time > '1970-01-02 00:00:00'");
+        $this->select->where(
+            "hdh.actual_end_time > '1970-01-02 00:00:00' AND hdh.was_started = 1 AND hdh.was_cancelled = 0"
+        );
         $this->columnMap['downtimehistory']['type'] = "('dt_end')";
         $this->columnMap['downtimehistory']['timestamp'] = str_replace(
             'actual_start_time',

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimestarthistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimestarthistoryQuery.php
@@ -102,7 +102,9 @@ protected function joinBaseTables()
                 "hdh.actual_start_time > '1970-01-02 00:00:00'"
             );
         }
-
+        $this->select->where(
+            "hdh.was_started = 1 AND hdh.was_cancelled = 0"
+        );
         $this->joinedVirtualTables['downtimehistory'] = true;
     }
 

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimeendhistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimeendhistoryQuery.php
@@ -29,7 +29,9 @@ protected function requireFilterColumns(Filter $filter)
     protected function joinBaseTables()
     {
         parent::joinBaseTables(true);
-        $this->select->where("sdh.actual_end_time > '1970-01-02 00:00:00'");
+        $this->select->where(
+            "sdh.actual_end_time > '1970-01-02 00:00:00' AND sdh.was_started = 1 AND sdh.was_cancelled = 0"
+        );
         $this->columnMap['downtimehistory']['type'] = "('dt_end')";
         $this->columnMap['downtimehistory']['timestamp'] = str_replace(
             'actual_start_time',

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimestarthistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimestarthistoryQuery.php
@@ -103,6 +103,9 @@ protected function joinBaseTables()
                 "sdh.actual_start_time > '1970-01-02 00:00:00'"
             );
         }
+        $this->select->where(
+            "sdh.was_started = 1 AND sdh.was_cancelled = 0"
+        );
 
         $this->joinedVirtualTables['downtimehistory'] = true;
     }