|
@@ -1,32 +1,46 @@
|
|
|
import _ from 'lodash';
|
|
import _ from 'lodash';
|
|
|
-import { describe, beforeEach, it, expect, angularMocks } from 'test/lib/common';
|
|
|
|
|
import moment from 'moment';
|
|
import moment from 'moment';
|
|
|
import angular from 'angular';
|
|
import angular from 'angular';
|
|
|
-import helpers from 'test/specs/helpers';
|
|
|
|
|
import { ElasticDatasource } from '../datasource';
|
|
import { ElasticDatasource } from '../datasource';
|
|
|
|
|
|
|
|
|
|
+import * as dateMath from 'app/core/utils/datemath';
|
|
|
|
|
+
|
|
|
describe('ElasticDatasource', function() {
|
|
describe('ElasticDatasource', function() {
|
|
|
- var ctx = new helpers.ServiceTestContext();
|
|
|
|
|
-
|
|
|
|
|
- beforeEach(angularMocks.module('grafana.core'));
|
|
|
|
|
- beforeEach(angularMocks.module('grafana.services'));
|
|
|
|
|
- beforeEach(ctx.providePhase(['templateSrv', 'backendSrv', 'timeSrv']));
|
|
|
|
|
-
|
|
|
|
|
- beforeEach(
|
|
|
|
|
- angularMocks.inject(function($q, $rootScope, $httpBackend, $injector) {
|
|
|
|
|
- ctx.$q = $q;
|
|
|
|
|
- ctx.$httpBackend = $httpBackend;
|
|
|
|
|
- ctx.$rootScope = $rootScope;
|
|
|
|
|
- ctx.$injector = $injector;
|
|
|
|
|
- $httpBackend.when('GET', /\.html$/).respond('');
|
|
|
|
|
- })
|
|
|
|
|
- );
|
|
|
|
|
|
|
+ let backendSrv = {
|
|
|
|
|
+ datasourceRequest: jest.fn(),
|
|
|
|
|
+ };
|
|
|
|
|
+
|
|
|
|
|
+ let $rootScope = {
|
|
|
|
|
+ $on: jest.fn(),
|
|
|
|
|
+ appEvent: jest.fn(),
|
|
|
|
|
+ };
|
|
|
|
|
+
|
|
|
|
|
+ let templateSrv = {
|
|
|
|
|
+ replace: jest.fn(text => text),
|
|
|
|
|
+ getAdhocFilters: jest.fn(() => []),
|
|
|
|
|
+ };
|
|
|
|
|
+
|
|
|
|
|
+ let timeSrv = {
|
|
|
|
|
+ time: { from: 'now-1h', to: 'now' },
|
|
|
|
|
+ timeRange: jest.fn(() => {
|
|
|
|
|
+ return {
|
|
|
|
|
+ from: dateMath.parse(this.time.from, false),
|
|
|
|
|
+ to: dateMath.parse(this.time.to, true),
|
|
|
|
|
+ };
|
|
|
|
|
+ }),
|
|
|
|
|
+ setTime: jest.fn(time => {
|
|
|
|
|
+ this.time = time;
|
|
|
|
|
+ }),
|
|
|
|
|
+ };
|
|
|
|
|
+
|
|
|
|
|
+ let ctx = <any>{
|
|
|
|
|
+ $rootScope,
|
|
|
|
|
+ backendSrv,
|
|
|
|
|
+ };
|
|
|
|
|
|
|
|
function createDatasource(instanceSettings) {
|
|
function createDatasource(instanceSettings) {
|
|
|
instanceSettings.jsonData = instanceSettings.jsonData || {};
|
|
instanceSettings.jsonData = instanceSettings.jsonData || {};
|
|
|
- ctx.ds = ctx.$injector.instantiate(ElasticDatasource, {
|
|
|
|
|
- instanceSettings: instanceSettings,
|
|
|
|
|
- });
|
|
|
|
|
|
|
+ ctx.ds = new ElasticDatasource(instanceSettings, {}, backendSrv, templateSrv, timeSrv);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
describe('When testing datasource with index pattern', function() {
|
|
describe('When testing datasource with index pattern', function() {
|
|
@@ -40,33 +54,32 @@ describe('ElasticDatasource', function() {
|
|
|
|
|
|
|
|
it('should translate index pattern to current day', function() {
|
|
it('should translate index pattern to current day', function() {
|
|
|
var requestOptions;
|
|
var requestOptions;
|
|
|
- ctx.backendSrv.datasourceRequest = function(options) {
|
|
|
|
|
|
|
+ ctx.backendSrv.datasourceRequest = jest.fn(options => {
|
|
|
requestOptions = options;
|
|
requestOptions = options;
|
|
|
- return ctx.$q.when({ data: {} });
|
|
|
|
|
- };
|
|
|
|
|
|
|
+ return Promise.resolve({ data: {} });
|
|
|
|
|
+ });
|
|
|
|
|
|
|
|
ctx.ds.testDatasource();
|
|
ctx.ds.testDatasource();
|
|
|
- ctx.$rootScope.$apply();
|
|
|
|
|
|
|
|
|
|
var today = moment.utc().format('YYYY.MM.DD');
|
|
var today = moment.utc().format('YYYY.MM.DD');
|
|
|
- expect(requestOptions.url).to.be('http://es.com/asd-' + today + '/_mapping');
|
|
|
|
|
|
|
+ expect(requestOptions.url).toBe('http://es.com/asd-' + today + '/_mapping');
|
|
|
});
|
|
});
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
describe('When issuing metric query with interval pattern', function() {
|
|
describe('When issuing metric query with interval pattern', function() {
|
|
|
var requestOptions, parts, header;
|
|
var requestOptions, parts, header;
|
|
|
|
|
|
|
|
- beforeEach(function() {
|
|
|
|
|
|
|
+ beforeEach(() => {
|
|
|
createDatasource({
|
|
createDatasource({
|
|
|
url: 'http://es.com',
|
|
url: 'http://es.com',
|
|
|
index: '[asd-]YYYY.MM.DD',
|
|
index: '[asd-]YYYY.MM.DD',
|
|
|
jsonData: { interval: 'Daily', esVersion: '2' },
|
|
jsonData: { interval: 'Daily', esVersion: '2' },
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
- ctx.backendSrv.datasourceRequest = function(options) {
|
|
|
|
|
|
|
+ ctx.backendSrv.datasourceRequest = jest.fn(options => {
|
|
|
requestOptions = options;
|
|
requestOptions = options;
|
|
|
- return ctx.$q.when({ data: { responses: [] } });
|
|
|
|
|
- };
|
|
|
|
|
|
|
+ return Promise.resolve({ data: { responses: [] } });
|
|
|
|
|
+ });
|
|
|
|
|
|
|
|
ctx.ds.query({
|
|
ctx.ds.query({
|
|
|
range: {
|
|
range: {
|
|
@@ -82,19 +95,17 @@ describe('ElasticDatasource', function() {
|
|
|
],
|
|
],
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
- ctx.$rootScope.$apply();
|
|
|
|
|
-
|
|
|
|
|
parts = requestOptions.data.split('\n');
|
|
parts = requestOptions.data.split('\n');
|
|
|
header = angular.fromJson(parts[0]);
|
|
header = angular.fromJson(parts[0]);
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
it('should translate index pattern to current day', function() {
|
|
it('should translate index pattern to current day', function() {
|
|
|
- expect(header.index).to.eql(['asd-2015.05.30', 'asd-2015.05.31', 'asd-2015.06.01']);
|
|
|
|
|
|
|
+ expect(header.index).toEqual(['asd-2015.05.30', 'asd-2015.05.31', 'asd-2015.06.01']);
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
it('should json escape lucene query', function() {
|
|
it('should json escape lucene query', function() {
|
|
|
var body = angular.fromJson(parts[1]);
|
|
var body = angular.fromJson(parts[1]);
|
|
|
- expect(body.query.bool.filter[1].query_string.query).to.be('escape\\:test');
|
|
|
|
|
|
|
+ expect(body.query.bool.filter[1].query_string.query).toBe('escape\\:test');
|
|
|
});
|
|
});
|
|
|
});
|
|
});
|
|
|
|
|
|
|
@@ -108,10 +119,10 @@ describe('ElasticDatasource', function() {
|
|
|
jsonData: { esVersion: '2' },
|
|
jsonData: { esVersion: '2' },
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
- ctx.backendSrv.datasourceRequest = function(options) {
|
|
|
|
|
|
|
+ ctx.backendSrv.datasourceRequest = jest.fn(options => {
|
|
|
requestOptions = options;
|
|
requestOptions = options;
|
|
|
- return ctx.$q.when({ data: { responses: [] } });
|
|
|
|
|
- };
|
|
|
|
|
|
|
+ return Promise.resolve({ data: { responses: [] } });
|
|
|
|
|
+ });
|
|
|
|
|
|
|
|
ctx.ds.query({
|
|
ctx.ds.query({
|
|
|
range: {
|
|
range: {
|
|
@@ -127,27 +138,26 @@ describe('ElasticDatasource', function() {
|
|
|
],
|
|
],
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
- ctx.$rootScope.$apply();
|
|
|
|
|
parts = requestOptions.data.split('\n');
|
|
parts = requestOptions.data.split('\n');
|
|
|
header = angular.fromJson(parts[0]);
|
|
header = angular.fromJson(parts[0]);
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
it('should set search type to query_then_fetch', function() {
|
|
it('should set search type to query_then_fetch', function() {
|
|
|
- expect(header.search_type).to.eql('query_then_fetch');
|
|
|
|
|
|
|
+ expect(header.search_type).toEqual('query_then_fetch');
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
it('should set size', function() {
|
|
it('should set size', function() {
|
|
|
var body = angular.fromJson(parts[1]);
|
|
var body = angular.fromJson(parts[1]);
|
|
|
- expect(body.size).to.be(500);
|
|
|
|
|
|
|
+ expect(body.size).toBe(500);
|
|
|
});
|
|
});
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
describe('When getting fields', function() {
|
|
describe('When getting fields', function() {
|
|
|
- beforeEach(function() {
|
|
|
|
|
|
|
+ beforeEach(() => {
|
|
|
createDatasource({ url: 'http://es.com', index: 'metricbeat' });
|
|
createDatasource({ url: 'http://es.com', index: 'metricbeat' });
|
|
|
|
|
|
|
|
- ctx.backendSrv.datasourceRequest = function(options) {
|
|
|
|
|
- return ctx.$q.when({
|
|
|
|
|
|
|
+ ctx.backendSrv.datasourceRequest = jest.fn(options => {
|
|
|
|
|
+ return Promise.resolve({
|
|
|
data: {
|
|
data: {
|
|
|
metricbeat: {
|
|
metricbeat: {
|
|
|
mappings: {
|
|
mappings: {
|
|
@@ -190,7 +200,7 @@ describe('ElasticDatasource', function() {
|
|
|
},
|
|
},
|
|
|
},
|
|
},
|
|
|
});
|
|
});
|
|
|
- };
|
|
|
|
|
|
|
+ });
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
it('should return nested fields', function() {
|
|
it('should return nested fields', function() {
|
|
@@ -201,7 +211,7 @@ describe('ElasticDatasource', function() {
|
|
|
})
|
|
})
|
|
|
.then(fieldObjects => {
|
|
.then(fieldObjects => {
|
|
|
var fields = _.map(fieldObjects, 'text');
|
|
var fields = _.map(fieldObjects, 'text');
|
|
|
- expect(fields).to.eql([
|
|
|
|
|
|
|
+ expect(fields).toEqual([
|
|
|
'@timestamp',
|
|
'@timestamp',
|
|
|
'beat.name.raw',
|
|
'beat.name.raw',
|
|
|
'beat.name',
|
|
'beat.name',
|
|
@@ -212,7 +222,6 @@ describe('ElasticDatasource', function() {
|
|
|
'system.process.name',
|
|
'system.process.name',
|
|
|
]);
|
|
]);
|
|
|
});
|
|
});
|
|
|
- ctx.$rootScope.$apply();
|
|
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
it('should return fields related to query type', function() {
|
|
it('should return fields related to query type', function() {
|
|
@@ -224,7 +233,7 @@ describe('ElasticDatasource', function() {
|
|
|
})
|
|
})
|
|
|
.then(fieldObjects => {
|
|
.then(fieldObjects => {
|
|
|
var fields = _.map(fieldObjects, 'text');
|
|
var fields = _.map(fieldObjects, 'text');
|
|
|
- expect(fields).to.eql(['system.cpu.system', 'system.cpu.user', 'system.process.cpu.total']);
|
|
|
|
|
|
|
+ expect(fields).toEqual(['system.cpu.system', 'system.cpu.user', 'system.process.cpu.total']);
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
ctx.ds
|
|
ctx.ds
|
|
@@ -235,10 +244,8 @@ describe('ElasticDatasource', function() {
|
|
|
})
|
|
})
|
|
|
.then(fieldObjects => {
|
|
.then(fieldObjects => {
|
|
|
var fields = _.map(fieldObjects, 'text');
|
|
var fields = _.map(fieldObjects, 'text');
|
|
|
- expect(fields).to.eql(['@timestamp']);
|
|
|
|
|
|
|
+ expect(fields).toEqual(['@timestamp']);
|
|
|
});
|
|
});
|
|
|
-
|
|
|
|
|
- ctx.$rootScope.$apply();
|
|
|
|
|
});
|
|
});
|
|
|
});
|
|
});
|
|
|
|
|
|
|
@@ -252,10 +259,10 @@ describe('ElasticDatasource', function() {
|
|
|
jsonData: { esVersion: '5' },
|
|
jsonData: { esVersion: '5' },
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
- ctx.backendSrv.datasourceRequest = function(options) {
|
|
|
|
|
|
|
+ ctx.backendSrv.datasourceRequest = jest.fn(options => {
|
|
|
requestOptions = options;
|
|
requestOptions = options;
|
|
|
- return ctx.$q.when({ data: { responses: [] } });
|
|
|
|
|
- };
|
|
|
|
|
|
|
+ return Promise.resolve({ data: { responses: [] } });
|
|
|
|
|
+ });
|
|
|
|
|
|
|
|
ctx.ds.query({
|
|
ctx.ds.query({
|
|
|
range: {
|
|
range: {
|
|
@@ -271,34 +278,33 @@ describe('ElasticDatasource', function() {
|
|
|
],
|
|
],
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
- ctx.$rootScope.$apply();
|
|
|
|
|
parts = requestOptions.data.split('\n');
|
|
parts = requestOptions.data.split('\n');
|
|
|
header = angular.fromJson(parts[0]);
|
|
header = angular.fromJson(parts[0]);
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
it('should not set search type to count', function() {
|
|
it('should not set search type to count', function() {
|
|
|
- expect(header.search_type).to.not.eql('count');
|
|
|
|
|
|
|
+ expect(header.search_type).not.toEqual('count');
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
it('should set size to 0', function() {
|
|
it('should set size to 0', function() {
|
|
|
var body = angular.fromJson(parts[1]);
|
|
var body = angular.fromJson(parts[1]);
|
|
|
- expect(body.size).to.be(0);
|
|
|
|
|
|
|
+ expect(body.size).toBe(0);
|
|
|
});
|
|
});
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
describe('When issuing metricFind query on es5.x', function() {
|
|
describe('When issuing metricFind query on es5.x', function() {
|
|
|
var requestOptions, parts, header, body, results;
|
|
var requestOptions, parts, header, body, results;
|
|
|
|
|
|
|
|
- beforeEach(function() {
|
|
|
|
|
|
|
+ beforeEach(() => {
|
|
|
createDatasource({
|
|
createDatasource({
|
|
|
url: 'http://es.com',
|
|
url: 'http://es.com',
|
|
|
index: 'test',
|
|
index: 'test',
|
|
|
jsonData: { esVersion: '5' },
|
|
jsonData: { esVersion: '5' },
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
- ctx.backendSrv.datasourceRequest = function(options) {
|
|
|
|
|
|
|
+ ctx.backendSrv.datasourceRequest = jest.fn(options => {
|
|
|
requestOptions = options;
|
|
requestOptions = options;
|
|
|
- return ctx.$q.when({
|
|
|
|
|
|
|
+ return Promise.resolve({
|
|
|
data: {
|
|
data: {
|
|
|
responses: [
|
|
responses: [
|
|
|
{
|
|
{
|
|
@@ -318,38 +324,36 @@ describe('ElasticDatasource', function() {
|
|
|
],
|
|
],
|
|
|
},
|
|
},
|
|
|
});
|
|
});
|
|
|
- };
|
|
|
|
|
|
|
+ });
|
|
|
|
|
|
|
|
ctx.ds.metricFindQuery('{"find": "terms", "field": "test"}').then(res => {
|
|
ctx.ds.metricFindQuery('{"find": "terms", "field": "test"}').then(res => {
|
|
|
results = res;
|
|
results = res;
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
- ctx.$rootScope.$apply();
|
|
|
|
|
-
|
|
|
|
|
parts = requestOptions.data.split('\n');
|
|
parts = requestOptions.data.split('\n');
|
|
|
header = angular.fromJson(parts[0]);
|
|
header = angular.fromJson(parts[0]);
|
|
|
body = angular.fromJson(parts[1]);
|
|
body = angular.fromJson(parts[1]);
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
- it('should get results', function() {
|
|
|
|
|
- expect(results.length).to.eql(2);
|
|
|
|
|
|
|
+ it('should get results', () => {
|
|
|
|
|
+ expect(results.length).toEqual(2);
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
- it('should use key or key_as_string', function() {
|
|
|
|
|
- expect(results[0].text).to.eql('test');
|
|
|
|
|
- expect(results[1].text).to.eql('test2_as_string');
|
|
|
|
|
|
|
+ it('should use key or key_as_string', () => {
|
|
|
|
|
+ expect(results[0].text).toEqual('test');
|
|
|
|
|
+ expect(results[1].text).toEqual('test2_as_string');
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
- it('should not set search type to count', function() {
|
|
|
|
|
- expect(header.search_type).to.not.eql('count');
|
|
|
|
|
|
|
+ it('should not set search type to count', () => {
|
|
|
|
|
+ expect(header.search_type).not.toEqual('count');
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
- it('should set size to 0', function() {
|
|
|
|
|
- expect(body.size).to.be(0);
|
|
|
|
|
|
|
+ it('should set size to 0', () => {
|
|
|
|
|
+ expect(body.size).toBe(0);
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
- it('should not set terms aggregation size to 0', function() {
|
|
|
|
|
- expect(body['aggs']['1']['terms'].size).to.not.be(0);
|
|
|
|
|
|
|
+ it('should not set terms aggregation size to 0', () => {
|
|
|
|
|
+ expect(body['aggs']['1']['terms'].size).not.toBe(0);
|
|
|
});
|
|
});
|
|
|
});
|
|
});
|
|
|
});
|
|
});
|