add logic to derive from via URL params to GraphiteGraph

mrtazz · Jun 21, 2016 · f7b7ce4 · f7b7ce4
1 parent 6d13feb
commit f7b7ce4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/phplib/GraphiteGraph.php b/phplib/GraphiteGraph.php
@@ -6,6 +6,7 @@ class GraphiteGraph
 {
 
     private $stacked = false;
+    protected $defaultTime = "4h";
 
     public function __construct(
         $graphitehost,
@@ -14,7 +15,10 @@ public function __construct(
         $hideLegend = null,
         $width = null
     ) {
-        $this->from = $from ?: "-4h";
+        $this->from = filter_input(INPUT_GET, 'from');
+        if (!isset($this->from)) {
+            $this->from = "-" . $this->defaultTime;
+        }
         $this->width = $width ?: "400";
         $this->graphitehost = $graphitehost;
         $this->baseurl = $graphitehost . "/render?width={$this->width}&from={$this->from}&target={{THETARGET}}";

diff --git a/tests/Page_tests.php b/tests/Page_tests.php
@@ -234,7 +234,7 @@ public function testGetHeaderWithoutSelectBox() {
     }
 
     public function testBuildPageForMetrics() {
-        $expct = '<div class="row"><div class="col-md-4"><img src="http://grpht.exmpl.com/render?width=400&from=-4hours&target=foo&hideLegend=true"></img></div><div class="col-md-4"><img src="http://grpht.exmpl.com/render?width=400&from=-4hours&target=bla&hideLegend=true"></img></div></div>';
+        $expct = '<div class="row"><div class="col-md-4"><img src="http://grpht.exmpl.com/render?width=400&from=-4h&target=foo&hideLegend=true"></img></div><div class="col-md-4"><img src="http://grpht.exmpl.com/render?width=400&from=-4h&target=bla&hideLegend=true"></img></div></div>';
         $ret = $this->page->buildPageForMetrics(["foo", "bla"]);
         $this->assertEquals($expct, $ret);
     }