Skip to content

Commit de0e056

Browse files
amlannandyamlannandy
committed
chore: bug fixes
1 parent 889e3c9 commit de0e056

File tree

12 files changed

+467
-176
lines changed

12 files changed

+467
-176
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ function DaemonSetDetails({
135135
id: 'k8s.object.kind--string--resource--false',
136136
},
137137
op: '=',
138-
value: 'Daemonset',
138+
value: 'DaemonSet',
139139
},
140140
{
141141
id: uuidv4(),

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

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,19 @@ export const getDaemonSetMetricsQueryPayload = (
6565
op: '=',
6666
value: daemonSet.meta.k8s_daemonset_name,
6767
},
68+
{
69+
id: '47b3adae',
70+
key: {
71+
dataType: DataTypes.String,
72+
id: 'k8s_namespace_name--string--tag--false',
73+
isColumn: false,
74+
isJSON: false,
75+
key: 'k8s_namespace_name',
76+
type: 'tag',
77+
},
78+
op: '=',
79+
value: daemonSet.meta.k8s_namespace_name,
80+
},
6881
],
6982
op: 'AND',
7083
},
@@ -108,6 +121,19 @@ export const getDaemonSetMetricsQueryPayload = (
108121
op: 'contains',
109122
value: daemonSet.meta.k8s_daemonset_name,
110123
},
124+
{
125+
id: '47b3adae',
126+
key: {
127+
dataType: DataTypes.String,
128+
id: 'k8s_namespace_name--string--tag--false',
129+
isColumn: false,
130+
isJSON: false,
131+
key: 'k8s_namespace_name',
132+
type: 'tag',
133+
},
134+
op: '=',
135+
value: daemonSet.meta.k8s_namespace_name,
136+
},
111137
],
112138
op: 'AND',
113139
},
@@ -151,6 +177,19 @@ export const getDaemonSetMetricsQueryPayload = (
151177
op: 'contains',
152178
value: daemonSet.meta.k8s_daemonset_name,
153179
},
180+
{
181+
id: '47b3adae',
182+
key: {
183+
dataType: DataTypes.String,
184+
id: 'k8s_namespace_name--string--tag--false',
185+
isColumn: false,
186+
isJSON: false,
187+
key: 'k8s_namespace_name',
188+
type: 'tag',
189+
},
190+
op: '=',
191+
value: daemonSet.meta.k8s_namespace_name,
192+
},
154193
],
155194
op: 'AND',
156195
},
@@ -227,6 +266,19 @@ export const getDaemonSetMetricsQueryPayload = (
227266
op: '=',
228267
value: daemonSet.meta.k8s_daemonset_name,
229268
},
269+
{
270+
id: '47b3adae',
271+
key: {
272+
dataType: DataTypes.String,
273+
id: 'k8s_namespace_name--string--tag--false',
274+
isColumn: false,
275+
isJSON: false,
276+
key: 'k8s_namespace_name',
277+
type: 'tag',
278+
},
279+
op: '=',
280+
value: daemonSet.meta.k8s_namespace_name,
281+
},
230282
],
231283
op: 'AND',
232284
},
@@ -270,6 +322,19 @@ export const getDaemonSetMetricsQueryPayload = (
270322
op: 'contains',
271323
value: daemonSet.meta.k8s_daemonset_name,
272324
},
325+
{
326+
id: '47b3adae',
327+
key: {
328+
dataType: DataTypes.String,
329+
id: 'k8s_namespace_name--string--tag--false',
330+
isColumn: false,
331+
isJSON: false,
332+
key: 'k8s_namespace_name',
333+
type: 'tag',
334+
},
335+
op: '=',
336+
value: daemonSet.meta.k8s_namespace_name,
337+
},
273338
],
274339
op: 'AND',
275340
},
@@ -313,6 +378,19 @@ export const getDaemonSetMetricsQueryPayload = (
313378
op: 'contains',
314379
value: daemonSet.meta.k8s_daemonset_name,
315380
},
381+
{
382+
id: '47b3adae',
383+
key: {
384+
dataType: DataTypes.String,
385+
id: 'k8s_namespace_name--string--tag--false',
386+
isColumn: false,
387+
isJSON: false,
388+
key: 'k8s_namespace_name',
389+
type: 'tag',
390+
},
391+
op: '=',
392+
value: daemonSet.meta.k8s_namespace_name,
393+
},
316394
],
317395
op: 'AND',
318396
},
@@ -389,6 +467,19 @@ export const getDaemonSetMetricsQueryPayload = (
389467
op: '=',
390468
value: daemonSet.meta.k8s_daemonset_name,
391469
},
470+
{
471+
id: '47b3adae',
472+
key: {
473+
dataType: DataTypes.String,
474+
id: 'k8s_namespace_name--string--tag--false',
475+
isColumn: false,
476+
isJSON: false,
477+
key: 'k8s_namespace_name',
478+
type: 'tag',
479+
},
480+
op: '=',
481+
value: daemonSet.meta.k8s_namespace_name,
482+
},
392483
],
393484
op: 'AND',
394485
},
@@ -482,6 +573,19 @@ export const getDaemonSetMetricsQueryPayload = (
482573
op: '=',
483574
value: daemonSet.meta.k8s_daemonset_name,
484575
},
576+
{
577+
id: '47b3adae',
578+
key: {
579+
dataType: DataTypes.String,
580+
id: 'k8s_namespace_name--string--tag--false',
581+
isColumn: false,
582+
isJSON: false,
583+
key: 'k8s_namespace_name',
584+
type: 'tag',
585+
},
586+
op: '=',
587+
value: daemonSet.meta.k8s_namespace_name,
588+
},
485589
],
486590
op: 'AND',
487591
},

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ function JobDetails({
8989
{
9090
id: uuidv4(),
9191
key: {
92-
key: QUERY_KEYS.K8S_STATEFUL_SET_NAME,
92+
key: QUERY_KEYS.K8S_JOB_NAME,
9393
dataType: DataTypes.String,
9494
type: 'resource',
9595
isColumn: false,
@@ -413,35 +413,35 @@ function JobDetails({
413413
overscrollBehavior: 'contain',
414414
background: isDarkMode ? Color.BG_INK_400 : Color.BG_VANILLA_100,
415415
}}
416-
className="job-detail-drawer"
416+
className="entity-detail-drawer"
417417
destroyOnClose
418418
closeIcon={<X size={16} style={{ marginTop: Spacing.MARGIN_1 }} />}
419419
>
420420
{job && (
421421
<>
422-
<div className="job-detail-drawer__job">
423-
<div className="job-details-grid">
422+
<div className="entity-detail-drawer__entity">
423+
<div className="entity-details-grid">
424424
<div className="labels-row">
425425
<Typography.Text
426426
type="secondary"
427-
className="job-details-metadata-label"
427+
className="entity-details-metadata-label"
428428
>
429429
Job Name
430430
</Typography.Text>
431431
<Typography.Text
432432
type="secondary"
433-
className="job-details-metadata-label"
433+
className="entity-details-metadata-label"
434434
>
435435
Namespace Name
436436
</Typography.Text>
437437
</div>
438438
<div className="values-row">
439-
<Typography.Text className="job-details-metadata-value">
439+
<Typography.Text className="entity-details-metadata-value">
440440
<Tooltip title={job.meta.k8s_job_name}>
441441
{job.meta.k8s_job_name}
442442
</Tooltip>
443443
</Typography.Text>
444-
<Typography.Text className="job-details-metadata-value">
444+
<Typography.Text className="entity-details-metadata-value">
445445
<Tooltip title={job.meta.k8s_namespace_name}>
446446
{job.meta.k8s_namespace_name}
447447
</Tooltip>

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

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,19 @@ export const getJobMetricsQueryPayload = (
6565
op: '=',
6666
value: job.jobName,
6767
},
68+
{
69+
id: '47b3adae',
70+
key: {
71+
dataType: DataTypes.String,
72+
id: 'k8s_namespace_name--string--tag--false',
73+
isColumn: false,
74+
isJSON: false,
75+
key: 'k8s_namespace_name',
76+
type: 'tag',
77+
},
78+
op: '=',
79+
value: job.meta.k8s_namespace_name,
80+
},
6881
],
6982
op: 'AND',
7083
},
@@ -141,6 +154,19 @@ export const getJobMetricsQueryPayload = (
141154
op: '=',
142155
value: job.jobName,
143156
},
157+
{
158+
id: '47b3adae',
159+
key: {
160+
dataType: DataTypes.String,
161+
id: 'k8s_namespace_name--string--tag--false',
162+
isColumn: false,
163+
isJSON: false,
164+
key: 'k8s_namespace_name',
165+
type: 'tag',
166+
},
167+
op: '=',
168+
value: job.meta.k8s_namespace_name,
169+
},
144170
],
145171
op: 'AND',
146172
},
@@ -217,6 +243,19 @@ export const getJobMetricsQueryPayload = (
217243
op: '=',
218244
value: job.jobName,
219245
},
246+
{
247+
id: '47b3adae',
248+
key: {
249+
dataType: DataTypes.String,
250+
id: 'k8s_namespace_name--string--tag--false',
251+
isColumn: false,
252+
isJSON: false,
253+
key: 'k8s_namespace_name',
254+
type: 'tag',
255+
},
256+
op: '=',
257+
value: job.meta.k8s_namespace_name,
258+
},
220259
],
221260
op: 'AND',
222261
},
@@ -310,6 +349,19 @@ export const getJobMetricsQueryPayload = (
310349
op: '=',
311350
value: job.jobName,
312351
},
352+
{
353+
id: '47b3adae',
354+
key: {
355+
dataType: DataTypes.String,
356+
id: 'k8s_namespace_name--string--tag--false',
357+
isColumn: false,
358+
isJSON: false,
359+
key: 'k8s_namespace_name',
360+
type: 'tag',
361+
},
362+
op: '=',
363+
value: job.meta.k8s_namespace_name,
364+
},
313365
],
314366
op: 'AND',
315367
},

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ function StatefulSetDetails({
138138
id: 'k8s.object.kind--string--resource--false',
139139
},
140140
op: '=',
141-
value: 'Statefulset',
141+
value: 'StatefulSet',
142142
},
143143
{
144144
id: uuidv4(),

0 commit comments

Comments
 (0)