tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

fixes https://github.com/Icinga/icingaweb2/issues/5176
This commit is contained in:
Robin Kraft 2024-04-05 16:23:56 +02:00 committed by GitHub
parent d6881e0273
commit dba77bce57
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimeendhistoryQuery.php
View File

@ -30,7 +30,7 @@ class HostdowntimeendhistoryQuery extends HostdowntimestarthistoryQuery
{
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(

2
modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimestarthistoryQuery.php
View File

@ -103,7 +103,7 @@ class HostdowntimestarthistoryQuery extends IdoQuery
);
}
$this->select->where(
"hdh.was_started = 1 AND hdh.was_cancelled = 0"
"hdh.was_started = 1"
);
$this->joinedVirtualTables['downtimehistory'] = true;
}

2
modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimeendhistoryQuery.php
View File

@ -30,7 +30,7 @@ class ServicedowntimeendhistoryQuery extends ServicedowntimestarthistoryQuery
{
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(

2
modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimestarthistoryQuery.php
View File

@ -104,7 +104,7 @@ class ServicedowntimestarthistoryQuery extends IdoQuery
);
}
$this->select->where(
"sdh.was_started = 1 AND sdh.was_cancelled = 0"
"sdh.was_started = 1"
);
$this->joinedVirtualTables['downtimehistory'] = true;