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

allow setting the database

Browse Source
This commit is contained in:
ryan 2017-04-11 16:30:20 -07:00
parent 07466b6725
commit c346aca26d
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
public/app/plugins/datasource/influxdb/datasource.ts
View File

@ -157,7 +157,7 @@ export default class InfluxDatasource {
return false;
};
metricFindQuery(query) {
metricFindQuery(query: string, db?: string) {
var interpolated = this.templateSrv.replace(query, null, 'regex');
return this._seriesQuery(interpolated)
@ -176,10 +176,10 @@ export default class InfluxDatasource {
return this.metricFindQuery(query);
}
_seriesQuery(query) {
_seriesQuery(query: string, db?: string) {
if (!query) { return this.$q.when({results: []}); }
return this._influxRequest('GET', '/query', {q: query, epoch: 'ms'});
return this._influxRequest('GET', '/query', {q: query, epoch: 'ms'}, db);
}
serializeParams(params) {
@ -207,19 +207,19 @@ export default class InfluxDatasource {
});
}
_influxRequest(method, url, data) {
var self = this;
var currentUrl = self.urls.shift();
self.urls.push(currentUrl);
_influxRequest(method: string, url: string, data: any, db?: string) {
var currentUrl = this.urls.shift();
this.urls.push(currentUrl);
var params: any = {
u: self.username,
p: self.password,
u: this.username,
p: this.password,
};
if (self.database) {
params.db = self.database;
if (db) {
params.db = db;
} else if (this.database) {
params.db = this.database;
}
if (method === 'GET') {
@ -241,8 +241,8 @@ export default class InfluxDatasource {
if (this.basicAuth || this.withCredentials) {
options.withCredentials = true;
}
if (self.basicAuth) {
options.headers.Authorization = self.basicAuth;
if (this.basicAuth) {
options.headers.Authorization = this.basicAuth;
}
return this.backendSrv.datasourceRequest(options).then(result => {