Merge pull request #75 from NETWAYS/remove-legacy

Remove dashboard logic for Monitoring module

Author: martialblog

application/controllers/DashboardController.php

@@ -2,19 +2,14 @@
 
 namespace Icinga\Module\Grafana\Controllers;
 
-use Icinga\Module\Grafana\ProvidedHook\Icingadb\IcingadbSupport;
-
-use Icinga\Application\Modules\Module;
-use Icinga\Module\Monitoring\Controller;
-use Icinga\Module\Monitoring\Object\Host;
-use Icinga\Module\Monitoring\Object\Service;
+use Icinga\Module\Grafana\Web\Controller\IcingadbGrafanaController;
 
 use ipl\Web\Url;
 
 /**
  * DashboardController for showing graphs for Monitoring Module dashboards
  */
-class DashboardController extends Controller
+class DashboardController extends IcingadbGrafanaController
 {
     public function init()
     {
@@ -24,32 +19,8 @@ public function init()
 
     public function indexAction()
     {
-        // Redirect to IcingaDB if it is enabled
-        if (Module::exists('icingadb') && IcingadbSupport::useIcingaDbAsBackend()) {
-            $this->redirectNow(Url::fromPath('grafana/icingadbdashboard')->setQueryString($this->params));
-        }
-
-        $this->getTabs()->add('graphs', [
-            'active' => true,
-            'label' => $this->translate('Graphs'),
-            'url' => $this->getRequest()->getUrl()
-        ]);
-
-        $hostname = $this->params->getRequired('host');
-        $servicename = $this->params->get('service');
-
-        if ($servicename != null) {
-            $object = new Service($this->backend, $hostname, $servicename);
-        } else {
-            $object = new Host($this->backend, $this->params->getRequired('host'));
-        }
-
-        $this->applyRestriction('monitoring/filter/objects', $object);
-        if ($object->fetch() === false) {
-            $this->httpNotFound($this->translate('Host or Service not found'));
-        }
-
-        $graph = new Grapher();
-        $this->view->graph = $graph->getPreviewHtml($object);
+        // This is an old controller that was used in the Monitoring module.
+        // So we redirect to IcingaDB, just to that older dashboards don't break.
+        $this->redirectNow(Url::fromPath('grafana/icingadbdashboard')->setQueryString($this->params));
     }
 }

application/controllers/IcingadbdashboardController.php

@@ -6,10 +6,6 @@
 use Icinga\Module\Grafana\ProvidedHook\Icingadb\ServiceDetailExtension;
 use Icinga\Module\Grafana\Web\Controller\IcingadbGrafanaController;
 
-use Icinga\Module\Icingadb\Model\Host;
-
-use ipl\Web\Url;
-
 /**
  * IcingadbdashboardController for showing graphs for IcingaDB Module dashboards
  */
@@ -23,10 +19,6 @@ public function init()
 
     public function indexAction()
     {
-        if (! $this->useIcingadbAsBackend) {
-            $this->redirectNow(Url::fromPath('grafana/dashboard')->setQueryString($this->params));
-        }
-
         $this->getTabs()->add(
             'graphs',
             [