Merge pull request #185 from nikicat/master

added graphite functions: percentileOfSeries, sumSeriesWithWildcards, averageSeriesWithWildcards
2014-03-10 14:17:15 +01:00 · 2014-03-10 17:04:34 +04:00 · 2014-03-10 11:11:24 +01:00 · 2014-03-10 02:50:11 -07:00 · 2014-03-09 19:12:02 +01:00
4 changed files with 42 additions and 2 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,22 @@
+# 1.5.0 (2013-03-09)
+###New Features and improvements
+- New function editor [video demo](http://youtu.be/I90WHRwE1ZM) (Issue #178)
+- Links to function documentation from function editor (Issue #3)
+- Reorder functions (Issue #130)
+- [Initial support for InfluxDB](https://github.com/torkelo/grafana/wiki/InfluxDB) as metric datasource (#103), need feedback!
+- [Dashboard playlist](https://github.com/torkelo/grafana/wiki/Dashboard-playlist) (Issue #36)
+- When adding aliasByNode smartly set node number (Issue #175)
+- Support graphite identifiers with embedded colons (Issue #173)
+- Typeahead & autocomplete when adding new function (Issue #164)
+- More graphite function definitions
+- Make "ms" axis format include hour, day, weeks, month and year (Issue #149)
+- Microsecond axis format (Issue #146)
+- Specify template paramaters in URL (Issue #123)
+
+### Fixes
+- Basic Auth fix (Issue #152)
+- Fix to annotations with graphite source & null values (Issue #138)
+
 # 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!
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ A beautiful, easy to use and feature rich Graphite dashboard replacement and gra
 ## Features
 ### Graphite Target Editor
 - Graphite target expression parser
- Quickly add / edit / remove function
+- Quickly add / edit / remove function ([video demo](http://youtu.be/I90WHRwE1ZM))
 - Function parameters can be easily changed
 - Quickly navigate graphite metric structure
 - Templating
--- a/src/app/panels/graphite/module.js
+++ b/src/app/panels/graphite/module.js
@@ -230,7 +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 = Math.ceil(($(window).width() * ($scope.panel.span / 12)) / 2);
      $scope.interval = '10m';

      if ($scope.range) {
--- a/src/app/services/graphite/gfunc.js
+++ b/src/app/services/graphite/gfunc.js
@@ -62,6 +62,27 @@ function (_) {
    category: categories.Combine,
  });

+  addFuncDef({
+    name: 'percentileOfSeries',
+    category: categories.Combine,
+    params: [ { name: "n", type: "int" }, { name: "interpolate", type: "select", options: ["true", "false"] } ],
+    defaultParams: [95, "false"]
+  });
+
+  addFuncDef({
+    name: 'sumSeriesWithWildcards',
+    category: categories.Combine,
+    params: [ { name: "node", type: "int" } ],
+    defaultParams: [3]
+  });
+
+  addFuncDef({
+    name: 'averageSeriesWithWildcards',
+    category: categories.Combine,
+    params: [ { name: "node", type: "int" } ],
+    defaultParams: [3]
+  });
+
  addFuncDef({
    name: "alias",
    category: categories.Special,
Author	SHA1	Message	Date
Torkel Ödegaard	b396563235	Merge pull request #185 from nikicat/master added graphite functions: percentileOfSeries, sumSeriesWithWildcards, averageSeriesWithWildcards	2014-03-10 14:17:15 +01:00
Nikolay Bryskin	c5b992e330	added graphite functions: percentileOfSeries, sumSeriesWithWildcards, averageSeriesWithWildcards	2014-03-10 17:04:34 +04:00
Torkel Ödegaard	ec6fae9e65	Merge pull request #183 from merc1031/master round up maxDataPoints to nearest integer in request. graphite 0.9.x and...	2014-03-10 11:11:24 +01:00
Leonidas Loucas	7f5c6ca18d	round up maxDataPoints to nearest integer in request. graphite 0.9.x and 0.9.12 seem to treat decimal maxDataPoints badly returning enourmous amounts of data	2014-03-10 02:50:11 -07:00
Torkel Odegaard	9de60a9a7c	updated readme and changelog	2014-03-09 19:12:02 +01:00