tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-27 15:54:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Hide feature commands which are not supported by Icinga 2 from the user

Browse Source 
fixes #7930
This commit is contained in:
Johannes Meyer 2015-07-03 14:17:06 +02:00
parent 3e5e6ec64e
commit 74a916d72a
3 changed files with 134 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php
View File

@ -8,7 +8,7 @@ use Icinga\Module\Monitoring\Forms\Command\CommandForm;
use Icinga\Web\Notification; use Icinga\Web\Notification;
/** /**
* Form for enabling or disabling features of Icinga objects, i.e. hosts or services * Form for enabling or disabling features of Icinga instances
*/ */
class ToggleInstanceFeaturesCommandForm extends CommandForm class ToggleInstanceFeaturesCommandForm extends CommandForm
{ {
@ -79,9 +79,10 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
} else { } else {
$notificationDescription = null; $notificationDescription = null;
} }
$toggleDisabled = $this->hasPermission('monitoring/command/feature/instance') ? null : ''; $toggleDisabled = $this->hasPermission('monitoring/command/feature/instance') ? null : '';
$this->addElements(array(
array( $this->addElement(
'checkbox', 'checkbox',
ToggleInstanceFeatureCommand::FEATURE_ACTIVE_HOST_CHECKS, ToggleInstanceFeatureCommand::FEATURE_ACTIVE_HOST_CHECKS,
array( array(
@ -89,8 +90,8 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
'autosubmit' => true, 'autosubmit' => true,
'disabled' => $toggleDisabled 'disabled' => $toggleDisabled
) )
), );
array( $this->addElement(
'checkbox', 'checkbox',
ToggleInstanceFeatureCommand::FEATURE_ACTIVE_SERVICE_CHECKS, ToggleInstanceFeatureCommand::FEATURE_ACTIVE_SERVICE_CHECKS,
array( array(
@ -98,8 +99,8 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
'autosubmit' => true, 'autosubmit' => true,
'disabled' => $toggleDisabled 'disabled' => $toggleDisabled
) )
), );
array( $this->addElement(
'checkbox', 'checkbox',
ToggleInstanceFeatureCommand::FEATURE_EVENT_HANDLERS, ToggleInstanceFeatureCommand::FEATURE_EVENT_HANDLERS,
array( array(
@ -107,8 +108,8 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
'autosubmit' => true, 'autosubmit' => true,
'disabled' => $toggleDisabled 'disabled' => $toggleDisabled
) )
), );
array( $this->addElement(
'checkbox', 'checkbox',
ToggleInstanceFeatureCommand::FEATURE_FLAP_DETECTION, ToggleInstanceFeatureCommand::FEATURE_FLAP_DETECTION,
array( array(
@ -116,8 +117,8 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
'autosubmit' => true, 'autosubmit' => true,
'disabled' => $toggleDisabled 'disabled' => $toggleDisabled
) )
), );
array( $this->addElement(
'checkbox', 'checkbox',
ToggleInstanceFeatureCommand::FEATURE_NOTIFICATIONS, ToggleInstanceFeatureCommand::FEATURE_NOTIFICATIONS,
array( array(
@ -136,8 +137,10 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
), ),
'disabled' => $toggleDisabled 'disabled' => $toggleDisabled
) )
), );
array(
if (! preg_match('~^v2\.\d+\.\d+.*$~', $this->status->program_version)) {
$this->addElement(
'checkbox', 'checkbox',
ToggleInstanceFeatureCommand::FEATURE_HOST_OBSESSING, ToggleInstanceFeatureCommand::FEATURE_HOST_OBSESSING,
array( array(
@ -145,8 +148,8 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
'autosubmit' => true, 'autosubmit' => true,
'disabled' => $toggleDisabled 'disabled' => $toggleDisabled
) )
), );
array( $this->addElement(
'checkbox', 'checkbox',
ToggleInstanceFeatureCommand::FEATURE_SERVICE_OBSESSING, ToggleInstanceFeatureCommand::FEATURE_SERVICE_OBSESSING,
array( array(
@ -154,8 +157,8 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
'autosubmit' => true, 'autosubmit' => true,
'disabled' => $toggleDisabled 'disabled' => $toggleDisabled
) )
), );
array( $this->addElement(
'checkbox', 'checkbox',
ToggleInstanceFeatureCommand::FEATURE_PASSIVE_HOST_CHECKS, ToggleInstanceFeatureCommand::FEATURE_PASSIVE_HOST_CHECKS,
array( array(
@ -163,8 +166,8 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
'autosubmit' => true, 'autosubmit' => true,
'disabled' => $toggleDisabled 'disabled' => $toggleDisabled
) )
), );
array( $this->addElement(
'checkbox', 'checkbox',
ToggleInstanceFeatureCommand::FEATURE_PASSIVE_SERVICE_CHECKS, ToggleInstanceFeatureCommand::FEATURE_PASSIVE_SERVICE_CHECKS,
array( array(
@ -172,8 +175,10 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
'autosubmit' => true, 'autosubmit' => true,
'disabled' => $toggleDisabled 'disabled' => $toggleDisabled
) )
), );
array( }
$this->addElement(
'checkbox', 'checkbox',
ToggleInstanceFeatureCommand::FEATURE_PERFORMANCE_DATA, ToggleInstanceFeatureCommand::FEATURE_PERFORMANCE_DATA,
array( array(
@ -181,9 +186,7 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
'autosubmit' => true, 'autosubmit' => true,
'disabled' => $toggleDisabled 'disabled' => $toggleDisabled
) )
) );
));
return $this;
} }
/** /**
@ -199,6 +202,7 @@ class ToggleInstanceFeaturesCommandForm extends CommandForm
foreach ($this->getValues() as $feature => $enabled) { foreach ($this->getValues() as $feature => $enabled) {
$this->getElement($feature)->setChecked($instanceStatus->{$feature}); $this->getElement($feature)->setChecked($instanceStatus->{$feature});
} }
return $this; return $this;
} }

44
modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php
View File

@ -31,8 +31,8 @@ class ToggleObjectFeaturesCommandForm extends ObjectsCommandForm
public function createElements(array $formData = array()) public function createElements(array $formData = array())
{ {
$toggleDisabled = $this->hasPermission('monitoring/command/feature/object') ? null : ''; $toggleDisabled = $this->hasPermission('monitoring/command/feature/object') ? null : '';
$this->addElements(array(
array( $this->addElement(
'checkbox', 'checkbox',
ToggleObjectFeatureCommand::FEATURE_ACTIVE_CHECKS, ToggleObjectFeatureCommand::FEATURE_ACTIVE_CHECKS,
array( array(
@ -40,8 +40,8 @@ class ToggleObjectFeaturesCommandForm extends ObjectsCommandForm
'autosubmit' => true, 'autosubmit' => true,
'disabled' => $toggleDisabled 'disabled' => $toggleDisabled
) )
), );
array( $this->addElement(
'checkbox', 'checkbox',
ToggleObjectFeatureCommand::FEATURE_PASSIVE_CHECKS, ToggleObjectFeatureCommand::FEATURE_PASSIVE_CHECKS,
array( array(
@ -49,8 +49,10 @@ class ToggleObjectFeaturesCommandForm extends ObjectsCommandForm
'autosubmit' => true, 'autosubmit' => true,
'disabled' => $toggleDisabled 'disabled' => $toggleDisabled
) )
), );
array(
if (! preg_match('~^v2\.\d+\.\d+.*$~', $this->getIcingaVersion())) {
$this->addElement(
'checkbox', 'checkbox',
ToggleObjectFeatureCommand::FEATURE_OBSESSING, ToggleObjectFeatureCommand::FEATURE_OBSESSING,
array( array(
@ -58,8 +60,10 @@ class ToggleObjectFeaturesCommandForm extends ObjectsCommandForm
'autosubmit' => true, 'autosubmit' => true,
'disabled' => $toggleDisabled 'disabled' => $toggleDisabled
) )
), );
array( }
$this->addElement(
'checkbox', 'checkbox',
ToggleObjectFeatureCommand::FEATURE_NOTIFICATIONS, ToggleObjectFeatureCommand::FEATURE_NOTIFICATIONS,
array( array(
@ -67,8 +71,8 @@ class ToggleObjectFeaturesCommandForm extends ObjectsCommandForm
'autosubmit' => true, 'autosubmit' => true,
'disabled' => $toggleDisabled 'disabled' => $toggleDisabled
) )
), );
array( $this->addElement(
'checkbox', 'checkbox',
ToggleObjectFeatureCommand::FEATURE_EVENT_HANDLER, ToggleObjectFeatureCommand::FEATURE_EVENT_HANDLER,
array( array(
@ -76,8 +80,8 @@ class ToggleObjectFeaturesCommandForm extends ObjectsCommandForm
'autosubmit' => true, 'autosubmit' => true,
'disabled' => $toggleDisabled 'disabled' => $toggleDisabled
) )
), );
array( $this->addElement(
'checkbox', 'checkbox',
ToggleObjectFeatureCommand::FEATURE_FLAP_DETECTION, ToggleObjectFeatureCommand::FEATURE_FLAP_DETECTION,
array( array(
@ -85,9 +89,7 @@ class ToggleObjectFeaturesCommandForm extends ObjectsCommandForm
'autosubmit' => true, 'autosubmit' => true,
'disabled' => $toggleDisabled 'disabled' => $toggleDisabled
) )
) );
));
return $this;
} }
/** /**
@ -107,6 +109,7 @@ class ToggleObjectFeaturesCommandForm extends ObjectsCommandForm
$element->setDescription($this->translate('changed')); $element->setDescription($this->translate('changed'));
} }
} }
return $this; return $this;
} }
@ -162,6 +165,17 @@ class ToggleObjectFeaturesCommandForm extends ObjectsCommandForm
} }
} }
} }
return true; return true;
} }
/**
* Fetch and return the program version of the current instance
*
* @return string
*/
protected function getIcingaVersion()
{
return $this->getBackend()->select()->from('programstatus', array('program_version'))->fetchOne();
}
} }

1
modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
View File

@ -76,6 +76,7 @@ abstract class MonitoredObjectController extends Controller
$this->object->populate(); $this->object->populate();
$toggleFeaturesForm = new ToggleObjectFeaturesCommandForm(); $toggleFeaturesForm = new ToggleObjectFeaturesCommandForm();
$toggleFeaturesForm $toggleFeaturesForm
->setBackend($this->backend)
->load($this->object) ->load($this->object)
->setObjects($this->object) ->setObjects($this->object)
->handleRequest(); ->handleRequest();