From dc4f347ae11e93dd11efa9d688270aa76e62fb30 Mon Sep 17 00:00:00 2001
From: ubhatnagar <utkarsh.cmu@gmail.com>
Date: Tue, 27 Oct 2015 13:40:50 -0700
Subject: [PATCH] Added relative checkbox

---
 public/app/panels/graph/graph.tooltip.js | 2 +-
 public/app/panels/graph/styleEditor.html | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/public/app/panels/graph/graph.tooltip.js b/public/app/panels/graph/graph.tooltip.js
index 8a747b61e0c..7f3df2cbafa 100644
--- a/public/app/panels/graph/graph.tooltip.js
+++ b/public/app/panels/graph/graph.tooltip.js
@@ -117,7 +117,7 @@ function ($) {
         var seriesHoverInfo = self.getMultiSeriesPlotHoverInfo(plotData, pos);
 
         seriesHtml = '';
-        timestamp = dashboard.formatDate(seriesHoverInfo.time);
+        timestamp = dashboard.formatDate(seriesHoverInfo.time,scope.panel.tooltip.relativeTimestamp);
 
         for (i = 0; i < seriesHoverInfo.length; i++) {
           hoverInfo = seriesHoverInfo[i];
diff --git a/public/app/panels/graph/styleEditor.html b/public/app/panels/graph/styleEditor.html
index 5d5f2fd7401..312f29b85ab 100644
--- a/public/app/panels/graph/styleEditor.html
+++ b/public/app/panels/graph/styleEditor.html
@@ -52,6 +52,10 @@
 			text="All series" model="panel.tooltip.shared" change="render()"
 			tip="Show all series on same tooltip and a x croshair to help follow all series">
 		</editor-opt-bool>
+    <editor-opt-bool
+      text="Relative timestamp" model="panel.tooltip.relativeTimestamp" change="render()"
+      tip="Shows elapsed time in relatively from the current timestamp. For example, 45 mins ago, 1 day 2 hours ago, etc.">
+    </editor-opt-bool>
 		<div class="editor-option" ng-show="panel.stack">
       <label class="small">Stacked Values <tip>How should the values in stacked charts to be calculated?</tip></label>
       <select class="input-small" ng-model="panel.tooltip.value_type" ng-options="f for f in ['cumulative','individual']" ng-change="render()"></select>