diff --git a/src/datasource/specs/dbConnector.test.ts b/src/datasource/specs/dbConnector.test.ts index b77d0ee..b61c212 100644 --- a/src/datasource/specs/dbConnector.test.ts +++ b/src/datasource/specs/dbConnector.test.ts @@ -6,7 +6,7 @@ const getAllMock = jest.fn().mockReturnValue([{ id: 42, name: 'foo', meta: {} }] jest.mock('@grafana/runtime', () => ({ getDataSourceSrv: () => ({ get: loadDatasourceMock, - getList: getAllMock + getList: getAllMock, }), })); @@ -17,7 +17,7 @@ describe('DBConnector', () => { beforeEach(() => { ctx.options = { datasourceId: 42, - datasourceName: undefined + datasourceName: undefined, }; loadDatasourceMock.mockClear(); diff --git a/src/datasource/specs/timeseries.spec.ts b/src/datasource/specs/timeseries.spec.ts index 5fe21b4..7d5e06d 100644 --- a/src/datasource/specs/timeseries.spec.ts +++ b/src/datasource/specs/timeseries.spec.ts @@ -2,15 +2,26 @@ import ts from '../timeseries'; describe('timeseries processing functions', () => { - describe('sumSeries()', () => { it('should properly sum series', (done) => { let series = [ - [[0, 1], [1, 2], [1, 3]], - [[2, 1], [3, 2], [4, 3]] + [ + [0, 1], + [1, 2], + [1, 3], + ], + [ + [2, 1], + [3, 2], + [4, 3], + ], ]; - let expected = [[2, 1], [4, 2], [5, 3]]; + let expected = [ + [2, 1], + [4, 2], + [5, 3], + ]; let result = ts.sumSeries(series); expect(result).toEqual(expected); @@ -20,11 +31,22 @@ describe('timeseries processing functions', () => { it('should properly sum series with nulls', (done) => { // issue #286 let series = [ - [[1, 1], [1, 2], [1, 3]], - [[3, 2], [4, 3]] + [ + [1, 1], + [1, 2], + [1, 3], + ], + [ + [3, 2], + [4, 3], + ], ]; - let expected = [[1, 1], [4, 2], [5, 3]]; + let expected = [ + [1, 1], + [4, 2], + [5, 3], + ]; let result = ts.sumSeries(series); expect(result).toEqual(expected); @@ -32,9 +54,17 @@ describe('timeseries processing functions', () => { }); it('should properly offset metric', (done) => { - let points = [[1, 1], [-4, 2], [2, 3]]; + let points = [ + [1, 1], + [-4, 2], + [2, 3], + ]; - let expected = [[101, 1], [96, 2], [102, 3]]; + let expected = [ + [101, 1], + [96, 2], + [102, 3], + ]; let result = ts.offset(points, 100); expect(result).toEqual(expected); diff --git a/src/datasource/specs/utils.spec.ts b/src/datasource/specs/utils.spec.ts index 01cc76f..13c14e5 100644 --- a/src/datasource/specs/utils.spec.ts +++ b/src/datasource/specs/utils.spec.ts @@ -2,29 +2,27 @@ import _ from 'lodash'; import * as utils from '../utils'; describe('Utils', () => { - describe('expandItemName()', () => { - it('should properly expand unquoted params', (done) => { let test_cases = [ { name: `CPU $2 time`, key: `system.cpu.util[,user,avg1]`, - expected: "CPU user time" + expected: 'CPU user time', }, { name: `CPU $2 time - $3`, key: `system.cpu.util[,system,avg1]`, - expected: "CPU system time - avg1" + expected: 'CPU system time - avg1', }, { name: `CPU - $1 - $2 - $3`, key: `system.cpu.util[,system,avg1]`, - expected: "CPU - - system - avg1" - } + expected: 'CPU - - system - avg1', + }, ]; - _.each(test_cases, test_case => { + _.each(test_cases, (test_case) => { let expandedName = utils.expandItemName(test_case.name, test_case.key); expect(expandedName).toBe(test_case.expected); }); @@ -36,26 +34,26 @@ describe('Utils', () => { { name: `CPU $2 time`, key: `system.cpu.util["type=user,value=avg",user]`, - expected: "CPU user time" + expected: 'CPU user time', }, { name: `CPU $1 time`, key: `system.cpu.util["type=user,value=avg","user"]`, - expected: "CPU type=user,value=avg time" + expected: 'CPU type=user,value=avg time', }, { name: `CPU $1 time $3`, key: `system.cpu.util["type=user,value=avg",,"user"]`, - expected: "CPU type=user,value=avg time user" + expected: 'CPU type=user,value=avg time user', }, { name: `CPU $1 $2 $3`, key: `system.cpu.util["type=user,value=avg",time,"user"]`, - expected: "CPU type=user,value=avg time user" - } + expected: 'CPU type=user,value=avg time user', + }, ]; - _.each(test_cases, test_case => { + _.each(test_cases, (test_case) => { let expandedName = utils.expandItemName(test_case.name, test_case.key); expect(expandedName).toBe(test_case.expected); }); @@ -67,21 +65,21 @@ describe('Utils', () => { { name: `CPU $2 - $3 time`, key: `system.cpu.util[,[user,system],avg1]`, - expected: "CPU user,system - avg1 time" + expected: 'CPU user,system - avg1 time', }, { name: `CPU $2 - $3 time`, key: `system.cpu.util[,["user,system",iowait],avg1]`, - expected: `CPU "user,system",iowait - avg1 time` + expected: `CPU "user,system",iowait - avg1 time`, }, { name: `CPU - $2 - $3 - $4`, key: `system.cpu.util[,[],["user,system",iowait],avg1]`, - expected: `CPU - - "user,system",iowait - avg1` - } + expected: `CPU - - "user,system",iowait - avg1`, + }, ]; - _.each(test_cases, test_case => { + _.each(test_cases, (test_case) => { let expandedName = utils.expandItemName(test_case.name, test_case.key); expect(expandedName).toBe(test_case.expected); }); @@ -90,21 +88,20 @@ describe('Utils', () => { }); describe('splitTemplateQuery()', () => { - // Backward compatibility it('should properly split query in old format', (done) => { let test_cases = [ { - query: `/alu/./tw-(nyc|que|brx|dwt|brk)-sta_(\w|\d)*-alu-[0-9{2}/`, - expected: ['/alu/', '/tw-(nyc|que|brx|dwt|brk)-sta_(\w|\d)*-alu-[0-9{2}/'] + query: `/alu/./tw-(nyc|que|brx|dwt|brk)-sta_(\\w|\\d)*-alu-[0-9{2}/`, + expected: ['/alu/', '/tw-(nyc|que|brx|dwt|brk)-sta_(\\w|\\d)*-alu-[0-9{2}/'], }, { query: `a.b.c.d`, - expected: ['a', 'b', 'c', 'd'] - } + expected: ['a', 'b', 'c', 'd'], + }, ]; - _.each(test_cases, test_case => { + _.each(test_cases, (test_case) => { let splitQuery = utils.splitTemplateQuery(test_case.query); expect(splitQuery).toEqual(test_case.expected); }); @@ -114,24 +111,24 @@ describe('Utils', () => { it('should properly split query', (done) => { let test_cases = [ { - query: `{alu}{/tw-(nyc|que|brx|dwt|brk)-sta_(\w|\d)*-alu-[0-9]*/}`, - expected: ['alu', '/tw-(nyc|que|brx|dwt|brk)-sta_(\w|\d)*-alu-[0-9]*/'] + query: `{alu}{/tw-(nyc|que|brx|dwt|brk)-sta_(\\w|\\d)*-alu-[0-9]*/}`, + expected: ['alu', '/tw-(nyc|que|brx|dwt|brk)-sta_(\\w|\\d)*-alu-[0-9]*/'], }, { - query: `{alu}{/tw-(nyc|que|brx|dwt|brk)-sta_(\w|\d)*-alu-[0-9]{2}/}`, - expected: ['alu', '/tw-(nyc|que|brx|dwt|brk)-sta_(\w|\d)*-alu-[0-9]{2}/'] + query: `{alu}{/tw-(nyc|que|brx|dwt|brk)-sta_(\\w|\\d)*-alu-[0-9]{2}/}`, + expected: ['alu', '/tw-(nyc|que|brx|dwt|brk)-sta_(\\w|\\d)*-alu-[0-9]{2}/'], }, { query: `{a}{b}{c}{d}`, - expected: ['a', 'b', 'c', 'd'] + expected: ['a', 'b', 'c', 'd'], }, { query: `{a}{b.c.d}`, - expected: ['a', 'b.c.d'] - } + expected: ['a', 'b.c.d'], + }, ]; - _.each(test_cases, test_case => { + _.each(test_cases, (test_case) => { let splitQuery = utils.splitTemplateQuery(test_case.query); expect(splitQuery).toEqual(test_case.expected); }); @@ -144,19 +141,31 @@ describe('Utils', () => { const test_cases = [ { array: [], - depth: 1 + depth: 1, }, { array: [1, 2, 3], - depth: 1 + depth: 1, }, { - array: [[1, 2], [3, 4]], - depth: 2 + array: [ + [1, 2], + [3, 4], + ], + depth: 2, }, { - array: [[[1, 2], [3, 4]], [[1, 2], [3, 4]]], - depth: 3 + array: [ + [ + [1, 2], + [3, 4], + ], + [ + [1, 2], + [3, 4], + ], + ], + depth: 3, }, ]; diff --git a/src/datasource/zabbix/connectors/zabbix_api/types.ts b/src/datasource/zabbix/connectors/zabbix_api/types.ts index 83038be..f94ebbc 100644 --- a/src/datasource/zabbix/connectors/zabbix_api/types.ts +++ b/src/datasource/zabbix/connectors/zabbix_api/types.ts @@ -19,11 +19,11 @@ export interface JSONRPCError { data?: string; } -export type JSONRPCRequestParams = {[key: string]: any}; +export type JSONRPCRequestParams = { [key: string]: any }; export type HTTPMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'HEAD' | 'CONNECT' | 'OPTIONS' | 'TRACE'; -export type GFRequestOptions = {[key: string]: any}; +export type GFRequestOptions = { [key: string]: any }; export interface ZabbixRequestResponse { data?: JSONRPCResponse;