diff --git a/application/controllers/AuthenticationController.php b/application/controllers/AuthenticationController.php index 402ad3411..662ad6143 100644 --- a/application/controllers/AuthenticationController.php +++ b/application/controllers/AuthenticationController.php @@ -122,7 +122,7 @@ class AuthenticationController extends ActionController if ($backendsWithError) { $this->view->form->getElement('username')->addError( $this->translate( - 'Please note that not all authentication methods where available.' + 'Please note that not all authentication methods were available.' . ' Check the system log or Icinga Web 2 log for more information.' ) ); @@ -135,7 +135,9 @@ class AuthenticationController extends ActionController $authenticated = $backend->authenticate($user); if ($authenticated === true) { $auth->setAuthenticated($user); - $this->rerenderLayout()->redirectNow($redirectUrl); + $this->rerenderLayout()->redirectNow( + Url::fromPath(Url::fromRequest()->getParam('redirect', 'dashboard')) + ); } } } @@ -151,14 +153,16 @@ class AuthenticationController extends ActionController public function logoutAction() { $auth = $this->Auth(); + if (! $auth->isAuthenticated()) { + $this->redirectToLogin(); + } $isRemoteUser = $auth->getUser()->isRemoteUser(); $auth->removeAuthorization(); - if ($isRemoteUser === true) { $this->_helper->layout->setLayout('login'); $this->_response->setHttpResponseCode(401); } else { - $this->rerenderLayout()->redirectToLogin(); + $this->redirectToLogin(); } } } diff --git a/application/forms/Authentication/LoginForm.php b/application/forms/Authentication/LoginForm.php index d878475f2..0afc56749 100644 --- a/application/forms/Authentication/LoginForm.php +++ b/application/forms/Authentication/LoginForm.php @@ -24,7 +24,7 @@ class LoginForm extends Form /** * @see Form::createElements() */ - public function createElements($formData) + public function createElements(array $formData) { $this->addElement( 'text', diff --git a/application/forms/Config/Resource/StatusdatResourceForm.php b/application/forms/Config/Resource/StatusdatResourceForm.php deleted file mode 100644 index d440f139d..000000000 --- a/application/forms/Config/Resource/StatusdatResourceForm.php +++ /dev/null @@ -1,63 +0,0 @@ -setName('form_config_resource_statusdat'); - } - - /** - * @see Form::createElements() - */ - public function createElements(array $formData) - { - $this->addElement( - 'text', - 'name', - array( - 'required' => true, - 'label' => t('Resource Name'), - 'description' => t('The unique name of this resource') - ) - ); - $this->addElement( - 'text', - 'status_file', - array( - 'required' => true, - 'label' => t('Filepath'), - 'description' => t('Location of your icinga status.dat file'), - 'value' => realpath(Icinga::app()->getApplicationDir() . '/../var/status.dat'), - 'validators' => array(new ReadablePathValidator()) - ) - ); - $this->addElement( - 'text', - 'object_file', - array( - 'required' => true, - 'label' => t('Filepath'), - 'description' => t('Location of your icinga objects.cache file'), - 'value' => realpath(Icinga::app()->getApplicationDir() . '/../var/objects.cache'), - 'validators' => array(new ReadablePathValidator()) - ) - ); - - return $this; - } -} diff --git a/application/forms/Config/ResourceConfigForm.php b/application/forms/Config/ResourceConfigForm.php index 9624b9e6a..e4e561ed8 100644 --- a/application/forms/Config/ResourceConfigForm.php +++ b/application/forms/Config/ResourceConfigForm.php @@ -12,7 +12,6 @@ use Icinga\Form\Config\Resource\DbResourceForm; use Icinga\Form\Config\Resource\FileResourceForm; use Icinga\Form\Config\Resource\LdapResourceForm; use Icinga\Form\Config\Resource\LivestatusResourceForm; -use Icinga\Form\Config\Resource\StatusdatResourceForm; use Icinga\Application\Platform; use Icinga\Exception\ConfigurationError; @@ -42,8 +41,6 @@ class ResourceConfigForm extends ConfigForm return new LdapResourceForm(); } elseif ($type === 'livestatus') { return new LivestatusResourceForm(); - } elseif ($type === 'statusdat') { - return new StatusdatResourceForm(); } elseif ($type === 'file') { return new FileResourceForm(); } else { @@ -214,7 +211,6 @@ class ResourceConfigForm extends ConfigForm $resourceTypes = array( 'file' => t('File'), - 'statusdat' => 'Status.dat', 'livestatus' => 'Livestatus', ); if ($resourceType === 'ldap' || Platform::extensionLoaded('ldap')) { diff --git a/config/authentication.ini.in b/config/authentication.ini.in index 71d9e4402..2a2d2a969 100644 --- a/config/authentication.ini.in +++ b/config/authentication.ini.in @@ -18,6 +18,10 @@ backend = ldap resource = internal_ldap user_class = @ldap_user_objectclass@ user_name_attribute = @ldap_attribute_username@ +group_base_dn = @ldap_group_base_dn@ +group_attribute = @ldap_group_attribute@ +group_member_attribute = @ldap_group_member_attribute@ +group_class = @ldap_group_class@ [internal_db_authentication] @internal_auth_disabled@ diff --git a/library/Icinga/Authentication/AdmissionLoader.php b/library/Icinga/Authentication/AdmissionLoader.php index f961fb87c..098afda81 100644 --- a/library/Icinga/Authentication/AdmissionLoader.php +++ b/library/Icinga/Authentication/AdmissionLoader.php @@ -52,12 +52,8 @@ class AdmissionLoader return $permissions; } foreach ($config as $section) { - if ($this->match($section, $username, $groups)) { - foreach ($section as $key => $value) { - if (strpos($key, 'permission') === 0) { - $permissions = array_merge($permissions, String::trimSplit($value)); - } - } + if ($this->match($section, $username, $groups) && isset($section->permissions)) { + $permissions += String::trimSplit($section->permissions); } } return $permissions; @@ -79,12 +75,12 @@ class AdmissionLoader } catch (NotReadableError $e) { return $restrictions; } - foreach ($config as $section) { + foreach ($config as $name => $section) { if ($this->match($section, $username, $groups)) { if (!array_key_exists($section->name, $restrictions)) { $restrictions[$section->name] = array(); } - $restrictions[$section->name][] = $section->restriction; + $restrictions[$section->name][$name] = $section->restriction; } } return $restrictions; diff --git a/library/Icinga/Authentication/Backend/LdapUserBackend.php b/library/Icinga/Authentication/Backend/LdapUserBackend.php index 8e5307fc8..0bf503dee 100644 --- a/library/Icinga/Authentication/Backend/LdapUserBackend.php +++ b/library/Icinga/Authentication/Backend/LdapUserBackend.php @@ -4,6 +4,7 @@ namespace Icinga\Authentication\Backend; +use Icinga\Logger\Logger; use Icinga\User; use Icinga\Authentication\UserBackend; use Icinga\Protocol\Ldap\Connection; @@ -23,11 +24,14 @@ class LdapUserBackend extends UserBackend protected $userNameAttribute; - public function __construct(Connection $conn, $userClass, $userNameAttribute) + protected $groupOptions; + + public function __construct(Connection $conn, $userClass, $userNameAttribute, $groupOptions = null) { $this->conn = $conn; $this->userClass = $userClass; $this->userNameAttribute = $userNameAttribute; + $this->groupOptions = $groupOptions; } /** @@ -83,6 +87,43 @@ class LdapUserBackend extends UserBackend } } + /** + * Retrieve the user groups + * + * @TODO: Subject to change, see #7343 + * + * @param string $dn + * + * @return array|null + */ + public function getGroups($dn) + { + if (empty($this->groupOptions) || ! isset($this->groupOptions['group_base_dn'])) { + return null; + } + + $q = $this->conn->select() + ->setBase($this->groupOptions['group_base_dn']) + ->from( + $this->groupOptions['group_class'], + array($this->groupOptions['group_attribute']) + ) + ->where( + $this->groupOptions['group_member_attribute'], + $dn + ); + + $result = $this->conn->fetchAll($q); + + $groups = array(); + + foreach ($result as $group) { + $groups[] = $group->{$this->groupOptions['group_attribute']}; + } + + return $groups; + } + /** * Test whether the given user exists * @@ -127,10 +168,15 @@ class LdapUserBackend extends UserBackend return false; } try { - return $this->conn->testCredentials( - $this->conn->fetchDN($this->createQuery($user->getUsername())), + $userDn = $this->conn->fetchDN($this->createQuery($user->getUsername())); + $authenticated = $this->conn->testCredentials( + $userDn, $password ); + if ($authenticated) { + $user->setGroups($this->getGroups($userDn)); + } + return $authenticated; } catch (LdapException $e) { // Error during authentication of this specific user throw new AuthenticationException( @@ -177,4 +223,3 @@ class LdapUserBackend extends UserBackend return $users; } } - diff --git a/library/Icinga/Authentication/UserBackend.php b/library/Icinga/Authentication/UserBackend.php index 9e7abd62a..7829210fd 100644 --- a/library/Icinga/Authentication/UserBackend.php +++ b/library/Icinga/Authentication/UserBackend.php @@ -93,26 +93,44 @@ abstract class UserBackend implements Countable $backend = new DbUserBackend($resource); break; case 'msldap': + $groupOptions = array( + 'group_base_dn' => $backendConfig->group_base_dn, + 'group_attribute' => $backendConfig->group_attribute, + 'group_member_attribute' => $backendConfig->group_member_attribute, + 'group_class' => $backendConfig->group_class + ); $backend = new LdapUserBackend( $resource, $backendConfig->get('user_class', 'user'), - $backendConfig->get('user_name_attribute', 'sAMAccountName') + $backendConfig->get('user_name_attribute', 'sAMAccountName'), + $groupOptions ); break; case 'ldap': - if (($userClass = $backendConfig->user_class) === null) { + if ($backendConfig->user_class === null) { throw new ConfigurationError( 'Authentication configuration for backend "%s" is missing the user_class directive', $name ); } - if (($userNameAttribute = $backendConfig->user_name_attribute) === null) { + if ($backendConfig->user_name_attribute === null) { throw new ConfigurationError( 'Authentication configuration for backend "%s" is missing the user_name_attribute directive', $name ); } - $backend = new LdapUserBackend($resource, $userClass, $userNameAttribute); + $groupOptions = array( + 'group_base_dn' => $backendConfig->group_base_dn, + 'group_attribute' => $backendConfig->group_attribute, + 'group_member_attribute' => $backendConfig->group_member_attribute, + 'group_class' => $backendConfig->group_class + ); + $backend = new LdapUserBackend( + $resource, + $backendConfig->user_class, + $backendConfig->user_name_attribute, + $groupOptions + ); break; default: throw new ConfigurationError( diff --git a/library/Icinga/Cli/Params.php b/library/Icinga/Cli/Params.php index 7236dcca2..5c6cbfe8b 100644 --- a/library/Icinga/Cli/Params.php +++ b/library/Icinga/Cli/Params.php @@ -108,6 +108,18 @@ class Params return $this->standalone; } + /** + * Support isset() and empty() checks on options + * + * @param $name + * + * @return bool + */ + public function __isset($name) + { + return isset($this->params[$name]); + } + /** * @see Params::get() */ diff --git a/library/Icinga/Data/Db/DbQuery.php b/library/Icinga/Data/Db/DbQuery.php index b701f3ac0..94765d98f 100644 --- a/library/Icinga/Data/Db/DbQuery.php +++ b/library/Icinga/Data/Db/DbQuery.php @@ -59,6 +59,13 @@ class DbQuery extends SimpleQuery */ protected $count; + /** + * GROUP BY clauses + * + * @var string|array + */ + protected $group; + protected function init() { $this->db = $this->ds->getDbAdapter(); @@ -89,17 +96,21 @@ class DbQuery extends SimpleQuery public function getSelectQuery() { $select = $this->dbSelect(); - // Add order fields to select for postgres distinct queries (#6351) if ($this->hasOrder() && $this->getDatasource()->getDbType() === 'pgsql' && $select->getPart(Zend_Db_Select::DISTINCT) === true) { foreach ($this->getOrder() as $fieldAndDirection) { - list($alias, $field) = explode('.', $fieldAndDirection[0]); - $this->columns[$field] = $fieldAndDirection[0]; + if (array_search($fieldAndDirection[0], $this->columns) === false) { + $this->columns[] = $fieldAndDirection[0]; + } } } + if ($this->group) { + $select->group($this->group); + } + $select->columns($this->columns); $this->applyFilterSql($select); @@ -117,7 +128,7 @@ class DbQuery extends SimpleQuery return $select; } - protected function applyFilterSql($query) + public function applyFilterSql($query) { $where = $this->renderFilter($this->filter); if ($where !== '') { @@ -253,6 +264,7 @@ class DbQuery extends SimpleQuery $this->applyFilterSql($count); if ($this->useSubqueryCount) { + $count->columns($this->columns); $columns = array('cnt' => 'COUNT(*)'); return $this->db->select()->from($count, $columns); } @@ -300,4 +312,17 @@ class DbQuery extends SimpleQuery { return (string) $this->getSelectQuery(); } + + /** + * Add a GROUP BY clause + * + * @param string|array $group + * + * @return $this + */ + public function group($group) + { + $this->group = $group; + return $this; + } } diff --git a/library/Icinga/Data/Filter/FilterExpression.php b/library/Icinga/Data/Filter/FilterExpression.php index c29414166..8378b5ae3 100644 --- a/library/Icinga/Data/Filter/FilterExpression.php +++ b/library/Icinga/Data/Filter/FilterExpression.php @@ -12,6 +12,8 @@ class FilterExpression extends Filter public function __construct($column, $sign, $expression) { + $column = trim($column); + $expression = is_array($expression) ? array_map('trim', $expression) : trim($expression); $this->column = $column; $this->sign = $sign; $this->expression = $expression; diff --git a/library/Icinga/Data/ResourceFactory.php b/library/Icinga/Data/ResourceFactory.php index 30597ad2d..e85413615 100644 --- a/library/Icinga/Data/ResourceFactory.php +++ b/library/Icinga/Data/ResourceFactory.php @@ -10,7 +10,6 @@ use Icinga\Util\ConfigAwareFactory; use Icinga\Exception\ConfigurationError; use Icinga\Data\Db\DbConnection; use Icinga\Protocol\Livestatus\Connection as LivestatusConnection; -use Icinga\Protocol\Statusdat\Reader as StatusdatReader; use Icinga\Protocol\Ldap\Connection as LdapConnection; use Icinga\Protocol\File\FileReader; @@ -102,7 +101,7 @@ class ResourceFactory implements ConfigAwareFactory * * @param Zend_Config $config The configuration for the created resource. * - * @return DbConnection|LdapConnection|LivestatusConnection|StatusdatReader An objects that can be used to access + * @return DbConnection|LdapConnection|LivestatusConnection An object that can be used to access * the given resource. The returned class depends on the configuration property 'type'. * @throws ConfigurationError When an unsupported type is given */ @@ -115,9 +114,6 @@ class ResourceFactory implements ConfigAwareFactory case 'ldap': $resource = new LdapConnection($config); break; - case 'statusdat': - $resource = new StatusdatReader($config); - break; case 'livestatus': $resource = new LivestatusConnection($config->socket); break; @@ -137,7 +133,7 @@ class ResourceFactory implements ConfigAwareFactory * Create a resource from name * * @param string $resourceName - * @return DbConnection|LdapConnection|LivestatusConnection|StatusdatReader + * @return DbConnection|LdapConnection|LivestatusConnection */ public static function create($resourceName) { diff --git a/library/Icinga/Exception/QueryException.php b/library/Icinga/Exception/QueryException.php new file mode 100644 index 000000000..beab3fe53 --- /dev/null +++ b/library/Icinga/Exception/QueryException.php @@ -0,0 +1,12 @@ +filename, $this->fields) - ); + return new FileIterator($this->filename, $this->fields); } /** diff --git a/library/Icinga/Protocol/Statusdat/Exception/ParsingException.php b/library/Icinga/Protocol/Statusdat/Exception/ParsingException.php deleted file mode 100644 index 0947e65bc..000000000 --- a/library/Icinga/Protocol/Statusdat/Exception/ParsingException.php +++ /dev/null @@ -1,13 +0,0 @@ -ref = & $obj; - $this->reader = & $reader; - } - - /** - * @param $attribute - * @return \stdClass - */ - public function __get($attribute) - { - $exploded = explode(".", $attribute); - $result = $this->ref; - - foreach ($exploded as $elem) { - if (isset($result->$elem)) { - $result = $result->$elem; - } else { - return null; - } - } - return $result; - } -} diff --git a/library/Icinga/Protocol/Statusdat/Parser.php b/library/Icinga/Protocol/Statusdat/Parser.php deleted file mode 100644 index 5b3694518..000000000 --- a/library/Icinga/Protocol/Statusdat/Parser.php +++ /dev/null @@ -1,422 +0,0 @@ -file = $file; - $this->icingaState = $baseState; - } - - /** - * Parse the given file handle as an objects file and read object information - */ - public function parseObjectsFile() - { - $DEFINE = strlen('define '); - $this->icingaState = array(); - foreach ($this->file as $line) { - $line = trim($line); - $this->lineCtr++; - if ($line === '' || $line[0] === '#') { - continue; - } - $this->currentObjectType = trim(substr($line, $DEFINE, -1)); - if (!isset($this->icingaState[$this->currentObjectType])) { - $this->icingaState[$this->currentObjectType] = array(); - } - $this->readCurrentObject(); - } - $this->processDeferred(); - } - - /** - * Parse the given file as an status.dat file and read runtime information - * - * @param File $file The file to parse or null to parse the one passed to the constructor - */ - public function parseRuntimeState(File $file = null) - { - if ($file != null) { - $this->file = $file; - } else { - $file = $this->file; - } - - if (!$this->icingaState) { - throw new ProgrammingError('Tried to read runtime state without existing objects data'); - } - $this->overwrites = array(); - foreach ($file as $line) { - $line = trim($line); - $this->lineCtr++; - if ($line === '' || $line[0] === '#') { - continue; - } - $this->currentStateType = trim(substr($line, 0, -1)); - $this->readCurrentState(); - } - } - - /** - * Read the next object from the object.cache file handle - * - * @throws ParsingException - */ - private function readCurrentObject() - { - $monitoringObject = new PrintableObject(); - foreach ($this->file as $line) { - $line = explode("\t", trim($line), 2); - $this->lineCtr++; - if (!$line) { - continue; - } - - // End of object - if ($line[0] === '}') { - $this->registerObject($monitoringObject); - return; - } - if (!isset($line[1])) { - $line[1] = ''; - } - $monitoringObject->{$line[0]} = trim($line[1]); - } - throw new ParsingException('Unexpected EOF in objects.cache, line ' . $this->lineCtr); - } - - /** - * Read the next state from the status.dat file handler - * - * @throws Exception\ParsingException - */ - private function readCurrentState() - { - $statusdatObject = new RuntimeStateContainer(); - - $objectType = $this->getObjectTypeForState(); - - if ($objectType != 'host' && $objectType != 'service') { - $this->skipObject(); // ignore unknown objects - return; - } - if (!isset($this->icingaState[$this->currentObjectType])) { - throw new ParsingException("No $this->currentObjectType objects registered in objects.cache"); - } - $base = & $this->icingaState[$this->currentObjectType]; - $state = $this->skipObject(true); - $statusdatObject->runtimeState = & $state; - $name = $this->getObjectIdentifier($statusdatObject); - - if (!isset($base[$name])) { - throw new ParsingException( - "Unknown object $name " . $this->currentObjectType . ' - ' - . print_r( - $statusdatObject, - true - ) - . "\n" . print_r($base, true) - ); - } - $type = substr($this->currentStateType, strlen($objectType)); - - if ($type == 'status') { - // directly set the status to the status field of the given object - $base[$name]->status = & $statusdatObject; - } else { - if (!isset($base[$name]->$type) || !in_array($base[$name]->$type, $this->overwrites)) { - $base[$name]->$type = array(); - $this->overwrites[] = & $base[$name]->$type; - } - array_push($base[$name]->$type, $statusdatObject); - $this->currentObjectType = $type; - if (!isset($this->icingaState[$type])) { - $this->icingaState[$type] = array(); - } - $this->icingaState[$type][] = &$statusdatObject; - $id = $this->getObjectIdentifier($statusdatObject); - if ($id !== false && isset($this->icingaState[$objectType][$id])) { - $statusdatObject->$objectType = $this->icingaState[$objectType][$id]; - } - } - - return; - - } - - /** - * Get the corresponding object type name for the given state - * - * @return string - */ - private function getObjectTypeForState() - { - $pos = strpos($this->currentStateType, 'service'); - - if ($pos === false) { - $pos = strpos($this->currentStateType, 'host'); - } else { - $this->currentObjectType = 'service'; - return 'service'; - } - - if ($pos === false) { - return $this->currentStateType; - } else { - $this->currentObjectType = 'host'; - return 'host'; - } - - return $this->currentObjectType; - } - - /** - * Skip the current object definition - * - * @param bool $returnString If true, the object string will be returned - * @return string The skipped object if $returnString is true - */ - protected function skipObject($returnString = false) - { - if (!$returnString) { - while (trim($this->file->fgets()) !== '}') { - } - return null; - } else { - $str = ''; - while (($val = trim($this->file->fgets())) !== '}') { - $str .= $val . "\n"; - } - return $str; - } - } - - /** - * Register the given object in the icinga state - * - * @param object $object The monitoring object to register - */ - protected function registerObject(&$object) - { - - $name = $this->getObjectIdentifier($object); - if ($name !== false) { - $this->icingaState[$this->currentObjectType][$name] = &$object; - } - $this->registerObjectAsProperty($object); - } - - /** - * Register the given object as a property in related objects - * - * This registers for example hosts underneath their hostgroup and vice cersa - * - * @param object $object The object to register as a property - */ - protected function registerObjectAsProperty(&$object) - { - if ($this->currentObjectType == 'service' - || $this->currentObjectType == 'host' - || $this->currentObjectType == 'contact') { - return null; - } - $isService = strpos($this->currentObjectType, 'service') !== false; - $isHost = strpos($this->currentObjectType, 'host') !== false; - $isContact = strpos($this->currentObjectType, 'contact') !== false; - $name = $this->getObjectIdentifier($object); - - if ($isService === false && $isHost === false && $isContact === false) { - // this would be error in the parser implementation - return null; - } - $property = $this->currentObjectType; - if ($isService) { - $this->currentObjectType = 'service'; - $property = substr($property, strlen('service')); - } elseif ($isHost) { - $this->currentObjectType = 'host'; - $property = substr($property, strlen('host')); - } elseif ($isContact) { - $this->currentObjectType = 'contact'; - $property = substr($property, strlen('contact')); - } - - if (!isset($this->icingaState[$this->currentObjectType])) { - return $this->deferRegistration($object, $this->currentObjectType . $property); - } - - // @TODO: Clean up, this differates between 1:n and 1:1 references - if (strpos($property, 'group') !== false) { - $sourceIdentifier = $this->getMembers($object); - foreach ($sourceIdentifier as $id) { - $source = $this->icingaState[$this->currentObjectType][$id]; - if (!isset($source->$property)) { - $source->$property = array(); - } - $type = $this->currentObjectType; - if (!isset($object->$type)) { - $object->$type = array(); - } - // add the member to the group object - array_push($object->$type, $source); - // add the group to the member object - array_push($source->$property, $name); - } - } else { - $source = $this->icingaState[$this->currentObjectType][$this->getObjectIdentifier($object)]; - if (!isset($source->$property)) { - $source->$property = array(); - } - - array_push($source->$property, $object); - } - - return null; - } - - /** - * Defer registration of the given object - * - * @param object $object The object to defer - * @param String $objType The name of the object type - */ - protected function deferRegistration($object, $objType) - { - $this->deferred[] = array($object, $objType); - } - - /** - * Process deferred objects - */ - protected function processDeferred() - { - foreach ($this->deferred as $obj) { - $this->currentObjectType = $obj[1]; - $this->registerObjectAsProperty($obj[0]); - } - } - - /** - * Return the resolved members directive of an object - * - * @param object $object The object to get the members from - * @return array An array of member names - */ - protected function getMembers(&$object) - { - if (!isset($object->members)) { - return array(); - } - - $members = explode(',', $object->members); - - if ($this->currentObjectType == 'service') { - $res = array(); - for ($i = 0; $i < count($members); $i += 2) { - $res[] = $members[$i] . ';' . $members[$i + 1]; - } - return $res; - } else { - return $members; - } - - } - - /** - * Return the unique name of the given object - * - * @param object $object The object to retrieve the name from - * @return string The name of the object or null if no name can be retrieved - */ - protected function getObjectIdentifier(&$object) - { - if ($this->currentObjectType == 'contact') { - return $object->contact_name; - } - - if ($this->currentObjectType == 'service') { - return $object->host_name . ';' . $object->service_description; - } - $name = $this->currentObjectType . '_name'; - if (isset($object->{$name})) { - return $object->{$name}; - } - if (isset($object->service_description)) { - return $object->host_name . ';' . $object->service_description; - } elseif (isset($object->host_name)) { - return $object->host_name; - } - return null; - - } - - /** - * Return the internal state of the parser - * - * @return null - */ - public function getRuntimeState() - { - return $this->icingaState; - } -} diff --git a/library/Icinga/Protocol/Statusdat/PrintableObject.php b/library/Icinga/Protocol/Statusdat/PrintableObject.php deleted file mode 100644 index 840a7aa2a..000000000 --- a/library/Icinga/Protocol/Statusdat/PrintableObject.php +++ /dev/null @@ -1,20 +0,0 @@ -contact_name)) { - return $this->contact_name; - } elseif (isset($this->service_description)) { - return $this->service_description; - } elseif (isset($this->host_name)) { - return $this->host_name; - } - return ''; - } -} diff --git a/library/Icinga/Protocol/Statusdat/Query.php b/library/Icinga/Protocol/Statusdat/Query.php deleted file mode 100644 index f3b5ea85e..000000000 --- a/library/Icinga/Protocol/Statusdat/Query.php +++ /dev/null @@ -1,460 +0,0 @@ - array('host'), - 'services' => array('service'), - 'downtimes' => array('downtime'), - 'groups' => array('hostgroup', 'servicegroup'), - 'hostgroups' => array('hostgroup'), - 'servicegroups' => array('servicegroup'), - 'comments' => array('comment'), - 'contacts' => array('contact'), - 'contactgroups' => array('contactgroup') - ); - - /** - * The current StatusDat query that will be applied upon calling fetchAll - * - * @var IQueryPart - */ - private $queryFilter = null; - - /** - * The current query source being used - * - * @var string - */ - private $source = ''; - - /** - * An array containing all columns used for sorting - * - * @var array - */ - protected $orderColumns = array(); - - /** - * An array containig all columns used for (simple) grouping - * - * @var array - */ - private $groupColumns = array(); - - /** - * An optional function callback to use for more specific grouping - * - * @var array - */ - private $groupByFn = null; - - /** - * The scope index for the callback function - */ - const FN_SCOPE = 0; - - /** - * The name index for the callback function - */ - const FN_NAME = 1; - - /** - * Return true if columns are set for this query - * - * @return bool - */ - public function hasColumns() - { - $columns = $this->getColumns(); - return !empty($columns); - } - - /** - * Set the status.dat specific IQueryPart filter to use - * - * @param IQueryPart $filter - */ - public function setQueryFilter($filter) - { - $this->queryFilter = $filter; - } - - /** - * Order the query result by the given columns - * - * @param String|array $columns An array of columns to order by - * @param String $dir The direction (asc or desc) in string form - * - * @return $this Fluent interface - */ - public function order($columns, $dir = null, $isFunction = false) - { - if ($dir && strtolower($dir) == 'desc') { - $dir = self::SORT_DESC; - } else { - $dir = self::SORT_ASC; - } - if (!is_array($columns)) { - $columns = array($columns); - } - - foreach ($columns as $col) { - if (($pos = strpos($col, ' ')) !== false) { - $dir = strtoupper(substr($col, $pos + 1)); - if ($dir === 'DESC') { - $dir = self::SORT_DESC; - } else { - $dir = self::SORT_ASC; - } - $col = substr($col, 0, $pos); - } else { - $col = $col; - } - - $this->orderColumns[] = array($col, $dir); - } - return $this; - } - - /** - * Order the query result using the callback to retrieve values for items - * - * @param array $columns A scope, function array to use for retrieving the values when ordering - * @param String $dir The direction (asc or desc) in string form - * - * @return $this Fluent interface - */ - public function orderByFn(array $callBack, $dir = null) - { - if ($dir && strtolower($dir) == 'desc') { - $dir = self::SORT_DESC; - } else { - $dir = self::SORT_ASC; - } - $this->orderColumns[] = array($callBack, $dir); - } - - - - /** - * Set the query target - * - * @param String $table The table/target to select the query from - * @param array $columns An array of attributes to use (required for fetchPairs()) - * - * @return $this Fluent interface - * @throws IcingaException If the target is unknonw - */ - public function from($table, array $attributes = null) - { - if (!$this->getColumns() && $attributes) { - $this->setColumns($attributes); - } - if (isset(self::$VALID_TARGETS[$table])) { - $this->source = $table; - } else { - throw new IcingaException( - 'Unknown from target for status.dat :%s', - $table - ); - } - return $this; - } - - /** - * Return an index of all objects matching the filter of this query - * - * This index will be used for ordering, grouping and limiting - */ - private function getFilteredIndices($classType = '\Icinga\Protocol\Statusdat\Query\Group') - { - $baseGroup = $this->queryFilter; - $state = $this->ds->getState(); - $result = array(); - $source = self::$VALID_TARGETS[$this->source]; - - foreach ($source as $target) { - - if (! isset($state[$target])) { - continue; - } - - $indexes = array_keys($state[$target]); - if ($baseGroup) { - $baseGroup->setQuery($this); - $idx = array_keys($state[$target]); - $indexes = $baseGroup->filter($state[$target], $idx); - } - if (!isset($result[$target])) { - $result[$target] = $indexes; - } else { - array_merge($result[$target], $indexes); - } - } - return $result; - } - - /** - * Order the given result set - * - * @param array $indices The result set of the query that should be ordered - */ - private function orderIndices(array &$indices) - { - if (!empty($this->orderColumns)) { - foreach ($indices as $type => &$subindices) { - $this->currentType = $type; - usort($subindices, array($this, 'orderResult')); - } - } - } - - /** - * Start a query - * - * This is just a dummy function to allow a more convenient syntax - * - * @return self Fluent interface - */ - public function select() - { - return $this; - } - - /** - * Order implementation called by usort - * - * @param String $a The left object index - * @param Strinv $b The right object index - * @return int 0, 1 or -1, see usort for detail - */ - private function orderResult($a, $b) - { - $o1 = $this->ds->getObjectByName($this->currentType, $a); - $o2 = $this->ds->getObjectByName($this->currentType, $b); - $result = 0; - - foreach ($this->orderColumns as &$col) { - if (is_array($col[0])) { - // sort by function - $result += $col[1] * strnatcasecmp( - $col[0][0]->$col[0][1]($o1), - $col[0][0]->$col[0][1]($o2) - ); - } else { - $result += $col[1] * strnatcasecmp($o1->{$col[0]}, $o2->{$col[0]}); - } - } - return $result; - } - - /** - * Limit the given resultset - * - * @param array $indices The filtered, ordered indices - */ - private function limitIndices(array &$indices) - { - foreach ($indices as $type => $subindices) { - $indices[$type] = array_slice($subindices, $this->getOffset(), $this->getLimit()); - } - } - - /** - * Register the given function for grouping the result - * - * @param String $fn The function to use for grouping - * @param Object $scope An optional scope to use instead of $this - * - * @return self Fluent interface - */ - public function groupByFunction($fn, $scope = null) - { - $this->groupByFn = array($scope ? $scope : $this, $fn); - return $this; - } - - /** - * Group by the given column - * - * @param array|string $columns The columns to use for grouping - * @return self Fluent interface - * @see Query::columnGroupFn() The implementation used for grouping - */ - public function groupByColumns($columns) - { - if (!is_array($columns)) { - $columns = array($columns); - } - $this->groupColumns = $columns; - $this->groupByFn = array($this, 'columnGroupFn'); - return $this; - } - - /** - * The internal handler function used by the group function - * - * @param array $indices The indices to group - * @return array The grouped result set - */ - private function columnGroupFn(array &$indices) - { - $cols = $this->groupColumns; - $result = array(); - foreach ($indices as $type => $subindices) { - foreach ($subindices as $objectIndex) { - $r = $this->ds->getObjectByName($type, $objectIndex); - $hash = ''; - $cols = array(); - foreach ($this->groupColumns as $col) { - $hash = md5($hash . $r->$col); - $cols[$col] = $r->$col; - } - if (!isset($result[$hash])) { - $result[$hash] = (object)array( - 'columns' => (object)$cols, - 'count' => 0 - ); - } - $result[$hash]->count++; - } - } - return array_values($result); - } - - /** - * Query Filter, Order, Group, Limit and return the result set - * - * @return array The resultset matching this query - */ - public function getResult() - { - $indices = $this->getFilteredIndices(); - $this->orderIndices($indices); - if ($this->groupByFn) { - $scope = $this->groupByFn[self::FN_SCOPE]; - $fn = $this->groupByFn[self::FN_NAME]; - - return $scope->$fn($indices); - } - - $this->limitIndices($indices); - - $result = array(); - $state = $this->ds->getState(); - - foreach ($indices as $type => $subindices) { - foreach ($subindices as $index) { - $result[] = & $state[$type][$index]; - } - } - return $result; - } - - - /** - * Apply all filters of this filterable on the datasource - */ - public function applyFilter() - { - $parser = new TreeToStatusdatQueryParser(); - if ($this->getFilter()) { - $query = $parser->treeToQuery($this->getFilter(), $this); - $this->setQueryFilter($query); - } - - } - - /** - * Return only the first row fetched from the result set - * - * @return MonitoringObjectList The monitoring object matching this query - */ - public function fetchRow() - { - $rs = $this->fetchAll(); - $rs->rewind(); - return $rs->current(); - } - - /** - * Fetch the result as an associative array using the first column as the key and the second as the value - * - * @return array An associative array with the result - * @throws IcingaException If no attributes are defined - */ - public function fetchPairs() - { - $result = array(); - if (count($this->getColumns()) < 2) { - throw new IcingaException( - 'Status.dat "fetchPairs()" query expects at least columns to be set in the query expression' - ); - } - $attributes = $this->getColumns(); - - $param1 = $attributes[0]; - $param2 = $attributes[1]; - foreach ($this->fetchAll() as $resultList) { - $result[$resultList->$param1] = $resultList->$param2; - } - - return $result; - } - - /** - * Fetch all results - * - * @return MonitoringObjectList An MonitoringObjectList wrapping the given resultset - */ - public function fetchAll() - { - $this->applyFilter(); - if (!isset($this->cursor)) { - $result = $this->getResult(); - $this->cursor = new MonitoringObjectList($result, $this); - } - return $this->cursor; - } - - /** - * Return the value of the first column for the first row fetched from the result set - */ - public function fetchOne() - { - throw new ProgrammingError('Statusdat/Query::fetchOne() is not implemented yet'); - } - - /** - * Count the number of results - * - * @return int - */ - public function count() - { - $q = clone $this; - $q->limit(null, null); - return count($q->fetchAll()); - } -} diff --git a/library/Icinga/Protocol/Statusdat/Query/Expression.php b/library/Icinga/Protocol/Statusdat/Query/Expression.php deleted file mode 100644 index 1db48df33..000000000 --- a/library/Icinga/Protocol/Statusdat/Query/Expression.php +++ /dev/null @@ -1,415 +0,0 @@ -": - $this->CB = "isGreater"; - break; - case "<": - $this->CB = "isLess"; - break; - case ">=": - $this->CB = "isGreaterEq"; - break; - case "<=": - $this->CB = "isLessEq"; - break; - case "=": - $this->CB = "isEqual"; - break; - case "LIKE": - $this->CB = "isLike"; - break; - case "NOT_LIKE": - $this->CB = "isNotLike"; - break; - case "!=": - $this->CB = "isNotEqual"; - break; - case "IN": - $this->CB = "isIn"; - break; - case "NOT_IN": - $this->CB = "isNotIn"; - break; - default: - throw new IcingaException( - 'Unknown operator %s in expression %s !', - $token, - $this->expression - ); - } - } - - /** - * @param $tokens - * @return mixed - */ - private function extractAggregationFunction(&$tokens) - { - $token = $tokens[0]; - $value = array(); - if (preg_match("/COUNT\{(.*)\}/", $token, $value) == false) { - return $token; - } - $this->function = "count"; - $tokens[0] = $value[1]; - - return null; - } - - /** - * @param $values - */ - private function parseExpression(&$values) - { - $tokenized = preg_split("/ +/", trim($this->expression), 3); - $this->extractAggregationFunction($tokenized); - if (count($tokenized) != 3) { - echo( - "Currently statusdat query expressions must be in " - . "the format FIELD OPERATOR ? or FIELD OPERATOR :value_name" - ); - } - - $this->fields = explode(".", trim($tokenized[0])); - $this->field = $this->fields[count($this->fields) - 1]; - - $this->getOperatorType(trim($tokenized[1])); - $tokenized[2] = trim($tokenized[2]); - - if ($tokenized[2][0] === ":") { - $this->name = substr($tokenized, 1); - $this->value = $values[$this->name]; - } else { - if ($tokenized[2] === "?") { - $this->value = array_shift($values); - } else { - $this->value = trim($tokenized[2]); - } - } - - } - - /** - * @param $expression - * @param $values - * @return $this - */ - public function fromString($expression, &$values) - { - $this->expression = $expression; - $this->parseExpression($values); - return $this; - } - - /** - * @param null $expression - * @param array $values - */ - public function __construct($expression = null, &$values = array()) - { - if ($expression) { - if (!is_array($values)) { - $values = array($values); - } - $this->fromString($expression, $values); - } - - } - - /** - * @param array $base - * @param array $idx - * @return array|mixed - */ - public function filter(array &$base, &$idx = array()) - { - if (!$idx) { - $idx = array_keys($base); - } - $this->basedata = $base; - return array_filter($idx, array($this, "filterFn")); - } - - /** - * @return string - */ - public function getValue() - { - return $this->value; - } - - /** - * @return null - */ - public function getField() - { - return $this->field; - } - - /** - * @param $idx - * @return bool - */ - protected function filterFn($idx) - { - $values = $this->getFieldValues($idx); - - if ($values === false) { - return false; - } - - if ($this->CB == "isIn" || $this->CB == "isNotIn") { - $cmpValues = is_array($this->value) ? $this->value : array($this->value); - foreach ($cmpValues as $cmpValue) { - $this->value = $cmpValue; - foreach ($values as $value) { - if ($this->CB == "isIn" && $this->isLike($value)) { - $this->value = $cmpValues; - return true; - } elseif ($this->CB == "isNotIn" && $this->isNotLike($value)) { - $this->value = $cmpValues; - return true; - } - } - } - $this->value = $cmpValues; - return false; - } - - if ($this->function) { - $values = call_user_func($this->function, $values); - if (!is_array($values)) { - $values = array($values); - } - } - foreach ($values as $val) { - - if (!is_string($val) && !is_numeric($val) && is_object($val)) { - if (isset($val->service_description)) { - $val = $val->service_description; - } elseif (isset($val->host_name)) { - $val = $val->host_name; - } else { - return false; - } - } - if ($this->{$this->CB}($val)) { - return true; - } - } - return false; - } - - /** - * @param $idx - * @return array - */ - private function getFieldValues($idx) - { - $res = $this->basedata[$idx]; - - foreach ($this->fields as $field) { - if (!is_array($res)) { - if ($this->query) { - $res = $this->query->get($res, $field); - continue; - } - - if (!isset($res->$field)) { - $res = array(); - break; - } - $res = $res->$field; - continue; - } - - // it can be that an element contains more than one value, like it - // happens when using comments, in this case we have to create a new - // array that contains the values/objects we're searching - $swap = array(); - foreach ($res as $sub) { - if ($this->query) { - $swap[] = $this->query->get($sub, $field); - continue; - } - if (!isset($sub->$field)) { - continue; - } - if (!is_array($sub->$field)) { - $swap[] = $sub->$field; - } else { - $swap = array_merge($swap, $sub->$field); - } - } - $res = $swap; - } - if (!is_array($res)) { - return array($res); - } - - return $res; - } - - /** - * @param $value - * @return bool - */ - public function isGreater($value) - { - return $value > $this->value; - } - - /** - * @param $value - * @return bool - */ - public function isLess($value) - { - return $value < $this->value; - } - - /** - * @param $value - * @return bool - */ - public function isLike($value) - { - return preg_match("/^" . str_replace("%", ".*", $this->value) . "$/", $value) ? true : false; - } - - /** - * @param $value - * @return bool - */ - public function isNotLike($value) - { - return !preg_match("/^" . str_replace("%", ".*", $this->value) . "$/", $value) ? true : false; - } - - /** - * @param $value - * @return bool - */ - public function isEqual($value) - { - if (!is_numeric($value)) { - return strtolower($value) == strtolower($this->value); - } - return $value == $this->value; - } - - /** - * @param $value - * @return bool - */ - public function isNotEqual($value) - { - return $value != $this->value; - } - - /** - * @param $value - * @return bool - */ - public function isGreaterEq($value) - { - return $value >= $this->value; - } - - /** - * @param $value - * @return bool - */ - public function isLessEq($value) - { - return $value <= $this->value; - } - - /** - * Add additional information about the query this filter belongs to - * - * @param $query - * @return mixed - */ - public function setQuery($query) - { - $this->query = $query; - } -} diff --git a/library/Icinga/Protocol/Statusdat/Query/Group.php b/library/Icinga/Protocol/Statusdat/Query/Group.php deleted file mode 100644 index 2e110843f..000000000 --- a/library/Icinga/Protocol/Statusdat/Query/Group.php +++ /dev/null @@ -1,397 +0,0 @@ -value = $value; - } - - /** - * @return array - */ - public function getItems() - { - return $this->items; - } - - /** - * @return string - */ - public function getType() - { - return $this->type ? $this->type : self::TYPE_AND; - } - - /** - * @param $type - */ - public function setType($type) - { - $this->type = $type; - } - - /** - * @throws IcingaException - */ - private function tokenize() - { - $token = 0; - $subgroupCount = 0; - while ($token != self::EOF) { - - $token = $this->getNextToken(); - - if ($token === self::GROUP_BEGIN) { - - /** - * check if this is a nested group, if so then it's - * considered part of the subexpression - */ - if ($subgroupCount == 0) { - $this->startNewSubExpression(); - } - $subgroupCount++; - continue; - } - if ($token === self::GROUP_END) { - if ($subgroupCount < 1) { - throw new IcingaException( - 'Invalid Query: unexpected \')\' at pos %s', - $this->parsePos - ); - } - $subgroupCount--; - /* - * check if this is a nested group, if so then it's - * considered part of the subexpression - */ - if ($subgroupCount == 0) { - $this->addSubgroupFromExpression(); - } - continue; - } - - if ($token === self::CONJUNCTION_AND && $subgroupCount == 0) { - $this->startNewSubExpression(); - if ($this->type != self::TYPE_AND && $this->type != "") { - $this->createImplicitGroup(self::TYPE_AND); - break; - } else { - $this->type = self::TYPE_AND; - } - continue; - } - if ($token === self::CONJUNCTION_OR && $subgroupCount == 0) { - $this->startNewSubExpression(); - if ($this->type != self::TYPE_OR && $this->type != "") { - $this->createImplicitGroup(self::TYPE_OR); - break; - } else { - - $this->type = self::TYPE_OR; - } - continue; - } - - $this->subExpressionLength = $this->parsePos - $this->subExpressionStart; - } - if ($subgroupCount > 0) { - throw new IcingaException('Unexpected end of query, are you missing a parenthesis?'); - } - - $this->startNewSubExpression(); - } - - /** - * @param $type - */ - private function createImplicitGroup($type) - { - $group = new Group(); - $group->setType($type); - $group->addItem(array_pop($this->items)); - - $group->fromString(substr($this->expression, $this->parsePos), $this->value, $this->expressionClass); - $this->items[] = $group; - $this->parsePos = strlen($this->expression); - - } - - /** - * - */ - private function startNewSubExpression() - { - if ($this->getCurrentSubExpression() != "") { - if (!$this->expressionClass) { - $this->items[] = new Expression($this->getCurrentSubExpression(), $this->value); - } else { - $this->items[] = new $this->expressionClass($this->getCurrentSubExpression(), $this->value); - } - } - - $this->subExpressionStart = $this->parsePos; - $this->subExpressionLength = 0; - } - - /** - * @return string - */ - private function getCurrentSubExpression() - { - - return substr($this->expression, $this->subExpressionStart, $this->subExpressionLength); - } - - /** - * - */ - private function addSubgroupFromExpression() - { - - if (!$this->expressionClass) { - $this->items[] = new Group($this->getCurrentSubExpression(), $this->value); - } else { - $group = new Group(); - $group->fromString($this->getCurrentSubExpression(), $this->value, $this->expressionClass); - $this->items[] = $group; - } - $this->subExpressionStart = $this->parsePos; - $this->subExpressionLength = 0; - } - - /** - * @return bool - */ - private function isEOF() - { - if ($this->parsePos >= strlen($this->expression)) { - return true; - } - return false; - } - - /** - * @return int|string - */ - private function getNextToken() - { - if ($this->isEOF()) { - return self::EOF; - } - - // skip whitespaces - while ($this->expression[$this->parsePos] == " ") { - $this->parsePos++; - if ($this->isEOF()) { - return self::EOF; - } - } - if ($this->expression[$this->parsePos] == self::GROUP_BEGIN) { - $this->parsePos++; - return self::GROUP_BEGIN; - } - if ($this->expression[$this->parsePos] == self::GROUP_END) { - $this->parsePos++; - return self::GROUP_END; - } - if (substr_compare( - $this->expression, - self::CONJUNCTION_AND, - $this->parsePos, - strlen(self::CONJUNCTION_AND), - true - ) === 0) { - $this->parsePos += strlen(self::CONJUNCTION_AND); - return self::CONJUNCTION_AND; - } - if (substr_compare( - $this->expression, - self::CONJUNCTION_OR, - $this->parsePos, - strlen(self::CONJUNCTION_OR), - true - ) === 0) { - $this->parsePos += strlen(self::CONJUNCTION_OR); - return self::CONJUNCTION_OR; - } - $this->parsePos++; - return self::EXPRESSION; - } - - /** - * @param $ex - * @return $this - */ - public function addItem($ex) - { - $this->items[] = $ex; - return $this; - } - - /** - * @param $expression - * @param array $value - * @param null $expressionClass - * @return $this - */ - public function fromString($expression, &$value = array(), $expressionClass = null) - { - $this->expression = $expression; - $this->value = & $value; - $this->expressionClass = $expressionClass; - - $this->tokenize(); - return $this; - } - - /** - * @param null $expression - * @param array $value - */ - public function __construct($expression = null, &$value = array()) - { - if ($expression) { - $this->fromString($expression, $value); - } - } - - /** - * @param array $base - * @param null $idx - * @return array|null - */ - public function filter(array &$base, &$idx = null) - { - if ($this->type == self::TYPE_OR) { - $idx = array(); - foreach ($this->items as &$subFilter) { - $baseKeys = array_keys($base); - $subFilter->setQuery($this->query); - $idx += $subFilter->filter($base, $baseKeys); - } - } else { - if (!$idx) { - $idx = array_keys($base); - } - foreach ($this->items as $subFilter) { - $subFilter->setQuery($this->query); - $idx = array_intersect($idx, $subFilter->filter($base, $idx)); - } - } - - return $idx; - } - - /** - * Add additional information about the query this filter belongs to - * - * @param $query - * @return mixed - */ - public function setQuery($query) - { - $this->query = $query; - } -} diff --git a/library/Icinga/Protocol/Statusdat/Query/IQueryPart.php b/library/Icinga/Protocol/Statusdat/Query/IQueryPart.php deleted file mode 100644 index 1dcd434df..000000000 --- a/library/Icinga/Protocol/Statusdat/Query/IQueryPart.php +++ /dev/null @@ -1,36 +0,0 @@ -noCache = $noCache; - if (isset($config->no_cache)) { - $this->noCache = $config->no_cache; - } - $this->config = $config; - $this->parser = $parser; - - if (!$this->noCache) { - $this->cache = $this->initializeCaches($config); - if ($this->fromCache()) { - $this->createHostServiceConnections(); - return; - } - } - - if (!$this->lastState) { - $this->parseObjectsCacheFile(); - } - if (!$this->hasRuntimeState) { - - } - $this->parseStatusDatFile(); - if (!$noCache && $this->newState) { - $this->statusCache->save($this->parser->getRuntimeState(), 'object' . md5($this->config->object_file)); - } - $this->createHostServiceConnections(); - - } - - /** - * Initialize the internal caches if enabled - * - * @throws ConfigurationError - */ - private function initializeCaches() - { - $defaultCachePath = self::STATUSDAT_DEFAULT_CACHE_PATH; - $cachePath = $this->config->get('cache_path', $defaultCachePath); - $maxCacheLifetime = intval($this->config->get('cache_path', self::DEFAULT_CACHE_LIFETIME)); - $cachingEnabled = true; - if (!is_writeable($cachePath)) { - Logger::warning( - 'Can\'t cache Status.dat backend; make sure cachepath %s is writable by the web user. ' - . 'Caching is now disabled', - $cachePath - ); - $cachePath = null; - } - $backendOptions = array( - 'cache_dir' => $cachePath - ); - // the object cache might exist for months and is still valid - $this->objectCache = $this->initCache($this->config->object_file, $backendOptions, null, $cachingEnabled); - $this->statusCache = $this->initCache( - $this->config->status_file, - $backendOptions, - $maxCacheLifetime, - $cachingEnabled - ); - } - - /** - * Init the Cache backend in Zend - * - * @param String $file The file to use as the cache master file - * @param Zend_Config $backend The backend configuration to use - * @param integer $lifetime The lifetime of the cache - * - * @return \Zend_Cache_Core|\Zend_Cache_Frontend - */ - private function initCache($file, $backendConfig, $lifetime) - { - $frontendOptions = array( - 'lifetime' => $lifetime, - 'automatic_serialization' => true, - 'master_files' => array($file) - ); - return \Zend_Cache::factory('Core', 'File', $frontendOptions, $backendConfig); - } - - /** - * Read the current cache state - * - * @return bool True if the state is the same as the icinga state - */ - private function fromCache() - { - if (!$this->readObjectsCache()) { - $this->newState = true; - return false; - } - if (!$this->readStatusCache()) { - $this->newState = true; - return false; - } - return true; - } - - /** - * Read the object.cache file from the Zend_Cache backend - * - * @return bool True if the file could be loaded from cache - */ - private function readObjectsCache() - { - $this->lastState = $this->objectCache->load('object' . md5($this->config->object_file)); - if ($this->lastState == false) { - return false; - } - - return true; - } - - /** - * Read the status.dat file from the Zend_Cache backend - * - * @return bool True if the file could be loaded from cache - */ - private function readStatusCache() - { - if (!isset($this->stateCache)) { - return true; - } - $statusInfo = $this->stateCache->load('state' . md5($this->config->status_file)); - if ($statusInfo == false) { - return false; - } - - $this->hasRuntimeState = true; - return true; - } - - /** - * Take the status.dat and objects.cache and connect all services to hosts - * - */ - private function createHostServiceConnections() - { - if (!isset($this->lastState["service"])) { - return; - } - foreach ($this->lastState["host"] as &$host) { - $host->host = $host; - } - foreach ($this->lastState["service"] as &$service) { - $service->service = &$service; // allow easier querying - $host = &$this->lastState["host"][$service->host_name]; - if (!isset($host->services)) { - $host->services = array(); - } - $host->services[$service->service_description] = & $service; - $service->host = & $host; - } - } - - /** - * Parse the object.cache file and update the current state - * - * @throws ConfigurationError If the object.cache couldn't be read - */ - private function parseObjectsCacheFile() - { - if (!is_readable($this->config->object_file)) { - throw new ConfigurationError( - 'Can\'t read object-file "%s", check your configuration', - $this->config->object_file - ); - } - if (!$this->parser) { - $this->parser = new Parser(new File($this->config->object_file, 'r')); - } - $this->parser->parseObjectsFile(); - $this->lastState = $this->parser->getRuntimeState(); - } - - /** - * Parse the status.dat file and update the current state - * - * @throws ConfigurationError If the status.dat couldn't be read - */ - private function parseStatusDatFile() - { - if (!is_readable($this->config->status_file)) { - throw new ConfigurationError( - 'Can\'t read status-file %s, check your configuration', - $this->config->status_file - ); - } - if (!$this->parser) { - $this->parser = new Parser(new File($this->config->status_file, 'r'), $this->lastState); - } - $this->parser->parseRuntimeState(new File($this->config->status_file, 'r')); - $this->lastState = $this->parser->getRuntimeState(); - if (!$this->noCache) { - $this->statusCache->save(array("true" => true), "state" . md5($this->config->object_file)); - } - } - - /** - * Create a new Query - * - * @return Query The query to operate on - */ - public function select() - { - return new Query($this); - } - - /** - * Return the internal state of the status.dat - * - * @return mixed The internal status.dat representation - */ - public function getState() - { - return $this->lastState; - } - - - /** - * Return the object with the given name and type - * - * @param String $type The type of the object to return (service, host, servicegroup...) - * @param String $name The name of the object - * - * @return ObjectContainer An object container wrapping the result or null if the object doesn't exist - */ - public function getObjectByName($type, $name) - { - if (isset($this->lastState[$type]) && isset($this->lastState[$type][$name])) { - return new ObjectContainer($this->lastState[$type][$name], $this); - } - return null; - } - - /** - * Get an array containing all names of monitoring objects with the given type - * - * @param String $type The type of object to get the names for - * @return array An array of names or null if the type does not exist - */ - public function getObjectNames($type) - { - return isset($this->lastState[$type]) ? array_keys($this->lastState[$type]) : null; - } -} diff --git a/library/Icinga/Protocol/Statusdat/RuntimeStateContainer.php b/library/Icinga/Protocol/Statusdat/RuntimeStateContainer.php deleted file mode 100644 index b15dfe4bb..000000000 --- a/library/Icinga/Protocol/Statusdat/RuntimeStateContainer.php +++ /dev/null @@ -1,72 +0,0 @@ -runtimeState = $str; - } - - /** - * Return true if the argument exists - * - * @param String $attr The argument to retrieve - * @return bool True if it exists, otherwise false - */ - public function __isset($attr) - { - try { - $this->__get($attr); - return true; - } catch (\InvalidArgumentException $e) { - return false; - } - } - - /** - * Return the given attribute - * - * If the container string is not yet parsed, this will happen here - * - * @param String $attr The attribute to retrieve - * @return mixed The value of the attribute - * @throws \InvalidArgumentException When the attribute does not exist - */ - public function __get($attr) - { - $start = strpos($this->runtimeState, $attr . "="); - if ($start === false) { - throw new \InvalidArgumentException("Unknown property $attr"); - } - - $start += strlen($attr . "="); - $len = strpos($this->runtimeState, "\n", $start) - $start; - $this->$attr = trim(substr($this->runtimeState, $start, $len)); - - return $this->$attr; - } -} diff --git a/library/Icinga/Protocol/Statusdat/View/AccessorStrategy.php b/library/Icinga/Protocol/Statusdat/View/AccessorStrategy.php deleted file mode 100644 index 4e4bc76a1..000000000 --- a/library/Icinga/Protocol/Statusdat/View/AccessorStrategy.php +++ /dev/null @@ -1,42 +0,0 @@ -dataSet = $dataset; - $this->position = 0; - $this->dataView = $dataView; - } - - public function count() - { - return count($this->dataSet); - } - - public function setPosition($pos) - { - $this->position = $pos; - } - - /** - * (PHP 5 >= 5.0.0)
- * Return the current element - * @link http://php.net/manual/en/iterator.current.php - * @return mixed Can return any type. - */ - public function current() - { - if ($this->dataView) { - return $this; - } - - return $this->dataSet[$this->position]; - } - - /** - * (PHP 5 >= 5.0.0)
- * Move forward to next element - * @link http://php.net/manual/en/iterator.next.php - * @return void Any returned value is ignored. - */ - public function next() - { - $this->position++; - } - - /** - * (PHP 5 >= 5.0.0)
- * Return the key of the current element - * @link http://php.net/manual/en/iterator.key.php - * @return mixed scalar on success, or null on failure. - */ - public function key() - { - return $this->position; - } - - /** - * (PHP 5 >= 5.0.0)
- * Checks if current position is valid - * @link http://php.net/manual/en/iterator.valid.php - * @return boolean The return value will be casted to boolean and then evaluated. - * Returns true on success or false on failure. - */ - public function valid() - { - return $this->position < count($this->dataSet); - } - - /** - * (PHP 5 >= 5.0.0)
- * Rewind the Iterator to the first element - * @link http://php.net/manual/en/iterator.rewind.php - * @return void Any returned value is ignored. - */ - public function rewind() - { - $this->position = 0; - } - - public function __isset($name) - { - return $this->dataView->exists($this->dataSet[$this->position], $name); - } - - public function __get($name) - { - return $this->dataView->get($this->dataSet[$this->position], $name); - } - - public function __set($name, $value) - { - throw new IcingaException('Setting is currently not available for objects'); - } - - public function offsetExists($offset) - { - return count($this->dataSet) < $offset; - } - - public function offsetGet($offset) - { - $res = new MonitoringObjectList($this->dataSet, $this->dataView); - $res->position = $offset; - return $res; - } - - public function offsetSet($offset, $value) - { - // non mutable - } - - public function offsetUnset($offset) - { - // non mutable - } -} diff --git a/library/Icinga/User.php b/library/Icinga/User.php index 03aa1bcd2..659767644 100644 --- a/library/Icinga/User.php +++ b/library/Icinga/User.php @@ -198,7 +198,9 @@ class User public function setPermissions(array $permissions) { natcasesort($permissions); - $this->permissions = array_combine($permissions, $permissions); + if (! empty($permissions)) { + $this->permissions = array_combine($permissions, $permissions); + } return $this; } diff --git a/library/Icinga/Util/Enumerate.php b/library/Icinga/Util/Enumerate.php deleted file mode 100644 index 0861f7f65..000000000 --- a/library/Icinga/Util/Enumerate.php +++ /dev/null @@ -1,62 +0,0 @@ -iterator = $iterator; - } - - public function rewind() - { - $this->iterator->rewind(); - $this->key = 0; - } - - public function next() - { - $this->iterator->next(); - ++$this->key; - } - - public function valid() - { - return $this->iterator->valid(); - } - - public function current() - { - return $this->iterator->current(); - } - - public function key() - { - return $this->key; - } -} diff --git a/library/Icinga/Util/EnumeratingFilterIterator.php b/library/Icinga/Util/EnumeratingFilterIterator.php new file mode 100644 index 000000000..44ef9b0c8 --- /dev/null +++ b/library/Icinga/Util/EnumeratingFilterIterator.php @@ -0,0 +1,37 @@ +index = 0; + } + + /** + * @return int + */ + public function key() + { + return $this->index++; + } +} diff --git a/library/Icinga/Util/String.php b/library/Icinga/Util/String.php index b64d9e524..0bebb06e7 100644 --- a/library/Icinga/Util/String.php +++ b/library/Icinga/Util/String.php @@ -21,4 +21,18 @@ class String { return array_map('trim', explode($delimiter, $value)); } + + /** + * Uppercase the first character of each word in a string assuming and removing the underscore as word separator + * + * Converts 'first_name' to 'firstName' for example. + * + * @param string $name + * + * @return string + */ + public static function cname($name) + { + return str_replace(' ', '', ucwords(str_replace('_', ' ', strtolower($name)))); + } } diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php index 2763e073e..b32a03075 100644 --- a/library/Icinga/Web/Form.php +++ b/library/Icinga/Web/Form.php @@ -5,6 +5,7 @@ namespace Icinga\Web; use LogicException; +use Zend_Config; use Zend_Form; use Zend_View_Interface; use Icinga\Application\Icinga; @@ -81,6 +82,19 @@ class Form extends Zend_Form */ protected $uidElementName = 'formUID'; + /** + * Default element decorators + * + * @var array + */ + public static $defaultElementDecorators = array( + 'ViewHelper', + 'Errors', + array('Description', array('tag' => 'span', 'class' => 'description')), + 'Label', + array('HtmlTag', array('tag' => 'div')) + ); + /** * Create a new form * @@ -105,16 +119,6 @@ class Form extends Zend_Form throw new LogicException('The option `onSuccess\' is not callable'); } - if (! isset($options['elementDecorators'])) { - $options['elementDecorators'] = array( - 'ViewHelper', - 'Errors', - array('Description', array('tag' => 'span', 'class' => 'description')), - 'Label', - array('HtmlTag', array('tag' => 'div')) - ); - } - parent::__construct($options); } @@ -417,23 +421,35 @@ class Form extends Zend_Form /** * Create a new element * - * Additionally, all structural form element decorators by Zend are replaced with our own ones. + * Icinga Web 2 loads its own default element decorators. For loading Zend's default element decorators set the + * `disableLoadDefaultDecorators' option to any other value than `true'. For loading custom element decorators use + * the 'decorators' option. * * @param string $type String element type * @param string $name The name of the element to add - * @param array $options The options for the element + * @param mixed $options The options for the element * * @return Zend_Form_Element * - * @see Zend_Form::createElement() + * @see Form::$defaultElementDecorators For Icinga Web 2's default element decorators. */ public function createElement($type, $name, $options = null) { - if (is_array($options) && ! isset($options['disableLoadDefaultDecorators'])) { - $options['disableLoadDefaultDecorators'] = true; + if ($options !== null) { + if ($options instanceof Zend_Config) { + $options = $options->toArray(); + } + if (! isset($options['decorators']) + && ! array_key_exists('disabledLoadDefaultDecorators', $options) + ) { + $options['decorators'] = static::$defaultElementDecorators; + } + } else { + $options = array('decorators' => static::$defaultElementDecorators); } $el = parent::createElement($type, $name, $options); + if ($el && $el->getAttrib('autosubmit')) { $el->addDecorator(new NoScriptApply()); // Non-JS environments $class = $el->getAttrib('class'); diff --git a/library/Icinga/Web/Form/Element/CsrfCounterMeasure.php b/library/Icinga/Web/Form/Element/CsrfCounterMeasure.php index 722b1d323..e9bc37edd 100644 --- a/library/Icinga/Web/Form/Element/CsrfCounterMeasure.php +++ b/library/Icinga/Web/Form/Element/CsrfCounterMeasure.php @@ -4,8 +4,8 @@ namespace Icinga\Web\Form\Element; -use Zend_Form_Element_Xhtml; use Icinga\Web\Session; +use Icinga\Web\Form\FormElement; use Icinga\Web\Form\InvalidCSRFTokenException; /** @@ -13,7 +13,7 @@ use Icinga\Web\Form\InvalidCSRFTokenException; * * You must not set a value to successfully use this element, just give it a name and you're good to go. */ -class CsrfCounterMeasure extends Zend_Form_Element_Xhtml +class CsrfCounterMeasure extends FormElement { /** * Default form view helper to use for rendering @@ -22,14 +22,26 @@ class CsrfCounterMeasure extends Zend_Form_Element_Xhtml */ public $helper = 'formHidden'; + /** + * Counter measure element is required + * + * @var bool + */ + protected $_ignore = true; + + /** + * Ignore element when retrieving values at form level + * + * @var bool + */ + protected $_required = true; + /** * Initialize this form element */ public function init() { - $this->setRequired(true); // Not requiring this element would not make any sense - $this->setIgnore(true); // We do not want this element's value being retrieved by Form::getValues() - $this->setDecorators(array('ViewHelper')); + $this->addDecorator('ViewHelper'); $this->setValue($this->generateCsrfToken()); } diff --git a/library/Icinga/Web/Form/Element/DateTimePicker.php b/library/Icinga/Web/Form/Element/DateTimePicker.php index 47f9b26e9..728262827 100644 --- a/library/Icinga/Web/Form/Element/DateTimePicker.php +++ b/library/Icinga/Web/Form/Element/DateTimePicker.php @@ -5,27 +5,15 @@ namespace Icinga\Web\Form\Element; use DateTime; -use Zend_Form_Element; +use Icinga\Web\Form; +use Icinga\Web\Form\FormElement; use Icinga\Web\Form\Validator\DateTimeValidator; /** * A date-and-time input control - * - * @method DateTime getValue() */ -class DateTimePicker extends Zend_Form_Element +class DateTimePicker extends FormElement { - /** - * Disable default decorators - * - * \Icinga\Web\Form sets default decorators for elements. - * - * @var bool - * - * @see \Icinga\Web\Form::__construct() For default element decorators. - */ - protected $_disableLoadDefaultDecorators = true; - /** * Form view helper to use for rendering * @@ -54,7 +42,7 @@ class DateTimePicker extends Zend_Form_Element /** * (non-PHPDoc) - * @see \Zend_Form_Element::init() For the method documentation. + * @see Zend_Form_Element::init() For the method documentation. */ public function init() { diff --git a/library/Icinga/Web/Form/Element/Note.php b/library/Icinga/Web/Form/Element/Note.php index 700bea107..78881ab44 100644 --- a/library/Icinga/Web/Form/Element/Note.php +++ b/library/Icinga/Web/Form/Element/Note.php @@ -5,35 +5,42 @@ namespace Icinga\Web\Form\Element; use Zend_Form_Element; +use Icinga\Web\Form; /** - * Implements note element for Zend forms + * A note */ class Note extends Zend_Form_Element { /** - * Disable default decorators - * - * \Icinga\Web\Form sets default decorators for elements. - * - * @var bool - * - * @see \Icinga\Web\Form::__construct() For default element decorators. - */ - protected $_disableLoadDefaultDecorators = true; - - /** - * Name of the view helper + * Form view helper to use for rendering * * @var string */ public $helper = 'formNote'; /** - * Return true to ensure redrawing + * Ignore element when retrieving values at form level * - * @param mixed $value The value of to validate (ignored) - * @return bool Always true + * @var bool + */ + protected $_ignore = true; + + /** + * (non-PHPDoc) + * @see Zend_Form_Element::init() For the method documentation. + */ + public function init() + { + $this->setDecorators(Form::$defaultElementDecorators); + } + + /** + * Validate element value (pseudo) + * + * @param mixed $value Ignored + * + * @return bool Always true */ public function isValid($value) { diff --git a/library/Icinga/Web/Form/Element/Number.php b/library/Icinga/Web/Form/Element/Number.php index 75c08165c..836142514 100644 --- a/library/Icinga/Web/Form/Element/Number.php +++ b/library/Icinga/Web/Form/Element/Number.php @@ -4,24 +4,13 @@ namespace Icinga\Web\Form\Element; -use Zend_Form_Element; +use Icinga\Web\Form\FormElement; /** * A number input control */ -class Number extends Zend_Form_Element +class Number extends FormElement { - /** - * Disable default decorators - * - * \Icinga\Web\Form sets default decorators for elements. - * - * @var bool - * - * @see \Icinga\Web\Form::__construct() For default element decorators. - */ - protected $_disableLoadDefaultDecorators = true; - /** * Form view helper to use for rendering * diff --git a/library/Icinga/Web/Form/FormElement.php b/library/Icinga/Web/Form/FormElement.php new file mode 100644 index 000000000..690be1acf --- /dev/null +++ b/library/Icinga/Web/Form/FormElement.php @@ -0,0 +1,62 @@ +_disableLoadDefaultDecorators === true; + } + + /** + * Load default decorators + * + * Icinga Web 2 loads its own default element decorators. For loading Zend's default element decorators set + * FormElement::$_disableLoadDefaultDecorators to false. + * + * @return this + * @see Form::$defaultElementDecorators For Icinga Web 2's default element decorators. + */ + public function loadDefaultDecorators() + { + if ($this->loadDefaultDecoratorsIsDisabled()) { + return $this; + } + + if (! isset($this->_disableLoadDefaultDecorators)) { + $decorators = $this->getDecorators(); + if (empty($decorators)) { + // Load Icinga Web 2's default element decorators + $this->addDecorators(Form::$defaultElementDecorators); + } + } else { + // Load Zend's default decorators + parent::loadDefaultDecorators(); + } + return $this; + } +} diff --git a/library/Icinga/Web/Widget/Tabs.php b/library/Icinga/Web/Widget/Tabs.php index 716d5a959..d79453a01 100644 --- a/library/Icinga/Web/Widget/Tabs.php +++ b/library/Icinga/Web/Widget/Tabs.php @@ -23,6 +23,7 @@ class Tabs extends AbstractWidget implements Countable EOT; @@ -40,6 +41,18 @@ EOT; EOT; + /** + * Template used for the close-button + * + * @var string + */ + private $closeTpl = <<< 'EOT' +
  • + X +
    • +EOT; + + /** * This is where single tabs added to this container will be stored * @@ -61,6 +74,21 @@ EOT; */ private $dropdownTabs = array(); + /** + * Whether the tabs should contain a close-button + * + * @var bool + */ + private $closeTab = true; + + /** + * Set whether the current tab is closable + */ + public function hideCloseButton() + { + $this->closeTab = false; + } + /** * Activate the tab with the given name * @@ -235,6 +263,11 @@ EOT; return $tabs; } + private function renderCloseTab() + { + return $this->closeTpl; + } + /** * Render to HTML * @@ -249,6 +282,7 @@ EOT; $html = $this->baseTpl; $html = str_replace('{TABS}', $this->renderTabs(), $html); $html = str_replace('{DROPDOWN}', $this->renderDropdownTabs(), $html); + $html = str_replace('{CLOSE}', $this->closeTab ? $this->renderCloseTab() : '', $html); return $html; } diff --git a/modules/monitoring/application/controllers/HostsController.php b/modules/monitoring/application/controllers/HostsController.php index 8298f456b..48b068705 100644 --- a/modules/monitoring/application/controllers/HostsController.php +++ b/modules/monitoring/application/controllers/HostsController.php @@ -43,6 +43,13 @@ class Monitoring_HostsController extends Controller public function showAction() { + $this->getTabs()->add( + 'show', + array( + 'title' => t('Hosts'), + 'url' => Url::fromRequest() + ) + )->activate('show'); $this->setAutorefreshInterval(15); $checkNowForm = new CheckNowCommandForm(); $checkNowForm diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php index 5f50eda13..9648145b7 100644 --- a/modules/monitoring/application/controllers/ListController.php +++ b/modules/monitoring/application/controllers/ListController.php @@ -265,6 +265,9 @@ class Monitoring_ListController extends Controller */ public function downtimesAction() { + if ($url = $this->hasBetterUrl()) { + return $this->redirectNow($url); + } $this->addTitleTab('downtimes'); $this->setAutorefreshInterval(12); $query = $this->backend->select()->from('downtime', array( @@ -309,6 +312,9 @@ class Monitoring_ListController extends Controller */ public function notificationsAction() { + if ($url = $this->hasBetterUrl()) { + return $this->redirectNow($url); + } $this->addTitleTab('notifications'); $this->setAutorefreshInterval(15); $query = $this->backend->select()->from('notification', array( @@ -328,6 +334,9 @@ class Monitoring_ListController extends Controller public function contactsAction() { + if ($url = $this->hasBetterUrl()) { + return $this->redirectNow($url); + } $this->addTitleTab('contacts'); $query = $this->backend->select()->from('contact', array( 'contact_name', @@ -364,14 +373,17 @@ class Monitoring_ListController extends Controller public function statehistorysummaryAction() { + if ($url = $this->hasBetterUrl()) { + return $this->redirectNow($url); + } $this->addTitleTab('statehistorysummary', 'State Summary'); $form = new StatehistoryForm(); $form->setEnctype(Zend_Form::ENCTYPE_URLENCODED); $form->setMethod('get'); $form->setTokenDisabled(); - $form->setRequest($this->getRequest()); - $form->buildForm(); + $form->setUidDisabled(); + $form->render(); $this->view->form = $form; $orientation = $this->params->shift('horizontal', 0) ? 'horizontal' : 'vertical'; @@ -391,11 +403,7 @@ class Monitoring_ListController extends Controller 'stateHistorySummary', array('day', $form->getValue('state')) ); - $this->params->shift('objecttype'); - $this->params->shift('from'); - $this->params->shift('to'); - $this->params->shift('state'); - $this->params->shift('btn_submit'); + $this->params->remove(array('objecttype', 'from', 'to', 'state', 'btn_submit')); $this->applyFilters($query); $this->view->summary = $query->getQuery()->fetchAll(); $this->view->column = $form->getValue('state'); @@ -405,6 +413,9 @@ class Monitoring_ListController extends Controller public function contactgroupsAction() { + if ($url = $this->hasBetterUrl()) { + return $this->redirectNow($url); + } $this->addTitleTab('contactgroups'); $query = $this->backend->select()->from('contactgroup', array( 'contactgroup_name', @@ -434,6 +445,9 @@ class Monitoring_ListController extends Controller public function commentsAction() { + if ($url = $this->hasBetterUrl()) { + return $this->redirectNow($url); + } $this->addTitleTab('comments'); $this->setAutorefreshInterval(12); $query = $this->backend->select()->from('comment', array( @@ -554,6 +568,9 @@ class Monitoring_ListController extends Controller public function servicematrixAction() { + if ($url = $this->hasBetterUrl()) { + return $this->redirectNow($url); + } $this->addTitleTab('servicematrix'); $this->setAutorefreshInterval(15); $query = $this->backend->select()->from('serviceStatus', array( diff --git a/modules/monitoring/application/controllers/ServicesController.php b/modules/monitoring/application/controllers/ServicesController.php index 633ff521b..c421ed881 100644 --- a/modules/monitoring/application/controllers/ServicesController.php +++ b/modules/monitoring/application/controllers/ServicesController.php @@ -43,6 +43,13 @@ class Monitoring_ServicesController extends Controller public function showAction() { + $this->getTabs()->add( + 'show', + array( + 'title' => t('Services'), + 'url' => Url::fromRequest() + ) + )->activate('show'); $this->setAutorefreshInterval(15); $checkNowForm = new CheckNowCommandForm(); $checkNowForm diff --git a/modules/monitoring/application/controllers/ShowController.php b/modules/monitoring/application/controllers/ShowController.php index 8a399c250..129903ce0 100644 --- a/modules/monitoring/application/controllers/ShowController.php +++ b/modules/monitoring/application/controllers/ShowController.php @@ -37,7 +37,7 @@ class Monitoring_ShowController extends Controller public function init() { $this->view->object = MonitoredObject::fromParams($this->params); - if ($this->view->object->fetch() === false) { + if ($this->view->object && $this->view->object->fetch() === false) { throw new Zend_Controller_Action_Exception($this->translate('Host or service not found')); } diff --git a/modules/monitoring/application/forms/Config/BackendConfigForm.php b/modules/monitoring/application/forms/Config/BackendConfigForm.php index e2cdf210c..079ea538a 100644 --- a/modules/monitoring/application/forms/Config/BackendConfigForm.php +++ b/modules/monitoring/application/forms/Config/BackendConfigForm.php @@ -45,8 +45,8 @@ class BackendConfigForm extends ConfigForm { $resources = array(); foreach ($resourceConfig as $name => $resource) { - if ($resource->type === 'db' || $resource->type === 'statusdat' || $resource->type === 'livestatus') { - $resources[$resource->type === 'db' ? 'ido' : strtolower($resource->type)][] = $name; + if ($resource->type === 'db' || $resource->type === 'livestatus') { + $resources[$resource->type === 'db' ? 'ido' : 'livestatus'][$name] = $name; } } @@ -192,9 +192,6 @@ class BackendConfigForm extends ConfigForm if ($resourceType === 'ido' || array_key_exists('ido', $this->resources)) { $resourceTypes['ido'] = 'IDO Backend'; } - if ($resourceType === 'statusdat' || array_key_exists('statusdat', $this->resources)) { - $resourceTypes['statusdat'] = 'Status.dat'; - } if ($resourceType === 'livestatus' || array_key_exists('livestatus', $this->resources)) { $resourceTypes['livestatus'] = 'Livestatus'; } diff --git a/modules/monitoring/application/forms/StatehistoryForm.php b/modules/monitoring/application/forms/StatehistoryForm.php index d4219bfd9..ed5710454 100644 --- a/modules/monitoring/application/forms/StatehistoryForm.php +++ b/modules/monitoring/application/forms/StatehistoryForm.php @@ -48,11 +48,9 @@ class StatehistoryForm extends Form } /** - * Create the confirmation form - * - * @see Form::create() + * @see Form::createElements() */ - public function create() + public function createElements(array $formData) { $this->addElement( 'select', @@ -137,8 +135,6 @@ class StatehistoryForm extends Form ) ); } - - $this->enableAutoSubmit(array('from', 'objecttype', 'state')); $this->addElement( 'button', 'btn_submit', diff --git a/modules/monitoring/application/views/helpers/ResolveComments.php b/modules/monitoring/application/views/helpers/ResolveComments.php deleted file mode 100644 index 6f62ee1d2..000000000 --- a/modules/monitoring/application/views/helpers/ResolveComments.php +++ /dev/null @@ -1,33 +0,0 @@ - translate('No hosts matching the filter') ?> -

    translate('Summary For %u Hosts'), count($objects)) ?>

    - - - - - - - - -
    translate('%u Hosts'), array_sum(array_values($hostStates))) ?>
    - hostStatesPieChart ?> - - + translate('Hosts (%u)'), array_sum(array_values($hostStates))) ?> + +
    + hostStatesPieChart ?> +
    +
    + $count) { + echo sprintf('%s: %u
    ', strtoupper($text), $count); + } ?> +
    - foreach (array_filter($hostStates) as $text => $count) { - echo sprintf('%s: %u
    ', strtoupper($text), $count); - } - - ?> -
    +

    + translate('%u Hosts'), + count($objects)) + ?> +

    @@ -32,8 +29,6 @@
    -
    -
    @@ -53,7 +48,7 @@ -

    +

    translatePlural( '%u Unhandled Host Problem', @@ -62,7 +57,7 @@ ), count($unhandledObjects) ) ?> -

    +
    diff --git a/modules/monitoring/application/views/scripts/services/show.phtml b/modules/monitoring/application/views/scripts/services/show.phtml index 4d5d46e05..802aa8ef6 100644 --- a/modules/monitoring/application/views/scripts/services/show.phtml +++ b/modules/monitoring/application/views/scripts/services/show.phtml @@ -5,39 +5,34 @@ translate('No services matching the filter') ?> -

    translate('Summary For %u Services'), count($objects)) ?>

    - - - - - - - - - - - -
    translate('%u Services'), array_sum(array_values($serviceStates))) ?>translate('%u Hosts'), array_sum(array_values($hostStates))) ?>
    - serviceStatesPieChart ?> - - $count) { - echo sprintf('%s: %u
    ', strtoupper($text), $count); - } +
    +
    + translate('Services (%u)'), array_sum(array_values($serviceStates))) ?> +
    +
    + serviceStatesPieChart ?> +
    +
    + $count) { + echo sprintf(' %s: %u
    ', strtoupper($text), $count); + } ?> +
    +
    - ?> -     		- hostStatesPieChart ?> - - $count) { - echo sprintf('%s: %u
    ', strtoupper($text), $count); - } - - ?> -
    +
    +
    + translate('Hosts (%u)'), array_sum(array_values($hostStates))) ?> +
    +
    + hostStatesPieChart ?> +
    +
    + $count) { + echo sprintf('%s: %u
    ', strtoupper($text), $count); + } ?> +
    +
    @@ -45,7 +40,6 @@
    -
    @@ -66,7 +60,7 @@
    -

    +

    translatePlural( '%u Unhandled Service Problem', @@ -75,7 +69,7 @@ ), count($unhandledObjects) ) ?> -

    +
    diff --git a/modules/monitoring/application/views/scripts/show/components/contacts.phtml b/modules/monitoring/application/views/scripts/show/components/contacts.phtml index 550c87e12..5cb0a1d51 100644 --- a/modules/monitoring/application/views/scripts/show/components/contacts.phtml +++ b/modules/monitoring/application/views/scripts/show/components/contacts.phtml @@ -5,7 +5,7 @@ if (! empty($object->contacts)) { $list = array(); foreach ($object->contacts as $contact) { $list[] = $this->qlink($contact->contact_alias, 'monitoring/show/contact', array( - 'contact_name' => $contact->contact_name + 'contact' => $contact->contact_name )); } @@ -24,7 +24,7 @@ if (! empty($object->contactgroups)) { $list[] = $this->qlink( $contactgroup->contactgroup_alias, 'monitoring/list/contactgroups', - array('contactgroup_name' => $contactgroup->contactgroup_name) + array('contactgroup' => $contactgroup->contactgroup_name) ); } diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php index aef50ebdb..346f2458a 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php @@ -8,39 +8,39 @@ class ContactgroupQuery extends IdoQuery { protected $columnMap = array( 'contactgroups' => array( - 'contactgroup_name' => 'cgo.name1 COLLATE latin1_general_ci', - 'contactgroup_alias' => 'cg.alias', + 'contactgroup' => 'cgo.name1 COLLATE latin1_general_ci', + 'contactgroup_name' => 'cgo.name1 COLLATE latin1_general_ci', + 'contactgroup_alias' => 'cg.alias', ), 'contacts' => array( - 'contact_name' => 'co.name1 COLLATE latin1_general_ci', - 'contact_alias' => 'c.alias', - 'contact_email' => 'c.email_address', - 'contact_pager' => 'c.pager_address', - 'contact_has_host_notfications' => 'c.host_notifications_enabled', - 'contact_has_service_notfications' => 'c.service_notifications_enabled', - 'contact_can_submit_commands' => 'c.can_submit_commands', - 'contact_notify_service_recovery' => 'c.notify_service_recovery', - 'contact_notify_service_warning' => 'c.notify_service_warning', - 'contact_notify_service_critical' => 'c.notify_service_critical', - 'contact_notify_service_unknown' => 'c.notify_service_unknown', - 'contact_notify_service_flapping' => 'c.notify_service_flapping', - 'contact_notify_service_downtime' => 'c.notify_service_recovery', - 'contact_notify_host_recovery' => 'c.notify_host_recovery', - 'contact_notify_host_down' => 'c.notify_host_down', - 'contact_notify_host_unreachable' => 'c.notify_host_unreachable', - 'contact_notify_host_flapping' => 'c.notify_host_flapping', - 'contact_notify_host_downtime' => 'c.notify_host_downtime', + 'contact' => 'co.name1 COLLATE latin1_general_ci', + 'contact_name' => 'co.name1 COLLATE latin1_general_ci', + 'contact_alias' => 'c.alias', + 'contact_email' => 'c.email_address', + 'contact_pager' => 'c.pager_address', + 'contact_has_host_notfications' => 'c.host_notifications_enabled', + 'contact_has_service_notfications' => 'c.service_notifications_enabled', + 'contact_can_submit_commands' => 'c.can_submit_commands', + 'contact_notify_service_recovery' => 'c.notify_service_recovery', + 'contact_notify_service_warning' => 'c.notify_service_warning', + 'contact_notify_service_critical' => 'c.notify_service_critical', + 'contact_notify_service_unknown' => 'c.notify_service_unknown', + 'contact_notify_service_flapping' => 'c.notify_service_flapping', + 'contact_notify_service_downtime' => 'c.notify_service_recovery', + 'contact_notify_host_recovery' => 'c.notify_host_recovery', + 'contact_notify_host_down' => 'c.notify_host_down', + 'contact_notify_host_unreachable' => 'c.notify_host_unreachable', + 'contact_notify_host_flapping' => 'c.notify_host_flapping', + 'contact_notify_host_downtime' => 'c.notify_host_downtime', ), 'hosts' => array( - 'host_object_id' => 'ho.object_id', - 'host_name' => 'ho.name1', - 'host' => 'ho.name1' + 'host' => 'ho.name1', + 'host_name' => 'ho.name1' ), 'services' => array( - 'service_object_id' => 'so.object_id', - 'service_host_name' => 'so.name1 COLLATE latin1_general_ci', - 'service' => 'so.name2 COLLATE latin1_general_ci', - 'service_description' => 'so.name2 COLLATE latin1_general_ci', + 'service' => 'so.name2 COLLATE latin1_general_ci', + 'service_description' => 'so.name2 COLLATE latin1_general_ci', + 'service_host_name' => 'so.name1 COLLATE latin1_general_ci' ) ); diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php index c1e12a1ee..ab1947f7e 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/GroupsummaryQuery.php @@ -44,7 +44,6 @@ class GroupSummaryQuery extends IdoQuery $columns = array( 'object_type', 'host_state', - 'host_name' ); // Prepend group column since we'll use columns index 0 later for grouping @@ -61,6 +60,9 @@ class GroupSummaryQuery extends IdoQuery 'in_downtime' => 'host_in_downtime' ) ); + if (in_array('servicegroup', $this->desiredColumns)) { + $hosts->group(array('sgo.name1', 'ho.object_id', 'state', 'acknowledged', 'in_downtime')); + } $services = $this->createSubQuery( 'Status', $columns + array( @@ -77,7 +79,7 @@ class GroupSummaryQuery extends IdoQuery } $union = $this->db->select()->union(array($hosts, $services), Zend_Db_Select::SQL_UNION_ALL); - $this->select->from(array('statussummary' => $union), array($groupColumn))->group(array($groupColumn)); + $this->select->from(array('statussummary' => $union), array())->group(array($groupColumn)); $this->joinedVirtualTables = array( 'servicestatussummary' => true, diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php index d3aca9934..e390aa114 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php @@ -8,6 +8,29 @@ use Zend_Db_Expr; class StatusQuery extends IdoQuery { + /** + * This mode represents whether we are in HostStatus or ServiceStatus + * + * Implemented for `distinct as workaround + * + * @TODO Subject to change, see #7344 + * + * @var string + */ + protected $mode; + + /** + * Sets the mode of the current query + * + * @TODO Subject to change, see #7344 + * + * @param string $mode + */ + public function setMode($mode) + { + $this->mode = $mode; + } + protected $allowCustomVars = true; protected $columnMap = array( @@ -430,6 +453,12 @@ class StatusQuery extends IdoQuery array() ); + // @TODO Subject to change, see #7344 + if ($this->mode === 'host' || $this->mode === 'service') { + $this->useSubqueryCount = true; + $this->distinct(); + } + return $this; } @@ -449,7 +478,11 @@ class StatusQuery extends IdoQuery . ' AND hgo.is_active = 1', array() ); - + // @TODO Subject to change, see #7344 + if ($this->mode === 'service') { + $this->distinct(); + $this->useSubqueryCount = true; + } return $this; } @@ -471,6 +504,14 @@ class StatusQuery extends IdoQuery array() ); + // @TODO Subject to change, see #7344 + if ($this->mode === 'host' || $this->mode === 'service') { + $this->distinct(); + } + if ($this->mode === 'host') { + $this->useSubqueryCount = true; + } + return $this; } diff --git a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/CommentQuery.php b/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/CommentQuery.php deleted file mode 100644 index 27b554ec8..000000000 --- a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/CommentQuery.php +++ /dev/null @@ -1,83 +0,0 @@ - 'comment_id', - 'comment_internal_id' => 'comment_id', - 'comment_data' => 'comment_data', - 'comment_author' => 'author', - 'comment_timestamp' => 'entry_time', - 'comment_is_persistent' => 'persistent', - 'host_name' => 'host_name', - 'host' => 'host_name', - ); - - public static $handlerParameters = array( - 'comment_objecttype_id' => 'getCommentObjectType', - 'comment_type' => 'getCommentType', - 'comment_expiration_timestamp' => 'getExpirationTime', - 'service' => 'getServiceDescription', - 'service_name' => 'getServiceDescription', - 'service_description' => 'getServiceDescription' - ); - - public function getServiceDescription(&$obj) - { - if (isset($obj->service_description)) { - return $obj->service_description; - } - return ''; - } - - public function getExpirationTime(&$obj) - { - if ($obj->expires) { - return $obj->expire_time; - } else { - return null; - } - } - - public function getCommentObjectType(&$obj) - { - if (isset($obj->service_description)) { - return 2; - } else { - return 1; - } - } - - public function getCommentType(&$obj) - { - switch ($obj->entry_type) { - case 1: - return 'comment'; - case 2: - return 'downtime'; - case 3: - return 'flapping'; - case 4: - return 'ack'; - } - return ''; - - } - - public function getObjectType(&$obj) - { - return isset($obj->service_description) ? 'service ': 'host'; - } - - public function selectBase() - { - $this->select()->from("comments", array()); - } -} diff --git a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/ContactQuery.php b/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/ContactQuery.php deleted file mode 100644 index d4ea895e3..000000000 --- a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/ContactQuery.php +++ /dev/null @@ -1,133 +0,0 @@ - 'contact_name', - 'contact_alias' => 'alias', - 'contact_email' => 'email', - 'contact_pager' => 'pager', - 'contact_has_host_notfications' => 'host_notifications_enabled', - 'contact_has_service_notfications' => 'service_notifications_enabled', - 'contact_can_submit_commands' => 'can_submit_commands', - 'contact_notify_host_timeperiod' => 'host_notification_period', - 'contact_notify_service_timeperiod'=> 'service_notification_period', - 'contact_service_notification_options' => 'service_notification_options', - 'contact_host_notification_options' => 'host_notification_options', - 'contactgroup_name' => 'group.contactgroup_name', - 'contactgroup_alias' => 'group.alias' - ); - - public static $handlerParameters = array( - 'contact_notify_service_recovery' => 'getServiceRecoveryFlag', - 'contact_notify_service_warning' => 'getServiceWarningFlag', - 'contact_notify_service_critical' => 'getServiceCriticalFlag', - 'contact_notify_service_unknown' => 'getServiceUnknownFlag', - 'contact_notify_service_flapping' => 'getServiceFlappingFlag', - 'contact_notify_service_downtime' => 'getServiceDowntimeFlag', - 'contact_notify_host_recovery' => 'getHostRecoveryFlag', - 'contact_notify_host_down' => 'getHostDownFlag', - 'contact_notify_host_unreachable' => 'getHostUnreachableFlag', - 'contact_notify_host_flapping' => 'getHostFlappingFlag', - 'contact_notify_host_downtime' => 'getHostDowntimeFlag', - 'host_name' => 'getHost', - 'host' => 'getHost', - 'service_host_name' => 'getHost', - 'service' => 'getService', - 'service_description' => 'getService' - ); - - - public function getHost(&$obj) - { - $result = array(); - foreach ($this->state['host'] as $values) { - if (!isset($values->contacts)) { - continue; - } - if (stripos($values->contacts, $obj->contacts) !== false) { - $result[] = $values; - } - } - return $result; - } - - public function getService(&$obj) - { - $result = array(); - foreach ($this->state['service'] as $values) { - if (!isset($values->contacts)) { - continue; - } - if (stripos($values->contact_groups, $obj->contacts) !== false) { - $result[] = $values; - } - } - return $result; - } - - public function getServiceRecoveryFlag(&$obj) - { - return stripos($obj->service_notification_options, 'r') === false ? 0 : 1; - } - - public function getServiceWarningFlag(&$obj) - { - return stripos($obj->service_notification_options, 'w') === false ? 0 : 1; - } - - public function getServiceCriticalFlag(&$obj) - { - return stripos($obj->service_notification_options, 'c') === false ? 0 : 1; - } - - public function getServiceUnknownFlag(&$obj) - { - return stripos($obj->service_notification_options, 'u') === false ? 0 : 1; - } - - public function getServiceFlappingFlag(&$obj) - { - return stripos($obj->service_notification_options, 'f') === false ? 0 : 1; - } - - public function getServiceDowntimeFlag(&$obj) - { - return stripos($obj->service_notification_options, 's') === false ? 0 : 1; - } - - public function getHostRecoveryFlag(&$obj) - { - return stripos($obj->host_notification_options, 'r') === false ? 0 : 1; - } - - public function getHostDownFlag(&$obj) - { - return stripos($obj->host_notification_options, 'd') === false ? 0 : 1; - } - - public function getHostUnreachableFlag(&$obj) - { - return stripos($obj->host_notification_options, 'u') === false ? 0 : 1; - } - - public function getHostFlappingFlag(&$obj) - { - return stripos($obj->host_notification_options, 'f') === false ? 0 : 1; - } - - public function getHostDowntimeFlag(&$obj) - { - return strpos($obj->host_notification_options, 's') === false ? 0 : 1; - } - - public function selectBase() - { - $this->state = $this->ds->getState(); - $this->select()->from("contacts", array()); - } -} diff --git a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/ContactgroupQuery.php b/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/ContactgroupQuery.php deleted file mode 100644 index 11b7f4b44..000000000 --- a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/ContactgroupQuery.php +++ /dev/null @@ -1,61 +0,0 @@ - 'contactgroup_name', - 'contactgroup_alias' => 'alias', - 'contact_name' => 'contact.contact_name', - 'contact_alias' => 'contact.alias', - 'contact_email' => 'contact.email', - 'contact_pager' => 'contact.pager', - 'contact_has_host_notfications' => 'contact.host_notifications_enabled', - 'contact_has_service_notfications' => 'contact.service_notifications_enabled', - 'contact_can_submit_commands' => 'contact.can_submit_commands', - 'contact_notify_host_timeperiod' => 'contact.host_notification_period', - 'contact_notify_service_timeperiod' => 'contact.service_notification_period', - 'contact_service_notification_options' => 'contact.service_notification_options', - 'contact_host_notification_options' => 'contact.host_notification_options', - ); - - public static $handlerParameters = array( - 'host_name' => 'getHosts', - 'host' => 'getHosts', - 'service_host_name' => 'getHosts', - 'service' => 'getService', - 'service_description' => 'getService' - ); - - public function getHosts(&$obj) - { - $result = array(); - foreach ($this->state['host'] as $values) { - if (stripos($values->contact_groups, $obj->contactgroup_name) !== false) { - $result[] = $values; - } - } - return $result; - } - - public function getService(&$obj) - { - $result = array(); - foreach ($this->state['service'] as $values) { - if (stripos($values->contact_groups, $obj->contactgroup_name) !== false) { - $result[] = $values; - } - } - return $result; - } - - public function selectBase() - { - $this->state = $this->ds->getState(); - return $this->select()->from("contactgroups", array()); - - } -} diff --git a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/DowntimeQuery.php b/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/DowntimeQuery.php deleted file mode 100644 index d0d8e1eaa..000000000 --- a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/DowntimeQuery.php +++ /dev/null @@ -1,79 +0,0 @@ - 'author', - 'downtime_comment' => 'comment', - 'downtime_duration' => 'duration', - 'downtime_end' => 'end_time', - 'downtime_was_started' => 'was_started', - 'downtime_is_fixed' => 'fixed', - 'downtime_is_in_effect' => 'is_in_effect', - 'downtime_trigger_time' => 'trigger_time', - 'downtime_triggered_by_id' => 'triggered_by_id', - 'downtime_internal_downtime_id' => 'downtime_id', - 'downtime_scheduled_start_time' => 'start_time', - 'host' => 'host_name', - 'host_name' => 'host_name', - 'service_host_name' => 'host_name' - ); - - public static $handlerParameters = array( - 'object_type' => 'getObjectType', - 'downtime_start' => 'getDowntimeStart', - 'downtime_is_flexible' => 'getFlexibleFlag', - 'service_description' => 'getServiceDescription' - ); - - public static $fieldTypes = array( - 'downtime_end' => self::TIMESTAMP, - 'downtime_trigger_time' => self::TIMESTAMP, - 'downtime_start' => self::TIMESTAMP - ); - - public function getServiceDescription(&$obj) - { - if (isset ($obj->service_description)) { - return $obj->service_description; - } - return ''; - } - - - public function getDowntimeStart(&$obj) - { - if ($obj->trigger_time != '0') { - return $obj->trigger_time; - } else { - return $obj->start_time; - } - } - - - public function getFlexibleFlag(&$obj) - { - return $obj->fixed ? 0 : 1; - } - - public function getObjectType(&$obj) - { - return isset($obj->service_description) ? 'service ': 'host'; - } - - public function selectBase() - { - $this->select()->from("downtimes", array()); - } -} diff --git a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/GroupsummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/GroupsummaryQuery.php deleted file mode 100644 index 1168d6da3..000000000 --- a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/GroupsummaryQuery.php +++ /dev/null @@ -1,248 +0,0 @@ - 'hostgroup_name', - 'servicegroup' => 'servicegroup_name' - ); - - public static $handlerParameters = array( - 'hosts_up' => 'getHostUpSum', - 'hosts_unreachable_handled' => 'getHostUnreachableSum', - 'hosts_unreachable_unhandled' => 'getHostUnreachableUnhandledSum', - 'hosts_down_handled' => 'getHostDownSum', - 'hosts_down_unhandled' => 'getHostDownUnhandledSum', - 'hosts_pending' => 'getHostPendingSum', - 'services_ok' => 'getServiceOkSum', - 'services_unknown_handled' => 'getServiceUnknownSum', - 'services_unknown_unhandled' => 'getServiceUnknownUnhandledSum', - 'services_critical_handled' => 'getServiceCriticalSum', - 'services_critical_unhandled' => 'getServiceCriticalUnhandledSum', - 'services_warning_handled' => 'getServiceWarningSum', - 'services_warning_unhandled' => 'getServiceWarningUnhandledSum', - 'services_pending' => 'getServicePendingSum', - - ); - - private function getMembers(&$obj, $hint = null) - { - if (!isset($obj->service) && !isset($obj->host)) { - return null; - } - $memberList = isset($obj->service) ? $obj->service : $obj->host; - - if (isset($obj->host) && $hint == 'service') { - $result = array(); - foreach ($memberList as &$member) { - if (isset($member->services)) { - $result = $result + $member->services; - } - } - return $result; - } - return $memberList; - } - - private function getMembersByCriteria(&$obj, $type, $namefield, $criteriaFn) - { - $memberList = $this->getMembers($obj, $type); - if ($memberList === null) { - return 0; - } - $ids = array(); - foreach ($memberList as $member) { - $name = $member->$type->$namefield; - if ($namefield === 'service_description') { - $name .= ';' . $member->$type->host_name; - } - - if (isset($ids[$name])) { - continue; - } else { - if ($criteriaFn($member->$type)) { - $ids[$name] = true; - } - } - } - return count(array_keys($ids)); - } - - public function getHostUpSum(&$obj) - { - return $this->getMembersByCriteria($obj, 'host', 'host_name', function($member) { - return ($member->status->current_state == 0 - && $member->status->has_been_checked); - }); - } - - public function getHostUnreachableSum(&$obj) - { - return $this->getMembersByCriteria($obj, 'host', 'host_name', function($member) { - return ($member->status->current_state == 2 - && $member->status->has_been_checked - && ( - $member->status->problem_has_been_acknowledged - || $member->status->scheduled_downtime_depth - ) - ); - }); - } - - public function getHostUnreachableUnhandledSum(&$obj) - { - return $this->getMembersByCriteria($obj, 'host', 'host_name', function($member) { - return ($member->status->current_state == 2 - && $member->status->has_been_checked - && !( - $member->status->problem_has_been_acknowledged - || $member->status->scheduled_downtime_depth - ) - ); - }); - } - - public function getHostDownSum(&$obj) - { - return $this->getMembersByCriteria($obj, 'host', 'host_name', function($member) { - return ($member->status->current_state == 1 - && $member->status->has_been_checked - && ( - $member->status->problem_has_been_acknowledged - || $member->status->scheduled_downtime_depth - ) - ); - }); - } - - public function getHostDownUnhandledSum(&$obj) - { - return $this->getMembersByCriteria($obj, 'host', 'host_name', function($member) { - return ($member->status->current_state == 1 - && $member->status->has_been_checked - && !( - $member->status->problem_has_been_acknowledged - || $member->status->scheduled_downtime_depth - ) - ); - }); - } - - public function getHostPendingSum(&$obj) - { - return $this->getMembersByCriteria($obj, 'host', 'host_name', function($member) { - return (!$member->status->has_been_checked); - }); - } - - public function getServiceOkSum(&$obj) - { - return $this->getMembersByCriteria($obj, 'service', 'service_description', function($member) { - return ($member->status->current_state == 0 - && $member->status->has_been_checked); - }); - } - - public function getServiceUnknownSum(&$obj) - { - return $this->getMembersByCriteria($obj, 'service', 'service_description', function($member) { - - return ($member->status->current_state == 3 - && $member->status->has_been_checked - && ( - $member->status->problem_has_been_acknowledged - || $member->status->scheduled_downtime_depth - ) - ); - }); - } - - public function getServiceUnknownUnhandledSum(&$obj) - { - return $this->getMembersByCriteria($obj, 'service', 'service_description', function($member) { - return ($member->status->current_state == 3 - && $member->status->has_been_checked - && !( - $member->status->problem_has_been_acknowledged - || $member->status->scheduled_downtime_depth - ) - ); - }); - } - - public function getServiceCriticalSum(&$obj) - { - return $this->getMembersByCriteria($obj, 'service', 'service_description', function($member) { - return ($member->status->current_state == 2 - && $member->status->has_been_checked - && ( - $member->status->problem_has_been_acknowledged - || $member->status->scheduled_downtime_depth - ) - ); - }); - } - - public function getServiceCriticalUnhandledSum(&$obj) - { - return $this->getMembersByCriteria($obj, 'service', 'service_description', function($member) { - return ($member->status->current_state == 2 - && $member->status->has_been_checked - && !( - $member->status->problem_has_been_acknowledged - || $member->status->scheduled_downtime_depth - ) - ); - }); - } - - public function getServiceWarningSum(&$obj) - { - return $this->getMembersByCriteria($obj, 'service', 'service_description', function($member) { - return ($member->status->current_state == 1 - && $member->status->has_been_checked - && !( - $member->status->problem_has_been_acknowledged - || $member->status->scheduled_downtime_depth - ) - ); - }); - } - - public function getServiceWarningUnhandledSum(&$obj) - { - return $this->getMembersByCriteria($obj, 'service', 'service_description', function($member) { - return ($member->status->current_state == 1 - && $member->status->has_been_checked - && ( - $member->status->problem_has_been_acknowledged - || $member->status->scheduled_downtime_depth - ) - ); - }); - } - - public function getServicePendingSum(&$obj) - { - return $this->getMembersByCriteria($obj, 'service', 'service_description', function($member) { - return (!$member->status->has_been_checked); - }); - } - - private function getTarget() - { - if (in_array('servicegroup', $this->getColumns())) { - return 'servicegroups'; - } - return 'hostgroups'; - } - - public function selectBase() - { - $this->select()->from($this->getTarget(), array()); - } -} diff --git a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/HostgroupQuery.php b/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/HostgroupQuery.php deleted file mode 100644 index 3855375c2..000000000 --- a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/HostgroupQuery.php +++ /dev/null @@ -1,25 +0,0 @@ - 'hostgroup_name', - 'hostgroup_name' => 'hostgroup_name', - 'hostgroup_alias' => 'alias', - 'host' => 'host.host_name', - 'host_name' => 'host.host_name' - ); - - public function selectBase() - { - $this->select()->from("hostgroups", array()); - } -} \ No newline at end of file diff --git a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/HostlistQuery.php b/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/HostlistQuery.php deleted file mode 100644 index 48ee82284..000000000 --- a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/HostlistQuery.php +++ /dev/null @@ -1,33 +0,0 @@ -select()->from("hosts", array()); - } -} diff --git a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/ServicegroupQuery.php b/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/ServicegroupQuery.php deleted file mode 100644 index 8d3f9a4ec..000000000 --- a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/ServicegroupQuery.php +++ /dev/null @@ -1,28 +0,0 @@ - 'servicegroup_name', - 'servicegroup_name' => 'servicegroup_name', - 'servicegroup_alias' => 'alias', - 'host' => 'service.host_name', - 'host_name' => 'service.host_name', - 'service' => 'service.service_description', - 'service_description'=> 'service.service_description' - - ); - - public function selectBase() - { - $this->select()->from("servicegroups", array()); - } -} \ No newline at end of file diff --git a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/ServicegroupsummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/ServicegroupsummaryQuery.php deleted file mode 100644 index cd712d801..000000000 --- a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/ServicegroupsummaryQuery.php +++ /dev/null @@ -1,22 +0,0 @@ -select()->from("services", array()); - } -} diff --git a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/StatusQuery.php b/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/StatusQuery.php deleted file mode 100644 index e78942f4c..000000000 --- a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/StatusQuery.php +++ /dev/null @@ -1,361 +0,0 @@ - 'host.host_name', - 'host_name' => 'host.host_name', - 'host_display_name' => 'host.host_name', - 'host_alias' => 'host.alias', - 'host_address' => 'host.address', - 'host_icon_image' => 'host.icon_image', - 'host_action_url' => 'host.action_url', - 'host_notes_url' => 'host.notes_url', - 'host_output' => 'host.status.plugin_output', - 'host_long_output' => 'host.status.long_plugin_output', - 'host_perfdata' => 'host.status.performance_data', - 'host_check_source' => 'host.status.check_source', - 'host_acknowledged' => 'host.status.problem_has_been_acknowledged', - 'host_last_state_change' => 'host.status.last_state_change', - 'host_last_hard_state' => 'host.status.last_hard_state', - 'host_last_hard_state_change' => 'host.status.last_hard_state_change', - 'host_check_command' => 'host.status.check_command', - 'host_last_check' => 'host.status.last_check', - 'host_next_check' => 'host.status.next_check', - 'host_check_execution_time' => 'host.status.check_execution_time', - 'host_check_latency' => 'host.status.check_latency', - 'host_notifications_enabled' => 'host.status.notifications_enabled', - 'host_last_time_up' => 'host.status.last_time_up', - 'host_last_time_down' => 'host.status.last_time_down', - 'host_last_time_unreachable' => 'host.status.last_time_unreachable', - 'host_current_check_attempt' => 'host.status.current_attempt', - 'host_max_check_attempts' => 'host.status.max_attempts', - 'host_check_type' => 'host.status.check_type', - 'host_state_type' => 'host.status.state_type', - 'host_last_notification' => 'host.status.last_notification', - 'host_next_notification' => 'host.status.next_notification', - 'host_no_more_notifications' => 'host.status.no_more_notifications', - 'host_problem_has_been_acknowledged' => 'host.status.problem_has_been_acknowledged', - 'host_acknowledgement_type' => 'host.status.acknowledgement_type', - 'host_current_notification_number' => 'host.status.current_notification_number', - 'host_passive_checks_enabled' => 'host.status.passive_checks_enabled', - 'host_active_checks_enabled' => 'host.status.active_checks_enabled', - 'host_event_handler_enabled' => 'host.status.event_handler_enabled', - 'host_flap_detection_enabled' => 'host.status.flap_detection_enabled', - 'host_is_flapping' => 'host.status.is_flapping', - 'host_percent_state_change' => 'host.status.percent_state_change', - 'host_scheduled_downtime_depth' => 'host.status.scheduled_downtime_depth', - 'host_failure_prediction_enabled' => 'host.status.failure_prediction_enabled', - 'host_process_performance_data' => 'host.status.process_performance_data', - 'host_obsessing' => 'host.status.obsess_over_host', - 'host_modified_host_attributes' => 'host.status.modified_host_attributes', - 'host_event_handler' => 'host.status.event_handler', - 'host_check_command' => 'host.status.check_command', - 'host_normal_check_interval' => 'host.status.normal_check_interval', - 'host_retry_check_interval' => 'host.status.retry_check_interval', - 'host_check_timeperiod_object_id' => 'host.status.check_timeperiod_object_id', - 'host_status_update_time' => 'host.status.status_update_time', - - 'service_host_name' => 'service.host_name', - 'service' => 'service.service_description', - 'service_description' => 'service.service_description', - 'service_display_name' => 'service.service_description', - 'service_icon_image' => 'service.icon_image', - 'service_action_url' => 'service.action_url', - 'service_notes_url' => 'service.notes_url', - 'service_state_type' => 'service.status.state_type', - 'service_output' => 'service.status.output', - 'service_long_output' => 'service.status.long_output', - 'service_perfdata' => 'service.status.perfdata', - 'service_check_source' => 'service.status.check_source', - 'service_acknowledged' => 'service.status.problem_has_been_acknowledged', - 'service_last_state_change' => 'service.status.last_state_change', - 'service_check_command' => 'service.status.check_command', - 'service_last_time_ok' => 'service.status.last_time_ok', - 'service_last_time_warning' => 'service.status.last_time_warning', - 'service_last_time_critical' => 'service.status.last_time_critical', - 'service_last_time_unknown' => 'service.status.last_time_unknown', - 'service_current_check_attempt' => 'service.status.current_check_attempt', - 'service_max_check_attempts' => 'service.status.max_check_attempts', - 'service_last_check' => 'service.status.last_check', - 'service_next_check' => 'service.status.next_check', - 'service_check_type' => 'service.status.check_type', - 'service_last_hard_state_change' => 'service.status.last_hard_state_change', - 'service_last_hard_state' => 'service.status.last_hard_state', - 'service_last_notification' => 'service.status.last_notification', - 'service_next_notification' => 'service.status.next_notification', - 'service_no_more_notifications' => 'service.status.no_more_notifications', - 'service_notifications_enabled' => 'service.status.notifications_enabled', - 'service_problem_has_been_acknowledged' => 'service.status.problem_has_been_acknowledged', - 'service_acknowledgement_type' => 'service.status.acknowledgement_type', - 'service_current_notification_number' => 'service.status.current_notification_number', - 'service_passive_checks_enabled' => 'service.status.passive_checks_enabled', - 'service_active_checks_enabled' => 'service.status.active_checks_enabled', - 'service_event_handler_enabled' => 'service.status.event_handler_enabled', - 'service_flap_detection_enabled' => 'service.status.flap_detection_enabled', - 'service_is_flapping' => 'service.status.is_flapping', - 'service_percent_state_change' => 'service.status.percent_state_change', - 'service_check_latency' => 'service.status.latency', - 'service_check_execution_time' => 'service.status.execution_time', - 'service_scheduled_downtime_depth' => 'service.status.scheduled_downtime_depth', - 'service_failure_prediction_enabled' => 'service.status.failure_prediction_enabled', - 'service_process_performance_data' => 'service.status.process_performance_data', - 'service_obsessing' => 'service.status.obsess_over_service', - 'service_modified_service_attributes' => 'service.status.modified_service_attributes', - 'service_event_handler' => 'service.status.event_handler', - 'service_check_command' => 'service.status.check_command', - 'service_normal_check_interval' => 'service.status.normal_check_interval', - 'service_retry_check_interval' => 'service.status.retry_check_interval', - 'service_check_timeperiod_object_id' => 'service.status.check_timeperiod_object_id', - 'service_status_update_time' => 'service.status.status_update_time', - 'hostgroup' => 'host.group', - 'servicegroup' => 'service.group' - ); - - /** - * @var mixed - */ - private $state; - - /** - * @var array - */ - public static $handlerParameters = array( - 'host_ipv4' => 'getAddress', - 'host_unhandled_service_count' => 'getNrOfUnhandledServices', - 'host_last_comment' => 'getLastComment', - 'service_last_comment' => 'getLastComment', - 'host_state' => 'getStateForHost', - 'host_hard_state' => 'getHardStateForHost', - 'host_handled' => 'isHandledForHost', - 'host_unhandled' => 'isHostUnhandled', - 'host_severity' => 'getSeverityForHost', - 'host_in_downtime' => 'isInDowntimeForHost', - 'host_problem' => 'isProblemForHost', - 'host_attempt' => 'getAttemptStringForHost', - 'service_state' => 'getState', - 'service_hard_state' => 'getHardState', - 'service_handled' => 'isHandled', - 'service_unhandled' => 'isUnhandled', - 'service_severity' => 'getSeverity', - 'service_in_downtime' => 'isInDowntime', - 'service_problem' => 'isProblem', - 'service_attempt' => 'getAttemptString', - ); - - public static $fieldTypes = array( - 'host_last_state_change' => self::TIMESTAMP, - 'host_last_hard_state_change' => self::TIMESTAMP, - 'host_last_check' => self::TIMESTAMP, - 'host_next_check' => self::TIMESTAMP, - 'host_last_time_up' => self::TIMESTAMP, - 'host_last_time_down' => self::TIMESTAMP, - 'host_last_time_unreachable' => self::TIMESTAMP, - 'host_status_update_time' => self::TIMESTAMP, - 'service_last_state_change' => self::TIMESTAMP, - 'service_last_hard_state_change' => self::TIMESTAMP, - 'service_last_check' => self::TIMESTAMP, - 'service_next_check' => self::TIMESTAMP, - 'service_last_time_ok' => self::TIMESTAMP, - 'service_last_time_warning' => self::TIMESTAMP, - 'service_last_time_critical' => self::TIMESTAMP, - 'service_last_time_unknown' => self::TIMESTAMP, - 'service_status_update_time' => self::TIMESTAMP - ); - - public function selectBase() - { - $target = $this->getTarget(); - $this->select()->from($target."s", array()); - } - - public function getAttemptString(&$obj) - { - return $obj->status->current_attempt . '/' . $obj->status->max_attempts; - } - - public function isProblem(&$obj) - { - return $obj->status->current_state > 0 ? 1 : 0; - } - - public function isInDowntime(&$obj) - { - return $obj->status->scheduled_downtime_depth > 0 ? 1 : 0; - } - - public function getAddress(&$obj) - { - return inet_pton($obj->host->address); - } - - public function getState(&$obj) - { - if (!$obj->status->has_been_checked) { - return 99; - } - return $obj->status->current_state; - } - - public function getHardState(&$obj) - { - if (!$obj->status->has_been_checked) { - return 99; - } else { - if ($obj->status->state_type == 1) { - return $this->status->current_state; - } else { - return $this->status->last_hard_state; - } - } - } - - - public function getSeverity(&$host) - { - $status = $host->status; - $severity = 0; - - if (!$status->has_been_checked) { - $severity += 16; - } elseif($status->current_state == 0) { - return $severity; - } elseif ($status->current_state == 1) { - $severity += 32; - } elseif ($status->current_state == 2) { - $severity += 64; - } else { - $severity += 256; - } - - if ($status->problem_has_been_acknowledged == 1) { - $severity += 2; - } elseif ($status->scheduled_downtime_depth > 0) { - $severity += 1; - } else { - $severity += 4; - } - - return $severity; - } - - public function isHandled(&$host) - { - return ($host->status->current_state == 0 || - $host->status->problem_has_been_acknowledged == 1 || - $host->status->scheduled_downtime_depth > 0) ? 1 : 0; - } - - public function isUnhandled(&$hostOrService) - { - return +!$this->isHandled($hostOrService); - } - - public function getNrOfUnhandledServices(&$obj) - { - $host = &$obj->host; - $ct = 0; - if (!isset($host->services)) { - return $ct; - } - foreach ($host->services as &$service) { - if ($service->status->current_state > 0 - && $service->status->problem_has_been_acknowledged == 0 - && $service->status->scheduled_downtime_depth == 0) { - $ct++; - } - } - return $ct; - } - - public function getLastComment(&$host) - { - if (!isset($host->comment) || empty($host->comment)) { - return null; - } - $comment = end($host->comment); - return $comment->comment_id; - } - - - /** - * @param $item - * @return null - */ - public function getHost(&$item) - { - if (!isset($this->state['service'][$item->host_name])) { - return null; - } - if (!isset($this->state['host'][$item->host_name])) { - return null; - } - return $this->state['host'][$item->host_name]; - } - - - private function getTarget() - { - foreach ($this->getColumns() as $column) { - if (preg_match("/^service/",$column)) { - return "service"; - } - } - - return "host"; - } - - - public function getStateForHost(&$obj) - { - return $this->getState($obj->host); - } - - public function getHardStateForHost(&$obj) - { - return $this->getHardState($obj->host); - } - - public function isHandledForHost(&$obj) - { - return $this->isHandled($obj->host); - } - - public function isHostUnhandled(&$obj) - { - return $this->isUnhandled($obj->host); - } - - public function getSeverityForHost(&$obj) - { - return $this->getSeverity($obj->host); - } - - public function isInDowntimeForHost(&$obj) - { - return $this->isInDowntime($obj->host); - } - - public function isProblemForHost(&$obj) - { - return $this->isProblem($obj->host); - } - - public function getAttemptStringForHost(&$obj) - { - return $this->getAttemptStringForHost($obj->host); - } - - -} diff --git a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/StatusSummaryQuery.php b/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/StatusSummaryQuery.php deleted file mode 100644 index 6f1e87f89..000000000 --- a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/StatusSummaryQuery.php +++ /dev/null @@ -1,115 +0,0 @@ -select()->from('hosts', array())->groupByFunction( - 'groupByStatus', - $this - ); - } - - public function groupByStatus(&$indices) - { - $hostsPending = 0; - $hostsUp = 0; - $hostsDownHandled = 0; - $hostsDownUnhandled = 0; - $hostsUnreachableHandled = 0; - $hostsUnreachableUnhandled = 0; - $servicesPending = 0; - $servicesOk = 0; - $servicesCriticalHandled = 0; - $servicesCriticalUnhandled = 0; - $servicesWarningHandled = 0; - $servicesWarningUnhandled = 0; - $servicesUnknownHandled = 0; - $servicesUnknownUnhandled = 0; - foreach ($indices['host'] as $hostName) { - $host = $this->ds->getObjectByName('host', $hostName); - $hostStatus = $host->status; - if ($hostStatus->has_been_checked !== '1') { - ++$hostsPending; - } elseif ($hostStatus->current_state === '0') { - ++$hostsUp; - } elseif ($hostStatus->current_state === '2') { - if ($hostStatus->problem_has_been_acknowledged === '1' - || $hostStatus->scheduled_downtime_depth === '1' - ) { - ++$hostsDownHandled; - } else { - ++$hostsDownUnhandled; - } - } elseif ($hostStatus->current_state === '1') { - if ($hostStatus->problem_has_been_acknowledged === '1' - || $hostStatus->scheduled_downtime_depth === '1' - ) { - ++$hostsUnreachableHandled; - } else { - ++$hostsUnreachableUnhandled; - } - } - if ($host->services === null) { - // Host does not have any service associated - continue; - } - foreach ($host->services as $service) { - $serviceStatus = $service->status; - if ($serviceStatus->has_been_checked !== '1') { - ++$servicesPending; - } elseif ($serviceStatus->current_state === '0') { - ++$servicesOk; - } elseif ($serviceStatus->current_state === '2') { - if ($serviceStatus->problem_has_been_acknowledged === '1' - || $serviceStatus->scheduled_downtime_depth === '1' - || $hostStatus->current_state !== '0' - ) { - ++$servicesCriticalHandled; - } else { - ++$servicesCriticalUnhandled; - } - } elseif ($serviceStatus->current_state === '1') { - if ($serviceStatus->problem_has_been_acknowledged === '1' - || $serviceStatus->scheduled_downtime_depth === '1' - || $hostStatus->current_state !== '0' - ) { - ++$servicesWarningHandled; - } else { - ++$servicesWarningUnhandled; - } - } elseif ($serviceStatus->current_state === '3') { - if ($serviceStatus->problem_has_been_acknowledged === '1' - || $serviceStatus->scheduled_downtime_depth === '1' - || $hostStatus->current_state !== '0' - ) { - ++$servicesUnknownHandled; - } else { - ++$servicesUnknownUnhandled; - } - } - } - } - $rs = array( - 'hosts_up' => $hostsUp, - 'hosts_unreachable_handled' => $hostsUnreachableHandled, - 'hosts_unreachable_unhandled' => $hostsUnreachableUnhandled, - 'hosts_down_handled' => $hostsDownHandled, - 'hosts_down_unhandled' => $hostsDownUnhandled, - 'hosts_pending' => $hostsPending, - 'services_ok' => $servicesOk, - 'services_unknown_handled' => $servicesUnknownHandled, - 'services_unknown_unhandled' => $servicesUnknownUnhandled, - 'services_critical_handled' => $servicesCriticalHandled, - 'services_critical_unhandled' => $servicesCriticalUnhandled, - 'services_warning_handled' => $servicesWarningHandled, - 'services_warning_unhandled' => $servicesWarningUnhandled, - 'services_pending' => $servicesPending - ); - return array((object) array_intersect_key($rs, array_flip($this->getColumns()))); - } -} diff --git a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/StatusdatQuery.php b/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/StatusdatQuery.php deleted file mode 100644 index 33b006c86..000000000 --- a/modules/monitoring/library/Monitoring/Backend/Statusdat/Query/StatusdatQuery.php +++ /dev/null @@ -1,218 +0,0 @@ -selectBase(); - } - - abstract public function selectBase(); - - /** - * Orders the resultset - * - * @param string $column Either a string in the 'FIELD ASC/DESC format or only the field - * @param null $dir 'asc' or 'desc' - * @return Query Returns this query,for fluent interface - */ - public function order($column, $dir = null, $isFunction = false) - { - - if ($column) { - $column = strval($column); - if (isset(static::$mappedParameters[$column])) { - parent::order(static::$mappedParameters[$column], strtolower($dir)); - } elseif (isset(static::$handlerParameters[$column])) { - parent::orderByFn(array($this, static::$handlerParameters[$column]), strtolower($dir)); - } else { - Logger::info("Tried to sort by unknown column %s", $column); - } - } - return $this; - } - - - - private $functionMap = array( - "TO_DATE" => "toDateFormat" - ); - - - - /** - * - * @see Icinga\Backend\DataView\AccessorStrategy - * - * @param The $item - * @param The $field - * @return The|string - * @throws \InvalidArgumentException - */ - public function get(&$item, $field) - { - $result = null; - if (isset($item->$field)) { - $result = $item->$field; - } elseif (isset(static::$mappedParameters[$field])) { - $result = $this->getMappedParameter($item, $field); - } elseif (isset(static::$handlerParameters[$field])) { - $hdl = static::$handlerParameters[$field]; - $result = $this->$hdl($item); - } - - return $result; - } - - private function applyPropertyFunction($function, $value) - { - if (!isset($this->functionMap[$function])) { - return $value; - } - $fn = $this->functionMap[$function]; - - return $this->$fn($value); - } - - private function toDateFormat($value) - { - if (is_numeric($value)) { - return date("Y-m-d H:i:s", intval($value)); - } else { - return $value; - } - } - - private function getMappedParameter(&$item, $field) - { - $matches = array(); - $fieldDef = static::$mappedParameters[$field]; - - $function = false; - if (preg_match_all('/(?P\w+)\((?P.*)\)/', $fieldDef, $matches)) { - $function = $matches["FUNCTION"][0]; - $fieldDef = $matches["PARAMETER"][0]; - } - $mapped = explode(".", $fieldDef); - $res = $item; - - foreach ($mapped as $map) { - if (is_array($res)) { - $subResult = array(); - foreach ($res as $subitem) { - if (!isset($subitem->$map)) { - continue; - } - $subResult[] = $subitem->$map; - } - $res = join(',', $subResult); - } else { - if (!isset($res->$map)) { - return ""; - } - $res = $res->$map; - } - } - - if ($function) { - return $this->applyPropertyFunction($function, $res); - } - return $res; - } - - /** - * - * @see Icinga\Backend\DataView\AccessorStrategy - * - * @param The $field - * @return The|string - */ - public function getMappedField($field) - { - if (isset(static::$mappedParameters[$field])) { - return static::$mappedParameters[$field]; - } - return $field; - } - - /** - * - * @see Icinga\Backend\DataView\AccessorStrategy - * - * @param The $item - * @param The $field - * @return bool - */ - public function exists(&$item, $field) - { - return (isset($item->$field) - || isset(static::$mappedParameters[$field]) - || isset(static::$handlerParameters[$field]) - ); - } - - - public function isValidFilterTarget($field) - { - return true; - } - - public function isTimestamp($field) - { - return isset(static::$fieldTypes[$field]) && static::$fieldTypes[$field] === self::TIMESTAMP; - } - -} - diff --git a/modules/monitoring/library/Monitoring/DataView/Contact.php b/modules/monitoring/library/Monitoring/DataView/Contact.php index 9f78a3b6a..27639b0c6 100644 --- a/modules/monitoring/library/Monitoring/DataView/Contact.php +++ b/modules/monitoring/library/Monitoring/DataView/Contact.php @@ -18,6 +18,7 @@ class Contact extends DataView public function getColumns() { return array( + 'contact', 'contact_name', 'contact_alias', 'contact_email', diff --git a/modules/monitoring/library/Monitoring/DataView/Contactgroup.php b/modules/monitoring/library/Monitoring/DataView/Contactgroup.php index 870a5407b..7dd7a1cd4 100644 --- a/modules/monitoring/library/Monitoring/DataView/Contactgroup.php +++ b/modules/monitoring/library/Monitoring/DataView/Contactgroup.php @@ -18,7 +18,9 @@ class Contactgroup extends DataView public function getColumns() { return array( + 'contact', 'contact_name', + 'contactgroup', 'contactgroup_name', 'contactgroup_alias', 'host', diff --git a/modules/monitoring/library/Monitoring/DataView/DataView.php b/modules/monitoring/library/Monitoring/DataView/DataView.php index 2b91c1673..df331999e 100644 --- a/modules/monitoring/library/Monitoring/DataView/DataView.php +++ b/modules/monitoring/library/Monitoring/DataView/DataView.php @@ -6,12 +6,13 @@ namespace Icinga\Module\Monitoring\DataView; use Countable; use Icinga\Data\Filter\Filter; -use Icinga\Data\SimpleQuery; +use Icinga\Data\Filter\FilterMatch; use Icinga\Data\Browsable; use Icinga\Data\PivotTable; use Icinga\Data\Sortable; use Icinga\Data\ConnectionInterface; use Icinga\Data\Filterable; +use Icinga\Exception\QueryException; use Icinga\Web\Request; use Icinga\Web\Url; use Icinga\Module\Monitoring\Backend; @@ -24,9 +25,9 @@ abstract class DataView implements Browsable, Countable, Filterable, Sortable /** * The query used to populate the view * - * @var SimpleQuery + * @var \Icinga\Data\SimpleQuery */ - private $query; + protected $query; protected $filter; @@ -37,8 +38,8 @@ abstract class DataView implements Browsable, Countable, Filterable, Sortable /** * Create a new view * - * @param SimpleQuery $query Which backend to query - * @param array $columns Select columns + * @param ConnectionInterface $connection + * @param array $columns */ public function __construct(ConnectionInterface $connection, array $columns = null) { @@ -46,6 +47,18 @@ abstract class DataView implements Browsable, Countable, Filterable, Sortable $queryClass = $connection->getQueryClass($this->getQueryName()); $this->query = new $queryClass($this->connection->getResource(), $columns); $this->filter = Filter::matchAll(); + $this->init(); + } + + /** + * Initializer for `distinct purposes + * + * Implemented for `distinct as workaround + * + * @TODO Subject to change, see #7344 + */ + public function init() + { } /** @@ -62,17 +75,17 @@ abstract class DataView implements Browsable, Countable, Filterable, Sortable return $tableName; } -public function where($condition, $value = null) -{ - $this->filter->addFilter(Filter::where($condition, $value)); - $this->query->where($condition, $value); - return $this; -} + public function where($condition, $value = null) + { + $this->filter->addFilter(Filter::where($condition, $value)); + $this->query->where($condition, $value); + return $this; + } -public function dump() -{ - return $this->query->dump(); -} + public function dump() + { + return $this->query->dump(); + } /** * Retrieve columns provided by this view @@ -192,9 +205,10 @@ public function dump() * Sort the rows, according to the specified sort column and order * * @param string $column Sort column - * @param int $order Sort order, one of the SORT_ constants + * @param string $order Sort order, one of the SORT_ constants * - * @return self + * @return $this + * @throws QueryException If the sort column is not allowed * @see DataView::SORT_ASC * @see DataView::SORT_DESC * @deprecated Use DataView::order() instead @@ -202,35 +216,43 @@ public function dump() public function sort($column = null, $order = null) { $sortRules = $this->getSortRules(); - - if ($sortRules !== null) { - if ($column === null) { - $sortColumns = reset($sortRules); - if (!isset($sortColumns['columns'])) { - $sortColumns['columns'] = array(key($sortRules)); + if ($column === null) { + // Use first available sort rule as default + if (empty($sortRules)) { + return $this; + } + $sortColumns = reset($sortRules); + if (! isset($sortColumns['columns'])) { + $sortColumns['columns'] = array(key($sortRules)); + } + } else { + if (isset($sortRules[$column])) { + $sortColumns = $sortRules[$column]; + if (! isset($sortColumns['columns'])) { + $sortColumns['columns'] = array($column); } } else { - if (isset($sortRules[$column])) { - $sortColumns = $sortRules[$column]; - if (!isset($sortColumns['columns'])) { - $sortColumns['columns'] = array($column); - } - } else { - $sortColumns = array( - 'columns' => array($column), - 'order' => $order - ); - }; - } - - $order = $order === null ? (isset($sortColumns['order']) ? $sortColumns['order'] : self::SORT_ASC) : $order; - $order = (strtoupper($order) === self::SORT_ASC) ? 'ASC' : 'DESC'; - - foreach ($sortColumns['columns'] as $column) { - $this->query->order($column, $order); - } - $this->isSorted = true; + $sortColumns = array( + 'columns' => array($column), + 'order' => $order + ); + }; } + + $order = $order === null ? (isset($sortColumns['order']) ? $sortColumns['order'] : static::SORT_ASC) : $order; + $order = (strtoupper($order) === static::SORT_ASC) ? 'ASC' : 'DESC'; + + foreach ($sortColumns['columns'] as $column) { + if (! $this->isValidFilterTarget($column)) { + throw new QueryException( + t('The sort column "%s" is not allowed in "%s".'), + $column, + get_class($this) + ); + } + $this->query->order($column, $order); + } + $this->isSorted = true; return $this; } @@ -241,7 +263,7 @@ public function dump() */ public function getSortRules() { - return null; + return array(); } /** @@ -250,7 +272,7 @@ public function dump() * @param string $column * @param string $direction * - * @return self + * @return $this */ public function order($column = null, $direction = null) { @@ -285,19 +307,48 @@ public function dump() /** * Return the query which was created in the constructor * - * @return mixed + * @return \Icinga\Data\SimpleQuery */ public function getQuery() { - if (! $this->isSorted) { $this->sort(); } + if (! $this->isSorted) { + $this->order(); + } return $this->query; } public function applyFilter(Filter $filter) { + $this->validateFilterColumns($filter); + return $this->addFilter($filter); } + /** + * Validates recursive the Filter columns against the isValidFilterTarget() method + * + * @param Filter $filter + * + * @throws \Icinga\Data\Filter\FilterException + */ + public function validateFilterColumns(Filter $filter) + { + if ($filter instanceof FilterMatch) { + if (! $this->isValidFilterTarget($filter->getColumn())) { + throw new QueryException( + t('The filter column "%s" is not allowed here.'), + $filter->getColumn() + ); + } + } + + if (method_exists($filter, 'filters')) { + foreach ($filter->filters() as $filter) { + $this->validateFilterColumns($filter); + } + } + } + public function clearFilter() { $this->query->clearFilter(); @@ -327,6 +378,9 @@ public function dump() */ public function paginate($itemsPerPage = null, $pageNumber = null) { + if (! $this->isSorted) { + $this->order(); + } return $this->query->paginate($itemsPerPage, $pageNumber); } diff --git a/modules/monitoring/library/Monitoring/DataView/HostStatus.php b/modules/monitoring/library/Monitoring/DataView/HostStatus.php index 60f224264..e9b5b60dd 100644 --- a/modules/monitoring/library/Monitoring/DataView/HostStatus.php +++ b/modules/monitoring/library/Monitoring/DataView/HostStatus.php @@ -6,6 +6,14 @@ namespace Icinga\Module\Monitoring\DataView; class HostStatus extends DataView { + /** + * @see DataView::init() + */ + public function init() + { + $this->query->setMode('host'); + } + /** * Retrieve columns provided by this view * @@ -64,7 +72,8 @@ class HostStatus extends DataView 'host_percent_state_change', 'host_modified_host_attributes', 'host_severity', - 'host_problem' + 'host_problem', + 'host_ipv4' ); } @@ -105,7 +114,7 @@ class HostStatus extends DataView public function getFilterColumns() { - return array('hostgroup', 'service_problems'); + return array('hostgroup', 'service_problems', 'servicegroup'); } public function isValidFilterTarget($column) diff --git a/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php b/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php index b81b56764..9edcabc87 100644 --- a/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php +++ b/modules/monitoring/library/Monitoring/DataView/ServiceStatus.php @@ -6,6 +6,16 @@ namespace Icinga\Module\Monitoring\DataView; class ServiceStatus extends DataView { + /** + * Sets the mode for `distinct as workaround + * + * @TODO Subject to change, see #7344 + */ + public function init() + { + $this->query->setMode('service'); + } + /** * Retrieve columns provided by this view * @@ -101,6 +111,7 @@ class ServiceStatus extends DataView 'service_flap_detection_enabled', 'service_flap_detection_enabled_changed', 'service_modified_service_attributes', + 'service_host_name' ); } diff --git a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php index 7b56929c8..3d3bde8dd 100644 --- a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php +++ b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php @@ -442,7 +442,7 @@ abstract class MonitoredObject { if (property_exists($this->properties, $name)) { return $this->properties->$name; - } elseif (isset($this->$name)) { + } elseif (property_exists($this, $name) && $this->$name !== null) { return $this->$name; } elseif (property_exists($this, $name)) { $fetchMethod = 'fetch' . ucfirst($name); @@ -458,6 +458,16 @@ abstract class MonitoredObject throw new InvalidPropertyException('Can\'t access property \'%s\'. Property does not exist.', $name); } + public function __isset($name) + { + if (property_exists($this->properties, $name)) { + return isset($this->properties->$name); + } elseif (property_exists($this, $name)) { + return isset($this->$name); + } + return false; + } + /** * @deprecated */ diff --git a/modules/monitoring/library/Monitoring/Object/Service.php b/modules/monitoring/library/Monitoring/Object/Service.php index ac6957eab..36a763101 100644 --- a/modules/monitoring/library/Monitoring/Object/Service.php +++ b/modules/monitoring/library/Monitoring/Object/Service.php @@ -191,7 +191,8 @@ class Service extends MonitoredObject 'service_flap_detection_enabled_changed', 'service_modified_service_attributes', 'service_process_performance_data', - 'service_percent_state_change' + 'service_percent_state_change', + 'service_host_name' )) ->where('host_name', $this->host->getName()) ->where('service_description', $this->service); diff --git a/public/css/icinga/layout-structure.less b/public/css/icinga/layout-structure.less index 6319e65d1..be8a8703f 100644 --- a/public/css/icinga/layout-structure.less +++ b/public/css/icinga/layout-structure.less @@ -331,3 +331,21 @@ html { font-weight: bold; color: white; } + +.hbox { + display: inline-block; +} + +.hbox-item { + display: inline-block; + vertical-align: top; + margin-bottom: 0.25em; + margin-left: 1em; + margin-right: 1em; +} + +.hbox-spacer { + display: inline-block; + vertical-align: top; + width: 2em; +} diff --git a/public/css/icinga/tabs.less b/public/css/icinga/tabs.less index ed846fc9d..74e3e0b72 100644 --- a/public/css/icinga/tabs.less +++ b/public/css/icinga/tabs.less @@ -136,3 +136,6 @@ ul.tabs img.icon { margin-top: -4px; } +a.close-tab { + display: none; +} \ No newline at end of file diff --git a/public/js/icinga/behavior/navigation.js b/public/js/icinga/behavior/navigation.js index 90cda9713..615e5ac08 100644 --- a/public/js/icinga/behavior/navigation.js +++ b/public/js/icinga/behavior/navigation.js @@ -24,8 +24,8 @@ Navigation.prototype.onRendered = function(evt) { // get original source element of the rendered-event var el = evt.target; - // restore old menu state if (activeMenuId) { + // restore old menu state $('[role="navigation"] li.active', el).removeClass('active'); var $selectedMenu = $('#' + activeMenuId).addClass('active'); var $outerMenu = $selectedMenu.parent().closest('li'); @@ -37,6 +37,9 @@ var $menus = $('[role="navigation"] li.active', el); if ($menus.size()) { activeMenuId = $menus[0].id; + $menus.find('li.active').first().each(function () { + activeMenuId = this.id; + }); } } }; @@ -74,6 +77,12 @@ $menu.data('icinga-url', menuDataUrl); }; + Navigation.prototype.setActiveByUrl = function(url) + { + this.resetActive(); + this.setActive($('#menu [href="' + url + '"]')); + } + /** * Change the active menu element * diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js index 9c889dfa8..5f62a8c8a 100644 --- a/public/js/icinga/events.js +++ b/public/js/icinga/events.js @@ -83,6 +83,12 @@ if (searchField.length && searchField.val().length) { self.searchValue = searchField.val(); } + + if (icinga.ui.isOneColLayout()) { + icinga.ui.disableCloseButtons(); + } else { + icinga.ui.enableCloseButtons(); + } }, /** @@ -371,6 +377,18 @@ // If link has hash tag... if (href.match(/#/)) { if (href === '#') { + if ($a.hasClass('close-toggle')) { + if (! icinga.ui.isOneColLayout()) { + var $cont = $a.closest('.container').first(); + if ($cont.attr('id') === 'col1') { + icinga.ui.moveToLeft(); + icinga.ui.layout1col(); + } else { + icinga.ui.layout1col(); + } + icinga.history.pushCurrentState(); + } + } return false; } $target = self.getLinkTargetFor($a); diff --git a/public/js/icinga/history.js b/public/js/icinga/history.js index a3fcf5deb..9f05def2d 100644 --- a/public/js/icinga/history.js +++ b/public/js/icinga/history.js @@ -90,6 +90,7 @@ } }); + // TODO: update navigation // Did we find any URL? Then push it! if (url !== '') { window.history.pushState({icinga: true}, null, this.cleanupUrl(url)); diff --git a/public/js/icinga/loader.js b/public/js/icinga/loader.js index 9c3feab6e..9847df4e6 100644 --- a/public/js/icinga/loader.js +++ b/public/js/icinga/loader.js @@ -340,12 +340,12 @@ if (! req.autorefresh) { // TODO: Hook for response/url? var $forms = $('[action="' + this.icinga.utils.parseUrl(url).path + '"]'); - var $matches = $.merge($('[href="' + url + '"]'), $forms); - $matches.each(function (idx, el) { if ($(el).closest('#menu').length) { - self.icinga.behaviors.navigation.resetActive(); + if (req.$target[0].id === 'col1') { + self.icinga.behaviors.navigation.resetActive(); + } } else if ($(el).closest('table.action').length) { $(el).closest('table.action').find('.active').removeClass('active'); } @@ -357,7 +357,9 @@ if ($el.is('form')) { $('input', $el).addClass('active'); } else { - self.icinga.behaviors.navigation.setActive($el); + if (req.$target[0].id === 'col1') { + self.icinga.behaviors.navigation.setActive($el); + } } // Interrupt .each, only on menu item shall be active return false; @@ -367,7 +369,6 @@ }); } else { // TODO: next container url - // Get first container url? active = $('[href].active', req.$target).attr('href'); } diff --git a/public/js/icinga/ui.js b/public/js/icinga/ui.js index 28ce353e1..ac98fb14c 100644 --- a/public/js/icinga/ui.js +++ b/public/js/icinga/ui.js @@ -136,6 +136,7 @@ var kill = this.cutContainer($('#col1')); this.pasteContainer($('#col1'), col2); this.fixControls(); + this.icinga.behaviors.navigation.setActiveByUrl($('#col1').data('icingaUrl')); }, cutContainer: function ($col) { @@ -199,6 +200,11 @@ self.refreshDebug(); }, + /** + * Returns whether the layout is too small for more than one column + * + * @returns {boolean} True when more than one column is available + */ hasOnlyOneColumn: function () { return this.currentLayout === 'poor' || this.currentLayout === 'minimal'; }, @@ -229,11 +235,21 @@ return false; }, + /** + * Returns whether only one column is displayed + * + * @returns {boolean} True when only one column is displayed + */ + isOneColLayout: function () { + return ! $('#layout').hasClass('twocols'); + }, + layout1col: function () { - if (! $('#layout').hasClass('twocols')) { return; } + if (this.isOneColLayout()) { return; } this.icinga.logger.debug('Switching to single col'); $('#layout').removeClass('twocols'); this.closeContainer($('#col2')); + this.disableCloseButtons(); }, closeContainer: function($c) { @@ -247,10 +263,11 @@ }, layout2col: function () { - if ($('#layout').hasClass('twocols')) { return; } + if (! this.isOneColLayout()) { return; } this.icinga.logger.debug('Switching to double col'); $('#layout').addClass('twocols'); this.fixControls(); + this.enableCloseButtons(); }, getAvailableColumnSpace: function () { @@ -698,6 +715,14 @@ this.fixControls(parent); }, + disableCloseButtons: function () { + $('a.close-toggle').hide(); + }, + + enableCloseButtons: function () { + $('a.close-toggle').show(); + }, + fixControls: function ($parent) { var self = this; diff --git a/test/php/library/Icinga/Data/Filter/FilterTest.php b/test/php/library/Icinga/Data/Filter/FilterTest.php index dbd640b91..7d6349213 100644 --- a/test/php/library/Icinga/Data/Filter/FilterTest.php +++ b/test/php/library/Icinga/Data/Filter/FilterTest.php @@ -199,6 +199,18 @@ class FilterTest extends BaseTestCase $this->assertNotEquals((string) $c, (string) $d); } + public function testLeadingAndTrailingWhitespacesSanitizing() + { + $columnHasWhitespaces = Filter::where(' host ', 'localhost'); + $expressionHasWhitespaces = Filter::where('host', ' localhost '); + $bothHaveWhitespaces = Filter::fromQueryString(' host = localhost '); + $withArray = Filter::where(' host ', array(' no match ', ' localhost ')); + $this->assertTrue($columnHasWhitespaces->matches($this->sampleData[0])); + $this->assertTrue($expressionHasWhitespaces->matches($this->sampleData[0])); + $this->assertTrue($bothHaveWhitespaces->matches($this->sampleData[0])); + $this->assertTrue($withArray->matches($this->sampleData[0])); + } + private function row($idx) { return $this->sampleData[$idx];