From 87a8b1b3f5806b691745d13043ca67c62dc98236 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 9 Jun 2014 13:33:30 +0200 Subject: [PATCH] small fix to config.sample.js --- src/app/dashboards/default.json | 2 +- src/app/directives/influxdbFuncEditor.js | 6 +++--- src/app/services/influxdb/influxdbDatasource.js | 13 +++++++------ src/config.sample.js | 4 ++-- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/app/dashboards/default.json b/src/app/dashboards/default.json index c0e58b154e0..e0d048ad8bb 100644 --- a/src/app/dashboards/default.json +++ b/src/app/dashboards/default.json @@ -90,7 +90,7 @@ "notice": false } ], - "editable": true, + "editable": false, "failover": false, "panel_hints": true, "style": "dark", diff --git a/src/app/directives/influxdbFuncEditor.js b/src/app/directives/influxdbFuncEditor.js index 33015a791a1..4633ac30428 100644 --- a/src/app/directives/influxdbFuncEditor.js +++ b/src/app/directives/influxdbFuncEditor.js @@ -114,10 +114,10 @@ function (angular, _, $) { $paramLink.appendTo(elem); $input.appendTo(elem); - $input.blur(_.partial(inputBlur)); + $input.blur(inputBlur); $input.keyup(inputKeyDown); - $input.keypress(_.partial(inputKeyPress)); - $paramLink.click(_.partial(clickFuncParam)); + $input.keypress(inputKeyPress); + $paramLink.click(clickFuncParam); addTypeahead($input); diff --git a/src/app/services/influxdb/influxdbDatasource.js b/src/app/services/influxdb/influxdbDatasource.js index 0151a92502b..295a3f544fd 100644 --- a/src/app/services/influxdb/influxdbDatasource.js +++ b/src/app/services/influxdb/influxdbDatasource.js @@ -89,7 +89,9 @@ function (angular, _, kbn) { target.query = query; } - return this.doInfluxRequest(query, alias).then(handleInfluxQueryResponse); + var handleResponse = _.partial(handleInfluxQueryResponse, alias); + + return this.doInfluxRequest(query, alias).then(handleResponse); }, this); @@ -126,7 +128,7 @@ function (angular, _, kbn) { return $q.reject(err); } - return this.doInfluxRequest(query, 'filters') + return this.doInfluxRequest(query) .then(function (results) { return _.map(results[0].points, function (metric) { return { @@ -148,7 +150,7 @@ function (angular, _, kbn) { }); } - InfluxDatasource.prototype.doInfluxRequest = function(query, alias) { + InfluxDatasource.prototype.doInfluxRequest = function(query) { var _this = this; var deferred = $q.defer(); @@ -170,7 +172,6 @@ function (angular, _, kbn) { }; return $http(options).success(function (data) { - data.alias = alias; deferred.resolve(data); }); }, 10); @@ -178,7 +179,7 @@ function (angular, _, kbn) { return deferred.promise; }; - function handleInfluxQueryResponse(data) { + function handleInfluxQueryResponse(alias, data) { var output = []; _.each(data, function(series) { @@ -189,7 +190,7 @@ function (angular, _, kbn) { return; } - var target = data.alias || series.name + "." + column; + var target = alias || series.name + "." + column; var datapoints = []; var value; diff --git a/src/config.sample.js b/src/config.sample.js index 2d8632cae0c..d2893a0c21e 100644 --- a/src/config.sample.js +++ b/src/config.sample.js @@ -18,8 +18,8 @@ function (Settings) { }, influxdb: { type: 'influxdb', - url: "http://my_influxdb_server:8080/db/database_name", - user: 'admin', + url: "http://my_influxdb_server:8086/db/database_name", + username: 'admin', password: 'admin' }, },