fixes #309

Mikesch-mp · Apr 6, 2023 · 32d26b8 · 32d26b8
1 parent 0d70d6b
commit 32d26b8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/library/Grafana/Helpers/.Timeranges.php.swp b/library/Grafana/Helpers/.Timeranges.php.swp
diff --git a/library/Grafana/Helpers/Timeranges.php b/library/Grafana/Helpers/Timeranges.php
@@ -93,10 +93,7 @@ protected function isValidTimeStamp($timestamp)
 
     private function buildTimerangeMenu($timerange = "", $timerangeto = "")
     {
-        $url = 'grafana/dashboard?';
-        if (Module::exists('icingadb') && IcingadbSupport::useIcingaDbAsBackend()) {
-            $url = 'grafana/icingadbdashboard?';
-        }
+        $url = 'grafana/icingadbdashboard?';
 
         $clockIcon = $this->view->qlink($timerange, 'dashboard/new-dashlet',
             ['url' => $url . http_build_query($this->urlparams, '', '&', PHP_QUERY_RFC3986)],

diff --git a/library/Grafana/ProvidedHook/Icingadb/IcingaDbGrapher.php b/library/Grafana/ProvidedHook/Icingadb/IcingaDbGrapher.php
@@ -352,11 +352,17 @@ public function getPreviewHtml(Model $object, $report = false)
             $serviceName = $object->checkcommand_name;
             $hostName = $object->name;
             $link = Links::host($object);
-            $parameters = ['host' => $hostName];
+            $parameters = array(
+                            'host' => $hostName,
+            );
         } elseif ($object instanceof Service) {
             $serviceName = $object->name;
             $hostName = $object->host->name;
             $link = Links::service($object, $object->host);
+            $parameters = array(
+                            'host' => $hostName,
+                            'service' => $serviceName,
+            );
         }
 
         $parameters['timerange'] = $this->timerange;