add canceled downtimes to the history, if they were started (#5184)

fixes #5176
Icinga · Apr 5, 2024 · dba77bc · dba77bc
1 parent d6881e0
commit dba77bc
Show file tree

Hide file tree

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

diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimestarthistoryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimestarthistoryQuery.php
@@ -103,7 +103,7 @@ protected function joinBaseTables()
             );
         }
         $this->select->where(
-            "hdh.was_started = 1 AND hdh.was_cancelled = 0"
+            "hdh.was_started = 1"
         );
         $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
@@ -30,7 +30,7 @@ protected function joinBaseTables()
     {
         parent::joinBaseTables(true);
         $this->select->where(
-            "sdh.actual_end_time > '1970-01-02 00:00:00' AND sdh.was_started = 1 AND sdh.was_cancelled = 0"
+            "sdh.actual_end_time > '1970-01-02 00:00:00' AND sdh.was_started = 1"
         );
         $this->columnMap['downtimehistory']['type'] = "('dt_end')";
         $this->columnMap['downtimehistory']['timestamp'] = str_replace(

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