From e1895db33b0798a1d557ad441ba9a266baaa6d83 Mon Sep 17 00:00:00 2001 From: Markus Opolka Date: Fri, 10 May 2024 10:25:06 +0200 Subject: [PATCH 1/9] Remove legacy DB support - This removes all support for converting legacy Icinga Web 1 views. Rationale being that this is likely not a use case any more and it does not need to be supported in the future (i.e. when migrating this to Icinga DB) --- application/clicommands/ConvertCommand.php | 104 ---- application/clicommands/LegacyCommand.php | 92 --- application/views/helpers/Badges.php | 1 - library/Toplevelview/Command.php | 44 -- library/Toplevelview/Config/ConfigEmitter.php | 72 --- .../Toplevelview/Legacy/LegacyDbHelper.php | 525 ------------------ 6 files changed, 838 deletions(-) delete mode 100644 application/clicommands/ConvertCommand.php delete mode 100644 application/clicommands/LegacyCommand.php delete mode 100644 library/Toplevelview/Command.php delete mode 100644 library/Toplevelview/Config/ConfigEmitter.php delete mode 100644 library/Toplevelview/Legacy/LegacyDbHelper.php diff --git a/application/clicommands/ConvertCommand.php b/application/clicommands/ConvertCommand.php deleted file mode 100644 index a05538b..0000000 --- a/application/clicommands/ConvertCommand.php +++ /dev/null @@ -1,104 +0,0 @@ - */ - -namespace Icinga\Module\Toplevelview\Clicommands; - -use Icinga\Exception\ConfigurationError; -use Icinga\Module\Toplevelview\Command; -use Icinga\Module\Toplevelview\Config\ConfigEmitter; -use Icinga\Module\Toplevelview\Legacy\LegacyDbHelper; -use Icinga\Module\Toplevelview\ViewConfig; -use Zend_Db_Adapter_Pdo_Sqlite; - -/** - * Converts a TopLevelView database into the new YAML configuration format - */ -class ConvertCommand extends Command -{ - protected $dbConnections = array(); - - public function init() - { - parent::init(); - - if (! extension_loaded('pdo_sqlite')) { - throw new ConfigurationError('You need the PHP extension "pdo_sqlite" in order to convert TopLevelView'); - } - } - - /** - * List all hierarchies in the database - * - * Arguments: - * --db SQLite3 data from from old TopLevelView module - */ - public function listAction() - { - $dbFile = $this->params->getRequired('db'); - $db = $this->sqlite($dbFile); - - $helper = new LegacyDbHelper($db); - foreach ($helper->fetchHierarchies() as $root) { - printf("[%d] %s\n", $root['id'], $root['name']); - } - } - - /** - * Generate a YAML config file for Icinga Web 2 module - * - * Arguments: - * --db SQLite3 data from from old TopLevelView module - * --id Database id to export (see list) - * --output Write to file (default '-' for stdout) - * --name If name is specified instead of file, - * config is saved under that name - */ - public function convertAction() - { - $dbFile = $this->params->getRequired('db'); - $db = $this->sqlite($dbFile); - - $id = $this->params->getRequired('id'); - - $output = $this->params->get('output', null); - $name = $this->params->get('name', null); - $format = $this->params->get('format', 'yaml'); - - $helper = new LegacyDbHelper($db, $this->monitoringBackend()); - $tree = $helper->fetchTree($id); - - $emitter = ConfigEmitter::fromLegacyTree($tree); - - if ($name !== null and $output === null) { - $viewConfig = new ViewConfig(); - $viewConfig->setConfigDir(); - $viewConfig->setFormat(ViewConfig::FORMAT_YAML); - $viewConfig->setName($name); - $viewConfig->setText($emitter->emitYAML($format)); - $viewConfig->store(); - printf("Saved as config %s\n", $name); - exit(0); - } - - $text = $emitter->emit($format); - if ($output === null || $output === '-') { - echo $text; - } else { - file_put_contents($output, $text); - } - } - - /** - * Sets up the Zend PDO resource for SQLite - * - * @param string $file - * - * @return Zend_Db_Adapter_Pdo_Sqlite - */ - protected function sqlite($file) - { - return new Zend_Db_Adapter_Pdo_Sqlite(array( - 'dbname' => $file, - )); - } -} diff --git a/application/clicommands/LegacyCommand.php b/application/clicommands/LegacyCommand.php deleted file mode 100644 index f9784be..0000000 --- a/application/clicommands/LegacyCommand.php +++ /dev/null @@ -1,92 +0,0 @@ - */ - -namespace Icinga\Module\Toplevelview\Clicommands; - -use Icinga\Exception\ConfigurationError; -use Icinga\Module\Monitoring\Backend\MonitoringBackend; -use Icinga\Module\Toplevelview\Command; -use Icinga\Module\Toplevelview\Legacy\LegacyDbHelper; -use Zend_Db_Adapter_Pdo_Sqlite; - -/** - * Tools for the legacy DB - */ -class LegacyCommand extends Command -{ - public function init() - { - parent::init(); - - if (! extension_loaded('pdo_sqlite')) { - throw new ConfigurationError('You need the PHP extension "pdo_sqlite" in order to convert TopLevelView'); - } - } - - /** - * Delete unreferenced objects from the database - * - * Arguments: - * --db SQLite3 data from from old TopLevelView module - * --noop Only show counts, don't delete - */ - public function cleanupAction() - { - $dbFile = $this->params->getRequired('db'); - $noop = $this->params->shift('noop'); - $db = $this->sqlite($dbFile); - - $helper = new LegacyDbHelper($db); - - $result = $helper->cleanupUnreferencedObjects($noop); - foreach ($result as $type => $c) { - printf("%s: %d\n", $type, $c); - } - } - - /** - * Migrate database ids from an IDO to another IDO - * - * Arguments: - * --db SQLite3 data from from old TopLevelView module - * --target Target database path (will be overwritten) - * --old OLD IDO backend (configured in monitoring module) - * --new New IDO backend (configured in monitoring module) (optional) - * --purge Remove unresolvable data during update (see log) - */ - public function idomigrateAction() - { - $dbFile = $this->params->getRequired('db'); - $old = $this->params->getRequired('old'); - $target = $this->params->getRequired('target'); - $new = $this->params->get('new'); - $purge = $this->params->shift('purge'); - - $db = $this->sqlite($dbFile); - - $helper = new LegacyDbHelper($db, MonitoringBackend::instance($new)); - $helper->setOldBackend(MonitoringBackend::instance($old)); - - // Use the copy as db - $helper->setDb($helper->copySqliteDb($db, $target)); - - $result = $helper->migrateObjectIds(false, $purge); - foreach ($result as $type => $c) { - printf("%s: %d\n", $type, $c); - } - } - - /** - * Sets up the Zend PDO resource for SQLite - * - * @param string $file - * - * @return Zend_Db_Adapter_Pdo_Sqlite - */ - protected function sqlite($file) - { - return new Zend_Db_Adapter_Pdo_Sqlite(array( - 'dbname' => $file, - )); - } -} diff --git a/application/views/helpers/Badges.php b/application/views/helpers/Badges.php index 6066a72..b70d6ed 100644 --- a/application/views/helpers/Badges.php +++ b/application/views/helpers/Badges.php @@ -2,7 +2,6 @@ /* Icinga Web 2 Top Level View | (c) 2017 Icinga Development Team | GPLv2+ */ use Icinga\Module\Toplevelview\Tree\TLVStatus; -use Icinga\Web\Url; class Zend_View_Helper_Badges extends Zend_View_Helper_Abstract { diff --git a/library/Toplevelview/Command.php b/library/Toplevelview/Command.php deleted file mode 100644 index 95fb47b..0000000 --- a/library/Toplevelview/Command.php +++ /dev/null @@ -1,44 +0,0 @@ - */ - -namespace Icinga\Module\Toplevelview; - -use Icinga\Application\Icinga; -use Icinga\Exception\ConfigurationError; -use Icinga\Exception\IcingaException; -use Icinga\Module\Monitoring\Backend\MonitoringBackend; -use Icinga\Cli\Command as IcingaCommand; - -class Command extends IcingaCommand -{ - /** @var MonitoringBackend */ - protected $monitoringBackend; - - public function init() - { - parent::init(); - - if (! extension_loaded('yaml')) { - throw new ConfigurationError('You need the PHP extension "yaml" in order to use TopLevelView'); - } - } - - /** - * Retrieves the Icinga MonitoringBackend - * - * @param string|null $name - * - * @return MonitoringBackend - * @throws IcingaException When monitoring is not enabled - */ - protected function monitoringBackend($name = null) - { - if ($this->monitoringBackend === null) { - if (! Icinga::app()->getModuleManager()->hasEnabled('monitoring')) { - throw new IcingaException('The module "monitoring" must be enabled and configured!'); - } - $this->monitoringBackend = MonitoringBackend::instance($name); - } - return $this->monitoringBackend; - } -} diff --git a/library/Toplevelview/Config/ConfigEmitter.php b/library/Toplevelview/Config/ConfigEmitter.php deleted file mode 100644 index b8caff9..0000000 --- a/library/Toplevelview/Config/ConfigEmitter.php +++ /dev/null @@ -1,72 +0,0 @@ - */ - -namespace Icinga\Module\Toplevelview\Config; - -use Icinga\Exception\NotImplementedError; -use stdClass; - -class ConfigEmitter -{ - /** @var array */ - protected $config; - - public function __construct($config) - { - $this->config = $config; - } - - public static function classToArray($obj) - { - $arr = array(); - foreach (get_object_vars($obj) as $k => $v) { - if ($k !== 'children') { - $arr[$k] = $v; - } - } - - // handle children last for visibility - if (property_exists($obj, 'children')) { - $arr['children'] = array(); - foreach ($obj->children as $child) { - // convert each child to an array - $arr['children'][] = static::classToArray($child); - } - } - - return $arr; - } - - public static function fromLegacyTree(stdClass $tree) - { - return new static(static::classToArray($tree)); - } - - public function emitJSON(&$contentType = null) - { - $contentType = 'application/json'; - return json_encode($this->config); - } - - public function emitYAML(&$contentType = null) - { - $contentType = 'application/yaml'; - return yaml_emit($this->config, YAML_UTF8_ENCODING, YAML_LN_BREAK); - } - - public function emitEXPORT(&$contentType = null) - { - $contentType = 'text/plain'; - return var_export($this->config, true); - } - - public function emit($format, &$contentType = null) - { - $funcName = 'emit' . strtoupper($format); - if (method_exists($this, $funcName)) { - return $this->$funcName($contentType); - } else { - throw new NotImplementedError('format "%s" is not implemented to emit!', $format); - } - } -} diff --git a/library/Toplevelview/Legacy/LegacyDbHelper.php b/library/Toplevelview/Legacy/LegacyDbHelper.php deleted file mode 100644 index ae50256..0000000 --- a/library/Toplevelview/Legacy/LegacyDbHelper.php +++ /dev/null @@ -1,525 +0,0 @@ - */ - -namespace Icinga\Module\Toplevelview\Legacy; - -use Icinga\Application\Benchmark; -use Icinga\Application\Logger; -use Icinga\Exception\IcingaException; -use Icinga\Exception\NotFoundError; -use Icinga\Exception\ProgrammingError; -use Icinga\Module\Monitoring\Backend\MonitoringBackend; -use stdClass; -use Zend_Db_Adapter_Pdo_Abstract; -use Zend_Db_Adapter_Pdo_Sqlite; - -class LegacyDbHelper -{ - /** @var Zend_Db_Adapter_Pdo_Abstract */ - protected $db; - - /** @var MonitoringBackend */ - protected $backend; - - /** @var MonitoringBackend */ - protected $oldBackend; - - protected static $idoObjectIds = [ - 'host' => 1, - 'service' => 2, - 'hostgroup' => 3, - ]; - - public function __construct(Zend_Db_Adapter_Pdo_Abstract $db, MonitoringBackend $backend = null) - { - $this->db = $db; - $this->backend = $backend; - } - - public function fetchHierarchies() - { - $query = $this->db->select() - ->from('toplevelview_view_hierarchy AS h', array( - 'id', - )) - ->joinLeft('toplevelview_view AS v', 'v.id = h.view_id', array( - 'name', - 'display_name', - )) - ->where('h.level = ?', 0) - ->where('h.root_id = h.id'); - - return $this->db->fetchAll($query); - } - - /** - * Purges stale object references from the database - * - * Apparently the original editor replaces the tree data, - * but leaves unreferenced objects where the view_id has - * no referenced row in toplevelview_view. - * - * @param bool $noop Only check but don't delete - * - * @return array object types with counts cleaned up - */ - public function cleanupUnreferencedObjects($noop = false) - { - $results = [ - 'host' => 0, - 'hostgroup' => 0, - 'service' => 0 - ]; - - foreach (array_keys($results) as $type) { - $query = $this->db->select() - ->from("toplevelview_${type} AS o", ['id']) - ->joinLeft('toplevelview_view AS v', 'v.id = o.view_id', []) - ->where('v.id IS NULL'); - - Logger::debug("searching for unreferenced %s objects: %s", $type, (string) $query); - - $ids = $this->db->fetchCol($query); - $results[$type] = count($ids); - - if (! $noop) { - Logger::debug("deleting unreferenced %s objects: %s", $type, json_encode($ids)); - $this->db->delete("toplevelview_${type}", sprintf('id IN (%s)', join(', ', $ids))); - } - } - - return $results; - } - - /** - * Migrate object ids from an old MonitoringBackend to a new one - * - * Since data is not stored as names, we need to lookup a name for each id, - * and get the new id from the other backend. - * - * @param bool $noop Do not update the database - * @param bool $removeUnknown Remove objects that are unknown in (new) IDO DB - * - * @return int[] - * @throws IcingaException - * @throws \Zend_Db_Adapter_Exception - */ - public function migrateObjectIds($noop = false, $removeUnknown = false) - { - $result = [ - 'host' => 0, - 'service' => 0, - 'hostgroup' => 0, - ]; - - foreach (array_keys($result) as $type) { - $query = $this->db->select() - ->from("toplevelview_${type}", ['id', "${type}_object_id AS object_id"]); - - Logger::debug("querying stored objects of type %s: %s", $type, (string) $query); - - $objects = []; - - // Load objects indexed by object_id - foreach ($this->db->fetchAll($query) as $row) { - $objects[$row['object_id']] = (object) $row; - } - - // Load names from old DB - $idoObjects = $this->oldBackend->getResource()->select() - ->from('icinga_objects', ['object_id', 'name1', 'name2']) - ->where('objecttype_id', self::$idoObjectIds[$type]); - - // Amend objects with names from old DB - foreach ($idoObjects->fetchAll() as $row) { - $id = $row->object_id; - if (array_key_exists($id, $objects)) { - $idx = $row->name1; - if ($row->name2 !== null) { - $idx .= '!' . $row->name2; - } - - $objects[$id]->name = $idx; - } - } - - // Load names from new DB and index by name - $newObjects = []; - foreach ($this->backend->getResource()->fetchAll($idoObjects) as $row) { - $idx = $row->name1; - if ($row->name2 !== null) { - $idx .= '!' . $row->name2; - } - - $newObjects[$idx] = $row; - } - - // Process all objects and store new id - $errors = 0; - foreach ($objects as $object) { - if (! property_exists($object, 'name')) { - Logger::error("object %s %d has not been found in old IDO", $type, $object->object_id); - $errors++; - } else if (! array_key_exists($object->name, $newObjects)) { - Logger::error("object %s %d '%s' has not been found in new IDO", - $type, $object->object_id, $object->name); - $errors++; - } else { - $object->new_object_id = $newObjects[$object->name]->object_id; - $result[$type]++; - } - } - - if (! $removeUnknown && $errors > 0) { - throw new IcingaException("errors have occurred during IDO id migration - see log"); - } - - if (! $noop) { - foreach ($objects as $object) { - if (property_exists($object, 'new_object_id')) { - $this->db->update( - "toplevelview_${type}", - ["${type}_object_id" => $object->new_object_id], - ["${type}_object_id = ?" => $object->object_id] - ); - } else if ($removeUnknown) { - $this->db->delete( - "toplevelview_${type}", - ["${type}_object_id = ?" => $object->object_id] - ); - } - } - } - } - - return $result; - } - - /** - * @param Zend_Db_Adapter_Pdo_Sqlite $db - * @param string $target - * - * @return Zend_Db_Adapter_Pdo_Sqlite - */ - public function copySqliteDb(Zend_Db_Adapter_Pdo_Sqlite $db, $target) - { - // Lock database for copy - $db->query('PRAGMA locking_mode = EXCLUSIVE'); - $db->query('BEGIN EXCLUSIVE'); - - $file = $db->getConfig()['dbname']; - if (! copy($file, $target)) { - throw new IcingaException("could not copy '%s' to '%s'", $file, $target); - } - - $db->query('COMMIT'); - $db->query('PRAGMA locking_mode = NORMAL'); - - return new Zend_Db_Adapter_Pdo_Sqlite([ - 'dbname' => $target, - ]); - } - - protected function fetchDatabaseHierarchy($root_id) - { - $query = $this->db->select() - ->from('toplevelview_view_hierarchy AS p', array()) - ->joinInner( - 'toplevelview_view_hierarchy AS n', - 'n.root_id = p.root_id AND (n.lft BETWEEN p.lft AND p.rgt) AND n.level >= p.level', - array('id', 'level') - )->joinInner( - 'toplevelview_view AS v', - 'v.id = n.view_id', - array('name', 'display_name') - )->joinLeft( - 'toplevelview_host AS h', - 'h.view_id = v.id', - array('h.host_object_id') - )->joinLeft( - 'toplevelview_service AS s', - 's.view_id = v.id', - array('s.service_object_id') - )->joinLeft( - 'toplevelview_hostgroup AS hg', - 'hg.view_id = v.id', - array('hg.hostgroup_object_id') - )->where( - 'p.id = ?', - $root_id - )->group(array( - 'n.root_id', - 'n.lft', - // 'n.id', - 'h.host_object_id', - 's.service_object_id', - 'hg.hostgroup_object_id', - ))->order(array( - 'n.lft', - 'hg.hostgroup_object_id', - 'h.host_object_id', - 's.service_object_id', - )); - - $nodes = $this->db->fetchAll($query); - - if (empty($nodes)) { - throw new NotFoundError('Could not find tree for root_id %d', $root_id); - } - - return $nodes; - } - - protected function buildTree($root_id, $nodes, &$hosts, &$services, &$hostgroups) - { - /** @var stdClass $tree */ - $tree = null; - /** @var stdClass $currentParent */ - $currentParent = null; - $currentNode = null; - $currentLevel = null; - $currentId = null; - $chain = array(); - - $currentHostId = null; - - $hosts = array(); - $hostgroups = array(); - $services = array(); - - foreach ($nodes as $node) { - $node = (object) $node; - $node->id = (int) $node->id; - $node->level = (int) $node->level; - - if ($currentId === null || $currentId !== $node->id) { - // only add the node once (all hosts, services and hostgroups are attached on the same node) - $chain[$node->level] = $node; - - if ($tree === null || $node->id === $root_id) { - $currentParent = $tree = $node; - - // minor tweak: remove "top level view" from title - $newTitle = preg_replace('/^Top\s*Level\s*View\s*/i', '', $tree->name); - if (strlen($newTitle) > 4) { - $tree->name = $tree->display_name = $newTitle; - } - - // add old default behavior for status - $tree->host_never_unhandled = true; - $tree->notification_periods = true; - $tree->ignored_notification_periods = ['notification_none']; // migration for Director - } elseif ($node->level > $currentLevel) { - // level down - $currentParent = $chain[$node->level - 1]; - - if (! property_exists($currentParent, 'children')) { - $currentParent->children = array(); - } - $currentParent->children[] = $node; - } elseif ($node->level === $currentLevel) { - // same level - $currentParent->children[] = $node; - } elseif ($node->level < $currentLevel) { - // level up - $currentParent = $chain[$node->level - 1]; - $currentParent->children[] = $node; - } - - if ($node->name === $node->display_name) { - unset($node->display_name); - } - - $currentId = $node->id; - $currentNode = $node; - - // clear current host when node changes - $currentHostId = null; - - // remove unused values - unset($node->id); - unset($node->level); - } - - if (property_exists($node, 'host_object_id') - && $node->host_object_id !== null - && $currentHostId !== $node->host_object_id - ) { - $currentHostId = $node->host_object_id; - - $host = new stdClass; - $host->host = 'UNKNOWN_HOST_' . $node->host_object_id; - $host->type = 'host'; - $host->object_id = $node->host_object_id; - - if (! property_exists($currentNode, 'children')) { - $currentNode->children = array(); - } - - $currentNode->children['host_' . $node->host_object_id] = $host; - $hosts[$node->host_object_id][] = $host; - } - unset($currentNode->host_object_id); - - if (property_exists($node, 'service_object_id') && $node->service_object_id !== null) { - $service = new stdClass; - $service->host = 'UNKNOWN_HOST'; - $service->service = 'UNKNOWN_SERVICE_' . $node->service_object_id; - $service->type = 'service'; - $service->object_id = $node->service_object_id; - - if (! property_exists($currentNode, 'children')) { - $currentNode->children = array(); - } - $currentNode->children['hostservice_' . $node->service_object_id] = $service; - $services[$node->service_object_id][] = $service; - } - unset($currentNode->service_object_id); - - if (property_exists($node, 'hostgroup_object_id') && $node->hostgroup_object_id !== null) { - $hostgroup = new stdClass; - $hostgroup->hostgroup = 'UNKNOWN_HOSTGROUP_' . $node->hostgroup_object_id; - $hostgroup->type = 'hostgroup'; - $hostgroup->object_id = $node->hostgroup_object_id; - - if (! property_exists($currentNode, 'children')) { - $currentNode->children = array(); - } - $currentNode->children['hostgroup_' . $node->hostgroup_object_id] = $hostgroup; - $hostgroups[$node->hostgroup_object_id][] = $hostgroup; - } - unset($currentNode->hostgroup_object_id); - } - - return $tree; - } - - public function fetchTree($root_id) - { - Benchmark::measure('fetchTree: begin'); - - $nodes = $this->fetchDatabaseHierarchy($root_id); - - Benchmark::measure('fetchTree: fetchAll done'); - - $tree = $this->buildTree($root_id, $nodes, $hosts, $services, $hostgroups); - - Benchmark::measure('fetchTree: done building tree'); - - if (! empty($hosts)) { - $hostNames = $this->fetchHosts(array_keys($hosts)); - foreach ($hosts as $objectId => $nodes) { - if (array_key_exists($objectId, $hostNames)) { - foreach ($nodes as $node) { - $node->host = $hostNames[$objectId]; - } - } - } - } - - Benchmark::measure('fetchTree: done getting host info'); - - if (! empty($services)) { - $icingaServices = $this->fetchServices(array_keys($services)); - foreach ($services as $objectId => $nodes) { - if (array_key_exists($objectId, $icingaServices)) { - foreach ($nodes as $node) { - $s = $icingaServices[$objectId]; - $node->host = $s->host_name; - $node->service = $s->service_name; - } - } - } - } - - Benchmark::measure('fetchTree: done getting service info'); - - if (! empty($hostgroups)) { - $icingaHostgroups = $this->fetchHostgroups(array_keys($hostgroups)); - foreach ($hostgroups as $objectId => $nodes) { - if (array_key_exists($objectId, $icingaHostgroups)) { - foreach ($nodes as $node) { - $node->hostgroup = $icingaHostgroups[$objectId]; - } - } - } - } - - Benchmark::measure('fetchTree: done getting service info'); - - return $tree; - } - - protected function fetchHosts($ids) - { - return $this->monitoringBackend()->getResource()->select() - ->from('icinga_objects', array( - 'object_id', - 'name1', - )) - ->where('object_id', $ids) - ->where('objecttype_id', 1) - ->fetchPairs(); - } - - protected function fetchServices($ids) - { - $rows = $this->monitoringBackend()->getResource()->select() - ->from('icinga_objects', array( - 'object_id' => 'object_id', - 'host_name' => 'name1', - 'service_name' => 'name2', - )) - ->where('object_id', $ids) - ->where('objecttype_id', 2) - ->fetchAll(); - - $services = array(); - foreach ($rows as $row) { - $services[$row->object_id] = $row; - } - return $services; - } - - protected function fetchHostgroups($ids) - { - return $this->monitoringBackend()->getResource()->select() - ->from('icinga_objects', array( - 'object_id', - 'name1', - )) - ->where('object_id', $ids) - ->where('objecttype_id', 3) - ->fetchPairs(); - } - - protected function monitoringBackend() - { - if ($this->backend === null) { - throw new ProgrammingError('monitoringBackend has not been set at runtime!'); - } - return $this->backend; - } - - /** - * @param MonitoringBackend $oldBackend - * - * @return LegacyDbHelper - */ - public function setOldBackend(MonitoringBackend $oldBackend) - { - $this->oldBackend = $oldBackend; - return $this; - } - - /** - * @param Zend_Db_Adapter_Pdo_Sqlite $db - * - * @return $this - */ - public function setDb($db) - { - $this->db = $db; - return $this; - } -} From e9f4e46f47211a8a72bb970721b2f883337d5c85 Mon Sep 17 00:00:00 2001 From: Markus Opolka Date: Fri, 10 May 2024 13:14:10 +0200 Subject: [PATCH 2/9] Update .gitignore --- .gitignore | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 2dfe791..4cc7592 100644 --- a/.gitignore +++ b/.gitignore @@ -2,14 +2,11 @@ .*.sw[op] *~ /.idea/ - -# Except those related to git !.git* - -# Docker -/docker-compose.yml +*TODO* # Artifacts from vendor parts in testing +/docker-compose.yml /*.phar /Icinga /Zend From fed9c5f40b9a601737e3af28ad2b9d6bafa86e90 Mon Sep 17 00:00:00 2001 From: Markus Opolka Date: Fri, 10 May 2024 13:14:01 +0200 Subject: [PATCH 3/9] Add support for Icinga DB Web - Breaking: changed option names and removed out_of_notification_period option - This migrates the use of the Monitoring Module to Icinga DB Web - Removes CLI Command to convert Icinga 1 TLV - Removes old database models --- .gitignore | 5 +- README.md | 2 +- application/controllers/ShowController.php | 2 - application/views/helpers/Badges.php | 4 + application/views/helpers/Breadcrumb.php | 2 + application/views/helpers/Tiles.php | 3 + application/views/helpers/Tree.php | 35 ++-- doc/01-Introduction.md | 14 +- doc/02-Behavior.md | 39 +--- doc/10-User-Guide.md | 9 +- doc/20-Editor.md | 6 +- doc/21-Config-Format.md | 15 +- doc/90-Limits.md | 27 --- .../Monitoring/HostgroupQuery.php | 132 ------------- .../Monitoring/Hostgroupsummary.php | 33 ---- .../Monitoring/HostgroupsummaryQuery.php | 157 --------------- .../Monitoring/IgnoredNotificationPeriods.php | 49 ----- library/Toplevelview/Monitoring/Options.php | 33 ---- .../Toplevelview/Monitoring/Servicestatus.php | 38 ---- .../Monitoring/ServicestatusQuery.php | 87 --------- .../Toplevelview/Tree/TLVHostGroupNode.php | 183 +++++++++--------- library/Toplevelview/Tree/TLVHostNode.php | 119 +++++++----- library/Toplevelview/Tree/TLVServiceNode.php | 162 ++++++++-------- library/Toplevelview/Tree/TLVStatus.php | 5 +- library/Toplevelview/Tree/TLVTree.php | 26 +-- library/Toplevelview/Tree/TLVTreeNode.php | 3 + library/Toplevelview/ViewConfig.php | 1 - library/Toplevelview/Web/Controller.php | 23 +-- module.info | 6 +- 29 files changed, 327 insertions(+), 893 deletions(-) delete mode 100644 doc/90-Limits.md delete mode 100644 library/Toplevelview/Monitoring/HostgroupQuery.php delete mode 100644 library/Toplevelview/Monitoring/Hostgroupsummary.php delete mode 100644 library/Toplevelview/Monitoring/HostgroupsummaryQuery.php delete mode 100644 library/Toplevelview/Monitoring/IgnoredNotificationPeriods.php delete mode 100644 library/Toplevelview/Monitoring/Options.php delete mode 100644 library/Toplevelview/Monitoring/Servicestatus.php delete mode 100644 library/Toplevelview/Monitoring/ServicestatusQuery.php diff --git a/.gitignore b/.gitignore index 4cc7592..bd18c50 100644 --- a/.gitignore +++ b/.gitignore @@ -2,10 +2,13 @@ .*.sw[op] *~ /.idea/ -!.git* +\#* +.\#* *TODO* +!.git* # Artifacts from vendor parts in testing +.phplint.cache/ /docker-compose.yml /*.phar /Icinga diff --git a/README.md b/README.md index 3e093fc..36455cb 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ please see the documentation on details. ## Requirements * Icinga Web 2 >= 2.5.0 - * and its monitoring module +* Icinga DB Web >=1.0.0 * php-yaml Also see [Introduction in docs](doc/01-Introduction.md). diff --git a/application/controllers/ShowController.php b/application/controllers/ShowController.php index d0560f2..0497616 100644 --- a/application/controllers/ShowController.php +++ b/application/controllers/ShowController.php @@ -58,7 +58,6 @@ public function indexAction() $this->view->name = $name = $this->params->getRequired('name'); $this->view->view = $view = ViewConfig::loadByName($name); $tree = $view->getTree(); - $tree->setBackend($this->monitoringBackend()); if (($lifetime = $this->getParam('cache')) !== null) { $tree->setCacheLifetime($lifetime); @@ -73,7 +72,6 @@ public function treeAction() $this->view->view = $view = ViewConfig::loadByName($name); $tree = $view->getTree(); $this->view->node = $tree->getById($this->params->getRequired('id')); - $tree->setBackend($this->monitoringBackend()); if (($lifetime = $this->getParam('cache')) !== null) { $tree->setCacheLifetime($lifetime); diff --git a/application/views/helpers/Badges.php b/application/views/helpers/Badges.php index b70d6ed..2bbe5e4 100644 --- a/application/views/helpers/Badges.php +++ b/application/views/helpers/Badges.php @@ -17,6 +17,10 @@ protected function prettyTitle($identifier) return trim($s); } + /** + * badges renders a TLVNode's TLVStatus into HTML. + * A badge represents the number of status of a given node + */ public function badges(TLVStatus $status, $problemsOnly = true, $showTotal = false) { $htm = ''; diff --git a/application/views/helpers/Breadcrumb.php b/application/views/helpers/Breadcrumb.php index 3263712..d155dee 100644 --- a/application/views/helpers/Breadcrumb.php +++ b/application/views/helpers/Breadcrumb.php @@ -9,6 +9,8 @@ class Zend_View_Helper_Breadcrumb extends Zend_View_Helper_Abstract public $view; /** + * breadcrumb renders a list of TLVTreeNodes into a HTML breadcrumb list + * * @param TLVTreeNode[] $breadcrumb * * @return string diff --git a/application/views/helpers/Tiles.php b/application/views/helpers/Tiles.php index dcefbfe..594da28 100644 --- a/application/views/helpers/Tiles.php +++ b/application/views/helpers/Tiles.php @@ -8,6 +8,9 @@ class Zend_View_Helper_Tiles extends Zend_View_Helper_Abstract /** @var \Icinga\Web\View */ public $view; + /** + * tiles renders a TLVTreeNode into a HTML TLV tile + */ public function tiles(TLVTreeNode $node, $levels = 2, $classes = array()) { $htm = ''; diff --git a/application/views/helpers/Tree.php b/application/views/helpers/Tree.php index a016b68..bd7c9ea 100644 --- a/application/views/helpers/Tree.php +++ b/application/views/helpers/Tree.php @@ -9,6 +9,10 @@ class Zend_View_Helper_Tree extends Zend_View_Helper_Abstract /** @var \Icinga\Web\View */ public $view; + /** + * tree takes a TLVTreeNode and renders it recursively into HTML. + * It is used in a Controller to render the full tree. + */ public function tree(TLVTreeNode $node, $classes = array(), $level = 0) { $htm = ''; @@ -23,29 +27,23 @@ public function tree(TLVTreeNode $node, $classes = array(), $level = 0) if ($type === 'host') { $icon = 'host'; - $url = Url::fromPath( - 'monitoring/host/show', - array( - 'host' => $node->get('host') - ) - ); + $url = Url::fromPath('icingadb/host', ['name' => $node->get('host')]); } elseif ($type === 'service') { $icon = 'service'; $url = Url::fromPath( - 'monitoring/service/show', - array( - 'host' => $node->get('host'), - 'service' => $node->get('service') - ) + 'icingadb/service', + [ + 'name' => $node->get('service'), + 'host.name' => $node->get('host') + ] ); } elseif ($type === 'hostgroup') { $icon = 'cubes'; $url = Url::fromPath( - 'monitoring/list/services', + 'icingadb/services', array( - 'hostgroup' => $node->get('hostgroup'), - 'sort' => 'service_severity', - 'dir' => 'desc', + 'hostgroup.name' => $node->get('hostgroup'), + 'sort' => 'service.state.severity desc' ) ); @@ -60,11 +58,10 @@ public function tree(TLVTreeNode $node, $classes = array(), $level = 0) $htmExtra .= ' ' . $this->view->qlink( $hostTitle, - 'monitoring/list/hosts', + 'icingadb/hosts', array( - 'hostgroup' => $node->get('hostgroup'), - 'sort' => 'host_severity', - 'dir' => 'desc', + 'hostgroup.name' => $node->get('hostgroup'), + 'sort' => 'service.state.severity desc' ), null, false diff --git a/doc/01-Introduction.md b/doc/01-Introduction.md index 84d9661..37814b3 100644 --- a/doc/01-Introduction.md +++ b/doc/01-Introduction.md @@ -4,7 +4,7 @@ Introduction Top Level View is a hierarchy based status view for Icinga Web 2. You can define a hierarchical structure containing hosts, services and hostgroups. -And the view presents you an overview of the overall status of the sub-hierarchies. +This view presents you an overview of the overall status of the sub-hierarchies. With a caching layer, this view can aggregate thousands of status objects and make them easily available for overview and drill down. @@ -12,14 +12,9 @@ them easily available for overview and drill down. This view extends the status logic and behavior of Icinga Web 2 a bit, please see later chapters on details. -## Requirements - -* Icinga Web 2 >= 2.5.0 - * and its monitoring module - ## Installation -The view is a simple module for Icinga Web 2, and can be installed via git or a tarball. +Top Level View is a module for Icinga Web 2, and can be installed via git or a tarball. Only other requirement is PHP YAML (which is needed for the configuration format), make sure to reload your web server after installing the module. @@ -41,11 +36,8 @@ Or if you prefer use git. git clone https://github.com/Icinga/icingaweb2-module-toplevelview.git \ /usr/share/icingaweb2/modules/toplevelview + git checkout v0.x.x Enable the module in the web interface, or via CLI: icingacli module enable toplevelview - -## Permissions - -TODO diff --git a/doc/02-Behavior.md b/doc/02-Behavior.md index ae2444b..9e6ba0c 100644 --- a/doc/02-Behavior.md +++ b/doc/02-Behavior.md @@ -1,7 +1,7 @@ Behavior ======== -Top Level View uses additional status logic for it's views. +Top Level View uses additional status logic for its views. This does not affect the overall status behavior of Icinga 2 or Icinga Web 2, but it is important to understand the differences. @@ -30,13 +30,12 @@ Similar to Icinga Web 2 you can easily see unhandled problems by the strength of ![Unhandled problems](screenshots/colors-unhandled.png) ![Handled problems](screenshots/colors-handled.png) -## SOFT states +## SOFT and HARD states While the normal monitoring views will always show you all current states, -the Top Level Views will only show hard states. +the **Top Level Views will only show hard states**. -Which means, as long as the object doesn't have reached a hard state, the -node should be OK and green. +Which means, as long as the object doesn't have reached a hard state, the node will be OK. ## Handled and Unhandled @@ -53,7 +52,7 @@ In Top Level View, a few things are different: * Notification settings can influence a status (see next topic) * Flapping means the state is handled -## Downtime and Notification Periods +## Downtime and Notifications Since downtime and notification settings are essential for alerting, Top Level Views tries to integrate these into its status logic. @@ -62,7 +61,6 @@ The following behaviors will trigger the downtime logic: * Host or Service is in an active downtime * Notifications are disabled for the host or service -* Host or Service is out of its notification period If those conditions are met: @@ -73,29 +71,12 @@ If those conditions are met: Some features can be enabled by view, and control some additional behavior. -### Host always handled +### Option `override_host_problem_to_handled` (bool) -Option `host_never_unhandled` - -Every host problem is set to unhandled by default. +Override every host problem to handled. + +* `override_host_problem_to_handled = true` +* `override_host_problem_to_handled = false` This helps when alerting is mostly based on service states, and the host is only a container. - -This was a behavior of the old Top Level View, and is enabled on convert. - -### Enabling notification period - -Option `notification_periods` - -Checks the configured notification_period and handles "out of period" as downtime active state. - -This was a behavior of the old Top Level View, and is enabled on convert. - -Also see [limitations](90-Limits.md) for this setting. - -### Ignoring certain notification periods - -Option `ignored_notification_periods` - -This notification periods will be ignored for "out of period" checking, see above. diff --git a/doc/10-User-Guide.md b/doc/10-User-Guide.md index 29d7917..762d632 100644 --- a/doc/10-User-Guide.md +++ b/doc/10-User-Guide.md @@ -10,7 +10,7 @@ To understand the status behavior, see the [chapter about behavior](02-Behavior. Unhandled problems can be identified based on color saturation of the tiles. -In addition counters show you how many states of what kind lay below. +In addition counters show you how many states of what kind lay below. ![Unhandled colors](screenshots/colors-unhandled.png) @@ -36,7 +36,7 @@ Every Icinga status object, a host, service or hostgroup is a single tile here. Counters are meant to give you an indication about how many problems, or -even objects are there. +even objects are there. ## Viewing Icinga details @@ -59,7 +59,8 @@ over hosts in that group. ## Note about caching -Please be aware that the data display in Top Level View is cached, for 60 -seconds by default. +Please be aware that the data displayed in the Top Level View is cached for 60 +seconds by default. This can be adjusted using the URL parameter `cache`. +For example: `toplevelview/show/tree?name=example-view&cache=30` Latest state changes will only be reflected after that caching time. diff --git a/doc/20-Editor.md b/doc/20-Editor.md index 28dd5c2..81ec8eb 100644 --- a/doc/20-Editor.md +++ b/doc/20-Editor.md @@ -8,7 +8,7 @@ Please also see the [chapter on config format](21-Config-Format.md). ## Saving -You have 2 options on saving: +You have two options on saving: * Save to session - so you can test and review your edit * Save to disk - it is stored to disk and visible for everyone @@ -20,7 +20,7 @@ Also you can cancel an edit with a button below the editor, and return to disk s ## History -Config history is saved to disk, so it can be restored manually. -But there is not interface yet. +Configuration history is saved to disk, so it can be restored manually. +But there is not web interface. See `/etc/icingaweb2/modules/toplevelview/views//*.yml`. diff --git a/doc/21-Config-Format.md b/doc/21-Config-Format.md index 33236e5..b3b59f0 100644 --- a/doc/21-Config-Format.md +++ b/doc/21-Config-Format.md @@ -11,7 +11,7 @@ For details on the format see [yaml.org](http://yaml.org/). The configuration is structured in a hierarchical object structure like: - root object -> children (array) -> objects -> more children + root object -> children (array) -> objects -> more children Every node is unique in the tree, but names can be repeated. An Icinga objects can be inserted multiple times. @@ -95,24 +95,19 @@ Attributes: ## Options -Additional options are available to control status behavior of -the respective view. - -* `host_never_unhandled` (boolean) Controls the host not being displayed as an unhandled problem. See [behavior](02-Behavior.md#host-always-handled) (Default: false) -* `notification_periods` (boolean) Controls checking notification_period to be in_period. See [behavior](02-Behavior.md#enabling-notification-period) (Default: false) - +Additional options are available to control status behavior of the respective view. These options are just set on the root node: ```yaml name: Test Config with Options -host_never_unhandled: true +override_host_problem_to_handled: true children: - name: Section 1 ``` ## Examples -Here is a longer example from a testing configuration +Here is a longer example from a testing configuration: ```yaml name: Test @@ -189,4 +184,4 @@ children: - name: Notexisting Object children: - host: notexisting -``` \ No newline at end of file +``` diff --git a/doc/90-Limits.md b/doc/90-Limits.md deleted file mode 100644 index 60dc2c7..0000000 --- a/doc/90-Limits.md +++ /dev/null @@ -1,27 +0,0 @@ -Limits of this module -===================== - -A few notes about compatibility to Icinga 2. - -## Notification Period - -Currently Icinga 2 does not publish `notification_period` to the IDO, due -to the new notification logic. - -When `notification_period` is `NULL`, TLV will treat the object as **in period** -to avoid problems here. - -This feature is disabled by default, see [config format](21-Config-Format.md#options) and -[behavior](02-Behavior.md#enabling-notification-period). - -### Period ranges in Icinga 2 - -The publishing of the individual ranges is buggy in Icinga 2 and can not be used here! - -See [Icinga2 #4659](https://github.com/Icinga/icinga2/issues/4659). - -### Period ranges in general - -Not all types of ranges are published to IDO. - -**Only the very basic range type is supported:** Weekday start and end time diff --git a/library/Toplevelview/Monitoring/HostgroupQuery.php b/library/Toplevelview/Monitoring/HostgroupQuery.php deleted file mode 100644 index 62cc014..0000000 --- a/library/Toplevelview/Monitoring/HostgroupQuery.php +++ /dev/null @@ -1,132 +0,0 @@ - */ - -namespace Icinga\Module\Toplevelview\Monitoring; - -use Icinga\Module\Monitoring\Backend\Ido\Query\HostgroupQuery as IcingaHostgroupQuery; - -/** - * Patched version of HostgroupQuery - */ -class HostgroupQuery extends IcingaHostgroupQuery -{ - use IgnoredNotificationPeriods; - use Options; - - public function __construct($ds, $columns = null, $options = null) - { - $this->setOptions($options); - parent::__construct($ds, $columns); - } - - public function init() - { - if (($periods = $this->getOption('ignored_notification_periods')) !== null) { - $this->ignoreNotificationPeriods($periods); - } - - $patchedColumnMap = array( - 'servicestatus' => array( - 'service_notifications_enabled' => 'ss.notifications_enabled', - 'service_is_flapping' => 'ss.is_flapping', - 'service_state' => ' - CASE WHEN ss.has_been_checked = 0 OR ss.has_been_checked IS NULL - THEN 99 - ELSE CASE WHEN ss.state_type = 1 - THEN ss.current_state - ELSE ss.last_hard_state - END - END', - 'service_handled' => ' - CASE WHEN (ss.problem_has_been_acknowledged + COALESCE(hs.current_state, 0)) > 0 - THEN 1 - ELSE 0 - END', - 'service_handled_wo_host' => ' - CASE WHEN ss.problem_has_been_acknowledged > 0 - THEN 1 - ELSE 0 - END', - 'service_in_downtime' => ' - CASE WHEN (ss.scheduled_downtime_depth = 0) - THEN 0 - ELSE 1 - END', - ), - 'hoststatus' => array( - 'host_notifications_enabled' => 'hs.notifications_enabled', - 'host_is_flapping' => 'hs.is_flapping', - 'host_state' => ' - CASE WHEN hs.has_been_checked = 0 OR hs.has_been_checked IS NULL - THEN 99 - ELSE CASE WHEN hs.state_type = 1 - THEN hs.current_state - ELSE hs.last_hard_state - END - END', - 'host_handled' => ' - CASE WHEN hs.problem_has_been_acknowledged > 0 - THEN 1 - ELSE 0 - END', - 'host_in_downtime' => ' - CASE WHEN (hs.scheduled_downtime_depth = 0) - THEN 0 - ELSE 1 - END', - ), - 'servicenotificationperiod' => array( - 'service_notification_period' => 'ntpo.name1', - 'service_in_notification_period' => ' - CASE WHEN ntpo.object_id IS NULL - THEN 1 - ELSE CASE WHEN ntpr.timeperiod_id IS NOT NULL - THEN 1 - ELSE 0 - END - END', - ), - ); - - foreach ($patchedColumnMap as $table => $columns) { - foreach ($columns as $k => $v) { - $this->columnMap[$table][$k] = $v; - } - } - - parent::init(); - } - - protected function joinServicenotificationperiod() - { - $extraJoinCond = ''; - - if ($this->hasIgnoredNotifications()) { - $extraJoinCond .= $this->db->quoteInto( - ' AND ntpo.name1 NOT IN (?)', - $this->getIgnoredNotificationPeriods() - ); - } - - $this->select->joinLeft( - ['ntp' => $this->prefix . 'timeperiods'], - 'ntp.timeperiod_object_id = s.notification_timeperiod_object_id' - . ' AND ntp.config_type = 1 AND ntp.instance_id = s.instance_id', - [] - ); - $this->select->joinLeft( - ['ntpo' => $this->prefix . 'objects'], - 'ntpo.object_id = s.notification_timeperiod_object_id' . $extraJoinCond, - [] - ); - $this->select->joinLeft( - ['ntpr' => $this->prefix . 'timeperiod_timeranges'], - "ntpr.timeperiod_id = ntp.timeperiod_id - AND ntpr.day = DAYOFWEEK(CURRENT_DATE()) - 1 - AND ntpr.start_sec <= UNIX_TIMESTAMP() - UNIX_TIMESTAMP(CURRENT_DATE()) - AND ntpr.end_sec >= UNIX_TIMESTAMP() - UNIX_TIMESTAMP(CURRENT_DATE()) - ", - [] - ); - } -} diff --git a/library/Toplevelview/Monitoring/Hostgroupsummary.php b/library/Toplevelview/Monitoring/Hostgroupsummary.php deleted file mode 100644 index c89f09c..0000000 --- a/library/Toplevelview/Monitoring/Hostgroupsummary.php +++ /dev/null @@ -1,33 +0,0 @@ - */ - -namespace Icinga\Module\Toplevelview\Monitoring; - -use Icinga\Data\ConnectionInterface; -use Icinga\Module\Monitoring\Backend\MonitoringBackend; -use Icinga\Module\Monitoring\DataView\Hostgroupsummary as IcingaHostgroupsummary; - -/** - * Patched version of Hostgroupsummary - * - * Just to load a patched version of HostgroupsummaryQuery - */ -class Hostgroupsummary extends IcingaHostgroupsummary -{ - /** @noinspection PhpMissingParentConstructorInspection */ - /** - * @param ConnectionInterface $connection - * @param array|null $columns - * @param array|null $options - * @noinspection PhpMissingParentConstructorInspection - */ - public function __construct( - ConnectionInterface $connection, - array $columns = null, - $options = null - ) { - /** @var MonitoringBackend $connection */ - $this->connection = $connection; - $this->query = new HostgroupsummaryQuery($connection->getResource(), $columns, $options); - } -} diff --git a/library/Toplevelview/Monitoring/HostgroupsummaryQuery.php b/library/Toplevelview/Monitoring/HostgroupsummaryQuery.php deleted file mode 100644 index 5390613..0000000 --- a/library/Toplevelview/Monitoring/HostgroupsummaryQuery.php +++ /dev/null @@ -1,157 +0,0 @@ - */ - -namespace Icinga\Module\Toplevelview\Monitoring; - -use Icinga\Data\Filter\Filter; -use Icinga\Module\Monitoring\Backend\Ido\Query\HostgroupsummaryQuery as IcingaHostgroupsummaryQuery; -use Zend_Db_Expr; -use Zend_Db_Select; - -/** - * Patched version of HostgroupsummaryQuery - */ -class HostgroupsummaryQuery extends IcingaHostgroupsummaryQuery -{ - use Options; - - public function __construct($ds, $columns = null, $options = null) - { - $this->setOptions($options); - parent::__construct($ds, $columns); - } - - public function init() - { - if ($this->getOption('notification_periods') === true) { - $serviceOutDowntime =# - 'service_notifications_enabled = 1 AND service_in_downtime = 0 AND service_in_notification_period = 1'; - $serviceInDowntime = - '(service_notifications_enabled = 0 OR service_in_downtime = 1 OR service_in_notification_period = 0)'; - } else { - $serviceOutDowntime = 'service_notifications_enabled = 1 AND service_in_downtime = 0'; - $serviceInDowntime = '(service_notifications_enabled = 0 OR service_in_downtime = 1)'; - } - - $hostOutDowntime = 'host_notifications_enabled = 1 AND host_in_downtime = 0'; - $hostInDowntime = '(host_notifications_enabled = 0 OR host_in_downtime = 1)'; - - if ($this->getOption('host_never_unhandled') === true) { - $patchServicesHandled = "(service_handled_wo_host = 1 OR service_is_flapping = 1) AND $serviceOutDowntime"; - $patchServicesUnhandled = "service_handled_wo_host = 0 AND service_is_flapping = 0 AND $serviceOutDowntime"; - } else { - $patchServicesHandled = "(service_handled = 1 OR service_is_flapping = 1) AND $serviceOutDowntime"; - $patchServicesUnhandled = "service_handled = 0 AND service_is_flapping = 0 AND $serviceOutDowntime"; - } - - $patchHostsHandled = "(host_handled = 1 OR host_is_flapping = 1) AND $hostOutDowntime"; - $patchHostsUnhandled = "host_handled = 0 AND host_is_flapping = 0 AND $hostOutDowntime"; - - $patchedColumnMap = array( - 'hostgroupsummary' => array( - 'hosts_down_handled' => - "SUM(CASE WHEN host_state = 1 AND $patchHostsHandled THEN 1 ELSE 0 END)", - 'hosts_down_unhandled' => - "SUM(CASE WHEN host_state = 1 AND $patchHostsUnhandled THEN 1 ELSE 0 END)", - 'hosts_unreachable_handled' => - "SUM(CASE WHEN host_state = 2 AND $patchHostsHandled THEN 1 ELSE 0 END)", - 'hosts_unreachable_unhandled' => - "SUM(CASE WHEN host_state = 2 AND $patchHostsUnhandled THEN 1 ELSE 0 END)", - 'hosts_downtime_handled' => - "SUM(CASE WHEN host_state != 0 AND $hostInDowntime THEN 1 ELSE 0 END)", - 'hosts_downtime_active' => - "SUM(CASE WHEN $hostInDowntime THEN 1 ELSE 0 END)", - 'services_critical_handled' => - "SUM(CASE WHEN service_state = 2 AND $patchServicesHandled THEN 1 ELSE 0 END)", - 'services_critical_unhandled' => - "SUM(CASE WHEN service_state = 2 AND $patchServicesUnhandled THEN 1 ELSE 0 END)", - 'services_unknown_handled' => - "SUM(CASE WHEN service_state = 3 AND $patchServicesHandled THEN 1 ELSE 0 END)", - 'services_unknown_unhandled' => - "SUM(CASE WHEN service_state = 3 AND $patchServicesUnhandled THEN 1 ELSE 0 END)", - 'services_warning_handled' => - "SUM(CASE WHEN service_state = 1 AND $patchServicesHandled THEN 1 ELSE 0 END)", - 'services_warning_unhandled' => - "SUM(CASE WHEN service_state = 1 AND $patchServicesUnhandled THEN 1 ELSE 0 END)", - 'services_downtime_handled' => - "SUM(CASE WHEN service_state != 0 AND $serviceInDowntime THEN 1 ELSE 0 END)", - 'services_downtime_active' => - "SUM(CASE WHEN $serviceInDowntime THEN 1 ELSE 0 END)", - ) - ); - - foreach ($patchedColumnMap as $table => $columns) { - foreach ($columns as $k => $v) { - $this->columnMap[$table][$k] = $v; - } - } - parent::init(); - } - - protected function createSubQuery($queryName, $columns = array()) - { - if ($queryName === 'Hostgroup') { - // use locally patched query - return new HostgroupQuery($this->ds, $columns, $this->options); - } else { - return parent::createSubQuery($queryName, $columns); - } - } - - protected function joinBaseTables() - { - $this->countQuery = $this->createSubQuery( - 'Hostgroup', - array() - ); - $hostColumns = array( - 'hostgroup_alias', - 'hostgroup_name', - 'host_handled', - 'host_notifications_enabled', - 'host_state', - 'host_is_flapping', - 'host_in_downtime', - 'service_handled' => new Zend_Db_Expr('NULL'), - 'service_handled_wo_host' => new Zend_Db_Expr('NULL'), - 'service_state' => new Zend_Db_Expr('NULL'), - 'service_notifications_enabled' => new Zend_Db_Expr('NULL'), - 'service_is_flapping' => new Zend_Db_Expr('NULL'), - 'service_in_downtime' => new Zend_Db_Expr('NULL'), - ); - - $serviceColumns = array( - 'hostgroup_alias', - 'hostgroup_name', - 'host_handled' => new Zend_Db_Expr('NULL'), - 'host_state' => new Zend_Db_Expr('NULL'), - 'host_notifications_enabled' => new Zend_Db_Expr('NULL'), - 'host_is_flapping' => new Zend_Db_Expr('NULL'), - 'host_in_downtime' => new Zend_Db_Expr('NULL'), - 'service_handled', - 'service_handled_wo_host', - 'service_state', - 'service_notifications_enabled', - 'service_is_flapping', - 'service_in_downtime', - ); - - if ($this->getOption('notification_periods') === true) { - $hostColumns['service_in_notification_period'] = new Zend_Db_Expr('NULL'); - $serviceColumns['service_in_notification_period'] = 'service_in_notification_period'; - } - - $hosts = $this->createSubQuery('Hostgroup', $hostColumns); - // ignore empty hostgroups in this subquery - $hosts->setFilter(Filter::expression('ho.object_id', '>', 0)); - $this->subQueries[] = $hosts; - $services = $this->createSubQuery('Hostgroup', $serviceColumns); - // ignore empty hostgroups in this subquery - $services->setFilter(Filter::expression('ho.object_id', '>', 0)); - $this->subQueries[] = $services; - $this->summaryQuery = $this->db->select()->union(array($hosts, $services), Zend_Db_Select::SQL_UNION_ALL); - $this->select->from(array('hostgroupsummary' => $this->summaryQuery), array()); - $this->group(array('hostgroup_name', 'hostgroup_alias')); - $this->joinedVirtualTables['hostgroupsummary'] = true; - } -} diff --git a/library/Toplevelview/Monitoring/IgnoredNotificationPeriods.php b/library/Toplevelview/Monitoring/IgnoredNotificationPeriods.php deleted file mode 100644 index 4b9e94c..0000000 --- a/library/Toplevelview/Monitoring/IgnoredNotificationPeriods.php +++ /dev/null @@ -1,49 +0,0 @@ - */ - -namespace Icinga\Module\Toplevelview\Monitoring; - -trait IgnoredNotificationPeriods -{ - protected $ignoredNotificationPeriods = []; - - public function ignoreNotificationPeriod($name) - { - $this->ignoredNotificationPeriods[$name] = true; - return $this; - } - - /** - * @param string|array|iterable $list - * - * @return $this - */ - public function ignoreNotificationPeriods($list) - { - if (is_string($list)) { - /** @var string $list */ - $this->ignoredNotificationPeriods[$list] = true; - } else { - foreach ($list as $i) { - $this->ignoredNotificationPeriods[$i] = true; - } - } - - return $this; - } - - public function getIgnoredNotificationPeriods() - { - return array_keys($this->ignoredNotificationPeriods); - } - - public function resetIgnoredNotificationPeriods() - { - $this->ignoredNotificationPeriods = []; - } - - public function hasIgnoredNotifications() - { - return ! empty($this->ignoredNotificationPeriods); - } -} diff --git a/library/Toplevelview/Monitoring/Options.php b/library/Toplevelview/Monitoring/Options.php deleted file mode 100644 index 75f739f..0000000 --- a/library/Toplevelview/Monitoring/Options.php +++ /dev/null @@ -1,33 +0,0 @@ - */ - -namespace Icinga\Module\Toplevelview\Monitoring; - -trait Options -{ - protected $options = []; - - public function getOption($key) - { - if (array_key_exists($key, $this->options)) { - return $this->options[$key]; - } - - return null; - } - - public function setOptions($options, $flush = false) - { - if ($flush) { - $this->options = []; - } - - if (! empty($options)) { - foreach ($options as $k => $v) { - $this->options[$k] = $v; - } - } - - return $this; - } -} diff --git a/library/Toplevelview/Monitoring/Servicestatus.php b/library/Toplevelview/Monitoring/Servicestatus.php deleted file mode 100644 index e43572f..0000000 --- a/library/Toplevelview/Monitoring/Servicestatus.php +++ /dev/null @@ -1,38 +0,0 @@ - */ - -namespace Icinga\Module\Toplevelview\Monitoring; - -use Icinga\Data\ConnectionInterface; -use Icinga\Module\Monitoring\Backend\MonitoringBackend; -use Icinga\Module\Monitoring\DataView\Servicestatus as IcingaServiceStatus; - -class Servicestatus extends IcingaServiceStatus -{ - /** @noinspection PhpMissingParentConstructorInspection */ - /** - * @param ConnectionInterface $connection - * @param array|null $columns - * @noinspection PhpMissingParentConstructorInspection - */ - public function __construct(ConnectionInterface $connection, array $columns = null, $options = null) - { - /** @var MonitoringBackend $connection */ - $this->connection = $connection; - $this->query = new ServicestatusQuery($connection->getResource(), $columns, $options); - } - - /** - * {@inheritdoc} - */ - public function getColumns() - { - return array_merge( - parent::getColumns(), - array( - //'service_in_notification_period', - 'service_notification_period', - ) - ); - } -} diff --git a/library/Toplevelview/Monitoring/ServicestatusQuery.php b/library/Toplevelview/Monitoring/ServicestatusQuery.php deleted file mode 100644 index addee2f..0000000 --- a/library/Toplevelview/Monitoring/ServicestatusQuery.php +++ /dev/null @@ -1,87 +0,0 @@ - */ - -namespace Icinga\Module\Toplevelview\Monitoring; - -use Icinga\Module\Monitoring\Backend\Ido\Query\ServicestatusQuery as IcingaServicestatusQuery; - -/** - * Patched version of ServicestatusQuery - */ -class ServicestatusQuery extends IcingaServicestatusQuery -{ - use IgnoredNotificationPeriods; - use Options; - - public function __construct($ds, $columns = null, $options = null) - { - $this->setOptions($options); - parent::__construct($ds, $columns); - } - - public function init() - { - if (($periods = $this->getOption('ignored_notification_periods')) !== null) { - $this->ignoreNotificationPeriods($periods); - } - - $patchedColumnMap = array( - 'servicestatus' => array( - 'service_handled_wo_host' => 'CASE WHEN ss.problem_has_been_acknowledged > 0 THEN 1 ELSE 0 END', - ), - 'servicenotificationperiod' => array( - 'service_notification_period' => 'ntpo.name1', - 'service_in_notification_period' => ' - CASE WHEN ntpo.name1 IS NULL - THEN 1 - ELSE CASE WHEN ntpr.timeperiod_id IS NOT NULL - THEN 1 - ELSE 0 - END - END', - ), - ); - - foreach ($patchedColumnMap as $table => $columns) { - foreach ($columns as $k => $v) { - $this->columnMap[$table][$k] = $v; - } - } - - parent::init(); - } - - protected function joinServicenotificationperiod() - { - $extraJoinCond = ''; - - if ($this->hasIgnoredNotifications()) { - $extraJoinCond .= $this->db->quoteInto( - ' AND ntpo.name1 NOT IN (?)', - $this->getIgnoredNotificationPeriods() - ); - } - - $this->select->joinLeft( - ["ntp" => $this->prefix . 'timeperiods'], - 'ntp.timeperiod_object_id = s.notification_timeperiod_object_id' - . ' AND ntp.config_type = 1 AND ntp.instance_id = s.instance_id', - [] - ); - $this->select->joinLeft( - ['ntpo' => $this->prefix . 'objects'], - 'ntpo.object_id = s.notification_timeperiod_object_id' - . $extraJoinCond, - [] - ); - $this->select->joinLeft( - ['ntpr' => $this->prefix . 'timeperiod_timeranges'], - 'ntpr.timeperiod_id = ntp.timeperiod_id - AND ntpr.day = DAYOFWEEK(CURRENT_DATE()) - 1 - AND ntpr.start_sec < UNIX_TIMESTAMP() - UNIX_TIMESTAMP(CURRENT_DATE()) - AND ntpr.end_sec > UNIX_TIMESTAMP() - UNIX_TIMESTAMP(CURRENT_DATE()) - ', - [] - ); - } -} diff --git a/library/Toplevelview/Tree/TLVHostGroupNode.php b/library/Toplevelview/Tree/TLVHostGroupNode.php index a6dc7e4..b55424f 100644 --- a/library/Toplevelview/Tree/TLVHostGroupNode.php +++ b/library/Toplevelview/Tree/TLVHostGroupNode.php @@ -5,8 +5,13 @@ use Icinga\Application\Benchmark; use Icinga\Exception\NotFoundError; -use Icinga\Module\Toplevelview\Monitoring\Hostgroupsummary; +use Icinga\Module\Icingadb\Model\Hostgroupsummary; +use ipl\Stdlib\Filter; +use stdClass; +/** + * TLVHostGroupNode represents a Hostgroup in the tree + */ class TLVHostGroupNode extends TLVIcingaNode { protected $type = 'hostgroup'; @@ -23,112 +28,100 @@ public static function fetch(TLVTree $root) throw new NotFoundError('No hostgroups registered to fetch!'); } - $names = array_keys($root->registeredObjects['hostgroup']); - - $options = []; - foreach (['notification_periods', 'host_never_unhandled', 'ignored_notification_periods'] as $opt) { - $options[$opt] = $root->get($opt); + $hgFilter = Filter::any(); + foreach (array_keys($root->registeredObjects['hostgroup']) as $name) { + $hgFilter->add(Filter::equal('hostgroup_name', $name)); } - // Note: this uses a patched version of Hostsgroupsummary / HostgroupsummaryQuery ! - $hostgroups = new Hostgroupsummary( - $root->getBackend(), - array( - 'hostgroup_name', - 'hosts_down_handled', - 'hosts_down_unhandled', - 'hosts_total', - 'hosts_unreachable_handled', - 'hosts_unreachable_unhandled', - 'hosts_downtime_handled', - 'hosts_downtime_active', - 'hosts_up', - 'services_critical_handled', - 'services_critical_unhandled', - 'services_ok', - 'services_total', - 'services_unknown_handled', - 'services_unknown_unhandled', - 'services_warning_handled', - 'services_warning_unhandled', - 'services_downtime_handled', - 'services_downtime_active', - ), - $options - ); + $hostgroups = Hostgroupsummary::on($root->getDb()); - $hostgroups->where('hostgroup_name', $names); + $hostgroups->filter($hgFilter); foreach ($hostgroups as $hostgroup) { - $root->registeredObjects['hostgroup'][$hostgroup->hostgroup_name] = $hostgroup; + // TODO We cannot store the ORM Models with json_encore + // Thus I'm converting things to objects that can be stored + // Maybe there's a better way? iterator_to_array does not work. + $hg = new stdClass; + $hg->hosts_total = $hostgroup->hosts_total; + $hg->hosts_up = $hostgroup->hosts_up; + $hg->hosts_total = $hostgroup->hosts_total; + $hg->services_total = $hostgroup->services_total; + $hg->hosts_up = $hostgroup->hosts_up; + $hg->services_ok = $hostgroup->services_ok; + $hg->hosts_down_handled = $hostgroup->hosts_down_handled; + $hg->hosts_down_unhandled = $hostgroup->hosts_down_unhandled; + $hg->services_warning_handled = $hostgroup->services_warning_handled; + $hg->services_warning_unhandled = $hostgroup->services_warning_unhandled; + $hg->services_critical_handled = $hostgroup->services_critical_handled; + $hg->services_critical_unhandled = $hostgroup->services_critical_unhandled; + $hg->services_unknown_handled = $hostgroup->services_unknown_handled; + $hg->services_unknown_unhandled = $hostgroup->services_unknown_unhandled; + + $root->registeredObjects['hostgroup'][$hostgroup->name] = $hg; } Benchmark::measure('Finished fetching hostgroups'); } - public function getStatus() + /** + * getStatus returns the current status for the Hostgroup + * + * @return TLVStatus + */ + public function getStatus(): TLVStatus { - if ($this->status === null) { - $this->status = $status = new TLVStatus(); - $key = $this->getKey(); - - if (($data = $this->root->getFetched($this->type, $key)) !== null) { - $status->set('total', $data->hosts_total + $data->services_total); - $status->set('ok', $data->hosts_up + $data->services_ok); - - $status->set('critical_handled', $data->services_critical_handled); - $status->set('critical_unhandled', $data->services_critical_unhandled); - - if ($this->getRoot()->get('host_never_unhandled') === true) { - $status->add( - 'critical_handled', - $data->hosts_down_handled - + $data->hosts_unreachable_handled - + $data->hosts_down_unhandled - + $data->hosts_unreachable_unhandled - ); - } else { - $status->add( - 'critical_handled', - $data->hosts_down_handled - + $data->hosts_unreachable_handled - ); - $status->add( - 'critical_unhandled', - $data->hosts_down_unhandled - + $data->hosts_unreachable_unhandled - ); - } - - $status->set('warning_handled', $data->services_warning_handled); - $status->set('warning_unhandled', $data->services_warning_unhandled); - $status->set('unknown_handled', $data->services_unknown_handled); - $status->set('unknown_unhandled', $data->services_unknown_unhandled); - - $status->set( - 'downtime_handled', - $data->hosts_downtime_handled - + $data->services_downtime_handled - ); - $status->set( - 'downtime_active', - $data->hosts_downtime_active - + $data->services_downtime_active - ); - - // extra metadata for view - $status->setMeta('hosts_total', $data->hosts_total); - $status->setMeta( - 'hosts_unhandled', - $data->hosts_down_unhandled - + $data->hosts_unreachable_unhandled - ); - - $status->set('missing', 0); - } else { - $status->add('missing', 1); - } + if ($this->status !== null) { + return $this->status; } + + $this->status = $status = new TLVStatus(); + $key = $this->getKey(); + + $hostgroup = $this->root->getFetched($this->type, $key); + + if ($hostgroup === null) { + $this->status->add('missing', 1); + return $this->status; + } + + $status->set('total', $hostgroup->hosts_total + $hostgroup->services_total); + $status->set('ok', $hostgroup->hosts_up + $hostgroup->services_ok); + + $status->set('critical_handled', $hostgroup->services_critical_handled); + $status->set('critical_unhandled', $hostgroup->services_critical_unhandled); + + // Override the host status to handled if the option is set + if ($this->getRoot()->get('override_host_problem_to_handled') === true) { + $status->add( + 'critical_handled', + $hostgroup->hosts_down_handled + + $hostgroup->hosts_down_unhandled + ); + } else { + $status->add( + 'critical_handled', + $hostgroup->hosts_down_handled + ); + $status->add( + 'critical_unhandled', + $hostgroup->hosts_down_unhandled + ); + } + + $status->set('warning_handled', $hostgroup->services_warning_handled); + $status->set('warning_unhandled', $hostgroup->services_warning_unhandled); + $status->set('unknown_handled', $hostgroup->services_unknown_handled); + $status->set('unknown_unhandled', $hostgroup->services_unknown_unhandled); + + // extra metadata for view + $status->setMeta('hosts_total', $hostgroup->hosts_total); + $status->setMeta( + 'hosts_unhandled', + $hostgroup->hosts_down_unhandled + ); + + $status->set('missing', 0); + return $this->status; } } diff --git a/library/Toplevelview/Tree/TLVHostNode.php b/library/Toplevelview/Tree/TLVHostNode.php index f03ae47..8c33e23 100644 --- a/library/Toplevelview/Tree/TLVHostNode.php +++ b/library/Toplevelview/Tree/TLVHostNode.php @@ -5,7 +5,13 @@ use Icinga\Application\Benchmark; use Icinga\Exception\NotFoundError; +use Icinga\Module\Icingadb\Model\Host; +use ipl\Stdlib\Filter; +use stdClass; +/** + * TLVHostNode represents a Host in the tree + */ class TLVHostNode extends TLVIcingaNode { protected $type = 'host'; @@ -22,60 +28,85 @@ public static function fetch(TLVTree $root) throw new NotFoundError('No hosts registered to fetch!'); } - $names = array_keys($root->registeredObjects['host']); + $hostnameFilter = Filter::any(); + foreach (array_keys($root->registeredObjects['host']) as $name) { + $hostnameFilter->add(Filter::equal('name', $name)); + } + + $hosts = Host::on($root->getDb())->with([ + 'state' + ]); - $hosts = $root->getBackend()->select() - ->from('hoststatus', array( - 'host_name', - 'host_hard_state', - 'host_handled', - 'host_in_downtime', - 'host_notifications_enabled', - )) - ->where('host_name', $names); + $hosts->filter($hostnameFilter); foreach ($hosts as $host) { - $root->registeredObjects['host'][$host->host_name] = $host; + // TODO We cannot store the ORM Models with json_encore + // Thus I'm converting things to objects that can be stored + // Maybe there's a better way? iterator_to_array does not work. + $h = new stdClass; + $h->state = new stdClass; + $h->notifications_enabled = $host->notifications_enabled; + $h->state->hard_state = $host->state->hard_state; + $h->state->is_flapping = $host->state->is_flapping; + $h->state->is_handled = $host->state->is_handled; + $h->state->in_downtime = $host->state->in_downtime; + + $root->registeredObjects['host'][$host->name] = $h; } Benchmark::measure('Finished fetching hosts'); } - public function getStatus() + /** + * getStatus returns the current status for the Host + * + * @return TLVStatus + */ + public function getStatus(): TLVStatus { - if ($this->status === null) { - $this->status = $status = new TLVStatus(); - $key = $this->getKey(); - - if (($data = $this->root->getFetched($this->type, $key)) !== null) { - $status->zero(); - $status->add('total'); - - $state = $data->host_hard_state; - - if ($data->host_in_downtime > 0 || $data->host_notifications_enabled === '0') { - $status->add('downtime_active'); - $state = '10'; - $handled = ''; - } elseif ($data->host_handled === '1' || $this->getRoot()->get('host_never_unhandled') === true) { - $handled = '_handled'; - } else { - $handled = '_unhandled'; - } - - if ($state === '0') { - $status->add('ok'); - } elseif ($state === '1' || $state === '2') { - $status->add('critical' . $handled); - } elseif ($state === '10') { - $status->add('downtime_handled'); - } else { - $status->add('unknown_handled'); - } - } else { - $status->add('missing', 1); - } + if ($this->status !== null) { + return $this->status; + } + + $this->status = $status = new TLVStatus(); + $key = $this->getKey(); + + $host = $this->root->getFetched($this->type, $key); + + if ($host === null) { + $this->status->add('missing', 1); + return $this->status; } + + $status->zero(); + $status->add('total'); + + // We only care about the hard state in TLV + $state = $host->state->hard_state; + + if ($host->state->in_downtime || $host->notifications_enabled === false) { + // Set downtime if notifications are disabled for the host + $status->add('downtime_active'); + $state = 10; + $handled = ''; + } elseif ($host->state->is_handled || + $this->getRoot()->get('override_host_problem_to_handled')) { + // Set the state to handled if it actually is handled, and the option is set to override the state + $handled = '_handled'; + } else { + $handled = '_unhandled'; + } + + if ($state === 0) { + $status->add('ok'); + } elseif ($state === 1 || $state === 2) { + $status->add('critical' . $handled); + } elseif ($state === 10) { + $status->add('downtime_handled'); + } else { + $status->add('unknown_handled'); + } + return $this->status; } } diff --git a/library/Toplevelview/Tree/TLVServiceNode.php b/library/Toplevelview/Tree/TLVServiceNode.php index 2036714..4b5cb07 100644 --- a/library/Toplevelview/Tree/TLVServiceNode.php +++ b/library/Toplevelview/Tree/TLVServiceNode.php @@ -5,8 +5,13 @@ use Icinga\Application\Benchmark; use Icinga\Exception\NotFoundError; -use Icinga\Module\Toplevelview\Monitoring\Servicestatus; +use Icinga\Module\Icingadb\Model\Service; +use ipl\Stdlib\Filter; +use stdClass; +/** + * TLVServiceNode represents a Service in the tree + */ class TLVServiceNode extends TLVIcingaNode { protected $type = 'service'; @@ -45,99 +50,100 @@ public static function fetch(TLVTree $root) throw new NotFoundError('No services registered to fetch!'); } - $names = array_keys($root->registeredObjects['host']); - - $columns = array( - 'host_name', - 'service_description', - 'service_hard_state', - 'service_handled', - 'service_handled_wo_host', - 'service_notifications_enabled', - 'service_notification_period', - 'service_is_flapping', - 'service_in_downtime', - ); + $hostnameFilter = Filter::any(); - $options = []; - foreach (['notification_periods', 'host_never_unhandled', 'ignored_notification_periods'] as $opt) { - $options[$opt] = $root->get($opt); + foreach (array_keys($root->registeredObjects['host']) as $name) { + $hostnameFilter->add(Filter::equal('host.name', $name)); } - if ($root->get('notification_periods') === true) { - $columns[] = 'service_in_notification_period'; - } + $services = Service::on($root->getDb())->with([ + 'host', + 'state' + ]); - // Note: this uses a patched version of Servicestatus / ServicestatusQuery ! - $services = new Servicestatus($root->getBackend(), $columns, $options); - $services->where('host_name', $names); + $services->filter($hostnameFilter); foreach ($services as $service) { - $key = sprintf('%s!%s', $service->host_name, $service->service_description); + // TODO We cannot store the ORM Models with json_encore + // Thus I'm converting things to objects that can be stored + // Maybe there's a better way? iterator_to_array does not work. + $s = new stdClass; + $s->state = new stdClass; + $s->notifications_enabled = $service->notifications_enabled; + $s->display_name = $service->display_name; + $s->state->hard_state = $service->state->hard_state; + $s->state->is_flapping = $service->state->is_flapping; + $s->state->is_handled = $service->state->is_handled; + $s->state->in_downtime = $service->state->in_downtime; + + $key = sprintf('%s!%s', $service->host->name, $service->display_name); if (array_key_exists($key, $root->registeredObjects['service'])) { - $root->registeredObjects['service'][$key] = $service; + $root->registeredObjects['service'][$key] = $s; } } Benchmark::measure('Finished fetching services'); } - public function getStatus() + /** + * getStatus returns the current status for the Service + * + * @return TLVStatus + */ + public function getStatus(): TLVStatus { - if ($this->status === null) { - $this->status = $status = new TLVStatus(); - $key = $this->getKey(); - - if (($data = $this->root->getFetched($this->type, $key)) !== null) { - $status->zero(); - $status->add('total'); - - $state = $data->service_hard_state; - - if ($this->getRoot()->get('notification_periods') === true) { - $notInPeriod = $data->service_in_notification_period === '0'; - } else { - $notInPeriod = false; - } - - if ($this->getRoot()->get('host_never_unhandled') === true) { - $isHandled = $data->service_handled_wo_host === '1'; - } else { - $isHandled = $data->service_handled === '1'; - } - $isHandled = $isHandled || $data->service_is_flapping === '1'; - - if ($data->service_in_downtime > 0 - || $data->service_notifications_enabled === '0' - || $notInPeriod - ) { - $status->add('downtime_active'); - if ($state !== '0') { - $state = '10'; - } - } - - if ($isHandled) { - $handled = '_handled'; - } else { - $handled = '_unhandled'; - } - - if ($state === '0' || $state === '99') { - $status->add('ok', 1); - } elseif ($state === '1') { - $status->add('warning' . $handled, 1); - } elseif ($state === '2') { - $status->add('critical' . $handled, 1); - } elseif ($state === '10') { - $status->add('downtime_handled'); - } else { - $status->add('unknown' . $handled, 1); - } - } else { - $status->add('missing', 1); + if ($this->status !== null) { + return $this->status; + } + + $this->status = $status = new TLVStatus(); + $key = $this->getKey(); + + $service = $this->root->getFetched($this->type, $key); + + if ($service === null) { + $status->add('missing', 1); + return $this->status; + } + + $status->zero(); + $status->add('total'); + + // We only care about the hard state in TLV + $state = $service->state->hard_state; + + // Get the service's current handled state + $isHandled = $service->state->is_handled; + + // In TLV flapping means the state is handled + $isHandled = $isHandled || $service->state->is_flapping; + + // Set downtime if notifications are disabled for the service + if ($service->state->in_downtime || $service->notifications_enabled === false) { + $status->add('downtime_active'); + if ($state !== 0) { + $state = 10; } } + + if ($isHandled) { + $handled = '_handled'; + } else { + $handled = '_unhandled'; + } + + if ($state === 0 || $state === 99) { + $status->add('ok', 1); + } elseif ($state === 1) { + $status->add('warning' . $handled, 1); + } elseif ($state === 2) { + $status->add('critical' . $handled, 1); + } elseif ($state === 10) { + $status->add('downtime_handled'); + } else { + $status->add('unknown' . $handled, 1); + } + return $this->status; } } diff --git a/library/Toplevelview/Tree/TLVStatus.php b/library/Toplevelview/Tree/TLVStatus.php index afecc1e..35c28bc 100644 --- a/library/Toplevelview/Tree/TLVStatus.php +++ b/library/Toplevelview/Tree/TLVStatus.php @@ -3,6 +3,9 @@ namespace Icinga\Module\Toplevelview\Tree; +/** + * TLVStatus represents the status for a TLVTreeNode that is shown in the view + */ class TLVStatus { protected $properties = array( @@ -22,7 +25,7 @@ class TLVStatus protected static $statusPriority = array( 'critical_unhandled', 'warning_unhandled', - 'unknown_unhandled', // Note: old TLV ignored UNKNOWN basically + 'unknown_unhandled', 'critical_handled', 'warning_handled', 'unknown_handled', diff --git a/library/Toplevelview/Tree/TLVTree.php b/library/Toplevelview/Tree/TLVTree.php index 817d52c..ecfe6e3 100644 --- a/library/Toplevelview/Tree/TLVTree.php +++ b/library/Toplevelview/Tree/TLVTree.php @@ -7,14 +7,22 @@ use Icinga\Exception\IcingaException; use Icinga\Exception\NotFoundError; use Icinga\Exception\ProgrammingError; -use Icinga\Module\Monitoring\Backend\MonitoringBackend; +use Icinga\Module\Icingadb\Common\Database; use Icinga\Module\Toplevelview\Util\Json; use Icinga\Module\Toplevelview\ViewConfig; use Icinga\Web\FileCache; use stdClass; +/** + * TLVTree represents the root of the TLV tree + */ class TLVTree extends TLVTreeNode { + /** + * @var Database + */ + use Database; + protected static $titleKey = 'name'; public $registeredTypes = array(); @@ -29,11 +37,6 @@ class TLVTree extends TLVTreeNode protected $cacheLifetime = 60; - /** - * @var MonitoringBackend - */ - protected $backend; - /** * @var ViewConfig */ @@ -209,17 +212,6 @@ public function getFetched($type, $key) } } - public function getBackend() - { - return $this->backend; - } - - public function setBackend(MonitoringBackend $backend) - { - $this->backend = $backend; - return $this; - } - /** * @return int time */ diff --git a/library/Toplevelview/Tree/TLVTreeNode.php b/library/Toplevelview/Tree/TLVTreeNode.php index fd70e49..af88811 100644 --- a/library/Toplevelview/Tree/TLVTreeNode.php +++ b/library/Toplevelview/Tree/TLVTreeNode.php @@ -9,6 +9,9 @@ use Icinga\Exception\NotImplementedError; use Icinga\Exception\ProgrammingError; +/** + * TLVTreeNode represents a node in the TLV tree + */ class TLVTreeNode extends TreeNode { /** diff --git a/library/Toplevelview/ViewConfig.php b/library/Toplevelview/ViewConfig.php index dc73b7f..3fdc7eb 100644 --- a/library/Toplevelview/ViewConfig.php +++ b/library/Toplevelview/ViewConfig.php @@ -422,7 +422,6 @@ protected function getSessionVarName() public static function session() { - // TODO: is this CLI safe? return Session::getSession(); } diff --git a/library/Toplevelview/Web/Controller.php b/library/Toplevelview/Web/Controller.php index c010cd7..970224f 100644 --- a/library/Toplevelview/Web/Controller.php +++ b/library/Toplevelview/Web/Controller.php @@ -9,6 +9,10 @@ use Icinga\Module\Monitoring\Backend\MonitoringBackend; use Icinga\Web\Controller as IcingaController; +/** + * Controller wraps around the Icinga\Web\Controller to + * check for the PHP YAML extension + */ class Controller extends IcingaController { /** @var MonitoringBackend */ @@ -23,25 +27,6 @@ public function init() } } - /** - * Retrieves the Icinga MonitoringBackend - * - * @param string|null $name - * - * @return MonitoringBackend - * @throws IcingaException When monitoring is not enabled - */ - protected function monitoringBackend($name = null) - { - if ($this->monitoringBackend === null) { - if (! Icinga::app()->getModuleManager()->hasEnabled('monitoring')) { - throw new IcingaException('The module "monitoring" must be enabled and configured!'); - } - $this->monitoringBackend = MonitoringBackend::instance($name); - } - return $this->monitoringBackend; - } - protected function setViewScript($name, $controller = null) { if ($controller !== null) { diff --git a/module.info b/module.info index bdffc60..341704c 100644 --- a/module.info +++ b/module.info @@ -1,6 +1,8 @@ Module: toplevelview -Version: 0.3.4 -Depends: monitoring (>=2.5.0) +Version: 0.4.0 +Requires: + Libraries: icinga-php-library (>=0.13.0) + Modules: icingadb (>=1.0.0) Description: Top Level View Top Level View is a hierarchy based status view for Icinga Web 2. From b574bb7b8e36433662d753aa897f4ab42007db28 Mon Sep 17 00:00:00 2001 From: Markus Opolka Date: Fri, 14 Jun 2024 16:05:50 +0200 Subject: [PATCH 4/9] Fix dropdown menu for fullscreen view --- application/controllers/ShowController.php | 6 +++--- .../locale/de_DE/LC_MESSAGES/toplevelview.mo | Bin 2771 -> 2757 bytes .../locale/de_DE/LC_MESSAGES/toplevelview.po | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/application/controllers/ShowController.php b/application/controllers/ShowController.php index 0497616..26b6abd 100644 --- a/application/controllers/ShowController.php +++ b/application/controllers/ShowController.php @@ -39,13 +39,13 @@ public function init() ); } + $fullscreen = new Tab(array( - 'title' => $this->translate('Go Fullscreen'), - 'icon' => 'dashboard', + 'title' => $this->translate('Fullscreen'), 'url' => ((string) $tiles) . '&view=compact&showFullscreen' )); $fullscreen->setTargetBlank(); - $tabs->addAsDropdown('fullscreen', $fullscreen); + $tabs->add('fullscreen', $fullscreen); $action = $this->getRequest()->getActionName(); if ($tab = $tabs->get($action)) { diff --git a/application/locale/de_DE/LC_MESSAGES/toplevelview.mo b/application/locale/de_DE/LC_MESSAGES/toplevelview.mo index fc7286f7a78d144b43e91ff6c3166be9a48002b7..8f78507e170046d7bd4849b6bd3c15934a06ae3c 100644 GIT binary patch delta 458 zcmXZYJxjx25Ww-vQ&ZEb*w#i6f>so9Noldxw?Q20;4F$DD$+%)C>;br2-Q5Gv-R0A5x;K|WQbcZJBE9&4J@|xM_=4S-?fS2K z=#fw209G)L8(761w6Te!_=aQn+sV^h&XG?cB{{GqkQ70kf;K+KM@!@ywO*oo0V}BY z$C$@6bg_Xtz$<3)9S5<6x>y@^G20PIU&Pc9jz0WB z-KdQ@9OhLWU=c5H8R;n>=;IfTqr)^4=;JJ|qW*!a6u}6=9qL5S;gH$3Bs?)QR)5$q k-_d<+-z3X^v6L&8=L^$OBEDdpwZmF%cdu5B)}2%H2h9F44FCWD delta 473 zcmXZYu`dI06u|L!cUq^2(q2U(xf5cc;+j%)m8iicA|gcFL20x>hbEGKqoP>N+iC&w8`Z@@4a90d++_8tq<$s-0K#RnjzAK*Vu`7xPgz@j{R-T zx{ZV6V;I2<25}wpn8N_R;1IsyFn+i4D2KD;(@06m0r4bEP@$k2pW>}1a*3**qWdIf zP@PwC0#DGw2UG*RVieyohMyS1KU9mErbq``*o!vyp=)~0P3Bt%tEevC!7?5rpZxGs zFZGLRBa_=497i?45}x5Q(o-53$1fbg7}Jbm8fP$z>IJUC1UA79s)?TJ1Nx@cQ?KeN zP3rf0!&oRee$Cj`L&9~oxDc27M(|TmBvhS>vip6Z9nBUqvDCD*e{YCRg{|7W8 BHh};D diff --git a/application/locale/de_DE/LC_MESSAGES/toplevelview.po b/application/locale/de_DE/LC_MESSAGES/toplevelview.po index 9dc3946..f26fb3d 100644 --- a/application/locale/de_DE/LC_MESSAGES/toplevelview.po +++ b/application/locale/de_DE/LC_MESSAGES/toplevelview.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Toplevelview Module (0.0.0)\n" "Report-Msgid-Bugs-To: dev@icinga.com\n" "POT-Creation-Date: 2017-10-13 11:53+0000\n" -"PO-Revision-Date: 2024-04-24 12:51+0200\n" +"PO-Revision-Date: 2024-06-14 16:05+0200\n" "Last-Translator: Markus Opolka \n" "Language-Team: \n" "Language: de_DE\n" @@ -80,8 +80,8 @@ msgid "Find previous" msgstr "Vorheriger Treffer" #: ../../../../modules/toplevelview/application/controllers/ShowController.php:43 -msgid "Go Fullscreen" -msgstr "Zur Vollbildansicht" +msgid "Fullscreen" +msgstr "Vollbild" #: ../../../../modules/toplevelview/application/views/scripts/edit/index.phtml:33 msgid "Jump to line" From 375b17ae01c36a6d7f02e214cbd813bc67b386e3 Mon Sep 17 00:00:00 2001 From: Markus Opolka Date: Fri, 12 Jul 2024 09:50:50 +0200 Subject: [PATCH 5/9] Fix state badges in tiles not having a border --- README.md | 2 +- public/css/module.less | 50 ++++++++++++++---------------------------- 2 files changed, 18 insertions(+), 34 deletions(-) diff --git a/README.md b/README.md index 36455cb..1e51058 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ please see the documentation on details. ## Requirements * Icinga Web 2 >= 2.5.0 -* Icinga DB Web >=1.0.0 +* Icinga DB Web >= 1.0.0 * php-yaml Also see [Introduction in docs](doc/01-Introduction.md). diff --git a/public/css/module.less b/public/css/module.less index f68d1ef..140df6d 100644 --- a/public/css/module.less +++ b/public/css/module.less @@ -2,19 +2,13 @@ .tlv-overview-tiles .tlv-overview-tile { display: block; - float: left; - padding: 1em; margin: 1em; - position: relative; - width: 20em; height: 10em; - border: 1px solid @gray; - text-decoration: none; .tlv-title { @@ -35,16 +29,13 @@ .unsaved { display: inline-block; padding: 0.2em; - font-weight: bold; - background: @tlv-color-warning-bg; color: @tlv-color-warning-fg; } } // see Icinga Web 2: public/css/icinga/base.less -//@import '../../vendor/icingaweb2/public/css/icinga/base.less'; @tlv-color-critical-bg: @color-critical; @tlv-color-critical-fg: white; @tlv-color-critical-handled-bg: #FFCCBC; // Material Design Deep Orange 100 @@ -69,6 +60,13 @@ @tlv-color-missing-fg: #333; .tlv-status-tile { + .badges { + .badge { + border: 0.1em solid @white; + margin-left: 0.2em; + } + } + &.critical, &.down { background-color: @tlv-color-critical-bg; color: @tlv-color-critical-fg; @@ -153,7 +151,6 @@ position: relative; width: 100%; height: 100%; - padding-right: 0 !important; padding-left: 0 !important; @@ -163,9 +160,9 @@ } } +/** BEGIN of header **/ .tlv-header { position: relative; - line-height: 2em; height: 2em; @@ -190,7 +187,6 @@ display: inline-block; position: absolute; right: 0; - font-size: 1.2em; .badge { @@ -198,17 +194,16 @@ } } } +/** END of header **/ +/** BEGIN of tiles **/ .tlv-view-tiles { position: relative; - clear: both; display: flex; flex-wrap: wrap; align-content: stretch; - height: 100%; - margin-top: -2em; padding-top: 2em; @@ -217,10 +212,8 @@ flex-wrap: wrap; align-content: stretch; flex-grow: 1; - width: 100%; height: 100%; - margin-top: -2.3em; // - padding title - margin tile padding-top: 2.3em; // + padding title + margin tile } @@ -228,19 +221,16 @@ .tlv-tile { margin: 0.1em; flex-grow: 1; - overflow: hidden; .badges { display: inline-block; - font-weight: normal; margin-left: 0.2em; .badge { font-size: 0.7em; - - border: 0.1em solid white; + border: 0.1em solid @white; margin-left: 0.2em; } } @@ -250,16 +240,13 @@ display: inline-block; height: 1.8em; width: 100%; - padding: 0.1em; } > .tlv-tile { // first level min-width: 40%; - border-style: solid; border-width: 1px 1px 1px 4px; - padding: 0.1em; margin: 0.3em 0.5em; @@ -292,6 +279,7 @@ } } } +/** END of tiles **/ #layout.wide-layout .tlv-view-tiles .tlv-tile-title { font-size: 1.3em; @@ -301,12 +289,12 @@ font-size: 1.1em; } +/** BEGIN of tree **/ .tlv-view-tree { .tlv-tree-node { display: flex; flex-wrap: wrap; flex-grow: 1; - width: 100%; &.tlv-collapsed { @@ -315,9 +303,7 @@ background: none; border-style: solid; - border-width: 2px 0 0 5px; - padding: 0.2em 0 0 1em; &.tlv-collapsed { @@ -330,8 +316,8 @@ display: inline-block; font-size: 0.9em; - .badge { - border: 0.1em solid white; + .badge { + border: 0.1em solid @white; margin-left: 0.2em; } } @@ -359,16 +345,14 @@ .tlv-node-icinga { flex-grow: 1; - margin: 0.2em; padding: 0.2em 1em; white-space: nowrap; - border-radius: 0.5em; - font-size: 0.9em; } } +/** END of tree **/ .tlv-collapsible { .icon.tlv-collapse-handle::before { @@ -389,7 +373,7 @@ list-style: none; overflow: hidden; padding: 0; - + // breadcrumb badges .badges { display: inline-block; padding: 0 0 0 0.5em; From 36c1107d5d1db3ec17d3595ed9ee699d0d19b7d8 Mon Sep 17 00:00:00 2001 From: Markus Opolka Date: Fri, 12 Jul 2024 11:24:36 +0200 Subject: [PATCH 6/9] Move control links to controls div --- application/controllers/IndexController.php | 16 +++---- application/controllers/ShowController.php | 44 +++++++------------- application/views/scripts/edit/index.phtml | 2 +- application/views/scripts/index/index.phtml | 11 +++-- application/views/scripts/show/actions.phtml | 32 +++++++++++--- application/views/scripts/show/index.phtml | 4 +- application/views/scripts/show/tree.phtml | 4 +- application/views/scripts/text/index.phtml | 2 +- library/Toplevelview/Web/Controller.php | 12 ++---- 9 files changed, 64 insertions(+), 63 deletions(-) diff --git a/application/controllers/IndexController.php b/application/controllers/IndexController.php index e1353f3..eccae95 100644 --- a/application/controllers/IndexController.php +++ b/application/controllers/IndexController.php @@ -6,17 +6,19 @@ use Icinga\Module\Toplevelview\ViewConfig; use Icinga\Module\Toplevelview\Web\Controller; +/** + * IndexController loads all existing Views from their YAML files. + */ class IndexController extends Controller { public function indexAction() { - $this->getTabs()->add( - 'index', - array( - 'title' => 'Top Level View', - 'url' => 'toplevelview', - ) - )->activate('index'); + $this->getTabs()->add('index', [ + 'title' => 'Top Level View', + 'url' => 'toplevelview', + ])->activate('index'); + + // Load add views from the existing YAML files $this->view->views = ViewConfig::loadAll(); $this->setAutorefreshInterval(30); diff --git a/application/controllers/ShowController.php b/application/controllers/ShowController.php index 26b6abd..480b2f9 100644 --- a/application/controllers/ShowController.php +++ b/application/controllers/ShowController.php @@ -6,7 +6,6 @@ use Icinga\Module\Toplevelview\ViewConfig; use Icinga\Module\Toplevelview\Web\Controller; use Icinga\Web\Url; -use Icinga\Web\Widget\Tab; class ShowController extends Controller { @@ -14,39 +13,26 @@ public function init() { $tabs = $this->getTabs(); - $tiles = Url::fromPath('toplevelview/show', array( - 'name' => $this->params->getRequired('name') - )); + $url = Url::fromRequest()->setParams(clone $this->params); - $tabs->add( - 'index', - array( - 'title' => $this->translate('Tiles'), - 'url' => $tiles - ) - ); + $tiles = Url::fromPath('toplevelview/show', ['name' => $this->params->getRequired('name')]); + + $tabs->add('index', [ + 'title' => $this->translate('Tree'), + 'url' => $tiles + ]); + // Add new Tabs for the entire tree if (($id = $this->getParam('id')) !== null) { - $tabs->add( - 'tree', - array( - 'title' => $this->translate('Tree'), - 'url' => Url::fromPath('toplevelview/show/tree', array( - 'name' => $this->params->getRequired('name'), - 'id' => $id - )) - ) - ); + $tabs->add('tree', [ + 'title' => $this->translate('Tiles'), + 'url' => Url::fromPath('toplevelview/show/tree', [ + 'name' => $this->params->getRequired('name'), + 'id' => $id + ]) + ]); } - - $fullscreen = new Tab(array( - 'title' => $this->translate('Fullscreen'), - 'url' => ((string) $tiles) . '&view=compact&showFullscreen' - )); - $fullscreen->setTargetBlank(); - $tabs->add('fullscreen', $fullscreen); - $action = $this->getRequest()->getActionName(); if ($tab = $tabs->get($action)) { $tab->setActive(); diff --git a/application/views/scripts/edit/index.phtml b/application/views/scripts/edit/index.phtml index 614e962..f169c1c 100644 --- a/application/views/scripts/edit/index.phtml +++ b/application/views/scripts/edit/index.phtml @@ -1,5 +1,5 @@ compact): ?> -
+
tabs ?>
diff --git a/application/views/scripts/index/index.phtml b/application/views/scripts/index/index.phtml index 3797583..98e98e5 100644 --- a/application/views/scripts/index/index.phtml +++ b/application/views/scripts/index/index.phtml @@ -2,12 +2,8 @@ /** @var array $views */ if (! $this->compact): ?> -
+
tabs ?> -
- -
-
qlink( $this->translate('Add'), @@ -19,7 +15,10 @@ if (! $this->compact): ?> ) ) ?>
- +
+ +
+
$view): /** @var \Icinga\Module\Toplevelview\ViewConfig $view */ diff --git a/application/views/scripts/show/actions.phtml b/application/views/scripts/show/actions.phtml index c199437..a94a438 100644 --- a/application/views/scripts/show/actions.phtml +++ b/application/views/scripts/show/actions.phtml @@ -4,6 +4,32 @@
compact) { + echo $this->qlink( + $this->translate('Source'), + 'toplevelview/show/source', + array('name' => $view->getName()), + array( + 'class' => 'action-link', + 'icon' => 'doc-text', + 'data-base-target' => '_next' + ) + ); + + echo $this->qlink( + $this->translate('Fullscreen'), + 'toplevelview/show', + array( + 'name' => $view->getName(), + 'view' => 'compact', + 'showFullscreen' => true + ), + array( + 'class' => 'action-link', + 'icon' => 'resize-full', + 'target' => '_blank' + ) + ); + if ($this->hasPermission('toplevelview/edit')) { echo $this->qlink( $this->translate('Edit'), @@ -25,12 +51,6 @@ 'data-base-target' => '_next' ) ); - } else { - echo $this->qlink( - $this->translate('Source'), - 'toplevelview/show/source', - array('name' => $view->getName()) - ); } } ?> diff --git a/application/views/scripts/show/index.phtml b/application/views/scripts/show/index.phtml index d976d5f..6462e85 100644 --- a/application/views/scripts/show/index.phtml +++ b/application/views/scripts/show/index.phtml @@ -4,8 +4,9 @@ $tree = $view->getTree(); if (! $this->compact): ?> -
+
tabs ?> + partial('show/actions.phtml', $this) ?>
@@ -18,7 +19,6 @@ if (! $this->compact):
badges($tree->getStatus(), false, true) ?>

getMeta('name') ?>

- partial('show/actions.phtml', $this) ?>
timeAgo($tree->getFetchTime()) ?>
diff --git a/application/views/scripts/show/tree.phtml b/application/views/scripts/show/tree.phtml index 52e4f80..02e02de 100644 --- a/application/views/scripts/show/tree.phtml +++ b/application/views/scripts/show/tree.phtml @@ -6,15 +6,15 @@ $tree = $view->getTree(); if (! $this->compact): ?> -
+
tabs ?> + partial('show/actions.phtml', $this) ?>
badges($tree->getStatus(), false, true) ?>

getMeta('name') ?>

- partial('show/actions.phtml', $this) ?>
timeAgo($tree->getFetchTime()) ?>
breadcrumb($node->getBreadCrumb(), $view->getName()) ?> diff --git a/application/views/scripts/text/index.phtml b/application/views/scripts/text/index.phtml index 82b8ee8..3aaf6d0 100644 --- a/application/views/scripts/text/index.phtml +++ b/application/views/scripts/text/index.phtml @@ -2,7 +2,7 @@ /** @var \Icinga\Module\Toplevelview\ViewConfig $view */ if (! $this->compact): ?> -
+
tabs ?>
diff --git a/library/Toplevelview/Web/Controller.php b/library/Toplevelview/Web/Controller.php index 970224f..6970b8f 100644 --- a/library/Toplevelview/Web/Controller.php +++ b/library/Toplevelview/Web/Controller.php @@ -3,21 +3,15 @@ namespace Icinga\Module\Toplevelview\Web; -use Icinga\Application\Icinga; use Icinga\Exception\ConfigurationError; -use Icinga\Exception\IcingaException; -use Icinga\Module\Monitoring\Backend\MonitoringBackend; -use Icinga\Web\Controller as IcingaController; +use ipl\Web\Compat\CompatController; /** * Controller wraps around the Icinga\Web\Controller to * check for the PHP YAML extension */ -class Controller extends IcingaController +class Controller extends CompatController { - /** @var MonitoringBackend */ - protected $monitoringBackend; - public function init() { parent::init(); @@ -27,7 +21,7 @@ public function init() } } - protected function setViewScript($name, $controller = null) + protected function setViewScript($name, $controller = null): void { if ($controller !== null) { $name = sprintf('%s/%s', $controller, $name); From 3eb2fb86562b389ee4debf5b313d2d49e1db9523 Mon Sep 17 00:00:00 2001 From: Markus Opolka Date: Fri, 12 Jul 2024 11:57:01 +0200 Subject: [PATCH 7/9] Improve handling of long View names - Introduced a helper util to limit strings --- application/views/helpers/Breadcrumb.php | 3 ++- application/views/scripts/index/index.phtml | 4 ++- application/views/scripts/show/index.phtml | 5 +++- application/views/scripts/show/tree.phtml | 4 ++- library/Toplevelview/Tree/TLVTreeNode.php | 4 ++- library/Toplevelview/Util/Str.php | 27 +++++++++++++++++++++ 6 files changed, 42 insertions(+), 5 deletions(-) create mode 100644 library/Toplevelview/Util/Str.php diff --git a/application/views/helpers/Breadcrumb.php b/application/views/helpers/Breadcrumb.php index d155dee..60fccbc 100644 --- a/application/views/helpers/Breadcrumb.php +++ b/application/views/helpers/Breadcrumb.php @@ -2,6 +2,7 @@ /* Icinga Web 2 | (c) 2016 Icinga Development Team | GPLv2+ */ use Icinga\Module\Toplevelview\Tree\TLVTreeNode; +use Icinga\Module\Toplevelview\Util\Str; class Zend_View_Helper_Breadcrumb extends Zend_View_Helper_Abstract { @@ -20,7 +21,7 @@ public function breadcrumb($breadcrumb, $config_name) $htm = '
    '; foreach ($breadcrumb as $crumb) { $htm .= '
  • ' . $this->view->qlink( - $crumb->getTitle(), + Str::limit($crumb->getTitle()), 'toplevelview/show/tree', array( 'name' => $config_name, diff --git a/application/views/scripts/index/index.phtml b/application/views/scripts/index/index.phtml index 98e98e5..c7ece75 100644 --- a/application/views/scripts/index/index.phtml +++ b/application/views/scripts/index/index.phtml @@ -1,4 +1,6 @@ compact): ?> @@ -25,7 +27,7 @@ if (! $this->compact): ?> $url = $this->url('toplevelview/show', array('name' => $name)); ?>
    -
    qlink($view->getMeta('name'), $url) ?>
    +
    qlink(Str::limit($view->getMeta('name')), $url) ?>
    hasBeenLoadedFromSession()): ?>
    translate('Unsaved changes!') ?>
    diff --git a/application/views/scripts/show/index.phtml b/application/views/scripts/show/index.phtml index 6462e85..2c29602 100644 --- a/application/views/scripts/show/index.phtml +++ b/application/views/scripts/show/index.phtml @@ -1,6 +1,9 @@ getTree(); if (! $this->compact): ?> @@ -18,7 +21,7 @@ if (! $this->compact):
    badges($tree->getStatus(), false, true) ?> -

    getMeta('name') ?>

    +

    getMeta('name'), 40) ?>

    timeAgo($tree->getFetchTime()) ?>
    diff --git a/application/views/scripts/show/tree.phtml b/application/views/scripts/show/tree.phtml index 02e02de..337feed 100644 --- a/application/views/scripts/show/tree.phtml +++ b/application/views/scripts/show/tree.phtml @@ -1,4 +1,6 @@ compact):
    badges($tree->getStatus(), false, true) ?> -

    getMeta('name') ?>

    +

    getMeta('name'), 40) ?>

    timeAgo($tree->getFetchTime()) ?>
    breadcrumb($node->getBreadCrumb(), $view->getName()) ?> diff --git a/library/Toplevelview/Tree/TLVTreeNode.php b/library/Toplevelview/Tree/TLVTreeNode.php index af88811..816c860 100644 --- a/library/Toplevelview/Tree/TLVTreeNode.php +++ b/library/Toplevelview/Tree/TLVTreeNode.php @@ -3,6 +3,8 @@ namespace Icinga\Module\Toplevelview\Tree; +use Icinga\Module\Toplevelview\Util\Str; + use Icinga\Application\Benchmark; use Icinga\Data\Tree\TreeNode; use Icinga\Exception\ConfigurationError; @@ -233,7 +235,7 @@ public function set($key, $value) public function getTitle() { if (array_key_exists(static::$titleKey, $this->properties)) { - return $this->properties[static::$titleKey]; + return Str::limit($this->properties[static::$titleKey], 45); } else { return null; } diff --git a/library/Toplevelview/Util/Str.php b/library/Toplevelview/Util/Str.php new file mode 100644 index 0000000..cabadaa --- /dev/null +++ b/library/Toplevelview/Util/Str.php @@ -0,0 +1,27 @@ + Date: Fri, 12 Jul 2024 13:17:31 +0200 Subject: [PATCH 8/9] Remove old Docker based testing setup --- README.md | 15 - doc/01-Introduction.md | 3 +- doc/02-Behavior.md | 4 +- docker-compose.dev.yml | 30 - test/config/authentication.ini | 3 - test/config/config.ini | 7 - test/config/enabledModules/doc | 1 - test/config/enabledModules/monitoring | 1 - test/config/enabledModules/toplevelview | 1 - test/config/enabledModules/translation | 1 - test/config/groups.ini | 3 - test/config/icingaweb2/authentication.ini | 3 - test/config/icingaweb2/config.ini | 7 - .../icingaweb2/enabledModules/monitoring | 1 - .../icingaweb2/enabledModules/toplevelview | 1 - test/config/icingaweb2/groups.ini | 3 - .../modules/monitoring/backends.ini | 3 - test/config/icingaweb2/resources.ini | 19 - test/config/icingaweb2/roles.ini | 4 - test/config/modules/monitoring/backends.ini | 8 - .../modules/toplevelview/views/.gitignore | 1 - .../modules/toplevelview/views/mass.yml | 394 ---- .../modules/toplevelview/views/test.yml | 75 - test/config/resources.ini | 27 - test/config/roles.ini | 4 - test/docker/Dockerfile | 5 - .../docker-entrypoint-initdb.d/icinga.sh | 19 - .../icinga/.gitignore | 1 - .../docker-entrypoint-initdb.d/icinga/dump.sh | 22 - .../icinga/ido-data.sql | 244 --- .../icinga/ido-legacy-data.sql | 78 - .../icinga/ido-mysql.sql | 1690 ----------------- .../docker-entrypoint-initdb.d/icingaweb2.sql | 138 -- test/fixtures/sqlite-legacy.sql | 44 - test/setup_vendor.sh | 74 - 35 files changed, 3 insertions(+), 2931 deletions(-) delete mode 100644 docker-compose.dev.yml delete mode 100644 test/config/authentication.ini delete mode 100644 test/config/config.ini delete mode 120000 test/config/enabledModules/doc delete mode 120000 test/config/enabledModules/monitoring delete mode 120000 test/config/enabledModules/toplevelview delete mode 120000 test/config/enabledModules/translation delete mode 100644 test/config/groups.ini delete mode 100644 test/config/icingaweb2/authentication.ini delete mode 100644 test/config/icingaweb2/config.ini delete mode 120000 test/config/icingaweb2/enabledModules/monitoring delete mode 120000 test/config/icingaweb2/enabledModules/toplevelview delete mode 100644 test/config/icingaweb2/groups.ini delete mode 100644 test/config/icingaweb2/modules/monitoring/backends.ini delete mode 100644 test/config/icingaweb2/resources.ini delete mode 100644 test/config/icingaweb2/roles.ini delete mode 100644 test/config/modules/monitoring/backends.ini delete mode 100644 test/config/modules/toplevelview/views/.gitignore delete mode 100644 test/config/modules/toplevelview/views/mass.yml delete mode 100644 test/config/modules/toplevelview/views/test.yml delete mode 100644 test/config/resources.ini delete mode 100644 test/config/roles.ini delete mode 100644 test/docker/Dockerfile delete mode 100644 test/docker/docker-entrypoint-initdb.d/icinga.sh delete mode 100644 test/docker/docker-entrypoint-initdb.d/icinga/.gitignore delete mode 100755 test/docker/docker-entrypoint-initdb.d/icinga/dump.sh delete mode 100644 test/docker/docker-entrypoint-initdb.d/icinga/ido-data.sql delete mode 100644 test/docker/docker-entrypoint-initdb.d/icinga/ido-legacy-data.sql delete mode 100644 test/docker/docker-entrypoint-initdb.d/icinga/ido-mysql.sql delete mode 100644 test/docker/docker-entrypoint-initdb.d/icingaweb2.sql delete mode 100644 test/fixtures/sqlite-legacy.sql delete mode 100755 test/setup_vendor.sh diff --git a/README.md b/README.md index 1e51058..66f23fa 100644 --- a/README.md +++ b/README.md @@ -26,21 +26,6 @@ Also see [Introduction in docs](doc/01-Introduction.md). All documentation can be found inside the [doc](doc/) directory. -Also available inside Icinga Web 2 with the doc module. - -## Development Environment - - ./test/setup_vendor.sh - - cp docker-compose.dev.yml docker-compose.yml - # adjust to your needs - - docker-compose up -d - -Then access [http://localhost:8080](http://localhost:8080). - -Default admin user is `icingaadmin` with password `icinga`. - ## License Icinga Web TopLevelView is licensed under the terms of the [GNU General Public License Version 2](COPYING). diff --git a/doc/01-Introduction.md b/doc/01-Introduction.md index 37814b3..7267b22 100644 --- a/doc/01-Introduction.md +++ b/doc/01-Introduction.md @@ -9,8 +9,7 @@ This view presents you an overview of the overall status of the sub-hierarchies. With a caching layer, this view can aggregate thousands of status objects and make them easily available for overview and drill down. -This view extends the status logic and behavior of Icinga Web 2 a bit, -please see later chapters on details. +**Hint:** Top Level View uses additional status logic for its views, see later chapters on details. ## Installation diff --git a/doc/02-Behavior.md b/doc/02-Behavior.md index 9e6ba0c..cbcebb1 100644 --- a/doc/02-Behavior.md +++ b/doc/02-Behavior.md @@ -30,7 +30,7 @@ Similar to Icinga Web 2 you can easily see unhandled problems by the strength of ![Unhandled problems](screenshots/colors-unhandled.png) ![Handled problems](screenshots/colors-handled.png) -## SOFT and HARD states +## Only HARD states While the normal monitoring views will always show you all current states, the **Top Level Views will only show hard states**. @@ -48,9 +48,9 @@ By default handled would be true if: In Top Level View, a few things are different: +* Flapping means the state is handled * Downtimes are handled special (see next topic) * Notification settings can influence a status (see next topic) -* Flapping means the state is handled ## Downtime and Notifications diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml deleted file mode 100644 index 4b3cc4f..0000000 --- a/docker-compose.dev.yml +++ /dev/null @@ -1,30 +0,0 @@ -version: '2' - -services: - web: - image: lazyfrosch/icingaweb2:sqlite - build: test/docker/ - ports: - - 8080:80 - links: - - db - volumes: - - ./test/config:/etc/icingaweb2 - - ./vendor/icingaweb2:/usr/share/icingaweb2 - - .:/usr/share/icingaweb2/modules/toplevelview - - db: - image: mariadb - volumes: - - db_data:/var/lib/mysql - - ./test/docker/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d - ports: - - 3310:3306 - environment: - MYSQL_ROOT_PASSWORD: onlyforadmin - MYSQL_DATABASE: icingaweb2 - MYSQL_USER: icingaweb2 - MYSQL_PASSWORD: rosebud - -volumes: - db_data: diff --git a/test/config/authentication.ini b/test/config/authentication.ini deleted file mode 100644 index 6852ece..0000000 --- a/test/config/authentication.ini +++ /dev/null @@ -1,3 +0,0 @@ -[icingaweb2] -backend = "db" -resource = "icingaweb_db" diff --git a/test/config/config.ini b/test/config/config.ini deleted file mode 100644 index 8fc8330..0000000 --- a/test/config/config.ini +++ /dev/null @@ -1,7 +0,0 @@ -[global] -show_stacktraces = "1" -config_backend = "db" -config_resource = "icingaweb_db" - -[logging] -log = "none" diff --git a/test/config/enabledModules/doc b/test/config/enabledModules/doc deleted file mode 120000 index a9d790e..0000000 --- a/test/config/enabledModules/doc +++ /dev/null @@ -1 +0,0 @@ -/usr/share/icingaweb2/modules/doc \ No newline at end of file diff --git a/test/config/enabledModules/monitoring b/test/config/enabledModules/monitoring deleted file mode 120000 index c201d00..0000000 --- a/test/config/enabledModules/monitoring +++ /dev/null @@ -1 +0,0 @@ -/usr/share/icingaweb2/modules/monitoring \ No newline at end of file diff --git a/test/config/enabledModules/toplevelview b/test/config/enabledModules/toplevelview deleted file mode 120000 index 71aae1d..0000000 --- a/test/config/enabledModules/toplevelview +++ /dev/null @@ -1 +0,0 @@ -/usr/share/icingaweb2/modules/toplevelview \ No newline at end of file diff --git a/test/config/enabledModules/translation b/test/config/enabledModules/translation deleted file mode 120000 index 45b66cf..0000000 --- a/test/config/enabledModules/translation +++ /dev/null @@ -1 +0,0 @@ -/usr/share/icingaweb2/modules/translation \ No newline at end of file diff --git a/test/config/groups.ini b/test/config/groups.ini deleted file mode 100644 index 6852ece..0000000 --- a/test/config/groups.ini +++ /dev/null @@ -1,3 +0,0 @@ -[icingaweb2] -backend = "db" -resource = "icingaweb_db" diff --git a/test/config/icingaweb2/authentication.ini b/test/config/icingaweb2/authentication.ini deleted file mode 100644 index 6852ece..0000000 --- a/test/config/icingaweb2/authentication.ini +++ /dev/null @@ -1,3 +0,0 @@ -[icingaweb2] -backend = "db" -resource = "icingaweb_db" diff --git a/test/config/icingaweb2/config.ini b/test/config/icingaweb2/config.ini deleted file mode 100644 index 8fc8330..0000000 --- a/test/config/icingaweb2/config.ini +++ /dev/null @@ -1,7 +0,0 @@ -[global] -show_stacktraces = "1" -config_backend = "db" -config_resource = "icingaweb_db" - -[logging] -log = "none" diff --git a/test/config/icingaweb2/enabledModules/monitoring b/test/config/icingaweb2/enabledModules/monitoring deleted file mode 120000 index c201d00..0000000 --- a/test/config/icingaweb2/enabledModules/monitoring +++ /dev/null @@ -1 +0,0 @@ -/usr/share/icingaweb2/modules/monitoring \ No newline at end of file diff --git a/test/config/icingaweb2/enabledModules/toplevelview b/test/config/icingaweb2/enabledModules/toplevelview deleted file mode 120000 index 71aae1d..0000000 --- a/test/config/icingaweb2/enabledModules/toplevelview +++ /dev/null @@ -1 +0,0 @@ -/usr/share/icingaweb2/modules/toplevelview \ No newline at end of file diff --git a/test/config/icingaweb2/groups.ini b/test/config/icingaweb2/groups.ini deleted file mode 100644 index 6852ece..0000000 --- a/test/config/icingaweb2/groups.ini +++ /dev/null @@ -1,3 +0,0 @@ -[icingaweb2] -backend = "db" -resource = "icingaweb_db" diff --git a/test/config/icingaweb2/modules/monitoring/backends.ini b/test/config/icingaweb2/modules/monitoring/backends.ini deleted file mode 100644 index eed9a90..0000000 --- a/test/config/icingaweb2/modules/monitoring/backends.ini +++ /dev/null @@ -1,3 +0,0 @@ -[ido] -type = "ido" -resource = "icinga_db" diff --git a/test/config/icingaweb2/resources.ini b/test/config/icingaweb2/resources.ini deleted file mode 100644 index 7dd53ee..0000000 --- a/test/config/icingaweb2/resources.ini +++ /dev/null @@ -1,19 +0,0 @@ -[icingaweb_db] -type = "db" -db = "mysql" -host = "db" -port = "" -dbname = "icingaweb2" -username = "icingaweb2" -password = "rosebud" -charset = "" -persistent = "0" -use_ssl = "0" - -[icinga_db] -type = "db" -db = "mysql" -host = "db" -dbname = "icinga" -username = "icingaweb2" -password = "rosebud" diff --git a/test/config/icingaweb2/roles.ini b/test/config/icingaweb2/roles.ini deleted file mode 100644 index 44f14d5..0000000 --- a/test/config/icingaweb2/roles.ini +++ /dev/null @@ -1,4 +0,0 @@ -[Administratoren] -users = "icingaadmin" -permissions = "*" -groups = "Administratoren" diff --git a/test/config/modules/monitoring/backends.ini b/test/config/modules/monitoring/backends.ini deleted file mode 100644 index 2611429..0000000 --- a/test/config/modules/monitoring/backends.ini +++ /dev/null @@ -1,8 +0,0 @@ -[icinga] -type = "ido" -resource = "icinga_db" - -[legacy] -type = "ido" -resource = "icinga_legacy_db" -;disabled = "1" diff --git a/test/config/modules/toplevelview/views/.gitignore b/test/config/modules/toplevelview/views/.gitignore deleted file mode 100644 index 355164c..0000000 --- a/test/config/modules/toplevelview/views/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*/ diff --git a/test/config/modules/toplevelview/views/mass.yml b/test/config/modules/toplevelview/views/mass.yml deleted file mode 100644 index 5bf1ad8..0000000 --- a/test/config/modules/toplevelview/views/mass.yml +++ /dev/null @@ -1,394 +0,0 @@ ---- -name: More Tiles -children: -- name: Section - children: - - name: Tile - children: - - host: host_ok - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok -- name: Section - children: - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_down - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok -- name: Section - children: - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok -- name: Section - children: - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_down - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok -- name: Section - children: - - name: Tile - children: - - host: host_down - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok -- name: Section - children: - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok -- name: Section - children: - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok -- name: Section - children: - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok - - name: Tile - children: - - host: host_ok diff --git a/test/config/modules/toplevelview/views/test.yml b/test/config/modules/toplevelview/views/test.yml deleted file mode 100644 index 789de94..0000000 --- a/test/config/modules/toplevelview/views/test.yml +++ /dev/null @@ -1,75 +0,0 @@ ---- -name: Test -children: -- name: Single Objects - children: - - name: OK - children: - - host: host_ok - - host: host_ok - service: s_ok - - host: host_s_soft - - host: host_s_soft - service: s_critical_soft - - name: DOWN - children: - - host: host_down - - host: host_down - service: s_critical - - name: CRITICAL - children: - - host: host_s_critical - - host: host_s_critical - service: s_critical - - name: WARNING - children: - - host: host_s_warning - - host: host_s_warning - service: s_warning -- name: Single Objects Handled - children: - - name: CRITICAL handled - children: - - host: host_s_critical_handled - - host: host_s_critical_handled - service: s_critical_handled - - name: WARNING handled - children: - - host: host_s_warning_handled - - host: host_s_warning_handled - service: s_warning_handled -- name: Hostgroups - children: - - name: OK - children: - - hostgroup: HG_OK - - hostgroup: HG_SOFT - - name: DOWN - children: - - hostgroup: HG_DOWN - - name: CRITICAL - children: - - hostgroup: HG_CRITICAL - - name: WARNING - children: - - hostgroup: HG_WARNING -- name: TLV Missing - children: - - name: Partially missing - children: - - host: host_ok - - name: missing - - name: Missing with problems - children: - - host: host_down - - name: missing - - name: Missing with handled - children: - - host: host_down_handled - - name: missing - - name: Empty - children: - - name: nothing here - - name: Notexisting Object - children: - - host: notexisting \ No newline at end of file diff --git a/test/config/resources.ini b/test/config/resources.ini deleted file mode 100644 index 2c0c221..0000000 --- a/test/config/resources.ini +++ /dev/null @@ -1,27 +0,0 @@ -[icingaweb_db] -type = "db" -db = "mysql" -host = "db" -port = "" -dbname = "icingaweb2" -username = "icingaweb2" -password = "rosebud" -charset = "" -persistent = "0" -use_ssl = "0" - -[icinga_db] -type = "db" -db = "mysql" -host = "db" -dbname = "icinga" -username = "icingaweb2" -password = "rosebud" - -[icinga_legacy_db] -type = "db" -db = "mysql" -host = "db" -dbname = "icinga_legacy" -username = "icingaweb2" -password = "rosebud" diff --git a/test/config/roles.ini b/test/config/roles.ini deleted file mode 100644 index 44f14d5..0000000 --- a/test/config/roles.ini +++ /dev/null @@ -1,4 +0,0 @@ -[Administratoren] -users = "icingaadmin" -permissions = "*" -groups = "Administratoren" diff --git a/test/docker/Dockerfile b/test/docker/Dockerfile deleted file mode 100644 index d1ffb4f..0000000 --- a/test/docker/Dockerfile +++ /dev/null @@ -1,5 +0,0 @@ -FROM lazyfrosch/icingaweb2 - -RUN apk add -U \ - php7-pdo_sqlite \ - sqlite diff --git a/test/docker/docker-entrypoint-initdb.d/icinga.sh b/test/docker/docker-entrypoint-initdb.d/icinga.sh deleted file mode 100644 index b0538d4..0000000 --- a/test/docker/docker-entrypoint-initdb.d/icinga.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -set -ex - -: ${MYSQL_ROOT_PASSWORD:=} -: ${MYSQL_USER:=} - -export MYSQL_PWD="${MYSQL_ROOT_PASSWORD}" - -mysql -e "DROP DATABASE IF EXISTS icinga" -mysql -e "CREATE DATABASE icinga" -mysql -e "GRANT ALL ON icinga.* TO '${MYSQL_USER}'@'%'" -mysql -e "DROP DATABASE IF EXISTS icinga_legacy" -mysql -e "CREATE DATABASE icinga_legacy" -mysql -e "GRANT ALL ON icinga_legacy.* TO '${MYSQL_USER}'@'%'" -mysql icinga < /docker-entrypoint-initdb.d/icinga/ido-mysql.sql -mysql icinga < /docker-entrypoint-initdb.d/icinga/ido-data.sql -mysql icinga_legacy < /docker-entrypoint-initdb.d/icinga/ido-mysql.sql -mysql icinga_legacy < /docker-entrypoint-initdb.d/icinga/ido-legacy-data.sql diff --git a/test/docker/docker-entrypoint-initdb.d/icinga/.gitignore b/test/docker/docker-entrypoint-initdb.d/icinga/.gitignore deleted file mode 100644 index 8cfb08d..0000000 --- a/test/docker/docker-entrypoint-initdb.d/icinga/.gitignore +++ /dev/null @@ -1 +0,0 @@ -full.sql diff --git a/test/docker/docker-entrypoint-initdb.d/icinga/dump.sh b/test/docker/docker-entrypoint-initdb.d/icinga/dump.sh deleted file mode 100755 index 54f91a9..0000000 --- a/test/docker/docker-entrypoint-initdb.d/icinga/dump.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -set -e - -CONFIG="$(docker-compose config)" -MYSQL_ROOT_PASSWORD="$(echo "$CONFIG" | grep MYSQL_ROOT_PASSWORD | cut -d: -f2 | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')" - -set -x - -docker exec -i \ - "$(docker-compose ps -q db)" \ - mysqldump -p"${MYSQL_ROOT_PASSWORD}" --no-create-info icinga \ - icinga_instances icinga_programstatus icinga_objects \ - icinga_hosts icinga_hoststatus \ - icinga_services icinga_servicestatus \ - icinga_hostgroups icinga_hostgroup_members \ - > ido-data.sql - -docker exec -i \ - "$(docker-compose ps -q db)" \ - mysqldump -p"${MYSQL_ROOT_PASSWORD}" icinga \ - > full.sql diff --git a/test/docker/docker-entrypoint-initdb.d/icinga/ido-data.sql b/test/docker/docker-entrypoint-initdb.d/icinga/ido-data.sql deleted file mode 100644 index c1eafe8..0000000 --- a/test/docker/docker-entrypoint-initdb.d/icinga/ido-data.sql +++ /dev/null @@ -1,244 +0,0 @@ --- MySQL dump 10.16 Distrib 10.1.18-MariaDB, for debian-linux-gnu (x86_64) --- --- Host: localhost Database: icinga --- ------------------------------------------------------ --- Server version 10.1.18-MariaDB-1~jessie - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!40101 SET NAMES utf8 */; -/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; -/*!40103 SET TIME_ZONE='+00:00' */; -/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; - --- --- Dumping data for table `icinga_instances` --- - -LOCK -TABLES `icinga_instances` WRITE; -/*!40000 ALTER TABLE `icinga_instances` DISABLE KEYS */; -INSERT INTO `icinga_instances` -VALUES (1, 'default', 'default'); -/*!40000 ALTER TABLE `icinga_instances` ENABLE KEYS */; -UNLOCK -TABLES; - --- --- Dumping data for table `icinga_programstatus` --- - -LOCK -TABLES `icinga_programstatus` WRITE; -/*!40000 ALTER TABLE `icinga_programstatus` DISABLE KEYS */; -INSERT INTO `icinga_programstatus` -VALUES (1, 1, '0.0.1', '2017-10-10 10:59:47', '2017-10-10 10:59:47', NULL, NULL, 1, 0, 0, NULL, NULL, 1, NULL, 1, 1, 1, - 1, 1, 1, 0, 0, 0, 0, 0, 0, NULL, NULL, 0, NULL); -/*!40000 ALTER TABLE `icinga_programstatus` ENABLE KEYS */; -UNLOCK -TABLES; - --- --- Dumping data for table `icinga_objects` --- - -LOCK -TABLES `icinga_objects` WRITE; -/*!40000 ALTER TABLE `icinga_objects` DISABLE KEYS */; -INSERT INTO `icinga_objects` -VALUES (1, 1, 1, 'host_ok', NULL, 1), - (2, 1, 1, 'host_down', NULL, 1), - (3, 1, 1, 'host_s_soft', NULL, 1), - (4, 1, 2, 'host_ok', 's_ok', 1), - (5, 1, 2, 'host_down', 's_critical', 1), - (6, 1, 2, 'host_s_soft', 's_critical_soft', 1), - (7, 1, 1, 'host_s_critical', NULL, 1), - (8, 1, 1, 'host_s_warning', NULL, 1), - (9, 1, 2, 'host_s_critical', 's_critical', 1), - (10, 1, 2, 'host_s_warning', 's_warning', 1), - (11, 1, 3, 'HG_OK', NULL, 1), - (12, 1, 3, 'HG_SOFT', NULL, 1), - (13, 1, 3, 'HG_DOWN', NULL, 1), - (14, 1, 3, 'HG_CRITICAL', NULL, 1), - (15, 1, 3, 'HG_WARNING', NULL, 1), - (16, 1, 1, 'host_s_critical_handled', NULL, 1), - (17, 1, 1, 'host_s_warning_handled', NULL, 1), - (18, 1, 2, 'host_s_critical_handled', 's_critical_handled', 1), - (19, 1, 2, 'host_s_warning_handled', 's_warning_handled', 1), - (20, 1, 9, '24x7', NULL, 1); -/*!40000 ALTER TABLE `icinga_objects` ENABLE KEYS */; -UNLOCK -TABLES; - --- --- Dumping data for table `icinga_hosts` --- - -LOCK -TABLES `icinga_hosts` WRITE; -/*!40000 ALTER TABLE `icinga_hosts` DISABLE KEYS */; -INSERT INTO `icinga_hosts` -VALUES (1, 1, 1, 1, 'host_ok', 'host_ok', '127.0.0.1', '', 0, NULL, 0, NULL, 20, 0, '', 5, 1, 5, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, - 0, 0, 0, NULL), - (2, 1, 1, 2, 'host_down', 'host_down', '127.0.0.1', '', 0, NULL, 0, NULL, 20, 0, '', 5, 1, 5, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, - 0, 0, 0, 0, 0, NULL), - (3, 1, 1, 3, 'host_s_soft', 'host_s_soft', '127.0.0.1', '', 0, NULL, 0, NULL, 20, 0, '', 5, 1, 5, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, - 0, 0, 0, 0, 0, 0, NULL), - (4, 1, 1, 7, 'host_s_critical', 'host_s_critical', '127.0.0.1', '', 0, NULL, 0, NULL, 20, 0, '', 5, 1, 5, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, 0, 0, 0, 0, 0, 0, 0, NULL), - (5, 1, 1, 8, 'host_s_warning', 'host_s_warning', '127.0.0.1', '', 0, NULL, 0, NULL, 20, 0, '', 5, 1, 5, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, 0, 0, 0, 0, 0, 0, 0, NULL), - (6, 1, 1, 16, 'host_s_critical_handled', 'host_s_critical_handled', '127.0.0.1', '', 0, NULL, 0, NULL, 20, 0, '', - 5, 1, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 0, NULL), - (7, 1, 1, 17, 'host_s_warning_handled', 'host_s_warning_handled', '127.0.0.1', '', 0, NULL, 0, NULL, 20, 0, '', - 5, 1, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 0, NULL); -/*!40000 ALTER TABLE `icinga_hosts` ENABLE KEYS */; -UNLOCK -TABLES; - --- --- Dumping data for table `icinga_hoststatus` --- - -LOCK -TABLES `icinga_hoststatus` WRITE; -/*!40000 ALTER TABLE `icinga_hoststatus` DISABLE KEYS */; -INSERT INTO `icinga_hoststatus` -VALUES (1, 1, 1, '2017-10-10 11:01:51', 'TEST', NULL, NULL, '', 0, 1, 0, 1, 5, '2017-10-10 11:01:51', - '2017-10-10 11:06:51', 0, '2017-10-10 11:01:51', '2017-10-10 11:01:51', 0, '2017-10-10 11:01:51', NULL, NULL, 1, - NULL, NULL, 0, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, 0, 0, 0, 0, NULL), - (2, 1, 2, '2017-10-10 11:01:51', 'TEST', NULL, NULL, '', 1, 1, 0, 1, 5, '2017-10-10 11:01:51', - '2017-10-10 11:06:51', 0, '2017-10-10 11:01:51', '2017-10-10 11:01:51', 1, '2017-10-10 11:01:51', - '2017-10-10 11:01:51', NULL, 1, NULL, NULL, 0, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, - NULL, 0, 0, 0, 0, NULL), - (3, 1, 3, '2017-10-10 11:01:51', 'TEST', NULL, NULL, '', 0, 1, 0, 1, 5, '2017-10-10 11:01:51', - '2017-10-10 11:06:51', 0, '2017-10-10 11:01:51', '2017-10-10 11:01:51', 0, '2017-10-10 11:01:51', NULL, NULL, 1, - NULL, NULL, 0, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, 0, 0, 0, 0, NULL), - (4, 1, 7, '2017-10-10 11:01:51', 'TEST', NULL, NULL, '', 0, 1, 0, 1, 5, '2017-10-10 11:01:51', - '2017-10-10 11:06:51', 0, '2017-10-10 11:01:51', '2017-10-10 11:01:51', 0, '2017-10-10 11:01:51', NULL, NULL, 1, - NULL, NULL, 0, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, 0, 0, 0, 0, NULL), - (5, 1, 8, '2017-10-10 11:01:51', 'TEST', NULL, NULL, '', 0, 1, 0, 1, 5, '2017-10-10 11:01:51', - '2017-10-10 11:06:51', 0, '2017-10-10 11:01:51', '2017-10-10 11:01:51', 0, '2017-10-10 11:01:51', NULL, NULL, 1, - NULL, NULL, 0, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, 0, 0, 0, 0, NULL), - (6, 1, 16, '2017-10-10 11:01:51', 'TEST', NULL, NULL, '', 0, 1, 0, 1, 5, '2017-10-10 11:01:51', - '2017-10-10 11:06:51', 0, '2017-10-10 11:01:51', '2017-10-10 11:01:51', 0, '2017-10-10 11:01:51', NULL, NULL, 1, - NULL, NULL, 0, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, 0, 0, 0, 0, NULL), - (7, 1, 17, '2017-10-10 11:01:51', 'TEST', NULL, NULL, '', 0, 1, 0, 1, 5, '2017-10-10 11:01:51', - '2017-10-10 11:06:51', 0, '2017-10-10 11:01:51', '2017-10-10 11:01:51', 0, '2017-10-10 11:01:51', NULL, NULL, 1, - NULL, NULL, 0, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, 0, 0, 0, 0, NULL); -/*!40000 ALTER TABLE `icinga_hoststatus` ENABLE KEYS */; -UNLOCK -TABLES; - --- --- Dumping data for table `icinga_services` --- - -LOCK -TABLES `icinga_services` WRITE; -/*!40000 ALTER TABLE `icinga_services` DISABLE KEYS */; -INSERT INTO `icinga_services` -VALUES (1, 1, 1, 1, 4, 's_ok', 0, NULL, 0, NULL, 20, 0, '', 5, 1, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL), - (2, 1, 1, 2, 5, 's_critical', 0, NULL, 0, NULL, 20, 0, '', 5, 1, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL), - (3, 1, 1, 3, 6, 's_critical_soft', 0, NULL, 0, NULL, 20, 0, '', 5, 1, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL), - (4, 1, 1, 7, 9, 's_critical', 0, NULL, 0, NULL, 20, 0, '', 5, 1, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL), - (5, 1, 1, 8, 10, 's_warning', 0, NULL, 0, NULL, 20, 0, '', 5, 1, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL), - (6, 1, 1, 16, 18, 's_critical_handled', 0, NULL, 0, NULL, 20, 0, '', 5, 1, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL), - (7, 1, 1, 17, 19, 's_warning_handled', 0, NULL, 0, NULL, 20, 0, '', 5, 1, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL); -/*!40000 ALTER TABLE `icinga_services` ENABLE KEYS */; -UNLOCK -TABLES; - --- --- Dumping data for table `icinga_servicestatus` --- - -LOCK -TABLES `icinga_servicestatus` WRITE; -/*!40000 ALTER TABLE `icinga_servicestatus` DISABLE KEYS */; -INSERT INTO `icinga_servicestatus` -VALUES (1, 1, 4, '2017-10-10 11:16:38', 'TEST', NULL, NULL, '', 0, 1, 0, 1, 5, '2017-10-10 11:17:01', - '2017-10-10 11:22:03', 1, '2017-10-10 11:17:11', '2017-10-10 11:17:11', 0, '2017-10-10 11:17:11', NULL, NULL, - NULL, 1, NULL, NULL, 0, 1, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, 5, 1, 0, 0, NULL), - (2, 1, 5, '2017-10-10 11:16:38', 'TEST', NULL, NULL, '', 2, 1, 0, 1, 5, '2017-10-10 11:17:01', - '2017-10-10 11:22:03', 1, '2017-10-10 11:17:11', '2017-10-10 11:17:11', 1, '2017-10-10 11:17:11', NULL, NULL, - NULL, 1, NULL, NULL, 0, 1, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, 5, 1, 0, 0, NULL), - (3, 1, 6, '2017-10-10 11:16:38', 'TEST', NULL, NULL, '', 2, 1, 0, 1, 5, '2017-10-10 11:17:01', - '2017-10-10 11:22:03', 1, '2017-10-10 11:17:11', '2017-10-10 11:17:11', 0, '2017-10-10 11:17:11', NULL, NULL, - NULL, 0, NULL, NULL, 0, 1, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, 5, 1, 0, 0, NULL), - (4, 1, 9, '2017-10-10 11:16:38', 'TEST', NULL, NULL, '', 2, 1, 0, 1, 5, '2017-10-10 11:17:01', - '2017-10-10 11:22:03', 1, '2017-10-10 11:17:11', '2017-10-10 11:17:11', 2, '2017-10-10 11:17:11', NULL, NULL, - NULL, 1, NULL, NULL, 0, 1, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, 5, 1, 0, 0, NULL), - (5, 1, 10, '2017-10-10 11:16:38', 'TEST', NULL, NULL, '', 1, 1, 0, 1, 5, '2017-10-10 11:17:01', - '2017-10-10 11:22:03', 1, '2017-10-10 11:17:11', '2017-10-10 11:17:11', 1, '2017-10-10 11:17:11', NULL, NULL, - NULL, 1, NULL, NULL, 0, 1, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, 5, 1, 0, 0, NULL), - (6, 1, 19, '2017-10-10 11:16:38', 'TEST', NULL, NULL, '', 1, 1, 0, 1, 5, '2017-10-10 11:17:01', - '2017-10-10 11:22:03', 1, '2017-10-10 11:17:11', '2017-10-10 11:17:11', 1, '2017-10-10 11:17:11', NULL, NULL, - NULL, 1, NULL, NULL, 0, 1, 1, 3, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, 5, 1, 0, 0, NULL), - (7, 1, 18, '2017-10-10 11:16:38', 'TEST', NULL, NULL, '', 2, 1, 0, 1, 5, '2017-10-10 11:17:01', - '2017-10-10 11:22:03', 1, '2017-10-10 11:17:11', '2017-10-10 11:17:11', 1, '2017-10-10 11:17:11', NULL, NULL, - NULL, 1, NULL, NULL, 0, 1, 1, 3, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, 5, 1, 0, 0, NULL); -/*!40000 ALTER TABLE `icinga_servicestatus` ENABLE KEYS */; -UNLOCK -TABLES; - --- --- Dumping data for table `icinga_hostgroups` --- - -LOCK -TABLES `icinga_hostgroups` WRITE; -/*!40000 ALTER TABLE `icinga_hostgroups` DISABLE KEYS */; -INSERT INTO `icinga_hostgroups` -VALUES (1, 1, 1, 11, 'HG_OK', NULL, NULL, NULL, NULL), - (2, 1, 1, 12, 'HG_SOFT', NULL, NULL, NULL, NULL), - (3, 1, 1, 13, 'HG_DOWN', NULL, NULL, NULL, NULL), - (4, 1, 1, 14, 'HG_CRITICAL', NULL, NULL, NULL, NULL), - (5, 1, 1, 15, 'HG_WARNING', NULL, NULL, NULL, NULL); -/*!40000 ALTER TABLE `icinga_hostgroups` ENABLE KEYS */; -UNLOCK -TABLES; - --- --- Dumping data for table `icinga_hostgroup_members` --- - -LOCK -TABLES `icinga_hostgroup_members` WRITE; -/*!40000 ALTER TABLE `icinga_hostgroup_members` DISABLE KEYS */; -INSERT INTO `icinga_hostgroup_members` -VALUES (1, 1, 1, 1), - (2, 1, 2, 3), - (3, 1, 3, 2), - (4, 1, 4, 7), - (5, 1, 5, 8); -/*!40000 ALTER TABLE `icinga_hostgroup_members` ENABLE KEYS */; -UNLOCK -TABLES; -/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; - -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; - --- Dump completed on 2017-10-17 10:05:46 diff --git a/test/docker/docker-entrypoint-initdb.d/icinga/ido-legacy-data.sql b/test/docker/docker-entrypoint-initdb.d/icinga/ido-legacy-data.sql deleted file mode 100644 index 2a1d4bf..0000000 --- a/test/docker/docker-entrypoint-initdb.d/icinga/ido-legacy-data.sql +++ /dev/null @@ -1,78 +0,0 @@ -INSERT INTO `icinga_instances` -VALUES (1, 'legacy', 'legacy'); - -INSERT INTO `icinga_programstatus` -VALUES (1, 1, '0.0.1', '2017-10-10 10:59:47', '2017-10-10 10:59:47', NULL, NULL, 1, 0, 0, NULL, NULL, 1, NULL, 1, 1, 1, - 1, 1, 1, 0, 0, 0, 0, 0, 0, NULL, NULL, 0, NULL); - -INSERT INTO `icinga_objects` -VALUES (991, 1, 1, 'host_ok', NULL, 1), - (992, 1, 1, 'host_down', NULL, 1), - (993, 1, 1, 'host_s_soft', NULL, 1), - (994, 1, 2, 'host_ok', 's_ok', 1), - (995, 1, 2, 'host_down', 's_critical', 1), - (996, 1, 2, 'host_s_soft', 's_critical_soft', 1), - (997, 1, 1, 'host_s_critical', NULL, 1), - (998, 1, 1, 'host_s_warning', NULL, 1), - (999, 1, 2, 'host_s_critical', 's_critical', 1), - (9910, 1, 2, 'host_s_warning', 's_warning', 1), - (9911, 1, 3, 'HG_OK', NULL, 1), - (9912, 1, 3, 'HG_SOFT', NULL, 1), - (9913, 1, 3, 'HG_DOWN', NULL, 1), - (9914, 1, 3, 'HG_CRITICAL', NULL, 1), - (9915, 1, 3, 'HG_WARNING', NULL, 1), - (9916, 1, 1, 'host_s_critical_handled', NULL, 1), - (9917, 1, 1, 'host_s_warning_handled', NULL, 1), - (9918, 1, 2, 'host_s_critical_handled', 's_critical_handled', 1), - (9919, 1, 2, 'host_s_warning_handled', 's_warning_handled', 1), - (9920, 1, 9, '24x7', NULL, 1); - -INSERT INTO `icinga_hosts` -VALUES (1, 1, 1, 991, 'host_ok', 'host_ok', '127.0.0.1', '', 0, NULL, 0, NULL, 20, 0, '', 5, 1, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 0, NULL), - (2, 1, 1, 992, 'host_down', 'host_down', '127.0.0.1', '', 0, NULL, 0, NULL, 20, 0, '', 5, 1, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 0, NULL), - (3, 1, 1, 993, 'host_s_soft', 'host_s_soft', '127.0.0.1', '', 0, NULL, 0, NULL, 20, 0, '', 5, 1, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 0, NULL), - (4, 1, 1, 997, 'host_s_critical', 'host_s_critical', '127.0.0.1', '', 0, NULL, 0, NULL, 20, 0, '', 5, 1, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 0, NULL), - (5, 1, 1, 998, 'host_s_warning', 'host_s_warning', '127.0.0.1', '', 0, NULL, 0, NULL, 20, 0, '', 5, 1, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 0, NULL), - (6, 1, 1, 9916, 'host_s_critical_handled', 'host_s_critical_handled', '127.0.0.1', '', 0, NULL, 0, NULL, 20, 0, '', 5, 1, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 0, NULL), - (7, 1, 1, 9917, 'host_s_warning_handled', 'host_s_warning_handled', '127.0.0.1', '', 0, NULL, 0, NULL, 20, 0, '', 5, 1, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 0, NULL); - -INSERT INTO `icinga_hoststatus` -VALUES (1, 1, 991, '2017-10-10 11:01:51', 'TEST', NULL, NULL, '', 0, 1, 0, 1, 5, '2017-10-10 11:01:51', '2017-10-10 11:06:51', 0, '2017-10-10 11:01:51', '2017-10-10 11:01:51', 0, '2017-10-10 11:01:51', NULL, NULL, 1, NULL, NULL, 0, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, 0, 0, 0, 0, NULL), - (2, 1, 992, '2017-10-10 11:01:51', 'TEST', NULL, NULL, '', 1, 1, 0, 1, 5, '2017-10-10 11:01:51', '2017-10-10 11:06:51', 0, '2017-10-10 11:01:51', '2017-10-10 11:01:51', 1, '2017-10-10 11:01:51', '2017-10-10 11:01:51', NULL, 1, NULL, NULL, 0, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, 0, 0, 0, 0, NULL), - (3, 1, 993, '2017-10-10 11:01:51', 'TEST', NULL, NULL, '', 0, 1, 0, 1, 5, '2017-10-10 11:01:51', '2017-10-10 11:06:51', 0, '2017-10-10 11:01:51', '2017-10-10 11:01:51', 0, '2017-10-10 11:01:51', NULL, NULL, 1, NULL, NULL, 0, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, 0, 0, 0, 0, NULL), - (4, 1, 997, '2017-10-10 11:01:51', 'TEST', NULL, NULL, '', 0, 1, 0, 1, 5, '2017-10-10 11:01:51', '2017-10-10 11:06:51', 0, '2017-10-10 11:01:51', '2017-10-10 11:01:51', 0, '2017-10-10 11:01:51', NULL, NULL, 1, NULL, NULL, 0, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, 0, 0, 0, 0, NULL), - (5, 1, 998, '2017-10-10 11:01:51', 'TEST', NULL, NULL, '', 0, 1, 0, 1, 5, '2017-10-10 11:01:51', '2017-10-10 11:06:51', 0, '2017-10-10 11:01:51', '2017-10-10 11:01:51', 0, '2017-10-10 11:01:51', NULL, NULL, 1, NULL, NULL, 0, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, 0, 0, 0, 0, NULL), - (6, 1, 9916, '2017-10-10 11:01:51', 'TEST', NULL, NULL, '', 0, 1, 0, 1, 5, '2017-10-10 11:01:51', '2017-10-10 11:06:51', 0, '2017-10-10 11:01:51', '2017-10-10 11:01:51', 0, '2017-10-10 11:01:51', NULL, NULL, 1, NULL, NULL, 0, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, 0, 0, 0, 0, NULL), - (7, 1, 9917, '2017-10-10 11:01:51', 'TEST', NULL, NULL, '', 0, 1, 0, 1, 5, '2017-10-10 11:01:51', '2017-10-10 11:06:51', 0, '2017-10-10 11:01:51', '2017-10-10 11:01:51', 0, '2017-10-10 11:01:51', NULL, NULL, 1, NULL, NULL, 0, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, 0, 0, 0, 0, NULL); - -INSERT INTO `icinga_services` -VALUES (1, 1, 1, 991, 994, 's_ok', 0, NULL, 0, NULL, 20, 0, '', 5, 1, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL), - (2, 1, 1, 992, 995, 's_critical', 0, NULL, 0, NULL, 20, 0, '', 5, 1, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL), - (3, 1, 1, 993, 996, 's_critical_soft', 0, NULL, 0, NULL, 20, 0, '', 5, 1, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL), - (4, 1, 1, 997, 999, 's_critical', 0, NULL, 0, NULL, 20, 0, '', 5, 1, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL), - (5, 1, 1, 998, 9910, 's_warning', 0, NULL, 0, NULL, 20, 0, '', 5, 1, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL), - (6, 1, 1, 9916, 9918, 's_critical_handled', 0, NULL, 0, NULL, 20, 0, '', 5, 1, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL), - (7, 1, 1, 9917, 9919, 's_warning_handled', 0, NULL, 0, NULL, 20, 0, '', 5, 1, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL); - -INSERT INTO `icinga_servicestatus` -VALUES (1, 1, 994, '2017-10-10 11:16:38', 'TEST', NULL, NULL, '', 0, 1, 0, 1, 5, '2017-10-10 11:17:01', '2017-10-10 11:22:03', 1, '2017-10-10 11:17:11', '2017-10-10 11:17:11', 0, '2017-10-10 11:17:11', NULL, NULL, NULL, 1, NULL, NULL, 0, 1, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, 5, 1, 0, 0, NULL), - (2, 1, 995, '2017-10-10 11:16:38', 'TEST', NULL, NULL, '', 2, 1, 0, 1, 5, '2017-10-10 11:17:01', '2017-10-10 11:22:03', 1, '2017-10-10 11:17:11', '2017-10-10 11:17:11', 1, '2017-10-10 11:17:11', NULL, NULL, NULL, 1, NULL, NULL, 0, 1, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, 5, 1, 0, 0, NULL), - (3, 1, 996, '2017-10-10 11:16:38', 'TEST', NULL, NULL, '', 2, 1, 0, 1, 5, '2017-10-10 11:17:01', '2017-10-10 11:22:03', 1, '2017-10-10 11:17:11', '2017-10-10 11:17:11', 0, '2017-10-10 11:17:11', NULL, NULL, NULL, 0, NULL, NULL, 0, 1, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, 5, 1, 0, 0, NULL), - (4, 1, 999, '2017-10-10 11:16:38', 'TEST', NULL, NULL, '', 2, 1, 0, 1, 5, '2017-10-10 11:17:01', '2017-10-10 11:22:03', 1, '2017-10-10 11:17:11', '2017-10-10 11:17:11', 2, '2017-10-10 11:17:11', NULL, NULL, NULL, 1, NULL, NULL, 0, 1, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, 5, 1, 0, 0, NULL), - (5, 1, 9910, '2017-10-10 11:16:38', 'TEST', NULL, NULL, '', 1, 1, 0, 1, 5, '2017-10-10 11:17:01', '2017-10-10 11:22:03', 1, '2017-10-10 11:17:11', '2017-10-10 11:17:11', 1, '2017-10-10 11:17:11', NULL, NULL, NULL, 1, NULL, NULL, 0, 1, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, 5, 1, 0, 0, NULL), - (6, 1, 9919, '2017-10-10 11:16:38', 'TEST', NULL, NULL, '', 1, 1, 0, 1, 5, '2017-10-10 11:17:01', '2017-10-10 11:22:03', 1, '2017-10-10 11:17:11', '2017-10-10 11:17:11', 1, '2017-10-10 11:17:11', NULL, NULL, NULL, 1, NULL, NULL, 0, 1, 1, 3, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, 5, 1, 0, 0, NULL), - (7, 1, 9918, '2017-10-10 11:16:38', 'TEST', NULL, NULL, '', 2, 1, 0, 1, 5, '2017-10-10 11:17:01', '2017-10-10 11:22:03', 1, '2017-10-10 11:17:11', '2017-10-10 11:17:11', 1, '2017-10-10 11:17:11', NULL, NULL, NULL, 1, NULL, NULL, 0, 1, 1, 3, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, 5, 1, 0, 0, NULL); - -INSERT INTO `icinga_hostgroups` -VALUES (1, 1, 1, 9911, 'HG_OK', NULL, NULL, NULL, NULL), - (2, 1, 1, 9912, 'HG_SOFT', NULL, NULL, NULL, NULL), - (3, 1, 1, 9913, 'HG_DOWN', NULL, NULL, NULL, NULL), - (4, 1, 1, 9914, 'HG_CRITICAL', NULL, NULL, NULL, NULL), - (5, 1, 1, 9915, 'HG_WARNING', NULL, NULL, NULL, NULL); - -INSERT INTO `icinga_hostgroup_members` -VALUES (1, 1, 1, 991), - (2, 1, 2, 993), - (3, 1, 3, 992), - (4, 1, 4, 997), - (5, 1, 5, 998); diff --git a/test/docker/docker-entrypoint-initdb.d/icinga/ido-mysql.sql b/test/docker/docker-entrypoint-initdb.d/icinga/ido-mysql.sql deleted file mode 100644 index 77f022b..0000000 --- a/test/docker/docker-entrypoint-initdb.d/icinga/ido-mysql.sql +++ /dev/null @@ -1,1690 +0,0 @@ --- -------------------------------------------------------- --- mysql.sql --- DB definition for IDO MySQL --- --- Copyright (c) 2009-2016 Icinga Development Team (https://www.icinga.com/) --- --- -- -------------------------------------------------------- - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!40101 SET NAMES utf8 */; - --- --- Database: icinga --- - --- -------------------------------------------------------- - --- --- Table structure for table icinga_acknowledgements --- - -CREATE TABLE IF NOT EXISTS icinga_acknowledgements ( - acknowledgement_id bigint(20) unsigned NOT NULL AUTO_INCREMENT, - instance_id bigint unsigned default 0, - entry_time timestamp NULL, - entry_time_usec int default 0, - acknowledgement_type smallint default 0, - object_id bigint unsigned default 0, - state smallint default 0, - author_name varchar(64) character set latin1 default '', - comment_data TEXT character set latin1, - is_sticky smallint default 0, - persistent_comment smallint default 0, - notify_contacts smallint default 0, - end_time timestamp NULL, - PRIMARY KEY (acknowledgement_id) -) ENGINE=InnoDB COMMENT='Current and historical host and service acknowledgements'; - --- -------------------------------------------------------- - --- --- Table structure for table icinga_commands --- - -CREATE TABLE IF NOT EXISTS icinga_commands ( - command_id bigint(20) unsigned NOT NULL AUTO_INCREMENT, - instance_id bigint unsigned default 0, - config_type smallint default 0, - object_id bigint unsigned default 0, - command_line TEXT character set latin1, - config_hash varchar(64) DEFAULT NULL, - PRIMARY KEY (command_id), - UNIQUE KEY instance_id (instance_id,object_id,config_type) -) ENGINE=InnoDB COMMENT='Command definitions'; - --- -------------------------------------------------------- - --- --- Table structure for table icinga_commenthistory --- - -CREATE TABLE IF NOT EXISTS icinga_commenthistory ( - commenthistory_id bigint(20) unsigned NOT NULL AUTO_INCREMENT, - instance_id bigint unsigned default 0, - entry_time timestamp NULL, - entry_time_usec int default 0, - comment_type smallint default 0, - entry_type smallint default 0, - object_id bigint unsigned default 0, - comment_time timestamp NULL, - internal_comment_id bigint unsigned default 0, - author_name varchar(64) character set latin1 default '', - comment_data TEXT character set latin1, - is_persistent smallint default 0, - comment_source smallint default 0, - expires smallint default 0, - expiration_time timestamp NULL, - deletion_time timestamp NULL, - deletion_time_usec int default 0, - name TEXT character set latin1 default NULL, - PRIMARY KEY (commenthistory_id), - UNIQUE KEY instance_id (instance_id,object_id,comment_time,internal_comment_id) -) ENGINE=InnoDB COMMENT='Historical host and service comments'; - --- -------------------------------------------------------- - --- --- Table structure for table icinga_comments --- - -CREATE TABLE IF NOT EXISTS icinga_comments ( - comment_id bigint(20) unsigned NOT NULL AUTO_INCREMENT, - instance_id bigint unsigned default 0, - entry_time timestamp NULL, - entry_time_usec int default 0, - comment_type smallint default 0, - entry_type smallint default 0, - object_id bigint unsigned default 0, - comment_time timestamp NULL, - internal_comment_id bigint unsigned default 0, - author_name varchar(64) character set latin1 default '', - comment_data TEXT character set latin1, - is_persistent smallint default 0, - comment_source smallint default 0, - expires smallint default 0, - expiration_time timestamp NULL, - name TEXT character set latin1 default NULL, - session_token int default NULL, - PRIMARY KEY (comment_id), - UNIQUE KEY instance_id (instance_id,object_id,comment_time,internal_comment_id) -) ENGINE=InnoDB COMMENT='Usercomments on Icinga objects'; - --- -------------------------------------------------------- - --- --- Table structure for table icinga_configfiles --- - -CREATE TABLE IF NOT EXISTS icinga_configfiles ( - configfile_id bigint(20) unsigned NOT NULL AUTO_INCREMENT, - instance_id bigint unsigned default 0, - configfile_type smallint default 0, - configfile_path varchar(255) character set latin1 default '', - PRIMARY KEY (configfile_id), - UNIQUE KEY instance_id (instance_id,configfile_type,configfile_path) -) ENGINE=InnoDB COMMENT='Configuration files'; - --- -------------------------------------------------------- - --- --- Table structure for table icinga_configfilevariables --- - -CREATE TABLE IF NOT EXISTS icinga_configfilevariables ( - configfilevariable_id bigint(20) unsigned NOT NULL AUTO_INCREMENT, - instance_id bigint unsigned default 0, - configfile_id bigint unsigned default 0, - varname varchar(64) character set latin1 default '', - varvalue TEXT character set latin1, - PRIMARY KEY (configfilevariable_id) -) ENGINE=InnoDB COMMENT='Configuration file variables'; - --- -------------------------------------------------------- - --- --- Table structure for table icinga_conninfo --- - -CREATE TABLE IF NOT EXISTS icinga_conninfo ( - conninfo_id bigint(20) unsigned NOT NULL AUTO_INCREMENT, - instance_id bigint unsigned default 0, - agent_name varchar(32) character set latin1 default '', - agent_version varchar(32) character set latin1 default '', - disposition varchar(32) character set latin1 default '', - connect_source varchar(32) character set latin1 default '', - connect_type varchar(32) character set latin1 default '', - connect_time timestamp NULL, - disconnect_time timestamp NULL, - last_checkin_time timestamp NULL, - data_start_time timestamp NULL, - data_end_time timestamp NULL, - bytes_processed bigint unsigned default '0', - lines_processed bigint unsigned default '0', - entries_processed bigint unsigned default '0', - PRIMARY KEY (conninfo_id) -) ENGINE=InnoDB COMMENT='IDO2DB daemon connection information'; - --- -------------------------------------------------------- - --- --- Table structure for table icinga_contactgroups --- - -CREATE TABLE IF NOT EXISTS icinga_contactgroups ( - contactgroup_id bigint(20) unsigned NOT NULL AUTO_INCREMENT, - instance_id bigint unsigned default 0, - config_type smallint default 0, - contactgroup_object_id bigint unsigned default 0, - alias varchar(255) character set latin1 default '', - config_hash varchar(64) DEFAULT NULL, - PRIMARY KEY (contactgroup_id), - UNIQUE KEY instance_id (instance_id,config_type,contactgroup_object_id) -) ENGINE=InnoDB COMMENT='Contactgroup definitions'; - --- -------------------------------------------------------- - --- --- Table structure for table icinga_contactgroup_members --- - -CREATE TABLE IF NOT EXISTS icinga_contactgroup_members ( - contactgroup_member_id bigint(20) unsigned NOT NULL AUTO_INCREMENT, - instance_id bigint unsigned default 0, - contactgroup_id bigint unsigned default 0, - contact_object_id bigint unsigned default 0, - PRIMARY KEY (contactgroup_member_id) -) ENGINE=InnoDB COMMENT='Contactgroup members'; - --- -------------------------------------------------------- - --- --- Table structure for table icinga_contactnotificationmethods --- - -CREATE TABLE IF NOT EXISTS icinga_contactnotificationmethods ( - contactnotificationmethod_id bigint(20) unsigned NOT NULL AUTO_INCREMENT, - instance_id bigint unsigned default 0, - contactnotification_id bigint unsigned default 0, - start_time timestamp NULL, - start_time_usec int default 0, - end_time timestamp NULL, - end_time_usec int default 0, - command_object_id bigint unsigned default 0, - command_args TEXT character set latin1, - PRIMARY KEY (contactnotificationmethod_id), - UNIQUE KEY instance_id (instance_id,contactnotification_id,start_time,start_time_usec) -) ENGINE=InnoDB COMMENT='Historical record of contact notification methods'; - --- -------------------------------------------------------- - --- --- Table structure for table icinga_contactnotifications --- - -CREATE TABLE IF NOT EXISTS icinga_contactnotifications ( - contactnotification_id bigint(20) unsigned NOT NULL AUTO_INCREMENT, - instance_id bigint unsigned default 0, - notification_id bigint unsigned default 0, - contact_object_id bigint unsigned default 0, - start_time timestamp NULL, - start_time_usec int default 0, - end_time timestamp NULL, - end_time_usec int default 0, - PRIMARY KEY (contactnotification_id), - UNIQUE KEY instance_id (instance_id,contact_object_id,start_time,start_time_usec) -) ENGINE=InnoDB COMMENT='Historical record of contact notifications'; - --- -------------------------------------------------------- - --- --- Table structure for table icinga_contacts --- - -CREATE TABLE IF NOT EXISTS icinga_contacts ( - contact_id bigint(20) unsigned NOT NULL AUTO_INCREMENT, - instance_id bigint unsigned default 0, - config_type smallint default 0, - contact_object_id bigint unsigned default 0, - alias varchar(255) character set latin1 default '', - email_address varchar(255) character set latin1 default '', - pager_address varchar(64) character set latin1 default '', - host_timeperiod_object_id bigint unsigned default 0, - service_timeperiod_object_id bigint unsigned default 0, - host_notifications_enabled smallint default 0, - service_notifications_enabled smallint default 0, - can_submit_commands smallint default 0, - notify_service_recovery smallint default 0, - notify_service_warning smallint default 0, - notify_service_unknown smallint default 0, - notify_service_critical smallint default 0, - notify_service_flapping smallint default 0, - notify_service_downtime smallint default 0, - notify_host_recovery smallint default 0, - notify_host_down smallint default 0, - notify_host_unreachable smallint default 0, - notify_host_flapping smallint default 0, - notify_host_downtime smallint default 0, - config_hash varchar(64) DEFAULT NULL, - PRIMARY KEY (contact_id), - UNIQUE KEY instance_id (instance_id,config_type,contact_object_id) -) ENGINE=InnoDB COMMENT='Contact definitions'; - --- -------------------------------------------------------- - --- --- Table structure for table icinga_contactstatus --- - -CREATE TABLE IF NOT EXISTS icinga_contactstatus ( - contactstatus_id bigint(20) unsigned NOT NULL AUTO_INCREMENT, - instance_id bigint unsigned default 0, - contact_object_id bigint unsigned default 0, - status_update_time timestamp NULL, - host_notifications_enabled smallint default 0, - service_notifications_enabled smallint default 0, - last_host_notification timestamp NULL, - last_service_notification timestamp NULL, - modified_attributes int default 0, - modified_host_attributes int default 0, - modified_service_attributes int default 0, - PRIMARY KEY (contactstatus_id), - UNIQUE KEY contact_object_id (contact_object_id) -) ENGINE=InnoDB COMMENT='Contact status'; - --- -------------------------------------------------------- - --- --- Table structure for table icinga_contact_addresses --- - -CREATE TABLE IF NOT EXISTS icinga_contact_addresses ( - contact_address_id bigint(20) unsigned NOT NULL AUTO_INCREMENT, - instance_id bigint unsigned default 0, - contact_id bigint unsigned default 0, - address_number smallint default 0, - address varchar(255) character set latin1 default '', - PRIMARY KEY (contact_address_id), - UNIQUE KEY contact_id (contact_id,address_number) -) ENGINE=InnoDB COMMENT='Contact addresses'; - --- -------------------------------------------------------- - --- --- Table structure for table icinga_contact_notificationcommands --- - -CREATE TABLE IF NOT EXISTS icinga_contact_notificationcommands ( - contact_notificationcommand_id bigint(20) unsigned NOT NULL AUTO_INCREMENT, - instance_id bigint unsigned default 0, - contact_id bigint unsigned default 0, - notification_type smallint default 0, - command_object_id bigint unsigned default 0, - command_args varchar(255) character set latin1 default '', - PRIMARY KEY (contact_notificationcommand_id), - UNIQUE KEY contact_id (contact_id,notification_type,command_object_id,command_args) -) ENGINE=InnoDB COMMENT='Contact host and service notification commands'; - --- -------------------------------------------------------- - --- --- Table structure for table icinga_customvariables --- - -CREATE TABLE IF NOT EXISTS icinga_customvariables ( - customvariable_id bigint(20) unsigned NOT NULL AUTO_INCREMENT, - instance_id bigint unsigned default 0, - object_id bigint unsigned default 0, - config_type smallint default 0, - has_been_modified smallint default 0, - varname varchar(255) character set latin1 collate latin1_general_cs default NULL, - varvalue TEXT character set latin1, - is_json smallint default 0, - PRIMARY KEY (customvariable_id), - UNIQUE KEY object_id_2 (object_id,config_type,varname), - KEY varname (varname) -) ENGINE=InnoDB COMMENT='Custom variables'; - --- -------------------------------------------------------- - --- --- Table structure for table icinga_customvariablestatus --- - -CREATE TABLE IF NOT EXISTS icinga_customvariablestatus ( - customvariablestatus_id bigint(20) unsigned NOT NULL AUTO_INCREMENT, - instance_id bigint unsigned default 0, - object_id bigint unsigned default 0, - status_update_time timestamp NULL, - has_been_modified smallint default 0, - varname varchar(255) character set latin1 collate latin1_general_cs default NULL, - varvalue TEXT character set latin1, - is_json smallint default 0, - PRIMARY KEY (customvariablestatus_id), - UNIQUE KEY object_id_2 (object_id,varname), - KEY varname (varname) -) ENGINE=InnoDB COMMENT='Custom variable status information'; - --- -------------------------------------------------------- - --- --- Table structure for table icinga_dbversion --- - -CREATE TABLE IF NOT EXISTS icinga_dbversion ( - dbversion_id bigint(20) unsigned NOT NULL AUTO_INCREMENT, - name varchar(10) character set latin1 default '', - version varchar(10) character set latin1 default '', - create_time timestamp NULL, - modify_time timestamp NULL, - PRIMARY KEY (dbversion_id), - UNIQUE KEY dbversion (name) -) ENGINE=InnoDB; - --- -------------------------------------------------------- - --- --- Table structure for table icinga_downtimehistory --- - -CREATE TABLE IF NOT EXISTS icinga_downtimehistory ( - downtimehistory_id bigint(20) unsigned NOT NULL AUTO_INCREMENT, - instance_id bigint unsigned default 0, - downtime_type smallint default 0, - object_id bigint unsigned default 0, - entry_time timestamp NULL, - author_name varchar(64) character set latin1 default '', - comment_data TEXT character set latin1, - internal_downtime_id bigint unsigned default 0, - triggered_by_id bigint unsigned default 0, - is_fixed smallint default 0, - duration bigint(20) default 0, - scheduled_start_time timestamp NULL, - scheduled_end_time timestamp NULL, - was_started smallint default 0, - actual_start_time timestamp NULL, - actual_start_time_usec int default 0, - actual_end_time timestamp NULL, - actual_end_time_usec int default 0, - was_cancelled smallint default 0, - is_in_effect smallint default 0, - trigger_time timestamp NULL, - name TEXT character set latin1 default NULL, - PRIMARY KEY (downtimehistory_id), - UNIQUE KEY instance_id (instance_id,object_id,entry_time,internal_downtime_id) -) ENGINE=InnoDB COMMENT='Historical scheduled host and service downtime'; - --- -------------------------------------------------------- - --- --- Table structure for table icinga_eventhandlers --- - -CREATE TABLE IF NOT EXISTS icinga_eventhandlers ( - eventhandler_id bigint(20) unsigned NOT NULL AUTO_INCREMENT, - instance_id bigint unsigned default 0, - eventhandler_type smallint default 0, - object_id bigint unsigned default 0, - state smallint default 0, - state_type smallint default 0, - start_time timestamp NULL, - start_time_usec int default 0, - end_time timestamp NULL, - end_time_usec int default 0, - command_object_id bigint unsigned default 0, - command_args TEXT character set latin1, - command_line TEXT character set latin1, - timeout smallint default 0, - early_timeout smallint default 0, - execution_time double default '0', - return_code smallint default 0, - output TEXT character set latin1, - long_output TEXT, - PRIMARY KEY (eventhandler_id), - UNIQUE KEY instance_id (instance_id,object_id,start_time,start_time_usec) -) ENGINE=InnoDB COMMENT='Historical host and service event handlers'; - --- -------------------------------------------------------- - --- --- Table structure for table icinga_externalcommands --- - -CREATE TABLE IF NOT EXISTS icinga_externalcommands ( - externalcommand_id bigint(20) unsigned NOT NULL AUTO_INCREMENT, - instance_id bigint unsigned default 0, - entry_time timestamp NULL, - command_type smallint default 0, - command_name varchar(128) character set latin1 default '', - command_args TEXT character set latin1, - PRIMARY KEY (externalcommand_id) -) ENGINE=InnoDB COMMENT='Historical record of processed external commands'; - --- -------------------------------------------------------- - --- --- Table structure for table icinga_flappinghistory --- - -CREATE TABLE IF NOT EXISTS icinga_flappinghistory ( - flappinghistory_id bigint(20) unsigned NOT NULL AUTO_INCREMENT, - instance_id bigint unsigned default 0, - event_time timestamp NULL, - event_time_usec int default 0, - event_type smallint default 0, - reason_type smallint default 0, - flapping_type smallint default 0, - object_id bigint unsigned default 0, - percent_state_change double default '0', - low_threshold double default '0', - high_threshold double default '0', - comment_time timestamp NULL, - internal_comment_id bigint unsigned default 0, - PRIMARY KEY (flappinghistory_id) -) ENGINE=InnoDB COMMENT='Current and historical record of host and service flapping'; - --- -------------------------------------------------------- - --- --- Table structure for table icinga_hostchecks --- - -CREATE TABLE IF NOT EXISTS icinga_hostchecks ( - hostcheck_id bigint(20) unsigned NOT NULL AUTO_INCREMENT, - instance_id bigint unsigned default 0, - host_object_id bigint unsigned default 0, - check_type smallint default 0, - is_raw_check smallint default 0, - current_check_attempt smallint default 0, - max_check_attempts smallint default 0, - state smallint default 0, - state_type smallint default 0, - start_time timestamp NULL, - start_time_usec int default 0, - end_time timestamp NULL, - end_time_usec int default 0, - command_object_id bigint unsigned default 0, - command_args TEXT character set latin1, - command_line TEXT character set latin1, - timeout smallint default 0, - early_timeout smallint default 0, - execution_time double default '0', - latency double default '0', - return_code smallint default 0, - output TEXT character set latin1, - long_output TEXT, - perfdata TEXT character set latin1, - PRIMARY KEY (hostcheck_id) -) ENGINE=InnoDB COMMENT='Historical host checks'; - --- -------------------------------------------------------- - --- --- Table structure for table icinga_hostdependencies --- - -CREATE TABLE IF NOT EXISTS icinga_hostdependencies ( - hostdependency_id bigint(20) unsigned NOT NULL AUTO_INCREMENT, - instance_id bigint unsigned default 0, - config_type smallint default 0, - host_object_id bigint unsigned default 0, - dependent_host_object_id bigint unsigned default 0, - dependency_type smallint default 0, - inherits_parent smallint default 0, - timeperiod_object_id bigint unsigned default 0, - fail_on_up smallint default 0, - fail_on_down smallint default 0, - fail_on_unreachable smallint default 0, - PRIMARY KEY (hostdependency_id), - KEY instance_id (instance_id,config_type,host_object_id,dependent_host_object_id,dependency_type,inherits_parent,fail_on_up,fail_on_down,fail_on_unreachable) -) ENGINE=InnoDB COMMENT='Host dependency definitions'; - --- -------------------------------------------------------- - --- --- Table structure for table icinga_hostescalations --- - -CREATE TABLE IF NOT EXISTS icinga_hostescalations ( - hostescalation_id bigint(20) unsigned NOT NULL AUTO_INCREMENT, - instance_id bigint unsigned default 0, - config_type smallint default 0, - host_object_id bigint unsigned default 0, - timeperiod_object_id bigint unsigned default 0, - first_notification smallint default 0, - last_notification smallint default 0, - notification_interval double default '0', - escalate_on_recovery smallint default 0, - escalate_on_down smallint default 0, - escalate_on_unreachable smallint default 0, - PRIMARY KEY (hostescalation_id), - UNIQUE KEY instance_id (instance_id,config_type,host_object_id,timeperiod_object_id,first_notification,last_notification) -) ENGINE=InnoDB COMMENT='Host escalation definitions'; - --- -------------------------------------------------------- - --- --- Table structure for table icinga_hostescalation_contactgroups --- - -CREATE TABLE IF NOT EXISTS icinga_hostescalation_contactgroups ( - hostescalation_contactgroup_id bigint(20) unsigned NOT NULL AUTO_INCREMENT, - instance_id bigint unsigned default 0, - hostescalation_id bigint unsigned default 0, - contactgroup_object_id bigint unsigned default 0, - PRIMARY KEY (hostescalation_contactgroup_id), - UNIQUE KEY instance_id (hostescalation_id,contactgroup_object_id) -) ENGINE=InnoDB COMMENT='Host escalation contact groups'; - --- -------------------------------------------------------- - --- --- Table structure for table icinga_hostescalation_contacts --- - -CREATE TABLE IF NOT EXISTS icinga_hostescalation_contacts ( - hostescalation_contact_id bigint(20) unsigned NOT NULL AUTO_INCREMENT, - instance_id bigint unsigned default 0, - hostescalation_id bigint unsigned default 0, - contact_object_id bigint unsigned default 0, - PRIMARY KEY (hostescalation_contact_id), - UNIQUE KEY instance_id (instance_id,hostescalation_id,contact_object_id) -) ENGINE=InnoDB COMMENT='Host escalation contacts'; - --- -------------------------------------------------------- - --- --- Table structure for table icinga_hostgroups --- - -CREATE TABLE IF NOT EXISTS icinga_hostgroups ( - hostgroup_id bigint(20) unsigned NOT NULL AUTO_INCREMENT, - instance_id bigint unsigned default 0, - config_type smallint default 0, - hostgroup_object_id bigint unsigned default 0, - alias varchar(255) character set latin1 default '', - notes TEXT character set latin1 default NULL, - notes_url TEXT character set latin1 default NULL, - action_url TEXT character set latin1 default NULL, - config_hash varchar(64) DEFAULT NULL, - PRIMARY KEY (hostgroup_id), - UNIQUE KEY instance_id (instance_id,hostgroup_object_id) -) ENGINE=InnoDB COMMENT='Hostgroup definitions'; - --- -------------------------------------------------------- - --- --- Table structure for table icinga_hostgroup_members --- - -CREATE TABLE IF NOT EXISTS icinga_hostgroup_members ( - hostgroup_member_id bigint(20) unsigned NOT NULL AUTO_INCREMENT, - instance_id bigint unsigned default 0, - hostgroup_id bigint unsigned default 0, - host_object_id bigint unsigned default 0, - PRIMARY KEY (hostgroup_member_id) -) ENGINE=InnoDB COMMENT='Hostgroup members'; - --- -------------------------------------------------------- - --- --- Table structure for table icinga_hosts --- - -CREATE TABLE IF NOT EXISTS icinga_hosts ( - host_id bigint(20) unsigned NOT NULL AUTO_INCREMENT, - instance_id bigint unsigned default 0, - config_type smallint default 0, - host_object_id bigint unsigned default 0, - alias varchar(255) character set latin1 default '', - display_name varchar(255) character set latin1 collate latin1_general_cs default '', - address varchar(128) character set latin1 default '', - address6 varchar(128) character set latin1 default '', - check_command_object_id bigint unsigned default 0, - check_command_args TEXT character set latin1, - eventhandler_command_object_id bigint unsigned default 0, - eventhandler_command_args TEXT character set latin1, - notification_timeperiod_object_id bigint unsigned default 0, - check_timeperiod_object_id bigint unsigned default 0, - failure_prediction_options varchar(128) character set latin1 default '', - check_interval double default '0', - retry_interval double default '0', - max_check_attempts smallint default 0, - first_notification_delay double default '0', - notification_interval double default '0', - notify_on_down smallint default 0, - notify_on_unreachable smallint default 0, - notify_on_recovery smallint default 0, - notify_on_flapping smallint default 0, - notify_on_downtime smallint default 0, - stalk_on_up smallint default 0, - stalk_on_down smallint default 0, - stalk_on_unreachable smallint default 0, - flap_detection_enabled smallint default 0, - flap_detection_on_up smallint default 0, - flap_detection_on_down smallint default 0, - flap_detection_on_unreachable smallint default 0, - low_flap_threshold double default '0', - high_flap_threshold double default '0', - process_performance_data smallint default 0, - freshness_checks_enabled smallint default 0, - freshness_threshold int default 0, - passive_checks_enabled smallint default 0, - event_handler_enabled smallint default 0, - active_checks_enabled smallint default 0, - retain_status_information smallint default 0, - retain_nonstatus_information smallint default 0, - notifications_enabled smallint default 0, - obsess_over_host smallint default 0, - failure_prediction_enabled smallint default 0, - notes TEXT character set latin1, - notes_url TEXT character set latin1, - action_url TEXT character set latin1, - icon_image TEXT character set latin1, - icon_image_alt TEXT character set latin1, - vrml_image TEXT character set latin1, - statusmap_image TEXT character set latin1, - have_2d_coords smallint default 0, - x_2d smallint default 0, - y_2d smallint default 0, - have_3d_coords smallint default 0, - x_3d double default '0', - y_3d double default '0', - z_3d double default '0', - config_hash varchar(64) DEFAULT NULL, - PRIMARY KEY (host_id), - UNIQUE KEY instance_id (instance_id,config_type,host_object_id), - KEY host_object_id (host_object_id) -) ENGINE=InnoDB COMMENT='Host definitions'; - --- -------------------------------------------------------- - --- --- Table structure for table icinga_hoststatus --- - -CREATE TABLE IF NOT EXISTS icinga_hoststatus ( - hoststatus_id bigint(20) unsigned NOT NULL AUTO_INCREMENT, - instance_id bigint unsigned default 0, - host_object_id bigint unsigned default 0, - status_update_time timestamp NULL, - output TEXT character set latin1, - long_output TEXT, - perfdata TEXT character set latin1, - check_source varchar(255) character set latin1 default '', - current_state smallint default 0, - has_been_checked smallint default 0, - should_be_scheduled smallint default 0, - current_check_attempt smallint default 0, - max_check_attempts smallint default 0, - last_check timestamp NULL, - next_check timestamp NULL, - check_type smallint default 0, - last_state_change timestamp NULL, - last_hard_state_change timestamp NULL, - last_hard_state smallint default 0, - last_time_up timestamp NULL, - last_time_down timestamp NULL, - last_time_unreachable timestamp NULL, - state_type smallint default 0, - last_notification timestamp NULL, - next_notification timestamp NULL, - no_more_notifications smallint default 0, - notifications_enabled smallint default 0, - problem_has_been_acknowledged smallint default 0, - acknowledgement_type smallint default 0, - current_notification_number int unsigned default 0, - passive_checks_enabled smallint default 0, - active_checks_enabled smallint default 0, - event_handler_enabled smallint default 0, - flap_detection_enabled smallint default 0, - is_flapping smallint default 0, - percent_state_change double default '0', - latency double default '0', - execution_time double default '0', - scheduled_downtime_depth smallint default 0, - failure_prediction_enabled smallint default 0, - process_performance_data smallint default 0, - obsess_over_host smallint default 0, - modified_host_attributes int default 0, - original_attributes TEXT character set latin1 default NULL, - event_handler TEXT character set latin1, - check_command TEXT character set latin1, - normal_check_interval double default '0', - retry_check_interval double default '0', - check_timeperiod_object_id bigint unsigned default 0, - is_reachable smallint default 0, - PRIMARY KEY (hoststatus_id), - UNIQUE KEY object_id (host_object_id) -) ENGINE=InnoDB COMMENT='Current host status information'; - --- -------------------------------------------------------- - --- --- Table structure for table icinga_host_contactgroups --- - -CREATE TABLE IF NOT EXISTS icinga_host_contactgroups ( - host_contactgroup_id bigint(20) unsigned NOT NULL AUTO_INCREMENT, - instance_id bigint unsigned default 0, - host_id bigint unsigned default 0, - contactgroup_object_id bigint unsigned default 0, - PRIMARY KEY (host_contactgroup_id) -) ENGINE=InnoDB COMMENT='Host contact groups'; - --- -------------------------------------------------------- - --- --- Table structure for table icinga_host_contacts --- - -CREATE TABLE IF NOT EXISTS icinga_host_contacts ( - host_contact_id bigint(20) unsigned NOT NULL AUTO_INCREMENT, - instance_id bigint unsigned default 0, - host_id bigint unsigned default 0, - contact_object_id bigint unsigned default 0, - PRIMARY KEY (host_contact_id) -) ENGINE=InnoDB COMMENT='Host contacts'; - --- -------------------------------------------------------- - --- --- Table structure for table icinga_host_parenthosts --- - -CREATE TABLE IF NOT EXISTS icinga_host_parenthosts ( - host_parenthost_id bigint(20) unsigned NOT NULL AUTO_INCREMENT, - instance_id bigint unsigned default 0, - host_id bigint unsigned default 0, - parent_host_object_id bigint unsigned default 0, - PRIMARY KEY (host_parenthost_id) -) ENGINE=InnoDB COMMENT='Parent hosts'; - --- -------------------------------------------------------- - --- --- Table structure for table icinga_instances --- - -CREATE TABLE IF NOT EXISTS icinga_instances ( - instance_id bigint(20) unsigned NOT NULL AUTO_INCREMENT, - instance_name varchar(64) character set latin1 default '', - instance_description varchar(128) character set latin1 default '', - PRIMARY KEY (instance_id) -) ENGINE=InnoDB COMMENT='Location names of various Icinga installations'; - --- -------------------------------------------------------- - --- --- Table structure for table icinga_logentries --- - -CREATE TABLE IF NOT EXISTS icinga_logentries ( - logentry_id bigint(20) unsigned NOT NULL AUTO_INCREMENT, - instance_id bigint unsigned default 0, - logentry_time timestamp NULL, - entry_time timestamp NULL, - entry_time_usec int default 0, - logentry_type int default 0, - logentry_data TEXT character set latin1, - realtime_data smallint default 0, - inferred_data_extracted smallint default 0, - object_id bigint unsigned default NULL, - PRIMARY KEY (logentry_id) -) ENGINE=InnoDB COMMENT='Historical record of log entries'; - --- -------------------------------------------------------- - --- --- Table structure for table icinga_notifications --- - -CREATE TABLE IF NOT EXISTS icinga_notifications ( - notification_id bigint(20) unsigned NOT NULL AUTO_INCREMENT, - instance_id bigint unsigned default 0, - notification_type smallint default 0, - notification_reason smallint default 0, - object_id bigint unsigned default 0, - start_time timestamp NULL, - start_time_usec int default 0, - end_time timestamp NULL, - end_time_usec int default 0, - state smallint default 0, - output TEXT character set latin1, - long_output TEXT, - escalated smallint default 0, - contacts_notified smallint default 0, - PRIMARY KEY (notification_id), - UNIQUE KEY instance_id (instance_id,object_id,start_time,start_time_usec) -) ENGINE=InnoDB COMMENT='Historical record of host and service notifications'; - --- -------------------------------------------------------- - --- --- Table structure for table icinga_objects --- - -CREATE TABLE IF NOT EXISTS icinga_objects ( - object_id bigint(20) unsigned NOT NULL AUTO_INCREMENT, - instance_id bigint unsigned default 0, - objecttype_id bigint unsigned default 0, - name1 varchar(128) character set latin1 collate latin1_general_cs default '', - name2 varchar(128) character set latin1 collate latin1_general_cs default NULL, - is_active smallint default 0, - PRIMARY KEY (object_id), - KEY objecttype_id (objecttype_id,name1,name2) -) ENGINE=InnoDB COMMENT='Current and historical objects of all kinds'; - --- -------------------------------------------------------- - --- --- Table structure for table icinga_processevents --- - -CREATE TABLE IF NOT EXISTS icinga_processevents ( - processevent_id bigint(20) unsigned NOT NULL AUTO_INCREMENT, - instance_id bigint unsigned default 0, - event_type smallint default 0, - event_time timestamp NULL, - event_time_usec int default 0, - process_id bigint unsigned default 0, - program_name varchar(16) character set latin1 default '', - program_version varchar(20) character set latin1 default '', - program_date varchar(10) character set latin1 default '', - PRIMARY KEY (processevent_id) -) ENGINE=InnoDB COMMENT='Historical Icinga process events'; - --- -------------------------------------------------------- - --- --- Table structure for table icinga_programstatus --- - -CREATE TABLE IF NOT EXISTS icinga_programstatus ( - programstatus_id bigint(20) unsigned NOT NULL AUTO_INCREMENT, - instance_id bigint unsigned default 0, - program_version varchar(64) character set latin1 collate latin1_general_cs default NULL, - status_update_time timestamp NULL, - program_start_time timestamp NULL, - program_end_time timestamp NULL, - endpoint_name varchar(255) character set latin1 collate latin1_general_cs default NULL, - is_currently_running smallint default 0, - process_id bigint unsigned default 0, - daemon_mode smallint default 0, - last_command_check timestamp NULL, - last_log_rotation timestamp NULL, - notifications_enabled smallint default 0, - disable_notif_expire_time timestamp NULL, - active_service_checks_enabled smallint default 0, - passive_service_checks_enabled smallint default 0, - active_host_checks_enabled smallint default 0, - passive_host_checks_enabled smallint default 0, - event_handlers_enabled smallint default 0, - flap_detection_enabled smallint default 0, - failure_prediction_enabled smallint default 0, - process_performance_data smallint default 0, - obsess_over_hosts smallint default 0, - obsess_over_services smallint default 0, - modified_host_attributes int default 0, - modified_service_attributes int default 0, - global_host_event_handler TEXT character set latin1, - global_service_event_handler TEXT character set latin1, - config_dump_in_progress smallint default 0, - PRIMARY KEY (programstatus_id), - UNIQUE KEY instance_id (instance_id) -) ENGINE=InnoDB COMMENT='Current program status information'; - --- -------------------------------------------------------- - --- --- Table structure for table icinga_runtimevariables --- - -CREATE TABLE IF NOT EXISTS icinga_runtimevariables ( - runtimevariable_id bigint(20) unsigned NOT NULL AUTO_INCREMENT, - instance_id bigint unsigned default 0, - varname varchar(64) character set latin1 default '', - varvalue TEXT character set latin1, - PRIMARY KEY (runtimevariable_id) -) ENGINE=InnoDB COMMENT='Runtime variables from the Icinga daemon'; - --- -------------------------------------------------------- - --- --- Table structure for table icinga_scheduleddowntime --- - -CREATE TABLE IF NOT EXISTS icinga_scheduleddowntime ( - scheduleddowntime_id bigint(20) unsigned NOT NULL AUTO_INCREMENT, - instance_id bigint unsigned default 0, - downtime_type smallint default 0, - object_id bigint unsigned default 0, - entry_time timestamp NULL, - author_name varchar(64) character set latin1 default '', - comment_data TEXT character set latin1, - internal_downtime_id bigint unsigned default 0, - triggered_by_id bigint unsigned default 0, - is_fixed smallint default 0, - duration bigint(20) default 0, - scheduled_start_time timestamp NULL, - scheduled_end_time timestamp NULL, - was_started smallint default 0, - actual_start_time timestamp NULL, - actual_start_time_usec int default 0, - is_in_effect smallint default 0, - trigger_time timestamp NULL, - name TEXT character set latin1 default NULL, - session_token int default NULL, - PRIMARY KEY (scheduleddowntime_id), - UNIQUE KEY instance_id (instance_id,object_id,entry_time,internal_downtime_id) -) ENGINE=InnoDB COMMENT='Current scheduled host and service downtime'; - --- -------------------------------------------------------- - --- --- Table structure for table icinga_servicechecks --- - -CREATE TABLE IF NOT EXISTS icinga_servicechecks ( - servicecheck_id bigint(20) unsigned NOT NULL AUTO_INCREMENT, - instance_id bigint unsigned default 0, - service_object_id bigint unsigned default 0, - check_type smallint default 0, - current_check_attempt smallint default 0, - max_check_attempts smallint default 0, - state smallint default 0, - state_type smallint default 0, - start_time timestamp NULL, - start_time_usec int default 0, - end_time timestamp NULL, - end_time_usec int default 0, - command_object_id bigint unsigned default 0, - command_args TEXT character set latin1, - command_line TEXT character set latin1, - timeout smallint default 0, - early_timeout smallint default 0, - execution_time double default '0', - latency double default '0', - return_code smallint default 0, - output TEXT character set latin1, - long_output TEXT, - perfdata TEXT character set latin1, - PRIMARY KEY (servicecheck_id) -) ENGINE=InnoDB COMMENT='Historical service checks'; - --- -------------------------------------------------------- - --- --- Table structure for table icinga_servicedependencies --- - -CREATE TABLE IF NOT EXISTS icinga_servicedependencies ( - servicedependency_id bigint(20) unsigned NOT NULL AUTO_INCREMENT, - instance_id bigint unsigned default 0, - config_type smallint default 0, - service_object_id bigint unsigned default 0, - dependent_service_object_id bigint unsigned default 0, - dependency_type smallint default 0, - inherits_parent smallint default 0, - timeperiod_object_id bigint unsigned default 0, - fail_on_ok smallint default 0, - fail_on_warning smallint default 0, - fail_on_unknown smallint default 0, - fail_on_critical smallint default 0, - PRIMARY KEY (servicedependency_id), - KEY instance_id (instance_id,config_type,service_object_id,dependent_service_object_id,dependency_type,inherits_parent,fail_on_ok,fail_on_warning,fail_on_unknown,fail_on_critical) -) ENGINE=InnoDB COMMENT='Service dependency definitions'; - --- -------------------------------------------------------- - --- --- Table structure for table icinga_serviceescalations --- - -CREATE TABLE IF NOT EXISTS icinga_serviceescalations ( - serviceescalation_id bigint(20) unsigned NOT NULL AUTO_INCREMENT, - instance_id bigint unsigned default 0, - config_type smallint default 0, - service_object_id bigint unsigned default 0, - timeperiod_object_id bigint unsigned default 0, - first_notification smallint default 0, - last_notification smallint default 0, - notification_interval double default '0', - escalate_on_recovery smallint default 0, - escalate_on_warning smallint default 0, - escalate_on_unknown smallint default 0, - escalate_on_critical smallint default 0, - PRIMARY KEY (serviceescalation_id), - UNIQUE KEY instance_id (instance_id,config_type,service_object_id,timeperiod_object_id,first_notification,last_notification) -) ENGINE=InnoDB COMMENT='Service escalation definitions'; - --- -------------------------------------------------------- - --- --- Table structure for table icinga_serviceescalation_contactgroups --- - -CREATE TABLE IF NOT EXISTS icinga_serviceescalation_contactgroups ( - serviceescalation_contactgroup_id bigint(20) unsigned NOT NULL AUTO_INCREMENT, - instance_id bigint unsigned default 0, - serviceescalation_id bigint unsigned default 0, - contactgroup_object_id bigint unsigned default 0, - PRIMARY KEY (serviceescalation_contactgroup_id), - UNIQUE KEY instance_id (serviceescalation_id,contactgroup_object_id) -) ENGINE=InnoDB COMMENT='Service escalation contact groups'; - --- -------------------------------------------------------- - --- --- Table structure for table icinga_serviceescalation_contacts --- - -CREATE TABLE IF NOT EXISTS icinga_serviceescalation_contacts ( - serviceescalation_contact_id bigint(20) unsigned NOT NULL AUTO_INCREMENT, - instance_id bigint unsigned default 0, - serviceescalation_id bigint unsigned default 0, - contact_object_id bigint unsigned default 0, - PRIMARY KEY (serviceescalation_contact_id), - UNIQUE KEY instance_id (instance_id,serviceescalation_id,contact_object_id) -) ENGINE=InnoDB COMMENT='Service escalation contacts'; - --- -------------------------------------------------------- - --- --- Table structure for table icinga_servicegroups --- - -CREATE TABLE IF NOT EXISTS icinga_servicegroups ( - servicegroup_id bigint(20) unsigned NOT NULL AUTO_INCREMENT, - instance_id bigint unsigned default 0, - config_type smallint default 0, - servicegroup_object_id bigint unsigned default 0, - alias varchar(255) character set latin1 default '', - notes TEXT character set latin1 default NULL, - notes_url TEXT character set latin1 default NULL, - action_url TEXT character set latin1 default NULL, - config_hash varchar(64) DEFAULT NULL, - PRIMARY KEY (servicegroup_id), - UNIQUE KEY instance_id (instance_id,config_type,servicegroup_object_id) -) ENGINE=InnoDB COMMENT='Servicegroup definitions'; - --- -------------------------------------------------------- - --- --- Table structure for table icinga_servicegroup_members --- - -CREATE TABLE IF NOT EXISTS icinga_servicegroup_members ( - servicegroup_member_id bigint(20) unsigned NOT NULL AUTO_INCREMENT, - instance_id bigint unsigned default 0, - servicegroup_id bigint unsigned default 0, - service_object_id bigint unsigned default 0, - PRIMARY KEY (servicegroup_member_id) -) ENGINE=InnoDB COMMENT='Servicegroup members'; - --- -------------------------------------------------------- - --- --- Table structure for table icinga_services --- - -CREATE TABLE IF NOT EXISTS icinga_services ( - service_id bigint(20) unsigned NOT NULL AUTO_INCREMENT, - instance_id bigint unsigned default 0, - config_type smallint default 0, - host_object_id bigint unsigned default 0, - service_object_id bigint unsigned default 0, - display_name varchar(255) character set latin1 collate latin1_general_cs default '', - check_command_object_id bigint unsigned default 0, - check_command_args TEXT character set latin1, - eventhandler_command_object_id bigint unsigned default 0, - eventhandler_command_args TEXT character set latin1, - notification_timeperiod_object_id bigint unsigned default 0, - check_timeperiod_object_id bigint unsigned default 0, - failure_prediction_options varchar(64) character set latin1 default '', - check_interval double default '0', - retry_interval double default '0', - max_check_attempts smallint default 0, - first_notification_delay double default '0', - notification_interval double default '0', - notify_on_warning smallint default 0, - notify_on_unknown smallint default 0, - notify_on_critical smallint default 0, - notify_on_recovery smallint default 0, - notify_on_flapping smallint default 0, - notify_on_downtime smallint default 0, - stalk_on_ok smallint default 0, - stalk_on_warning smallint default 0, - stalk_on_unknown smallint default 0, - stalk_on_critical smallint default 0, - is_volatile smallint default 0, - flap_detection_enabled smallint default 0, - flap_detection_on_ok smallint default 0, - flap_detection_on_warning smallint default 0, - flap_detection_on_unknown smallint default 0, - flap_detection_on_critical smallint default 0, - low_flap_threshold double default '0', - high_flap_threshold double default '0', - process_performance_data smallint default 0, - freshness_checks_enabled smallint default 0, - freshness_threshold int default 0, - passive_checks_enabled smallint default 0, - event_handler_enabled smallint default 0, - active_checks_enabled smallint default 0, - retain_status_information smallint default 0, - retain_nonstatus_information smallint default 0, - notifications_enabled smallint default 0, - obsess_over_service smallint default 0, - failure_prediction_enabled smallint default 0, - notes TEXT character set latin1, - notes_url TEXT character set latin1, - action_url TEXT character set latin1, - icon_image TEXT character set latin1, - icon_image_alt TEXT character set latin1, - config_hash varchar(64) DEFAULT NULL, - PRIMARY KEY (service_id), - UNIQUE KEY instance_id (instance_id,config_type,service_object_id), - KEY service_object_id (service_object_id) -) ENGINE=InnoDB COMMENT='Service definitions'; - --- -------------------------------------------------------- - --- --- Table structure for table icinga_servicestatus --- - -CREATE TABLE IF NOT EXISTS icinga_servicestatus ( - servicestatus_id bigint(20) unsigned NOT NULL AUTO_INCREMENT, - instance_id bigint unsigned default 0, - service_object_id bigint unsigned default 0, - status_update_time timestamp NULL, - output TEXT character set latin1, - long_output TEXT, - perfdata TEXT character set latin1, - check_source varchar(255) character set latin1 default '', - current_state smallint default 0, - has_been_checked smallint default 0, - should_be_scheduled smallint default 0, - current_check_attempt smallint default 0, - max_check_attempts smallint default 0, - last_check timestamp NULL, - next_check timestamp NULL, - check_type smallint default 0, - last_state_change timestamp NULL, - last_hard_state_change timestamp NULL, - last_hard_state smallint default 0, - last_time_ok timestamp NULL, - last_time_warning timestamp NULL, - last_time_unknown timestamp NULL, - last_time_critical timestamp NULL, - state_type smallint default 0, - last_notification timestamp NULL, - next_notification timestamp NULL, - no_more_notifications smallint default 0, - notifications_enabled smallint default 0, - problem_has_been_acknowledged smallint default 0, - acknowledgement_type smallint default 0, - current_notification_number int unsigned default 0, - passive_checks_enabled smallint default 0, - active_checks_enabled smallint default 0, - event_handler_enabled smallint default 0, - flap_detection_enabled smallint default 0, - is_flapping smallint default 0, - percent_state_change double default '0', - latency double default '0', - execution_time double default '0', - scheduled_downtime_depth smallint default 0, - failure_prediction_enabled smallint default 0, - process_performance_data smallint default 0, - obsess_over_service smallint default 0, - modified_service_attributes int default 0, - original_attributes TEXT character set latin1 default NULL, - event_handler TEXT character set latin1, - check_command TEXT character set latin1, - normal_check_interval double default '0', - retry_check_interval double default '0', - check_timeperiod_object_id bigint unsigned default 0, - is_reachable smallint default 0, - PRIMARY KEY (servicestatus_id), - UNIQUE KEY object_id (service_object_id) -) ENGINE=InnoDB COMMENT='Current service status information'; - --- -------------------------------------------------------- - --- --- Table structure for table icinga_service_contactgroups --- - -CREATE TABLE IF NOT EXISTS icinga_service_contactgroups ( - service_contactgroup_id bigint(20) unsigned NOT NULL AUTO_INCREMENT, - instance_id bigint unsigned default 0, - service_id bigint unsigned default 0, - contactgroup_object_id bigint unsigned default 0, - PRIMARY KEY (service_contactgroup_id) -) ENGINE=InnoDB COMMENT='Service contact groups'; - --- -------------------------------------------------------- - --- --- Table structure for table icinga_service_contacts --- - -CREATE TABLE IF NOT EXISTS icinga_service_contacts ( - service_contact_id bigint(20) unsigned NOT NULL AUTO_INCREMENT, - instance_id bigint unsigned default 0, - service_id bigint unsigned default 0, - contact_object_id bigint unsigned default 0, - PRIMARY KEY (service_contact_id) -) ENGINE=InnoDB COMMENT='Service contacts'; - --- -------------------------------------------------------- - --- --- Table structure for table icinga_statehistory --- - -CREATE TABLE IF NOT EXISTS icinga_statehistory ( - statehistory_id bigint(20) unsigned NOT NULL AUTO_INCREMENT, - instance_id bigint unsigned default 0, - state_time timestamp NULL, - state_time_usec int default 0, - object_id bigint unsigned default 0, - state_change smallint default 0, - state smallint default 0, - state_type smallint default 0, - current_check_attempt smallint default 0, - max_check_attempts smallint default 0, - last_state smallint default 0, - last_hard_state smallint default 0, - output TEXT character set latin1, - long_output TEXT, - check_source varchar(255) character set latin1 default NULL, - PRIMARY KEY (statehistory_id) -) ENGINE=InnoDB COMMENT='Historical host and service state changes'; - --- -------------------------------------------------------- - --- --- Table structure for table icinga_systemcommands --- - -CREATE TABLE IF NOT EXISTS icinga_systemcommands ( - systemcommand_id bigint(20) unsigned NOT NULL AUTO_INCREMENT, - instance_id bigint unsigned default 0, - start_time timestamp NULL, - start_time_usec int default 0, - end_time timestamp NULL, - end_time_usec int default 0, - command_line TEXT character set latin1, - timeout smallint default 0, - early_timeout smallint default 0, - execution_time double default '0', - return_code smallint default 0, - output TEXT character set latin1, - long_output TEXT, - PRIMARY KEY (systemcommand_id), - UNIQUE KEY instance_id (instance_id,start_time,start_time_usec) -) ENGINE=InnoDB COMMENT='Historical system commands that are executed'; - --- -------------------------------------------------------- - --- --- Table structure for table icinga_timeperiods --- - -CREATE TABLE IF NOT EXISTS icinga_timeperiods ( - timeperiod_id bigint(20) unsigned NOT NULL AUTO_INCREMENT, - instance_id bigint unsigned default 0, - config_type smallint default 0, - timeperiod_object_id bigint unsigned default 0, - alias varchar(255) character set latin1 default '', - config_hash varchar(64) DEFAULT NULL, - PRIMARY KEY (timeperiod_id), - UNIQUE KEY instance_id (instance_id,config_type,timeperiod_object_id) -) ENGINE=InnoDB COMMENT='Timeperiod definitions'; - --- -------------------------------------------------------- - --- --- Table structure for table icinga_timeperiod_timeranges --- - -CREATE TABLE IF NOT EXISTS icinga_timeperiod_timeranges ( - timeperiod_timerange_id bigint(20) unsigned NOT NULL AUTO_INCREMENT, - instance_id bigint unsigned default 0, - timeperiod_id bigint unsigned default 0, - day smallint default 0, - start_sec int default 0, - end_sec int default 0, - PRIMARY KEY (timeperiod_timerange_id) -) ENGINE=InnoDB COMMENT='Timeperiod definitions'; - - --- -------------------------------------------------------- --- Icinga 2 specific schema extensions --- -------------------------------------------------------- - --- --- Table structure for table icinga_endpoints --- - -CREATE TABLE IF NOT EXISTS icinga_endpoints ( - endpoint_id bigint(20) unsigned NOT NULL AUTO_INCREMENT, - instance_id bigint unsigned default 0, - endpoint_object_id bigint(20) unsigned DEFAULT '0', - zone_object_id bigint(20) unsigned DEFAULT '0', - config_type smallint(6) DEFAULT '0', - identity varchar(255) DEFAULT NULL, - node varchar(255) DEFAULT NULL, - config_hash varchar(64) DEFAULT NULL, - PRIMARY KEY (endpoint_id) -) ENGINE=InnoDB COMMENT='Endpoint configuration'; - --- -------------------------------------------------------- - --- --- Table structure for table icinga_endpointstatus --- - -CREATE TABLE IF NOT EXISTS icinga_endpointstatus ( - endpointstatus_id bigint(20) unsigned NOT NULL AUTO_INCREMENT, - instance_id bigint unsigned default 0, - endpoint_object_id bigint(20) unsigned DEFAULT '0', - zone_object_id bigint(20) unsigned DEFAULT '0', - status_update_time timestamp NULL, - identity varchar(255) DEFAULT NULL, - node varchar(255) DEFAULT NULL, - is_connected smallint(6), - PRIMARY KEY (endpointstatus_id) -) ENGINE=InnoDB COMMENT='Endpoint status'; - --- --- Table structure for table icinga_zones --- - -CREATE TABLE IF NOT EXISTS icinga_zones ( - zone_id bigint(20) unsigned NOT NULL AUTO_INCREMENT, - instance_id bigint unsigned default 0, - zone_object_id bigint(20) unsigned DEFAULT '0', - config_type smallint(6) DEFAULT '0', - parent_zone_object_id bigint(20) unsigned DEFAULT '0', - is_global smallint(6), - config_hash varchar(64) DEFAULT NULL, - PRIMARY KEY (zone_id) -) ENGINE=InnoDB COMMENT='Zone configuration'; - --- -------------------------------------------------------- - --- --- Table structure for table icinga_zonestatus --- - -CREATE TABLE IF NOT EXISTS icinga_zonestatus ( - zonestatus_id bigint(20) unsigned NOT NULL AUTO_INCREMENT, - instance_id bigint unsigned default 0, - zone_object_id bigint(20) unsigned DEFAULT '0', - status_update_time timestamp NULL, - parent_zone_object_id bigint(20) unsigned DEFAULT '0', - PRIMARY KEY (zonestatus_id) -) ENGINE=InnoDB COMMENT='Zone status'; - - - - -ALTER TABLE icinga_servicestatus ADD COLUMN endpoint_object_id bigint default NULL; -ALTER TABLE icinga_hoststatus ADD COLUMN endpoint_object_id bigint default NULL; -ALTER TABLE icinga_contactstatus ADD COLUMN endpoint_object_id bigint default NULL; -ALTER TABLE icinga_programstatus ADD COLUMN endpoint_object_id bigint default NULL; -ALTER TABLE icinga_comments ADD COLUMN endpoint_object_id bigint default NULL; -ALTER TABLE icinga_scheduleddowntime ADD COLUMN endpoint_object_id bigint default NULL; -ALTER TABLE icinga_runtimevariables ADD COLUMN endpoint_object_id bigint default NULL; -ALTER TABLE icinga_customvariablestatus ADD COLUMN endpoint_object_id bigint default NULL; - -ALTER TABLE icinga_acknowledgements ADD COLUMN endpoint_object_id bigint default NULL; -ALTER TABLE icinga_commenthistory ADD COLUMN endpoint_object_id bigint default NULL; -ALTER TABLE icinga_contactnotifications ADD COLUMN endpoint_object_id bigint default NULL; -ALTER TABLE icinga_downtimehistory ADD COLUMN endpoint_object_id bigint default NULL; -ALTER TABLE icinga_eventhandlers ADD COLUMN endpoint_object_id bigint default NULL; -ALTER TABLE icinga_externalcommands ADD COLUMN endpoint_object_id bigint default NULL; -ALTER TABLE icinga_flappinghistory ADD COLUMN endpoint_object_id bigint default NULL; -ALTER TABLE icinga_hostchecks ADD COLUMN endpoint_object_id bigint default NULL; -ALTER TABLE icinga_logentries ADD COLUMN endpoint_object_id bigint default NULL; -ALTER TABLE icinga_notifications ADD COLUMN endpoint_object_id bigint default NULL; -ALTER TABLE icinga_processevents ADD COLUMN endpoint_object_id bigint default NULL; -ALTER TABLE icinga_servicechecks ADD COLUMN endpoint_object_id bigint default NULL; -ALTER TABLE icinga_statehistory ADD COLUMN endpoint_object_id bigint default NULL; -ALTER TABLE icinga_systemcommands ADD COLUMN endpoint_object_id bigint default NULL; - --- ----------------------------------------- --- add index (delete) --- ----------------------------------------- - --- for periodic delete --- instance_id and --- SYSTEMCOMMANDS, SERVICECHECKS, HOSTCHECKS, EVENTHANDLERS => start_time --- EXTERNALCOMMANDS => entry_time - --- instance_id -CREATE INDEX systemcommands_i_id_idx on icinga_systemcommands(instance_id); -CREATE INDEX servicechecks_i_id_idx on icinga_servicechecks(instance_id); -CREATE INDEX hostchecks_i_id_idx on icinga_hostchecks(instance_id); -CREATE INDEX eventhandlers_i_id_idx on icinga_eventhandlers(instance_id); -CREATE INDEX externalcommands_i_id_idx on icinga_externalcommands(instance_id); - --- time -CREATE INDEX systemcommands_time_id_idx on icinga_systemcommands(start_time); -CREATE INDEX servicechecks_time_id_idx on icinga_servicechecks(start_time); -CREATE INDEX hostchecks_time_id_idx on icinga_hostchecks(start_time); -CREATE INDEX eventhandlers_time_id_idx on icinga_eventhandlers(start_time); -CREATE INDEX externalcommands_time_id_idx on icinga_externalcommands(entry_time); - - --- for starting cleanup - referenced in dbhandler.c:882 --- instance_id only - --- realtime data -CREATE INDEX programstatus_i_id_idx on icinga_programstatus(instance_id); -CREATE INDEX hoststatus_i_id_idx on icinga_hoststatus(instance_id); -CREATE INDEX servicestatus_i_id_idx on icinga_servicestatus(instance_id); -CREATE INDEX contactstatus_i_id_idx on icinga_contactstatus(instance_id); -CREATE INDEX comments_i_id_idx on icinga_comments(instance_id); -CREATE INDEX scheduleddowntime_i_id_idx on icinga_scheduleddowntime(instance_id); -CREATE INDEX runtimevariables_i_id_idx on icinga_runtimevariables(instance_id); -CREATE INDEX customvariablestatus_i_id_idx on icinga_customvariablestatus(instance_id); - --- config data -CREATE INDEX configfiles_i_id_idx on icinga_configfiles(instance_id); -CREATE INDEX configfilevariables_i_id_idx on icinga_configfilevariables(instance_id); -CREATE INDEX customvariables_i_id_idx on icinga_customvariables(instance_id); -CREATE INDEX commands_i_id_idx on icinga_commands(instance_id); -CREATE INDEX timeperiods_i_id_idx on icinga_timeperiods(instance_id); -CREATE INDEX timeperiod_timeranges_i_id_idx on icinga_timeperiod_timeranges(instance_id); -CREATE INDEX contactgroups_i_id_idx on icinga_contactgroups(instance_id); -CREATE INDEX contactgroup_members_i_id_idx on icinga_contactgroup_members(instance_id); -CREATE INDEX hostgroups_i_id_idx on icinga_hostgroups(instance_id); -CREATE INDEX hostgroup_members_i_id_idx on icinga_hostgroup_members(instance_id); -CREATE INDEX servicegroups_i_id_idx on icinga_servicegroups(instance_id); -CREATE INDEX servicegroup_members_i_id_idx on icinga_servicegroup_members(instance_id); -CREATE INDEX hostesc_i_id_idx on icinga_hostescalations(instance_id); -CREATE INDEX hostesc_contacts_i_id_idx on icinga_hostescalation_contacts(instance_id); -CREATE INDEX serviceesc_i_id_idx on icinga_serviceescalations(instance_id); -CREATE INDEX serviceesc_contacts_i_id_idx on icinga_serviceescalation_contacts(instance_id); -CREATE INDEX hostdependencies_i_id_idx on icinga_hostdependencies(instance_id); -CREATE INDEX contacts_i_id_idx on icinga_contacts(instance_id); -CREATE INDEX contact_addresses_i_id_idx on icinga_contact_addresses(instance_id); -CREATE INDEX contact_notifcommands_i_id_idx on icinga_contact_notificationcommands(instance_id); -CREATE INDEX hosts_i_id_idx on icinga_hosts(instance_id); -CREATE INDEX host_parenthosts_i_id_idx on icinga_host_parenthosts(instance_id); -CREATE INDEX host_contacts_i_id_idx on icinga_host_contacts(instance_id); -CREATE INDEX services_i_id_idx on icinga_services(instance_id); -CREATE INDEX service_contacts_i_id_idx on icinga_service_contacts(instance_id); -CREATE INDEX service_contactgroups_i_id_idx on icinga_service_contactgroups(instance_id); -CREATE INDEX host_contactgroups_i_id_idx on icinga_host_contactgroups(instance_id); -CREATE INDEX hostesc_cgroups_i_id_idx on icinga_hostescalation_contactgroups(instance_id); -CREATE INDEX serviceesc_cgroups_i_id_idx on icinga_serviceescalation_contactgroups(instance_id); - --- ----------------------------------------- --- more index stuff (WHERE clauses) --- ----------------------------------------- - --- hosts -CREATE INDEX hosts_host_object_id_idx on icinga_hosts(host_object_id); - --- hoststatus -CREATE INDEX hoststatus_stat_upd_time_idx on icinga_hoststatus(status_update_time); -CREATE INDEX hoststatus_current_state_idx on icinga_hoststatus(current_state); -CREATE INDEX hoststatus_check_type_idx on icinga_hoststatus(check_type); -CREATE INDEX hoststatus_state_type_idx on icinga_hoststatus(state_type); -CREATE INDEX hoststatus_last_state_chg_idx on icinga_hoststatus(last_state_change); -CREATE INDEX hoststatus_notif_enabled_idx on icinga_hoststatus(notifications_enabled); -CREATE INDEX hoststatus_problem_ack_idx on icinga_hoststatus(problem_has_been_acknowledged); -CREATE INDEX hoststatus_act_chks_en_idx on icinga_hoststatus(active_checks_enabled); -CREATE INDEX hoststatus_pas_chks_en_idx on icinga_hoststatus(passive_checks_enabled); -CREATE INDEX hoststatus_event_hdl_en_idx on icinga_hoststatus(event_handler_enabled); -CREATE INDEX hoststatus_flap_det_en_idx on icinga_hoststatus(flap_detection_enabled); -CREATE INDEX hoststatus_is_flapping_idx on icinga_hoststatus(is_flapping); -CREATE INDEX hoststatus_p_state_chg_idx on icinga_hoststatus(percent_state_change); -CREATE INDEX hoststatus_latency_idx on icinga_hoststatus(latency); -CREATE INDEX hoststatus_ex_time_idx on icinga_hoststatus(execution_time); -CREATE INDEX hoststatus_sch_downt_d_idx on icinga_hoststatus(scheduled_downtime_depth); - --- services -CREATE INDEX services_host_object_id_idx on icinga_services(host_object_id); - --- servicestatus -CREATE INDEX srvcstatus_stat_upd_time_idx on icinga_servicestatus(status_update_time); -CREATE INDEX srvcstatus_current_state_idx on icinga_servicestatus(current_state); -CREATE INDEX srvcstatus_check_type_idx on icinga_servicestatus(check_type); -CREATE INDEX srvcstatus_state_type_idx on icinga_servicestatus(state_type); -CREATE INDEX srvcstatus_last_state_chg_idx on icinga_servicestatus(last_state_change); -CREATE INDEX srvcstatus_notif_enabled_idx on icinga_servicestatus(notifications_enabled); -CREATE INDEX srvcstatus_problem_ack_idx on icinga_servicestatus(problem_has_been_acknowledged); -CREATE INDEX srvcstatus_act_chks_en_idx on icinga_servicestatus(active_checks_enabled); -CREATE INDEX srvcstatus_pas_chks_en_idx on icinga_servicestatus(passive_checks_enabled); -CREATE INDEX srvcstatus_event_hdl_en_idx on icinga_servicestatus(event_handler_enabled); -CREATE INDEX srvcstatus_flap_det_en_idx on icinga_servicestatus(flap_detection_enabled); -CREATE INDEX srvcstatus_is_flapping_idx on icinga_servicestatus(is_flapping); -CREATE INDEX srvcstatus_p_state_chg_idx on icinga_servicestatus(percent_state_change); -CREATE INDEX srvcstatus_latency_idx on icinga_servicestatus(latency); -CREATE INDEX srvcstatus_ex_time_idx on icinga_servicestatus(execution_time); -CREATE INDEX srvcstatus_sch_downt_d_idx on icinga_servicestatus(scheduled_downtime_depth); - --- hostchecks -CREATE INDEX hostchks_h_obj_id_idx on icinga_hostchecks(host_object_id); - --- servicechecks -CREATE INDEX servicechks_s_obj_id_idx on icinga_servicechecks(service_object_id); - --- objects -CREATE INDEX objects_objtype_id_idx ON icinga_objects(objecttype_id); -CREATE INDEX objects_name1_idx ON icinga_objects(name1); -CREATE INDEX objects_name2_idx ON icinga_objects(name2); -CREATE INDEX objects_inst_id_idx ON icinga_objects(instance_id); - --- instances --- CREATE INDEX instances_name_idx on icinga_instances(instance_name); - --- logentries --- CREATE INDEX loge_instance_id_idx on icinga_logentries(instance_id); --- #236 -CREATE INDEX loge_time_idx on icinga_logentries(logentry_time); --- CREATE INDEX loge_data_idx on icinga_logentries(logentry_data); -CREATE INDEX loge_inst_id_time_idx on icinga_logentries (instance_id ASC, logentry_time DESC); - --- commenthistory --- CREATE INDEX c_hist_instance_id_idx on icinga_logentries(instance_id); --- CREATE INDEX c_hist_c_time_idx on icinga_logentries(comment_time); --- CREATE INDEX c_hist_i_c_id_idx on icinga_logentries(internal_comment_id); - --- downtimehistory --- CREATE INDEX d_t_hist_nstance_id_idx on icinga_downtimehistory(instance_id); --- CREATE INDEX d_t_hist_type_idx on icinga_downtimehistory(downtime_type); --- CREATE INDEX d_t_hist_object_id_idx on icinga_downtimehistory(object_id); --- CREATE INDEX d_t_hist_entry_time_idx on icinga_downtimehistory(entry_time); --- CREATE INDEX d_t_hist_sched_start_idx on icinga_downtimehistory(scheduled_start_time); --- CREATE INDEX d_t_hist_sched_end_idx on icinga_downtimehistory(scheduled_end_time); - --- scheduleddowntime --- CREATE INDEX sched_d_t_downtime_type_idx on icinga_scheduleddowntime(downtime_type); --- CREATE INDEX sched_d_t_object_id_idx on icinga_scheduleddowntime(object_id); --- CREATE INDEX sched_d_t_entry_time_idx on icinga_scheduleddowntime(entry_time); --- CREATE INDEX sched_d_t_start_time_idx on icinga_scheduleddowntime(scheduled_start_time); --- CREATE INDEX sched_d_t_end_time_idx on icinga_scheduleddowntime(scheduled_end_time); - --- statehistory -CREATE INDEX statehist_i_id_o_id_s_ty_s_ti on icinga_statehistory(instance_id, object_id, state_type, state_time); --- #2274 -create index statehist_state_idx on icinga_statehistory(object_id,state); - - --- Icinga Web Notifications -CREATE INDEX notification_idx ON icinga_notifications(notification_type, object_id, start_time); -CREATE INDEX notification_object_id_idx ON icinga_notifications(object_id); -CREATE INDEX contact_notification_idx ON icinga_contactnotifications(notification_id, contact_object_id); -CREATE INDEX contacts_object_id_idx ON icinga_contacts(contact_object_id); -CREATE INDEX contact_notif_meth_notif_idx ON icinga_contactnotificationmethods(contactnotification_id, command_object_id); -CREATE INDEX command_object_idx ON icinga_commands(object_id); -CREATE INDEX services_combined_object_idx ON icinga_services(service_object_id, host_object_id); - - --- #2618 -CREATE INDEX cntgrpmbrs_cgid_coid ON icinga_contactgroup_members (contactgroup_id,contact_object_id); -CREATE INDEX hstgrpmbrs_hgid_hoid ON icinga_hostgroup_members (hostgroup_id,host_object_id); -CREATE INDEX hstcntgrps_hid_cgoid ON icinga_host_contactgroups (host_id,contactgroup_object_id); -CREATE INDEX hstprnthsts_hid_phoid ON icinga_host_parenthosts (host_id,parent_host_object_id); -CREATE INDEX runtimevars_iid_varn ON icinga_runtimevariables (instance_id,varname); -CREATE INDEX sgmbrs_sgid_soid ON icinga_servicegroup_members (servicegroup_id,service_object_id); -CREATE INDEX scgrps_sid_cgoid ON icinga_service_contactgroups (service_id,contactgroup_object_id); -CREATE INDEX tperiod_tid_d_ss_es ON icinga_timeperiod_timeranges (timeperiod_id,day,start_sec,end_sec); - --- #3649 -CREATE INDEX sla_idx_sthist ON icinga_statehistory (object_id, state_time DESC); -CREATE INDEX sla_idx_dohist ON icinga_downtimehistory (object_id, actual_start_time, actual_end_time); -CREATE INDEX sla_idx_obj ON icinga_objects (objecttype_id, is_active, name1); - --- #4985 -CREATE INDEX commenthistory_delete_idx ON icinga_commenthistory (instance_id, comment_time, internal_comment_id); - --- #10070 -CREATE INDEX idx_comments_object_id on icinga_comments(object_id); -CREATE INDEX idx_scheduleddowntime_object_id on icinga_scheduleddowntime(object_id); - --- #10066 -CREATE INDEX idx_endpoints_object_id on icinga_endpoints(endpoint_object_id); -CREATE INDEX idx_endpointstatus_object_id on icinga_endpointstatus(endpoint_object_id); - -CREATE INDEX idx_endpoints_zone_object_id on icinga_endpoints(zone_object_id); -CREATE INDEX idx_endpointstatus_zone_object_id on icinga_endpointstatus(zone_object_id); - -CREATE INDEX idx_zones_object_id on icinga_zones(zone_object_id); -CREATE INDEX idx_zonestatus_object_id on icinga_zonestatus(zone_object_id); - -CREATE INDEX idx_zones_parent_object_id on icinga_zones(parent_zone_object_id); -CREATE INDEX idx_zonestatus_parent_object_id on icinga_zonestatus(parent_zone_object_id); - --- #12210 -CREATE INDEX idx_comments_session_del ON icinga_comments (instance_id, session_token); -CREATE INDEX idx_downtimes_session_del ON icinga_scheduleddowntime (instance_id, session_token); - --- #12107 -CREATE INDEX idx_statehistory_cleanup on icinga_statehistory(instance_id, state_time); - --- #12435 -CREATE INDEX idx_customvariables_object_id on icinga_customvariables(object_id); -CREATE INDEX idx_contactgroup_members_object_id on icinga_contactgroup_members(contact_object_id); -CREATE INDEX idx_hostgroup_members_object_id on icinga_hostgroup_members(host_object_id); -CREATE INDEX idx_servicegroup_members_object_id on icinga_servicegroup_members(service_object_id); -CREATE INDEX idx_servicedependencies_dependent_service_object_id on icinga_servicedependencies(dependent_service_object_id); -CREATE INDEX idx_hostdependencies_dependent_host_object_id on icinga_hostdependencies(dependent_host_object_id); -CREATE INDEX idx_service_contacts_service_id on icinga_service_contacts(service_id); -CREATE INDEX idx_host_contacts_host_id on icinga_host_contacts(host_id); - --- ----------------------------------------- --- set dbversion --- ----------------------------------------- -INSERT INTO icinga_dbversion (name, version, create_time, modify_time) VALUES ('idoutils', '1.14.2', NOW(), NOW()) -ON DUPLICATE KEY UPDATE version='1.14.2', modify_time=NOW(); - - diff --git a/test/docker/docker-entrypoint-initdb.d/icingaweb2.sql b/test/docker/docker-entrypoint-initdb.d/icingaweb2.sql deleted file mode 100644 index 8bd8f3f..0000000 --- a/test/docker/docker-entrypoint-initdb.d/icingaweb2.sql +++ /dev/null @@ -1,138 +0,0 @@ --- MySQL dump 10.16 Distrib 10.1.26-MariaDB, for debian-linux-gnu (x86_64) --- --- Host: 127.0.0.1 Database: icingaweb2 --- ------------------------------------------------------ --- Server version 10.1.18-MariaDB-1~jessie - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!40101 SET NAMES utf8mb4 */; -/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; -/*!40103 SET TIME_ZONE='+00:00' */; -/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; -/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; - --- --- Table structure for table `icingaweb_group` --- - -DROP TABLE IF EXISTS `icingaweb_group`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; -CREATE TABLE `icingaweb_group` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `name` varchar(64) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL, - `parent` int(10) unsigned DEFAULT NULL, - `ctime` timestamp NULL DEFAULT NULL, - `mtime` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP, - PRIMARY KEY (`id`), - UNIQUE KEY `idx_name` (`name`), - KEY `fk_icingaweb_group_parent_id` (`parent`), - CONSTRAINT `fk_icingaweb_group_parent_id` FOREIGN KEY (`parent`) REFERENCES `icingaweb_group` (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Dumping data for table `icingaweb_group` --- - -LOCK TABLES `icingaweb_group` WRITE; -/*!40000 ALTER TABLE `icingaweb_group` DISABLE KEYS */; -INSERT INTO `icingaweb_group` VALUES (1,'Administratoren',NULL,'2017-10-10 10:28:43',NULL); -/*!40000 ALTER TABLE `icingaweb_group` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `icingaweb_group_membership` --- - -DROP TABLE IF EXISTS `icingaweb_group_membership`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; -CREATE TABLE `icingaweb_group_membership` ( - `group_id` int(10) unsigned NOT NULL, - `username` varchar(254) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL, - `ctime` timestamp NULL DEFAULT NULL, - `mtime` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP, - PRIMARY KEY (`group_id`,`username`), - CONSTRAINT `fk_icingaweb_group_membership_icingaweb_group` FOREIGN KEY (`group_id`) REFERENCES `icingaweb_group` (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Dumping data for table `icingaweb_group_membership` --- - -LOCK TABLES `icingaweb_group_membership` WRITE; -/*!40000 ALTER TABLE `icingaweb_group_membership` DISABLE KEYS */; -INSERT INTO `icingaweb_group_membership` VALUES (1,'icingaadmin','2017-10-10 10:28:43',NULL); -/*!40000 ALTER TABLE `icingaweb_group_membership` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `icingaweb_user` --- - -DROP TABLE IF EXISTS `icingaweb_user`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; -CREATE TABLE `icingaweb_user` ( - `name` varchar(254) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL, - `active` tinyint(1) NOT NULL, - `password_hash` varbinary(255) NOT NULL, - `ctime` timestamp NULL DEFAULT NULL, - `mtime` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP, - PRIMARY KEY (`name`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Dumping data for table `icingaweb_user` --- - -LOCK TABLES `icingaweb_user` WRITE; -/*!40000 ALTER TABLE `icingaweb_user` DISABLE KEYS */; -INSERT INTO `icingaweb_user` VALUES ('icingaadmin',1,'$1$Žk}sÔ$Wtk67yqRK61IkZMpritMv.','2017-10-10 10:28:43',NULL); -/*!40000 ALTER TABLE `icingaweb_user` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `icingaweb_user_preference` --- - -DROP TABLE IF EXISTS `icingaweb_user_preference`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; -CREATE TABLE `icingaweb_user_preference` ( - `username` varchar(254) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL, - `section` varchar(64) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL, - `name` varchar(64) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL, - `value` varchar(255) NOT NULL, - `ctime` timestamp NULL DEFAULT NULL, - `mtime` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP, - PRIMARY KEY (`username`,`section`,`name`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Dumping data for table `icingaweb_user_preference` --- - -LOCK TABLES `icingaweb_user_preference` WRITE; -/*!40000 ALTER TABLE `icingaweb_user_preference` DISABLE KEYS */; -/*!40000 ALTER TABLE `icingaweb_user_preference` ENABLE KEYS */; -UNLOCK TABLES; -/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; - -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; -/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; - --- Dump completed on 2017-10-10 10:29:24 diff --git a/test/fixtures/sqlite-legacy.sql b/test/fixtures/sqlite-legacy.sql deleted file mode 100644 index 7f19439..0000000 --- a/test/fixtures/sqlite-legacy.sql +++ /dev/null @@ -1,44 +0,0 @@ --- sqlite3 -bail /tmp/toplevelview.db Date: Fri, 12 Jul 2024 13:20:54 +0200 Subject: [PATCH 9/9] Change menu entry priority to not be inbetween Problems and Overview --- configuration.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configuration.php b/configuration.php index cd6dc92..4b41a29 100644 --- a/configuration.php +++ b/configuration.php @@ -14,7 +14,7 @@ ->setLabel('Top Level View') ->setUrl('toplevelview') ->setIcon('sitemap') - ->setPriority(20); + ->setPriority(50); try { if (extension_loaded('yaml')) {