IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

small fix to config.sample.js

Browse Source
This commit is contained in:
Torkel Ödegaard 2014-06-09 13:33:30 +02:00
parent c5d2590293
commit 87a8b1b3f5
4 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/dashboards/default.json
View File

@ -90,7 +90,7 @@
"notice": false "notice": false
} }
], ],
"editable": true, "editable": false,
"failover": false, "failover": false,
"panel_hints": true, "panel_hints": true,
"style": "dark", "style": "dark",

6
src/app/directives/influxdbFuncEditor.js
View File

@ -114,10 +114,10 @@ function (angular, _, $) {
$paramLink.appendTo(elem); $paramLink.appendTo(elem);
$input.appendTo(elem); $input.appendTo(elem);
$input.blur(_.partial(inputBlur)); $input.blur(inputBlur);
$input.keyup(inputKeyDown); $input.keyup(inputKeyDown);
$input.keypress(_.partial(inputKeyPress)); $input.keypress(inputKeyPress);
$paramLink.click(_.partial(clickFuncParam)); $paramLink.click(clickFuncParam);
addTypeahead($input); addTypeahead($input);

13
src/app/services/influxdb/influxdbDatasource.js
View File

@ -89,7 +89,9 @@ function (angular, _, kbn) {
target.query = query; target.query = query;
} }
return this.doInfluxRequest(query, alias).then(handleInfluxQueryResponse); var handleResponse = _.partial(handleInfluxQueryResponse, alias);
return this.doInfluxRequest(query, alias).then(handleResponse);
}, this); }, this);
@ -126,7 +128,7 @@ function (angular, _, kbn) {
return $q.reject(err); return $q.reject(err);
} }
return this.doInfluxRequest(query, 'filters') return this.doInfluxRequest(query)
.then(function (results) { .then(function (results) {
return _.map(results[0].points, function (metric) { return _.map(results[0].points, function (metric) {
return { return {
@ -148,7 +150,7 @@ function (angular, _, kbn) {
}); });
} }
InfluxDatasource.prototype.doInfluxRequest = function(query, alias) { InfluxDatasource.prototype.doInfluxRequest = function(query) {
var _this = this; var _this = this;
var deferred = $q.defer(); var deferred = $q.defer();
@ -170,7 +172,6 @@ function (angular, _, kbn) {
}; };
return $http(options).success(function (data) { return $http(options).success(function (data) {
data.alias = alias;
deferred.resolve(data); deferred.resolve(data);
}); });
}, 10); }, 10);
@ -178,7 +179,7 @@ function (angular, _, kbn) {
return deferred.promise; return deferred.promise;
}; };
function handleInfluxQueryResponse(data) { function handleInfluxQueryResponse(alias, data) {
var output = []; var output = [];
_.each(data, function(series) { _.each(data, function(series) {
@ -189,7 +190,7 @@ function (angular, _, kbn) {
return; return;
} }
var target = data.alias || series.name + "." + column; var target = alias || series.name + "." + column;
var datapoints = []; var datapoints = [];
var value; var value;

4
src/config.sample.js
View File

@ -18,8 +18,8 @@ function (Settings) {
}, },
influxdb: { influxdb: {
type: 'influxdb', type: 'influxdb',
url: "http://my_influxdb_server:8080/db/database_name", url: "http://my_influxdb_server:8086/db/database_name",
user: 'admin', username: 'admin',
password: 'admin' password: 'admin'
}, },
}, },