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

Review feedback.

Browse Source
This commit is contained in:
Mitsuhiro Tanda 2018-07-27 11:39:00 +09:00
parent e62c083cf0
commit bf8840255c
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/app/plugins/datasource/prometheus/completer.ts
View File

@ -264,7 +264,7 @@ export class PromCompleter {
return Promise.resolve([]); return Promise.resolve([]);
} }
getLabelNameAndValueForExpression(expr, type) { getLabelNameAndValueForExpression(expr: string, type: string): Promise<any> {
if (this.labelQueryCache[expr]) { if (this.labelQueryCache[expr]) {
return Promise.resolve(this.labelQueryCache[expr]); return Promise.resolve(this.labelQueryCache[expr]);
} }
@ -276,8 +276,8 @@ export class PromCompleter {
} }
query = '{__name__' + op + '"' + expr + '"}'; query = '{__name__' + op + '"' + expr + '"}';
} }
let range = this.datasource.getTimeRange(); const { start, end } = this.datasource.getTimeRange();
let url = '/api/v1/series?match[]=' + encodeURIComponent(query) + '&start=' + range.from + '&end=' + range.to; const url = '/api/v1/series?match[]=' + encodeURIComponent(query) + '&start=' + start + '&end=' + end;
return this.datasource.metadataRequest(url).then(response => { return this.datasource.metadataRequest(url).then(response => {
this.labelQueryCache[expr] = response.data.data; this.labelQueryCache[expr] = response.data.data;
return response.data.data; return response.data.data;

6
public/app/plugins/datasource/prometheus/datasource.ts
View File

@ -629,11 +629,11 @@ export class PrometheusDatasource {
return Math.ceil(date.valueOf() / 1000); return Math.ceil(date.valueOf() / 1000);
} }
getTimeRange() { getTimeRange(): { start: number; end: number } {
let range = this.timeSrv.timeRange(); let range = this.timeSrv.timeRange();
return { return {
from: this.getPrometheusTime(range.from, false), start: this.getPrometheusTime(range.from, false),
to: this.getPrometheusTime(range.to, true) end: this.getPrometheusTime(range.to, true),
}; };
} }

9
public/app/plugins/datasource/prometheus/specs/completer.test.ts
View File

@ -4,7 +4,7 @@ import { BackendSrv } from 'app/core/services/backend_srv';
jest.mock('../datasource'); jest.mock('../datasource');
jest.mock('app/core/services/backend_srv'); jest.mock('app/core/services/backend_srv');
describe('Prometheus editor completer', function () { describe('Prometheus editor completer', function() {
function getSessionStub(data) { function getSessionStub(data) {
return { return {
getTokenAt: jest.fn(() => data.currentToken), getTokenAt: jest.fn(() => data.currentToken),
@ -19,8 +19,11 @@ describe('Prometheus editor completer', function () {
const datasourceStub = new PrometheusDatasource({}, {}, backendSrv, {}, {}); const datasourceStub = new PrometheusDatasource({}, {}, backendSrv, {}, {});
datasourceStub.metadataRequest = jest.fn(() => datasourceStub.metadataRequest = jest.fn(() =>
Promise.resolve({ data: { data: [{ metric: { job: 'node', instance: 'localhost:9100', }, },], }, })); Promise.resolve({ data: { data: [{ metric: { job: 'node', instance: 'localhost:9100' } }] } })
datasourceStub.getTimeRange = jest.fn(() => { return { from: 1514732400, to: 1514818800 }; }); );
datasourceStub.getTimeRange = jest.fn(() => {
return { start: 1514732400, end: 1514818800 };
});
datasourceStub.performSuggestQuery = jest.fn(() => Promise.resolve(['node_cpu'])); datasourceStub.performSuggestQuery = jest.fn(() => Promise.resolve(['node_cpu']));
const templateSrv = { const templateSrv = {