Merge branch 'bugfix/slow-unhandled-service-summary-query-in-host-overview-9864'
fixes #9864
This commit is contained in:
Johannes Meyer
commit
9d64da7544
|
|
@ -85,7 +85,6 @@ class Monitoring_ListController extends Controller
|
|||
'host_last_check',
|
||||
'host_last_state_change' => $stateChangeColumn,
|
||||
'host_notifications_enabled',
|
||||
'host_unhandled_services',
|
||||
'host_action_url',
|
||||
'host_notes_url',
|
||||
'host_last_comment',
|
||||
|
|
@ -121,6 +120,10 @@ class Monitoring_ListController extends Controller
|
|||
'host_address' => $this->translate('Address'),
|
||||
'host_last_check' => $this->translate('Last Check')
|
||||
), $query);
|
||||
|
||||
$summary = $query->getQuery()->queryServiceProblemSummary();
|
||||
$this->applyRestriction('monitoring/filter/objects', $summary);
|
||||
$this->view->summary = $summary->fetchPairs();
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -58,11 +58,11 @@ if (! $this->compact): ?>
|
|||
'class' => 'rowaction'
|
||||
)
|
||||
); ?>
|
||||
<?php if (isset($host->host_unhandled_services) && $host->host_unhandled_services > 0): ?>
|
||||
<?php if (isset($summary[$host->host_name])): ?>
|
||||
<span> (<?= $this->qlink(
|
||||
sprintf(
|
||||
$this->translatePlural('%u unhandled service', '%u unhandled services', $host->host_unhandled_services),
|
||||
$host->host_unhandled_services
|
||||
$this->translatePlural('%u unhandled service', '%u unhandled services', $summary[$host->host_name]),
|
||||
$summary[$host->host_name]
|
||||
),
|
||||
'monitoring/list/services',
|
||||
array(
|
||||
|
|
@ -76,9 +76,9 @@ if (! $this->compact): ?>
|
|||
$this->translatePlural(
|
||||
'List %s unhandled service problem on host %s',
|
||||
'List %s unhandled service problems on host %s',
|
||||
$host->host_unhandled_services
|
||||
$summary[$host->host_name]
|
||||
),
|
||||
$host->host_unhandled_services,
|
||||
$summary[$host->host_name],
|
||||
$host->host_name
|
||||
)
|
||||
)
|
||||
|
|
|
|||
|
|
@ -142,7 +142,7 @@ class HostcommentQuery extends IdoQuery
|
|||
{
|
||||
$this->select->joinLeft(
|
||||
array('s' => $this->prefix . 'services'),
|
||||
's.host_object_id = h.host_object_id',
|
||||
's.host_object_id = ho.object_id',
|
||||
array()
|
||||
)->joinLeft(
|
||||
array('so' => $this->prefix . 'objects'),
|
||||
|
|
|
|||
|
|
@ -148,7 +148,7 @@ class HostdowntimeQuery extends IdoQuery
|
|||
{
|
||||
$this->select->joinLeft(
|
||||
array('s' => $this->prefix . 'services'),
|
||||
's.host_object_id = h.host_object_id',
|
||||
's.host_object_id = ho.object_id',
|
||||
array()
|
||||
)->joinLeft(
|
||||
array('so' => $this->prefix . 'objects'),
|
||||
|
|
|
|||
|
|
@ -0,0 +1,140 @@
|
|||
<?php
|
||||
/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
|
||||
|
||||
namespace Icinga\Module\Monitoring\Backend\Ido\Query;
|
||||
|
||||
class HostserviceproblemsummaryQuery extends IdoQuery
|
||||
{
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
protected $allowCustomVars = true;
|
||||
|
||||
/**
|
||||
* The HoststatusQuery in use
|
||||
*
|
||||
* @var HoststatusQuery
|
||||
*/
|
||||
protected $hostStatusQuery;
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
protected $columnMap = array(
|
||||
'services' => array(
|
||||
'host_name' => 'so.name1',
|
||||
'service_description' => 'so.name2'
|
||||
),
|
||||
'hostgroups' => array(
|
||||
'hostgroup_name' => 'hgo.name1'
|
||||
),
|
||||
'servicegroups' => array(
|
||||
'servicegroup_name' => 'sgo.name1'
|
||||
),
|
||||
'problemsummary' => array(
|
||||
'unhandled_service_count' => 'SUM(
|
||||
CASE
|
||||
WHEN (ss.problem_has_been_acknowledged + ss.scheduled_downtime_depth + COALESCE(hs.current_state, 0)) > 0
|
||||
THEN 0
|
||||
ELSE 1
|
||||
END
|
||||
)'
|
||||
)
|
||||
);
|
||||
|
||||
/**
|
||||
* Set the HoststatusQuery to use
|
||||
*
|
||||
* @param HoststatusQuery $query
|
||||
*
|
||||
* @return $this
|
||||
*/
|
||||
public function setHoststatusQuery(HoststatusQuery $query)
|
||||
{
|
||||
$this->hostStatusQuery = clone $query;
|
||||
$this->hostStatusQuery->setIsSubQuery();
|
||||
$this->hostStatusQuery->columns(array('object_id'));
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
protected function joinBaseTables()
|
||||
{
|
||||
$this->select->from(
|
||||
array('so' => $this->prefix . 'objects'),
|
||||
array()
|
||||
)->join(
|
||||
array('s' => $this->prefix . 'services'),
|
||||
's.service_object_id = so.object_id',
|
||||
array()
|
||||
);
|
||||
|
||||
$this->select->group(array('so.name1'));
|
||||
$this->select->where('so.is_active = 1');
|
||||
$this->joinedVirtualTables['services'] = true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Join host groups
|
||||
*/
|
||||
protected function joinHostgroups()
|
||||
{
|
||||
$this->select->joinLeft(
|
||||
array('hgm' => $this->prefix . 'hostgroup_members'),
|
||||
'hgm.host_object_id = s.host_object_id',
|
||||
array()
|
||||
)->joinLeft(
|
||||
array('hg' => $this->prefix . 'hostgroups'),
|
||||
'hg.hostgroup_id = hgm.hostgroup_id',
|
||||
array()
|
||||
)->joinLeft(
|
||||
array('hgo' => $this->prefix . 'objects'),
|
||||
'hgo.object_id = hg.hostgroup_object_id AND hgo.is_active = 1 AND hgo.objecttype_id = 3',
|
||||
array()
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Join service groups
|
||||
*/
|
||||
protected function joinServicegroups()
|
||||
{
|
||||
$this->select->joinLeft(
|
||||
array('sgm' => $this->prefix . 'servicegroup_members'),
|
||||
'sgm.service_object_id = so.object_id',
|
||||
array()
|
||||
)->joinLeft(
|
||||
array('sg' => $this->prefix . 'servicegroups'),
|
||||
'sgm.servicegroup_id = sg.servicegroup_id',
|
||||
array()
|
||||
)->joinLeft(
|
||||
array('sgo' => $this->prefix . 'objects'),
|
||||
'sgo.object_id = sg.servicegroup_object_id AND sgo.is_active = 1 AND sgo.objecttype_id = 4',
|
||||
array()
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Join the statussummary
|
||||
*/
|
||||
protected function joinProblemsummary()
|
||||
{
|
||||
$this->select->join(
|
||||
array('ss' => $this->prefix . 'servicestatus'),
|
||||
'ss.service_object_id = so.object_id AND ss.current_state > 0',
|
||||
array()
|
||||
)->join(
|
||||
array('hs' => $this->prefix . 'hoststatus'),
|
||||
'hs.host_object_id = s.host_object_id',
|
||||
array()
|
||||
)->join(
|
||||
array('h' => $this->hostStatusQuery),
|
||||
'h.object_id = s.host_object_id',
|
||||
array()
|
||||
);
|
||||
|
||||
$this->select->having($this->getMappedField('unhandled_service_count') . ' > 0');
|
||||
}
|
||||
}
|
||||
|
|
@ -33,7 +33,8 @@ class HoststatusQuery extends IdoQuery
|
|||
'host_name' => 'ho.name1',
|
||||
'host_notes' => 'h.notes',
|
||||
'host_notes_url' => 'h.notes_url',
|
||||
'object_type' => '(\'host\')'
|
||||
'object_type' => '(\'host\')',
|
||||
'object_id' => 'ho.object_id'
|
||||
),
|
||||
'hoststatus' => array(
|
||||
'host_acknowledged' => 'hs.problem_has_been_acknowledged',
|
||||
|
|
@ -448,4 +449,20 @@ SQL;
|
|||
|
||||
return $group;
|
||||
}
|
||||
|
||||
/**
|
||||
* Query the service problem summary for all hosts of this query's result set
|
||||
*
|
||||
* @return HostserviceproblemsummaryQuery
|
||||
*/
|
||||
public function queryServiceProblemSummary()
|
||||
{
|
||||
return $this->createSubQuery('Hostserviceproblemsummary')
|
||||
->setHostStatusQuery($this)
|
||||
->columns(array(
|
||||
'host_name',
|
||||
'unhandled_service_count'
|
||||
)
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue