Merge pull request #54 from Icinga/feature/icingadb

Refactor for IcingaDB
Icinga · Jul 12, 2024 · 56d7144 · 56d7144
2 parents 16f245d + bb4e3c3
commit 56d7144
Show file tree

Hide file tree

Showing 78 changed files with 457 additions and 4,770 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,14 +2,14 @@
 .*.sw[op]
 *~
 /.idea/
-
-# Except those related to git
+\#*
+.\#*
+*TODO*
 !.git*
 
-# Docker
-/docker-compose.yml
-
 # Artifacts from vendor parts in testing
+.phplint.cache/
+/docker-compose.yml
 /*.phar
 /Icinga
 /Zend

diff --git 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).
@@ -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/application/clicommands/ConvertCommand.php b/application/clicommands/ConvertCommand.php
diff --git a/application/clicommands/LegacyCommand.php b/application/clicommands/LegacyCommand.php
diff --git 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
@@ -6,47 +6,33 @@
 use Icinga\Module\Toplevelview\ViewConfig;
 use Icinga\Module\Toplevelview\Web\Controller;
 use Icinga\Web\Url;
-use Icinga\Web\Widget\Tab;
 
 class ShowController extends Controller
 {
     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('Go Fullscreen'),
-            'icon'  => 'dashboard',
-            'url'   => ((string) $tiles) . '&view=compact&showFullscreen'
-        ));
-        $fullscreen->setTargetBlank();
-        $tabs->addAsDropdown('fullscreen', $fullscreen);
-
         $action = $this->getRequest()->getActionName();
         if ($tab = $tabs->get($action)) {
             $tab->setActive();
@@ -58,7 +44,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 +58,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/locale/de_DE/LC_MESSAGES/toplevelview.mo b/application/locale/de_DE/LC_MESSAGES/toplevelview.mo
diff --git 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 <markus.opolka@netways.de>\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"

diff --git 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
 {
@@ -18,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 = '';