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

Merge pull request #3505 from Icinga/fix/service-contacts-host-restriction 

Split contact query into subqueries
This commit is contained in:
Eric Lippmann 2018-07-18 15:28:42 +02:00 committed by GitHub
parent 121bd545d1 d5d336884c
commit a295f271c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 556 additions and 209 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

297
modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
View File

@ -3,233 +3,126 @@
namespace Icinga\Module\Monitoring\Backend\Ido\Query; namespace Icinga\Module\Monitoring\Backend\Ido\Query;
use Zend_Db_Select;
use Icinga\Data\Filter\Filter;
/** /**
* Query for contacts * Query for contacts
*/ */
class ContactQuery extends IdoQuery class ContactQuery extends IdoQuery
{ {
/** protected $columnMap = [
* {@inheritdoc} 'contacts' => [
*/
protected $allowCustomVars = true;
/**
* {@inheritdoc}
*/
protected $groupBase = array('contacts' => array('co.object_id', 'c.contact_id'));
/**
* {@inheritdoc}
*/
protected $groupOrigin = array('contactgroups', 'hosts', 'services');
/**
* {@inheritdoc}
*/
protected $columnMap = array(
'contactgroups' => array(
'contactgroup' => 'cgo.name1 COLLATE latin1_general_ci',
'contactgroup_name' => 'cgo.name1',
'contactgroup_alias' => 'cg.alias COLLATE latin1_general_ci'
),
'contacts' => array(
'contact_id' => 'c.contact_id', 'contact_id' => 'c.contact_id',
'contact' => 'co.name1 COLLATE latin1_general_ci', 'contact' => 'c.contact',
'contact_name' => 'co.name1', 'contact_name' => 'c.contact_name',
'contact_alias' => 'c.alias COLLATE latin1_general_ci', 'contact_alias' => 'c.contact_alias',
'contact_email' => 'c.email_address COLLATE latin1_general_ci', 'contact_email' => 'c.contact_email',
'contact_pager' => 'c.pager_address', 'contact_pager' => 'c.contact_pager',
'contact_object_id' => 'c.contact_object_id', 'contact_object_id' => 'c.contact_object_id',
'contact_has_host_notfications' => 'c.host_notifications_enabled', 'contact_has_host_notfications' => 'c.contact_has_host_notfications',
'contact_has_service_notfications' => 'c.service_notifications_enabled', 'contact_has_service_notfications' => 'c.contact_has_service_notfications',
'contact_can_submit_commands' => 'c.can_submit_commands', 'contact_can_submit_commands' => 'c.contact_can_submit_commands',
'contact_notify_service_recovery' => 'c.notify_service_recovery', 'contact_notify_service_recovery' => 'c.contact_notify_service_recovery',
'contact_notify_service_warning' => 'c.notify_service_warning', 'contact_notify_service_warning' => 'c.contact_notify_service_warning',
'contact_notify_service_critical' => 'c.notify_service_critical', 'contact_notify_service_critical' => 'c.contact_notify_service_critical',
'contact_notify_service_unknown' => 'c.notify_service_unknown', 'contact_notify_service_unknown' => 'c.contact_notify_service_unknown',
'contact_notify_service_flapping' => 'c.notify_service_flapping', 'contact_notify_service_flapping' => 'c.contact_notify_service_flapping',
'contact_notify_service_downtime' => 'c.notify_service_downtime', 'contact_notify_service_downtime' => 'c.contact_notify_service_downtime',
'contact_notify_host_recovery' => 'c.notify_host_recovery', 'contact_notify_host_recovery' => 'c.contact_notify_host_recovery',
'contact_notify_host_down' => 'c.notify_host_down', 'contact_notify_host_down' => 'c.contact_notify_host_down',
'contact_notify_host_unreachable' => 'c.notify_host_unreachable', 'contact_notify_host_unreachable' => 'c.contact_notify_host_unreachable',
'contact_notify_host_flapping' => 'c.notify_host_flapping', 'contact_notify_host_flapping' => 'c.contact_notify_host_flapping',
'contact_notify_host_downtime' => 'c.notify_host_downtime' 'contact_notify_host_downtime' => 'c.contact_notify_host_downtime',
), 'contact_notify_host_timeperiod' => 'c.contact_notify_host_timeperiod',
'hostgroups' => array( 'contact_notify_service_timeperiod' => 'c.contact_notify_service_timeperiod'
'hostgroup' => 'hgo.name1 COLLATE latin1_general_ci', ]
'hostgroup_alias' => 'hg.alias COLLATE latin1_general_ci', ];
'hostgroup_name' => 'hgo.name1'
), /** @var Zend_Db_Select The union */
'hosts' => array( protected $contactQuery;
'host' => 'ho.name1 COLLATE latin1_general_ci',
'host_name' => 'ho.name1', /** @var IdoQuery[] Subqueries used for the contact query */
'host_alias' => 'h.alias', protected $subQueries = [];
'host_display_name' => 'h.display_name COLLATE latin1_general_ci'
), public function allowsCustomVars()
'instances' => array( {
'instance_name' => 'i.instance_name' foreach ($this->subQueries as $query) {
), if (! $query->allowsCustomVars()) {
'servicegroups' => array( return false;
'servicegroup' => 'sgo.name1 COLLATE latin1_general_ci', }
'servicegroup_name' => 'sgo.name1', }
'servicegroup_alias' => 'sg.alias COLLATE latin1_general_ci'
), return true;
'services' => array( }
'service' => 'so.name2 COLLATE latin1_general_ci',
'service_description' => 'so.name2', public function addFilter(Filter $filter)
'service_display_name' => 's.display_name COLLATE latin1_general_ci', {
'service_host_name' => 'so.name1' $strangers = array_diff(
), $filter->listFilteredColumns(),
'timeperiods' => array( array_keys($this->columnMap['contacts'])
'contact_notify_host_timeperiod' => 'ht.alias COLLATE latin1_general_ci', );
'contact_notify_service_timeperiod' => 'st.alias COLLATE latin1_general_ci' if (! empty($strangers)) {
) $this->transformToUnion();
); }
foreach ($this->subQueries as $sub) {
$sub->applyFilter(clone $filter);
}
return $this;
}
/**
* {@inheritdoc}
*/
protected function joinBaseTables() protected function joinBaseTables()
{ {
$this->contactQuery = $this->createSubQuery('Hostcontact', array_keys($this->columnMap['contacts']));
$this->contactQuery->setIsSubQuery();
$this->subQueries[] = $this->contactQuery;
$this->select->from( $this->select->from(
array('c' => $this->prefix . 'contacts'), ['c' => $this->contactQuery],
array() []
)->join(
array('co' => $this->prefix . 'objects'),
'co.object_id = c.contact_object_id AND co.is_active = 1',
array()
); );
$this->joinedVirtualTables['contacts'] = true; $this->joinedVirtualTables['contacts'] = true;
} }
/** public function order($columnOrAlias, $dir = null)
* Join contact groups
*/
protected function joinContactgroups()
{ {
$this->select->joinLeft( foreach ($this->subQueries as $sub) {
array('cgm' => $this->prefix . 'contactgroup_members'), $sub->requireColumn($columnOrAlias);
'co.object_id = cgm.contact_object_id', }
array()
)->joinLeft( return parent::order($columnOrAlias, $dir);
array('cg' => $this->prefix . 'contactgroups'),
'cgm.contactgroup_id = cg.contactgroup_id',
array()
)->joinLeft(
array('cgo' => $this->prefix . 'objects'),
'cg.contactgroup_object_id = cgo.object_id AND cgo.is_active = 1 AND cgo.objecttype_id = 11',
array()
);
} }
/** public function where($condition, $value = null)
* Join host groups
*/
protected function joinHostgroups()
{ {
$this->requireVirtualTable('hosts'); $this->requireColumn($condition);
$this->select->joinLeft( foreach ($this->subQueries as $sub) {
array('hgm' => $this->prefix . 'hostgroup_members'), $sub->where($condition, $value);
'hgm.host_object_id = ho.object_id', }
array()
)->joinLeft( return $this;
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()
);
} }
/** public function transformToUnion()
* Join hosts
*/
protected function joinHosts()
{ {
$this->select->joinLeft( $this->contactQuery = $this->db->select();
array('hc' => $this->prefix . 'host_contacts'), $this->select->reset();
'hc.contact_object_id = c.contact_object_id', $this->subQueries = [];
array()
)->joinLeft(
array('h' => $this->prefix . 'hosts'),
'h.host_id = hc.host_id',
array()
)->joinLeft(
array('ho' => $this->prefix . 'objects'),
'ho.object_id = h.host_object_id AND ho.is_active = 1',
array()
);
}
/** $this->select->distinct()->from(
* Join instances ['c' => $this->contactQuery],
*/ []
protected function joinInstances()
{
$this->select->join(
array('i' => $this->prefix . 'instances'),
'i.instance_id = c.instance_id',
array()
); );
}
/** $hosts = $this->createSubQuery('Hostcontact', array_keys($this->columnMap['contacts']));
* Join service groups $this->subQueries[] = $hosts;
*/ $this->contactQuery->union([$hosts], Zend_Db_Select::SQL_UNION_ALL);
protected function joinServicegroups()
{
$this->requireVirtualTable('services');
$this->select->joinLeft(
array('sgm' => $this->prefix . 'servicegroup_members'),
'sgm.service_object_id = s.service_object_id',
array()
)->joinLeft(
array('sg' => $this->prefix . 'servicegroups'),
'sg.servicegroup_id = sgm.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()
);
}
/** $services = $this->createSubQuery('Servicecontact', array_keys($this->columnMap['contacts']));
* Join services $this->subQueries[] = $services;
*/ $this->contactQuery->union([$services], Zend_Db_Select::SQL_UNION_ALL);
protected function joinServices()
{
$this->select->joinLeft(
array('sc' => $this->prefix . 'service_contacts'),
'sc.contact_object_id = c.contact_object_id',
array()
)->joinLeft(
array('s' => $this->prefix . 'services'),
's.service_id = sc.service_id',
array()
)->joinLeft(
array('so' => $this->prefix . 'objects'),
'so.object_id = s.service_object_id AND so.is_active = 1 AND so.objecttype_id = 2',
array()
);
}
/**
* Join time periods
*/
protected function joinTimeperiods()
{
$this->select->joinLeft(
array('ht' => $this->prefix . 'timeperiods'),
'ht.timeperiod_object_id = c.host_timeperiod_object_id',
array()
);
$this->select->joinLeft(
array('st' => $this->prefix . 'timeperiods'),
'st.timeperiod_object_id = c.service_timeperiod_object_id',
array()
);
} }
} }

