Browse Source

Merge branch 'dashboard_loading_refactoring' into annotations_redesign

Torkel Ödegaard 11 years ago
parent
commit
7d6eafb2f2
2 changed files with 4 additions and 3 deletions
  1. 3 2
      CHANGELOG.md
  2. 1 1
      src/app/services/influxdb/influxdbDatasource.js

+ 3 - 2
CHANGELOG.md

@@ -4,10 +4,11 @@ vNext
 - Allow [[..]] filter notation in all text panels (markdown/html/text) (Issue #511)
 - New legend display option "Align as table" (Issue #136)
 - New legend display option "Right side", will show legend to the right of the graph (Issue #556)
-- Enhanced InfluxDB series aliasing (legend names) with pattern replacements (Issue #525)
+- InfluxDB: Enhanced series aliasing (legend names) with pattern replacements (Issue #525)
+- InfluxDB: Add continuous query in series results (series typeahead). #581
 
 **Changes**
-- Use unix epoch for Graphite from/to for absolute time ranges (Closes #536)
+- Graphite: Use unix epoch for Graphite from/to for absolute time ranges (Closes #536)
 
 **Fixes**
 - Fix formatting negative values (PR #545)

+ 1 - 1
src/app/services/influxdb/influxdbDatasource.js

@@ -129,7 +129,7 @@ function (angular, _, kbn, InfluxSeries) {
     };
 
     InfluxDatasource.prototype.listSeries = function() {
-      return this.doInfluxRequest('list series').then(function(data) {
+      return this.doInfluxRequest('select * from /.*/ limit 1').then(function(data) {
         return _.map(data, function(series) {
           return series.name;
         });