diff --git a/frontend/src/container/InfraMonitoringK8s/Clusters/utils.tsx b/frontend/src/container/InfraMonitoringK8s/Clusters/utils.tsx
index 7dfc0e23d7f9..8be53cb38f0f 100644
--- a/frontend/src/container/InfraMonitoringK8s/Clusters/utils.tsx
+++ b/frontend/src/container/InfraMonitoringK8s/Clusters/utils.tsx
@@ -31,7 +31,7 @@ export const defaultAddedColumns: IEntityColumn[] = [
canRemove: false,
},
{
- label: 'Mem Usage',
+ label: 'Mem Usage (WSS)',
value: 'memory',
id: 'memory',
canRemove: false,
@@ -105,7 +105,7 @@ const columnsConfig = [
align: 'left',
},
{
- title:
Memory Utilization (bytes)
,
+ title: Memory Utilization (WSS)
,
dataIndex: 'memory',
key: 'memory',
width: 80,
@@ -113,7 +113,7 @@ const columnsConfig = [
align: 'left',
},
{
- title: Memory Allocatable (bytes)
,
+ title: Memory Allocatable
,
dataIndex: 'memory_allocatable',
key: 'memory_allocatable',
width: 80,
diff --git a/frontend/src/container/InfraMonitoringK8s/DaemonSets/utils.tsx b/frontend/src/container/InfraMonitoringK8s/DaemonSets/utils.tsx
index 5a3be3a741da..c9487f4e03dc 100644
--- a/frontend/src/container/InfraMonitoringK8s/DaemonSets/utils.tsx
+++ b/frontend/src/container/InfraMonitoringK8s/DaemonSets/utils.tsx
@@ -72,7 +72,7 @@ export const defaultAddedColumns: IEntityColumn[] = [
canRemove: false,
},
{
- label: 'Mem Usage',
+ label: 'Mem Usage (WSS)',
value: 'memory',
id: 'memory',
canRemove: false,
@@ -211,10 +211,10 @@ const columnsConfig = [
className: `column ${columnProgressBarClassName}`,
},
{
- title: Mem Usage
,
+ title: Mem Usage (WSS)
,
dataIndex: 'memory',
key: 'memory',
- width: 80,
+ width: 120,
ellipsis: true,
sorter: true,
align: 'left',
diff --git a/frontend/src/container/InfraMonitoringK8s/Deployments/utils.tsx b/frontend/src/container/InfraMonitoringK8s/Deployments/utils.tsx
index b64845eb9c81..572a32d98586 100644
--- a/frontend/src/container/InfraMonitoringK8s/Deployments/utils.tsx
+++ b/frontend/src/container/InfraMonitoringK8s/Deployments/utils.tsx
@@ -203,10 +203,10 @@ const columnsConfig = [
align: 'left',
},
{
- title: Mem Usage
,
+ title: Mem Usage (WSS)
,
dataIndex: 'memory',
key: 'memory',
- width: 80,
+ width: 120,
sorter: true,
align: 'left',
},
diff --git a/frontend/src/container/InfraMonitoringK8s/Jobs/utils.tsx b/frontend/src/container/InfraMonitoringK8s/Jobs/utils.tsx
index b580969e57e0..d01d77f18559 100644
--- a/frontend/src/container/InfraMonitoringK8s/Jobs/utils.tsx
+++ b/frontend/src/container/InfraMonitoringK8s/Jobs/utils.tsx
@@ -84,7 +84,7 @@ export const defaultAddedColumns: IEntityColumn[] = [
canRemove: false,
},
{
- label: 'Mem Usage',
+ label: 'Mem Usage (WSS)',
value: 'memory',
id: 'memory',
canRemove: false,
@@ -238,10 +238,10 @@ const columnsConfig = [
className: `column ${columnProgressBarClassName}`,
},
{
- title: Mem Usage
,
+ title: Mem Usage (WSS)
,
dataIndex: 'memory',
key: 'memory',
- width: 80,
+ width: 120,
ellipsis: true,
sorter: true,
align: 'left',
diff --git a/frontend/src/container/InfraMonitoringK8s/Namespaces/utils.tsx b/frontend/src/container/InfraMonitoringK8s/Namespaces/utils.tsx
index cf9e5cfb31d6..3d66b5af9d36 100644
--- a/frontend/src/container/InfraMonitoringK8s/Namespaces/utils.tsx
+++ b/frontend/src/container/InfraMonitoringK8s/Namespaces/utils.tsx
@@ -99,10 +99,10 @@ const columnsConfig = [
align: 'left',
},
{
- title: Mem Usage
,
+ title: Mem Usage (WSS)
,
dataIndex: 'memory',
key: 'memory',
- width: 80,
+ width: 120,
sorter: true,
align: 'left',
},
diff --git a/frontend/src/container/InfraMonitoringK8s/Nodes/utils.tsx b/frontend/src/container/InfraMonitoringK8s/Nodes/utils.tsx
index 96d475bd35e4..56bd7c62baba 100644
--- a/frontend/src/container/InfraMonitoringK8s/Nodes/utils.tsx
+++ b/frontend/src/container/InfraMonitoringK8s/Nodes/utils.tsx
@@ -37,7 +37,7 @@ export const defaultAddedColumns: IEntityColumn[] = [
canRemove: false,
},
{
- label: 'Memory Usage (bytes)',
+ label: 'Memory Usage (WSS)',
value: 'memory',
id: 'memory',
canRemove: false,
@@ -121,7 +121,7 @@ const columnsConfig = [
align: 'left',
},
{
- title: Memory Usage (bytes)
,
+ title: Memory Usage (WSS)
,
dataIndex: 'memory',
key: 'memory',
width: 80,
@@ -129,7 +129,7 @@ const columnsConfig = [
align: 'left',
},
{
- title: Memory Alloc (bytes)
,
+ title: Memory Allocatable
,
dataIndex: 'memory_allocatable',
key: 'memory_allocatable',
width: 80,
diff --git a/frontend/src/container/InfraMonitoringK8s/StatefulSets/utils.tsx b/frontend/src/container/InfraMonitoringK8s/StatefulSets/utils.tsx
index 0e393e99bf4a..ec4b9025b78c 100644
--- a/frontend/src/container/InfraMonitoringK8s/StatefulSets/utils.tsx
+++ b/frontend/src/container/InfraMonitoringK8s/StatefulSets/utils.tsx
@@ -72,7 +72,7 @@ export const defaultAddedColumns: IEntityColumn[] = [
canRemove: false,
},
{
- label: 'Mem Usage',
+ label: 'Mem Usage (WSS)',
value: 'memory',
id: 'memory',
canRemove: false,
@@ -211,10 +211,10 @@ const columnsConfig = [
className: `column ${columnProgressBarClassName}`,
},
{
- title: Mem Usage
,
+ title: Mem Usage (WSS)
,
dataIndex: 'memory',
key: 'memory',
- width: 80,
+ width: 120,
ellipsis: true,
sorter: true,
align: 'left',
diff --git a/frontend/src/container/InfraMonitoringK8s/utils.tsx b/frontend/src/container/InfraMonitoringK8s/utils.tsx
index 976bda2ffa74..e95aff2354d2 100644
--- a/frontend/src/container/InfraMonitoringK8s/utils.tsx
+++ b/frontend/src/container/InfraMonitoringK8s/utils.tsx
@@ -69,7 +69,7 @@ export const defaultAddedColumns: IEntityColumn[] = [
canRemove: false,
},
{
- label: 'Mem Usage',
+ label: 'Mem Usage (WSS)',
value: 'memory',
id: 'memory',
canRemove: false,
@@ -207,10 +207,10 @@ const columnsConfig = [
className: `column ${columnProgressBarClassName}`,
},
{
- title: Mem Usage
,
+ title: Mem Usage (WSS)
,
dataIndex: 'memory',
key: 'memory',
- width: 80,
+ width: 120,
ellipsis: true,
sorter: true,
align: 'left',
diff --git a/pkg/query-service/app/inframetrics/common.go b/pkg/query-service/app/inframetrics/common.go
index d712096768b0..7b986f049384 100644
--- a/pkg/query-service/app/inframetrics/common.go
+++ b/pkg/query-service/app/inframetrics/common.go
@@ -207,7 +207,7 @@ var (
// TODO(srikanthccv): import metadata yaml from receivers and use generated files to check the metrics
podMetricNamesToCheck = []string{
GetDotMetrics("k8s_pod_cpu_usage"),
- GetDotMetrics("k8s_pod_memory_usage"),
+ GetDotMetrics("k8s_pod_memory_working_set"),
GetDotMetrics("k8s_pod_cpu_request_utilization"),
GetDotMetrics("k8s_pod_memory_request_utilization"),
GetDotMetrics("k8s_pod_cpu_limit_utilization"),
@@ -218,7 +218,7 @@ var (
nodeMetricNamesToCheck = []string{
GetDotMetrics("k8s_node_cpu_usage"),
GetDotMetrics("k8s_node_allocatable_cpu"),
- GetDotMetrics("k8s_node_memory_usage"),
+ GetDotMetrics("k8s_node_memory_working_set"),
GetDotMetrics("k8s_node_allocatable_memory"),
GetDotMetrics("k8s_node_condition_ready"),
}
diff --git a/pkg/query-service/app/inframetrics/nodes.go b/pkg/query-service/app/inframetrics/nodes.go
index 6fe442cfc46a..0b534768ad28 100644
--- a/pkg/query-service/app/inframetrics/nodes.go
+++ b/pkg/query-service/app/inframetrics/nodes.go
@@ -36,7 +36,7 @@ var (
metricNamesForNodes = map[string]string{
"cpu": GetDotMetrics("k8s_node_cpu_usage"),
"cpu_allocatable": GetDotMetrics("k8s_node_allocatable_cpu"),
- "memory": GetDotMetrics("k8s_node_memory_usage"),
+ "memory": GetDotMetrics("k8s_node_memory_working_set"),
"memory_allocatable": GetDotMetrics("k8s_node_allocatable_memory"),
"node_condition": GetDotMetrics("k8s_node_condition_ready"),
}
diff --git a/pkg/query-service/app/inframetrics/pods.go b/pkg/query-service/app/inframetrics/pods.go
index 63649706e082..8d96bb3047d2 100644
--- a/pkg/query-service/app/inframetrics/pods.go
+++ b/pkg/query-service/app/inframetrics/pods.go
@@ -52,7 +52,7 @@ var (
"cpu": GetDotMetrics("k8s_pod_cpu_usage"),
"cpu_request": GetDotMetrics("k8s_pod_cpu_request_utilization"),
"cpu_limit": GetDotMetrics("k8s_pod_cpu_limit_utilization"),
- "memory": GetDotMetrics("k8s_pod_memory_usage"),
+ "memory": GetDotMetrics("k8s_pod_memory_working_set"),
"memory_request": GetDotMetrics("k8s_pod_memory_request_utilization"),
"memory_limit": GetDotMetrics("k8s_pod_memory_limit_utilization"),
"restarts": GetDotMetrics("k8s_container_restarts"),
diff --git a/pkg/query-service/app/inframetrics/workload_query.go b/pkg/query-service/app/inframetrics/workload_query.go
index 296f3dbf3c57..e5730fd0faca 100644
--- a/pkg/query-service/app/inframetrics/workload_query.go
+++ b/pkg/query-service/app/inframetrics/workload_query.go
@@ -7,7 +7,7 @@ var (
"cpu": GetDotMetrics("k8s_pod_cpu_usage"),
"cpu_request": GetDotMetrics("k8s_pod_cpu_request_utilization"),
"cpu_limit": GetDotMetrics("k8s_pod_cpu_limit_utilization"),
- "memory": GetDotMetrics("k8s_pod_memory_usage"),
+ "memory": GetDotMetrics("k8s_pod_memory_working_set"),
"memory_request": GetDotMetrics("k8s_pod_memory_request_utilization"),
"memory_limit": GetDotMetrics("k8s_pod_memory_limit_utilization"),
"restarts": GetDotMetrics("k8s_container_restarts"),