Skip to content

Commit c033881

Browse files
jewbetchajewbetcha
committedAug 5, 2024
[cr] add prettier config and re-format
1 parent 645a7d8 commit c033881

File tree

5 files changed

+104
-107
lines changed

5 files changed

+104
-107
lines changed
 

‎.prettierrc.js

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
/*
2+
* ⚠️⚠️⚠️ THIS FILE WAS SCAFFOLDED BY `@grafana/create-plugin`. DO NOT EDIT THIS FILE DIRECTLY. ⚠️⚠️⚠️
3+
*
4+
* In order to extend the configuration follow the steps in .config/README.md
5+
*/
6+
7+
module.exports = {
8+
"endOfLine": "auto",
9+
"printWidth": 120,
10+
"trailingComma": "es5",
11+
"semi": true,
12+
"jsxSingleQuote": false,
13+
"singleQuote": true,
14+
"useTabs": false,
15+
"tabWidth": 2
16+
};

‎src/promql.ts

+26-43
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,44 @@
1-
import { AggregationParams, LogicalOpParams } from "./types";
1+
import { AggregationParams, LogicalOpParams } from './types';
22

33
export const promql = {
4-
x_over_time: (x: string, q: string, range = "$__range", interval = "") => {
4+
x_over_time: (x: string, q: string, range = '$__range', interval = '') => {
55
return `${x}_over_time((${q})[${range}:${interval}])`;
66
},
77

88
// Aggregation over time
9-
avg_over_time: (q: string, range?: string, interval?: string) =>
10-
promql.x_over_time("avg", q, range, interval),
11-
count_over_time: (q: string, range?: string, interval?: string) =>
12-
promql.x_over_time("count", q, range, interval),
13-
last_over_time: (q: string, range?: string, interval?: string) =>
14-
promql.x_over_time("last", q, range, interval),
15-
max_over_time: (q: string, range?: string, interval?: string) =>
16-
promql.x_over_time("max", q, range, interval),
17-
min_over_time: (q: string, range?: string, interval?: string) =>
18-
promql.x_over_time("min", q, range, interval),
9+
avg_over_time: (q: string, range?: string, interval?: string) => promql.x_over_time('avg', q, range, interval),
10+
count_over_time: (q: string, range?: string, interval?: string) => promql.x_over_time('count', q, range, interval),
11+
last_over_time: (q: string, range?: string, interval?: string) => promql.x_over_time('last', q, range, interval),
12+
max_over_time: (q: string, range?: string, interval?: string) => promql.x_over_time('max', q, range, interval),
13+
min_over_time: (q: string, range?: string, interval?: string) => promql.x_over_time('min', q, range, interval),
1914
present_over_time: (q: string, range?: string, interval?: string) =>
20-
promql.x_over_time("present", q, range, interval),
21-
stddev_over_time: (q: string, range?: string, interval?: string) =>
22-
promql.x_over_time("stddev", q, range, interval),
23-
stdvar_over_time: (q: string, range?: string, interval?: string) =>
24-
promql.x_over_time("stdvar", q, range, interval),
25-
sum_over_time: (q: string, range?: string, interval?: string) =>
26-
promql.x_over_time("sum", q, range, interval),
15+
promql.x_over_time('present', q, range, interval),
16+
stddev_over_time: (q: string, range?: string, interval?: string) => promql.x_over_time('stddev', q, range, interval),
17+
stdvar_over_time: (q: string, range?: string, interval?: string) => promql.x_over_time('stdvar', q, range, interval),
18+
sum_over_time: (q: string, range?: string, interval?: string) => promql.x_over_time('sum', q, range, interval),
2719
quantile_over_time: (q: string, range?: string, interval?: string) =>
28-
promql.x_over_time("quantile", q, range, interval),
20+
promql.x_over_time('quantile', q, range, interval),
2921

3022
offset: (offset?: number, units?: string) => {
3123
// implicit cast because syntax checker only generates string args
3224
offset = offset ? +offset : 0;
33-
units = units || "d";
34-
return offset && units ? `offset ${offset}${units}` : "";
25+
units = units || 'd';
26+
return offset && units ? `offset ${offset}${units}` : '';
3527
},
3628

37-
by: (labels?: string) => (labels ? ` by (${labels}) ` : ""),
38-
without: (labels?: string) => (labels ? ` without (${labels}) ` : ""),
39-
byOrWithout: ({ by, without }: AggregationParams) =>
40-
by ? promql.by(by) : promql.without(without),
29+
by: (labels?: string) => (labels ? ` by (${labels}) ` : ''),
30+
without: (labels?: string) => (labels ? ` without (${labels}) ` : ''),
31+
byOrWithout: ({ by, without }: AggregationParams) => (by ? promql.by(by) : promql.without(without)),
4132

4233
// Aggregation
43-
sum: (params: AggregationParams) =>
44-
`sum${promql.byOrWithout(params)}(${params.expr})`,
45-
min: (params: AggregationParams) =>
46-
`min${promql.byOrWithout(params)}(${params.expr})`,
47-
max: (params: AggregationParams) =>
48-
`max${promql.byOrWithout(params)}(${params.expr})`,
49-
avg: (params: AggregationParams) =>
50-
`avg${promql.byOrWithout(params)}(${params.expr})`,
51-
group: (params: AggregationParams) =>
52-
`group${promql.byOrWithout(params)}(${params.expr})`,
53-
count: (params: AggregationParams) =>
54-
`count${promql.byOrWithout(params)}(${params.expr})`,
55-
stddev: (params: AggregationParams) =>
56-
`stddev${promql.byOrWithout(params)}(${params.expr})`,
57-
stdvar: (params: AggregationParams) =>
58-
`stdvar${promql.byOrWithout(params)}(${params.expr})`,
34+
sum: (params: AggregationParams) => `sum${promql.byOrWithout(params)}(${params.expr})`,
35+
min: (params: AggregationParams) => `min${promql.byOrWithout(params)}(${params.expr})`,
36+
max: (params: AggregationParams) => `max${promql.byOrWithout(params)}(${params.expr})`,
37+
avg: (params: AggregationParams) => `avg${promql.byOrWithout(params)}(${params.expr})`,
38+
group: (params: AggregationParams) => `group${promql.byOrWithout(params)}(${params.expr})`,
39+
count: (params: AggregationParams) => `count${promql.byOrWithout(params)}(${params.expr})`,
40+
stddev: (params: AggregationParams) => `stddev${promql.byOrWithout(params)}(${params.expr})`,
41+
stdvar: (params: AggregationParams) => `stdvar${promql.byOrWithout(params)}(${params.expr})`,
5942
count_values: (parameter: number, params: AggregationParams) =>
6043
`count_values${promql.byOrWithout(params)}(${parameter}, ${params.expr})`,
6144
bottomk: (parameter: number, params: AggregationParams) =>
@@ -69,5 +52,5 @@ export const promql = {
6952
or: (params: LogicalOpParams) => `${params.left} or ${params.right}`,
7053
unless: (params: LogicalOpParams) => `${params.left} unless ${params.right}`,
7154

72-
rate: (q: string, interval = "$__rate_interval") => `rate(${q}[${interval}])`,
55+
rate: (q: string, interval = '$__rate_interval') => `rate(${q}[${interval}])`,
7356
};

‎src/test/aggregate.spec.ts

+32-34
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,74 @@
1-
import { promql } from "../promql";
1+
import { promql } from '../promql';
22

33
// https://prometheus.io/docs/prometheus/latest/querying/operators/#aggregation-operators
4-
describe("Operators: Aggregations", () => {
4+
describe('Operators: Aggregations', () => {
55
it.each([
66
{
7-
actual: () => promql.sum({ expr: "" }),
8-
expected: "sum()",
7+
actual: () => promql.sum({ expr: '' }),
8+
expected: 'sum()',
99
},
1010
{
11-
actual: () => promql.min({ expr: "" }),
12-
expected: "min()",
11+
actual: () => promql.min({ expr: '' }),
12+
expected: 'min()',
1313
},
1414
{
15-
actual: () => promql.max({ expr: "" }),
16-
expected: "max()",
15+
actual: () => promql.max({ expr: '' }),
16+
expected: 'max()',
1717
},
1818
{
19-
actual: () => promql.avg({ expr: "" }),
20-
expected: "avg()",
19+
actual: () => promql.avg({ expr: '' }),
20+
expected: 'avg()',
2121
},
2222
{
23-
actual: () => promql.group({ expr: "" }),
24-
expected: "group()",
23+
actual: () => promql.group({ expr: '' }),
24+
expected: 'group()',
2525
},
2626
{
27-
actual: () => promql.count({ expr: "" }),
28-
expected: "count()",
27+
actual: () => promql.count({ expr: '' }),
28+
expected: 'count()',
2929
},
3030
{
31-
actual: () => promql.stddev({ expr: "" }),
32-
expected: "stddev()",
31+
actual: () => promql.stddev({ expr: '' }),
32+
expected: 'stddev()',
3333
},
3434
{
35-
actual: () => promql.stdvar({ expr: "" }),
36-
expected: "stdvar()",
35+
actual: () => promql.stdvar({ expr: '' }),
36+
expected: 'stdvar()',
3737
},
3838
{
39-
actual: () => promql.count_values(1, { expr: "" }),
40-
expected: "count_values(1, )",
39+
actual: () => promql.count_values(1, { expr: '' }),
40+
expected: 'count_values(1, )',
4141
},
4242
{
43-
actual: () => promql.bottomk(1, { expr: "" }),
44-
expected: "bottomk(1, )",
43+
actual: () => promql.bottomk(1, { expr: '' }),
44+
expected: 'bottomk(1, )',
4545
},
4646
{
47-
actual: () => promql.topk(1, { expr: "" }),
48-
expected: "topk(1, )",
47+
actual: () => promql.topk(1, { expr: '' }),
48+
expected: 'topk(1, )',
4949
},
5050
{
51-
actual: () => promql.quantile(1, { expr: "" }),
52-
expected: "quantile(1, )",
51+
actual: () => promql.quantile(1, { expr: '' }),
52+
expected: 'quantile(1, )',
5353
},
5454
{
5555
actual: () => promql.sum({ expr: 'test_metric{foo="bar"}' }),
5656
expected: 'sum(test_metric{foo="bar"})',
5757
},
5858
{
59-
actual: () =>
60-
promql.sum({ expr: 'test_metric{foo="bar"}', without: "foo" }),
59+
actual: () => promql.sum({ expr: 'test_metric{foo="bar"}', without: 'foo' }),
6160
expected: 'sum without (foo) (test_metric{foo="bar"})',
6261
},
6362
{
64-
actual: () => promql.sum({ expr: 'test_metric{foo="bar"}', by: "foo" }),
63+
actual: () => promql.sum({ expr: 'test_metric{foo="bar"}', by: 'foo' }),
6564
expected: 'sum by (foo) (test_metric{foo="bar"})',
6665
},
6766
{
6867
actual: () =>
6968
promql.sum({
7069
expr: 'test_metric{foo="bar"}',
71-
without: "foo",
72-
by: "bar",
70+
without: 'foo',
71+
by: 'bar',
7372
}),
7473
expected: 'sum by (bar) (test_metric{foo="bar"})',
7574
},
@@ -78,11 +77,10 @@ describe("Operators: Aggregations", () => {
7877
expected: 'stddev(test_metric{foo="bar"})',
7978
},
8079
{
81-
actual: () =>
82-
promql.stddev({ expr: 'test_metric{foo="bar"}', by: "foo" }),
80+
actual: () => promql.stddev({ expr: 'test_metric{foo="bar"}', by: 'foo' }),
8381
expected: 'stddev by (foo) (test_metric{foo="bar"})',
8482
},
85-
])("Generate PromQL query: $expected", ({ actual, expected }) => {
83+
])('Generate PromQL query: $expected', ({ actual, expected }) => {
8684
expect(actual()).toStrictEqual(expected);
8785
});
8886
});

‎src/test/aggregateOverTime.spec.ts

+23-23
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,57 @@
1-
import { promql } from "../promql";
1+
import { promql } from '../promql';
22

33
// https://prometheus.io/docs/prometheus/latest/querying/functions/#aggregation_over_time
4-
describe("Functions: Aggregation over time", () => {
4+
describe('Functions: Aggregation over time', () => {
55
it.each([
66
{
7-
actual: () => promql.avg_over_time(""),
8-
expected: "avg_over_time(()[$__range:])",
7+
actual: () => promql.avg_over_time(''),
8+
expected: 'avg_over_time(()[$__range:])',
99
},
1010
{
11-
actual: () => promql.count_over_time(""),
12-
expected: "count_over_time(()[$__range:])",
11+
actual: () => promql.count_over_time(''),
12+
expected: 'count_over_time(()[$__range:])',
1313
},
1414
{
15-
actual: () => promql.last_over_time(""),
16-
expected: "last_over_time(()[$__range:])",
15+
actual: () => promql.last_over_time(''),
16+
expected: 'last_over_time(()[$__range:])',
1717
},
1818
{
19-
actual: () => promql.max_over_time(""),
20-
expected: "max_over_time(()[$__range:])",
19+
actual: () => promql.max_over_time(''),
20+
expected: 'max_over_time(()[$__range:])',
2121
},
2222
{
23-
actual: () => promql.min_over_time(""),
24-
expected: "min_over_time(()[$__range:])",
23+
actual: () => promql.min_over_time(''),
24+
expected: 'min_over_time(()[$__range:])',
2525
},
2626
{
27-
actual: () => promql.present_over_time(""),
28-
expected: "present_over_time(()[$__range:])",
27+
actual: () => promql.present_over_time(''),
28+
expected: 'present_over_time(()[$__range:])',
2929
},
3030
{
31-
actual: () => promql.stddev_over_time(""),
32-
expected: "stddev_over_time(()[$__range:])",
31+
actual: () => promql.stddev_over_time(''),
32+
expected: 'stddev_over_time(()[$__range:])',
3333
},
3434
{
35-
actual: () => promql.stdvar_over_time(""),
36-
expected: "stdvar_over_time(()[$__range:])",
35+
actual: () => promql.stdvar_over_time(''),
36+
expected: 'stdvar_over_time(()[$__range:])',
3737
},
3838
{
39-
actual: () => promql.sum_over_time(""),
40-
expected: "sum_over_time(()[$__range:])",
39+
actual: () => promql.sum_over_time(''),
40+
expected: 'sum_over_time(()[$__range:])',
4141
},
4242
{
4343
actual: () => promql.sum_over_time('test_metric{foo="bar"}'),
4444
expected: 'sum_over_time((test_metric{foo="bar"})[$__range:])',
4545
},
4646
{
47-
actual: () => promql.sum_over_time('test_metric{foo="bar"}', "1h"),
47+
actual: () => promql.sum_over_time('test_metric{foo="bar"}', '1h'),
4848
expected: 'sum_over_time((test_metric{foo="bar"})[1h:])',
4949
},
5050
{
51-
actual: () => promql.sum_over_time('test_metric{foo="bar"}', "1h", "1m"),
51+
actual: () => promql.sum_over_time('test_metric{foo="bar"}', '1h', '1m'),
5252
expected: 'sum_over_time((test_metric{foo="bar"})[1h:1m])',
5353
},
54-
])("Generate PromQL query: $expected", ({ actual, expected }) => {
54+
])('Generate PromQL query: $expected', ({ actual, expected }) => {
5555
expect(actual()).toStrictEqual(expected);
5656
});
5757
});

‎src/test/offset.spec.ts

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
import { promql } from "../promql";
1+
import { promql } from '../promql';
22

33
// https://prometheus.io/docs/prometheus/latest/querying/basics/#offset-modifier
4-
describe("Basics: offset modifier", () => {
4+
describe('Basics: offset modifier', () => {
55
it.each([
66
{
77
actual: () => promql.offset(),
8-
expected: "",
8+
expected: '',
99
},
1010
{
1111
actual: () => promql.offset(42),
12-
expected: "offset 42d",
12+
expected: 'offset 42d',
1313
},
1414
{
15-
actual: () => promql.offset(42, "h"),
16-
expected: "offset 42h",
15+
actual: () => promql.offset(42, 'h'),
16+
expected: 'offset 42h',
1717
},
18-
])("Generate PromQL offset modifier: $expected", ({ actual, expected }) => {
18+
])('Generate PromQL offset modifier: $expected', ({ actual, expected }) => {
1919
expect(actual()).toStrictEqual(expected);
2020
});
2121
});

0 commit comments

Comments
 (0)
Please sign in to comment.