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

fixed jshint errors

Browse Source
This commit is contained in:
Torkel Odegaard 2014-02-15 17:18:47 +01:00
parent e2d7ead815
commit 4152c0653f
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/app/services/dashboard.js
View File

@ -55,7 +55,6 @@ function (angular, $, kbn, _, config, moment, Modernizr) {
// Store a reference to this // Store a reference to this
var self = this; var self = this;
var filterSrv; var filterSrv;
var graphiteSrv;
this.current = _.clone(_dash); this.current = _.clone(_dash);
this.last = {}; this.last = {};

6
src/app/services/graphite/graphiteDatasource.js
View File

@ -16,7 +16,7 @@ function (angular, _, $, config, kbn, moment) {
this.$q = $q; this.$q = $q;
this.filterSrv = filterSrv; this.filterSrv = filterSrv;
this.$http = $http; this.$http = $http;
}; }
GraphiteDatasource.prototype.query = function(options) { GraphiteDatasource.prototype.query = function(options) {
try { try {
@ -31,7 +31,7 @@ function (angular, _, $, config, kbn, moment) {
var params = this.buildGraphiteParams(graphOptions); var params = this.buildGraphiteParams(graphOptions);
if (options.format === 'png') { if (options.format === 'png') {
return $q.when(graphiteRenderUrl + '?' + params.join('&')); return this.$q.when(this.url + '/render' + '?' + params.join('&'));
} }
return this.doGraphiteRequest({ return this.doGraphiteRequest({
@ -79,7 +79,7 @@ function (angular, _, $, config, kbn, moment) {
interpolated = this.filterSrv.applyFilterToTarget(query); interpolated = this.filterSrv.applyFilterToTarget(query);
} }
catch(err) { catch(err) {
return $q.reject(err); return this.$q.reject(err);
} }
return this.doGraphiteRequest({method: 'GET', url: '/metrics/find/?query=' + interpolated }) return this.doGraphiteRequest({method: 'GET', url: '/metrics/find/?query=' + interpolated })