Skip to content

Commit 407d624

Browse files
tiithansentiithansen
committed
feat: Initial attemp to display stopped/terminated pods in pods table when Show stopped pods is enabled
1 parent 7644581 commit 407d624

File tree

15 files changed

+287
-105
lines changed

15 files changed

+287
-105
lines changed

‎src/common/promql.ts

+139-60
Original file line numberDiff line numberDiff line change
@@ -73,41 +73,6 @@ class PromQLBinaryExpression extends PromQLExpression {
7373
}
7474
}
7575

76-
export enum ComparisonOperators {
77-
EQUALS = '==',
78-
NOT_EQUALS = '!=',
79-
GREATER_THAN = '>',
80-
LESS_THAN = '<',
81-
GREATER_THAN_OR_EQUALS = '>=',
82-
LESS_THAN_OR_EQUALS = '<=',
83-
}
84-
85-
class PromQLComparisonExpression extends PromQLExpression {
86-
87-
constructor(private operator: ComparisonOperators, private left: PromQLExpression, private right: PromQLExpression) {
88-
super();
89-
}
90-
91-
stringify() {
92-
return `${this.left.stringify()} ${this.operator} ${this.right.stringify()} `;
93-
}
94-
}
95-
96-
enum LogicalOperators {
97-
AND = 'and',
98-
OR = 'or',
99-
}
100-
101-
class PromQLLogicalExpression extends PromQLExpression {
102-
constructor(private operator: LogicalOperators, private left: PromQLExpression, private right: PromQLExpression) {
103-
super();
104-
}
105-
106-
stringify() {
107-
return `${this.left.stringify()} ${this.operator} (${this.right.stringify()}) `;
108-
}
109-
}
110-
11176

11277
export abstract class PromQLVectorExpression extends PromQLExpression {
11378

@@ -148,6 +113,41 @@ export abstract class PromQLVectorExpression extends PromQLExpression {
148113
}
149114
}
150115

