Fix for missing dashboarduid in iframe mode. fixes #266

Mikesch-mp · Apr 30, 2021 · 2cae443 · 2cae443
1 parent 17188dc
commit 2cae443
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/library/Grafana/ProvidedHook/Grapher.php b/library/Grafana/ProvidedHook/Grapher.php
@@ -178,12 +178,7 @@ private function getGraphConf($serviceName, $serviceCommand = null)
         }
 
         $this->dashboard = $this->getGraphConfigOption($serviceName, 'dashboard', $this->defaultDashboard);
-        if ($this->grafanaVersion == "1") {
-            $this->dashboarduid = $this->getGraphConfigOption($serviceName, 'dashboarduid', $this->defaultdashboarduid);
-        } else {
-            $this->dashboardstore = $this->getGraphConfigOption($serviceName, 'dashboardstore',
-                $this->defaultDashboardStore);
-        }
+        $this->dashboarduid = $this->getGraphConfigOption($serviceName, 'dashboarduid', $this->defaultdashboarduid);
         $this->panelId = $this->getGraphConfigOption($serviceName, 'panelId', $this->defaultDashboardPanelId);
         $this->orgId = $this->getGraphConfigOption($serviceName, 'orgId', $this->defaultOrgId);
         $this->customVars = $this->getGraphConfigOption($serviceName, 'customVars', '');

diff --git a/module.info b/module.info
@@ -1,5 +1,5 @@
 Name: Grafana
-Version: 1.4.0
+Version: 1.4.1
 Depends: monitoring
 Description: Grafana - A perfdata visualisation module
  Shows Grafana graphs for captured metrics.