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

*historyQuery: Drop redundant query columns 

refs #8613
This commit is contained in:
Johannes Meyer 2015-04-09 15:13:59 +02:00
parent 9e79419eb1
commit 51bf5cfbc8
6 changed files with 79 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
modules/monitoring/library/Monitoring/Backend/Ido/Query/CommentdeletionhistoryQuery.php
View File

@ -7,24 +7,22 @@ class CommentdeletionhistoryQuery extends IdoQuery
{ {
protected $columnMap = array( protected $columnMap = array(
'commenthistory' => array( 'commenthistory' => array(
'state_time' => 'h.deletion_time', 'state_time' => 'h.deletion_time',
'timestamp' => 'UNIX_TIMESTAMP(h.deletion_time)', 'timestamp' => 'UNIX_TIMESTAMP(h.deletion_time)',
'raw_timestamp' => 'h.deletion_time', 'raw_timestamp' => 'h.deletion_time',
'object_id' => 'h.object_id', 'object_id' => 'h.object_id',
'type' => "(CASE h.entry_type WHEN 1 THEN 'comment_deleted' WHEN 2 THEN 'dt_comment_deleted' WHEN 3 THEN 'flapping_deleted' WHEN 4 THEN 'ack_deleted' END)", 'type' => "(CASE h.entry_type WHEN 1 THEN 'comment_deleted' WHEN 2 THEN 'dt_comment_deleted' WHEN 3 THEN 'flapping_deleted' WHEN 4 THEN 'ack_deleted' END)",
'state' => '(NULL)', 'state' => '(NULL)',
'state_type' => '(NULL)', 'state_type' => '(NULL)',
'output' => "('[' || h.author_name || '] ' || h.comment_data)", 'output' => "('[' || h.author_name || '] ' || h.comment_data)",
'attempt' => '(NULL)', 'attempt' => '(NULL)',
'max_attempts' => '(NULL)', 'max_attempts' => '(NULL)',
'host' => 'o.name1 COLLATE latin1_general_ci', 'host' => 'o.name1 COLLATE latin1_general_ci',
'service' => 'o.name2 COLLATE latin1_general_ci', 'service' => 'o.name2 COLLATE latin1_general_ci',
'host_name' => 'o.name1 COLLATE latin1_general_ci', 'host_name' => 'o.name1 COLLATE latin1_general_ci',
'service_description' => 'o.name2 COLLATE latin1_general_ci', 'service_description' => 'o.name2 COLLATE latin1_general_ci',
'service_host_name' => 'o.name1 COLLATE latin1_general_ci', 'object_type' => "CASE WHEN o.objecttype_id = 1 THEN 'host' ELSE 'service' END"
'service_description' => 'o.name2 COLLATE latin1_general_ci',
'object_type' => "CASE WHEN o.objecttype_id = 1 THEN 'host' ELSE 'service' END"
) )
); );

32
modules/monitoring/library/Monitoring/Backend/Ido/Query/CommenthistoryQuery.php
View File

@ -7,24 +7,22 @@ class CommenthistoryQuery extends IdoQuery
{ {
protected $columnMap = array( protected $columnMap = array(
'commenthistory' => array( 'commenthistory' => array(
'state_time' => 'h.comment_time', 'state_time' => 'h.comment_time',
'timestamp' => 'UNIX_TIMESTAMP(h.comment_time)', 'timestamp' => 'UNIX_TIMESTAMP(h.comment_time)',
'raw_timestamp' => 'h.comment_time', 'raw_timestamp' => 'h.comment_time',
'object_id' => 'h.object_id', 'object_id' => 'h.object_id',
'type' => "(CASE h.entry_type WHEN 1 THEN 'comment' WHEN 2 THEN 'dt_comment' WHEN 3 THEN 'flapping' WHEN 4 THEN 'ack' END)", 'type' => "(CASE h.entry_type WHEN 1 THEN 'comment' WHEN 2 THEN 'dt_comment' WHEN 3 THEN 'flapping' WHEN 4 THEN 'ack' END)",
'state' => '(NULL)', 'state' => '(NULL)',
'state_type' => '(NULL)', 'state_type' => '(NULL)',
'output' => "('[' || h.author_name || '] ' || h.comment_data)", 'output' => "('[' || h.author_name || '] ' || h.comment_data)",
'attempt' => '(NULL)', 'attempt' => '(NULL)',
'max_attempts' => '(NULL)', 'max_attempts' => '(NULL)',
'host' => 'o.name1 COLLATE latin1_general_ci', 'host' => 'o.name1 COLLATE latin1_general_ci',
'service' => 'o.name2 COLLATE latin1_general_ci', 'service' => 'o.name2 COLLATE latin1_general_ci',
'host_name' => 'o.name1 COLLATE latin1_general_ci', 'host_name' => 'o.name1 COLLATE latin1_general_ci',
'service_description' => 'o.name2 COLLATE latin1_general_ci', 'service_description' => 'o.name2 COLLATE latin1_general_ci',
'service_host_name' => 'o.name1 COLLATE latin1_general_ci', 'object_type' => "CASE WHEN o.objecttype_id = 1 THEN 'host' ELSE 'service' END"
'service_description' => 'o.name2 COLLATE latin1_general_ci',
'object_type' => "CASE WHEN o.objecttype_id = 1 THEN 'host' ELSE 'service' END"
) )
); );

32
modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeendhistoryQuery.php
View File

@ -7,24 +7,22 @@ class DowntimeendhistoryQuery extends IdoQuery
{ {
protected $columnMap = array( protected $columnMap = array(
'downtimehistory' => array( 'downtimehistory' => array(
'state_time' => 'h.actual_end_time', 'state_time' => 'h.actual_end_time',
'timestamp' => 'UNIX_TIMESTAMP(h.actual_end_time)', 'timestamp' => 'UNIX_TIMESTAMP(h.actual_end_time)',
'raw_timestamp' => 'h.actual_end_time', 'raw_timestamp' => 'h.actual_end_time',
'object_id' => 'h.object_id', 'object_id' => 'h.object_id',
'type' => "('dt_end')", 'type' => "('dt_end')",
'state' => '(NULL)', 'state' => '(NULL)',
'state_type' => '(NULL)', 'state_type' => '(NULL)',
'output' => "('[' || h.author_name || '] ' || h.comment_data)", 'output' => "('[' || h.author_name || '] ' || h.comment_data)",
'attempt' => '(NULL)', 'attempt' => '(NULL)',
'max_attempts' => '(NULL)', 'max_attempts' => '(NULL)',
'host' => 'o.name1 COLLATE latin1_general_ci', 'host' => 'o.name1 COLLATE latin1_general_ci',
'service' => 'o.name2 COLLATE latin1_general_ci', 'service' => 'o.name2 COLLATE latin1_general_ci',
'host_name' => 'o.name1 COLLATE latin1_general_ci', 'host_name' => 'o.name1 COLLATE latin1_general_ci',
'service_description' => 'o.name2 COLLATE latin1_general_ci', 'service_description' => 'o.name2 COLLATE latin1_general_ci',
'service_host_name' => 'o.name1 COLLATE latin1_general_ci', 'object_type' => "CASE WHEN o.objecttype_id = 1 THEN 'host' ELSE 'service' END"
'service_description' => 'o.name2 COLLATE latin1_general_ci',
'object_type' => "CASE WHEN o.objecttype_id = 1 THEN 'host' ELSE 'service' END"
) )
); );

32
modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimestarthistoryQuery.php
View File

@ -7,24 +7,22 @@ class DowntimestarthistoryQuery extends IdoQuery
{ {
protected $columnMap = array( protected $columnMap = array(
'downtimehistory' => array( 'downtimehistory' => array(
'state_time' => 'h.actual_start_time', 'state_time' => 'h.actual_start_time',
'timestamp' => 'UNIX_TIMESTAMP(h.actual_start_time)', 'timestamp' => 'UNIX_TIMESTAMP(h.actual_start_time)',
'raw_timestamp' => 'h.actual_start_time', 'raw_timestamp' => 'h.actual_start_time',
'object_id' => 'h.object_id', 'object_id' => 'h.object_id',
'type' => "('dt_start')", 'type' => "('dt_start')",
'state' => '(NULL)', 'state' => '(NULL)',
'state_type' => '(NULL)', 'state_type' => '(NULL)',
'output' => "('[' || h.author_name || '] ' || h.comment_data)", 'output' => "('[' || h.author_name || '] ' || h.comment_data)",
'attempt' => '(NULL)', 'attempt' => '(NULL)',
'max_attempts' => '(NULL)', 'max_attempts' => '(NULL)',
'host' => 'o.name1 COLLATE latin1_general_ci', 'host' => 'o.name1 COLLATE latin1_general_ci',
'service' => 'o.name2 COLLATE latin1_general_ci', 'service' => 'o.name2 COLLATE latin1_general_ci',
'host_name' => 'o.name1 COLLATE latin1_general_ci', 'host_name' => 'o.name1 COLLATE latin1_general_ci',
'service_description' => 'o.name2 COLLATE latin1_general_ci', 'service_description' => 'o.name2 COLLATE latin1_general_ci',
'service_host_name' => 'o.name1 COLLATE latin1_general_ci', 'object_type' => "CASE WHEN o.objecttype_id = 1 THEN 'host' ELSE 'service' END"
'service_description' => 'o.name2 COLLATE latin1_general_ci',
'object_type' => "CASE WHEN o.objecttype_id = 1 THEN 'host' ELSE 'service' END"
) )
); );

32
modules/monitoring/library/Monitoring/Backend/Ido/Query/NotificationhistoryQuery.php
View File

@ -7,24 +7,22 @@ class NotificationhistoryQuery extends IdoQuery
{ {
protected $columnMap = array( protected $columnMap = array(
'history' => array( 'history' => array(
'timestamp' => 'UNIX_TIMESTAMP(n.start_time)', 'state_time' => 'n.start_time',
'raw_timestamp' => 'n.start_time', 'timestamp' => 'UNIX_TIMESTAMP(n.start_time)',
'state_time' => 'n.start_time', 'raw_timestamp' => 'n.start_time',
'object_id' => 'n.object_id', 'object_id' => 'n.object_id',
'type' => "('notify')", 'type' => "('notify')",
'state' => 'n.state', 'state' => 'n.state',
'state_type' => '(NULL)', 'state_type' => '(NULL)',
'output' => null, 'output' => null,
'attempt' => '(NULL)', 'attempt' => '(NULL)',
'max_attempts' => '(NULL)', 'max_attempts' => '(NULL)',
'host' => 'o.name1 COLLATE latin1_general_ci', 'host' => 'o.name1 COLLATE latin1_general_ci',
'service' => 'o.name2 COLLATE latin1_general_ci', 'service' => 'o.name2 COLLATE latin1_general_ci',
'host_name' => 'o.name1 COLLATE latin1_general_ci', 'host_name' => 'o.name1 COLLATE latin1_general_ci',
'service_description' => 'o.name2 COLLATE latin1_general_ci', 'service_description' => 'o.name2 COLLATE latin1_general_ci',
'service_host_name' => 'o.name1 COLLATE latin1_general_ci', 'object_type' => "CASE WHEN o.objecttype_id = 1 THEN 'host' ELSE 'service' END"
'service_description' => 'o.name2 COLLATE latin1_general_ci',
'object_type' => "CASE WHEN o.objecttype_id = 1 THEN 'host' ELSE 'service' END"
) )
); );

8
modules/monitoring/library/Monitoring/Backend/Ido/Query/StatehistoryQuery.php
View File

@ -12,9 +12,9 @@ class StatehistoryQuery extends IdoQuery
protected $columnMap = array( protected $columnMap = array(
'statehistory' => array( 'statehistory' => array(
'raw_timestamp' => 'sh.state_time',
'timestamp' => 'UNIX_TIMESTAMP(sh.state_time)',
'state_time' => 'sh.state_time', 'state_time' => 'sh.state_time',
'timestamp' => 'UNIX_TIMESTAMP(sh.state_time)',
'raw_timestamp' => 'sh.state_time',
'object_id' => 'sho.object_id', 'object_id' => 'sho.object_id',
'type' => "(CASE WHEN sh.state_type = 1 THEN 'hard_state' ELSE 'soft_state' END)", 'type' => "(CASE WHEN sh.state_type = 1 THEN 'hard_state' ELSE 'soft_state' END)",
'state' => 'sh.state', 'state' => 'sh.state',
@ -22,11 +22,11 @@ class StatehistoryQuery extends IdoQuery
'output' => 'sh.output', 'output' => 'sh.output',
'attempt' => 'sh.current_check_attempt', 'attempt' => 'sh.current_check_attempt',
'max_attempts' => 'sh.max_check_attempts', 'max_attempts' => 'sh.max_check_attempts',
'host' => 'sho.name1 COLLATE latin1_general_ci', 'host' => 'sho.name1 COLLATE latin1_general_ci',
'host_name' => 'sho.name1 COLLATE latin1_general_ci',
'service' => 'sho.name2 COLLATE latin1_general_ci', 'service' => 'sho.name2 COLLATE latin1_general_ci',
'host_name' => 'sho.name1 COLLATE latin1_general_ci',
'service_description' => 'sho.name2 COLLATE latin1_general_ci', 'service_description' => 'sho.name2 COLLATE latin1_general_ci',
'service_host_name' => 'sho.name1 COLLATE latin1_general_ci',
'object_type' => "CASE WHEN sho.objecttype_id = 1 THEN 'host' ELSE 'service' END" 'object_type' => "CASE WHEN sho.objecttype_id = 1 THEN 'host' ELSE 'service' END"
) )
); );