Misthios/grafana-zabbix
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Chore: Fix prettier issues in test files (#1710)

Browse Source 
* Chore: Fix prettier issues in test files

* Escape w and d properly
This commit is contained in:
Zoltán Bedi
2023-10-13 15:20:31 +02:00
committed by GitHub
parent 5df74544e0
commit 43f2c6653b
4 changed files with 90 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/datasource/specs/dbConnector.test.ts
View File

@@ -6,7 +6,7 @@ const getAllMock = jest.fn().mockReturnValue([{ id: 42, name: 'foo', meta: {} }]
jest.mock('@grafana/runtime', () => ({ jest.mock('@grafana/runtime', () => ({
getDataSourceSrv: () => ({ getDataSourceSrv: () => ({
get: loadDatasourceMock, get: loadDatasourceMock,
getList: getAllMock getList: getAllMock,
}), }),
})); }));
@@ -17,7 +17,7 @@ describe('DBConnector', () => {
beforeEach(() => { beforeEach(() => {
ctx.options = { ctx.options = {
datasourceId: 42, datasourceId: 42,
datasourceName: undefined datasourceName: undefined,
}; };
loadDatasourceMock.mockClear(); loadDatasourceMock.mockClear();

48
src/datasource/specs/timeseries.spec.ts
View File

@@ -2,15 +2,26 @@
import ts from '../timeseries'; import ts from '../timeseries';
describe('timeseries processing functions', () => { describe('timeseries processing functions', () => {
describe('sumSeries()', () => { describe('sumSeries()', () => {
it('should properly sum series', (done) => { it('should properly sum series', (done) => {
let series = [ 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); let result = ts.sumSeries(series);
expect(result).toEqual(expected); expect(result).toEqual(expected);
@@ -20,11 +31,22 @@ describe('timeseries processing functions', () => {
it('should properly sum series with nulls', (done) => { it('should properly sum series with nulls', (done) => {
// issue #286 // issue #286
let series = [ 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); let result = ts.sumSeries(series);
expect(result).toEqual(expected); expect(result).toEqual(expected);
@@ -32,9 +54,17 @@ describe('timeseries processing functions', () => {
}); });
it('should properly offset metric', (done) => { 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); let result = ts.offset(points, 100);
expect(result).toEqual(expected); expect(result).toEqual(expected);

85
src/datasource/specs/utils.spec.ts
View File

@@ -2,29 +2,27 @@ import _ from 'lodash';
import * as utils from '../utils'; import * as utils from '../utils';
describe('Utils', () => { describe('Utils', () => {
describe('expandItemName()', () => { describe('expandItemName()', () => {
it('should properly expand unquoted params', (done) => { it('should properly expand unquoted params', (done) => {
let test_cases = [ let test_cases = [
{ {
name: `CPU $2 time`, name: `CPU $2 time`,
key: `system.cpu.util[,user,avg1]`, key: `system.cpu.util[,user,avg1]`,
expected: "CPU user time" expected: 'CPU user time',
}, },
{ {
name: `CPU $2 time - $3`, name: `CPU $2 time - $3`,
key: `system.cpu.util[,system,avg1]`, key: `system.cpu.util[,system,avg1]`,
expected: "CPU system time - avg1" expected: 'CPU system time - avg1',
}, },
{ {
name: `CPU - $1 - $2 - $3`, name: `CPU - $1 - $2 - $3`,
key: `system.cpu.util[,system,avg1]`, 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); let expandedName = utils.expandItemName(test_case.name, test_case.key);
expect(expandedName).toBe(test_case.expected); expect(expandedName).toBe(test_case.expected);
}); });
@@ -36,26 +34,26 @@ describe('Utils', () => {
{ {
name: `CPU $2 time`, name: `CPU $2 time`,
key: `system.cpu.util["type=user,value=avg",user]`, key: `system.cpu.util["type=user,value=avg",user]`,
expected: "CPU user time" expected: 'CPU user time',
}, },
{ {
name: `CPU $1 time`, name: `CPU $1 time`,
key: `system.cpu.util["type=user,value=avg","user"]`, 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`, name: `CPU $1 time $3`,
key: `system.cpu.util["type=user,value=avg",,"user"]`, 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`, name: `CPU $1 $2 $3`,
key: `system.cpu.util["type=user,value=avg",time,"user"]`, 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); let expandedName = utils.expandItemName(test_case.name, test_case.key);
expect(expandedName).toBe(test_case.expected); expect(expandedName).toBe(test_case.expected);
}); });
@@ -67,21 +65,21 @@ describe('Utils', () => {
{ {
name: `CPU $2 - $3 time`, name: `CPU $2 - $3 time`,
key: `system.cpu.util[,[user,system],avg1]`, key: `system.cpu.util[,[user,system],avg1]`,
expected: "CPU user,system - avg1 time" expected: 'CPU user,system - avg1 time',
}, },
{ {
name: `CPU $2 - $3 time`, name: `CPU $2 - $3 time`,
key: `system.cpu.util[,["user,system",iowait],avg1]`, 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`, name: `CPU - $2 - $3 - $4`,
key: `system.cpu.util[,[],["user,system",iowait],avg1]`, 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); let expandedName = utils.expandItemName(test_case.name, test_case.key);
expect(expandedName).toBe(test_case.expected); expect(expandedName).toBe(test_case.expected);
}); });
@@ -90,21 +88,20 @@ describe('Utils', () => {
}); });
describe('splitTemplateQuery()', () => { describe('splitTemplateQuery()', () => {
// Backward compatibility // Backward compatibility
it('should properly split query in old format', (done) => { it('should properly split query in old format', (done) => {
let test_cases = [ let test_cases = [
{ {
query: `/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}/'] expected: ['/alu/', '/tw-(nyc|que|brx|dwt|brk)-sta_(\\w|\\d)*-alu-[0-9{2}/'],
}, },
{ {
query: `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); let splitQuery = utils.splitTemplateQuery(test_case.query);
expect(splitQuery).toEqual(test_case.expected); expect(splitQuery).toEqual(test_case.expected);
}); });
@@ -114,24 +111,24 @@ describe('Utils', () => {
it('should properly split query', (done) => { it('should properly split query', (done) => {
let test_cases = [ let test_cases = [
{ {
query: `{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]*/'] 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}/}`, 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}/'] expected: ['alu', '/tw-(nyc|que|brx|dwt|brk)-sta_(\\w|\\d)*-alu-[0-9]{2}/'],
}, },
{ {
query: `{a}{b}{c}{d}`, query: `{a}{b}{c}{d}`,
expected: ['a', 'b', 'c', 'd'] expected: ['a', 'b', 'c', 'd'],
}, },
{ {
query: `{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); let splitQuery = utils.splitTemplateQuery(test_case.query);
expect(splitQuery).toEqual(test_case.expected); expect(splitQuery).toEqual(test_case.expected);
}); });
@@ -144,19 +141,31 @@ describe('Utils', () => {
const test_cases = [ const test_cases = [
{ {
array: [], array: [],
depth: 1 depth: 1,
}, },
{ {
array: [1, 2, 3], array: [1, 2, 3],
depth: 1 depth: 1,
}, },
{ {
array: [[1, 2], [3, 4]], array: [
depth: 2 [1, 2],
[3, 4],
],
depth: 2,
}, },
{ {
array: [[[1, 2], [3, 4]], [[1, 2], [3, 4]]], array: [
depth: 3 [
[1, 2],
[3, 4],
],
[
[1, 2],
[3, 4],
],
],
depth: 3,
}, },
]; ];

4
src/datasource/zabbix/connectors/zabbix_api/types.ts
View File

@@ -19,11 +19,11 @@ export interface JSONRPCError {
data?: string; 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 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 { export interface ZabbixRequestResponse {
data?: JSONRPCResponse<any>; data?: JSONRPCResponse<any>;