219
modules/monitoring/library/Monitoring/Backend/Ido/Query/HostcontactQuery.php Normal file
View File

@ -0,0 +1,219 @@
<?php
/* Icinga Web 2 | (c) 2018 Icinga Development Team | GPLv2+ */
namespace Icinga\Module\Monitoring\Backend\Ido\Query;
/**
* Query for host contacts
*/
class HostcontactQuery extends IdoQuery
{
protected $allowCustomVars = true;
protected $groupBase = [
'contacts' => ['co.object_id', 'c.contact_id'],
'timeperiods' => ['ht.timeperiod_id', 'st.timeperiod_id']
];
protected $groupOrigin = ['contactgroups', 'hosts', 'services'];
protected $columnMap = [
'contactgroups' => [
'contactgroup' => 'cgo.name1 COLLATE latin1_general_ci',
'contactgroup_name' => 'cgo.name1',
'contactgroup_alias' => 'cg.alias COLLATE latin1_general_ci'
],
'contacts' => [
'contact_id' => 'c.contact_id',
'contact' => 'co.name1 COLLATE latin1_general_ci',
'contact_name' => 'co.name1',
'contact_alias' => 'c.alias COLLATE latin1_general_ci',
'contact_email' => 'c.email_address COLLATE latin1_general_ci',
'contact_pager' => 'c.pager_address',
'contact_object_id' => 'c.contact_object_id',
'contact_has_host_notfications' => 'c.host_notifications_enabled',
'contact_has_service_notfications' => 'c.service_notifications_enabled',
'contact_can_submit_commands' => 'c.can_submit_commands',
'contact_notify_service_recovery' => 'c.notify_service_recovery',
'contact_notify_service_warning' => 'c.notify_service_warning',
'contact_notify_service_critical' => 'c.notify_service_critical',
'contact_notify_service_unknown' => 'c.notify_service_unknown',
'contact_notify_service_flapping' => 'c.notify_service_flapping',
'contact_notify_service_downtime' => 'c.notify_service_downtime',
'contact_notify_host_recovery' => 'c.notify_host_recovery',
'contact_notify_host_down' => 'c.notify_host_down',
'contact_notify_host_unreachable' => 'c.notify_host_unreachable',
'contact_notify_host_flapping' => 'c.notify_host_flapping',
'contact_notify_host_downtime' => 'c.notify_host_downtime'
],
'hostgroups' => [
'hostgroup' => 'hgo.name1 COLLATE latin1_general_ci',
'hostgroup_alias' => 'hg.alias COLLATE latin1_general_ci',
'hostgroup_name' => 'hgo.name1'
],
'hosts' => [
'host' => 'ho.name1 COLLATE latin1_general_ci',
'host_name' => 'ho.name1',
'host_alias' => 'h.alias',
'host_display_name' => 'h.display_name COLLATE latin1_general_ci'
],
'instances' => [
'instance_name' => 'i.instance_name'
],
'servicegroups' => [
'servicegroup' => 'sgo.name1 COLLATE latin1_general_ci',
'servicegroup_name' => 'sgo.name1',
'servicegroup_alias' => 'sg.alias COLLATE latin1_general_ci'
],
'services' => [
'service' => 'so.name2 COLLATE latin1_general_ci',
'service_description' => 'so.name2',
'service_display_name' => 's.display_name COLLATE latin1_general_ci',
'service_host_name' => 'so.name1'
],
'timeperiods' => [
'contact_notify_host_timeperiod' => 'ht.alias COLLATE latin1_general_ci',
'contact_notify_service_timeperiod' => 'st.alias COLLATE latin1_general_ci'
]
];
protected function joinBaseTables()
{
$this->select->from(
['c' => $this->prefix . 'contacts'],
[]
)->join(
['co' => $this->prefix . 'objects'],
'co.object_id = c.contact_object_id AND co.is_active = 1',
[]
);
$this->joinedVirtualTables = array('contacts' => true);
}
/**
* Join contact groups
*/
protected function joinContactgroups()
{
$this->select->joinLeft(
['cgm' => $this->prefix . 'contactgroup_members'],
'co.object_id = cgm.contact_object_id',
[]
)->joinLeft(
['cg' => $this->prefix . 'contactgroups'],
'cgm.contactgroup_id = cg.contactgroup_id',
[]
)->joinLeft(
['cgo' => $this->prefix . 'objects'],
'cg.contactgroup_object_id = cgo.object_id AND cgo.is_active = 1 AND cgo.objecttype_id = 11',
[]
);
}
/**
* Join host groups
*/
protected function joinHostgroups()
{
$this->select->joinLeft(
['hgm' => $this->prefix . 'hostgroup_members'],
'hgm.host_object_id = ho.object_id',
[]
)->joinLeft(
['hg' => $this->prefix . 'hostgroups'],
'hg.hostgroup_id = hgm.hostgroup_id',
[]
)->joinLeft(
['hgo' => $this->prefix . 'objects'],
'hgo.object_id = hg.hostgroup_object_id AND hgo.is_active = 1 AND hgo.objecttype_id = 3',
[]
);
}
/**
* Join hosts
*/
protected function joinHosts()
{
$this->select->joinLeft(
['hc' => $this->prefix . 'host_contacts'],
'hc.contact_object_id = c.contact_object_id',
[]
)->joinLeft(
['h' => $this->prefix . 'hosts'],
'h.host_id = hc.host_id',
[]
)->joinLeft(
['ho' => $this->prefix . 'objects'],
'ho.object_id = h.host_object_id AND ho.is_active = 1',
[]
);
}
/**
* Join instances
*/
protected function joinInstances()
{
$this->select->join(
['i' => $this->prefix . 'instances'],
'i.instance_id = c.instance_id',
[]
);
}
/**
* Join service groups
*/
protected function joinServicegroups()
{
$this->requireVirtualTable('services');
$this->select->joinLeft(
['sgm' => $this->prefix . 'servicegroup_members'],
'sgm.service_object_id = s.service_object_id',
[]
)->joinLeft(
['sg' => $this->prefix . 'servicegroups'],
'sg.servicegroup_id = sgm.servicegroup_id',
[]
)->joinLeft(
['sgo' => $this->prefix . 'objects'],
'sgo.object_id = sg.servicegroup_object_id AND sgo.is_active = 1 AND sgo.objecttype_id = 4',
[]
);
}
/**
* Join services
*/
protected function joinServices()
{
$this->select->joinLeft(
['s' => $this->prefix . 'services'],
's.host_object_id = ho.object_id',
[]
)->joinLeft(
['so' => $this->prefix . 'objects'],
'so.object_id = s.service_object_id AND so.is_active = 1 AND so.objecttype_id = 2',
[]
);
}
/**
* Join time periods
*/
protected function joinTimeperiods()
{
$this->select->joinLeft(
['ht' => $this->prefix . 'timeperiods'],
'ht.timeperiod_object_id = c.host_timeperiod_object_id',
[]
);
$this->select->joinLeft(
['st' => $this->prefix . 'timeperiods'],
'st.timeperiod_object_id = c.service_timeperiod_object_id',
[]
);
}
}

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

