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

(EventOverview/StateHistory)Form: Method `getValue()` expects only one param

This commit is contained in:
Sukhwinder Dhillon 2023-08-16 10:35:48 +02:00 committed by raviks789
parent 4341a32c1f
commit 7cd89490cc
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/monitoring/application/forms/EventOverviewForm.php
View File

@ -97,19 +97,19 @@ class EventOverviewForm extends Form
public function getFilter() public function getFilter()
{ {
$filters = array(); $filters = array();
if ($this->getValue('statechange', 1)) { if ($this->getValue('statechange')) {
$filters[] = $this->stateChangeFilter(); $filters[] = $this->stateChangeFilter();
} }
if ($this->getValue('comment', 1)) { if ($this->getValue('comment')) {
$filters[] = $this->commentFilter(); $filters[] = $this->commentFilter();
} }
if ($this->getValue('notification', 1)) { if ($this->getValue('notification')) {
$filters[] = $this->notificationFilter(); $filters[] = $this->notificationFilter();
} }
if ($this->getValue('downtime', 1)) { if ($this->getValue('downtime')) {
$filters[] = $this->downtimeFilter(); $filters[] = $this->downtimeFilter();
} }
if ($this->getValue('flapping', 1)) { if ($this->getValue('flapping')) {
$filters[] = $this->flappingFilter(); $filters[] = $this->flappingFilter();
} }
return Filter::matchAny($filters); return Filter::matchAny($filters);

4
modules/monitoring/application/forms/StatehistoryForm.php
View File

@ -31,7 +31,7 @@ class StatehistoryForm extends Form
Filter::expression('type', '=', 'hard_state') Filter::expression('type', '=', 'hard_state')
); );
if ($this->getValue('objecttype', 'hosts') === 'hosts') { if ($this->getValue('objecttype') === 'hosts') {
$objectTypeFilter = Filter::expression('object_type', '=', 'host'); $objectTypeFilter = Filter::expression('object_type', '=', 'host');
} else { } else {
$objectTypeFilter = Filter::expression('object_type', '=', 'service'); $objectTypeFilter = Filter::expression('object_type', '=', 'service');
@ -46,7 +46,7 @@ class StatehistoryForm extends Form
'cnt_unknown_hard' => Filter::expression('state', '=', '3'), 'cnt_unknown_hard' => Filter::expression('state', '=', '3'),
'cnt_ok' => Filter::expression('state', '=', '0') 'cnt_ok' => Filter::expression('state', '=', '0')
); );
$state = $this->getValue('state', 'cnt_critical_hard'); $state = $this->getValue('state');
$stateFilter = $states[$state]; $stateFilter = $states[$state];
if (in_array($state, array('cnt_ok', 'cnt_up'))) { if (in_array($state, array('cnt_ok', 'cnt_up'))) {
return Filter::matchAll($objectTypeFilter, $stateFilter); return Filter::matchAll($objectTypeFilter, $stateFilter);