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

(Host)ServiceTable: always show blacklist details 

It can affect also single services
This commit is contained in:
Thomas Gelf 2018-06-05 11:06:43 +02:00
parent bd5ad64f02
commit 7efeab674c
2 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
library/Director/Web/Table/IcingaHostServiceTable.php
View File

@ -104,7 +104,6 @@ class IcingaHostServiceTable extends ZfQueryBasedTable
/** /**
* @return \Zend_Db_Select * @return \Zend_Db_Select
* @throws \Zend_Db_Select_Exception
*/ */
public function prepareQuery() public function prepareQuery()
{ {
@ -118,32 +117,26 @@ class IcingaHostServiceTable extends ZfQueryBasedTable
'host' => 'h.object_name', 'host' => 'h.object_name',
'service' => 's.object_name', 'service' => 's.object_name',
'object_type' => 's.object_type', 'object_type' => 's.object_type',
'blacklisted' => "CASE WHEN hsb.service_id IS NULL THEN 'n' ELSE 'y' END"
] ]
)->joinLeft( )->joinLeft(
['h' => 'icinga_host'], ['h' => 'icinga_host'],
'h.id = s.host_id', 'h.id = s.host_id',
[] []
)->joinLeft(
['hsb' => 'icinga_host_service_blacklist'],
$db->quoteInto(
's.id = hsb.service_id AND hsb.host_id = ?',
$this->inheritedBy === null
? $this->host->get('id')
: $this->inheritedBy->get('id')
),
[]
)->where( )->where(
's.host_id = ?', 's.host_id = ?',
$this->host->get('id') $this->host->get('id')
)->order('s.object_name'); )->order('s.object_name');
if ($this->inheritedBy) {
$query->joinLeft(
['hsb' => 'icinga_host_service_blacklist'],
$db->quoteInto(
's.id = hsb.service_id AND hsb.host_id = ?',
$this->inheritedBy->get('id')
),
[]
);
$query->columns([
'blacklisted' => "CASE WHEN hsb.service_id IS NULL THEN 'n' ELSE 'y' END"
]);
} else {
$query->columns(['blacklisted' => "('n')"]);
}
return $query; return $query;
} }
} }

12
library/Director/Web/Table/ObjectsTableService.php
View File

@ -27,6 +27,7 @@ class ObjectsTableService extends ObjectsTable
'hots_object_type' => 'h.object_type', 'hots_object_type' => 'h.object_type',
'host_disabled' => 'h.disabled', 'host_disabled' => 'h.disabled',
'id' => 'o.id', 'id' => 'o.id',
'blacklisted' => "CASE WHEN hsb.service_id IS NULL THEN 'n' ELSE 'y' END",
]; ];
} }
@ -68,9 +69,14 @@ class ObjectsTableService extends ObjectsTable
static::td($row->object_name) static::td($row->object_name)
]); ]);
$attributes = $tr->getAttributes();
if ($row->host_disabled === 'y' || $row->disabled === 'y') { if ($row->host_disabled === 'y' || $row->disabled === 'y') {
$tr->getAttributes()->add('class', 'disabled'); $attributes->add('class', 'disabled');
} }
if ($row->blacklisted === 'y') {
$attributes->add('class', 'strike-links');
}
return $tr; return $tr;
} }
@ -80,6 +86,10 @@ class ObjectsTableService extends ObjectsTable
['h' => 'icinga_host'], ['h' => 'icinga_host'],
'o.host_id = h.id', 'o.host_id = h.id',
[] []
)->joinLeft(
['hsb' => 'icinga_host_service_blacklist'],
'hsb.service_id = o.id AND hsb.host_id = o.host_id',
[]
)->where('o.service_set_id IS NULL') )->where('o.service_set_id IS NULL')
->order('o.object_name')->order('h.object_name'); ->order('o.object_name')->order('h.object_name');
} }