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: Support host and service display_name in the NotificationQuery

Browse Source 
refs #7843
This commit is contained in:
Eric Lippmann 2015-01-21 15:47:10 +01:00
parent b05316340c
commit d8b1e63231
1 changed files with 40 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationQuery.php
View File

@ -6,26 +6,32 @@ class NotificationQuery extends IdoQuery
{ {
protected $columnMap = array( protected $columnMap = array(
'notification' => array( 'notification' => array(
'notification_output' => 'n.output', 'notification_output' => 'n.output',
'notification_start_time' => 'UNIX_TIMESTAMP(n.start_time)', 'notification_start_time' => 'UNIX_TIMESTAMP(n.start_time)',
'notification_state' => 'n.state', 'notification_state' => 'n.state',
'notification_object_id' => 'n.object_id' 'notification_object_id' => 'n.object_id'
), ),
'objects' => array( 'objects' => array(
'host' => 'o.name1', 'host' => 'o.name1',
'service' => 'o.name2' 'service' => 'o.name2'
), ),
'contact' => array( 'contact' => array(
'notification_contact' => 'c_o.name1', 'notification_contact' => 'c_o.name1',
'contact_object_id' => 'c_o.object_id' 'contact_object_id' => 'c_o.object_id'
), ),
'command' => array( 'command' => array(
'notification_command' => 'cmd_o.name1' 'notification_command' => 'cmd_o.name1'
), ),
'acknowledgement' => array( 'acknowledgement' => array(
'acknowledgement_entry_time' => 'UNIX_TIMESTAMP(a.entry_time)', 'acknowledgement_entry_time' => 'UNIX_TIMESTAMP(a.entry_time)',
'acknowledgement_author_name' => 'a.author_name', 'acknowledgement_author_name' => 'a.author_name',
'acknowledgement_comment_data' => 'a.comment_data' 'acknowledgement_comment_data' => 'a.comment_data'
),
'hosts' => array(
'host_display_name' => 'CASE WHEN sh.display_name IS NOT NULL THEN sh.display_name ELSE h.display_name END'
),
'services' => array(
'service_display_name' => 's.display_name'
) )
); );
@ -100,4 +106,29 @@ class NotificationQuery extends IdoQuery
array() array()
); );
} }
protected function joinHosts()
{
$this->select->joinLeft(
array('h' => $this->prefix . 'hosts'),
'h.host_object_id = o.object_id',
array()
);
return $this;
}
protected function joinServices()
{
$this->select->joinLeft(
array('s' => $this->prefix . 'services'),
's.service_object_id = o.object_id',
array()
);
$this->select->joinLeft(
array('sh' => $this->prefix . 'hosts'),
'sh.host_object_id = s.host_object_id',
array()
);
return $this;
}
} }