tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-28 08:14:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

monitoring: Don't use absolute alias in the AlertsummaryController

Browse Source
This commit is contained in:
Eric Lippmann 2015-08-27 15:37:01 +02:00
parent 65a7365e1e
commit 9d926fb4c6
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
modules/monitoring/application/controllers/AlertsummaryController.php
View File

@ -11,6 +11,7 @@ use Zend_Controller_Action_Exception;
use Icinga\Chart\GridChart; use Icinga\Chart\GridChart;
use Icinga\Chart\Unit\LinearUnit; use Icinga\Chart\Unit\LinearUnit;
use Icinga\Chart\Unit\StaticAxis; use Icinga\Chart\Unit\StaticAxis;
use Icinga\Data\Filter\FilterExpression;
use Icinga\Module\Monitoring\Controller; use Icinga\Module\Monitoring\Controller;
use Icinga\Module\Monitoring\Web\Widget\SelectBox; use Icinga\Module\Monitoring\Web\Widget\SelectBox;
use Icinga\Web\Url; use Icinga\Web\Url;
@ -102,7 +103,7 @@ class AlertsummaryController extends Controller
$this->applyRestriction('monitoring/filter/objects', $query); $this->applyRestriction('monitoring/filter/objects', $query);
$query->addFilter( $query->addFilter(
new Icinga\Data\Filter\FilterExpression( new FilterExpression(
'notification_start_time', 'notification_start_time',
'>=', '>=',
$this->getBeginDate($interval)->format('Y-m-d H:i:s') $this->getBeginDate($interval)->format('Y-m-d H:i:s')
@ -151,7 +152,7 @@ class AlertsummaryController extends Controller
$this->applyRestriction('monitoring/filter/objects', $query); $this->applyRestriction('monitoring/filter/objects', $query);
$query->addFilter( $query->addFilter(
new Icinga\Data\Filter\FilterExpression( new FilterExpression(
'notification_start_time', 'notification_start_time',
'>=', '>=',
$beginDate->format('Y-m-d H:i:s') $beginDate->format('Y-m-d H:i:s')
@ -219,7 +220,7 @@ class AlertsummaryController extends Controller
$this->applyRestriction('monitoring/filter/objects', $query); $this->applyRestriction('monitoring/filter/objects', $query);
$query->addFilter( $query->addFilter(
new Icinga\Data\Filter\FilterExpression( new FilterExpression(
'notification_start_time', 'notification_start_time',
'>=', '>=',
$this->getBeginDate($interval)->format('Y-m-d H:i:s') $this->getBeginDate($interval)->format('Y-m-d H:i:s')
@ -270,7 +271,7 @@ class AlertsummaryController extends Controller
$this->applyRestriction('monitoring/filter/objects', $query); $this->applyRestriction('monitoring/filter/objects', $query);
$query->addFilter( $query->addFilter(
new Icinga\Data\Filter\FilterExpression( new FilterExpression(
'timestamp', 'timestamp',
'>=', '>=',
$this->getBeginDate($interval)->getTimestamp() $this->getBeginDate($interval)->getTimestamp()
@ -278,7 +279,7 @@ class AlertsummaryController extends Controller
); );
$query->addFilter( $query->addFilter(
new Icinga\Data\Filter\FilterExpression( new FilterExpression(
'state', 'state',
'>', '>',
0 0
@ -336,7 +337,7 @@ class AlertsummaryController extends Controller
$this->applyRestriction('monitoring/filter/objects', $query); $this->applyRestriction('monitoring/filter/objects', $query);
$query->addFilter( $query->addFilter(
new Icinga\Data\Filter\FilterExpression( new FilterExpression(
'notification_start_time', 'notification_start_time',
'>=', '>=',
$this->getBeginDate($interval)->format('Y-m-d H:i:s') $this->getBeginDate($interval)->format('Y-m-d H:i:s')