From 284a6ee62965711fc5c00fdd3ce5ef4c233c79e2 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Thu, 18 Aug 2016 15:34:32 +0300
Subject: [PATCH] Graph panel: rename X axis modes, issue #5812.

---
 public/app/plugins/panel/graph/graph.js      |  6 +++---
 public/app/plugins/panel/graph/module.ts     | 12 ++++++------
 public/app/plugins/panel/graph/tab_axes.html |  6 +++---
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/public/app/plugins/panel/graph/graph.js b/public/app/plugins/panel/graph/graph.js
index 75b3bc2b5e1..25774f799f2 100755
--- a/public/app/plugins/panel/graph/graph.js
+++ b/public/app/plugins/panel/graph/graph.js
@@ -230,9 +230,9 @@ function (angular, $, moment, _, kbn, GraphTooltip) {
             var series = data[i];
             series.data = series.getFlotPairs(series.nullPointMode || panel.nullPointMode);
 
-            if (panel.xaxis.mode === 'histogram') {
+            if (panel.xaxis.mode === 'series') {
               series.data = [
-                [i + 1, series.stats[panel.xaxis.histogramValue]]
+                [i + 1, series.stats[panel.xaxis.seriesValue]]
               ];
             }
 
@@ -243,7 +243,7 @@ function (angular, $, moment, _, kbn, GraphTooltip) {
             }
           }
 
-          if (panel.xaxis.mode === 'histogram') {
+          if (panel.xaxis.mode === 'series') {
             if (data.length) {
               options.series.bars.barWidth = 0.7;
               options.series.bars.align = 'center';
diff --git a/public/app/plugins/panel/graph/module.ts b/public/app/plugins/panel/graph/module.ts
index 9a10c45a9f8..22ec7235cde 100644
--- a/public/app/plugins/panel/graph/module.ts
+++ b/public/app/plugins/panel/graph/module.ts
@@ -21,7 +21,7 @@ class GraphCtrl extends MetricsPanelCtrl {
   logScales: any;
   unitFormats: any;
   xAxisModes: any;
-  xAxisHistogramValues: any;
+  xAxisSeriesValues: any;
   annotationsPromise: any;
   datapointsCount: number;
   datapointsOutside: boolean;
@@ -53,8 +53,8 @@ class GraphCtrl extends MetricsPanelCtrl {
     ],
     xaxis: {
       show: true,
-      mode: 'timeseries',
-      histogramValue: 'avg'
+      mode: 'time',
+      seriesValue: 'avg'
     },
     grid          : {
       threshold1: null,
@@ -145,11 +145,11 @@ class GraphCtrl extends MetricsPanelCtrl {
     this.unitFormats = kbn.getUnitFormats();
 
     this.xAxisModes = {
-      'Time Series': 'timeseries',
-      'Histogram': 'histogram'
+      'Time': 'time',
+      'Series': 'series'
     };
 
-    this.xAxisHistogramValues = ['min', 'max', 'avg', 'current', 'total'];
+    this.xAxisSeriesValues = ['min', 'max', 'avg', 'current', 'total'];
   }
 
   onInitPanelActions(actions) {
diff --git a/public/app/plugins/panel/graph/tab_axes.html b/public/app/plugins/panel/graph/tab_axes.html
index b4d7aedf0a7..5c868115596 100644
--- a/public/app/plugins/panel/graph/tab_axes.html
+++ b/public/app/plugins/panel/graph/tab_axes.html
@@ -51,12 +51,12 @@
 				</select>
 			</div>
 		</div>
-		<div class="gf-form" ng-if="ctrl.panel.xaxis.mode==='histogram'">
+		<div class="gf-form" ng-if="ctrl.panel.xaxis.mode==='series'">
 			<label class="gf-form-label width-5">Value</label>
 			<div class="gf-form-select-wrapper max-width-15">
 				<select class="gf-form-input"
-					ng-model="ctrl.panel.xaxis.histogramValue"
-					ng-options="v for v in ctrl.xAxisHistogramValues"
+					ng-model="ctrl.panel.xaxis.seriesValue"
+					ng-options="v for v in ctrl.xAxisSeriesValues"
 					ng-change="ctrl.render()">
 				</select>
 			</div>