@ -1132,10 +1132,6 @@ abstract class IdoQuery extends DbQuery
case 'servicestatus': case 'servicestatus':
$groupedColumns[] = 'ss.servicestatus_id'; $groupedColumns[] = 'ss.servicestatus_id';
break; break;
case 'timeperiods':
$groupedColumns[] = 'ht.timeperiod_id';
$groupedColumns[] = 'st.timeperiod_id';
break;
default: default:
return; return;
} }

215
modules/monitoring/library/Monitoring/Backend/Ido/Query/ServicecontactQuery.php Normal file
View File

@ -0,0 +1,215 @@
<?php
/* Icinga Web 2 | (c) 2018 Icinga Development Team | GPLv2+ */
namespace Icinga\Module\Monitoring\Backend\Ido\Query;
/**
* Query for service contacts
*/
class ServicecontactQuery extends IdoQuery
{
protected $allowCustomVars = true;
protected $groupBase = [
'contacts' => ['co.object_id', 'c.contact_id'],
'timeperiods' => ['ht.timeperiod_id', 'st.timeperiod_id']
];
protected $groupOrigin = ['contactgroups', 'hosts', 'services'];
protected $columnMap = [
'contactgroups' => [
'contactgroup' => 'cgo.name1 COLLATE latin1_general_ci',
'contactgroup_name' => 'cgo.name1',
'contactgroup_alias' => 'cg.alias COLLATE latin1_general_ci'
],
'contacts' => [
'contact_id' => 'c.contact_id',
'contact' => 'co.name1 COLLATE latin1_general_ci',
'contact_name' => 'co.name1',
'contact_alias' => 'c.alias COLLATE latin1_general_ci',
'contact_email' => 'c.email_address COLLATE latin1_general_ci',
'contact_pager' => 'c.pager_address',
'contact_object_id' => 'c.contact_object_id',
'contact_has_host_notfications' => 'c.host_notifications_enabled',
'contact_has_service_notfications' => 'c.service_notifications_enabled',
'contact_can_submit_commands' => 'c.can_submit_commands',
'contact_notify_service_recovery' => 'c.notify_service_recovery',
'contact_notify_service_warning' => 'c.notify_service_warning',
'contact_notify_service_critical' => 'c.notify_service_critical',
'contact_notify_service_unknown' => 'c.notify_service_unknown',
'contact_notify_service_flapping' => 'c.notify_service_flapping',
'contact_notify_service_downtime' => 'c.notify_service_downtime',
'contact_notify_host_recovery' => 'c.notify_host_recovery',
'contact_notify_host_down' => 'c.notify_host_down',
'contact_notify_host_unreachable' => 'c.notify_host_unreachable',
'contact_notify_host_flapping' => 'c.notify_host_flapping',
'contact_notify_host_downtime' => 'c.notify_host_downtime'
],
'hostgroups' => [
'hostgroup' => 'hgo.name1 COLLATE latin1_general_ci',
'hostgroup_alias' => 'hg.alias COLLATE latin1_general_ci',
'hostgroup_name' => 'hgo.name1'
],
'hosts' => [
'host' => 'ho.name1 COLLATE latin1_general_ci',
'host_name' => 'ho.name1',
'host_alias' => 'h.alias',
'host_display_name' => 'h.display_name COLLATE latin1_general_ci'
],
'instances' => [
'instance_name' => 'i.instance_name'
],
'servicegroups' => [
'servicegroup' => 'sgo.name1 COLLATE latin1_general_ci',
'servicegroup_name' => 'sgo.name1',
'servicegroup_alias' => 'sg.alias COLLATE latin1_general_ci'
],
'services' => [
'service' => 'so.name2 COLLATE latin1_general_ci',
'service_description' => 'so.name2',
'service_display_name' => 's.display_name COLLATE latin1_general_ci',
'service_host_name' => 'so.name1'
],
'timeperiods' => [
'contact_notify_host_timeperiod' => 'ht.alias COLLATE latin1_general_ci',
'contact_notify_service_timeperiod' => 'st.alias COLLATE latin1_general_ci'
]
];
protected function joinBaseTables()
{
$this->select->from(
['c' => $this->prefix . 'contacts'],
[]
)->join(
['co' => $this->prefix . 'objects'],
'co.object_id = c.contact_object_id AND co.is_active = 1',
[]
);
$this->select->joinLeft(
['sc' => $this->prefix . 'service_contacts'],
'sc.contact_object_id = c.contact_object_id',
[]
)->joinLeft(
['s' => $this->prefix . 'services'],
's.service_id = sc.service_id',
[]
)->joinLeft(
['so' => $this->prefix . 'objects'],
'so.object_id = s.service_object_id AND so.is_active = 1 AND so.objecttype_id = 2',
[]
);
$this->joinedVirtualTables['contacts'] = true;
$this->joinedVirtualTables['services'] = true;
}
/**
* Join contact groups
*/
protected function joinContactgroups()
{
$this->select->joinLeft(
['cgm' => $this->prefix . 'contactgroup_members'],
'co.object_id = cgm.contact_object_id',
[]
)->joinLeft(
['cg' => $this->prefix . 'contactgroups'],
'cgm.contactgroup_id = cg.contactgroup_id',
[]
)->joinLeft(
['cgo' => $this->prefix . 'objects'],
'cg.contactgroup_object_id = cgo.object_id AND cgo.is_active = 1 AND cgo.objecttype_id = 11',
[]
);
}
/**
* Join host groups
*/
protected function joinHostgroups()
{
$this->requireVirtualTable('hosts');
$this->select->joinLeft(
['hgm' => $this->prefix . 'hostgroup_members'],
'hgm.host_object_id = ho.object_id',
[]
)->joinLeft(
['hg' => $this->prefix . 'hostgroups'],
'hg.hostgroup_id = hgm.hostgroup_id',
[]
)->joinLeft(
['hgo' => $this->prefix . 'objects'],
'hgo.object_id = hg.hostgroup_object_id AND hgo.is_active = 1 AND hgo.objecttype_id = 3',
[]
);
}
/**
* Join hosts
*/
protected function joinHosts()
{
$this->select->joinLeft(
['h' => $this->prefix . 'hosts'],
'h.host_object_id = s.host_object_id',
[]
)->joinLeft(
['ho' => $this->prefix . 'objects'],
'ho.object_id = h.host_object_id AND ho.is_active = 1',
[]
);
}
/**
* Join instances
*/
protected function joinInstances()
{
$this->select->join(
['i' => $this->prefix . 'instances'],
'i.instance_id = c.instance_id',
[]
);
}
/**
* Join service groups
*/
protected function joinServicegroups()
{
$this->requireVirtualTable('services');
$this->select->joinLeft(
['sgm' => $this->prefix . 'servicegroup_members'],
'sgm.service_object_id = s.service_object_id',
[]
)->joinLeft(
['sg' => $this->prefix . 'servicegroups'],
'sg.servicegroup_id = sgm.servicegroup_id',
[]
)->joinLeft(
['sgo' => $this->prefix . 'objects'],
'sgo.object_id = sg.servicegroup_object_id AND sgo.is_active = 1 AND sgo.objecttype_id = 4',
[]
);
}
/**
* Join time periods
*/
protected function joinTimeperiods()
{
$this->select->joinLeft(
['ht' => $this->prefix . 'timeperiods'],
'ht.timeperiod_object_id = c.host_timeperiod_object_id',
[]
);
$this->select->joinLeft(
['st' => $this->prefix . 'timeperiods'],
'st.timeperiod_object_id = c.service_timeperiod_object_id',
[]
);
}
}

