added flag to disable paneltitle

Griesbacher · Nov 23, 2016 · 9264a9f · 9264a9f
1 parent 8746546
commit 9264a9f
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 1 deletion.
diff --git a/histou.ini.example b/histou.ini.example
@@ -7,6 +7,8 @@ specialChar = "&"
 ; set the backend: influxdb, elasticsearch
 databaseType = "influxdb"
 forecastDatasourceName = "nagflux_forecast"
+; disable the Panel Titel globally
+disablePanelTitel = false
 
 [folder]
 defaultTemplateFolder = "templates/default/"

diff --git a/histou.js b/histou.js
@@ -13,7 +13,7 @@ return function (callback) {
     }
 
     var url = 'http://localhost/histou/';
-    var configUrl = url+'index.php?host='+host+'&service='+service+'&height='+height+'&legend='+legend+debug+'&annotations='+annotations;
+    var configUrl = url+'index.php?host='+host+'&service='+service+'&height='+height+'&legend='+legend+debug+disablePanelTitel+'&annotations='+annotations;
 
     var flotAddons = url + 'flotAddons.js';
     $.getScript(flotAddons, function (){});
@@ -149,6 +149,13 @@ function parseArgs()
     } else {
         annotations = false;
     }
+
+    if(_.isUndefined(ARGS.disablePanelTitel)) {
+        disablePanelTitel = '';
+    }else{
+        disablePanelTitel = "&disablePanelTitel";
+    }
+
 }
 
 function clearUi()

diff --git a/histou/basic.php b/histou/basic.php
@@ -30,6 +30,7 @@ class Basic
         1 => array("pipe", "w"),    // STDOUT
         2 => array("pipe", "w")     // STERR
     );
+    public static $disablePanelTitel = false;
 
     /**
     Parses the GET parameter.
@@ -94,6 +95,10 @@ public static function parsArgs()
             }
         }
 
+        if (isset($_GET['disablePanelTitel'])) {
+            static::$disablePanelTitel = true;
+        }
+
         if (isset($_GET['debug'])) {
             \histou\Debug::enable();
         }
@@ -175,6 +180,10 @@ public static function parsIni($filename)
         if (!empty($phpCommand)) {
             static::$phpCommand = $phpCommand;
         }
+        $disablePanelTitel = Basic::getConfigKey($config, 'general', 'disablePanelTitel');
+        if (!empty($disablePanelTitel)) {
+            static::$disablePanelTitel = $disablePanelTitel;
+        }
         Basic::setConstant(
             "TMP_FOLDER",
             Basic::getConfigKey($config, 'general', 'tmpFolder'),
@@ -195,6 +204,7 @@ public static function parsIni($filename)
             strtolower(Basic::getConfigKey($config, 'general', 'forecastDatasourceName')),
             "nagflux_forecast"
         );
+
         Basic::setConstant(
             "URL",
             Basic::getConfigKey($config, DATABASE_TYPE, 'url'),

diff --git a/histou/grafana/panel.php b/histou/grafana/panel.php
@@ -52,6 +52,9 @@ public function __construct($title, $type, $id = -1)
     **/
     public function toArray()
     {
+        if (\histou\Basic::$disablePanelTitel) {
+            $this->data['title'] = "";
+        }
         return $this->data;
     }
 

diff --git a/tests/histou/basicTest.php b/tests/histou/basicTest.php
@@ -50,9 +50,11 @@ public function testTestConfig()
     {
         $file_contents = file_get_contents('histou.ini.example');
         $file_contents = str_replace('phpCommand = "php"', 'phpCommand = "foo"', $file_contents);
+        $file_contents = str_replace('disablePanelTitel = false', 'disablePanelTitel = true', $file_contents);
         file_put_contents('histou.ini.example.tmp', $file_contents);
         \histou\Basic::parsIni('histou.ini.example.tmp');
         unlink('histou.ini.example.tmp');
+        $this->assertTrue((boolean)\histou\Basic::$disablePanelTitel);
         $this->assertSame(\histou\Basic::$phpCommand, "foo");
         ob_start();
         $this->assertSame(1, \histou\Basic::testConfig());

diff --git a/tests/histou/grafana/panelTest.php b/tests/histou/grafana/panelTest.php
@@ -14,6 +14,8 @@ public function testCreatePanel()
     {
         $panel1 = new \histou\grafana\graphpanel\GraphPanelInfluxdb('p1', 'test');
         $this->assertSame('p1', $panel1->toArray()['title']);
+        \histou\Basic::$disablePanelTitel = true;
+        $this->assertSame('', $panel1->toArray()['title']);
         $panel1->setSpan(20);
         $this->assertSame(20, $panel1->toArray()['span']);
         $panel1->setEditable(false);