Add external link to Grafana in iFrame mode

NETWAYS · Dec 4, 2024 · 2a753dd · 2a753dd
1 parent 463199c
commit 2a753dd
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 6 deletions.
diff --git a/library/Grafana/ProvidedHook/Icingadb/IcingaDbGrapher.php b/library/Grafana/ProvidedHook/Icingadb/IcingaDbGrapher.php
@@ -23,12 +23,17 @@
 use ipl\Stdlib\Filter;
 use ipl\Web\Url;
 use ipl\Web\Widget\Link;
+use ipl\Web\Widget\Icon;
 
 trait IcingaDbGrapher
 {
     use Database;
     use IcingaDbAuth;
 
+    // Could be constants in the future, but for now we want to keep compatibility
+    protected $GRAFANA_URL = "%s://%s/d/%s/%s?var-hostname=%s&var-service=%s&var-command=%s%s&from=%s&to=%s&orgId=%s&viewPanel=%s";
+    protected $GRAFANA_URL_SOLO = "%s://%s/d-solo/%s/%s?var-hostname=%s&var-service=%s&var-command=%s%s&panelId=%s&orgId=%s&theme=%s&from=%s&to=%s";
+
     protected $config;
     protected $graphConfig;
     protected $auth;
@@ -310,8 +315,7 @@ private function getMyPreviewHtml($serviceName, $hostName, HtmlDocument $preview
             $previewHtml->add($imgHtml);
         } elseif ($this->accessMode === "iframe") {
             $iFramesrc = sprintf(
-                "%s://%s/d-solo/%s/%s?" .
-                "var-hostname=%s&var-service=%s&var-command=%s%s&panelId=%s&orgId=%s&theme=%s&from=%s&to=%s",
+                $this->GRAFANA_URL_SOLO,
                 $this->protocol,
                 $this->grafanaHost,
                 $this->dashboarduid,
@@ -338,6 +342,15 @@ private function getMyPreviewHtml($serviceName, $hostName, HtmlDocument $preview
             );
 
             $previewHtml->add($iframeHtml);
+            // Add a link to Grafana in the title
+            $this->title->add(new Link(
+                new Icon(
+                    'arrow-up-right-from-square',
+                    ['title' => 'View in Grafana']
+                ),
+                str_replace('/d-solo/', '/d/', $iFramesrc),
+                ['target' => '_blank', 'class' => 'external-link']
+            ));
         }
         return true;
     }
@@ -467,11 +480,8 @@ public function getPreviewHtml(Model $object, $report = false)
                 || ! $this->permission->hasPermission('grafana/enablelink')) {
                 $html->addHtml($previewHtml);
             } else {
-                $urlFormat = "%s://%s/d/%s/%s" .
-                "?var-hostname=%s&var-service=%s&var-command=%s%s&from=%s&to=%s&orgId=%s&viewPanel=%s";
-
                 $url = sprintf(
-                    $urlFormat,
+                    $this->GRAFANA_URL,
                     $this->publicProtocol,
                     $this->publicHost,
                     $this->dashboarduid,

diff --git a/public/css/module.less b/public/css/module.less
@@ -52,6 +52,12 @@
   padding: 0;
 }
 
+/* Icon to external pages like Grafana */
+.external-link {
+  margin: 0 0.33em;
+  font-size: 0.77em;
+}
+
 /* NAVIGATION */
 .grafana-menu-navigation {
   list-style: none;