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

DowntimeQuery: Fix grouping 

There was only one downtime for each host or service being fetched.

refs #9009
This commit is contained in:
Johannes Meyer 2015-06-08 18:00:54 +02:00
parent 75c5aab1b9
commit 83c21f08e3
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/monitoring/library/Monitoring/Backend/Ido/Query/HostdowntimeQuery.php
View File

@ -107,7 +107,7 @@ class HostdowntimeQuery extends IdoQuery
'hgo.objecttype_id = ?',
3
);
$this->group('ho.name1');
$this->group(array('sd.scheduleddowntime_id', 'ho.name1'));
}
/**
@ -183,6 +183,6 @@ class HostdowntimeQuery extends IdoQuery
'so.objecttype_id = ?',
2
);
$this->group('ho.name1');
$this->group(array('sd.scheduleddowntime_id', 'ho.name1'));
}
}

4
modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicedowntimeQuery.php
View File

@ -112,7 +112,7 @@ class ServicedowntimeQuery extends IdoQuery
'hgo.objecttype_id = ?',
3
);
$this->group(array('so.name2', 'so.name1'));
$this->group(array('sd.scheduleddowntime_id', 'so.name2', 'so.name1'));
}
/**
@ -166,7 +166,7 @@ class ServicedowntimeQuery extends IdoQuery
'sgo.objecttype_id = ?',
4
);
$this->group(array('so.name2', 'so.name1'));
$this->group(array('sd.scheduleddowntime_id', 'so.name2', 'so.name1'));
}
/**