Skip to content

Commit 6a8cf85

Browse files
srikanthccvamlannandy
srikanthccv
authored and
amlannandy
committed
chore: update sort keys and aggregate attribute
1 parent de0e056 commit 6a8cf85

File tree

11 files changed

+83
-80
lines changed

11 files changed

+83
-80
lines changed

‎frontend/src/container/InfraMonitoringK8s/DaemonSets/utils.tsx‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@ export const defaultAddedColumns: IEntityColumn[] = [
3131
},
3232
{
3333
label: 'Available',
34-
value: 'available',
35-
id: 'available',
34+
value: 'available_nodes',
35+
id: 'available_nodes',
3636
canRemove: false,
3737
},
3838
{
3939
label: 'Desired',
40-
value: 'desired',
41-
id: 'desired',
40+
value: 'desired_nodes',
41+
id: 'desired_nodes',
4242
canRemove: false,
4343
},
4444
{
@@ -89,8 +89,8 @@ export interface K8sDaemonSetsRowData {
8989
memory_request: React.ReactNode;
9090
memory_limit: React.ReactNode;
9191
memory: React.ReactNode;
92-
desired: React.ReactNode;
93-
available: React.ReactNode;
92+
desired_nodes: React.ReactNode;
93+
available_nodes: React.ReactNode;
9494
namespaceName: React.ReactNode;
9595
groupedByMeta?: any;
9696
}
@@ -149,17 +149,17 @@ const columnsConfig = [
149149
},
150150
{
151151
title: <div className="column-header small-col">Available</div>,
152-
dataIndex: 'available',
153-
key: 'available',
152+
dataIndex: 'available_nodes',
153+
key: 'available_nodes',
154154
ellipsis: true,
155155
sorter: true,
156156
align: 'left',
157157
className: `column ${columnProgressBarClassName}`,
158158
},
159159
{
160160
title: <div className="column-header small-col">Desired</div>,
161-
dataIndex: 'desired',
162-
key: 'desired',
161+
dataIndex: 'desired_nodes',
162+
key: 'desired_nodes',
163163
sorter: true,
164164
align: 'left',
165165
className: `column ${columnProgressBarClassName}`,
@@ -328,12 +328,12 @@ export const formatDataForTable = (
328328
{formatBytes(daemonSet.memoryUsage)}
329329
</ValidateColumnValueWrapper>
330330
),
331-
available: (
331+
available_nodes: (
332332
<ValidateColumnValueWrapper value={daemonSet.availableNodes}>
333333
{daemonSet.availableNodes}
334334
</ValidateColumnValueWrapper>
335335
),
336-
desired: (
336+
desired_nodes: (
337337
<ValidateColumnValueWrapper value={daemonSet.desiredNodes}>
338338
{daemonSet.desiredNodes}
339339
</ValidateColumnValueWrapper>

‎frontend/src/container/InfraMonitoringK8s/Deployments/utils.tsx‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@ export const defaultAddedColumns: IEntityColumn[] = [
3030
},
3131
{
3232
label: 'Available',
33-
value: 'available',
34-
id: 'available',
33+
value: 'available_pods',
34+
id: 'available_pods',
3535
canRemove: false,
3636
},
3737
{
3838
label: 'Desired',
39-
value: 'desired',
40-
id: 'desired',
39+
value: 'desired_pods',
40+
id: 'desired_pods',
4141
canRemove: false,
4242
},
4343
{
@@ -82,8 +82,8 @@ export interface K8sDeploymentsRowData {
8282
key: string;
8383
deploymentUID: string;
8484
deploymentName: React.ReactNode;
85-
availableReplicas: React.ReactNode;
86-
desiredReplicas: React.ReactNode;
85+
available_pods: React.ReactNode;
86+
desired_pods: React.ReactNode;
8787
cpu_request: React.ReactNode;
8888
cpu_limit: React.ReactNode;
8989
cpu: React.ReactNode;
@@ -148,16 +148,16 @@ const columnsConfig = [
148148
},
149149
{
150150
title: <div className="column-header-left small-col">Available</div>,
151-
dataIndex: 'availableReplicas',
152-
key: 'availableReplicas',
151+
dataIndex: 'available_pods',
152+
key: 'available_pods',
153153
width: 100,
154154
sorter: false,
155155
align: 'left',
156156
},
157157
{
158158
title: <div className="column-header-left small-col">Desired</div>,
159-
dataIndex: 'desiredReplicas',
160-
key: 'desiredReplicas',
159+
dataIndex: 'desired_pods',
160+
key: 'desired_pods',
161161
width: 80,
162162
sorter: false,
163163
align: 'left',
@@ -261,12 +261,12 @@ export const formatDataForTable = (
261261
{deployment.meta.k8s_deployment_name}
262262
</Tooltip>
263263
),
264-
availableReplicas: (
264+
available_pods: (
265265
<ValidateColumnValueWrapper value={deployment.availablePods}>
266266
{deployment.availablePods}
267267
</ValidateColumnValueWrapper>
268268
),
269-
desiredReplicas: (
269+
desired_pods: (
270270
<ValidateColumnValueWrapper value={deployment.desiredPods}>
271271
{deployment.desiredPods}
272272
</ValidateColumnValueWrapper>

‎frontend/src/container/InfraMonitoringK8s/Jobs/utils.tsx‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -31,26 +31,26 @@ export const defaultAddedColumns: IEntityColumn[] = [
3131
},
3232
{
3333
label: 'Successful',
34-
value: 'successful',
35-
id: 'successful',
34+
value: 'successful_pods',
35+
id: 'successful_pods',
3636
canRemove: false,
3737
},
3838
{
3939
label: 'Failed',
40-
value: 'failed',
41-
id: 'failed',
40+
value: 'failed_pods',
41+
id: 'failed_pods',
4242
canRemove: false,
4343
},
4444
{
4545
label: 'Desired Successful',
46-
value: 'desired_successful',
47-
id: 'desired_successful',
46+
value: 'desired_successful_pods',
47+
id: 'desired_successful_pods',
4848
canRemove: false,
4949
},
5050
{
5151
label: 'Active',
52-
value: 'active',
53-
id: 'active',
52+
value: 'active_pods',
53+
id: 'active_pods',
5454
canRemove: false,
5555
},
5656
{
@@ -96,10 +96,10 @@ export interface K8sJobsRowData {
9696
jobUID: string;
9797
jobName: React.ReactNode;
9898
namespaceName: React.ReactNode;
99-
successful: React.ReactNode;
100-
failed: React.ReactNode;
101-
active: React.ReactNode;
102-
desired_successful: React.ReactNode;
99+
successful_pods: React.ReactNode;
100+
failed_pods: React.ReactNode;
101+
active_pods: React.ReactNode;
102+
desired_successful_pods: React.ReactNode;
103103
cpu_request: React.ReactNode;
104104
cpu_limit: React.ReactNode;
105105
cpu: React.ReactNode;
@@ -159,34 +159,34 @@ const columnsConfig = [
159159
},
160160
{
161161
title: <div className="column-header small-col">Successful</div>,
162-
dataIndex: 'successful',
163-
key: 'successful',
162+
dataIndex: 'successful_pods',
163+
key: 'successful_pods',
164164
ellipsis: true,
165165
sorter: true,
166166
align: 'left',
167167
className: `column ${columnProgressBarClassName}`,
168168
},
169169
{
170170
title: <div className="column-header small-col">Failed</div>,
171-
dataIndex: 'failed',
172-
key: 'failed',
171+
dataIndex: 'failed_pods',
172+
key: 'failed_pods',
173173
sorter: true,
174174
align: 'left',
175175
className: `column ${columnProgressBarClassName}`,
176176
},
177177
{
178178
title: <div className="column-header small-col">Desired Successful</div>,
179-
dataIndex: 'desired_successful',
180-
key: 'desired_successful',
179+
dataIndex: 'desired_successful_pods',
180+
key: 'desired_successful_pods',
181181
ellipsis: true,
182182
sorter: true,
183183
align: 'left',
184184
className: `column ${columnProgressBarClassName}`,
185185
},
186186
{
187187
title: <div className="column-header small-col">Active</div>,
188-
dataIndex: 'active',
189-
key: 'active',
188+
dataIndex: 'active_pods',
189+
key: 'active_pods',
190190
sorter: true,
191191
align: 'left',
192192
className: `column ${columnProgressBarClassName}`,
@@ -355,22 +355,22 @@ export const formatDataForTable = (
355355
{formatBytes(job.memoryUsage)}
356356
</ValidateColumnValueWrapper>
357357
),
358-
successful: (
358+
successful_pods: (
359359
<ValidateColumnValueWrapper value={job.successfulPods}>
360360
{job.successfulPods}
361361
</ValidateColumnValueWrapper>
362362
),
363-
desired_successful: (
363+
desired_successful_pods: (
364364
<ValidateColumnValueWrapper value={job.desiredSuccessfulPods}>
365365
{job.desiredSuccessfulPods}
366366
</ValidateColumnValueWrapper>
367367
),
368-
failed: (
368+
failed_pods: (
369369
<ValidateColumnValueWrapper value={job.failedPods}>
370370
{job.failedPods}
371371
</ValidateColumnValueWrapper>
372372
),
373-
active: (
373+
active_pods: (
374374
<ValidateColumnValueWrapper value={job.activePods}>
375375
{job.activePods}
376376
</ValidateColumnValueWrapper>

‎frontend/src/container/InfraMonitoringK8s/StatefulSets/utils.tsx‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@ export const defaultAddedColumns: IEntityColumn[] = [
3131
},
3232
{
3333
label: 'Available',
34-
value: 'available',
35-
id: 'available',
34+
value: 'available_pods',
35+
id: 'available_pods',
3636
canRemove: false,
3737
},
3838
{
3939
label: 'Desired',
40-
value: 'desired',
41-
id: 'desired',
40+
value: 'desired_pods',
41+
id: 'desired_pods',
4242
canRemove: false,
4343
},
4444
{
@@ -89,8 +89,8 @@ export interface K8sStatefulSetsRowData {
8989
memory_request: React.ReactNode;
9090
memory_limit: React.ReactNode;
9191
memory: React.ReactNode;
92-
desired: React.ReactNode;
93-
available: React.ReactNode;
92+
desired_pods: React.ReactNode;
93+
available_pods: React.ReactNode;
9494
namespaceName: React.ReactNode;
9595
groupedByMeta?: any;
9696
}
@@ -149,17 +149,17 @@ const columnsConfig = [
149149
},
150150
{
151151
title: <div className="column-header small-col">Available</div>,
152-
dataIndex: 'available',
153-
key: 'available',
152+
dataIndex: 'available_pods',
153+
key: 'available_pods',
154154
ellipsis: true,
155155
sorter: true,
156156
align: 'left',
157157
className: `column small-col`,
158158
},
159159
{
160160
title: <div className="column-header small-col">Desired</div>,
161-
dataIndex: 'desired',
162-
key: 'desired',
161+
dataIndex: 'desired_pods',
162+
key: 'desired_pods',
163163
sorter: true,
164164
align: 'left',
165165
className: `column small-col`,
@@ -330,12 +330,12 @@ export const formatDataForTable = (
330330
{formatBytes(statefulSet.memoryUsage)}
331331
</ValidateColumnValueWrapper>
332332
),
333-
available: (
333+
available_pods: (
334334
<ValidateColumnValueWrapper value={statefulSet.availablePods}>
335335
{statefulSet.availablePods}
336336
</ValidateColumnValueWrapper>
337337
),
338-
desired: (
338+
desired_pods: (
339339
<ValidateColumnValueWrapper value={statefulSet.desiredPods}>
340340
{statefulSet.desiredPods}
341341
</ValidateColumnValueWrapper>

‎frontend/src/container/InfraMonitoringK8s/constants.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ export const K8sEntityToAggregateAttributeMapping = {
4444
[K8sCategory.STATEFULSETS]: 'k8s_pod_cpu_utilization',
4545
[K8sCategory.DAEMONSETS]: 'k8s_pod_cpu_utilization',
4646
[K8sCategory.CONTAINERS]: 'k8s_pod_cpu_utilization',
47-
[K8sCategory.JOBS]: 'k8s_pod_cpu_utilization',
48-
[K8sCategory.VOLUMES]: 'k8s_pod_cpu_utilization',
47+
[K8sCategory.JOBS]: 'k8s_job_desired_successful_pods',
48+
[K8sCategory.VOLUMES]: 'k8s_volume_capacity',
4949
};
5050

5151
export const PodsQuickFiltersConfig: IQuickFiltersConfig[] = [

‎pkg/query-service/app/inframetrics/daemonsets.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ func (d *DaemonSetsRepo) GetDaemonSetList(ctx context.Context, req model.DaemonS
296296

297297
// add additional queries for daemon sets
298298
for _, daemonSetQuery := range builderQueriesForDaemonSets {
299-
query.CompositeQuery.BuilderQueries[daemonSetQuery.QueryName] = daemonSetQuery
299+
query.CompositeQuery.BuilderQueries[daemonSetQuery.QueryName] = daemonSetQuery.Clone()
300300
}
301301

302302
for _, query := range query.CompositeQuery.BuilderQueries {

‎pkg/query-service/app/inframetrics/deployments.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ func (d *DeploymentsRepo) GetDeploymentList(ctx context.Context, req model.Deplo
296296

297297
// add additional queries for deployments
298298
for _, deploymentQuery := range builderQueriesForDeployments {
299-
query.CompositeQuery.BuilderQueries[deploymentQuery.QueryName] = deploymentQuery
299+
query.CompositeQuery.BuilderQueries[deploymentQuery.QueryName] = deploymentQuery.Clone()
300300
}
301301

302302
for _, query := range query.CompositeQuery.BuilderQueries {

‎pkg/query-service/app/inframetrics/jobs.go‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
)
1616

1717
var (
18-
metricToUseForJobs = "k8s_pod_cpu_utilization"
18+
metricToUseForJobs = "k8s_job_desired_successful_pods"
1919
k8sJobNameAttrKey = "k8s_job_name"
2020

2121
metricNamesForJobs = map[string]string{
@@ -32,17 +32,17 @@ var (
3232
}
3333

3434
queryNamesForJobs = map[string][]string{
35-
"cpu": {"A"},
36-
"cpu_request": {"B", "A"},
37-
"cpu_limit": {"C", "A"},
38-
"memory": {"D"},
39-
"memory_request": {"E", "D"},
40-
"memory_limit": {"F", "D"},
41-
"restarts": {"G", "A"},
42-
"desired_pods": {"H"},
43-
"active_pods": {"I"},
44-
"failed_pods": {"J"},
45-
"successful_pods": {"K"},
35+
"cpu": {"A"},
36+
"cpu_request": {"B", "A"},
37+
"cpu_limit": {"C", "A"},
38+
"memory": {"D"},
39+
"memory_request": {"E", "D"},
40+
"memory_limit": {"F", "D"},
41+
"restarts": {"G", "A"},
42+
"desired_successful_pods": {"H"},
43+
"active_pods": {"I"},
44+
"failed_pods": {"J"},
45+
"successful_pods": {"K"},
4646
}
4747

4848
builderQueriesForJobs = map[string]*v3.BuilderQuery{
@@ -340,7 +340,7 @@ func (d *JobsRepo) GetJobList(ctx context.Context, req model.JobListRequest) (mo
340340

341341
// add additional queries for jobs
342342
for _, jobQuery := range builderQueriesForJobs {
343-
query.CompositeQuery.BuilderQueries[jobQuery.QueryName] = jobQuery
343+
query.CompositeQuery.BuilderQueries[jobQuery.QueryName] = jobQuery.Clone()
344344
}
345345

346346
for _, query := range query.CompositeQuery.BuilderQueries {

0 commit comments

Comments
 (0)