Skip to content

Commit a028ffe

Browse files
Merge pull request #146 from alanconway/lint-fixes
NO-JIRA: Run linter
2 parents 34d6cc5 + 7adc20f commit a028ffe

11 files changed

Lines changed: 32 additions & 26 deletions

File tree

web/src/__tests__/all-domains.spec.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,5 +72,7 @@ it.each([
7272
},
7373
])('convert URL<=>link', ({ url, query, constraint }) => {
7474
expect(allDomains.linkToQuery(new URIRef(url))).toEqual(Query.parse(query));
75-
expect(allDomains.queryToLink(Query.parse(query), Constraint.fromAPI(constraint))).toEqual(new URIRef(url));
75+
expect(allDomains.queryToLink(Query.parse(query), Constraint.fromAPI(constraint))).toEqual(
76+
new URIRef(url),
77+
);
7678
});

web/src/__tests__/k8s.spec.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,9 @@ describe('K8sNode.fromQuery', () => {
111111
},
112112
{
113113
query: `k8s:Pod:{"namespace":"x","name":"y","labels":{"a":"b","c":"d"},"fields": {"x":"y"}}`,
114-
url: `k8s/ns/x/pods/y?labels=${encodeURIComponent('a=b,c=d')}&fields=${encodeURIComponent('x=y')}`,
114+
url: `k8s/ns/x/pods/y?labels=${encodeURIComponent('a=b,c=d')}&fields=${encodeURIComponent(
115+
'x=y',
116+
)}`,
115117
},
116118
{
117119
query:

web/src/__tests__/log.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ describe('LogDomain.fromURL', () => {
1313
{
1414
url: `monitoring/logs?q=${encodeURIComponent(
1515
'{kubernetes_namespace_name="default",' +
16-
'kubernetes_pod_name="foo",log_type="infrastructure"}',
16+
'kubernetes_pod_name="foo",log_type="infrastructure"}',
1717
)}`,
1818
query:
1919
`log:infrastructure:{kubernetes_namespace_name="default",` +

web/src/__tests__/metric.spec.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,26 @@ import { Query, URIRef } from '../korrel8r/types';
77
*
88
*/
99
describe('metric', () => {
10-
const metric = new MetricDomain()
10+
const metric = new MetricDomain();
1111

1212
describe('query-link round trip', () => {
1313
it.each([
1414
{
15-
query: 'metric:metric:max_over_time(kube_pod_container_status_waiting_reason{job="kube-state-metrics",namespace=~"(openshift-.*|kube-.*|default)",reason="CrashLoopBackOff"}[5m]) <= 1',
16-
link: 'monitoring/query-browser?query0=max_over_time%28kube_pod_container_status_waiting_reason%7Bjob%3D%22kube-state-metrics%22%2Cnamespace%3D%7E%22%28openshift-.*%7Ckube-.*%7Cdefault%29%22%2Creason%3D%22CrashLoopBackOff%22%7D%5B5m%5D%29+%3C%3D+1'
15+
query:
16+
'metric:metric:max_over_time(kube_pod_container_status_waiting_reason{job="kube-state-metrics",namespace=~"(openshift-.*|kube-.*|default)",reason="CrashLoopBackOff"}[5m]) <= 1',
17+
link: 'monitoring/query-browser?query0=max_over_time%28kube_pod_container_status_waiting_reason%7Bjob%3D%22kube-state-metrics%22%2Cnamespace%3D%7E%22%28openshift-.*%7Ckube-.*%7Cdefault%29%22%2Creason%3D%22CrashLoopBackOff%22%7D%5B5m%5D%29+%3C%3D+1',
1718
},
1819
{
1920
// Verify issue: https://github.com/openshift/troubleshooting-panel-console-plugin/issues/127
20-
query: 'metric:metric:(1 - sum(node_memory_MemFree_bytes + node_memory_Buffers_bytes + node_memory_Cached_bytes and on (instance) label_replace(kube_node_role{role="master"}, "instance", "$1", "node", "(.+)")) / sum(node_memory_MemTotal_bytes and on (instance) label_replace(kube_node_role{role="master"}, "instance", "$1", "node", "(.+)"))) * 100 > 60',
21-
link: 'monitoring/query-browser?query0=%281+-+sum%28node_memory_MemFree_bytes+%2B+node_memory_Buffers_bytes+%2B+node_memory_Cached_bytes+and+on+%28instance%29+label_replace%28kube_node_role%7Brole%3D%22master%22%7D%2C+%22instance%22%2C+%22%241%22%2C+%22node%22%2C+%22%28.%2B%29%22%29%29+%2F+sum%28node_memory_MemTotal_bytes+and+on+%28instance%29+label_replace%28kube_node_role%7Brole%3D%22master%22%7D%2C+%22instance%22%2C+%22%241%22%2C+%22node%22%2C+%22%28.%2B%29%22%29%29%29+*+100+%3E+60'
21+
query:
22+
'metric:metric:(1 - sum(node_memory_MemFree_bytes + node_memory_Buffers_bytes + node_memory_Cached_bytes and on (instance) label_replace(kube_node_role{role="master"}, "instance", "$1", "node", "(.+)")) / sum(node_memory_MemTotal_bytes and on (instance) label_replace(kube_node_role{role="master"}, "instance", "$1", "node", "(.+)"))) * 100 > 60',
23+
link: 'monitoring/query-browser?query0=%281+-+sum%28node_memory_MemFree_bytes+%2B+node_memory_Buffers_bytes+%2B+node_memory_Cached_bytes+and+on+%28instance%29+label_replace%28kube_node_role%7Brole%3D%22master%22%7D%2C+%22instance%22%2C+%22%241%22%2C+%22node%22%2C+%22%28.%2B%29%22%29%29+%2F+sum%28node_memory_MemTotal_bytes+and+on+%28instance%29+label_replace%28kube_node_role%7Brole%3D%22master%22%7D%2C+%22instance%22%2C+%22%241%22%2C+%22node%22%2C+%22%28.%2B%29%22%29%29%29+*+100+%3E+60',
2224
},
2325
])('', ({ query, link }) => {
24-
const q = Query.parse(query)
25-
expect(metric.queryToLink(q).toString()).toEqual(link)
26+
const q = Query.parse(query);
27+
expect(metric.queryToLink(q).toString()).toEqual(link);
2628
expect(metric.linkToQuery(new URIRef(link))).toEqual(q);
27-
})
28-
29+
});
2930
});
3031

3132
describe('linkToQuery errors', () => {
@@ -40,7 +41,6 @@ describe('metric', () => {
4041
},
4142
])('$url', ({ url, error }) => {
4243
expect(() => metric.linkToQuery(new URIRef(url))).toThrow(error);
43-
4444
});
4545
});
4646

web/src/__tests__/types.spec.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ class FakeDomain extends Domain {
3838

3939
queryToLink(query: Query, constraint?: Constraint): URIRef {
4040
if (!query || !query.class || query.class.domain != this.name) throw this.badQuery(query);
41-
return new URIRef(`${query.class.domain}/${query.class.name}?${query.selector}`, { constraint: constraint });
41+
return new URIRef(`${query.class.domain}/${query.class.name}?${query.selector}`, {
42+
constraint: constraint,
43+
});
4244
}
4345
}
4446

web/src/components/Korrel8rPanel.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ export default function Korrel8rPanel() {
5454
persistedSearch?.queryStr
5555
? persistedSearch
5656
: ({
57-
...defaultSearch,
58-
queryStr: locationQuery?.toString(),
59-
constraint: persistedSearch?.constraint,
60-
} as Search),
57+
...defaultSearch,
58+
queryStr: locationQuery?.toString(),
59+
constraint: persistedSearch?.constraint,
60+
} as Search),
6161
);
6262
const [result, setResult] = React.useState<Result | null>(null);
6363
const [showQuery, setShowQuery] = React.useState(false);

web/src/korrel8r/alert.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@ export class AlertDomain extends Domain {
3030

3131
queryToLink(query: Query): URIRef {
3232
const selectors = keyValueList(JSON.parse(query.selector));
33-
return new URIRef(`monitoring/alerts`, { alerts: selectors || undefined })
33+
return new URIRef(`monitoring/alerts`, { alerts: selectors || undefined });
3434
}
3535
}

web/src/korrel8r/log.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,6 @@ export class LogDomain extends Domain {
4747
tenant: logClass,
4848
start: unixMilliseconds(constraint?.start),
4949
end: unixMilliseconds(constraint?.end),
50-
})
50+
});
5151
}
5252
}

web/src/korrel8r/metric.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ export class MetricDomain extends Domain {
2121
if (!query.selector || query.selector.match(/{ *}/)) {
2222
throw this.badQuery(query, 'empty selector');
2323
}
24-
return new URIRef('monitoring/query-browser', { query0: query.selector }) // FIXME use explicit URIRef everywhere.
24+
return new URIRef('monitoring/query-browser', { query0: query.selector }); // FIXME use explicit URIRef everywhere.
2525
}
2626
}

web/src/korrel8r/netflow.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,6 @@ export class NetflowDomain extends Domain {
7272
filters: filters ? filters : undefined,
7373
startTime: unixSeconds(constraint?.start),
7474
endTime: unixSeconds(constraint?.end),
75-
})
75+
});
7676
}
7777
}

0 commit comments

Comments
 (0)