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

Update tests, remove conosole logs, refactor

Browse Source
This commit is contained in:
Ivana 2020-07-10 13:39:56 +02:00
parent 712c061ebb
commit d61e334c58
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
public/app/plugins/datasource/elasticsearch/datasource.ts
View File

@ -344,7 +344,6 @@ export class ElasticDatasource extends DataSourceApi<ElasticsearchQuery, Elastic
}
query(options: DataQueryRequest<ElasticsearchQuery>): Promise<DataQueryResponse> {
console.log('optinos', options);
let payload = '';
const targets = _.cloneDeep(options.targets);
const sentTargets: ElasticsearchQuery[] = [];
@ -412,8 +411,6 @@ export class ElasticDatasource extends DataSourceApi<ElasticsearchQuery, Elastic
enhanceDataFrame(dataFrame, this.dataLinks);
}
return response;
} else if (sentTargets.some(target => target.metrics.some(metric => metric.type === 'raw_document_v2'))) {
return er.getTimeSeries(true);
}
return er.getTimeSeries();

4
public/app/plugins/datasource/elasticsearch/elastic_response.ts
View File

@ -390,8 +390,8 @@ export class ElasticResponse {
return result;
}
getTimeSeries(processToDataFrames = false): DataQueryResponse {
if (processToDataFrames) {
getTimeSeries(): DataQueryResponse {
if (this.targets.some(target => target.metrics.some(metric => metric.type === 'raw_document_v2'))) {
return this.processResponseToDataFrames(false);
}
return this.processResponseToSeries();

8
public/app/plugins/datasource/elasticsearch/specs/query_def.test.ts
View File

@ -92,25 +92,25 @@ describe('ElasticQueryDef', () => {
describe('pipeline aggs depending on esverison', () => {
describe('using esversion undefined', () => {
test('should not get pipeline aggs', () => {
expect(queryDef.getMetricAggTypes(undefined).length).toBe(10);
expect(queryDef.getMetricAggTypes(undefined).length).toBe(11);
});
});
describe('using esversion 1', () => {
test('should not get pipeline aggs', () => {
expect(queryDef.getMetricAggTypes(1).length).toBe(10);
expect(queryDef.getMetricAggTypes(1).length).toBe(11);
});
});
describe('using esversion 2', () => {
test('should get pipeline aggs', () => {
expect(queryDef.getMetricAggTypes(2).length).toBe(14);
expect(queryDef.getMetricAggTypes(2).length).toBe(15);
});
});
describe('using esversion 5', () => {
test('should get pipeline aggs', () => {
expect(queryDef.getMetricAggTypes(5).length).toBe(14);
expect(queryDef.getMetricAggTypes(5).length).toBe(15);
});
});
});