From 9e7c55728fdb8c46b1c710a19cd84e611839a0d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Sat, 6 Sep 2014 18:05:54 +0200
Subject: [PATCH 01/59] small cleanup of unused code

---
 src/app/controllers/dashboardCtrl.js               | 10 +---------
 src/app/partials/paneladd.html                     |  6 ------
 src/app/services/dashboard/dashboardKeyBindings.js |  2 +-
 3 files changed, 2 insertions(+), 16 deletions(-)
 delete mode 100644 src/app/partials/paneladd.html

diff --git a/src/app/controllers/dashboardCtrl.js b/src/app/controllers/dashboardCtrl.js
index 8ccbb170d8a..b9893b2dcda 100644
--- a/src/app/controllers/dashboardCtrl.js
+++ b/src/app/controllers/dashboardCtrl.js
@@ -44,7 +44,7 @@ function (angular, $, config, _) {
     $scope.setupDashboard = function(event, dashboardData) {
       $rootScope.performance.dashboardLoadStart = new Date().getTime();
       $rootScope.performance.panelsInitialized = 0;
-      $rootScope.performance.panelsRendered= 0;
+      $rootScope.performance.panelsRendered = 0;
 
       $scope.dashboard = dashboardSrv.create(dashboardData);
       $scope.dashboardViewState = dashboardViewStateSrv.create($scope);
@@ -93,14 +93,6 @@ function (angular, $, config, _) {
       };
     };
 
-    $scope.panel_path =function(type) {
-      if(type) {
-        return 'app/panels/'+type.replace(".","/");
-      } else {
-        return false;
-      }
-    };
-
     $scope.edit_path = function(type) {
       var p = $scope.panel_path(type);
       if(p) {
diff --git a/src/app/partials/paneladd.html b/src/app/partials/paneladd.html
deleted file mode 100644
index f902bbce561..00000000000
--- a/src/app/partials/paneladd.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<div ng-include="'app/partials/panelgeneral.html'"></div>
-<div ng-if="!panelMeta.fullEditorTabs" ng-include="edit_path(panel.type)"></div>
-<div ng-repeat="tab in panelMeta.editorTabs">
-  <h5>{{tab.title}}</h5>
-  <div ng-include="tab.src"></div>
-</div>
\ No newline at end of file
diff --git a/src/app/services/dashboard/dashboardKeyBindings.js b/src/app/services/dashboard/dashboardKeyBindings.js
index 27bbe8ee027..ba8dcaf0f23 100644
--- a/src/app/services/dashboard/dashboardKeyBindings.js
+++ b/src/app/services/dashboard/dashboardKeyBindings.js
@@ -18,8 +18,8 @@ function(angular, $) {
         keyboardManager.unbind('ctrl+s');
         keyboardManager.unbind('ctrl+r');
         keyboardManager.unbind('ctrl+z');
+        keyboardManager.unbind('esc');
       });
-      keyboardManager.unbind('esc');
 
       keyboardManager.bind('ctrl+f', function() {
         scope.emitAppEvent('show-dash-editor', { src: 'app/partials/search.html' });

From bbc5dae1d2308edb487f82ed755cd1ada2cee895 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Sun, 7 Sep 2014 11:55:26 +0200
Subject: [PATCH 02/59] Working on better handling of variables and url init
 and state

---
 src/test/specs/helpers.js                 |  2 ++
 src/test/specs/templateValuesSrv-specs.js | 16 +++++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/test/specs/helpers.js b/src/test/specs/helpers.js
index 35cde542de6..81f0df7be7e 100644
--- a/src/test/specs/helpers.js
+++ b/src/test/specs/helpers.js
@@ -51,6 +51,7 @@ define([
     self.templateSrv = new TemplateSrvStub();
     self.timeSrv = new TimeSrvStub();
     self.datasourceSrv = {};
+    self.$routeParams = {};
 
     this.providePhase = function(mocks) {
      return module(function($provide) {
@@ -103,6 +104,7 @@ define([
     this.replace = function(text) {
       return _.template(text, this.data,  this.templateSettings);
     };
+    this.init = function() {};
     this.updateTemplateData = function() { };
     this.variableExists = function() { return false; };
     this.highlightVariablesAsHtml = function(str) { return str; };
diff --git a/src/test/specs/templateValuesSrv-specs.js b/src/test/specs/templateValuesSrv-specs.js
index eb1b0225618..c0674a5cd75 100644
--- a/src/test/specs/templateValuesSrv-specs.js
+++ b/src/test/specs/templateValuesSrv-specs.js
@@ -10,7 +10,7 @@ define([
     var ctx = new helpers.ServiceTestContext();
 
     beforeEach(module('grafana.services'));
-    beforeEach(ctx.providePhase(['datasourceSrv', 'timeSrv', 'templateSrv']));
+    beforeEach(ctx.providePhase(['datasourceSrv', 'timeSrv', 'templateSrv', "$routeParams"]));
     beforeEach(ctx.createService('templateValuesSrv'));
 
     describe('update interval variable options', function() {
@@ -27,6 +27,20 @@ define([
       });
     });
 
+    describe.only('should init values', function() {
+      var variables = [
+        { name: 'test', current: { value: 'hej' }}
+      ];
+      var dashboard = { templating: { list: variables } };
+
+      beforeEach(function() {
+        ctx.service.init(dashboard);
+      });
+
+      it('should update options array', function() {
+      });
+    });
+
     function describeUpdateVariable(desc, fn) {
       describe(desc, function() {
         var scenario = {};

From e0c9ddbfba44b23277c2badf6ec637d706803fd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Mon, 8 Sep 2014 11:03:14 +0200
Subject: [PATCH 03/59] Worked on variable initilization and sync to from url,
 #772

---
 CHANGELOG.md                                  |  2 +
 src/app/controllers/dashboardCtrl.js          |  2 +-
 src/app/directives/graphiteSegment.js         |  2 +-
 .../dashboard/dashboardViewStateSrv.js        | 55 +++++++++++--------
 src/app/services/templateSrv.js               | 15 ++---
 src/app/services/templateValuesSrv.js         | 24 +++++---
 src/css/less/overrides.less                   |  5 ++
 src/test/specs/dashboardViewStateSrv-specs.js |  2 +
 src/test/specs/templateSrv-specs.js           | 18 ++++++
 src/test/specs/templateValuesSrv-specs.js     | 30 +---------
 10 files changed, 84 insertions(+), 71 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1fb7ec258ea..16b11573fd7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,8 @@
 - [Issue #262](https://github.com/grafana/grafana/issues/262). Templating: Ability to use template variables for function parameters via custom variable type, can be used as parameter for movingAverage or scaleToSeconds for example
 - [Issue #312](https://github.com/grafana/grafana/issues/312). Templating: Can now use template variables in panel titles
 - [Issue #613](https://github.com/grafana/grafana/issues/613). Templating: Full support for InfluxDB, filter by part of series names, extract series substrings, nested queries, multipe where clauses!
+- Template variables can be initialized from url, with var-my_varname=value, breaking change, before it was just my_varname.
+- Templating and url state sync has some issues that are not solved for this release, see [Issue #772](https://github.com/grafana/grafana/issues/772) for more details.
 
 **InfluxDB Breaking changes**
 - To better support templating, fill(0) and group by time low limit some changes has been made to the editor and query model schema
diff --git a/src/app/controllers/dashboardCtrl.js b/src/app/controllers/dashboardCtrl.js
index b9893b2dcda..f4d057e77e5 100644
--- a/src/app/controllers/dashboardCtrl.js
+++ b/src/app/controllers/dashboardCtrl.js
@@ -51,7 +51,7 @@ function (angular, $, config, _) {
 
       // init services
       timeSrv.init($scope.dashboard);
-      templateValuesSrv.init($scope.dashboard);
+      templateValuesSrv.init($scope.dashboard, $scope.dashboardViewState);
       panelMoveSrv.init($scope.dashboard, $scope);
 
       $scope.checkFeatureToggles();
diff --git a/src/app/directives/graphiteSegment.js b/src/app/directives/graphiteSegment.js
index 032ea99c39a..f0116bc8847 100644
--- a/src/app/directives/graphiteSegment.js
+++ b/src/app/directives/graphiteSegment.js
@@ -94,7 +94,7 @@ function (angular, app, _, $) {
           };
 
           $input.attr('data-provide', 'typeahead');
-          $input.typeahead({ source: $scope.source, minLength: 0, items: 100, updater: $scope.updater });
+          $input.typeahead({ source: $scope.source, minLength: 0, items: 10000, updater: $scope.updater });
 
           var typeahead = $input.data('typeahead');
           typeahead.lookup = function () {
diff --git a/src/app/services/dashboard/dashboardViewStateSrv.js b/src/app/services/dashboard/dashboardViewStateSrv.js
index 64d217f3dec..2f85da5d27a 100644
--- a/src/app/services/dashboard/dashboardViewStateSrv.js
+++ b/src/app/services/dashboard/dashboardViewStateSrv.js
@@ -14,9 +14,12 @@ function (angular, _, $) {
     // like fullscreen panel & edit
     function DashboardViewState($scope) {
       var self = this;
+      self.state = {};
+      self.panelScopes = [];
+      self.$scope = $scope;
 
       $scope.exitFullscreen = function() {
-        if (self.fullscreen) {
+        if (self.state.fullscreen) {
           self.update({ fullscreen: false });
         }
       };
@@ -28,42 +31,48 @@ function (angular, _, $) {
         }
       });
 
-      this.panelScopes = [];
-      this.$scope = $scope;
-
       this.update(this.getQueryStringState(), true);
     }
 
     DashboardViewState.prototype.needsSync = function(urlState) {
-      if (urlState.fullscreen !== this.fullscreen) { return true; }
-      if (urlState.edit !== this.edit) { return true; }
-      if (urlState.panelId !== this.panelId) { return true; }
-      return false;
+      return _.isEqual(this.state, urlState) === false;
     };
 
     DashboardViewState.prototype.getQueryStringState = function() {
       var queryParams = $location.search();
-      return {
+      var urlState = {
         panelId: parseInt(queryParams.panelId) || null,
         fullscreen: queryParams.fullscreen ? true : false,
-        edit: queryParams.edit ? true : false
+        edit: queryParams.edit ? true : false,
       };
+
+      _.each(queryParams, function(value, key) {
+        if (key.indexOf('var-') !== 0) { return; }
+        urlState[key] = value;
+      });
+
+      return urlState;
+    };
+
+    DashboardViewState.prototype.serializeToUrl = function() {
+      var urlState = _.clone(this.state);
+      urlState.fullscreen = this.state.fullscreen ? true : null,
+      urlState.edit = this.state.edit ? true : null;
+
+      return urlState;
     };
 
     DashboardViewState.prototype.update = function(state, skipUrlSync) {
-      _.extend(this, state);
+      _.extend(this.state, state);
+      this.fullscreen = this.state.fullscreen;
 
-      if (!this.fullscreen) {
-        this.panelId = null;
-        this.edit = false;
+      if (!this.state.fullscreen) {
+        this.state.panelId = null;
+        this.state.edit = false;
       }
 
       if (!skipUrlSync) {
-        $location.search({
-          fullscreen: this.fullscreen ? true : null,
-          panelId: this.panelId,
-          edit: this.edit ? true : null
-        });
+        $location.search(this.serializeToUrl());
       }
 
       this.syncState();
@@ -76,7 +85,7 @@ function (angular, _, $) {
         if (this.fullscreenPanel) {
           this.leaveFullscreen(false);
         }
-        var panelScope = this.getPanelScope(this.panelId);
+        var panelScope = this.getPanelScope(this.state.panelId);
         this.enterFullscreen(panelScope);
         return;
       }
@@ -118,8 +127,8 @@ function (angular, _, $) {
       var fullscreenHeight = Math.floor(docHeight * 0.7);
       this.oldTimeRange = panelScope.range;
 
-      panelScope.height = this.edit ? editHeight : fullscreenHeight;
-      panelScope.editMode = this.edit;
+      panelScope.height = this.state.edit ? editHeight : fullscreenHeight;
+      panelScope.editMode = this.state.edit;
       this.fullscreenPanel = panelScope;
 
       $(window).scrollTop(0);
@@ -135,7 +144,7 @@ function (angular, _, $) {
       var self = this;
       self.panelScopes.push(panelScope);
 
-      if (self.panelId === panelScope.panel.id) {
+      if (self.state.panelId === panelScope.panel.id) {
         self.enterFullscreen(panelScope);
       }
 
diff --git a/src/app/services/templateSrv.js b/src/app/services/templateSrv.js
index f8247d1c5cb..d63a9df34d4 100644
--- a/src/app/services/templateSrv.js
+++ b/src/app/services/templateSrv.js
@@ -7,7 +7,7 @@ function (angular, _) {
 
   var module = angular.module('grafana.services');
 
-  module.service('templateSrv', function($q, $routeParams) {
+  module.service('templateSrv', function() {
     var self = this;
 
     this._regex = /\$(\w+)|\[\[([\s\S]+?)\]\]/g;
@@ -19,17 +19,10 @@ function (angular, _) {
       this.updateTemplateData(true);
     };
 
-    this.updateTemplateData = function(initial) {
+    this.updateTemplateData = function() {
       var data = {};
 
       _.each(this.variables, function(variable) {
-        if (initial) {
-          var urlValue = $routeParams[ variable.name ];
-          if (urlValue) {
-            variable.current = { text: urlValue, value: urlValue };
-          }
-        }
-
         if (!variable.current || !variable.current.value) {
           return;
         }
@@ -50,6 +43,10 @@ function (angular, _) {
       return match && (self._templateData[match[1] || match[2]] !== void 0);
     };
 
+    this.containsVariable = function(str, variableName) {
+      return str.indexOf('$' + variableName) !== -1 || str.indexOf('[[' + variableName + ']]') !== -1;
+    };
+
     this.highlightVariablesAsHtml = function(str) {
       if (!str || !_.isString(str)) { return str; }
 
diff --git a/src/app/services/templateValuesSrv.js b/src/app/services/templateValuesSrv.js
index 511d5bfb495..cf2d766edc4 100644
--- a/src/app/services/templateValuesSrv.js
+++ b/src/app/services/templateValuesSrv.js
@@ -18,17 +18,24 @@ function (angular, _, kbn) {
       }
     });
 
-    this.init = function(dashboard) {
+    this.init = function(dashboard, viewstate) {
       this.variables = dashboard.templating.list;
+      this.viewstate = viewstate;
       templateSrv.init(this.variables);
 
       for (var i = 0; i < this.variables.length; i++) {
-        var param = this.variables[i];
-        if (param.refresh) {
-          this.updateOptions(param);
+        var variable = this.variables[i];
+        var urlValue = viewstate.state['var-' + variable.name];
+        if (urlValue !== void 0) {
+          var option = _.findWhere(variable.options, { text: urlValue });
+          option = option || { text: urlValue, value: urlValue };
+          this.setVariableValue(variable, option, true);
         }
-        else if (param.type === 'interval') {
-          this.updateAutoInterval(param);
+        else if (variable.refresh) {
+          this.updateOptions(variable);
+        }
+        else if (variable.type === 'interval') {
+          this.updateAutoInterval(variable);
         }
       }
     };
@@ -63,7 +70,7 @@ function (angular, _, kbn) {
         if (otherVariable === updatedVariable) {
           return;
         }
-        if (otherVariable.query.indexOf('[[' + updatedVariable.name + ']]') !== -1) {
+        if (templateSrv.containsVariable(otherVariable.query, updatedVariable.name)) {
           return self.updateOptions(otherVariable);
         }
       });
@@ -92,7 +99,6 @@ function (angular, _, kbn) {
       var datasource = datasourceSrv.get(variable.datasource);
       return datasource.metricFindQuery(variable.query)
         .then(function (results) {
-
           variable.options = self.metricNamesToVariableValues(variable, results);
 
           if (variable.includeAll) {
@@ -102,7 +108,7 @@ function (angular, _, kbn) {
           // if parameter has current value
           // if it exists in options array keep value
           if (variable.current) {
-            var currentExists = _.findWhere(variable.options, { value: variable.current.value });
+            var currentExists = _.findWhere(variable.options, { text: variable.current.text });
             if (currentExists) {
               return self.setVariableValue(variable, variable.current, true);
             }
diff --git a/src/css/less/overrides.less b/src/css/less/overrides.less
index 4415c85d3c0..58e72ef43fa 100644
--- a/src/css/less/overrides.less
+++ b/src/css/less/overrides.less
@@ -516,6 +516,11 @@ div.flot-text {
   }
 }
 
+// typeahead max height
+.typeahead {
+  max-height: 300px;
+  overflow-y: auto;
+}
 
 // Labels & Badges
 .label-tag {
diff --git a/src/test/specs/dashboardViewStateSrv-specs.js b/src/test/specs/dashboardViewStateSrv-specs.js
index 92e444d55d0..82ccfe51363 100644
--- a/src/test/specs/dashboardViewStateSrv-specs.js
+++ b/src/test/specs/dashboardViewStateSrv-specs.js
@@ -20,6 +20,7 @@ define([
         viewState.update(updateState);
         expect(location.search()).to.eql(updateState);
         expect(viewState.fullscreen).to.be(true);
+        expect(viewState.state.fullscreen).to.be(true);
       });
     });
 
@@ -29,6 +30,7 @@ define([
         viewState.update({fullscreen: false});
         expect(location.search()).to.eql({});
         expect(viewState.fullscreen).to.be(false);
+        expect(viewState.state.fullscreen).to.be(false);
       });
     });
 
diff --git a/src/test/specs/templateSrv-specs.js b/src/test/specs/templateSrv-specs.js
index ac711dce66a..938d8bfe0a1 100644
--- a/src/test/specs/templateSrv-specs.js
+++ b/src/test/specs/templateSrv-specs.js
@@ -62,6 +62,24 @@ define([
 
     });
 
+    describe('when checking if a string contains a variable', function() {
+      beforeEach(function() {
+        _templateSrv.init([{ name: 'test', current: { value: 'muuuu' } }]);
+        _templateSrv.updateTemplateData();
+      });
+
+      it('should find it with $var syntax', function() {
+        var contains = _templateSrv.containsVariable('this.$test.filters', 'test');
+        expect(contains).to.be(true);
+      });
+
+      it('should find it with [[var]] syntax', function() {
+        var contains = _templateSrv.containsVariable('this.[[test]].filters', 'test');
+        expect(contains).to.be(true);
+      });
+
+    });
+
     describe('updateTemplateData with simple value', function() {
       beforeEach(function() {
         _templateSrv.init([{ name: 'test', current: { value: 'muuuu' } }]);
diff --git a/src/test/specs/templateValuesSrv-specs.js b/src/test/specs/templateValuesSrv-specs.js
index c0674a5cd75..bc0de36e959 100644
--- a/src/test/specs/templateValuesSrv-specs.js
+++ b/src/test/specs/templateValuesSrv-specs.js
@@ -27,20 +27,6 @@ define([
       });
     });
 
-    describe.only('should init values', function() {
-      var variables = [
-        { name: 'test', current: { value: 'hej' }}
-      ];
-      var dashboard = { templating: { list: variables } };
-
-      beforeEach(function() {
-        ctx.service.init(dashboard);
-      });
-
-      it('should update options array', function() {
-      });
-    });
-
     function describeUpdateVariable(desc, fn) {
       describe(desc, function() {
         var scenario = {};
@@ -139,12 +125,12 @@ define([
     describeUpdateVariable('and existing value still exists in options', function(scenario) {
       scenario.setup(function() {
         scenario.variable = { type: 'query', query: 'apps.*', name: 'test' };
-        scenario.variable.current = { value: 'backend2'};
+        scenario.variable.current = { text: 'backend2'};
         scenario.queryResult = [{text: 'backend1'}, {text: 'backend2'}];
       });
 
       it('should keep variable value', function() {
-        expect(scenario.variable.current.value).to.be('backend2');
+        expect(scenario.variable.current.text).to.be('backend2');
       });
     });
 
@@ -196,18 +182,6 @@ define([
       });
     });
 
-    describeUpdateVariable('and existing value still exists in options', function(scenario) {
-      scenario.setup(function() {
-        scenario.variable = { type: 'query', query: 'apps.*', name: 'test' };
-        scenario.variable.current = { value: 'backend2'};
-        scenario.queryResult = [{text: 'backend1'}, {text: 'backend2'}];
-      });
-
-      it('should keep variable value', function() {
-        expect(scenario.variable.current.value).to.be('backend2');
-      });
-    });
-
     describeUpdateVariable('with include All glob syntax', function(scenario) {
       scenario.setup(function() {
         scenario.variable = { type: 'query', query: 'apps.*', name: 'test', includeAll: true, allFormat: 'glob' };

From a9d96ccc8cef20b07c84f1ed4a0160f5b2ba1aee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Mon, 8 Sep 2014 18:03:10 +0200
Subject: [PATCH 04/59] Fixed ids for panels in default.json welcome to grafana
 dashboard

---
 src/app/dashboards/default.json | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/app/dashboards/default.json b/src/app/dashboards/default.json
index 015ede1d7dc..4fcdf570d53 100644
--- a/src/app/dashboards/default.json
+++ b/src/app/dashboards/default.json
@@ -11,7 +11,7 @@
       "collapse": false,
       "panels": [
         {
-          "error": false,
+          "id": 1,
           "span": 12,
           "editable": true,
           "type": "text",
@@ -28,20 +28,17 @@
       "collapse": false,
       "panels": [
         {
-          "error": false,
+          "id": 2,
           "span": 6,
-          "editable": true,
           "type": "text",
-          "loadingEditor": false,
           "mode": "html",
           "content": "<br/>\n\n<div class=\"row-fluid\">\n  <div class=\"span6\">\n    <ul>\n      <li>\n        <a href=\"http://grafana.org/docs#configuration\" target=\"_blank\">Configuration</a>\n      </li>\n      <li>\n        <a href=\"http://grafana.org/docs/troubleshooting\" target=\"_blank\">Troubleshooting</a>\n      </li>\n      <li>\n        <a href=\"http://grafana.org/docs/support\" target=\"_blank\">Support</a>\n      </li>\n      <li>\n        <a href=\"http://grafana.org/docs/features/intro\" target=\"_blank\">Getting started</a>  (Must read!)\n      </li>\n    </ul>\n  </div>\n  <div class=\"span6\">\n    <ul>\n      <li>\n        <a href=\"http://grafana.org/docs/features/graphing\" target=\"_blank\">Graphing</a>\n      </li>\n      <li>\n        <a href=\"http://grafana.org/docs/features/annotations\" target=\"_blank\">Annotations</a>\n      </li>\n      <li>\n        <a href=\"http://grafana.org/docs/features/graphite\" target=\"_blank\">Graphite</a>\n      </li>\n      <li>\n        <a href=\"http://grafana.org/docs/features/influxdb\" target=\"_blank\">InfluxDB</a>\n      </li>\n      <li>\n        <a href=\"http://grafana.org/docs/features/opentsdb\" target=\"_blank\">OpenTSDB</a>\n      </li>\n    </ul>\n  </div>\n</div>",
           "style": {},
           "title": "Documentation Links"
         },
         {
-          "error": false,
+          "id": 3,
           "span": 6,
-          "editable": true,
           "type": "text",
           "mode": "html",
           "content": "<br/>\n\n<div class=\"row-fluid\">\n  <div class=\"span12\">\n    <ul>\n      <li>Ctrl+S saves the current dashboard</li>\n      <li>Ctrl+F Opens the dashboard finder</li>\n      <li>Ctrl+H Hide/show row controls</li>\n      <li>Click and drag graph title to move panel</li>\n      <li>Hit Escape to exit graph when in fullscreen or edit mode</li>\n      <li>Click the colored icon in the legend to change series color</li>\n      <li>Ctrl or Shift + Click legend name to hide other series</li>\n    </ul>\n  </div>\n</div>\n",
@@ -56,8 +53,8 @@
       "collapse": false,
       "panels": [
         {
+          "id": 4,
           "span": 12,
-          "editable": true,
           "type": "graph",
           "x-axis": true,
           "y-axis": true,

From 4798aa4789d673363bb6a9af53bddca10827e8d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Tue, 9 Sep 2014 08:24:04 +0200
Subject: [PATCH 05/59] Fixes to requirejs build task to include all modules,
 Fixes #779

---
 tasks/options/requirejs.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tasks/options/requirejs.js b/tasks/options/requirejs.js
index b3bc4f97909..c1a718c3397 100644
--- a/tasks/options/requirejs.js
+++ b/tasks/options/requirejs.js
@@ -1,4 +1,6 @@
 module.exports = function(config,grunt) {
+  'use strict';
+
   var _c = {
     build: {
       options: {
@@ -59,12 +61,15 @@ module.exports = function(config,grunt) {
         'directives/all',
         'jquery.flot.pie',
         'angular-dragdrop',
+        'controllers/all',
+        'routes/all',
+        'components/partials',
       ]
     }
   ];
 
   var fs = require('fs');
-  var panelPath = config.srcDir+'/app/panels'
+  var panelPath = config.srcDir+'/app/panels';
 
   // create a module for each directory in src/app/panels/
   fs.readdirSync(panelPath).forEach(function (panelName) {

From 0f88b470e8e2f35e18d23384d2f37840458828d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Tue, 9 Sep 2014 08:50:01 +0200
Subject: [PATCH 06/59] Fix for elasticsearch annotations when timestamp is a
 field and not in source, Fixes #777

---
 src/app/partials/annotations_editor.html        |  3 +++
 src/app/services/elasticsearch/es-datasource.js | 15 +++++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/app/partials/annotations_editor.html b/src/app/partials/annotations_editor.html
index cb9db2244d6..c72194b6f6a 100644
--- a/src/app/partials/annotations_editor.html
+++ b/src/app/partials/annotations_editor.html
@@ -16,6 +16,9 @@
 	<div class="dashboard-editor-body">
 		<div class="editor-row row" ng-if="editor.index == 0">
 			<div class="span6">
+				<div ng-if="variables.length === 0">
+					<em>No annotations defined</em>
+				</div>
 				<table class="grafana-options-table">
 					<tr ng-repeat="annotation in annotations">
 						<td style="width:90%">
diff --git a/src/app/services/elasticsearch/es-datasource.js b/src/app/services/elasticsearch/es-datasource.js
index 34db3b50d8a..721ba00881b 100644
--- a/src/app/services/elasticsearch/es-datasource.js
+++ b/src/app/services/elasticsearch/es-datasource.js
@@ -76,7 +76,11 @@ function (angular, _, $, config, kbn, moment) {
       var queryInterpolated = templateSrv.replace(queryString);
       var filter = { "bool": { "must": [{ "range": range }] } };
       var query = { "bool": { "should": [{ "query_string": { "query": queryInterpolated } }] } };
-      var data = { "query" : { "filtered": { "query" : query, "filter": filter } }, "size": 100 };
+      var data = {
+        "fields": [timeField, "_source"],
+        "query" : { "filtered": { "query" : query, "filter": filter } },
+        "size": 100
+      };
 
       return this._request('POST', '/_search', annotation.index, data).then(function(results) {
         var list = [];
@@ -84,9 +88,16 @@ function (angular, _, $, config, kbn, moment) {
 
         for (var i = 0; i < hits.length; i++) {
           var source = hits[i]._source;
+          var fields = hits[i].fields;
+          var time = source[timeField];
+
+          if (_.isString(fields[timeField]) || _.isNumber(fields[timeField])) {
+            time = fields[timeField];
+          }
+
           var event = {
             annotation: annotation,
-            time: moment.utc(source[timeField]).valueOf(),
+            time: moment.utc(time).valueOf(),
             title: source[titleField],
           };
 

From 71a307270aea56158d64c2182ff738a85cb70067 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Tue, 9 Sep 2014 09:16:00 +0200
Subject: [PATCH 07/59] Fixed text color in json text area for white theme,
 #735

---
 src/app/partials/edit_json.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/partials/edit_json.html b/src/app/partials/edit_json.html
index c4fa5fd950f..a43e1d56bcd 100644
--- a/src/app/partials/edit_json.html
+++ b/src/app/partials/edit_json.html
@@ -8,7 +8,7 @@
 	</div>
 
 	<div class="dashboard-editor-body" style="height: 500px">
-		<textarea ng-model="json" rows="20" spellcheck="false" style="width: 90%; color: white"></textarea>
+		<textarea ng-model="json" rows="20" spellcheck="false" style="width: 90%;"></textarea>
 	</div>
 
 	<div class="dashboard-editor-footer">

From d6e844c67c4ac7887a88c7a4847f9595da612bfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Tue, 9 Sep 2014 10:29:59 +0200
Subject: [PATCH 08/59] Fixes for opentsdb, (broken during 1.8 development)

---
 src/app/partials/opentsdb/editor.html           | 2 +-
 src/app/services/opentsdb/opentsdbDatasource.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/partials/opentsdb/editor.html b/src/app/partials/opentsdb/editor.html
index efc54af8e05..b74b1d7a269 100644
--- a/src/app/partials/opentsdb/editor.html
+++ b/src/app/partials/opentsdb/editor.html
@@ -30,7 +30,7 @@
           </li>
         </ul>
 
-        <ul class="grafana-target-segment-list">
+        <ul class="grafana-segment-list">
           <li>
             <a  class="grafana-target-segment"
                 ng-click="target.hide = !target.hide; get_data();"
diff --git a/src/app/services/opentsdb/opentsdbDatasource.js b/src/app/services/opentsdb/opentsdbDatasource.js
index 68eb55acc7f..f6a36c6f035 100644
--- a/src/app/services/opentsdb/opentsdbDatasource.js
+++ b/src/app/services/opentsdb/opentsdbDatasource.js
@@ -19,7 +19,7 @@ function (angular, _, kbn) {
     }
 
     // Called once per panel (graph)
-    OpenTSDBDatasource.prototype.query = function(filterSrv, options) {
+    OpenTSDBDatasource.prototype.query = function(options) {
       var start = convertToTSDBTime(options.range.from);
       var end = convertToTSDBTime(options.range.to);
       var queries = _.compact(_.map(options.targets, convertTargetToQuery));

From 4b170ca9a35bd0b11fe2a8d2fb82881535cb34b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Tue, 9 Sep 2014 11:14:57 +0200
Subject: [PATCH 09/59] Corrected error handling for influxdb datasource when
 loading/deleting dashboard

---
 src/app/services/influxdb/influxdbDatasource.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/services/influxdb/influxdbDatasource.js b/src/app/services/influxdb/influxdbDatasource.js
index f316340fd91..d79834b5508 100644
--- a/src/app/services/influxdb/influxdbDatasource.js
+++ b/src/app/services/influxdb/influxdbDatasource.js
@@ -253,7 +253,7 @@ function (angular, _, kbn, InfluxSeries, InfluxQueryBuilder) {
 
         return angular.fromJson(dashJson);
       }, function(err) {
-        return "Could not load dashboard, " + err.data;
+        throw  "Could not load dashboard, " + err.data;
       });
     };
 
@@ -264,7 +264,7 @@ function (angular, _, kbn, InfluxSeries, InfluxQueryBuilder) {
         }
         return id;
       }, function(err) {
-        return "Could not delete dashboard, " + err.data;
+        throw "Could not delete dashboard, " + err.data;
       });
     };
 

From 1440d1a147b9d025a8c9445fc08753a7dbc60eaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Tue, 9 Sep 2014 11:30:00 +0200
Subject: [PATCH 10/59] Fix when changing templated vars, should update child
 template vars All value

---
 src/app/dashboards/template_vars.json | 264 ++++++++++++++++++++++++++
 src/app/services/templateValuesSrv.js |   8 +-
 2 files changed, 269 insertions(+), 3 deletions(-)
 create mode 100644 src/app/dashboards/template_vars.json

diff --git a/src/app/dashboards/template_vars.json b/src/app/dashboards/template_vars.json
new file mode 100644
index 00000000000..affe7727ce2
--- /dev/null
+++ b/src/app/dashboards/template_vars.json
@@ -0,0 +1,264 @@
+{
+  "id": null,
+  "title": "Templated Graphs Nested",
+  "originalTitle": "Templated Graphs Nested",
+  "tags": [
+    "showcase",
+    "templated"
+  ],
+  "style": "dark",
+  "timezone": "browser",
+  "editable": true,
+  "hideControls": false,
+  "rows": [
+    {
+      "title": "Row1",
+      "height": "350px",
+      "editable": true,
+      "collapse": false,
+      "collapsable": true,
+      "panels": [
+        {
+          "span": 12,
+          "editable": true,
+          "type": "graph",
+          "loadingEditor": false,
+          "datasource": null,
+          "renderer": "flot",
+          "x-axis": true,
+          "y-axis": true,
+          "scale": 1,
+          "y_formats": [
+            "short",
+            "short"
+          ],
+          "grid": {
+            "max": null,
+            "min": 0,
+            "threshold1": null,
+            "threshold2": null,
+            "threshold1Color": "rgba(216, 200, 27, 0.27)",
+            "threshold2Color": "rgba(234, 112, 112, 0.22)",
+            "leftMax": null,
+            "rightMax": null,
+            "leftMin": null,
+            "rightMin": null
+          },
+          "annotate": {
+            "enable": false
+          },
+          "resolution": 100,
+          "lines": true,
+          "fill": 1,
+          "linewidth": 1,
+          "points": false,
+          "pointradius": 5,
+          "bars": false,
+          "stack": true,
+          "legend": {
+            "show": true,
+            "values": false,
+            "min": false,
+            "max": false,
+            "current": false,
+            "total": false,
+            "avg": false
+          },
+          "percentage": false,
+          "zerofill": true,
+          "nullPointMode": "connected",
+          "steppedLine": false,
+          "tooltip": {
+            "value_type": "cumulative",
+            "query_as_alias": true
+          },
+          "targets": [
+            {
+              "target": "aliasByNode(apps.$app.$server.counters.requests.count, 2)",
+              "function": "mean",
+              "column": "value"
+            }
+          ],
+          "aliasColors": {
+            "highres.test": "#1F78C1",
+            "scale(highres.test,3)": "#6ED0E0",
+            "mobile": "#6ED0E0",
+            "tablet": "#EAB839"
+          },
+          "title": "Traffic [[period]]",
+          "id": 1,
+          "seriesOverrides": []
+        }
+      ],
+      "notice": false
+    },
+    {
+      "title": "Row1",
+      "height": "350px",
+      "editable": true,
+      "collapse": false,
+      "collapsable": true,
+      "panels": [
+        {
+          "span": 12,
+          "editable": true,
+          "type": "graph",
+          "loadingEditor": false,
+          "datasource": null,
+          "renderer": "flot",
+          "x-axis": true,
+          "y-axis": true,
+          "scale": 1,
+          "y_formats": [
+            "short",
+            "short"
+          ],
+          "grid": {
+            "max": null,
+            "min": 0,
+            "threshold1": null,
+            "threshold2": null,
+            "threshold1Color": "rgba(216, 200, 27, 0.27)",
+            "threshold2Color": "rgba(234, 112, 112, 0.22)",
+            "leftMax": null,
+            "rightMax": null,
+            "leftMin": null,
+            "rightMin": null
+          },
+          "annotate": {
+            "enable": false
+          },
+          "resolution": 100,
+          "lines": true,
+          "fill": 1,
+          "linewidth": 1,
+          "points": false,
+          "pointradius": 5,
+          "bars": false,
+          "stack": true,
+          "legend": {
+            "show": true,
+            "values": false,
+            "min": false,
+            "max": false,
+            "current": false,
+            "total": false,
+            "avg": false
+          },
+          "percentage": false,
+          "zerofill": true,
+          "nullPointMode": "connected",
+          "steppedLine": false,
+          "tooltip": {
+            "value_type": "cumulative",
+            "query_as_alias": true
+          },
+          "targets": [
+            {
+              "target": "aliasByNode(apps.$app.$server.counters.requests.count, 2)"
+            }
+          ],
+          "aliasColors": {
+            "highres.test": "#1F78C1",
+            "scale(highres.test,3)": "#6ED0E0",
+            "mobile": "#6ED0E0",
+            "tablet": "#EAB839"
+          },
+          "title": "Second pannel",
+          "id": 2,
+          "seriesOverrides": []
+        }
+      ],
+      "notice": false
+    }
+  ],
+  "nav": [
+    {
+      "type": "timepicker",
+      "collapse": false,
+      "notice": false,
+      "enable": true,
+      "status": "Stable",
+      "time_options": [
+        "5m",
+        "15m",
+        "1h",
+        "6h",
+        "12h",
+        "24h",
+        "2d",
+        "7d",
+        "30d"
+      ],
+      "refresh_intervals": [
+        "5s",
+        "10s",
+        "30s",
+        "1m",
+        "5m",
+        "15m",
+        "30m",
+        "1h",
+        "2h",
+        "1d"
+      ],
+      "now": true
+    }
+  ],
+  "time": {
+    "from": "now-15m",
+    "to": "now"
+  },
+  "templating": {
+    "list": [
+      {
+        "type": "query",
+        "name": "app",
+        "query": "apps.*",
+        "includeAll": true,
+        "options": [],
+        "current": {
+          "text": "All",
+          "value": "*"
+        },
+        "datasource": null,
+        "allFormat": "wildcard",
+        "refresh": true
+      },
+      {
+        "type": "query",
+        "name": "server",
+        "query": "apps.$app.*",
+        "includeAll": true,
+        "options": [],
+        "current": {
+          "text": "All",
+          "value": "*"
+        },
+        "datasource": null,
+        "allFormat": "Glob",
+        "refresh": false
+      },
+      {
+        "type": "query",
+        "datasource": null,
+        "refresh_on_load": false,
+        "name": "metric",
+        "options": [],
+        "includeAll": true,
+        "allFormat": "glob",
+        "query": "apps.$app.$server.*",
+        "current": {
+          "text": "counters",
+          "value": "counters"
+        }
+      }
+    ],
+    "enable": true
+  },
+  "annotations": {
+    "enable": false
+  },
+  "refresh": false,
+  "version": 6
+}
diff --git a/src/app/services/templateValuesSrv.js b/src/app/services/templateValuesSrv.js
index cf2d766edc4..b04958547ca 100644
--- a/src/app/services/templateValuesSrv.js
+++ b/src/app/services/templateValuesSrv.js
@@ -70,7 +70,9 @@ function (angular, _, kbn) {
         if (otherVariable === updatedVariable) {
           return;
         }
+        console.log("value");
         if (templateSrv.containsVariable(otherVariable.query, updatedVariable.name)) {
+          console.log("valuei2");
           return self.updateOptions(otherVariable);
         }
       });
@@ -108,9 +110,9 @@ function (angular, _, kbn) {
           // if parameter has current value
           // if it exists in options array keep value
           if (variable.current) {
-            var currentExists = _.findWhere(variable.options, { text: variable.current.text });
-            if (currentExists) {
-              return self.setVariableValue(variable, variable.current, true);
+            var currentOption = _.findWhere(variable.options, { text: variable.current.text });
+            if (currentOption) {
+              return self.setVariableValue(variable, currentOption, true);
             }
           }
 

From 4311a20c5f36e0e946825440c3913b94bf4fbedf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Tue, 9 Sep 2014 11:35:29 +0200
Subject: [PATCH 11/59] Fixed issue with editing text panel, removed a function
 from dashboard controller that I though was not used, turned out it was

---
 src/app/controllers/dashboardCtrl.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/app/controllers/dashboardCtrl.js b/src/app/controllers/dashboardCtrl.js
index f4d057e77e5..424f0e225e8 100644
--- a/src/app/controllers/dashboardCtrl.js
+++ b/src/app/controllers/dashboardCtrl.js
@@ -102,6 +102,14 @@ function (angular, $, config, _) {
       }
     };
 
+    $scope.panel_path =function(type) {
+      if(type) {
+        return 'app/panels/'+type.replace(".","/");
+      } else {
+        return false;
+      }
+    };
+
     $scope.showJsonEditor = function(evt, options) {
       var editScope = $rootScope.$new();
       editScope.object = options.object;

From e94976110788719be3a774cf451c863ae1935140 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Tue, 9 Sep 2014 11:40:37 +0200
Subject: [PATCH 12/59] Made unsaved changes service ignore template variable
 options and selection changes

---
 src/app/services/unsavedChangesSrv.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/app/services/unsavedChangesSrv.js b/src/app/services/unsavedChangesSrv.js
index d1a83a59da2..9b8d2eea198 100644
--- a/src/app/services/unsavedChangesSrv.js
+++ b/src/app/services/unsavedChangesSrv.js
@@ -83,6 +83,14 @@ function(angular, _, config) {
       current.time = original.time = {};
       current.refresh = original.refresh;
 
+      // ignore template variable values
+      _.each(current.templating.list, function(value, index) {
+        value.current = null;
+        value.options = null;
+        original.templating.list[index].current = null;
+        original.templating.list[index].options = null;
+      });
+
       var currentTimepicker = _.findWhere(current.nav, { type: 'timepicker' });
       var originalTimepicker = _.findWhere(original.nav, { type: 'timepicker' });
 

From 05fabc73c2c6b5811b04fdb075202fb6fbede428 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Tue, 9 Sep 2014 13:04:07 +0200
Subject: [PATCH 13/59] Dashboard: elasticsearch dashboard storage now
 slugifies urls, #781

---
 src/app/components/kbn.js                     |  7 +++
 .../services/elasticsearch/es-datasource.js   | 49 +++++++++++++------
 2 files changed, 40 insertions(+), 16 deletions(-)

diff --git a/src/app/components/kbn.js b/src/app/components/kbn.js
index 35e5c2f67a7..cefcb42d289 100644
--- a/src/app/components/kbn.js
+++ b/src/app/components/kbn.js
@@ -655,6 +655,13 @@ function($, _, moment) {
     }
   };
 
+  kbn.slugifyForUrl = function(str) {
+    return str
+      .toLowerCase()
+      .replace(/[^\w ]+/g,'')
+      .replace(/ +/g,'-');
+  };
+
   kbn.stringToJsRegex = function(str) {
     if (str[0] !== '/') {
       return new RegExp(str);
diff --git a/src/app/services/elasticsearch/es-datasource.js b/src/app/services/elasticsearch/es-datasource.js
index 721ba00881b..3b36d17b2a3 100644
--- a/src/app/services/elasticsearch/es-datasource.js
+++ b/src/app/services/elasticsearch/es-datasource.js
@@ -1,12 +1,11 @@
 define([
   'angular',
   'lodash',
-  'jquery',
   'config',
   'kbn',
   'moment'
 ],
-function (angular, _, $, config, kbn, moment) {
+function (angular, _, config, kbn, moment) {
   'use strict';
 
   var module = angular.module('grafana.services');
@@ -119,25 +118,29 @@ function (angular, _, $, config, kbn, moment) {
       });
     };
 
+    ElasticDatasource.prototype._getDashboardWithSlug = function(id) {
+      return this._get('/dashboard/' + kbn.slugifyForUrl(id))
+        .then(function(result) {
+          return angular.fromJson(result._source.dashboard);
+        }, function() {
+          throw "Dashboard not found";
+        });
+    };
+
     ElasticDatasource.prototype.getDashboard = function(id, isTemp) {
       var url = '/dashboard/' + id;
+      if (isTemp) { url = '/temp/' + id; }
 
-      if (isTemp) {
-        url = '/temp/' + id;
-      }
-
+      var self = this;
       return this._get(url)
         .then(function(result) {
-          if (result._source && result._source.dashboard) {
-            return angular.fromJson(result._source.dashboard);
-          } else {
-            return false;
-          }
+          return angular.fromJson(result._source.dashboard);
         }, function(data) {
           if(data.status === 0) {
             throw "Could not contact Elasticsearch. Please ensure that Elasticsearch is reachable from your browser.";
           } else {
-            throw "Could not find dashboard " + id;
+            // backward compatible fallback
+            return self._getDashboardWithSlug(id);
           }
         });
     };
@@ -159,15 +162,29 @@ function (angular, _, $, config, kbn, moment) {
         return this._saveTempDashboard(data);
       }
       else {
-        return this._request('PUT', '/dashboard/' + encodeURIComponent(title), this.index, data)
-          .then(function() {
-            return { title: title, url: '/dashboard/db/' + title };
+
+        var id = encodeURIComponent(kbn.slugifyForUrl(title));
+        var self = this;
+
+        return this._request('PUT', '/dashboard/' + id, this.index, data)
+          .then(function(results) {
+            self._removeUnslugifiedDashboard(results, title);
+            return { title: title, url: '/dashboard/db/' + id };
           }, function(err) {
             throw 'Failed to save to elasticsearch ' + err.data;
           });
       }
     };
 
+    ElasticDatasource.prototype._removeUnslugifiedDashboard = function(saveResult, title) {
+      if (saveResult.statusText !== 'Created') { return; }
+
+      var self = this;
+      this._get('/dashboard/' + title).then(function() {
+        self.deleteDashboard(title);
+      });
+    };
+
     ElasticDatasource.prototype._saveTempDashboard = function(data) {
       return this._request('POST', '/temp/?ttl=' + this.saveTempTTL, this.index, data)
         .then(function(result) {
@@ -227,7 +244,7 @@ function (angular, _, $, config, kbn, moment) {
           for (var i = 0; i < results.hits.hits.length; i++) {
             hits.dashboards.push({
               id: results.hits.hits[i]._id,
-              title: results.hits.hits[i]._id,
+              title: results.hits.hits[i]._source.title,
               tags: results.hits.hits[i]._source.tags
             });
           }

From 3df592c7022a52d17723ba988ab340bff4da4c5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Tue, 9 Sep 2014 13:42:46 +0200
Subject: [PATCH 14/59] Dashboard: elasticsearch dashboard storage now
 slugifies urls, #781

---
 CHANGELOG.md                                  |  1 +
 .../services/influxdb/influxdbDatasource.js   | 65 +++++++++++++++----
 2 files changed, 52 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 16b11573fd7..2d4c9ce4c40 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,6 +43,7 @@
 - [Issue #425](https://github.com/grafana/grafana/issues/425). Graph: New section in 'Display Styles' tab to override any display setting on per series bases (mix and match lines, bars, points, fill, stack, line width etc)
 - [Issue #634](https://github.com/grafana/grafana/issues/634). Dashboard: Dashboard tags now in different colors (from fixed palette) determined by tag name.
 - [Issue #685](https://github.com/grafana/grafana/issues/685). Dashboard: New config.js option to change/remove window title prefix.
+- [Issue #781](https://github.com/grafana/grafana/issues/781). Dashboard: Title URL is now slugified for greater URL readability, works with both ES & InfluxDB storage, is backward compatible
 
 **Fixes**
 - [Issue #696](https://github.com/grafana/grafana/issues/696). Graph: Fix for y-axis format 'none' when values are in scientific notation (ex 2.3e-13)
diff --git a/src/app/services/influxdb/influxdbDatasource.js b/src/app/services/influxdb/influxdbDatasource.js
index d79834b5508..846b5ed80e1 100644
--- a/src/app/services/influxdb/influxdbDatasource.js
+++ b/src/app/services/influxdb/influxdbDatasource.js
@@ -182,34 +182,46 @@ function (angular, _, kbn, InfluxSeries, InfluxQueryBuilder) {
       var tags = dashboard.tags.join(',');
       var title = dashboard.title;
       var temp = dashboard.temp;
+      var id = kbn.slugifyForUrl(title);
       if (temp) { delete dashboard.temp; }
 
       var data = [{
-        name: 'grafana.dashboard_' + btoa(title),
-        columns: ['time', 'sequence_number', 'title', 'tags', 'dashboard'],
-        points: [[1000000000000, 1, title, tags, angular.toJson(dashboard)]]
+        name: 'grafana.dashboard_' + btoa(id),
+        columns: ['time', 'sequence_number', 'title', 'tags', 'dashboard', 'id'],
+        points: [[1000000000000, 1, title, tags, angular.toJson(dashboard), id]]
       }];
 
       if (temp) {
-        return this._saveDashboardTemp(data, title);
+        return this._saveDashboardTemp(data, title, id);
       }
       else {
+        var self = this;
         return this._influxRequest('POST', '/series', data).then(function() {
-          return { title: title, url: '/dashboard/db/' + title };
+          self._removeUnslugifiedDashboard(title, false);
+          return { title: title, url: '/dashboard/db/' + id };
         }, function(err) {
           throw 'Failed to save dashboard to InfluxDB: ' + err.data;
         });
       }
     };
 
-    InfluxDatasource.prototype._saveDashboardTemp = function(data, title) {
-      data[0].name = 'grafana.temp_dashboard_' + btoa(title);
+    InfluxDatasource.prototype._removeUnslugifiedDashboard = function(id, isTemp) {
+      var self = this;
+      self._getDashboardInternal(id, isTemp).then(function(dashboard) {
+        if (dashboard !== null) {
+          self.deleteDashboard(id);
+        }
+      });
+    };
+
+    InfluxDatasource.prototype._saveDashboardTemp = function(data, title, id) {
+      data[0].name = 'grafana.temp_dashboard_' + btoa(id);
       data[0].columns.push('expires');
       data[0].points[0].push(this._getTempDashboardExpiresDate());
 
       return this._influxRequest('POST', '/series', data).then(function() {
         var baseUrl = window.location.href.replace(window.location.hash,'');
-        var url = baseUrl + "#dashboard/temp/" + title;
+        var url = baseUrl + "#dashboard/temp/" + id;
         return { title: title, url: url };
       }, function(err) {
         throw 'Failed to save shared dashboard to InfluxDB: ' + err.data;
@@ -236,7 +248,7 @@ function (angular, _, kbn, InfluxSeries, InfluxQueryBuilder) {
       return expires;
     };
 
-    InfluxDatasource.prototype.getDashboard = function(id, isTemp) {
+    InfluxDatasource.prototype._getDashboardInternal = function(id, isTemp) {
       var queryString = 'select dashboard from "grafana.dashboard_' + btoa(id) + '"';
 
       if (isTemp) {
@@ -245,13 +257,32 @@ function (angular, _, kbn, InfluxSeries, InfluxQueryBuilder) {
 
       return this._seriesQuery(queryString).then(function(results) {
         if (!results || !results.length) {
-          throw "Dashboard not found";
+          return null;
         }
 
         var dashCol = _.indexOf(results[0].columns, 'dashboard');
         var dashJson = results[0].points[0][dashCol];
 
         return angular.fromJson(dashJson);
+      }, function() {
+        return null;
+      });
+    };
+
+    InfluxDatasource.prototype.getDashboard = function(id, isTemp) {
+      var self = this;
+      return this._getDashboardInternal(id, isTemp).then(function(dashboard) {
+        if (dashboard !== null)  {
+          return dashboard;
+        }
+
+        // backward compatible load for unslugified ids
+        var slug = kbn.slugifyForUrl(id);
+        if (slug !== id) {
+          return self.getDashboard(slug, isTemp);
+        }
+
+        throw "Dashboard not found";
       }, function(err) {
         throw  "Could not load dashboard, " + err.data;
       });
@@ -269,7 +300,7 @@ function (angular, _, kbn, InfluxSeries, InfluxQueryBuilder) {
     };
 
     InfluxDatasource.prototype.searchDashboards = function(queryString) {
-      var influxQuery = 'select title, tags from /grafana.dashboard_.*/ where ';
+      var influxQuery = 'select * from /grafana.dashboard_.*/ where ';
 
       var tagsOnly = queryString.indexOf('tags!:') === 0;
       if (tagsOnly) {
@@ -294,15 +325,21 @@ function (angular, _, kbn, InfluxSeries, InfluxQueryBuilder) {
           return hits;
         }
 
-        var dashCol = _.indexOf(results[0].columns, 'title');
-        var tagsCol = _.indexOf(results[0].columns, 'tags');
-
         for (var i = 0; i < results.length; i++) {
+          var dashCol = _.indexOf(results[i].columns, 'title');
+          var tagsCol = _.indexOf(results[i].columns, 'tags');
+          var idCol = _.indexOf(results[i].columns, 'id');
+
           var hit =  {
             id: results[i].points[0][dashCol],
             title: results[i].points[0][dashCol],
             tags: results[i].points[0][tagsCol].split(",")
           };
+
+          if (idCol !== -1) {
+            hit.id = results[i].points[0][idCol];
+          }
+
           hit.tags = hit.tags[0] ? hit.tags : [];
           hits.dashboards.push(hit);
         }

From 4558486cbd561dc7a5db8c440eb2718a6694b9a4 Mon Sep 17 00:00:00 2001
From: Daniel Shir <daniel@nextpeer.com>
Date: Tue, 9 Sep 2014 15:23:40 +0300
Subject: [PATCH 15/59] Added basic authorization for influxdb if needed

---
 src/app/services/influxdb/influxdbDatasource.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/app/services/influxdb/influxdbDatasource.js b/src/app/services/influxdb/influxdbDatasource.js
index 846b5ed80e1..d9a7d8b378c 100644
--- a/src/app/services/influxdb/influxdbDatasource.js
+++ b/src/app/services/influxdb/influxdbDatasource.js
@@ -19,6 +19,7 @@ function (angular, _, kbn, InfluxSeries, InfluxQueryBuilder) {
       this.username = datasource.username;
       this.password = datasource.password;
       this.name = datasource.name;
+      this.basicAuth = datasource.basicAuth;
 
       this.saveTemp = _.isUndefined(datasource.save_temp) ? true : datasource.save_temp;
       this.saveTempTTL = _.isUndefined(datasource.save_temp_ttl) ? '30d' : datasource.save_temp_ttl;
@@ -170,6 +171,11 @@ function (angular, _, kbn, InfluxSeries, InfluxQueryBuilder) {
           inspect: { type: 'influxdb' },
         };
 
+        options.headers = options.headers || {};
+        if (_this.basicAuth) {
+          options.headers.Authorization = 'Basic ' + _this.basicAuth;
+        }
+
         return $http(options).success(function (data) {
           deferred.resolve(data);
         });

From 6152a5e3c21b9f3067c39d993c57e9714eb01b9e Mon Sep 17 00:00:00 2001
From: Ed Dawley <ed.dawley@bronto.com>
Date: Tue, 9 Sep 2014 15:16:47 -0400
Subject: [PATCH 16/59] Adding in global search id counter so that async search
 responses can be discarded if a newer search is being processed.  This
 prevents older search results from clobbering a newer search that happened to
 complete faster.

---
 src/app/controllers/search.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/app/controllers/search.js b/src/app/controllers/search.js
index c294c9d86f6..98e6616f0a4 100644
--- a/src/app/controllers/search.js
+++ b/src/app/controllers/search.js
@@ -17,6 +17,7 @@ function (angular, _, config, $) {
       $scope.results = {dashboards: [], tags: [], metrics: []};
       $scope.query = { query: 'title:' };
       $scope.db = datasourceSrv.getGrafanaDB();
+      $scope.currentSearchId = 0;
 
       $timeout(function() {
         $scope.giveSearchFocus = $scope.giveSearchFocus + 1;
@@ -75,8 +76,18 @@ function (angular, _, config, $) {
     };
 
     $scope.searchDashboards = function(queryString) {
+      // bookeeping for determining stale search requests
+      var searchId = $scope.currentSearchId + 1;
+      $scope.currentSearchId = searchId > $scope.currentSearchId ? searchId : $scope.currentSearchId;
+
       return $scope.db.searchDashboards(queryString)
         .then(function(results) {
+          // since searches are async, it's possible that these results are not for the latest search. throw
+          // them away if so
+          if (searchId < $scope.currentSearchId) {
+            return;
+          }
+
           $scope.tagsOnly = results.tagsOnly;
           $scope.results.dashboards = results.dashboards;
           $scope.results.tags = results.tags;

From 17e040abe4cfb39b1a606da10fd71ca08e6e48cf Mon Sep 17 00:00:00 2001
From: Ed Dawley <ed.dawley@bronto.com>
Date: Tue, 9 Sep 2014 15:17:13 -0400
Subject: [PATCH 17/59] The elasticsearch datasource will now better handle
 language specifics when making the search partial (ie for search as you
 type).  This means the search field will now support significantly more
 complex searches such as:

    title:foo AND title:bar OR baz
    title:mysql AND [3306 TO 3308]
    web~
    title:foo AND -bar
---
 .../services/elasticsearch/es-datasource.js   | 32 +++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/src/app/services/elasticsearch/es-datasource.js b/src/app/services/elasticsearch/es-datasource.js
index 3b36d17b2a3..dd5fb1020ac 100644
--- a/src/app/services/elasticsearch/es-datasource.js
+++ b/src/app/services/elasticsearch/es-datasource.js
@@ -209,7 +209,21 @@ function (angular, _, config, kbn, moment) {
     };
 
     ElasticDatasource.prototype.searchDashboards = function(queryString) {
-      queryString = queryString.toLowerCase().replace(' and ', ' AND ');
+      var endsInOpen = function(string, opener, closer) {
+        var character;
+        var count = 0;
+        for (var i=0; i<string.length; i++) {
+          character = string[i];
+
+          if (character == opener) {
+            count++;
+          } else if (character == closer) {
+            count--;
+          }
+        }
+
+        return count > 0;
+      }
 
       var tagsOnly = queryString.indexOf('tags!:') === 0;
       if (tagsOnly) {
@@ -221,7 +235,21 @@ function (angular, _, config, kbn, moment) {
           queryString = 'title:';
         }
 
-        if (queryString[queryString.length - 1] !== '*') {
+        // make this a partial search if we're not in some reserved portion of the language,  comments on conditionals, in order:
+        // 1. ends in reserved character, boosting, boolean operator ( -foo)
+        // 2. typing a reserved word like AND, OR, NOT
+        // 3. open parens (groupiing)
+        // 4. open " (term phrase)
+        // 5. open [ (range)
+        // 6. open { (range)
+        // see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#query-string-syntax
+        if (!queryString.match(/(\*|\]|}|~|\)|"|^\d+|\s[\-+]\w+)$/) &&
+            !queryString.match(/[A-Z]$/) &&
+            !endsInOpen(queryString, '(', ')') &&
+            !endsInOpen(queryString, '"', '"') &&
+            !endsInOpen(queryString, '[', ']') && !endsInOpen(queryString, '[', '}') &&
+            !endsInOpen(queryString, '{', ']') && !endsInOpen(queryString, '{', '}')
+        ){
           queryString += '*';
         }
       }

From c0935c84ee033009105f1993af8c6365a84a5228 Mon Sep 17 00:00:00 2001
From: Ed Dawley <ed.dawley@bronto.com>
Date: Tue, 9 Sep 2014 15:54:05 -0400
Subject: [PATCH 18/59] Fixing some grunt errors with the elasticsearch grammar
 changes

---
 src/app/services/elasticsearch/es-datasource.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/services/elasticsearch/es-datasource.js b/src/app/services/elasticsearch/es-datasource.js
index dd5fb1020ac..4d1f6272720 100644
--- a/src/app/services/elasticsearch/es-datasource.js
+++ b/src/app/services/elasticsearch/es-datasource.js
@@ -215,15 +215,15 @@ function (angular, _, config, kbn, moment) {
         for (var i=0; i<string.length; i++) {
           character = string[i];
 
-          if (character == opener) {
+          if (character === opener) {
             count++;
-          } else if (character == closer) {
+          } else if (character === closer) {
             count--;
           }
         }
 
         return count > 0;
-      }
+      };
 
       var tagsOnly = queryString.indexOf('tags!:') === 0;
       if (tagsOnly) {

From 4d4478d969733c2c1b6a5c3f24c77fb4f2624951 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Wed, 10 Sep 2014 09:07:14 +0200
Subject: [PATCH 19/59] Added PR #785 to changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2d4c9ce4c40..e05bc4c913f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -44,6 +44,7 @@
 - [Issue #634](https://github.com/grafana/grafana/issues/634). Dashboard: Dashboard tags now in different colors (from fixed palette) determined by tag name.
 - [Issue #685](https://github.com/grafana/grafana/issues/685). Dashboard: New config.js option to change/remove window title prefix.
 - [Issue #781](https://github.com/grafana/grafana/issues/781). Dashboard: Title URL is now slugified for greater URL readability, works with both ES & InfluxDB storage, is backward compatible
+- [Issue #785](https://github.com/grafana/grafana/issues/785). Elasticsearch: Support for full elasticsearch lucene search grammar when searching for dashboards, better async search
 
 **Fixes**
 - [Issue #696](https://github.com/grafana/grafana/issues/696). Graph: Fix for y-axis format 'none' when values are in scientific notation (ex 2.3e-13)

From 682d2a167512a048b846836b180e4e84de8940ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Wed, 10 Sep 2014 10:46:04 +0200
Subject: [PATCH 20/59] Dashboard: time range can now be read from URL
 parameters, will override dashboard saved time range, Closes #787, Closes
 #761

---
 CHANGELOG.md                    |  1 +
 src/app/services/timeSrv.js     | 36 ++++++++++++++++++++++++++---
 src/test/specs/timeSrv-specs.js | 41 ++++++++++++++++++++++++++++++++-
 3 files changed, 74 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e05bc4c913f..a182bbf6cad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -45,6 +45,7 @@
 - [Issue #685](https://github.com/grafana/grafana/issues/685). Dashboard: New config.js option to change/remove window title prefix.
 - [Issue #781](https://github.com/grafana/grafana/issues/781). Dashboard: Title URL is now slugified for greater URL readability, works with both ES & InfluxDB storage, is backward compatible
 - [Issue #785](https://github.com/grafana/grafana/issues/785). Elasticsearch: Support for full elasticsearch lucene search grammar when searching for dashboards, better async search
+- [Issue #787](https://github.com/grafana/grafana/issues/787). Dashboard: time range can now be read from URL parameters, will override dashboard saved time range
 
 **Fixes**
 - [Issue #696](https://github.com/grafana/grafana/issues/696). Graph: Fix for y-axis format 'none' when values are in scientific notation (ex 2.3e-13)
diff --git a/src/app/services/timeSrv.js b/src/app/services/timeSrv.js
index 7d81d8fe375..1ee9ecdf925 100644
--- a/src/app/services/timeSrv.js
+++ b/src/app/services/timeSrv.js
@@ -2,13 +2,14 @@ define([
   'angular',
   'lodash',
   'config',
-  'kbn'
-], function (angular, _, config, kbn) {
+  'kbn',
+  'moment'
+], function (angular, _, config, kbn, moment) {
   'use strict';
 
   var module = angular.module('grafana.services');
 
-  module.service('timeSrv', function($rootScope, $timeout, timer) {
+  module.service('timeSrv', function($rootScope, $timeout, $routeParams, timer) {
     var self = this;
 
     this.init = function(dashboard) {
@@ -17,11 +18,40 @@ define([
       this.dashboard = dashboard;
       this.time = dashboard.time;
 
+      this._initTimeFromUrl();
+
       if(this.dashboard.refresh) {
         this.set_interval(this.dashboard.refresh);
       }
     };
 
+    this._parseUrlParam = function(value) {
+      if (value.indexOf('now') !== -1) {
+        return value;
+      }
+      if (value.length === 8) {
+        return moment.utc(value, 'YYYYMMDD').toDate();
+      }
+      if (value.length === 15) {
+        return moment.utc(value, 'YYYYMMDDTHHmmss').toDate();
+      }
+      var epoch = parseInt(value);
+      if (!_.isNaN(epoch)) {
+        return new Date(epoch);
+      }
+
+      return null;
+    };
+
+    this._initTimeFromUrl = function() {
+      if ($routeParams.from) {
+        this.time.from = this._parseUrlParam($routeParams.from) || this.time.from;
+      }
+      if ($routeParams.to) {
+        this.time.to = this._parseUrlParam($routeParams.to) || this.time.to;
+      }
+    };
+
     this.set_interval = function (interval) {
       this.dashboard.refresh = interval;
       if (interval) {
diff --git a/src/test/specs/timeSrv-specs.js b/src/test/specs/timeSrv-specs.js
index a0bc053b1e1..1d8a158e27e 100644
--- a/src/test/specs/timeSrv-specs.js
+++ b/src/test/specs/timeSrv-specs.js
@@ -11,7 +11,7 @@ define([
     var _dashboard;
 
     beforeEach(module('grafana.services'));
-    beforeEach(ctx.providePhase());
+    beforeEach(ctx.providePhase(['$routeParams']));
     beforeEach(ctx.createService('timeSrv'));
 
     beforeEach(function() {
@@ -35,6 +35,45 @@ define([
       });
     });
 
+    describe('init time from url', function() {
+      it('should handle relative times', function() {
+        ctx.$routeParams.from = 'now-2d';
+        ctx.$routeParams.to = 'now';
+        ctx.service.init(_dashboard);
+        var time = ctx.service.timeRange(false);
+        expect(time.from).to.be('now-2d');
+        expect(time.to).to.be('now');
+      });
+
+      it('should handle formated dates', function() {
+        ctx.$routeParams.from = '20140410T052010';
+        ctx.$routeParams.to = '20140520T031022';
+        ctx.service.init(_dashboard);
+        var time = ctx.service.timeRange(true);
+        expect(time.from.getTime()).to.equal(new Date("2014-04-10T05:20:10Z").getTime());
+        expect(time.to.getTime()).to.equal(new Date("2014-05-20T03:10:22Z").getTime());
+      });
+
+      it('should handle formated dates without time', function() {
+        ctx.$routeParams.from = '20140410';
+        ctx.$routeParams.to = '20140520';
+        ctx.service.init(_dashboard);
+        var time = ctx.service.timeRange(true);
+        expect(time.from.getTime()).to.equal(new Date("2014-04-10T00:00:00Z").getTime());
+        expect(time.to.getTime()).to.equal(new Date("2014-05-20T00:00:00Z").getTime());
+      });
+
+      it('should handle epochs', function() {
+        ctx.$routeParams.from = '1410337646373';
+        ctx.$routeParams.to = '1410337665699';
+        ctx.service.init(_dashboard);
+        var time = ctx.service.timeRange(true);
+        expect(time.from.getTime()).to.equal(1410337646373);
+        expect(time.to.getTime()).to.equal(1410337665699);
+      });
+
+    });
+
     describe('setTime', function() {
       it('should return disable refresh for absolute times', function() {
         _dashboard.refresh = false;

From 6f8cb743b599370a52ddaec4c01440a8cd9b87b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Wed, 10 Sep 2014 11:53:58 +0200
Subject: [PATCH 21/59] Fixed default welcome to grafana dashboard, rows were
 not marked as editable

---
 src/app/dashboards/default.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/app/dashboards/default.json b/src/app/dashboards/default.json
index 4fcdf570d53..ab22805f99c 100644
--- a/src/app/dashboards/default.json
+++ b/src/app/dashboards/default.json
@@ -9,6 +9,7 @@
       "title": "New row",
       "height": "150px",
       "collapse": false,
+      "editable": true,
       "panels": [
         {
           "id": 1,
@@ -26,6 +27,7 @@
       "title": "Welcome to Grafana",
       "height": "210px",
       "collapse": false,
+      "editable": true,
       "panels": [
         {
           "id": 2,
@@ -50,6 +52,7 @@
     {
       "title": "test",
       "height": "250px",
+      "editable": true,
       "collapse": false,
       "panels": [
         {

From 2150bbf1916e8eb731e7a15ec96eb9ae208beb49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Wed, 10 Sep 2014 13:35:54 +0200
Subject: [PATCH 22/59] removed console.log from templateValuesSrv

---
 src/app/services/templateValuesSrv.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/app/services/templateValuesSrv.js b/src/app/services/templateValuesSrv.js
index b04958547ca..9b80c336f4b 100644
--- a/src/app/services/templateValuesSrv.js
+++ b/src/app/services/templateValuesSrv.js
@@ -70,9 +70,7 @@ function (angular, _, kbn) {
         if (otherVariable === updatedVariable) {
           return;
         }
-        console.log("value");
         if (templateSrv.containsVariable(otherVariable.query, updatedVariable.name)) {
-          console.log("valuei2");
           return self.updateOptions(otherVariable);
         }
       });

From 99009a11ed25d6567ec2fb2b542a2863dca64370 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Thu, 11 Sep 2014 08:03:00 +0200
Subject: [PATCH 23/59] Graphite: added divideSeries function, #177

---
 src/app/services/graphite/gfunc.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/app/services/graphite/gfunc.js b/src/app/services/graphite/gfunc.js
index 4968384a24f..533bb897283 100644
--- a/src/app/services/graphite/gfunc.js
+++ b/src/app/services/graphite/gfunc.js
@@ -68,7 +68,14 @@ function (_) {
   addFuncDef({
     name: 'diffSeries',
     params: optionalSeriesRefArgs,
-    defaultParams: ['#B'],
+    defaultParams: ['#A'],
+    category: categories.Calculate,
+  });
+
+  addFuncDef({
+    name: 'divideSeries',
+    params: optionalSeriesRefArgs,
+    defaultParams: ['#A'],
     category: categories.Calculate,
   });
 

From a640d5529778c5f055b2d65e3e914a326dbf1180 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Thu, 11 Sep 2014 09:27:49 +0200
Subject: [PATCH 24/59] Added informatio & help blocks to graphite metric
 editor

---
 src/app/partials/graphite/editor.html | 108 ++++++++++++++++++++++----
 src/app/partials/influxdb/editor.html |  16 ++--
 src/css/less/grafana.less             |  19 +++++
 3 files changed, 120 insertions(+), 23 deletions(-)

diff --git a/src/app/partials/graphite/editor.html b/src/app/partials/graphite/editor.html
index 82241ec1923..46e7d081884 100755
--- a/src/app/partials/graphite/editor.html
+++ b/src/app/partials/graphite/editor.html
@@ -1,4 +1,4 @@
-<div class="editor-row" style="margin-top: 10px;">
+<div class="editor-row">
 
 	<div  ng-repeat="target in panel.targets"
         class="grafana-target"
@@ -30,13 +30,6 @@
                   ng-click="duplicate()">
                 Duplicate
               </a>
-            </li>
-            <li role="menuitem">
-              <a  tabindex="1"
-                  ng-click="toggleMetricOptions()">
-                Toggle request options
-              </a>
-            </li>
           </ul>
         </li>
         <li>
@@ -80,24 +73,109 @@
     </div>
   </div>
 
-	<div class="grafana-target grafana-metric-options" ng-if="panel.metricOptionsEnabled">
+</div>
+
+<section class="grafana-metric-options">
 		<div class="grafana-target-inner">
 			<ul class="grafana-segment-list">
+				<li class="grafana-target-segment grafana-target-segment-icon">
+					<i class="icon-wrench"></i>
+				</li>
 				<li class="grafana-target-segment">
-					cacheTimeout <tip>Graphite parameter to overwride memcache default timeout (unit is seconds)</tip>
+					cacheTimeout
 				</li>
 				<li>
 					<input type="text"
-								class="input-large grafana-target-segment-input"
-								ng-model="panel.cacheTimeout"
-								spellcheck='false'
-								placeholder="60">
+					class="input-mini grafana-target-segment-input"
+					ng-model="panel.cacheTimeout"
+					bs-tooltip="'Graphite parameter to overwride memcache default timeout (unit is seconds)'"
+					data-placement="right"
+					spellcheck='false'
+					placeholder="60">
 				</li>
 			</ul>
-      <div class="clearfix"></div>
+			<div class="clearfix"></div>
+		</div>
+		<div class="grafana-target-inner">
+			<ul class="grafana-segment-list">
+				<li class="grafana-target-segment grafana-target-segment-icon">
+					<i class="icon-info-sign"></i>
+				</li>
+				<li class="grafana-target-segment">
+					<a ng-click="toggleEditorHelp(1);" bs-tooltip="'click to show helpful info'" data-placement="bottom">
+						shorter legend names
+					</a>
+				</li>
+				<li class="grafana-target-segment">
+					<a ng-click="toggleEditorHelp(2);" bs-tooltip="'click to show helpful info'" data-placement="bottom">
+						series as paramaters
+					</a>
+				</li>
+				<li class="grafana-target-segment">
+					<a ng-click="toggleEditorHelp(3)" bs-tooltip="'click to show helpful info'" data-placement="bottom">
+						stacking
+					</a>
+				</li>
+				<li class="grafana-target-segment">
+					<a ng-click="toggleEditorHelp(4)" bs-tooltip="'click to show helpful info'" data-placement="bottom">
+						templating
+					</a>
+				</li>
+			</ul>
+			<div class="clearfix"></div>
 		</div>
 	</div>
+</section>
 
+<div class="editor-row">
+	<div class="pull-left" style="margin-top: 30px;">
+
+		<div class="grafana-info-box span8" ng-if="editorHelpIndex === 1">
+			<h5>Shorter legend names</h5>
+			<ul>
+				<li>alias() function to specify a custom series name</li>
+				<li>aliasByNode(2) to alias by a specific part of your metric path</li>
+				<li>aliasByNode(2, -1) you can add multiple segment paths, and use negative index</li>
+				<li>groupByNode(2, 'sum') is useful if you have 2 wildcards in your metric path and want to sumSeries and group by</li>
+			</ul>
+		</div>
+
+		<div class="grafana-info-box span8" ng-if="editorHelpIndex === 2">
+			<h5>Series as parameter</h5>
+			<ul>
+				<li>Some graphite functions allow you to have many series arguments</li>
+				<li>Use #[A-Z] to use a graphite query as parameter to a function</li>
+				<li>
+					Examples:
+					<ul>
+						<li>asPercent(#A, #B)</li>
+						<li>prod.srv-01.counters.count - asPercent(#A) : percentage of count in comparison with A query</li>
+						<li>prod.srv-01.counters.count - sumSeries(#A) : sum count and series A </li>
+						<li>divideSeries(#A, #B)</li>
+					</ul>
+				</li>
+				<li>If a query is added only to be used as a parameter, hide it from the graph with the eye icon</li>
+			</ul>
+		</div>
+
+		<div class="grafana-info-box span6" ng-if="editorHelpIndex === 3">
+			<h5>Stacking</h5>
+			<ul>
+				<li>You find the stacking option under Display Styles tab</li>
+				<li>When stacking is enabled make sure null point mode is set to 'null as zero'</li>
+			</ul>
+		</div>
+
+		<div class="grafana-info-box span6" ng-if="editorHelpIndex === 4">
+			<h5>Templating</h5>
+			<ul>
+				<li>You can use a template variable in place of metric names</li>
+				<li>You can use a template variable in place of function parameters</li>
+				<li>You enable the templating feature in Dashboard settings / Feature toggles </li>
+			</ul>
+		</div>
+
+	</div>
 </div>
 
 
diff --git a/src/app/partials/influxdb/editor.html b/src/app/partials/influxdb/editor.html
index 70da2fbf282..4fd13645d3d 100644
--- a/src/app/partials/influxdb/editor.html
+++ b/src/app/partials/influxdb/editor.html
@@ -181,8 +181,8 @@
 	<div class="grafana-target">
 		<div class="grafana-target-inner">
 			<ul class="grafana-segment-list">
-				<li class="grafana-target-segment">
-					<i class="icon-cogs"></i>
+				<li class="grafana-target-segment grafana-target-segment-icon">
+					<i class="icon-wrench"></i>
 				</li>
 				<li class="grafana-target-segment">
 					group by time
@@ -227,8 +227,8 @@
 <div class="editor-row">
 	<div class="pull-left" style="margin-top: 30px;">
 
-		<div class="span6" ng-if="editorHelpIndex === 1">
-			Alias patterns:
+		<div class="grafana-info-box span6" ng-if="editorHelpIndex === 1">
+			<h5>Alias patterns</h5>
 			<ul>
 				<li>$s = series name</li>
 				<li>$g = group by</li>
@@ -236,8 +236,8 @@
 			</ul>
 		</div>
 
-		<div class="span6" ng-if="editorHelpIndex === 2">
-			Stacking and fill:
+		<div class="grafana-info-box span6" ng-if="editorHelpIndex === 2">
+			<h5>Stacking and fill</h5>
 			<ul>
 				<li>When stacking is enabled it important that points align</li>
 				<li>If there are missing points for one series it can cause gaps or missing bars</li>
@@ -247,8 +247,8 @@
 			</ul>
 		</div>
 
-		<div class="span6" ng-if="editorHelpIndex === 3">
-			Group by time:
+		<div class="grafana-info-box span6" ng-if="editorHelpIndex === 3">
+			<h5>Group by time</h5>
 			<ul>
 				<li>Group by time is important, otherwise the query could return many thousands of datapoints that will slow down Grafana</li>
 				<li>Leave the group by time field empty for each query and it will be calculated based on time range and pixel width of the graph</li>
diff --git a/src/css/less/grafana.less b/src/css/less/grafana.less
index 022319a1042..7c17e6967db 100644
--- a/src/css/less/grafana.less
+++ b/src/css/less/grafana.less
@@ -485,3 +485,22 @@ select.grafana-target-segment-input {
   color: @variable;
 }
 
+.grafana-info-box:before {
+  content: "\f05a";
+  font-family:'FontAwesome';
+  position: absolute;
+  top: -8px;
+  left: -8px;
+  font-size: 20px;
+  color: @blue;
+}
+
+.grafana-info-box {
+  position: relative;
+  padding: 5px 15px;
+  background-color: @grafanaTargetBackground;
+  border: 1px solid @grafanaTargetBorder;
+  h5 {
+    margin-top: 5px;
+  }
+}

From b1abe72ab65190cf9611372bb000eb6655107846 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Thu, 11 Sep 2014 11:34:32 +0200
Subject: [PATCH 25/59] small update to text panel editor

---
 src/app/panels/text/editor.html | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/app/panels/text/editor.html b/src/app/panels/text/editor.html
index 6af4dc069c2..b3b8afbbec0 100644
--- a/src/app/panels/text/editor.html
+++ b/src/app/panels/text/editor.html
@@ -9,10 +9,9 @@
   </div>
 
   <label class=small>Content
-    <span ng-show="panel.mode == 'html'">(This area uses HTML sanitized via AngularJS's <a href='http://docs.angularjs.org/api/ngSanitize.$sanitize'>$sanitize</a> service)</span>
     <span ng-show="panel.mode == 'markdown'">(This area uses <a target="_blank" href="http://en.wikipedia.org/wiki/Markdown">Markdown</a>. HTML is not supported)</span>
   </label>
 
-  <textarea ng-model="panel.content" rows="6" style="width:95%" ng-change="render()" ng-model-onblur>
+  <textarea ng-model="panel.content" rows="20" style="width:95%" ng-change="render()" ng-model-onblur>
   </textarea>
-</div>
\ No newline at end of file
+</div>

From 4883b2a2960a56aac3e19f490e948aa7228ae531 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Thu, 11 Sep 2014 13:54:59 +0200
Subject: [PATCH 26/59] Fixed issue with using template variables in panel
 titles, and text panel, when selecting All option in variable

---
 package.json                        |  2 +-
 src/app/filters/all.js              |  2 +-
 src/app/services/templateSrv.js     | 41 ++++++++++++++++++++---------
 src/test/specs/templateSrv-specs.js | 17 ++++++++++++
 4 files changed, 47 insertions(+), 15 deletions(-)

diff --git a/package.json b/package.json
index 8de8f05cf8a..f84ca9cf8c6 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
     "company": "Coding Instinct AB"
   },
   "name": "grafana",
-  "version": "1.8.0",
+  "version": "1.8.0-rc1",
   "repository": {
     "type": "git",
     "url": "http://github.com/torkelo/grafana.git"
diff --git a/src/app/filters/all.js b/src/app/filters/all.js
index b2729d120dd..eb9a736d0ce 100755
--- a/src/app/filters/all.js
+++ b/src/app/filters/all.js
@@ -57,7 +57,7 @@ define(['angular', 'jquery', 'lodash', 'moment'], function (angular, $, _, momen
 
   module.filter('interpolateTemplateVars', function(templateSrv) {
     return function(text) {
-      return templateSrv.replace(text);
+      return templateSrv.replaceWithText(text);
     };
   });
 
diff --git a/src/app/services/templateSrv.js b/src/app/services/templateSrv.js
index d63a9df34d4..c201147becf 100644
--- a/src/app/services/templateSrv.js
+++ b/src/app/services/templateSrv.js
@@ -11,26 +11,25 @@ function (angular, _) {
     var self = this;
 
     this._regex = /\$(\w+)|\[\[([\s\S]+?)\]\]/g;
-    this._templateData = {};
+    this._values = {};
+    this._texts = {};
     this._grafanaVariables = {};
 
     this.init = function(variables) {
       this.variables = variables;
-      this.updateTemplateData(true);
+      this.updateTemplateData();
     };
 
     this.updateTemplateData = function() {
-      var data = {};
+      this._values = {};
+      this._texts = {};
 
       _.each(this.variables, function(variable) {
-        if (!variable.current || !variable.current.value) {
-          return;
-        }
+        if (!variable.current || !variable.current.value) { return; }
 
-        data[variable.name] = variable.current.value;
-      });
-
-      this._templateData = data;
+        this._values[variable.name] = variable.current.value;
+        this._texts[variable.name] = variable.current.text;
+      }, this);
     };
 
     this.setGrafanaVariable = function (name, value) {
@@ -40,7 +39,7 @@ function (angular, _) {
     this.variableExists = function(expression) {
       this._regex.lastIndex = 0;
       var match = this._regex.exec(expression);
-      return match && (self._templateData[match[1] || match[2]] !== void 0);
+      return match && (self._values[match[1] || match[2]] !== void 0);
     };
 
     this.containsVariable = function(str, variableName) {
@@ -52,7 +51,7 @@ function (angular, _) {
 
       this._regex.lastIndex = 0;
       return str.replace(this._regex, function(match, g1, g2) {
-        if (self._templateData[g1 || g2]) {
+        if (self._values[g1 || g2]) {
           return '<span class="template-variable">' + match + '</span>';
         }
         return match;
@@ -66,13 +65,29 @@ function (angular, _) {
       this._regex.lastIndex = 0;
 
       return target.replace(this._regex, function(match, g1, g2) {
-        value = self._templateData[g1 || g2];
+        value = self._values[g1 || g2];
         if (!value) { return match; }
 
         return self._grafanaVariables[value] || value;
       });
     };
 
+    this.replaceWithText = function(target) {
+      if (!target) { return; }
+
+      var value;
+      var text;
+      this._regex.lastIndex = 0;
+
+      return target.replace(this._regex, function(match, g1, g2) {
+        value = self._values[g1 || g2];
+        text = self._texts[g1 || g2];
+        if (!value) { return match; }
+
+        return self._grafanaVariables[value] || text;
+      });
+    };
+
   });
 
 });
diff --git a/src/test/specs/templateSrv-specs.js b/src/test/specs/templateSrv-specs.js
index 938d8bfe0a1..f740ef6d544 100644
--- a/src/test/specs/templateSrv-specs.js
+++ b/src/test/specs/templateSrv-specs.js
@@ -92,6 +92,23 @@ define([
       });
     });
 
+    describe('replaceWithText', function() {
+      beforeEach(function() {
+        _templateSrv.init([
+          { name: 'server', current: { value: '{asd,asd2}', text: 'All' } },
+          { name: 'period', current: { value: '$__auto_interval', text: 'auto' } }
+        ]);
+        _templateSrv.setGrafanaVariable('$__auto_interval', '13m');
+        _templateSrv.updateTemplateData();
+      });
+
+      it('should replace with text except for grafanaVariables', function() {
+        var target = _templateSrv.replaceWithText('Server: $server, period: $period');
+        expect(target).to.be('Server: All, period: 13m');
+      });
+    });
+
+
   });
 
 });

From a65c61442ede3d656c3ef648538e89730670a6c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Thu, 11 Sep 2014 14:01:37 +0200
Subject: [PATCH 27/59] minifix for spacing of question sign tooltips when html
 is minified

---
 src/app/directives/tip.js             | 4 ++--
 src/app/panels/graph/styleEditor.html | 2 +-
 src/css/less/grafana.less             | 4 ++++
 src/css/less/variables.dark.less      | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/app/directives/tip.js b/src/app/directives/tip.js
index 975a4c02228..974ed98a637 100644
--- a/src/app/directives/tip.js
+++ b/src/app/directives/tip.js
@@ -11,10 +11,10 @@ function (angular, kbn) {
       return {
         restrict: 'E',
         link: function(scope, elem, attrs) {
-          var _t = '<i class="icon-'+(attrs.icon||'question-sign')+'" bs-tooltip="\''+
+          var _t = '<i class="grafana-tip icon-'+(attrs.icon||'question-sign')+'" bs-tooltip="\''+
             kbn.addslashes(elem.text())+'\'"></i>';
           elem.replaceWith($compile(angular.element(_t))(scope));
         }
       };
     });
-});
\ No newline at end of file
+});
diff --git a/src/app/panels/graph/styleEditor.html b/src/app/panels/graph/styleEditor.html
index b8c80473ebd..cd83f23f197 100644
--- a/src/app/panels/graph/styleEditor.html
+++ b/src/app/panels/graph/styleEditor.html
@@ -27,7 +27,7 @@
       <select class="input-mini" ng-model="panel.pointradius" ng-options="f for f in [1,2,3,4,5,6,7,8,9,10]" ng-change="render()"></select>
     </div>
     <div class="editor-option">
-      <label class="small">Null point mode <tip>Define how null values should be drawn</tip></label>
+      <label class="small">Null point mode<tip>Define how null values should be drawn</tip></label>
       <select class="input-medium" ng-model="panel.nullPointMode" ng-options="f for f in ['connected', 'null', 'null as zero']" ng-change="render()"></select>
     </div>
     <div class="editor-option">
diff --git a/src/css/less/grafana.less b/src/css/less/grafana.less
index 7c17e6967db..3e52b7fc94c 100644
--- a/src/css/less/grafana.less
+++ b/src/css/less/grafana.less
@@ -504,3 +504,7 @@ select.grafana-target-segment-input {
     margin-top: 5px;
   }
 }
+
+.grafana-tip {
+  padding-left: 5px;
+}
diff --git a/src/css/less/variables.dark.less b/src/css/less/variables.dark.less
index 608dfb609b0..f3817ef454d 100644
--- a/src/css/less/variables.dark.less
+++ b/src/css/less/variables.dark.less
@@ -35,7 +35,7 @@
 
 // Graphite Target Editor
 @grafanaTargetBorder:         @black;
-@grafanaTargetBackground:     @grayDark;
+@grafana-info-box grafanaTargetBackground:     @grayDark;
 @grafanaTargetColor:          #c8c8c8;
 @grafanaTargetColorHide:      darken(#c8c8c8, 25%);
 @grafanaTargetSegmentBorder:  #050505;

From 762dab618afb31f071488be6d1155cfa87443d30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Thu, 11 Sep 2014 14:07:27 +0200
Subject: [PATCH 28/59] Small change to datasourceSrv, if datasource is not
 found, return default datasource

---
 src/app/services/datasourceSrv.js | 2 +-
 src/css/less/variables.dark.less  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/services/datasourceSrv.js b/src/app/services/datasourceSrv.js
index 5d26ebdc28c..effb3d1a7dc 100644
--- a/src/app/services/datasourceSrv.js
+++ b/src/app/services/datasourceSrv.js
@@ -80,7 +80,7 @@ function (angular, _, config) {
       if (!name) { return this.default; }
       if (datasources[name]) { return datasources[name]; }
 
-      throw "Unable to find datasource: " + name;
+      return this.default;
     };
 
     this.getAnnotationSources = function() {
diff --git a/src/css/less/variables.dark.less b/src/css/less/variables.dark.less
index f3817ef454d..608dfb609b0 100644
--- a/src/css/less/variables.dark.less
+++ b/src/css/less/variables.dark.less
@@ -35,7 +35,7 @@
 
 // Graphite Target Editor
 @grafanaTargetBorder:         @black;
-@grafana-info-box grafanaTargetBackground:     @grayDark;
+@grafanaTargetBackground:     @grayDark;
 @grafanaTargetColor:          #c8c8c8;
 @grafanaTargetColorHide:      darken(#c8c8c8, 25%);
 @grafanaTargetSegmentBorder:  #050505;

From 6ca73f6df0d99e7bea0cdd84875ab990b7593c45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Thu, 11 Sep 2014 14:25:20 +0200
Subject: [PATCH 29/59] Do not render graph when width is zero, avoids plot
 errors

---
 src/app/directives/grafanaGraph.js | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/app/directives/grafanaGraph.js b/src/app/directives/grafanaGraph.js
index 9bb302bf671..15f1556aa62 100755
--- a/src/app/directives/grafanaGraph.js
+++ b/src/app/directives/grafanaGraph.js
@@ -15,7 +15,7 @@ function (angular, $, kbn, moment, _) {
       restrict: 'A',
       template: '<div> </div>',
       link: function(scope, elem) {
-        var data, plot, annotations;
+        var data, annotations;
         var hiddenData = {};
         var dashboard = scope.dashboard;
         var legendSideLastValue = null;
@@ -82,6 +82,10 @@ function (angular, $, kbn, moment, _) {
             render_panel_as_graphite_png(data);
             return true;
           }
+
+          if (elem.width() === 0) {
+            return;
+          }
         }
 
         // Function for rendering panel
@@ -165,18 +169,22 @@ function (angular, $, kbn, moment, _) {
 
           var sortedSeries = _.sortBy(data, function(series) { return series.zindex; });
 
-          // if legend is to the right delay plot draw a few milliseconds
-          // so the legend width calculation can be done
+          function callPlot() {
+            try {
+              $.plot(elem, sortedSeries, options);
+            } catch (e) {
+              console.log('flotcharts error', e);
+            }
+
+            addAxisLabels();
+          }
+
           if (shouldDelayDraw(panel)) {
+            setTimeout(callPlot, 50);
             legendSideLastValue = panel.legend.rightSide;
-            setTimeout(function() {
-              plot = $.plot(elem, sortedSeries, options);
-              addAxisLabels();
-            }, 50);
           }
           else {
-            plot = $.plot(elem, sortedSeries, options);
-            addAxisLabels();
+            callPlot();
           }
         }
 

From 5a3db0505fb3a95ab925045b8d0e0813722ef683 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Thu, 11 Sep 2014 16:00:59 +0200
Subject: [PATCH 30/59] Small fix to elasticsearch save error handling

---
 src/app/services/elasticsearch/es-datasource.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/services/elasticsearch/es-datasource.js b/src/app/services/elasticsearch/es-datasource.js
index 4d1f6272720..80e3c5d0100 100644
--- a/src/app/services/elasticsearch/es-datasource.js
+++ b/src/app/services/elasticsearch/es-datasource.js
@@ -170,8 +170,8 @@ function (angular, _, config, kbn, moment) {
           .then(function(results) {
             self._removeUnslugifiedDashboard(results, title);
             return { title: title, url: '/dashboard/db/' + id };
-          }, function(err) {
-            throw 'Failed to save to elasticsearch ' + err.data;
+          }, function() {
+            throw 'Failed to save to elasticsearch';
           });
       }
     };

From 2c6ea276c1c0bfc684e7ed29d80d79e65e21716f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Thu, 11 Sep 2014 17:19:39 +0200
Subject: [PATCH 31/59] Fixed small bug in graphite target controller when
 having variable for single parameter function

---
 src/app/controllers/graphiteTarget.js      |  2 +-
 src/test/specs/graphiteTargetCtrl-specs.js | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/app/controllers/graphiteTarget.js b/src/app/controllers/graphiteTarget.js
index cd13926cc80..cd8462ac62d 100644
--- a/src/app/controllers/graphiteTarget.js
+++ b/src/app/controllers/graphiteTarget.js
@@ -90,7 +90,7 @@ function (angular, _, config, gfunc, Parser) {
         break;
       case 'metric':
         if ($scope.segments.length > 0) {
-          if ($scope.segments[0].length !== 1) {
+          if (astNode.segments.length !== 1) {
             throw { message: 'Multiple metric params not supported, use text editor.' };
           }
           addFunctionParameter(func, astNode.segments[0].value, index, true);
diff --git a/src/test/specs/graphiteTargetCtrl-specs.js b/src/test/specs/graphiteTargetCtrl-specs.js
index 57f3870cb5d..27be0d92b26 100644
--- a/src/test/specs/graphiteTargetCtrl-specs.js
+++ b/src/test/specs/graphiteTargetCtrl-specs.js
@@ -99,6 +99,25 @@ define([
 
     });
 
+    describe('when initializing a target with single param func using variable', function() {
+      beforeEach(function() {
+        ctx.scope.target.target = 'movingAverage(prod.count, $var)';
+        ctx.scope.datasource.metricFindQuery.returns(ctx.$q.when([]));
+        ctx.scope.init();
+        ctx.scope.$digest();
+        ctx.scope.$parent = { get_data: sinon.spy() };
+      });
+
+      it('should add 2 segments', function() {
+        expect(ctx.scope.segments.length).to.be(2);
+      });
+
+      it('should add function param', function() {
+        expect(ctx.scope.functions[0].params.length).to.be(1);
+      });
+
+    });
+
     describe('when initalizing target without metric expression and function with series-ref', function() {
       beforeEach(function() {
         ctx.scope.target.target = 'asPercent(metric.node.count, #A)';

From 48eb2083f25566995575dd7773ca80fd08a4c140 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Thu, 11 Sep 2014 17:25:59 +0200
Subject: [PATCH 32/59] Fix for graphite query letter assignment

---
 src/app/controllers/graphiteTarget.js | 2 +-
 src/app/partials/graphite/editor.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/controllers/graphiteTarget.js b/src/app/controllers/graphiteTarget.js
index cd8462ac62d..27299474bc0 100644
--- a/src/app/controllers/graphiteTarget.js
+++ b/src/app/controllers/graphiteTarget.js
@@ -15,7 +15,7 @@ function (angular, _, config, gfunc, Parser) {
 
     $scope.init = function() {
       $scope.target.target = $scope.target.target || '';
-      $scope.targetLetter = targetLetters[$scope.$index];
+      $scope.targetLetters = targetLetters;
 
       parseTarget();
     };
diff --git a/src/app/partials/graphite/editor.html b/src/app/partials/graphite/editor.html
index 46e7d081884..4d670255bc0 100755
--- a/src/app/partials/graphite/editor.html
+++ b/src/app/partials/graphite/editor.html
@@ -41,7 +41,7 @@
 
       <ul class="grafana-segment-list">
 				<li class="grafana-target-segment" style="min-width: 15px; text-align: center">
-					{{targetLetter}}
+					{{targetLetters[$index]}}
         </li>
         <li>
           <a  class="grafana-target-segment"

From 7b45a2ec519f64a79a665cead374ea9de8a5f101 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Fri, 12 Sep 2014 13:15:06 +0200
Subject: [PATCH 33/59] Small fix to scripted async dashboard example

---
 src/app/dashboards/scripted_async.js | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/app/dashboards/scripted_async.js b/src/app/dashboards/scripted_async.js
index 84e5d976f6b..31d23f2dde2 100644
--- a/src/app/dashboards/scripted_async.js
+++ b/src/app/dashboards/scripted_async.js
@@ -35,11 +35,9 @@ return function(callback) {
 
   // Set a title
   dashboard.title = 'Scripted dash';
-  dashboard.services.filter = {
-    time: {
-      from: "now-" + (ARGS.from || timspan),
-      to: "now"
-    }
+  dashboard.time = {
+    from: "now-" + (ARGS.from || timspan),
+    to: "now"
   };
 
   var rows = 1;
@@ -78,4 +76,4 @@ return function(callback) {
     callback(dashboard);
 
   });
-}
\ No newline at end of file
+}

From bf9eaea33450c8c322e70056efd3b0e46192fd1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Fri, 12 Sep 2014 13:19:17 +0200
Subject: [PATCH 34/59] Updated lastest.json

---
 latest.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/latest.json b/latest.json
index 38e862a643a..c66de1bc179 100644
--- a/latest.json
+++ b/latest.json
@@ -1,4 +1,4 @@
 {
-	"version": "1.7.0",
-	"url": "http://grafanarel.s3.amazonaws.com/grafana-1.7.0"
+	"version": "1.8.0-rc1",
+	"url": "http://grafanarel.s3.amazonaws.com/grafana-1.8.0-rc1"
 }

From 15f2b2cf9a8a8318fbe0a5d52377cd32286a18ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Sat, 13 Sep 2014 16:19:33 +0200
Subject: [PATCH 35/59] Annotations: fixed InfluxDB annotation query, added
 unit test for annotation query, Fixes #802

---
 CHANGELOG.md                                  |  7 ++++-
 .../services/influxdb/influxdbDatasource.js   |  2 +-
 src/test/specs/influxdb-datasource-specs.js   | 26 ++++++++++++++++++-
 3 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a182bbf6cad..6d6c63ee023 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,9 @@
-# 1.8.0 (unreleased)
+# 1.8.0 (2014-09-12)
+
+**Fixes**
+- [Issue #802](https://github.com/grafana/grafana/issues/802). Annotations: Fix when using InfluxDB datasource
+
+# 1.8.0-RC1 (2014-09-12)
 
 **UI polish / changes**
 - [Issue #725](https://github.com/grafana/grafana/issues/725). UI: All modal editors are removed and replaced by an edit pane under menu. The look of editors is also updated and polished. Search dropdown is also shown as pane under menu and has seen some UI polish.
diff --git a/src/app/services/influxdb/influxdbDatasource.js b/src/app/services/influxdb/influxdbDatasource.js
index d9a7d8b378c..c076fb2c5e1 100644
--- a/src/app/services/influxdb/influxdbDatasource.js
+++ b/src/app/services/influxdb/influxdbDatasource.js
@@ -64,7 +64,7 @@ function (angular, _, kbn, InfluxSeries, InfluxQueryBuilder) {
     InfluxDatasource.prototype.annotationQuery = function(annotation, rangeUnparsed) {
       var timeFilter = getTimeFilter({ range: rangeUnparsed });
       var query = annotation.query.replace('$timeFilter', timeFilter);
-      query = templateSrv.replace(annotation.query);
+      query = templateSrv.replace(query);
 
       return this._seriesQuery(query).then(function(results) {
         return new InfluxSeries({ seriesList: results, annotation: annotation }).getAnnotations();
diff --git a/src/test/specs/influxdb-datasource-specs.js b/src/test/specs/influxdb-datasource-specs.js
index ddf7db48282..3851b0cd898 100644
--- a/src/test/specs/influxdb-datasource-specs.js
+++ b/src/test/specs/influxdb-datasource-specs.js
@@ -8,7 +8,7 @@ define([
     var ctx = new helpers.ServiceTestContext();
 
     beforeEach(module('grafana.services'));
-    beforeEach(ctx.providePhase());
+    beforeEach(ctx.providePhase(['templateSrv']));
     beforeEach(ctx.createService('InfluxDatasource'));
     beforeEach(function() {
       ctx.ds = new ctx.service({ urls: [''], user: 'test', password: 'mupp' });
@@ -70,6 +70,30 @@ define([
 
     });
 
+    describe('When issuing annotation query', function() {
+      var results;
+      var urlExpected = "/series?p=mupp&q=select+title+from+events.backend_01"+
+                        "+where+time+%3E+now()+-+1h&time_precision=s";
+
+      var range = { from: 'now-1h', to: 'now' };
+      var annotation = { query: 'select title from events.$server where $timeFilter' };
+      var response = [];
+
+      beforeEach(function() {
+        ctx.templateSrv.replace = function(str) {
+          return str.replace('$server', 'backend_01');
+        };
+        ctx.$httpBackend.expect('GET', urlExpected).respond(response);
+        ctx.ds.annotationQuery(annotation, range).then(function(data) { results = data; });
+        ctx.$httpBackend.flush();
+      });
+
+      it('should generate the correct query', function() {
+        ctx.$httpBackend.verifyNoOutstandingExpectation();
+      });
+
+    });
+
   });
 
 });

From 96a0d0aefa0005211d35f2c2af43731e1fa2384e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Sat, 13 Sep 2014 16:38:01 +0200
Subject: [PATCH 36/59] fixed changelog

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6d6c63ee023..2301c2b35a8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# 1.8.0 (2014-09-12)
+# 1.8.0 (unreleased)
 
 **Fixes**
 - [Issue #802](https://github.com/grafana/grafana/issues/802). Annotations: Fix when using InfluxDB datasource

From 92bec31ccb158a5edd234e302adae2262cb46ff1 Mon Sep 17 00:00:00 2001
From: starshayayord <starshayayord@gmail.com>
Date: Mon, 15 Sep 2014 18:51:58 +0600
Subject: [PATCH 37/59] Update index.html

disable google translate plugin
---
 src/index.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/index.html b/src/index.html
index 63e837abfcd..d47f9df9196 100644
--- a/src/index.html
+++ b/src/index.html
@@ -5,6 +5,7 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width">
+    <meta name="google" value="notranslate">
 
     <title>Grafana</title>
     <link rel="stylesheet" href="css/grafana.dark.min.css" title="Dark">

From 32a41a8422b8b5c4381efd0aacbe989e747b4d8c Mon Sep 17 00:00:00 2001
From: Lorenzo Pierfederici <lorenzop@image-engine.com>
Date: Mon, 15 Sep 2014 18:12:20 -0700
Subject: [PATCH 38/59] add override options to allow multiple stacks

---
 src/app/panels/graph/seriesOverridesCtrl.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/panels/graph/seriesOverridesCtrl.js b/src/app/panels/graph/seriesOverridesCtrl.js
index 4f54c6d0e6f..1b6b1dfc144 100644
--- a/src/app/panels/graph/seriesOverridesCtrl.js
+++ b/src/app/panels/graph/seriesOverridesCtrl.js
@@ -70,7 +70,7 @@ define([
     $scope.addOverrideOption('Staircase line', 'steppedLine', [true, false]);
     $scope.addOverrideOption('Points', 'points', [true, false]);
     $scope.addOverrideOption('Points Radius', 'pointradius', [1,2,3,4,5]);
-    $scope.addOverrideOption('Stack', 'stack', [true, false]);
+    $scope.addOverrideOption('Stack', 'stack', [true, false, 2, 3, 4, 5]);
     $scope.addOverrideOption('Y-axis', 'yaxis', [1, 2]);
     $scope.addOverrideOption('Z-index', 'zindex', [-1,-2,-3,0,1,2,3]);
     $scope.updateCurrentOverrides();

From ff91430fcc9e539671cde35e27a04101a8b202bb Mon Sep 17 00:00:00 2001
From: Torkel Odegaard <torkel.odegaard@gmail.com>
Date: Tue, 16 Sep 2014 08:01:18 +0200
Subject: [PATCH 39/59] added favicons

---
 src/app/partials/dashboard_topnav.html |   2 +-
 src/img/fav16.png                      | Bin 0 -> 639 bytes
 src/img/fav32.png                      | Bin 0 -> 1344 bytes
 src/index.html                         |   1 +
 4 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 src/img/fav16.png
 create mode 100644 src/img/fav32.png

diff --git a/src/app/partials/dashboard_topnav.html b/src/app/partials/dashboard_topnav.html
index 15ea694058c..689b8374b1c 100644
--- a/src/app/partials/dashboard_topnav.html
+++ b/src/app/partials/dashboard_topnav.html
@@ -1,7 +1,7 @@
 <div class="navbar navbar-static-top">
 	<div class="navbar-inner">
 		<div class="container-fluid">
-			<span class="brand"><img src="img/small.png" bs-tooltip="'Grafana'" data-placement="bottom"> {{dashboard.title}}</span>
+			<span class="brand"><img src="img/fav32.png" bs-tooltip="'Grafana'" data-placement="bottom"> {{dashboard.title}}</span>
 			<ul class="nav pull-right" ng-controller='DashboardNavCtrl' ng-init="init()">
 
 				<li ng-show="dashboardViewState.fullscreen">
diff --git a/src/img/fav16.png b/src/img/fav16.png
new file mode 100644
index 0000000000000000000000000000000000000000..c5cdb319630826dc181f0db531dd3bb911a12fcb
GIT binary patch
literal 639
zcmV-_0)YLAP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000XU000XU0RWnu7ytkQAxT6*R5*>5lV3<vVHn1L=kv^Y=JCww
z)-?aHp+px^K@?p?L3m-^1qQOa2!guH!ftkBUA4UFBEb<vT`73eKM*x3$;7}AK@38r
zL{<$}?zB1G+4;Jt*_<Qmx%&8?_xJGfzPt)WibT3YF~bP2R_m=v&E)`ar&HN_)BI4M
zG;iLxerK?-UdccDd%L{zx@U5sp?+U+XrT_QeqLydWlvn|=}Bw_^!Ijor@eKHE44Mo
z-{8C&6W`Xt{^|3&Gd`sP%<G=Xe}w_snpfO4T6)CB^-e@0-J#vuF4ms14FIG?K*S6q
z{68>&)7?pCwvzNyYfP+G>#cbspssP>`<&aJah!@(5^nbg@J-E-nJ~$HEITCfs{%Mu
z5ywzA2&&&{c9=Why)J{cO{ka{`}HC0peQUjSb2)<ipJ)Whb!)5G&!^_PgMk${jInk
z^lb}O-RV>|p;tLVMjZ`rW=OqF0V#CtF5%7#Oll6ijN*4Spg(z!Tu*PoHeyM6_W0u0
z{l1j1B6*bTqtP90yUw*x-n0zBk3k#j%O6il?up~RSaq#P;!KX09NNa~MeK~giYr)&
z?VglGRiVgRIa6NE%;G5(kc&eyx^p8EyRT(nWKIG2)X|~kRC5@ioGjT!k!;CJQNDgA
z`0!Om05lH`t(RF<?btH98!WN=@-P%!V_wUlvxg<QONy<WM%Y34J#EPgDT%fW49^wT
Z{{*Td!)!5q4q^ZR002ovPDHLkV1g&ODK!89

literal 0
HcmV?d00001

diff --git a/src/img/fav32.png b/src/img/fav32.png
new file mode 100644
index 0000000000000000000000000000000000000000..5eec853a02f5702f41f6dc69e12a501b140be100
GIT binary patch
literal 1344
zcmV-G1;6@<P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm000XU000XU0RWnu7ytkS;z>k7R9J<zmV0QGbr{D#@9(_l;&wb|
zW4g^vb5{|(Z0K;Zf<SPMZV*VIjtHTw&>%N-76d}YJZc1@A@zranz8z$sHxLMLuY{~
z8#b-oQcJfnwcXBpZtwg1^@nb5=j?Jew(o!MbNPM0@ALki=Xo{a#Gym)XAare`@rSe
z*za~{_BoviA%|T9aE8MwDHJxmLqm5L7=gM(rBzo{d~!FQbG0dneU)XmyxzkdX{mV;
zn=LM}4$CCBySFu?Z*WIdmGAtF1ROiKYe8FL(%I{oi`GhQN}c0ENX6=VU02e(t+I-J
z`yR$Ez~`$hZOY8}vDf2q&WJe*3kL>*YyRzev2xFW`e<KFO?|%ITN-n-zwb{-u+IiL
zfZ=rNU7q>n+t#i4>q6b-meIa374Z2gOB-`@&KM4dm@V?r@Pq^ML)XPmm!u3n)HLl(
za&c|bh=8L9DpD_HWZs#rvPZ+AS$vfAD_MF!08&bcX4|R{2Xwl<wR1%d@U-)v5pn<_
zgaE5rz@t{Xp1El4T#*BKMJUFm5NQJ7me+fDrmYq)n!@R*XrtsOaq!@-B^_z0d2`AR
z^ocYAsc)gIM6e*(YFWmg_FcMPckPLH!p#&K@b<DIWH7?Ou>i`HfM!#KOY{dW*T#tw
z-CCIKo@=ae^w4LyIO$)(<<R133n<ITV})k{!NYq{rujselp939+nqU4;&#t9iXHc`
zW3kZY=UvYgmX5l~@!+Wh4_mWV5&rILWOvkl5)_C&r!!%q<TZ}&sCY%8qbF{1yRfly
zc`>2ZKQJ5W#)(ilVtA#F2fv&bV+)WNw}8#rt4Kv4j~|^V#5>{0ooCarrM$}M-ccfx
z&G}nd?M|MOydXK9vPHRA$B&=}C;n`@GaOci%N0|F_p(;wu<Q)h*w7c7C_k9(UD%($
zMAgQZxY*gk7d`EmQpOzWu{(Jue=UK=daRbF$#nMXNujV|xLjlE`bugRD^oHss`ny$
zB3L6=!6fv<Y0MkVJoEYvRwbuXeXEH(#sJxR9|evc`lXAa>`mwc{a7_$O;IPUQ}+%H
z-M#1aEE_g0PfTJ{ULm35N02>T<EB|{H!(imjeE-*R2OXEYWp{=Q@=1gOx56h22WcM
ziA>HfY1UH$#`zcKwJ$4l^x#(s6fSuU^Wp^}SAUx{R~deSUw(#t{j(I8w7`@0Mho3W
zcPqkEyuX5a{mr5qn#=wqTlM-FJQuq-CPL)*22_zii@MHY!sdPisiYCGLbbwWGs{Oi
zG!?*}ZN)7B!2COE%_xZ6j#)ip1)`l?S<^72L+p|o$1*95dPRZ)JzGQhA=s#}?oW~+
zi3p|b2hb7fbI__rxPyvt`}7p3Aoy!l+{%?uhnAi?*8w1sir0OhP&<{WE`(d<e?v72
z<)0S+^q^?g?7@A*k7EW<TX|`oF1ZY1;T+NT2y7)wPyO6EY#4KQ^H0>ZgI)@<cP_}4
zkk5@Kj}ZWneX6#}6qF$4^;x4<Gz)AcIVb9xqg~@Jqx=(f?Kaa>3>;8nM$9xJi6~Sx
zj==ipHy_57f1+*WrFk}!Dy6YmXj6@s$Gl1!0_~)b+Ww{Ap6!?{Htt{Ho7-NV?+iws
z*QDHlpa4`3;C<}w2dxuHvx0iV3f8WyX&8#<-2VZcG3#(sJVhq}0000<MNUMnLSTXr
Cmyfdm

literal 0
HcmV?d00001

diff --git a/src/index.html b/src/index.html
index d47f9df9196..0274494c169 100644
--- a/src/index.html
+++ b/src/index.html
@@ -9,6 +9,7 @@
 
     <title>Grafana</title>
     <link rel="stylesheet" href="css/grafana.dark.min.css" title="Dark">
+    <link rel="icon" type="image/png" href="img/fav16.png">
 
     <!-- build:js app/app.js -->
     <script src="vendor/require/require.js"></script>

From 26bb2e0193a90a97f4a234b21e39816769ced26e Mon Sep 17 00:00:00 2001
From: Alexey Remizov <rem@onsec.ru>
Date: Tue, 16 Sep 2014 13:08:28 +0400
Subject: [PATCH 40/59] fix typos

---
 CHANGELOG.md                          | 2 +-
 src/app/partials/graphite/editor.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2301c2b35a8..96a6905d158 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -244,7 +244,7 @@ Read this for more info:
 - More graphite function definitions
 - Make "ms" axis format include hour, day, weeks, month and year ([Issue #149](https://github.com/grafana/grafana/issues/149))
 - Microsecond axis format ([Issue #146](https://github.com/grafana/grafana/issues/146))
-- Specify template paramaters in URL ([Issue #123](https://github.com/grafana/grafana/issues/123))
+- Specify template parameters in URL ([Issue #123](https://github.com/grafana/grafana/issues/123))
 
 ### Fixes
 - Basic Auth fix ([Issue #152](https://github.com/grafana/grafana/issues/152))
diff --git a/src/app/partials/graphite/editor.html b/src/app/partials/graphite/editor.html
index 4d670255bc0..dcbc4306e0f 100755
--- a/src/app/partials/graphite/editor.html
+++ b/src/app/partials/graphite/editor.html
@@ -108,7 +108,7 @@
 				</li>
 				<li class="grafana-target-segment">
 					<a ng-click="toggleEditorHelp(2);" bs-tooltip="'click to show helpful info'" data-placement="bottom">
-						series as paramaters
+						series as parameters
 					</a>
 				</li>
 				<li class="grafana-target-segment">

From 5e9ed95684bec0166768c7c4c268532059b39e90 Mon Sep 17 00:00:00 2001
From: Marcus Hammarberg <marcusoft.net@gmail.com>
Date: Tue, 16 Sep 2014 17:45:43 +0700
Subject: [PATCH 41/59] Added a favicon. This will resolve issue #796

---
 src/favicon.ico | Bin 0 -> 32038 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 src/favicon.ico

diff --git a/src/favicon.ico b/src/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..23174fc962385f60e952bc77c2a038aac4843f01
GIT binary patch
literal 32038
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
PaWvIrvJX4GO~(8`Rv#)`

literal 0
HcmV?d00001


From 064a97e7342f1bda60521efa16a9b1791fd62383 Mon Sep 17 00:00:00 2001
From: Torkel Odegaard <torkel.odegaard@gmail.com>
Date: Tue, 16 Sep 2014 12:06:18 +0200
Subject: [PATCH 42/59] added favicon, Closes #796

---
 src/app/partials/dashboard_topnav.html |   5 ++++-
 src/css/less/bootswatch.dark.less      |   2 +-
 src/css/less/grafana.less              |  13 +++++++++++++
 src/img/fav16.png                      | Bin 639 -> 3971 bytes
 src/img/fav32.png                      | Bin 1344 -> 3971 bytes
 src/img/fav_dark_16.png                | Bin 0 -> 4837 bytes
 src/img/fav_dark_32.png                | Bin 0 -> 3435 bytes
 src/index.html                         |   2 +-
 8 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 src/img/fav_dark_16.png
 create mode 100644 src/img/fav_dark_32.png

diff --git a/src/app/partials/dashboard_topnav.html b/src/app/partials/dashboard_topnav.html
index 689b8374b1c..b6db19d33aa 100644
--- a/src/app/partials/dashboard_topnav.html
+++ b/src/app/partials/dashboard_topnav.html
@@ -1,7 +1,10 @@
 <div class="navbar navbar-static-top">
 	<div class="navbar-inner">
 		<div class="container-fluid">
-			<span class="brand"><img src="img/fav32.png" bs-tooltip="'Grafana'" data-placement="bottom"> {{dashboard.title}}</span>
+			<span class="brand">
+				<img class="logo-icon" src="img/fav32.png" bs-tooltip="'Grafana'" data-placement="bottom"></img>
+				<span class="page-title">{{dashboard.title}}</span>
+			</span>
 			<ul class="nav pull-right" ng-controller='DashboardNavCtrl' ng-init="init()">
 
 				<li ng-show="dashboardViewState.fullscreen">
diff --git a/src/css/less/bootswatch.dark.less b/src/css/less/bootswatch.dark.less
index d1bfbcf1154..ad9fe11e73d 100644
--- a/src/css/less/bootswatch.dark.less
+++ b/src/css/less/bootswatch.dark.less
@@ -56,7 +56,7 @@ hr {
 	}
 
 	.brand {
-		padding: 15px 20px 15px;
+		padding: 0px 15px;
 		color: @grayLighter;
 		font-weight: normal;
 		text-shadow: none;
diff --git a/src/css/less/grafana.less b/src/css/less/grafana.less
index 3e52b7fc94c..da9f300b0e7 100644
--- a/src/css/less/grafana.less
+++ b/src/css/less/grafana.less
@@ -35,6 +35,19 @@
   }
 }
 
+.logo-icon {
+  width: 26px;
+  padding: 12px 11px 0 0;
+  display: block;
+  float: left;
+}
+
+.page-title {
+ padding: 15px 0;
+ display: block;
+ float: left;
+}
+
 .row-button {
   width: 24px;
 }
diff --git a/src/img/fav16.png b/src/img/fav16.png
index c5cdb319630826dc181f0db531dd3bb911a12fcb..827cd972e4bbb57d74493f8f19c620ebf7a15e69 100644
GIT binary patch
literal 3971
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

literal 639
zcmV-_0)YLAP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000XU000XU0RWnu7ytkQAxT6*R5*>5lV3<vVHn1L=kv^Y=JCww
z)-?aHp+px^K@?p?L3m-^1qQOa2!guH!ftkBUA4UFBEb<vT`73eKM*x3$;7}AK@38r
zL{<$}?zB1G+4;Jt*_<Qmx%&8?_xJGfzPt)WibT3YF~bP2R_m=v&E)`ar&HN_)BI4M
zG;iLxerK?-UdccDd%L{zx@U5sp?+U+XrT_QeqLydWlvn|=}Bw_^!Ijor@eKHE44Mo
z-{8C&6W`Xt{^|3&Gd`sP%<G=Xe}w_snpfO4T6)CB^-e@0-J#vuF4ms14FIG?K*S6q
z{68>&)7?pCwvzNyYfP+G>#cbspssP>`<&aJah!@(5^nbg@J-E-nJ~$HEITCfs{%Mu
z5ywzA2&&&{c9=Why)J{cO{ka{`}HC0peQUjSb2)<ipJ)Whb!)5G&!^_PgMk${jInk
z^lb}O-RV>|p;tLVMjZ`rW=OqF0V#CtF5%7#Oll6ijN*4Spg(z!Tu*PoHeyM6_W0u0
z{l1j1B6*bTqtP90yUw*x-n0zBk3k#j%O6il?up~RSaq#P;!KX09NNa~MeK~giYr)&
z?VglGRiVgRIa6NE%;G5(kc&eyx^p8EyRT(nWKIG2)X|~kRC5@ioGjT!k!;CJQNDgA
z`0!Om05lH`t(RF<?btH98!WN=@-P%!V_wUlvxg<QONy<WM%Y34J#EPgDT%fW49^wT
Z{{*Td!)!5q4q^ZR002ovPDHLkV1g&ODK!89

diff --git a/src/img/fav32.png b/src/img/fav32.png
index 5eec853a02f5702f41f6dc69e12a501b140be100..827cd972e4bbb57d74493f8f19c620ebf7a15e69 100644
GIT binary patch
literal 3971
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

delta 1325
zcmV+|1=9M1AHWKbB!2{RLP=Bz2nYy#2xN!=000SaNLh0L01FcU01FcV0GgZ_000Ey
zNkl<ZScSEgduWw)7{@>F@4V;Yc06Zey3I{<R}s8y=y0-vKyZz25J;eo2%)UdAUAXt
z1VY6;Y6PMo^@oL;vHGK^snbP6XMrdiHm%)KOSdt#-OhV%?|=LI^@nb5=j?Jew(o!M
zbNPM0@ALki=Xo{a#Gym)XAare`@rSe*za~{_BoviA%|T9aE8MwDHJxmLqm5L7=gM(
zrBzo{d~!FQbG0dneU)XmyxzkdX{mV;n=LM}4$CCBySFu?Z*WIdmGAtF1ROiKYe8FL
z(%I{oi`GhQN`IZ>LP*8xdtF!3yREW{efu89Ex_liEN#ln__5dHan6W23JV7Yf@}Wm
zda-iPf%<4)Oig{h-CG)Sv%l|8NU+ZaIe_7G>Rq1s<=fV+`0GO5<(ARDF%|InDoY!4
zbIuqJhnOw$(eQ)=@<Z3fPnV<&KGZbrOmcB;(};kh2Y)J3FJ)xjnXR%%!=YJxl=LfE
zdOrYCN{MFMst*Try1lh?MGo+^^PdrN03n0`t6IRLR=b|LXzg5)19(L!#-<Qy0^pX{
zdw8a;7B8B@>8NO<<R@|P;I1VdX{mX0$`162Gy<t_p{zu(AlPbI#-H|Gx?gwgiFd-y
z6dLgMvVS6EFv7sG0LqkrW>bVq^an22#)%T$TA1ygYpikf&}X?g>0iO+(Bf$eD9gxW
zg=Yc5!+TJs`9zqM8$`d`ojFnBcF#469rv(fvC!t{UC$Mkj=IV5;Hd-;TeDUX{_bmJ
zchr6o6o@{jGhw3SHIDA6ctxS3CvI}Pu(5M_F@K@fKQJ5W#)(ilVtA#F2fv&bV+)WN
zw}8#rt4Kv4j~|^V#5>{0ooCarrM$}M-ccfx&G}nd?M|MOydXK9vPHRA$B&=}C;n`@
zGaOci%N0|F_p(;wu<Q)h*w7c7C_k9(UD%($MAgQZxY*gk7d`EmQpOzWu{(Jue=UK=
zdVj2zrpa{n>q()oVYpml>iSA*7AsRSFsk<=dm>mPSHUFo!)eSL%{=q^4pt?nQ+=z6
zJH`OndLIRj9{Qz=qU=rR1N~SvUrkXbtyA|74c)!x^(-4UEl*5hQ(hsV<42G^UE`)%
zZ8tGK-i>?98&nr;;A;CftW&=*JWSQ#eSZc|TM&s%&M#@!Qv$~M7v{AuD|GbWR|ym@
zc@6X81tM2}n>1G$eu7_qhJF3B6qmHXllDdn-9~pS!c)Azf_nYUq8pma{v=!V`WQSH
zyErC7<o5<tkwA;O&SJvmegvtc5wJqF!eukdM>{kXz@BZzEdap$J8I1+h}@1@J%3{b
zqMck>(=en%?2;PCGAWFDMS=o7TSNIF*r>4XPm&;s2&L@@&=Kl$(5gnbgNktb^c1Kd
z_-j?%%9T)umYzD-0U(l!*L|Q+JC&&}gj?l*Lp2KJpBDf0plH_Y!F|JzV+K%Ld1;<5
zxeQ|A9MSg(Y$Z!i{oFZh7;|^?Pk+?4gI)@<cP_}4kk5@Kj}ZWneX6#}6qF$4^;x4<
zGz)AcIVb9xqg~@Jqx=(f?Kaa>3>;8nM$9xJi6~Sxj==ipHy_57f1+*WrFk}!Dy6Ym
zXj6@s$Gl1!0_~)b+Ww{Ap6!?{Htt{Ho7-NV?+iws*QDHlpa4`3;C<}w2PUl(Nwb1_
j!wS}}tZ5jE=iL7RoiXchQ#?f{00000NkvXXu0mjfZK{!J

diff --git a/src/img/fav_dark_16.png b/src/img/fav_dark_16.png
new file mode 100644
index 0000000000000000000000000000000000000000..2f66c42db40ae33a18b48587dabee1b6442a4767
GIT binary patch
literal 4837
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
LNkvXXu0mjfusI^$

literal 0
HcmV?d00001

diff --git a/src/img/fav_dark_32.png b/src/img/fav_dark_32.png
new file mode 100644
index 0000000000000000000000000000000000000000..9248832f6717e9fd9383d0accd92b3894196e984
GIT binary patch
literal 3435
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
N002ovPDHLkV1oY}ah(7F

literal 0
HcmV?d00001

diff --git a/src/index.html b/src/index.html
index 0274494c169..bf3a2179363 100644
--- a/src/index.html
+++ b/src/index.html
@@ -9,7 +9,7 @@
 
     <title>Grafana</title>
     <link rel="stylesheet" href="css/grafana.dark.min.css" title="Dark">
-    <link rel="icon" type="image/png" href="img/fav16.png">
+    <link rel="icon" type="image/png" href="img/fav_dark_16.png">
 
     <!-- build:js app/app.js -->
     <script src="vendor/require/require.js"></script>

From 430e2e439b97cdd81897746a83e400f0dc5c6f62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Tue, 16 Sep 2014 13:32:27 +0200
Subject: [PATCH 43/59] Small fix to schemaUpgrade, Closes #807

---
 src/app/services/dashboard/dashboardSrv.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/services/dashboard/dashboardSrv.js b/src/app/services/dashboard/dashboardSrv.js
index 91587feda38..c6b386917ba 100644
--- a/src/app/services/dashboard/dashboardSrv.js
+++ b/src/app/services/dashboard/dashboardSrv.js
@@ -131,7 +131,7 @@ function (angular, $, kbn, _, moment) {
         if (old.services) {
           if (old.services.filter) {
             this.time = old.services.filter.time;
-            this.templating.list = old.services.filter.list;
+            this.templating.list = old.services.filter.list || [];
           }
           delete this.services;
         }

From 3099198e478b86c01c5337f7a87fd86d9bba9515 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Wed, 17 Sep 2014 09:03:34 +0200
Subject: [PATCH 44/59] Fixed default dashboard grafana logo when using https

---
 src/app/dashboards/default.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/dashboards/default.json b/src/app/dashboards/default.json
index ab22805f99c..70b907e13da 100644
--- a/src/app/dashboards/default.json
+++ b/src/app/dashboards/default.json
@@ -17,7 +17,7 @@
           "editable": true,
           "type": "text",
           "mode": "html",
-          "content": "<div class=\"text-center\" style=\"padding-top: 15px\">\n<img src=\"http://grafana.org/assets/img/logo_transparent_200x75.png\"> \n</div>",
+          "content": "<div class=\"text-center\" style=\"padding-top: 15px\">\n<img src=\"//grafana.org/assets/img/logo_transparent_200x75.png\"> \n</div>",
           "style": {},
           "title": "Welcome to"
         }

From d40e21a7e0337d1a4df9727e6e3e8b478e0bdc60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Wed, 17 Sep 2014 09:29:51 +0200
Subject: [PATCH 45/59] Chrome: Fix for display issue in chrome beta & chrome
 canary when entering edit mode, Closes #795

---
 CHANGELOG.md              |  1 +
 src/css/less/grafana.less | 15 +++++++--------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 96a6905d158..1909b01c7bc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 **Fixes**
 - [Issue #802](https://github.com/grafana/grafana/issues/802). Annotations: Fix when using InfluxDB datasource
+- [Issue #795](https://github.com/grafana/grafana/issues/795). Chrome: Fix for display issue in chrome beta & chrome canary when entering edit mode
 
 # 1.8.0-RC1 (2014-09-12)
 
diff --git a/src/css/less/grafana.less b/src/css/less/grafana.less
index da9f300b0e7..8d52f749ff5 100644
--- a/src/css/less/grafana.less
+++ b/src/css/less/grafana.less
@@ -36,8 +36,8 @@
 }
 
 .logo-icon {
-  width: 26px;
-  padding: 12px 11px 0 0;
+  width: 24px;
+  padding: 13px 11px 0 0;
   display: block;
   float: left;
 }
@@ -100,7 +100,7 @@
 
 .panel-fullscreen {
   z-index: 100;
-  display: block !important;
+  display: block;
   position: fixed;
   left: 0px;
   right: 0px;
@@ -116,11 +116,10 @@
   }
 }
 
-.dashboard-fullscreen .main-view-container {
-  height: 0px;
-  width: 0px;
-  position: fixed;
-  right: -10000px;
+.dashboard-fullscreen {
+  .row-control-inner {
+    display: none;
+  }
 }
 
 .histogram-chart {

From bba3f3000f701677909fa723446100c8990f9976 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Wed, 17 Sep 2014 13:00:35 +0200
Subject: [PATCH 46/59] Search: remove dashboard from search result after
 dashboard deletion, Closes #753

---
 src/app/controllers/search.js | 5 +++--
 src/app/partials/search.html  | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/app/controllers/search.js b/src/app/controllers/search.js
index 98e6616f0a4..18b860d0ab5 100644
--- a/src/app/controllers/search.js
+++ b/src/app/controllers/search.js
@@ -119,9 +119,10 @@ function (angular, _, config, $) {
       $scope.searchDashboards($scope.query.query);
     };
 
-    $scope.deleteDashboard = function(id, evt) {
+    $scope.deleteDashboard = function(dash, evt) {
       evt.stopPropagation();
-      $scope.emitAppEvent('delete-dashboard', { id: id });
+      $scope.emitAppEvent('delete-dashboard', { id: dash.id });
+      $scope.results.dashboards = _.without($scope.results.dashboards, dash);
     };
 
     $scope.addMetricToCurrentDashboard = function (metricId) {
diff --git a/src/app/partials/search.html b/src/app/partials/search.html
index e5241e9b11e..ccddfb14474 100644
--- a/src/app/partials/search.html
+++ b/src/app/partials/search.html
@@ -54,7 +54,7 @@
 					<a ng-click="shareDashboard(row.id, row.id, $event)" config-modal="app/partials/dashLoaderShare.html">
 						<i class="icon-share"></i> share &nbsp;&nbsp;&nbsp;
 					</a>
-					<a ng-click="deleteDashboard(row.id, $event)">
+					<a ng-click="deleteDashboard(row, $event)">
 						<i class="icon-remove"></i> delete
 					</a>
 				</div>

From 6dae8f44b9a95e4c4689220f553a57c38edec85c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Wed, 17 Sep 2014 13:58:32 +0200
Subject: [PATCH 47/59] Small fix for favicon

---
 src/favicon.ico | Bin 32038 -> 0 bytes
 src/index.html  |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100644 src/favicon.ico

diff --git a/src/favicon.ico b/src/favicon.ico
deleted file mode 100644
index 23174fc962385f60e952bc77c2a038aac4843f01..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 32038
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
PaWvIrvJX4GO~(8`Rv#)`

diff --git a/src/index.html b/src/index.html
index bf3a2179363..1c99649d8b7 100644
--- a/src/index.html
+++ b/src/index.html
@@ -9,7 +9,7 @@
 
     <title>Grafana</title>
     <link rel="stylesheet" href="css/grafana.dark.min.css" title="Dark">
-    <link rel="icon" type="image/png" href="img/fav_dark_16.png">
+    <link rel="icon" type="image/png" href="img/fav32.png">
 
     <!-- build:js app/app.js -->
     <script src="vendor/require/require.js"></script>

From a0ab9113fc11815630856154e99aaeaf4b4207ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Wed, 17 Sep 2014 15:39:45 +0200
Subject: [PATCH 48/59] Graph: added percent y-axis format, Closes #818

---
 CHANGELOG.md                         | 1 +
 src/app/components/kbn.js            | 4 ++++
 src/app/panels/graph/axisEditor.html | 4 ++--
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1909b01c7bc..7b525a62999 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 **Fixes**
 - [Issue #802](https://github.com/grafana/grafana/issues/802). Annotations: Fix when using InfluxDB datasource
 - [Issue #795](https://github.com/grafana/grafana/issues/795). Chrome: Fix for display issue in chrome beta & chrome canary when entering edit mode
+- [Issue #818](https://github.com/grafana/grafana/issues/818). Graph: Added percent y-axis format
 
 # 1.8.0-RC1 (2014-09-12)
 
diff --git a/src/app/components/kbn.js b/src/app/components/kbn.js
index cefcb42d289..374d2f561b8 100644
--- a/src/app/components/kbn.js
+++ b/src/app/components/kbn.js
@@ -531,6 +531,10 @@ function($, _, moment) {
       return function(val) {
         return kbn.nanosFormat(val, decimals);
       };
+    case 'percent':
+      return function(val, axis) {
+        return kbn.noneFormat(val, axis ? axis.tickDecimals : null) + ' %';
+      };
     default:
       return function(val, axis) {
         return kbn.noneFormat(val, axis ? axis.tickDecimals : null);
diff --git a/src/app/panels/graph/axisEditor.html b/src/app/panels/graph/axisEditor.html
index 6800ee832b9..9380cb99327 100644
--- a/src/app/panels/graph/axisEditor.html
+++ b/src/app/panels/graph/axisEditor.html
@@ -4,7 +4,7 @@
     <h5>Left Y Axis</h5>
        <div class="editor-option">
         <label class="small">Format <tip>Y-axis formatting</tip></label>
-        <select class="input-small" ng-model="panel.y_formats[0]" ng-options="f for f in ['none','short','bytes', 'bits', 'bps', 's', 'ms', 'µs', 'ns']" ng-change="render()"></select>
+        <select class="input-small" ng-model="panel.y_formats[0]" ng-options="f for f in ['none','short','bytes', 'bits', 'bps', 's', 'ms', 'µs', 'ns', 'percent']" ng-change="render()"></select>
       </div>
       <div class="editor-option">
         <label class="small">Min / <a ng-click="toggleGridMinMax('leftMin')">Auto <i class="icon-star" ng-show="_.isNull(panel.grid.leftMin)"></i></a></label>
@@ -23,7 +23,7 @@
     <h5>Right Y Axis</h5>
        <div class="editor-option">
         <label class="small">Format <tip>Y-axis formatting</tip></label>
-        <select class="input-small" ng-model="panel.y_formats[1]" ng-options="f for f in ['none','short','bytes', 'bits', 'bps', 's', 'ms', 'µs', 'ns']" ng-change="render()"></select>
+        <select class="input-small" ng-model="panel.y_formats[1]" ng-options="f for f in ['none','short','bytes', 'bits', 'bps', 's', 'ms', 'µs', 'ns', 'percent']" ng-change="render()"></select>
       </div>
       <div class="editor-option">
         <label class="small">Min / <a ng-click="toggleGridMinMax('rightMin')">Auto <i class="icon-star" ng-show="_.isNull(panel.grid.rightMin)"></i></a></label>

From 88ea524f44415b190d679de31aef2f4920559312 Mon Sep 17 00:00:00 2001
From: Julien Ozog <xam+github@ixene.net>
Date: Wed, 17 Sep 2014 17:12:43 +0200
Subject: [PATCH 49/59] Handle 'group' graphite method

---
 src/app/services/graphite/gfunc.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/app/services/graphite/gfunc.js b/src/app/services/graphite/gfunc.js
index 533bb897283..1acfad8739b 100644
--- a/src/app/services/graphite/gfunc.js
+++ b/src/app/services/graphite/gfunc.js
@@ -86,6 +86,13 @@ function (_) {
     category: categories.Calculate,
   });
 
+  addFuncDef({
+    name: 'group',
+    params: optionalSeriesRefArgs,
+    defaultParams: ['#A', '#B'],
+    category: categories.Combine,
+  });
+
   addFuncDef({
     name: 'sumSeries',
     shortName: 'sum',

From 98b3126e327079909c58792a5f199bda559a0d14 Mon Sep 17 00:00:00 2001
From: Bryan Irvine <sparctacus@gmail.com>
Date: Wed, 17 Sep 2014 11:04:06 -0700
Subject: [PATCH 50/59] Update playlist.html

---
 src/app/partials/playlist.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/partials/playlist.html b/src/app/partials/playlist.html
index 3b3ba7600c4..1517678e730 100644
--- a/src/app/partials/playlist.html
+++ b/src/app/partials/playlist.html
@@ -38,7 +38,7 @@
 				<div class="editor-option">
 					<div class="span4">
 						<span><i class="icon-question-sign"></i>
-							dashboards available in the playlist are only the once marked as favorites (stored in local browser storage).
+							dashboards available in the playlist are only the ones marked as favorites (stored in local browser storage).
 							to mark a dashboard as favorite, use save icon in the menu and in the dropdown select mark as favorite
 							<br/><br/>
 						</span>

From 77b0d36b554d4feaa1a91f49470e5409252e4700 Mon Sep 17 00:00:00 2001
From: Alexey Kirpichnikov <alex.kirp@gmail.com>
Date: Thu, 18 Sep 2014 17:50:59 +0600
Subject: [PATCH 51/59] enable withCredentials in elasticsearch basic auth

---
 src/app/services/elasticsearch/es-datasource.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/app/services/elasticsearch/es-datasource.js b/src/app/services/elasticsearch/es-datasource.js
index 80e3c5d0100..4f69df61f17 100644
--- a/src/app/services/elasticsearch/es-datasource.js
+++ b/src/app/services/elasticsearch/es-datasource.js
@@ -37,6 +37,7 @@ function (angular, _, config, kbn, moment) {
       };
 
       if (this.basicAuth) {
+        options.withCredentials = true;
         options.headers = {
           "Authorization": "Basic " + this.basicAuth
         };

From a68a179c1ef6ef66c520261ad732db679a47d9e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Thu, 18 Sep 2014 15:07:49 +0200
Subject: [PATCH 52/59] Small improvements to dashboard alerts, less intrusive,
 do not push down page anymore, Closes #822

---
 src/app/controllers/dashboardNavCtrl.js |  4 +--
 src/css/less/bootswatch.light.less      |  2 +-
 src/css/less/overrides.less             | 37 +++++++++++++++++++++----
 src/index.html                          | 17 ++++++++----
 4 files changed, 45 insertions(+), 15 deletions(-)

diff --git a/src/app/controllers/dashboardNavCtrl.js b/src/app/controllers/dashboardNavCtrl.js
index b6813b7ce19..76ef34f8e92 100644
--- a/src/app/controllers/dashboardNavCtrl.js
+++ b/src/app/controllers/dashboardNavCtrl.js
@@ -78,7 +78,7 @@ function (angular, _, moment, config, store) {
       var clone = angular.copy($scope.dashboard);
       $scope.db.saveDashboard(clone)
         .then(function(result) {
-          alertSrv.set('Dashboard Saved', 'Dashboard has been saved as "' + result.title + '"','success', 5000);
+          alertSrv.set('Dashboard Saved', 'Saved as "' + result.title + '"','success', 3000);
 
           if (result.url !== $location.path()) {
             $location.search({});
@@ -88,7 +88,7 @@ function (angular, _, moment, config, store) {
           $rootScope.$emit('dashboard-saved', $scope.dashboard);
 
         }, function(err) {
-          alertSrv.set('Save failed', err, 'error',5000);
+          alertSrv.set('Save failed', err, 'error', 5000);
         });
     };
 
diff --git a/src/css/less/bootswatch.light.less b/src/css/less/bootswatch.light.less
index 5675d605cbd..f4f573c58b0 100644
--- a/src/css/less/bootswatch.light.less
+++ b/src/css/less/bootswatch.light.less
@@ -59,6 +59,7 @@ a.text-success:hover { color: darken(@green, 10%); }
 	}
 
 	.brand {
+		padding: 0px 15px;
 
 		&:hover {
 			color: @navbarLinkColorHover;
@@ -461,7 +462,6 @@ legend {
 // -----------------------------------------------------
 
 .alert {
-	.border-radius(0);
 	text-shadow: none;
 
 	&-heading, h1, h2, h3, h4, h5, h6 {
diff --git a/src/css/less/overrides.less b/src/css/less/overrides.less
index 58e72ef43fa..957a56147dd 100644
--- a/src/css/less/overrides.less
+++ b/src/css/less/overrides.less
@@ -317,13 +317,38 @@ div.flot-text {
   color: @textColor !important;
 }
 
-.dashboard-notice {
+.page-alert-list {
   z-index:8000;
-  margin-left:0px;
-  padding:3px 0px 3px 0px;
-  width:100%;
-  padding-left:20px;
-  color: @white;
+  min-width: 300px;
+  max-width: 300px;
+  position: fixed;
+  right: 20px;
+  top: 56px;
+
+  .alert {
+    color: @white;
+    padding-bottom: 13px;
+    position: relative;
+  }
+
+  .alert-close {
+    position: absolute;
+    top: -4px;
+    right: -2px;
+    width: 19px;
+    height: 19px;
+    padding: 0;
+    background: @grayLighter;
+    border-radius: 50%;
+    border: none;
+    font-size: 1.1rem;
+    color: @grayDarker;
+  }
+
+  .alert-title {
+    font-weight: bold;
+    padding-bottom: 2px;
+  }
 }
 
 
diff --git a/src/index.html b/src/index.html
index 1c99649d8b7..84e7787b83d 100644
--- a/src/index.html
+++ b/src/index.html
@@ -24,12 +24,17 @@
 
     <link rel="stylesheet" href="css/grafana.light.min.css" ng-if="grafana.style === 'light'">
 
-    <div ng-repeat='alert in dashAlerts.list' class="alert-{{alert.severity}} dashboard-notice" ng-show="$last">
-      <button type="button" class="close" ng-click="dashAlerts.clear(alert)" style="padding-right:50px">&times;</button>
-      <strong>{{alert.title}}</strong> <span ng-bind-html='alert.text'></span> <div style="padding-right:10px" class='pull-right small'> {{$index + 1}} alert(s) </div>
-    </div>
+		<div class="page-alert-list">
+			<div ng-repeat='alert in dashAlerts.list' class="alert-{{alert.severity}} alert">
+				<button type="button" class="alert-close" ng-click="dashAlerts.clear(alert)">
+					<i class="icon-remove-sign"></i>
+				</button>
+				<div class="alert-title">{{alert.title}}</div>
+				<div ng-bind-html='alert.text'></div>
+			</div>
+		</div>
 
-    <div ng-view></div>
+		<div ng-view></div>
 
-  </body>
+	</body>
 </html>

From a97bcc3ca793c7c2bc6d06840f024156ba6e4942 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Fri, 19 Sep 2014 10:37:28 +0200
Subject: [PATCH 53/59] Elasticsearch: fix for issue when saving dashboard with
 title equal to slugified url, would cause the backward compatible fix to
 delete it, Closes #828

---
 CHANGELOG.md                                    | 1 +
 src/app/services/elasticsearch/es-datasource.js | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7b525a62999..b7d233c8237 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 - [Issue #802](https://github.com/grafana/grafana/issues/802). Annotations: Fix when using InfluxDB datasource
 - [Issue #795](https://github.com/grafana/grafana/issues/795). Chrome: Fix for display issue in chrome beta & chrome canary when entering edit mode
 - [Issue #818](https://github.com/grafana/grafana/issues/818). Graph: Added percent y-axis format
+- [Issue #828](https://github.com/grafana/grafana/issues/828). Elasticsearch: saving new dashboard with title equal to slugified url would cause it to deleted.
 
 # 1.8.0-RC1 (2014-09-12)
 
diff --git a/src/app/services/elasticsearch/es-datasource.js b/src/app/services/elasticsearch/es-datasource.js
index 4f69df61f17..ab03c614a83 100644
--- a/src/app/services/elasticsearch/es-datasource.js
+++ b/src/app/services/elasticsearch/es-datasource.js
@@ -169,7 +169,7 @@ function (angular, _, config, kbn, moment) {
 
         return this._request('PUT', '/dashboard/' + id, this.index, data)
           .then(function(results) {
-            self._removeUnslugifiedDashboard(results, title);
+            self._removeUnslugifiedDashboard(results, title, id);
             return { title: title, url: '/dashboard/db/' + id };
           }, function() {
             throw 'Failed to save to elasticsearch';
@@ -177,8 +177,9 @@ function (angular, _, config, kbn, moment) {
       }
     };
 
-    ElasticDatasource.prototype._removeUnslugifiedDashboard = function(saveResult, title) {
+    ElasticDatasource.prototype._removeUnslugifiedDashboard = function(saveResult, title, id) {
       if (saveResult.statusText !== 'Created') { return; }
+      if (title === id) { return; }
 
       var self = this;
       this._get('/dashboard/' + title).then(function() {

From 563dd898c1761b2aa80f559a6909da9e682119c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Fri, 19 Sep 2014 12:16:00 +0200
Subject: [PATCH 54/59] Graph: fix for downscaling y-axis format, never
 downscale when value is zero, Fixes #826

---
 src/app/components/kbn.js          | 8 ++++----
 src/app/directives/grafanaGraph.js | 5 +++++
 src/test/specs/kbn-format-specs.js | 6 ++++++
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/app/components/kbn.js b/src/app/components/kbn.js
index 374d2f561b8..7c61b22c83b 100644
--- a/src/app/components/kbn.js
+++ b/src/app/components/kbn.js
@@ -567,8 +567,8 @@ function($, _, moment) {
 
   kbn.msFormat = function(size, decimals) {
     // Less than 1 milli, downscale to micro
-    if (Math.abs(size) < 1) {
-      return kbn.microsFormat(size * 1000,decimals);
+    if (size !== 0 && Math.abs(size) < 1) {
+      return kbn.microsFormat(size * 1000, decimals);
     }
     else if (Math.abs(size) < 1000) {
       return size.toFixed(decimals) + " ms";
@@ -595,7 +595,7 @@ function($, _, moment) {
 
   kbn.sFormat = function(size, decimals) {
     // Less than 1 sec, downscale to milli
-    if (Math.abs(size) < 1) {
+    if (size !== 0 && Math.abs(size) < 1) {
       return kbn.msFormat(size * 1000, decimals);
     }
     // Less than 10 min, use seconds
@@ -624,7 +624,7 @@ function($, _, moment) {
 
   kbn.microsFormat = function(size, decimals) {
     // Less than 1 micro, downscale to nano
-    if (Math.abs(size) < 1) {
+    if (size !== 0 && Math.abs(size) < 1) {
       return kbn.nanosFormat(size * 1000, decimals);
     }
     else if (Math.abs(size) < 1000) {
diff --git a/src/app/directives/grafanaGraph.js b/src/app/directives/grafanaGraph.js
index 15f1556aa62..ee6b0fb7dd7 100755
--- a/src/app/directives/grafanaGraph.js
+++ b/src/app/directives/grafanaGraph.js
@@ -110,6 +110,11 @@ function (angular, $, kbn, moment, _) {
 
           // Populate element
           var options = {
+            hooks: {
+              drawSeries: [function() {
+                console.log('drawSeries', arguments);
+              }]
+            },
             legend: { show: false },
             series: {
               stackpercent: panel.stack ? panel.percentage : false,
diff --git a/src/test/specs/kbn-format-specs.js b/src/test/specs/kbn-format-specs.js
index a44475556b0..85807c277ec 100644
--- a/src/test/specs/kbn-format-specs.js
+++ b/src/test/specs/kbn-format-specs.js
@@ -15,6 +15,12 @@ define([
       expect(str).to.be('1.02 hour');
     });
 
+    it('should not downscale when value is zero', function() {
+      var str = kbn.msFormat(0, 2);
+      expect(str).to.be('0.00 ms');
+    });
+
+
     it('should translate 365445 as 6.09 min', function() {
       var str = kbn.msFormat(365445, 2);
       expect(str).to.be('6.09 min');

From 10f9022d7c706306acbe4975d9296a981c17f845 Mon Sep 17 00:00:00 2001
From: Gregory Becker <gregorybecker@notonthehighstreet.com>
Date: Fri, 19 Sep 2014 14:03:08 +0100
Subject: [PATCH 55/59] Support fields from nested objects pulled from
 Elasticsearch

---
 .../services/elasticsearch/es-datasource.js   | 32 +++++++++++--------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/app/services/elasticsearch/es-datasource.js b/src/app/services/elasticsearch/es-datasource.js
index ab03c614a83..4cc1da3843e 100644
--- a/src/app/services/elasticsearch/es-datasource.js
+++ b/src/app/services/elasticsearch/es-datasource.js
@@ -86,7 +86,23 @@ function (angular, _, config, kbn, moment) {
         var list = [];
         var hits = results.data.hits.hits;
 
+        var getFieldFromSource = function(source, fieldName) {
+          var fieldValue;
+          if (fieldName) {
+            var fieldNames = fieldName.split('.');
+            fieldValue = source;
+            for (var i = 0; i < fieldNames.length; i++) {
+              fieldValue = fieldValue[fieldNames[i]];
+            }
+            if (_.isArray(fieldValue)) {
+              fieldValue = fieldValue.join(',');
+            }
+          }
+          return fieldValue;
+        };
+
         for (var i = 0; i < hits.length; i++) {
+          console.log('annotationQuery', hits[i]);
           var source = hits[i]._source;
           var fields = hits[i].fields;
           var time = source[timeField];
@@ -98,21 +114,11 @@ function (angular, _, config, kbn, moment) {
           var event = {
             annotation: annotation,
             time: moment.utc(time).valueOf(),
-            title: source[titleField],
+            title: getFieldFromSource(source, titleField),
+            tags: getFieldFromSource(source, tagsField),
+            text: getFieldFromSource(source, textField)
           };
 
-          if (source[tagsField]) {
-            if (_.isArray(source[tagsField])) {
-              event.tags = source[tagsField].join(', ');
-            }
-            else {
-              event.tags = source[tagsField];
-            }
-          }
-          if (textField && source[textField]) {
-            event.text = source[textField];
-          }
-
           list.push(event);
         }
         return list;

From 06ec91c899ed69bf32a8b628c86c353151c8497c Mon Sep 17 00:00:00 2001
From: Gregory Becker <gregorybecker@notonthehighstreet.com>
Date: Fri, 19 Sep 2014 14:16:53 +0100
Subject: [PATCH 56/59] Give maximum width & height constraint to tooltip boxes

Extreme values that go beyond the screen resolution are very likely to be misplaced. This is a simple workaround. A better solution would be to improve the code placing the tooltip and make it handle tooltips containing more content than they can safely display.
---
 src/css/less/grafana.less | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/css/less/grafana.less b/src/css/less/grafana.less
index 8d52f749ff5..b291b548219 100644
--- a/src/css/less/grafana.less
+++ b/src/css/less/grafana.less
@@ -435,6 +435,9 @@ select.grafana-target-segment-input {
   background-color: rgb(58, 57, 57);
   border-radius: 5px;
   z-index: 9999;
+  max-width: 800px;
+  max-height: 600px;
+  overflow: hidden;
 }
 
 .tooltip.in {

From 40a491a80bb5beac046128a01ec59c453edbf4ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Sat, 20 Sep 2014 08:30:59 +0200
Subject: [PATCH 57/59] Annotations: Elasticsearch annotation and field mapping
 fixes, small changes for PR #830

---
 CHANGELOG.md                                  |  1 +
 src/app/directives/grafanaGraph.js            |  5 -----
 src/app/services/annotationsSrv.js            |  3 ++-
 .../services/elasticsearch/es-datasource.js   | 22 +++++++++----------
 4 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b7d233c8237..69835953dc1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 - [Issue #795](https://github.com/grafana/grafana/issues/795). Chrome: Fix for display issue in chrome beta & chrome canary when entering edit mode
 - [Issue #818](https://github.com/grafana/grafana/issues/818). Graph: Added percent y-axis format
 - [Issue #828](https://github.com/grafana/grafana/issues/828). Elasticsearch: saving new dashboard with title equal to slugified url would cause it to deleted.
+- [Issue #830](https://github.com/grafana/grafana/issues/830). Annotations: Fix for elasticsearch annotations and mapping nested fields
 
 # 1.8.0-RC1 (2014-09-12)
 
diff --git a/src/app/directives/grafanaGraph.js b/src/app/directives/grafanaGraph.js
index ee6b0fb7dd7..15f1556aa62 100755
--- a/src/app/directives/grafanaGraph.js
+++ b/src/app/directives/grafanaGraph.js
@@ -110,11 +110,6 @@ function (angular, $, kbn, moment, _) {
 
           // Populate element
           var options = {
-            hooks: {
-              drawSeries: [function() {
-                console.log('drawSeries', arguments);
-              }]
-            },
             legend: { show: false },
             series: {
               stackpercent: panel.stack ? panel.percentage : false,
diff --git a/src/app/services/annotationsSrv.js b/src/app/services/annotationsSrv.js
index c1733189462..04fb4224cc6 100644
--- a/src/app/services/annotationsSrv.js
+++ b/src/app/services/annotationsSrv.js
@@ -57,7 +57,8 @@ define([
 
     function errorHandler(err) {
       console.log('Annotation error: ', err);
-      alertSrv.set('Annotations','Could not fetch annotations','error');
+      var message = err.message || "Aannotation query failed";
+      alertSrv.set('Annotations error', message,'error');
     }
 
     function addAnnotation(options) {
diff --git a/src/app/services/elasticsearch/es-datasource.js b/src/app/services/elasticsearch/es-datasource.js
index 4cc1da3843e..04d1e62ce04 100644
--- a/src/app/services/elasticsearch/es-datasource.js
+++ b/src/app/services/elasticsearch/es-datasource.js
@@ -87,22 +87,22 @@ function (angular, _, config, kbn, moment) {
         var hits = results.data.hits.hits;
 
         var getFieldFromSource = function(source, fieldName) {
-          var fieldValue;
-          if (fieldName) {
-            var fieldNames = fieldName.split('.');
-            fieldValue = source;
-            for (var i = 0; i < fieldNames.length; i++) {
-              fieldValue = fieldValue[fieldNames[i]];
-            }
-            if (_.isArray(fieldValue)) {
-              fieldValue = fieldValue.join(',');
-            }
+          if (!fieldName) { return; }
+
+          var fieldNames = fieldName.split('.');
+          var fieldValue = source;
+
+          for (var i = 0; i < fieldNames.length; i++) {
+            fieldValue = fieldValue[fieldNames[i]];
+          }
+
+          if (_.isArray(fieldValue)) {
+            fieldValue = fieldValue.join(', ');
           }
           return fieldValue;
         };
 
         for (var i = 0; i < hits.length; i++) {
-          console.log('annotationQuery', hits[i]);
           var source = hits[i]._source;
           var fields = hits[i].fields;
           var time = source[timeField];

From a19a2c70abf01bcf3a9979bc5aa7a51a3dbe3893 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Sat, 20 Sep 2014 08:33:16 +0200
Subject: [PATCH 58/59] Fixed spelling in config.sample.js

---
 src/config.sample.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/config.sample.js b/src/config.sample.js
index 6046a753d5a..740c0d4b8c9 100644
--- a/src/config.sample.js
+++ b/src/config.sample.js
@@ -1,8 +1,7 @@
-///// @scratch /configuration/config.js/1
- // == Configuration
- // config.js is where you will find the core Grafana configuration. This file contains parameter that
- // must be set before Grafana is run for the first time.
- ///
+// == Configuration
+// config.js is where you will find the core Grafana configuration. This file contains parameter that
+// must be set before Grafana is run for the first time.
+
 define(['settings'],
 function (Settings) {
   "use strict";
@@ -97,7 +96,7 @@ function (Settings) {
     // Change window title prefix from 'Grafana - <dashboard title>'
     window_title_prefix: 'Grafana - ',
 
-    // Add your own custom pannels
+    // Add your own custom panels
     plugins: {
       // list of plugin panels
       panels: [],

From b56c3eb035db4287fdef8629a4dfcc522c8c5928 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Sat, 20 Sep 2014 13:32:26 +0200
Subject: [PATCH 59/59] Changed color for warning alert

---
 src/css/less/variables.dark.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/css/less/variables.dark.less b/src/css/less/variables.dark.less
index 608dfb609b0..c65a6f99179 100644
--- a/src/css/less/variables.dark.less
+++ b/src/css/less/variables.dark.less
@@ -257,7 +257,7 @@
 // Form states and alerts
 // -------------------------
 @warningText:             darken(#c09853, 10%);
-@warningBackground:       @grayLighter;
+@warningBackground:       @orange;
 @warningBorder:           transparent;
 
 @errorText:               #b94a48;