Merge branch 'master' into new_func_editor

CHANGELOG.md

@@ -0,0 +1,84 @@
+# 1.4.0 (2013-02-21)
+###New Features
+- #44 Annotations! Required a lot of work to get right. Read wiki article for more info. Supported annotations data sources are graphite metrics and graphite events. Support for more will be added in the future!
+- #35 Support for multiple graphite servers! (Read wiki article for more)
+- #116 Back to dashboard link in top menu to easily exist full screen / edit mode.
+- #114, #97 Legend values now use the same y axes formatter
+- #77 Improvements and polish to the light theme
+
+### Changes
+- #98 Stack is no longer by default turned on in graph display settings.
+- Hide controls (Ctrl+h) now hides the sub menu row (where filtering, and annotations are). So if you had filtering enabled and hide controls enabled you will not see the filtering sub menu.
+
+### Fixes:
+- #94 Fix for bug that caused dashboard settings to sometimes not contain timepicker tab.
+- #110 Graph with many many metrics caused legend to push down graph editor below screen. You can now scroll in edit mode & full screen mode for graphs with lots of series & legends.
+- #104 Improvement to graphite target editor, select wildcard now gives you a "select metric" link for the next node.
+- #105 Added zero as a possible node value in groupByAlias function
+
+# 1.3.0 (2013-02-13)
+### New features or improvements
+- #86 Dashboard tags and search (see wiki article for details)
+- #54 Enhancement to filter / template. "Include All" improvement
+- #82 Dashboard search result sorted in alphabetical order
+
+### Fixes
+- #91 Custom date selector is one day behind
+- #89 Filter / template does not work after switching dashboard
+- #88 Closed / Minimized row css bug
+- #85 Added all parameters to summarize function
+- #83 Stack as percent should now work a lot better!
+
+# 1.2.0 (2013-02-10)
+### New features
+- #70 Grid Thresholds (warning and error regions or lines in graph)
+- #72 Added an example of a scripted dashboard and a short wiki article documenting scripted dashboards.
+
+### Fixes
+- #81 Grid min/max values are ignored bug
+- #80 "stacked as percent" graphs should always use "max" value of 100 bug
+- #73 Left Y format change did not work
+- #42 Fixes to grid min/max auto scaling
+- #69 Fixes to lexer/parser for metrics segments like "10-20".
+- #67 Allow decimal input for scale function
+- #68 Bug when trying to open dashboard while in edit mode
+
+# 1.1.0 (2013-02-06)
+### New features:
+
+- #22 Support for native graphite png renderer, does not support click and select zoom yet
+- #60 Support for legend values (cactiStyle, min, max, current, total, avg). The options for these are found in the new "Axes & Grid" tab for now.
+- #62 There is now a "New" button in the search/open dashboard view to quickly open a clean empty dashboard.
+- #55 Basic auth is now supported for elastic search as well
+- some new function definitions added (will focus more on this for next release).
+
+### Fixes
+- #45 zero values from graphite was handled as null.
+- #63 Kibana / Grafana on same host would use same localStorage keys, now fixed
+- #46 Impossible to edit graph without a name fixed.
+- #24 fix for dashboard search when elastic search is configured to disable _all field.
+- #38 Improvement to lexer / parser to support pure numeric literals in metric segments
+
+Thanks to everyone who contributed fixes and provided feedback :+1:
+
+# 1.0.4 (2013-01-24)
+- Fixes #28 - Relative time range caused 500 graphite error in some cases (thx rsommer for the fix)
+
+# 1.0.3 (2013-01-23)
+- #9 Add Y-axis format for milliseconds
+- #16 Add support for Basic Auth (use http://username:password@yourgraphitedomain.com)
+- #13 Relative time ranges now uses relative time ranges when issuing graphite query
+
+# 1.0.2 (2013-01-21)
+- Fixes #12, should now work ok without ElasticSearch
+
+# 1.0.1 (2013-01-21)
+- Resize fix
+- Improvements to drag & drop
+- Added a few graphite function definitions
+- Fixed duplicate panel bug
+- Updated default dashboard with welcome message and randomWalk graph
+
+# 1.0.0 (2013-01-19)
+
+First public release

CONTRIBUTING.md

@@ -0,0 +1,14 @@
+If you have any idea for an improvement or found a bug do not hesitate to open an issue.
+And if you have time clone this repo and submit a pull request and help me make Grafana the
+kickass metrics & devops dashboard we all dream about!
+
+Prerequisites:
+Nodejs (for jshint & grunt & development server)
+
+Clone repository:
+
+npm install
+grunt server (starts development web server in src folder)
+grunt (runs jshint and less -> css compilation)
+
+Please remember to run grunt before doing pull request to verify that your code passes all the jshint validations.

src/app/controllers/influxTargetCtrl.js

@@ -15,14 +15,7 @@ function (angular) {
         $scope.target.function = 'mean';
       }
 
-      if (!seriesList) {
-        seriesList = [];
-        $scope.datasource.listSeries().then(function(series) {
-          seriesList = series;
-        });
-      }
-
-      $scope.oldSeris = $scope.target.series;
+      $scope.oldSeries = $scope.target.series;
       $scope.$on('typeahead-updated', function(){
         $timeout($scope.get_data);
       });
