diff --git a/frontend/src/container/InfraMonitoringK8s/Nodes/K8sNodesList.styles.scss b/frontend/src/container/InfraMonitoringK8s/Nodes/K8sNodesList.styles.scss
new file mode 100644
index 00000000000..c09c569a030
--- /dev/null
+++ b/frontend/src/container/InfraMonitoringK8s/Nodes/K8sNodesList.styles.scss
@@ -0,0 +1,17 @@
+.infra-monitoring-container {
+ .nodes-list-table {
+ .expanded-table-container {
+ padding-left: 40px;
+ }
+
+ .ant-table-cell {
+ min-width: 223px !important;
+ max-width: 223px !important;
+ }
+
+ .ant-table-row-expand-icon-cell {
+ min-width: 30px !important;
+ max-width: 30px !important;
+ }
+ }
+}
diff --git a/frontend/src/container/InfraMonitoringK8s/Nodes/K8sNodesList.tsx b/frontend/src/container/InfraMonitoringK8s/Nodes/K8sNodesList.tsx
index 6d77068d461..c6ec2b99768 100644
--- a/frontend/src/container/InfraMonitoringK8s/Nodes/K8sNodesList.tsx
+++ b/frontend/src/container/InfraMonitoringK8s/Nodes/K8sNodesList.tsx
@@ -1,6 +1,7 @@
/* eslint-disable no-restricted-syntax */
/* eslint-disable @typescript-eslint/explicit-function-return-type */
import '../InfraMonitoringK8s.styles.scss';
+import './K8sNodesList.styles.scss';
import { LoadingOutlined } from '@ant-design/icons';
import {
@@ -28,7 +29,6 @@ import { GlobalReducer } from 'types/reducer/globalTime';
import { K8sCategory } from '../constants';
import K8sHeader from '../K8sHeader';
import LoadingContainer from '../LoadingContainer';
-import { dummyColumnConfig } from '../utils';
import NodeDetails from './NodeDetails';
import {
defaultAddedColumns,
@@ -275,10 +275,7 @@ function K8sNodesList({
});
};
- const nestedColumns = useMemo(() => {
- const nestedColumns = getK8sNodesListColumns([]);
- return [dummyColumnConfig, ...nestedColumns];
- }, []);
+ const nestedColumns = useMemo(() => getK8sNodesListColumns([]), []);
const isGroupedByAttribute = groupBy.length > 0;
@@ -458,7 +455,7 @@ function K8sNodesList({
{showsNodesTable && (
CPU Utilization (cores),
+ title: CPU Usage (cores)
,
dataIndex: 'cpu',
key: 'cpu',
width: 80,
@@ -111,7 +111,7 @@ const columnsConfig = [
align: 'left',
},
{
- title: CPU Allocatable (cores)
,
+ title: CPU Alloc (cores)
,
dataIndex: 'cpu_allocatable',
key: 'cpu_allocatable',
width: 80,
@@ -119,7 +119,7 @@ const columnsConfig = [
align: 'left',
},
{
- title: Memory Utilization (bytes)
,
+ title: Memory Usage (bytes)
,
dataIndex: 'memory',
key: 'memory',
width: 80,
@@ -127,7 +127,7 @@ const columnsConfig = [
align: 'left',
},
{
- title: Memory Allocatable (bytes)
,
+ title: Memory Alloc (bytes)
,
dataIndex: 'memory_allocatable',
key: 'memory_allocatable',
width: 80,
@@ -179,11 +179,9 @@ export const formatDataForTable = (
key: `${node.nodeUID}-${index}`,
nodeUID: node.nodeUID || '',
nodeName: (
-
-
- {node.meta.k8s_node_name || ''}
-
-
+
+ {node.meta.k8s_node_name || ''}
+
),
clusterName: node.meta.k8s_cluster_name,
cpu: (
diff --git a/frontend/src/container/InfraMonitoringK8s/Pods/PodDetails/Events/Events.tsx b/frontend/src/container/InfraMonitoringK8s/Pods/PodDetails/Events/Events.tsx
index 7abd2e7c68b..c36cd519cd4 100644
--- a/frontend/src/container/InfraMonitoringK8s/Pods/PodDetails/Events/Events.tsx
+++ b/frontend/src/container/InfraMonitoringK8s/Pods/PodDetails/Events/Events.tsx
@@ -77,6 +77,7 @@ export default function Events({
aggregateAttribute: {
...currentQuery.builder.queryData[0].aggregateAttribute,
},
+ filters: [] as any,
},
],
},
diff --git a/frontend/src/container/InfraMonitoringK8s/Pods/PodDetails/PodLogs/PodLogsDetailedView.tsx b/frontend/src/container/InfraMonitoringK8s/Pods/PodDetails/PodLogs/PodLogsDetailedView.tsx
index de53a8a7293..013cb5f8065 100644
--- a/frontend/src/container/InfraMonitoringK8s/Pods/PodDetails/PodLogs/PodLogsDetailedView.tsx
+++ b/frontend/src/container/InfraMonitoringK8s/Pods/PodDetails/PodLogs/PodLogsDetailedView.tsx
@@ -50,8 +50,8 @@ function PodLogsDetailedView({
aggregateAttribute: {
...currentQuery.builder.queryData[0].aggregateAttribute,
},
- // filters: [],
- } as any,
+ filters: [] as any,
+ },
],
},
}),
diff --git a/frontend/src/container/InfraMonitoringK8s/Pods/PodDetails/PodTraces/PodTraces.tsx b/frontend/src/container/InfraMonitoringK8s/Pods/PodDetails/PodTraces/PodTraces.tsx
index 2fe601271e2..794d462c680 100644
--- a/frontend/src/container/InfraMonitoringK8s/Pods/PodDetails/PodTraces/PodTraces.tsx
+++ b/frontend/src/container/InfraMonitoringK8s/Pods/PodDetails/PodTraces/PodTraces.tsx
@@ -67,6 +67,7 @@ function PodTraces({
aggregateAttribute: {
...currentQuery.builder.queryData[0].aggregateAttribute,
},
+ filters: [] as any,
},
],
},
diff --git a/frontend/src/container/InfraMonitoringK8s/constants.ts b/frontend/src/container/InfraMonitoringK8s/constants.ts
index 7030ed850ad..5b88260629c 100644
--- a/frontend/src/container/InfraMonitoringK8s/constants.ts
+++ b/frontend/src/container/InfraMonitoringK8s/constants.ts
@@ -157,14 +157,13 @@ export const PodsQuickFiltersConfig: IQuickFiltersConfig[] = [
export const NodesQuickFiltersConfig: IQuickFiltersConfig[] = [
{
type: FiltersType.CHECKBOX,
- title: 'Node',
+ title: 'Node Name',
attributeKey: {
key: 'k8s_node_name',
dataType: DataTypes.String,
type: 'resource',
isColumn: false,
isJSON: false,
- // id: 'k8s_pod_name--string--tag--true',
},
aggregateOperator: 'noop',
aggregateAttribute: 'k8s_pod_cpu_utilization',