116+
enum LogicalOperators {
117+
AND = 'and',
118+
OR = 'or',
119+
}
120+
121+
class PromQLLogicalExpression extends PromQLVectorExpression {
122+
constructor(private operator: LogicalOperators, private left: PromQLExpression, private right: PromQLExpression) {
123+
super();
124+
}
125+
126+
stringify() {
127+
return `${this.left.stringify()} ${this.operator} (${this.right.stringify()}) `;
128+
}
129+
}
130+
131+
export enum ComparisonOperators {
132+
EQUALS = '==',
133+
NOT_EQUALS = '!=',
134+
GREATER_THAN = '>',
135+
LESS_THAN = '<',
136+
GREATER_THAN_OR_EQUALS = '>=',
137+
LESS_THAN_OR_EQUALS = '<=',
138+
}
139+
140+
class PromQLComparisonExpression extends PromQLVectorExpression {
141+
142+
constructor(private operator: ComparisonOperators, private left: PromQLExpression, private right: PromQLExpression) {
143+
super();
144+
}
145+
146+
stringify() {
147+
return `${this.left.stringify()} ${this.operator} ${this.right.stringify()} `;
148+
}
149+
}
150+
151151
class PromQLScalarExpression extends PromQLVectorExpression {
152152
constructor(private scalar: number, private left?: PromQLExpression) {
153153
super();
@@ -260,20 +260,58 @@ class PromQLWithoutExpression extends PromQLExpression {
260260
}
261261
}
262262

263+
class PromQLRangeVectorExpression extends PromQLVectorExpression {
264+
265+
constructor(private vectorExpression: PromQLVectorExpression, private range: string) {
266+
super()
267+
}
268+
269+
stringify(): string {
270+
return `${this.vectorExpression.stringify()}[${this.range}]`
271+
}
272+
}
273+
274+
abstract class PromQLFunctionArg {
275+
abstract stringify(): string
276+
}
277+
278+
class PromQLVectorExpressionFunctionArg extends PromQLFunctionArg {
279+
constructor(private arg: PromQLVectorExpression) {
280+
super()
281+
}
282+
283+
stringify(): string {
284+
return this.arg.stringify()
285+
}
286+
}
287+
288+
class PromQLStringFunctionArg extends PromQLFunctionArg {
289+
constructor(private arg: string) {
290+
super()
291+
}
292+
293+
stringify(): string {
294+
return `"${this.arg}"`
295+
}
296+
}
297+
263298
class PromQLFunction extends PromQLVectorExpression {
264299

265-
constructor(private name: string, private subExpression: PromQLExpression) {
300+
constructor(private name: string, private args: PromQLFunctionArg[]) {
266301
super();
267302
}
268303

269304
stringify() {
270305
return `${this.name}(
271-
${this.subExpression.stringify()}${this.stringifyInner()}
306+
${this.serializeArgs()}
272307
)`;
273308
}
274309

275-
stringifyInner() {
276-
return ''
310+
private serializeArgs() {
311+
return this.args.map(
312+
arg => arg.stringify()
313+
)
314+
.join(', ')
277315
}
278316
}
279317

@@ -298,46 +336,75 @@ class PromQLAggregationFunction extends PromQLFunction {
298336

299337
class PromQLSumFunction extends PromQLAggregationFunction {
300338

301-
constructor(subExpression: PromQLExpression) {
302-
super('sum', subExpression);
339+
constructor(subExpression: PromQLVectorExpression) {
340+
super('sum', [
341+
new PromQLVectorExpressionFunctionArg(subExpression)
342+
]);
303343
}
304344
}
305345

306346
class PromQLMaxFunction extends PromQLAggregationFunction {
307347

308-
constructor(subExpression: PromQLExpression) {
309-
super('max', subExpression);
348+
constructor(subExpression: PromQLVectorExpression) {
349+
super('max', [
350+
new PromQLVectorExpressionFunctionArg(subExpression)
351+
]);
310352
}
311353
}
312354

313355
class PromQLGroupFunction extends PromQLAggregationFunction {
314356

315-
constructor(subExpression: PromQLExpression) {
316-
super('group', subExpression);
357+
constructor(subExpression: PromQLVectorExpression) {
358+
super('group', [
359+
new PromQLVectorExpressionFunctionArg(subExpression)
360+
])
317361
}
318362
}
319363

320364
class PromQLCountFunction extends PromQLAggregationFunction {
321365

322-
constructor(subExpression: PromQLExpression) {
323-
super('count', subExpression);
366+
constructor(subExpression: PromQLVectorExpression) {
367+
super('count', [
368+
new PromQLVectorExpressionFunctionArg(subExpression)
369+
])
324370
}
325371
}
326372

327373
class PromQLSortFunction extends PromQLFunction {
328374

329-
constructor(direction: 'asc' | 'desc', subExpression: PromQLExpression) {
330-
super(`sort${direction === 'desc' ? '_desc' : ''}`, subExpression);
375+
constructor(direction: 'asc' | 'desc', subExpression: PromQLVectorExpression) {
376+
super(`sort${direction === 'desc' ? '_desc' : ''}`, [
377+
new PromQLVectorExpressionFunctionArg(subExpression)
378+
])
331379
}
332380
}
333381

334382
class PromQLRateFunction extends PromQLFunction {
335-
constructor(private range: string, subExpression: PromQLExpression) {
336-
super('rate', subExpression);
383+
constructor(subExpression: PromQLRangeVectorExpression) {
384+
super('rate', [
385+
new PromQLVectorExpressionFunctionArg(subExpression)
386+
])
337387
}
388+
}
389+
390+
class PromQLPresentOverTimeFunction extends PromQLFunction {
391+
392+
constructor(subExpression: PromQLRangeVectorExpression) {
393+
super('present_over_time', [
394+
new PromQLVectorExpressionFunctionArg(subExpression)
395+
])
396+
}
397+
}
338398

339-
stringifyInner() {
340-
return `[${this.range}]`;
399+
class PromQLLabelReplaceFunction extends PromQLFunction {
400+
constructor(exp: PromQLVectorExpression, dest: string, sourceLabel: string, replacement: string, regex: string) {
401+
super('label_replace', [
402+
new PromQLVectorExpressionFunctionArg(exp),
403+
new PromQLStringFunctionArg(dest),
404+
new PromQLStringFunctionArg(sourceLabel),
405+
new PromQLStringFunctionArg(replacement),
406+
new PromQLStringFunctionArg(regex),
407+
])
341408
}
342409
}
343410

@@ -346,27 +413,39 @@ export class PromQL {
346413
return new PromQLMetric(name);
347414
}
348415

349-
static sum(subExpression: PromQLExpression) {
416+
static withRange(subExpression: PromQLVectorExpression, range: string) {
417+
return new PromQLRangeVectorExpression(subExpression, range)
418+
}
419+
420+
static sum(subExpression: PromQLVectorExpression) {
350421
return new PromQLSumFunction(subExpression);
351422
}
352423

353-
static sort(direction: 'asc' | 'desc', subExpression: PromQLExpression) {
424+
static sort(direction: 'asc' | 'desc', subExpression: PromQLVectorExpression) {
354425
return new PromQLSortFunction(direction, subExpression);
355426
}
356427

357-
static rate(subExpression: PromQLExpression, range: string) {
358-
return new PromQLRateFunction(range, subExpression);
428+
static rate(subExpression: PromQLRangeVectorExpression) {
429+
return new PromQLRateFunction(subExpression);
359430
}
360431

361-
static max(subExpression: PromQLExpression) {
432+
static max(subExpression: PromQLVectorExpression) {
362433
return new PromQLMaxFunction(subExpression);
363434
}
364435

365-
static group(subExpression: PromQLExpression) {
436+
static group(subExpression: PromQLVectorExpression) {
366437
return new PromQLGroupFunction(subExpression);
367438
}
368439

369-
static count(subExpression: PromQLExpression) {
440+
static count(subExpression: PromQLVectorExpression) {
370441
return new PromQLCountFunction(subExpression);
371442
}
443+
444+
static presentOverTime(subExpression: PromQLRangeVectorExpression) {
445+
return new PromQLPresentOverTimeFunction(subExpression);
446+
}
447+
448+
static labelReplace(exp: PromQLVectorExpression, dest: string, sourceLabel: string, replacement: string, regex: string) {
449+
return new PromQLLabelReplaceFunction(exp, dest, sourceLabel, replacement, regex);
450+
}
372451
}

‎src/components/AlertsTable/index.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,8 @@ export function AlertsTable(labelFilters?: LabelFilters, showVariableControls =
218218
asyncDataRowMapper: rowMapper,
219219
$data: queryBuilder.rootQueryBuilder(variables, defaultSorting),
220220
queryBuilder: queryBuilder,
221-
expandedRowBuilder: expandedRowSceneBuilder(createRowId)
221+
expandedRowBuilder: expandedRowSceneBuilder(createRowId),
222+
sorting: defaultSorting,
222223
}),
223224
}),
224225
],

‎src/components/AsyncTable/index.tsx

+14-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ interface TableState<TableRow> extends SceneObjectState {
6060
expandedRows?: SceneObject[];
6161
asyncRowData?: Map<string, number[]>;
6262
visibleRowIds?: string;
63-
sorting?: SortingState;
63+
sorting: SortingState;
6464
columns: Array<Column<TableRow>>;
6565
createRowId: (row: TableRow) => string;
6666
asyncDataRowMapper: (row: TableRow, asyncRowData: any) => void;
@@ -231,7 +231,20 @@ export class AsyncTable<TableRow> extends SceneObjectBase<TableState<TableRow>>
231231
}
232232
}
233233

234+
public rebuildQuery() {
235+
const sortingConfig = this.getColumnById(this.state.sorting!.columnId)?.sortingConfig;
236+
this.setState({
237+
...this.state,
238+
$data: this.state.queryBuilder.rootQueryBuilder(sceneGraph.getVariables(this), this.state.sorting!, sortingConfig)
239+
});
240+
}
241+
234242
static Component = (props: SceneComponentProps<AsyncTable<any>>) => {
243+
244+
useEffect(() => {
245+
props.model.rebuildQuery();
246+
}, [props.model]);
247+
235248
const { data } = sceneGraph.getData(props.model).useState();
236249
const { asyncRowData, sorting, columns, asyncDataRowMapper } = props.model.useState();
237250
const sortingConfig = sorting ? props.model.getColumnById(sorting.columnId)?.sortingConfig : undefined;

‎src/components/ResourceBreakdownTable/index.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,8 @@ export const ResourceBreakdownTable = () => {
388388
queryBuilder: {
389389
rowQueryBuilder: createRowQueries,
390390
rootQueryBuilder: createRootQuery,
391-
}
391+
},
392+
sorting: defaultSorting,
392393
}),
393394
}),
394395
],

‎src/components/ToggleVariable.tsx

+3-5
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,8 @@ export class ToggleVariable extends SceneObjectBase<ToggleVariableState> impleme
4040
this.setValue(event.target.checked);
4141
}
4242

43-
public setValue(newValue: boolean) {
44-
console.log(newValue, this.state.value)
45-
if (newValue !== this.state.value) {
43+
public setValue(newValue: boolean, forceUpdate = false) {
44+
if (newValue !== this.state.value || forceUpdate) {
4645
this.setState({ value: newValue });
4746
this.publishEvent(new SceneVariableValueChangedEvent(this), true);
4847
}
@@ -60,7 +59,6 @@ export class ToggleVariable extends SceneObjectBase<ToggleVariableState> impleme
6059
const update: Partial<ToggleVariableState> = {};
6160
const val = values[this.getKey()];
6261
update.value = val === 'true';
63-
6462
this.setState(update);
6563
}
6664

@@ -70,7 +68,7 @@ export class ToggleVariable extends SceneObjectBase<ToggleVariableState> impleme
7068

7169
return (
7270
<span className={cx(styles.switchWrap)}>
73-
<Switch value={value} onChange={model.onChangeFn} />;
71+
<Switch value={value} onChange={model.onChangeFn} />
7472
</span>
7573
);
7674
};

‎src/metrics/metrics.ts

+1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ export const Metrics = {
3838
labels:{
3939
namespace: 'namespace',
4040
pod: 'pod',
41+
uid: 'uid'
4142
}
4243
},
4344
kubePodContainerInfo: {

‎src/pages/Clusters/tabs/Nodes/Nodes.tsx

+1
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,7 @@ export const getNodesScene = () => {
293293
queryBuilder,
294294
createRowId: (row) => row.internal_ip,
295295
expandedRowBuilder: buildExpandedRowScene,
296+
sorting: defaultSorting,
296297
}),
297298
}),
298299
],

‎src/pages/Workloads/components/ContainersTable/ContainersTable.tsx

+1
Original file line numberDiff line numberDiff line change
@@ -250,5 +250,6 @@ export const getContainersScene = (staticLabelFilters: LabelFilters, showVariabl
250250
asyncDataRowMapper: asyncDataRowMapper,
251251
createRowId: (row: TableRow) => row.container,
252252
queryBuilder,
253+
sorting: defaultSorting,
253254
})
254255
}

‎src/pages/Workloads/tabs/CronJobs/CronJobs.tsx

+1
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ export const getCronJobsScene = () => {
160160
createRowId: (row: TableRow) => `${row.namespace}/${row.cronjob}`,
161161
queryBuilder: queryBuilder,
162162
asyncDataRowMapper: asyncDataRowMapper,
163+
sorting: defaultSorting,
163164
}),
164165
}),
165166
],

0 commit comments

Comments
 (0)