@@ -30,14 +23,38 @@ function (angular) {
 
     // Cannot use typeahead and ng-change on blur at the same time
     $scope.seriesBlur = function() {
-      if ($scope.oldSeris !== $scope.target.series) {
-        $scope.oldSeris = $scope.target.series;
+      if ($scope.oldSeries !== $scope.target.series) {
+        $scope.oldSeries = $scope.target.series;
         $scope.get_data();
       }
     };
 
-    $scope.listSeries = function() {
-      return seriesList;
+    // called outside of digest
+    $scope.listColumns = function(query, callback) {
+      if (!$scope.columnList) {
+        $scope.$apply(function() {
+          $scope.datasource.listColumns($scope.target.series).then(function(columns) {
+            $scope.columnList = columns;
+            callback(columns);
+          });
+        });
+      }
+      else {
+        return $scope.columnList;
+      }
+    };
+
+    $scope.listSeries = function(query, callback) {
+      if (!seriesList) {
+        seriesList = [];
+        $scope.datasource.listSeries().then(function(series) {
+          seriesList = series;
+          callback(seriesList);
+        });
+      }
+      else {
+        return seriesList;
+      }
     };
 
     $scope.duplicate = function() {

src/app/directives/grafanaGraph.js

@@ -257,25 +257,22 @@ function (angular, $, kbn, moment, _) {
         }
 
         function time_format(interval, ticks, min, max) {
-          var _int = kbn.interval_to_seconds(interval);
-          if(_int >= 2628000) {
-            return "%Y-%m";
-          }
-          if(_int >= 10000) {
-            return "%m/%d";
-          }
-          if(_int >= 3600) {
-            return "%m/%d %H:%M";
-          }
-          if(_int >= 700) {
-            return "%a %H:%M";
-          }
-
           if (min && max && ticks) {
-            var msPerTick = (max - min) / ticks;
-            if (msPerTick <= 45000) {
+            var secPerTick = ((max - min) / ticks) / 1000;
+
+            if (secPerTick <= 45) {
               return "%H:%M:%S";
             }
+            if (secPerTick <= 3600) {
+              return "%H:%M";
+            }
+            if (secPerTick <= 80000) {
+              return "%m/%d %H:%M";
+            }
+            if (secPerTick <= 2419200) {
+              return "%m/%d";
+            }
+            return "%Y-%m";
           }
 
           return "%H:%M";

src/app/panels/graphite/module.js

@@ -230,8 +230,7 @@ function (angular, app, $, _, kbn, moment, timeSeries) {
     $scope.updateTimeRange = function () {
       $scope.range = filterSrv.timeRange();
       $scope.rangeUnparsed = filterSrv.timeRange(false);
-      $scope.resolution = ($(window).width() / ($scope.panel.span / 12)) / 2;
-
+      $scope.resolution = ($(window).width() * ($scope.panel.span / 12)) / 2;
       $scope.interval = '10m';
 
       if ($scope.range) {

src/app/partials/influxdb/editor.html

@@ -66,7 +66,9 @@
                    ng-model="target.column"
                    placeholder="value column"
                    spellcheck='false'
-                   ng-model-onblur ng-change="get_data()" >
+                   bs-typeahead="listColumns"
+                   data-min-length=0
+                   ng-blur="get_data()">
           </li>
           <li class="grafana-target-segment">
             function

src/app/services/influxdb/influxdbDatasource.js

@@ -41,7 +41,6 @@ function (angular, _, kbn) {
         };
 
         var query = _.template(template, templateData, this.templateSettings);
-        console.log(query);
 
         return this.doInfluxRequest(query).then(handleInfluxQueryResponse);
 
@@ -54,6 +53,17 @@ function (angular, _, kbn) {
 
     };
 
+    InfluxDatasource.prototype.listColumns = function(seriesName) {
+      return this.doInfluxRequest('select * from ' + seriesName + ' limit 1').then(function(results) {
+        console.log('response!');
+        if (!results.data) {
+          return [];
+        }
+
+        return results.data[0].columns;
+      });
+    };
+
     InfluxDatasource.prototype.listSeries = function() {
       return this.doInfluxRequest('list series').then(function(results) {
         if (!results.data) {
@@ -79,6 +89,7 @@ function (angular, _, kbn) {
         params: params,
       };
 
+      console.log(query);
       return $http(options);
     };
 

src/vendor/jquery/jquery.flot.time.js

@@ -71,13 +71,13 @@ API.txt for details.
 				switch (c) {
 					case 'a': c = "" + dayNames[d.getDay()]; break;
 					case 'b': c = "" + monthNames[d.getMonth()]; break;
-					case 'd': c = leftPad(d.getDate()); break;
+					case 'd': c = leftPad(d.getDate(), ""); break;
 					case 'e': c = leftPad(d.getDate(), " "); break;
 					case 'h':	// For back-compat with 0.7; remove in 1.0
 					case 'H': c = leftPad(hours); break;
 					case 'I': c = leftPad(hours12); break;
 					case 'l': c = leftPad(hours12, " "); break;
-					case 'm': c = leftPad(d.getMonth() + 1); break;
+					case 'm': c = leftPad(d.getMonth() + 1, ""); break;
 					case 'M': c = leftPad(d.getMinutes()); break;
 					// quarters not in Open Group's strftime specification
 					case 'q':
@@ -158,7 +158,7 @@ API.txt for details.
 			return makeUtcWrapper(new Date(ts));
 		}
 	}
-	
+
 	// map of app. size of time units in milliseconds
 
 	var timeUnitSize = {
@@ -176,9 +176,9 @@ API.txt for details.
 
 	var baseSpec = [
 		[1, "second"], [2, "second"], [5, "second"], [10, "second"],
-		[30, "second"], 
+		[30, "second"],
 		[1, "minute"], [2, "minute"], [5, "minute"], [10, "minute"],
-		[30, "minute"], 
+		[30, "minute"],
 		[1, "hour"], [2, "hour"], [4, "hour"],
 		[8, "hour"], [12, "hour"],
 		[1, "day"], [2, "day"], [3, "day"],