3
modules/monitoring/library/Monitoring/DataView/Contact.php
View File

@ -11,7 +11,6 @@ class Contact extends DataView
public function getColumns() public function getColumns()
{ {
return array( return array(
'instance_name',
'contact_object_id', 'contact_object_id',
'contact_id', 'contact_id',
'contact_name', 'contact_name',
@ -55,7 +54,7 @@ class Contact extends DataView
public function getStaticFilterColumns() public function getStaticFilterColumns()
{ {
return array( return array(
'contact', 'contact', 'instance_name',
'contactgroup', 'contactgroup_name', 'contactgroup_alias', 'contactgroup', 'contactgroup_name', 'contactgroup_alias',
'host', 'host_name', 'host_display_name', 'host_alias', 'host', 'host_name', 'host_display_name', 'host_alias',
'hostgroup', 'hostgroup_alias', 'hostgroup_name', 'hostgroup', 'hostgroup_alias', 'hostgroup_name',

17
modules/monitoring/library/Monitoring/DataView/Hostcontact.php Normal file
View File

@ -0,0 +1,17 @@
<?php
/* Icinga Web 2 | (c) 2018 Icinga Development Team | GPLv2+ */
namespace Icinga\Module\Monitoring\DataView;
class Hostcontact extends Contact
{
public function getColumns()
{
return [
'contact_name',
'contact_alias',
'contact_email',
'contact_pager'
];
}
}

8
modules/monitoring/library/Monitoring/DataView/Servicecontact.php Normal file
View File

@ -0,0 +1,8 @@
<?php
/* Icinga Web 2 | (c) 2018 Icinga Development Team | GPLv2+ */
namespace Icinga\Module\Monitoring\DataView;
class Servicecontact extends Hostcontact
{
}

2
modules/monitoring/library/Monitoring/Object/MonitoredObject.php
View File

@ -394,7 +394,7 @@ abstract class MonitoredObject implements Filterable
*/ */
public function fetchContacts() public function fetchContacts()
{ {
$contacts = $this->backend->select()->from('contact', array( $contacts = $this->backend->select()->from("{$this->type}contact", array(
'contact_name', 'contact_name',
'contact_alias', 'contact_alias',
'contact_email', 'contact_email',