Skip to content

Commit 201c5ad

Browse files
alanconwayshwetaap
authored andcommitted
refactor: remove unused Korrel8rNode.domain property
1 parent 6cb3de4 commit 201c5ad

8 files changed

Lines changed: 44 additions & 13 deletions

File tree

web/src/korrel8r/alert.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
import { Korrel8rDomain, Korrel8rNode, NodeError } from './korrel8r.types';
1+
import { Korrel8rNode, NodeError } from './korrel8r.types';
22
import { keyValueList, parseKeyValueList, parseQuery, parseURL } from './query-url';
33

44
const domain = 'alert';
55

66
export class AlertNode extends Korrel8rNode {
7-
domain: Korrel8rDomain = Korrel8rDomain.Alert;
87
query: string;
98
url: string;
109

web/src/korrel8r/invalid.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
import { Korrel8rDomain, Korrel8rNode } from './korrel8r.types';
1+
import { Korrel8rNode } from './korrel8r.types';
22

33
export class InvalidNode extends Korrel8rNode {
4-
domain: Korrel8rDomain = Korrel8rDomain.Alert;
54
query: string;
65
url: string;
76

web/src/korrel8r/k8s.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { getCachedResources } from '../getResources';
2-
import { Korrel8rDomain, Korrel8rNode, NodeError } from './korrel8r.types';
2+
import { Korrel8rNode, NodeError } from './korrel8r.types';
33
import { keyValueList, parseQuery, parseURL } from './query-url';
44

55
type GroupVersionKind = {
@@ -33,7 +33,6 @@ const pathRegex = new RegExp(
3333
);
3434

3535
export class K8sNode extends Korrel8rNode {
36-
domain: Korrel8rDomain = Korrel8rDomain.Alert;
3736
query: string;
3837
url: string;
3938

web/src/korrel8r/korrel8r.types.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ export enum Korrel8rDomain {
77
}
88

99
export abstract class Korrel8rNode {
10-
domain: Korrel8rDomain;
1110
static fromURL: (url: string) => Korrel8rNode;
1211
static fromQuery: (query: string) => Korrel8rNode;
1312
abstract toURL(): string;

web/src/korrel8r/log.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Korrel8rDomain, Korrel8rNode, NodeError } from './korrel8r.types';
1+
import { Korrel8rNode, NodeError } from './korrel8r.types';
22
import { parseQuery, parseURL } from './query-url';
33

44
enum LogClass {
@@ -12,7 +12,6 @@ const addJSON = (logQL: string): string => {
1212
};
1313

1414
export class LogNode extends Korrel8rNode {
15-
domain: Korrel8rDomain = Korrel8rDomain.Alert;
1615
logClass: LogClass;
1716
query: string;
1817
url: string;

web/src/korrel8r/metric.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
import { Korrel8rDomain, Korrel8rNode, NodeError } from './korrel8r.types';
1+
import { Korrel8rNode, NodeError } from './korrel8r.types';
22
import { parseURL } from './query-url';
33

44
export class MetricNode extends Korrel8rNode {
5-
domain: Korrel8rDomain = Korrel8rDomain.Alert;
65
query: string;
76
url: string;
87

web/src/korrel8r/netflow.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Korrel8rDomain, Korrel8rNode, NodeError } from './korrel8r.types';
1+
import { Korrel8rNode, NodeError } from './korrel8r.types';
22
import { parseQuery, parseURL } from './query-url';
33

44
// https://docs.openshift.com/container-platform/4.15/observability/network_observability/json-flows-format-reference.html
@@ -25,7 +25,6 @@ const urlToQueryName = Object.entries(queryToURLName).reduce((result, [key, valu
2525
}, {});
2626

2727
export class NetflowNode extends Korrel8rNode {
28-
domain: Korrel8rDomain = Korrel8rDomain.Alert;
2928
query: string;
3029
url: string;
3130

web/src/korrel8r/trace.ts

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
import { Korrel8rNode } from './korrel8r.types';
2+
import { parseQuery, parseURL } from './query-url';
3+
4+
export class TraceNode extends Korrel8rNode {
5+
query: string;
6+
url: string;
7+
8+
constructor(url: string, query: string) {
9+
super();
10+
this.query = query;
11+
this.url = url;
12+
}
13+
14+
// TODO: Add support for pulling parameters from filter query parameters
15+
static fromURL(url: string): Korrel8rNode {
16+
const [, params] = parseURL('trace', 'observe/traces', url);
17+
const traceQL = params.get('q');
18+
return new TraceNode(url, `trace:trace:${traceQL}`);
19+
}
20+
21+
static fromQuery(query: string): Korrel8rNode {
22+
const [, traceQL] = parseQuery('trace', query);
23+
// FIME get variable tempo address info from query or config...
24+
return new TraceNode(
25+
`observe/traces?namespace=openshift-tracing&name=platform&tenant=platform&` +
26+
`q=${encodeURIComponent(traceQL)}`,
27+
query,
28+
);
29+
}
30+
31+
toURL(): string {
32+
return this.url;
33+
}
34+
35+
toQuery(): string {
36+
return this.query;
37+
}
38+
}

0 commit comments

Comments
 (0)