Squashed commit of the following:

commit 6d0b607f41b80583b2f4dc015c728d57fd0a3f6a Author: nityanandagohain <nityanandagohain@gmail.com> Date: Wed Jul 15 10:30:43 2026 +0530 fix: update tests commit 20f42474b0901e49cc745155a2c70bb829988a94 Merge: 36dca5dab0 31efe177a4 Author: nityanandagohain <nityanandagohain@gmail.com> Date: Tue Jul 14 23:09:00 2026 +0530 Merge branch 'issue_5601': scoped-trace builder package + port aggregations Merges the telemetryscopedtraces refactor (generic scoped-trace topology moved out of telemetryai, feature-flagged gen_ai key enrichment, tracefield. context classification) and ports the scalar/time-series work onto it: - trace_aggregation.go / trace_having.go now live in telemetryscopedtraces - trace-level HAVING resolution composes the canonical pkg/variables replacement (dynamic __all__ drops a condition for any operator) with the standard filter pipeline, so values still bind as args - buildPerTraceScan adopts the merged embedExpr placeholder/arg checking - ColumnProvider gains ActivityGateAlias; gen_ai provider gates trace-level aggregations on llm_call_count commit 36dca5dab0c0abb08aeb2645fee07f28cc764eb8 Author: nityanandagohain <nityanandagohain@gmail.com> Date: Tue Jul 14 23:09:00 2026 +0530 feat: trace-level aggregations for scalar/time-series and trace-scoped span list - trace.-prefixed aggregations (avg(trace.output_tokens), count(trace.trace_id), arithmetic) run over window-clipped per-trace values via a native CTE pipeline - a trace-level filter condition qualifies traces in scalar/time-series/raw via __qualified / __trace_scope, resource-fingerprint pruned like the trace list - trace-level filter conditions resolve through the standard filter pipeline (bound args, operators, query variables) against the per-trace column aliases - per-trace rows with no LLM span in the window are dropped from trace-level aggregations (LLM-activity gate) - targeted rejections for group-by/order-by on trace-level columns
feat: support ai trace aggregate filtering in ai span list
2026-07-15 19:00:34 +01:00 · 2026-07-15 12:38:57 +05:30 · 2026-07-15 12:27:55 +05:30 · 2026-07-14 18:53:30 +05:30 · 2026-07-10 14:27:07 +05:30 · 2026-07-10 14:21:16 +05:30
667 changed files with 16890 additions and 30772 deletions
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -189,9 +189,7 @@ go.mod @therealpandey
 ## Infrastructure Monitoring
 /frontend/src/pages/InfrastructureMonitoring/ @SigNoz/pulse-frontend
 /frontend/src/container/InfraMonitoringHosts/ @SigNoz/pulse-frontend
-/frontend/src/container/InfraMonitoringHostsV2/ @SigNoz/pulse-frontend
 /frontend/src/container/InfraMonitoringK8s/ @SigNoz/pulse-frontend
-/frontend/src/container/InfraMonitoringK8sV2/ @SigNoz/pulse-frontend

 ## Alerts
 /frontend/src/pages/AlertList/ @SigNoz/pulse-frontend
--- a/.github/workflows/integrationci.yaml
+++ b/.github/workflows/integrationci.yaml
@@ -53,6 +53,7 @@ jobs:
          - queriermetrics
          - querierscalar
          - queriercommon
+          - querierai
          - rawexportdata
          - role
          - rootuser
--- a/conf/example.yaml
+++ b/conf/example.yaml
@@ -129,7 +129,7 @@ sqlstore:
    # The timeout for the sqlite database to wait for a lock.
    busy_timeout: 10s
    # The default transaction locking behavior. Supported values: deferred, immediate, exclusive.
-    transaction_mode: immediate
+    transaction_mode: deferred

 ##################### APIServer #####################
 apiserver:
--- a/docs/api/openapi.yml
+++ b/docs/api/openapi.yml
@@ -543,31 +543,6 @@ components:
      required:
      - id
      type: object
-    AuthtypesGettableRole:
-      properties:
-        createdAt:
-          format: date-time
-          type: string
-        description:
-          type: string
-        id:
-          type: string
-        name:
-          type: string
-        orgId:
-          type: string
-        type:
-          type: string
-        updatedAt:
-          format: date-time
-          type: string
-      required:
-      - id
-      - name
-      - description
-      - type
-      - orgId
-      type: object
    AuthtypesGettableToken:
      properties:
        accessToken:
@@ -719,6 +694,43 @@ components:
      - detach
      type: string
    AuthtypesRole:
+      properties:
+        createdAt:
+          format: date-time
+          type: string
+        description:
+          type: string
+        id:
+          type: string
+        name:
+          type: string
+        orgId:
+          type: string
+        type:
+          type: string
+        updatedAt:
+          format: date-time
+          type: string
+      required:
+      - id
+      - name
+      - description
+      - type
+      - orgId
+      type: object
+    AuthtypesRoleMapping:
+      properties:
+        defaultRole:
+          type: string
+        groupMappings:
+          additionalProperties:
+            type: string
+          nullable: true
+          type: object
+        useRoleAttribute:
+          type: boolean
+      type: object
+    AuthtypesRoleWithTransactionGroups:
      properties:
        createdAt:
          format: date-time
@@ -746,18 +758,6 @@ components:
      - orgId
      - transactionGroups
      type: object
-    AuthtypesRoleMapping:
-      properties:
-        defaultRole:
-          type: string
-        groupMappings:
-          additionalProperties:
-            type: string
-          nullable: true
-          type: object
-        useRoleAttribute:
-          type: boolean
-      type: object
    AuthtypesSamlConfig:
      properties:
        attributeMapping:
@@ -1494,7 +1494,7 @@ components:
      - cosmosdb
      - cassandradb
      - redis
-      - cloudsql_postgres
+      - cloudsql
      type: string
    CloudintegrationtypesServiceMetadata:
      properties:
@@ -3148,8 +3148,6 @@ components:
          type: string
        image:
          type: string
-        legacy:
-          type: boolean
        locked:
          type: boolean
        name:
@@ -3182,7 +3180,6 @@ components:
      - name
      - tags
      - spec
-      - legacy
      - pinned
      type: object
    DashboardtypesListedDashboardV2:
@@ -3196,8 +3193,6 @@ components:
          type: string
        image:
          type: string
-        legacy:
-          type: boolean
        locked:
          type: boolean
        name:
@@ -3228,7 +3223,6 @@ components:
      - name
      - tags
      - spec
-      - legacy
      type: object
    DashboardtypesListedDashboardV2Spec:
      properties:
@@ -4195,7 +4189,6 @@ components:
      - namespaces
      - clusters
      - volumes
-      - kube_containers
      type: string
    InframonitoringtypesChecks:
      properties:
@@ -4259,34 +4252,6 @@ components:
          type: number
        clusterName:
          type: string
-        counts:
-          properties:
-            daemonSets:
-              format: int64
-              type: integer
-            deployments:
-              format: int64
-              type: integer
-            jobs:
-              format: int64
-              type: integer
-            namespaces:
-              format: int64
-              type: integer
-            nodes:
-              format: int64
-              type: integer
-            statefulSets:
-              format: int64
-              type: integer
-          required:
-          - nodes
-          - namespaces
-          - deployments
-          - daemonSets
-          - jobs
-          - statefulSets
-          type: object
        meta:
          additionalProperties:
            type: string
@@ -4307,7 +4272,6 @@ components:
      - nodeCountsByReadiness
      - podCountsByPhase
      - podCountsByStatus
-      - counts
      - meta
      type: object
    InframonitoringtypesClusters:
@@ -4330,158 +4294,6 @@ components:
      - total
      - endTimeBeforeRetention
      type: object
-    InframonitoringtypesContainerCountsByReady:
-      properties:
-        notReady:
-          type: integer
-        ready:
-          type: integer
-      required:
-      - ready
-      - notReady
-      type: object
-    InframonitoringtypesContainerCountsByStatus:
-      properties:
-        completed:
-          type: integer
-        containerCannotRun:
-          type: integer
-        containerCreating:
-          type: integer
-        crashLoopBackOff:
-          type: integer
-        createContainerConfigError:
-          type: integer
-        errImagePull:
-          type: integer
-        error:
-          type: integer
-        imagePullBackOff:
-          type: integer
-        oomKilled:
-          type: integer
-        running:
-          type: integer
-        terminated:
-          type: integer
-        unknown:
-          type: integer
-        waiting:
-          type: integer
-      required:
-      - running
-      - waiting
-      - terminated
-      - crashLoopBackOff
-      - imagePullBackOff
-      - errImagePull
-      - createContainerConfigError
-      - containerCreating
-      - oomKilled
-      - completed
-      - error
-      - containerCannotRun
-      - unknown
-      type: object
-    InframonitoringtypesContainerReady:
-      enum:
-      - ready
-      - not_ready
-      - no_data
-      type: string
-    InframonitoringtypesContainerRecord:
-      properties:
-        containerCountsByReady:
-          $ref: '#/components/schemas/InframonitoringtypesContainerCountsByReady'
-        containerCountsByStatus:
-          $ref: '#/components/schemas/InframonitoringtypesContainerCountsByStatus'
-        containerName:
-          type: string
-        cpu:
-          format: double
-          type: number
-        cpuLimitUtilization:
-          format: double
-          type: number
-        cpuRequestUtilization:
-          format: double
-          type: number
-        memory:
-          format: double
-          type: number
-        memoryLimitUtilization:
-          format: double
-          type: number
-        memoryRequestUtilization:
-          format: double
-          type: number
-        meta:
-          additionalProperties:
-            type: string
-          nullable: true
-          type: object
-        podUID:
-          type: string
-        ready:
-          $ref: '#/components/schemas/InframonitoringtypesContainerReady'
-        restarts:
-          format: int64
-          type: integer
-        status:
-          $ref: '#/components/schemas/InframonitoringtypesContainerStatus'
-      required:
-      - podUID
-      - containerName
-      - status
-      - containerCountsByStatus
-      - ready
-      - containerCountsByReady
-      - restarts
-      - cpu
-      - cpuRequestUtilization
-      - cpuLimitUtilization
-      - memory
-      - memoryRequestUtilization
-      - memoryLimitUtilization
-      - meta
-      type: object
-    InframonitoringtypesContainerStatus:
-      enum:
-      - running
-      - waiting
-      - terminated
-      - crashloopbackoff
-      - imagepullbackoff
-      - errimagepull
-      - createcontainerconfigerror
-      - containercreating
-      - oomkilled
-      - completed
-      - error
-      - containercannotrun
-      - unknown
-      - no_data
-      type: string
-    InframonitoringtypesContainers:
-      properties:
-        endTimeBeforeRetention:
-          type: boolean
-        records:
-          items:
-            $ref: '#/components/schemas/InframonitoringtypesContainerRecord'
-          type: array
-        total:
-          type: integer
-        type:
-          $ref: '#/components/schemas/InframonitoringtypesResponseType'
-        warning:
-          $ref: '#/components/schemas/Querybuildertypesv5QueryWarnData'
-      required:
-      - type
-      - records
-      - total
-      - endTimeBeforeRetention
-      type: object
    InframonitoringtypesDaemonSetRecord:
      properties:
        currentNodes:
@@ -4513,14 +4325,10 @@ components:
            type: string
          nullable: true
          type: object
-        misscheduledNodes:
-          type: integer
        podCountsByPhase:
          $ref: '#/components/schemas/InframonitoringtypesPodCountsByPhase'
        podCountsByStatus:
          $ref: '#/components/schemas/InframonitoringtypesPodCountsByStatus'
-        readyNodes:
-          type: integer
      required:
      - daemonSetName
      - daemonSetCPU
@@ -4531,8 +4339,6 @@ components:
      - daemonSetMemoryLimit
      - desiredNodes
      - currentNodes
-      - readyNodes
-      - misscheduledNodes
      - podCountsByPhase
      - podCountsByStatus
      - meta
@@ -4829,26 +4635,6 @@ components:
      type: object
    InframonitoringtypesNamespaceRecord:
      properties:
-        counts:
-          properties:
-            daemonSets:
-              format: int64
-              type: integer
-            deployments:
-              format: int64
-              type: integer
-            jobs:
-              format: int64
-              type: integer
-            statefulSets:
-              format: int64
-              type: integer
-          required:
-          - deployments
-          - daemonSets
-          - jobs
-          - statefulSets
-          type: object
        meta:
          additionalProperties:
            type: string
@@ -4872,7 +4658,6 @@ components:
      - namespaceMemory
      - podCountsByPhase
      - podCountsByStatus
-      - counts
      - meta
      type: object
    InframonitoringtypesNamespaces:
@@ -5183,32 +4968,6 @@ components:
      - end
      - limit
      type: object
-    InframonitoringtypesPostableContainers:
-      properties:
-        end:
-          format: int64
-          type: integer
-        filter:
-          $ref: '#/components/schemas/Querybuildertypesv5Filter'
-        groupBy:
-          items:
-            $ref: '#/components/schemas/Querybuildertypesv5GroupByKey'
-          nullable: true
-          type: array
-        limit:
-          type: integer
-        offset:
-          type: integer
-        orderBy:
-          $ref: '#/components/schemas/Querybuildertypesv5OrderBy'
-        start:
-          format: int64
-          type: integer
-      required:
-      - start
-      - end
-      - limit
-      type: object
    InframonitoringtypesPostableDaemonSets:
      properties:
        end:
@@ -7456,11 +7215,9 @@ components:
        op:
          $ref: '#/components/schemas/RuletypesCompareOperator'
        recoveryTarget:
-          format: double
          nullable: true
          type: number
        target:
-          format: double
          nullable: true
          type: number
        targetUnit:
@@ -7744,7 +7501,6 @@ components:
        selectedQueryName:
          type: string
        target:
-          format: double
          nullable: true
          type: number
        targetUnit:
@@ -8048,15 +7804,6 @@ components:
      required:
      - items
      type: object
-    SpantypesGettableSpanMappers:
-      properties:
-        items:
-          items:
-            $ref: '#/components/schemas/SpantypesSpanMapper'
-          type: array
-      required:
-      - items
-      type: object
    SpantypesGettableTraceAggregations:
      properties:
        aggregations:
@@ -8209,7 +7956,7 @@ components:
          type: boolean
        fieldContext:
          $ref: '#/components/schemas/SpantypesFieldContext'
-        groupId:
+        group_id:
          type: string
        id:
          type: string
@@ -8222,7 +7969,7 @@ components:
          type: string
      required:
      - id
-      - groupId
+      - group_id
      - name
      - fieldContext
      - config
@@ -8565,6 +8312,7 @@ components:
    TelemetrytypesSource:
      enum:
      - meter
+      - ai
      type: string
    TelemetrytypesTelemetryFieldKey:
      properties:
@@ -12081,7 +11829,7 @@ paths:
                properties:
                  data:
                    items:
-                      $ref: '#/components/schemas/AuthtypesGettableRole'
+                      $ref: '#/components/schemas/AuthtypesRole'
                    type: array
                  status:
                    type: string
@@ -12265,7 +12013,7 @@ paths:
              schema:
                properties:
                  data:
-                    $ref: '#/components/schemas/AuthtypesRole'
+                    $ref: '#/components/schemas/AuthtypesRoleWithTransactionGroups'
                  status:
                    type: string
                required:
@@ -13801,7 +13549,7 @@ paths:
              schema:
                properties:
                  data:
-                    $ref: '#/components/schemas/SpantypesGettableSpanMappers'
+                    $ref: '#/components/schemas/SpantypesGettableSpanMapperGroups'
                  status:
                    type: string
                required:
@@ -16064,24 +15812,21 @@ paths:
        daemonSetCPULimit, daemonSetMemoryRequest, daemonSetMemoryLimit). Each row
        also reports the latest known node-level counters from kube-state-metrics:
        desiredNodes (k8s.daemonset.desired_scheduled_nodes, the number of nodes the
-        daemonset wants to run on), currentNodes (k8s.daemonset.current_scheduled_nodes,
-        the number of nodes the daemonset currently runs on), readyNodes (k8s.daemonset.ready_nodes,
-        the number of nodes running at least one ready daemon pod) and misscheduledNodes
-        (k8s.daemonset.misscheduled_nodes, the number of nodes running the daemon
-        pod but not supposed to) — note these are node counts, not pod counts. It
-        also reports per-group podCountsByPhase ({ pending, running, succeeded, failed,
-        unknown } from each pod''s latest k8s.pod.phase value). Each daemonset includes
-        metadata attributes (k8s.daemonset.name, k8s.namespace.name, k8s.cluster.name).
-        The response type is ''list'' for the default k8s.daemonset.name grouping
-        or ''grouped_list'' for custom groupBy keys; in both modes every row aggregates
-        pods owned by daemonsets in the group. Supports filtering via a filter expression,
-        custom groupBy, ordering by cpu / cpu_request / cpu_limit / memory / memory_request
-        / memory_limit / desired_nodes / current_nodes / ready_nodes / misscheduled_nodes,
+        daemonset wants to run on) and currentNodes (k8s.daemonset.current_scheduled_nodes,
+        the number of nodes the daemonset currently runs on) — note these are node
+        counts, not pod counts. It also reports per-group podCountsByPhase ({ pending,
+        running, succeeded, failed, unknown } from each pod''s latest k8s.pod.phase
+        value). Each daemonset includes metadata attributes (k8s.daemonset.name, k8s.namespace.name,
+        k8s.cluster.name). The response type is ''list'' for the default k8s.daemonset.name
+        grouping or ''grouped_list'' for custom groupBy keys; in both modes every
+        row aggregates pods owned by daemonsets in the group. Supports filtering via
+        a filter expression, custom groupBy, ordering by cpu / cpu_request / cpu_limit
+        / memory / memory_request / memory_limit / desired_nodes / current_nodes,
        and pagination via offset/limit. Also reports whether the requested time range
        falls before the data retention boundary. Numeric metric fields (daemonSetCPU,
        daemonSetCPURequest, daemonSetCPULimit, daemonSetMemory, daemonSetMemoryRequest,
-        daemonSetMemoryLimit, desiredNodes, currentNodes, readyNodes, misscheduledNodes)
-        return -1 as a sentinel when no data is available for that field.'
+        daemonSetMemoryLimit, desiredNodes, currentNodes) return -1 as a sentinel
+        when no data is available for that field.'
      operationId: ListDaemonSets
      requestBody:
        content:
@@ -16355,86 +16100,6 @@ paths:
      summary: List Jobs for Infra Monitoring
      tags:
      - inframonitoring
-  /api/v2/infra_monitoring/kube_containers:
-    post:
-      deprecated: false
-      description: 'Returns a paginated list of Kubernetes containers with key kubeletstats
-        metrics: CPU usage (cores), CPU request/limit utilization, memory working
-        set, and memory request/limit utilization. Each container also reports health
-        signals from the k8s_cluster receiver: status (kubectl-style display status
-        derived from k8s.container.status.state + k8s.container.status.reason), restarts
-        (absolute count from k8s.container.restarts), and ready (ready/not_ready from
-        k8s.container.ready). The row identity is (k8s.pod.uid, k8s.container.name),
-        stable across container restarts. Each container includes metadata attributes
-        (k8s.container.name, k8s.pod.name, container.image.name, container.image.tag,
-        k8s.namespace.name, k8s.node.name, k8s.cluster.name, and workload owner such
-        as deployment/statefulset/daemonset/job). The response type is ''list'' for
-        the default (k8s.pod.uid, k8s.container.name) grouping (each row is one container
-        with its current status and ready state) or ''grouped_list'' for custom groupBy
-        keys (each row aggregates containers in the group with per-status counts under
-        containerCountsByStatus, per-readiness counts under containerCountsByReady,
-        and restarts as the group sum). Status requires the optional k8s.container.status.state
-        and k8s.container.status.reason metrics; when either is missing, status is
-        omitted and a warning is returned while restarts and ready are still computed.
-        Supports filtering via a filter expression, custom groupBy, ordering by any
-        of the six metrics (cpu, cpu_request, cpu_limit, memory, memory_request, memory_limit),
-        and pagination via offset/limit. Also reports whether the requested time range
-        falls before the data retention boundary. Numeric metric fields (cpu, cpuRequestUtilization,
-        cpuLimitUtilization, memory, memoryRequestUtilization, memoryLimitUtilization)
-        and restarts return -1 as a sentinel when no data is available for that field.'
-      operationId: ListContainers
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/InframonitoringtypesPostableContainers'
-      responses:
-        "200":
-          content:
-            application/json:
-              schema:
-                properties:
-                  data:
-                    $ref: '#/components/schemas/InframonitoringtypesContainers'
-                  status:
-                    type: string
-                required:
-                - status
-                - data
-                type: object
-          description: OK
-        "400":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/RenderErrorResponse'
-          description: Bad Request
-        "401":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/RenderErrorResponse'
-          description: Unauthorized
-        "403":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/RenderErrorResponse'
-          description: Forbidden
-        "500":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/RenderErrorResponse'
-          description: Internal Server Error
-      security:
-      - api_key:
-        - VIEWER
-      - tokenizer:
-        - VIEWER
-      summary: List Kubernetes Containers for Infra Monitoring
-      tags:
-      - inframonitoring
  /api/v2/infra_monitoring/namespaces:
    post:
      deprecated: false
@@ -18245,16 +17910,6 @@ paths:
        public dashboard. The panel is addressed by its key in spec.panels.
      operationId: GetPublicDashboardPanelQueryRangeV2
      parameters:
-      - in: query
-        name: startTime
-        required: false
-        schema:
-          type: string
-      - in: query
-        name: endTime
-        required: false
-        schema:
-          type: string
      - in: path
        name: id
        required: true
--- a/ee/authz/openfgaauthz/provider.go
+++ b/ee/authz/openfgaauthz/provider.go
@@ -119,6 +119,10 @@ func (provider *provider) CheckTransactions(ctx context.Context, subject string,
 	return results, nil
 }

+func (provider *provider) ListObjects(ctx context.Context, subject string, relation authtypes.Relation, objectType coretypes.Type) ([]*coretypes.Object, error) {
+	return provider.openfgaServer.ListObjects(ctx, subject, relation, objectType)
+}
+
 func (provider *provider) Write(ctx context.Context, additions []*openfgav1.TupleKey, deletions []*openfgav1.TupleKey) error {
 	return provider.openfgaServer.Write(ctx, additions, deletions)
 }
@@ -127,6 +131,10 @@ func (provider *provider) ReadTuples(ctx context.Context, tupleKey *openfgav1.Re
 	return provider.openfgaServer.ReadTuples(ctx, tupleKey)
 }

+func (provider *provider) Get(ctx context.Context, orgID valuer.UUID, id valuer.UUID) (*authtypes.Role, error) {
+	return provider.pkgAuthzService.Get(ctx, orgID, id)
+}
+
 func (provider *provider) GetByOrgIDAndName(ctx context.Context, orgID valuer.UUID, name string) (*authtypes.Role, error) {
 	return provider.pkgAuthzService.GetByOrgIDAndName(ctx, orgID, name)
 }
@@ -175,7 +183,7 @@ func (provider *provider) CreateManagedUserRoleTransactions(ctx context.Context,
 	return provider.Write(ctx, tuples, nil)
 }

-func (provider *provider) Create(ctx context.Context, orgID valuer.UUID, role *authtypes.Role) error {
+func (provider *provider) Create(ctx context.Context, orgID valuer.UUID, role *authtypes.RoleWithTransactionGroups) error {
 	_, err := provider.licensing.GetActive(ctx, orgID)
 	if err != nil {
 		return errors.New(errors.TypeLicenseUnavailable, errors.CodeLicenseUnavailable, "a valid license is not available").WithAdditional("this feature requires a valid license").WithAdditional(err.Error())
@@ -200,31 +208,70 @@ func (provider *provider) Create(ctx context.Context, orgID valuer.UUID, role *a
 		return err
 	}

-	return provider.store.Create(ctx, role)
+	if err := provider.store.Create(ctx, role.Role); err != nil {
+		return err
+	}
+
+	return nil
 }

-func (provider *provider) Get(ctx context.Context, orgID valuer.UUID, id valuer.UUID) (*authtypes.Role, error) {
-	return provider.store.Get(ctx, orgID, id)
+func (provider *provider) GetOrCreate(ctx context.Context, orgID valuer.UUID, role *authtypes.Role) (*authtypes.Role, error) {
+	_, err := provider.licensing.GetActive(ctx, orgID)
+	if err != nil {
+		return nil, errors.New(errors.TypeLicenseUnavailable, errors.CodeLicenseUnavailable, "a valid license is not available").WithAdditional("this feature requires a valid license").WithAdditional(err.Error())
+	}
+
+	existingRole, err := provider.store.GetByOrgIDAndName(ctx, role.OrgID, role.Name)
+	if err != nil {
+		if !errors.Ast(err, errors.TypeNotFound) {
+			return nil, err
+		}
+	}
+
+	if existingRole != nil {
+		return existingRole, nil
+	}
+
+	err = provider.store.Create(ctx, role)
+	if err != nil {
+		return nil, err
+	}
+
+	return role, nil
 }

-func (provider *provider) Update(ctx context.Context, orgID valuer.UUID, updatedRole *authtypes.Role) error {
+func (provider *provider) GetWithTransactionGroups(ctx context.Context, orgID valuer.UUID, id valuer.UUID) (*authtypes.RoleWithTransactionGroups, error) {
+	_, err := provider.licensing.GetActive(ctx, orgID)
+	if err != nil {
+		return nil, errors.New(errors.TypeLicenseUnavailable, errors.CodeLicenseUnavailable, "a valid license is not available").WithAdditional("this feature requires a valid license").WithAdditional(err.Error())
+	}
+
+	role, err := provider.store.Get(ctx, orgID, id)
+	if err != nil {
+		return nil, err
+	}
+
+	tuples, err := provider.readAllTuplesForRole(ctx, role.Name, orgID)
+	if err != nil {
+		return nil, err
+	}
+
+	transactionGroups := authtypes.MustNewTransactionGroupsFromTuples(tuples)
+	return authtypes.MakeRoleWithTransactionGroups(role, transactionGroups), nil
+}
+
+func (provider *provider) Update(ctx context.Context, orgID valuer.UUID, updatedRole *authtypes.RoleWithTransactionGroups) error {
 	_, err := provider.licensing.GetActive(ctx, orgID)
 	if err != nil {
 		return errors.New(errors.TypeLicenseUnavailable, errors.CodeLicenseUnavailable, "a valid license is not available").WithAdditional("this feature requires a valid license").WithAdditional(err.Error())
 	}

-	existingRole, err := provider.Get(ctx, orgID, updatedRole.ID)
+	existingRole, err := provider.GetWithTransactionGroups(ctx, orgID, updatedRole.ID)
 	if err != nil {
 		return err
 	}

-	existingTuples, err := provider.readAllTuplesForRole(ctx, existingRole.Name, orgID)
-	if err != nil {
-		return err
-	}
-
-	existingGroups := authtypes.MustNewTransactionGroupsFromTuples(existingTuples)
-	additions, deletions := existingGroups.Diff(updatedRole.TransactionGroups)
+	additions, deletions := existingRole.TransactionGroups.Diff(updatedRole.TransactionGroups)
 	additionTuples, err := authtypes.NewTuplesFromTransactionGroups(existingRole.Name, orgID, additions)
 	if err != nil {
 		return err
@@ -240,7 +287,7 @@ func (provider *provider) Update(ctx context.Context, orgID valuer.UUID, updated
 		return err
 	}

-	return provider.store.Update(ctx, orgID, updatedRole)
+	return provider.store.Update(ctx, orgID, updatedRole.Role)
 }

 func (provider *provider) Delete(ctx context.Context, orgID valuer.UUID, id valuer.UUID) error {
@@ -249,7 +296,7 @@ func (provider *provider) Delete(ctx context.Context, orgID valuer.UUID, id valu
 		return errors.New(errors.TypeLicenseUnavailable, errors.CodeLicenseUnavailable, "a valid license is not available").WithAdditional("this feature requires a valid license").WithAdditional(err.Error())
 	}

-	role, err := provider.Get(ctx, orgID, id)
+	role, err := provider.GetWithTransactionGroups(ctx, orgID, id)
 	if err != nil {
 		return err
 	}
@@ -265,7 +312,7 @@ func (provider *provider) Delete(ctx context.Context, orgID valuer.UUID, id valu
 		}
 	}

-	tuples, err := provider.readAllTuplesForRole(ctx, role.Name, orgID)
+	tuples, err := authtypes.NewTuplesFromTransactionGroups(role.Name, orgID, role.TransactionGroups)
 	if err != nil {
 		return err
 	}
@@ -277,24 +324,6 @@ func (provider *provider) Delete(ctx context.Context, orgID valuer.UUID, id valu
 	return provider.store.Delete(ctx, orgID, id)
 }

-func (provider *provider) readAllTuplesForRole(ctx context.Context, roleName string, orgID valuer.UUID) ([]*openfgav1.TupleKey, error) {
-	subject := authtypes.MustNewSubject(coretypes.NewResourceRole(), roleName, orgID, &coretypes.VerbAssignee)
-
-	tuples := make([]*openfgav1.TupleKey, 0)
-	for _, objectType := range provider.registry.Types() {
-		typeTuples, err := provider.openfgaServer.ReadTuples(ctx, &openfgav1.ReadRequestTupleKey{
-			User:   subject,
-			Object: objectType.StringValue() + ":",
-		})
-		if err != nil {
-			return nil, err
-		}
-		tuples = append(tuples, typeTuples...)
-	}
-
-	return tuples, nil
-}
-
 func (provider *provider) getManagedRoleGrantTuples(orgID valuer.UUID, userID valuer.UUID) []*openfgav1.TupleKey {
 	tuples := []*openfgav1.TupleKey{}

@@ -346,3 +375,21 @@ func (provider *provider) getManagedRoleTransactionTuples(orgID valuer.UUID) []*

 	return tuples
 }
+
+func (provider *provider) readAllTuplesForRole(ctx context.Context, roleName string, orgID valuer.UUID) ([]*openfgav1.TupleKey, error) {
+	subject := authtypes.MustNewSubject(coretypes.NewResourceRole(), roleName, orgID, &coretypes.VerbAssignee)
+
+	tuples := make([]*openfgav1.TupleKey, 0)
+	for _, objectType := range provider.registry.Types() {
+		typeTuples, err := provider.ReadTuples(ctx, &openfgav1.ReadRequestTupleKey{
+			User:   subject,
+			Object: objectType.StringValue() + ":",
+		})
+		if err != nil {
+			return nil, err
+		}
+		tuples = append(tuples, typeTuples...)
+	}
+
+	return tuples, nil
+}
--- a/ee/authz/openfgaserver/server.go
+++ b/ee/authz/openfgaserver/server.go
@@ -105,6 +105,10 @@ func (server *Server) BatchCheck(ctx context.Context, tupleReq map[string]*openf
 	return server.pkgAuthzService.BatchCheck(ctx, tupleReq)
 }

+func (server *Server) ListObjects(ctx context.Context, subject string, relation authtypes.Relation, objectType coretypes.Type) ([]*coretypes.Object, error) {
+	return server.pkgAuthzService.ListObjects(ctx, subject, relation, objectType)
+}
+
 func (server *Server) Write(ctx context.Context, additions []*openfgav1.TupleKey, deletions []*openfgav1.TupleKey) error {
 	return server.pkgAuthzService.Write(ctx, additions, deletions)
 }
--- a/ee/sqlschema/postgressqlschema/provider.go
+++ b/ee/sqlschema/postgressqlschema/provider.go
@@ -3,7 +3,6 @@ package postgressqlschema
 import (
 	"context"
 	"database/sql"
-	"log/slog"

 	"github.com/uptrace/bun"

@@ -215,20 +214,6 @@ WHERE
 }

 func (provider *provider) GetIndices(ctx context.Context, name sqlschema.TableName) ([]sqlschema.Index, error) {
-	// A key is one entry an index is built on: a column (plain) or an expression
-	// like lower(x) (functional). Returns one row per key of each non-constraint-
-	// backed index on the table, ordered by position. Keys are enumerated with
-	// generate_series over indnkeyatts (count of key columns, excluding non-key
-	// INCLUDE columns), so expression keys are covered too. Reconstruction uses:
-	//
-	//   index_name    | index the key belongs to
-	//   is_expression | true if the key is an expression, not a plain column
-	//   key_def       | rendered key text, e.g. org_id or lower(key)
-	//   column_name   | column name for plain keys; NULL for expression keys
-	//   predicate     | partial-index WHERE; NULL if not partial (same every row)
-	//
-	// table_name/unique/primary/column_position are carried over from the prior
-	// query (unique gates the loop, column_position orders the keys).
 	rows, err := provider.
 		sqlstore.
 		BunDB().
@@ -239,21 +224,19 @@ SELECT
    i.indisunique AS unique,
    i.indisprimary AS primary,
    a.attname AS column_name,
-    n AS column_position,
-	(i.indkey[n - 1] = 0) AS is_expression,
-    pg_get_indexdef(i.indexrelid, n, true) AS key_def,
+    array_position(i.indkey, a.attnum) AS column_position,
    pg_get_expr(i.indpred, i.indrelid) AS predicate
 FROM
    pg_index i
    LEFT JOIN pg_class ct ON ct.oid = i.indrelid
    LEFT JOIN pg_class ci ON ci.oid = i.indexrelid
+    LEFT JOIN pg_attribute a ON a.attrelid = ct.oid
    LEFT JOIN pg_constraint con ON con.conindid = i.indexrelid
-    CROSS JOIN generate_series(1, i.indnkeyatts) AS n
-    LEFT JOIN pg_attribute a ON a.attrelid = ct.oid AND a.attnum = i.indkey[n - 1]
 WHERE
-    ct.relname = ?
-    AND ct.relkind = 'r'
+    a.attnum = ANY(i.indkey)
    AND con.oid IS NULL
+    AND ct.relkind = 'r'
+    AND ct.relname = ?
 ORDER BY index_name, column_position`, string(name))
 	if err != nil {
 		return nil, provider.sqlstore.WrapNotFoundErrf(err, errors.CodeNotFound, "no indices for table (%s) found", name)
@@ -268,10 +251,6 @@ ORDER BY index_name, column_position`, string(name))
 	type indexEntry struct {
 		columns   []sqlschema.ColumnName
 		predicate *string
-		// keyDefs holds every key rendered by pg_get_indexdef, in key order; used
-		// for functional indexes where a key may be an expression like lower(x).
-		keyDefs       []string
-		hasExpression bool
 	}

 	uniqueIndicesMap := make(map[string]*indexEntry)
@@ -281,45 +260,30 @@ ORDER BY index_name, column_position`, string(name))
 			indexName  string
 			unique     bool
 			primary    bool
-			columnName *string
-			// starts from 1 and is unused in this function, this is to ensure that the column names are in the correct order
+			columnName string
+			// starts from 0 and is unused in this function, this is to ensure that the column names are in the correct order
 			columnPosition int
-			isExpression   bool
-			keyDef         string
 			predicate      *string
 		)

-		if err := rows.Scan(&tableName, &indexName, &unique, &primary, &columnName, &columnPosition, &isExpression, &keyDef, &predicate); err != nil {
+		if err := rows.Scan(&tableName, &indexName, &unique, &primary, &columnName, &columnPosition, &predicate); err != nil {
 			return nil, err
 		}

-		if !unique {
-			continue
-		}
-
-		entry, ok := uniqueIndicesMap[indexName]
-		if !ok {
-			entry = &indexEntry{predicate: predicate}
-			uniqueIndicesMap[indexName] = entry
-		}
-
-		entry.keyDefs = append(entry.keyDefs, keyDef)
-		if isExpression {
-			entry.hasExpression = true
-		} else if columnName != nil {
-			entry.columns = append(entry.columns, sqlschema.ColumnName(*columnName))
+		if unique {
+			if _, ok := uniqueIndicesMap[indexName]; !ok {
+				uniqueIndicesMap[indexName] = &indexEntry{
+					columns:   []sqlschema.ColumnName{sqlschema.ColumnName(columnName)},
+					predicate: predicate,
+				}
+			} else {
+				uniqueIndicesMap[indexName].columns = append(uniqueIndicesMap[indexName].columns, sqlschema.ColumnName(columnName))
+			}
 		}
 	}

 	indices := make([]sqlschema.Index, 0)
 	for indexName, entry := range uniqueIndicesMap {
-		// functional partial indexes aren't representable (PartialUniqueIndex has no
-		// expressions); skip rather than misrepresent.
-		if entry.hasExpression && entry.predicate != nil {
-			provider.settings.Logger().WarnContext(ctx, "skipping functional partial unique index; not representable by sqlschema", slog.String("index", indexName), slog.String("table", string(name)))
-			continue
-		}
-
 		if entry.predicate != nil {
 			index := &sqlschema.PartialUniqueIndex{
 				TableName:   name,
@@ -327,17 +291,6 @@ ORDER BY index_name, column_position`, string(name))
 				Where:       *entry.predicate,
 			}

-			if index.Name() == indexName {
-				indices = append(indices, index)
-			} else {
-				indices = append(indices, index.Named(indexName))
-			}
-		} else if entry.hasExpression {
-			index := &sqlschema.UniqueIndexWithExpressions{
-				TableName:   name,
-				Expressions: entry.keyDefs,
-			}
-
 			if index.Name() == indexName {
 				indices = append(indices, index)
 			} else {
--- a/ee/sqlschema/postgressqlschema/provider_test.go
+++ b/ee/sqlschema/postgressqlschema/provider_test.go
@@ -1,116 +0,0 @@
-package postgressqlschema
-
-import (
-	"context"
-	"database/sql/driver"
-	"testing"
-
-	"github.com/DATA-DOG/go-sqlmock"
-	"github.com/SigNoz/signoz/pkg/instrumentation/instrumentationtest"
-	"github.com/SigNoz/signoz/pkg/sqlschema"
-	"github.com/SigNoz/signoz/pkg/sqlstore"
-	"github.com/SigNoz/signoz/pkg/sqlstore/sqlstoretest"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-// TestGetIndices feeds GetIndices the exact rows the catalog query returns for a
-// real table (captured from devenv postgres) and checks each unique-index shape
-// is reconstructed: expression keys, partial (predicate), and plain columns.
-func TestGetIndices(t *testing.T) {
-	// column order must match the SELECT in GetIndices.
-	columns := []string{"table_name", "index_name", "unique", "primary", "column_name", "column_position", "is_expression", "key_def", "predicate"}
-
-	testCases := []struct {
-		name  string
-		table sqlschema.TableName
-		rows  [][]driver.Value
-		want  []sqlschema.Index
-	}{
-		{
-			name:  "UniqueIndexWithExpressions",
-			table: "tag",
-			rows: [][]driver.Value{
-				{"tag", "uq_tag_a36c51df", true, false, "org_id", 1, false, "org_id", nil},
-				{"tag", "uq_tag_a36c51df", true, false, "kind", 2, false, "kind", nil},
-				{"tag", "uq_tag_a36c51df", true, false, nil, 3, true, "lower(key)", nil},
-				{"tag", "uq_tag_a36c51df", true, false, nil, 4, true, "lower(value)", nil},
-			},
-			want: []sqlschema.Index{
-				&sqlschema.UniqueIndexWithExpressions{
-					TableName:   "tag",
-					Expressions: []string{"org_id", "kind", "lower(key)", "lower(value)"},
-				},
-			},
-		},
-		{
-			name:  "PartialUniqueIndexes",
-			table: "service_account",
-			rows: [][]driver.Value{
-				{"service_account", "puq_service_account_email_org_id_471d6134", true, false, "email", 1, false, "email", "(status <> 'deleted'::text)"},
-				{"service_account", "puq_service_account_email_org_id_471d6134", true, false, "org_id", 2, false, "org_id", "(status <> 'deleted'::text)"},
-				{"service_account", "puq_service_account_name_org_id_471d6134", true, false, "name", 1, false, "name", "(status <> 'deleted'::text)"},
-				{"service_account", "puq_service_account_name_org_id_471d6134", true, false, "org_id", 2, false, "org_id", "(status <> 'deleted'::text)"},
-			},
-			want: []sqlschema.Index{
-				(&sqlschema.PartialUniqueIndex{
-					TableName:   "service_account",
-					ColumnNames: []sqlschema.ColumnName{"email", "org_id"},
-					Where:       "(status <> 'deleted'::text)",
-				}).Named("puq_service_account_email_org_id_471d6134"),
-				(&sqlschema.PartialUniqueIndex{
-					TableName:   "service_account",
-					ColumnNames: []sqlschema.ColumnName{"name", "org_id"},
-					Where:       "(status <> 'deleted'::text)",
-				}).Named("puq_service_account_name_org_id_471d6134"),
-			},
-		},
-		{
-			name:  "PlainUniqueIndex",
-			table: "tag_relation",
-			rows: [][]driver.Value{
-				{"tag_relation", "uq_tag_relation_kind_resource_id_tag_id", true, false, "kind", 1, false, "kind", nil},
-				{"tag_relation", "uq_tag_relation_kind_resource_id_tag_id", true, false, "resource_id", 2, false, "resource_id", nil},
-				{"tag_relation", "uq_tag_relation_kind_resource_id_tag_id", true, false, "tag_id", 3, false, "tag_id", nil},
-			},
-			want: []sqlschema.Index{
-				&sqlschema.UniqueIndex{
-					TableName:   "tag_relation",
-					ColumnNames: []sqlschema.ColumnName{"kind", "resource_id", "tag_id"},
-				},
-			},
-		},
-	}
-
-	for _, testCase := range testCases {
-		t.Run(testCase.name, func(t *testing.T) {
-			store := sqlstoretest.New(sqlstore.Config{Provider: "postgres"}, sqlmock.QueryMatcherRegexp)
-			rows := sqlmock.NewRows(columns)
-			for _, row := range testCase.rows {
-				rows.AddRow(row...)
-			}
-			store.Mock().ExpectQuery("pg_index").WillReturnRows(rows)
-
-			schema, err := New(context.Background(), instrumentationtest.New().ToProviderSettings(), sqlschema.Config{}, store)
-			require.NoError(t, err)
-
-			indices, err := schema.GetIndices(context.Background(), testCase.table)
-			require.NoError(t, err)
-			assert.Len(t, indices, len(testCase.want))
-
-			// GetIndices iterates a map, so match by name rather than slice order.
-			got := make(map[string]sqlschema.Index, len(indices))
-			for _, index := range indices {
-				got[index.Name()] = index
-			}
-			for _, want := range testCase.want {
-				actual, ok := got[want.Name()]
-				if !assert.True(t, ok, "expected index %s not returned", want.Name()) {
-					// so that other items in the for loop can also be checked.
-					continue
-				}
-				assert.True(t, want.Equals(actual), "index %s reconstructed differently", want.Name())
-			}
-		})
-	}
-}
--- a/frontend/mocks/motionMock.tsx
+++ b/frontend/mocks/motionMock.tsx
@@ -1,88 +0,0 @@
-// oxlint-disable-next-line no-restricted-imports
-import * as React from 'react';
-
-// In jsdom, AnimatePresence from motion/react keeps children in DOM during exit
-// animations (awaiting rAF-driven completion that never fully runs in jsdom).
-// This mock makes AnimatePresence render children immediately and makes motion.*
-// elements render as their plain HTML equivalents without animation side-effects.
-//
-// IMPORTANT: motion component references are cached so React sees a stable
-// component identity across re-renders and does not enter an infinite remount loop.
-
-const MOTION_PROPS_TO_STRIP = new Set([
-	'initial',
-	'animate',
-	'exit',
-	'variants',
-	'transition',
-	'whileHover',
-	'whileTap',
-	'whileFocus',
-	'whileInView',
-	'layout',
-	'layoutId',
-	'onAnimationStart',
-	'onAnimationComplete',
-]);
-
-const cache = new Map<string, React.ComponentType>();
-
-function getMotionComponent(tag: string): React.ComponentType {
-	if (!cache.has(tag)) {
-		const Component = React.forwardRef<HTMLElement, Record<string, unknown>>(
-			(props, ref) => {
-				const domProps: Record<string, unknown> = {};
-				for (const [k, v] of Object.entries(props)) {
-					if (!MOTION_PROPS_TO_STRIP.has(k)) {
-						domProps[k] = v;
-					}
-				}
-				return React.createElement(tag, { ...domProps, ref });
-			},
-		);
-		Component.displayName = `motion.${tag}`;
-		cache.set(tag, Component as unknown as React.ComponentType);
-	}
-	return cache.get(tag) as React.ComponentType;
-}
-
-const motionHandler: ProxyHandler<Record<string, React.ComponentType>> = {
-	get(_target, prop: string) {
-		return getMotionComponent(prop);
-	},
-};
-
-export const AnimatePresence: React.FC<{
-	children?: React.ReactNode;
-	mode?: string;
-}> = ({ children }) => React.createElement(React.Fragment, null, children);
-
-export const motion = new Proxy(
-	{} as Record<string, React.ComponentType>,
-	motionHandler,
-);
-
-export const useAnimation = (): Record<string, unknown> => ({
-	start: (): unknown => Promise.resolve(),
-	stop: (): unknown => undefined,
-	set: (): unknown => undefined,
-});
-
-export const useMotionValue = (
-	initial: unknown,
-): { get: () => unknown; set: () => void } => ({
-	get: (): unknown => initial,
-	set: (): unknown => undefined,
-});
-
-export const useTransform = (): { get: () => number } => ({
-	get: (): number => 0,
-});
-
-export const useSpring = (v: unknown): unknown => v;
-
-export const useScroll = (): { scrollY: { get: () => number } } => ({
-	scrollY: { get: (): number => 0 },
-});
-
-export default { motion, AnimatePresence };
--- a/frontend/mocks/resizableMock.tsx
+++ b/frontend/mocks/resizableMock.tsx
@@ -0,0 +1,29 @@
+import { PropsWithChildren } from 'react';
+
+type CommonProps = PropsWithChildren<{
+	className?: string;
+	minSize?: number;
+	maxSize?: number;
+	defaultSize?: number;
+	direction?: 'horizontal' | 'vertical';
+	autoSaveId?: string;
+	withHandle?: boolean;
+}>;
+
+export function ResizablePanelGroup({
+	children,
+	className,
+}: CommonProps): JSX.Element {
+	return <div className={className}>{children}</div>;
+}
+
+export function ResizablePanel({
+	children,
+	className,
+}: CommonProps): JSX.Element {
+	return <div className={className}>{children}</div>;
+}
+
+export function ResizableHandle({ className }: CommonProps): JSX.Element {
+	return <div className={className} />;
+}
--- a/frontend/jest.config.ts
+++ b/frontend/jest.config.ts
@@ -20,7 +20,7 @@ const config: Config.InitialOptions = {
 		'\\.module\\.mjs$': '<rootDir>/__mocks__/cssMock.ts',
 		'\\.md$': '<rootDir>/__mocks__/cssMock.ts',
 		'^uplot$': '<rootDir>/__mocks__/uplotMock.ts',
-		'^motion/react$': '<rootDir>/__mocks__/motionMock.tsx',
+		'^@signozhq/resizable$': '<rootDir>/__mocks__/resizableMock.tsx',
 		'^hooks/useSafeNavigate$': USE_SAFE_NAVIGATE_MOCK_PATH,
 		'^src/hooks/useSafeNavigate$': USE_SAFE_NAVIGATE_MOCK_PATH,
 		'^.*/useSafeNavigate$': USE_SAFE_NAVIGATE_MOCK_PATH,
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -49,6 +49,7 @@
    "@sentry/vite-plugin": "5.3.0",
    "@signozhq/design-tokens": "2.1.4",
    "@signozhq/icons": "0.4.0",
+    "@signozhq/resizable": "0.0.2",
    "@signozhq/ui": "0.0.23",
    "@tanstack/react-table": "8.21.3",
    "@tanstack/react-virtual": "3.13.22",
@@ -74,7 +75,7 @@
    "crypto-js": "4.2.0",
    "d3-hierarchy": "3.1.2",
    "dayjs": "^1.10.7",
-    "dompurify": "3.4.11",
+    "dompurify": "3.4.0",
    "event-source-polyfill": "1.0.31",
    "eventemitter3": "5.0.1",
    "history": "4.10.1",
@@ -127,7 +128,7 @@
    "timestamp-nano": "^1.0.0",
    "typescript": "5.9.3",
    "uplot": "1.6.31",
-    "uuid": "14.0.1",
+    "uuid": "^8.3.2",
    "vite": "npm:rolldown-vite@7.3.1",
    "vite-plugin-html": "3.2.2",
    "zod": "4.3.6",
@@ -221,5 +222,26 @@
    "*.(scss|css)": [
      "stylelint"
    ]
+  },
+  "resolutions": {
+    "@types/react": "18.0.26",
+    "@types/react-dom": "18.0.10",
+    "debug": "4.3.4",
+    "semver": "7.5.4",
+    "xml2js": "0.5.0",
+    "phin": "^3.7.1",
+    "body-parser": "1.20.3",
+    "http-proxy-middleware": "4.1.1",
+    "cross-spawn": "7.0.5",
+    "cookie": "^0.7.1",
+    "serialize-javascript": "6.0.2",
+    "prismjs": "1.30.0",
+    "got": "11.8.5",
+    "form-data": "4.0.6",
+    "brace-expansion": "^2.0.2",
+    "on-headers": "^1.1.0",
+    "js-cookie": "^3.0.7",
+    "tmp": "0.2.7",
+    "vite": "npm:rolldown-vite@7.3.1"
  }
 }
--- a/frontend/pnpm-lock.yaml
+++ b/frontend/pnpm-lock.yaml
--- a/frontend/pnpm-workspace.yaml
+++ b/frontend/pnpm-workspace.yaml
@@ -1,53 +1,6 @@
-blockExoticSubdeps: true
+trustPolicy: no-downgrade
 minimumReleaseAge: 2880 # 2d
+minimumReleaseAgeStrict: true
 minimumReleaseAgeExclude:
 - '@signozhq/*'
-minimumReleaseAgeStrict: true
-# Security floors for vulnerable transitive deps. Where possible, targets are
-# capped to avoid crossing breaking versions (major; and minor for 0.x).
-# Some entries may still force a breaking bump when no safe release exists
-# within the consumer’s constraint—see per-entry notes.
-overrides:
- # via: direct devDep @babel/core ^7.22.11 (+ babel plugin peers)
- # remove: bump @babel/core in package.json to ^7.29.6
- '@babel/core@<=7.29.0': '>=7.29.6 <8'
- # via: jest > babel-plugin-istanbul > @istanbuljs/load-nyc-config@1.1.0 (js-yaml ^3.13.1)
- # remove: blocked — 1.1.0 is latest and still depends on js-yaml 3.x
- '@istanbuljs/load-nyc-config>js-yaml': '>=4.2.0 <5'
- # via: msw@1.3.2 (devDep) > cookie ^0.4.2
- # remove: upgrade msw to >=2 (ships cookie ^1). Do NOT open the cap: cookie >=1 is
- # ESM-only and breaks msw under jest's CJS sandbox (kills every test suite)
- cookie@<0.7.0: '>=0.7.1 <1'
- # via: direct dep dompurify 3.4.0; @grafana/data@11.6.15 (3.4.0/3.2.4 exact);
- #      @monaco-editor/react > monaco-editor@0.55.1 (3.2.7 exact)
- # remove: bump direct dep to 3.4.11; @grafana/data (latest 13.1.0) and
- #         monaco-editor (latest 0.55.1) still pin vulnerable versions — blocked
- dompurify@<=3.4.10: '>=3.4.11 <4'
- # via: rolldown-vite@7.3.1 (esbuild ^0.27.0); orval@8.9.1 (^0.27.4); ts-jest@29.4.9 (~0.27.4)
- # remove: blocked on rolldown-vite (7.3.1 is latest, still ^0.27.0);
- #         orval >=8.20.0 and ts-jest >=29.4.11 already fixed on their side
- esbuild@>=0.27.3 <0.28.1: '>=0.28.1 <0.29.0'
- # via: react-use@17.5.1 (direct, js-cookie ^2.2.1); @grafana/data > react-use@17.6.0
- # remove: bump react-use to >=17.6.1 (js-cookie ^3); @grafana/data side blocked
- js-cookie@<=3.0.5: '>=3.0.7 <4'
- # via: @orval/core@8.9.1 (devDep, js-yaml 4.1.1 EXACT pin — not deletable);
- #      json-schema-to-typescript@15 > @apidevtools/json-schema-ref-parser (^4.1.0)
- # remove: upgrade orval to >=8.20.0 (drops js-yaml dependency entirely)
- js-yaml@>=4.0.0 <=4.1.1: '>=4.2.0 <5'
- # via: react-syntax-highlighter@15.5.0 (prismjs ^1.27.0 + refractor@3 ~1.27.0 tilde-pinned)
- # remove: bump react-syntax-highlighter to >=16.1.1 (prismjs ^1.30.0, refractor@5)
- prismjs@<1.30.0: '>=1.30.0 <2'
- # via: direct dep react-router-dom-v5-compat@6.30.3 (react-router 6.30.3 exact)
- # remove: bump react-router-dom-v5-compat to 6.30.4. Do NOT open the cap:
- # react-router >=7 requires React 19 and breaks the app-wide CompatRouter
- react-router@>=6.7.0 <6.30.4: '>=6.30.4 <7'
- # via: msw@1.3.2 (devDep) > inquirer@8 > external-editor@3.1.0 (tmp ^0.0.33)
- # remove: upgrade msw to >=2 (drops the inquirer/external-editor chain)
- tmp@<0.2.6: '>=0.2.6 <0.3.0'
- # via: jest > babel-plugin-macros > cosmiconfig@7 (yaml ^1.10.0);
- #      typescript-plugin-css-modules > postcss-load-config@3 (^1.10.2)
- # remove: blocked — babel-plugin-macros 3.1.0 (latest) still uses cosmiconfig@7
- yaml@>=1.0.0 <1.10.3: '>=1.10.3 <2'
-trustPolicy: no-downgrade
-trustPolicyExclude:
- - 'semver@6.3.1 || 5.7.2'
+blockExoticSubdeps: true
--- a/frontend/src/api/generated/services/dashboard/index.ts
+++ b/frontend/src/api/generated/services/dashboard/index.ts
@@ -41,7 +41,6 @@ import type {
 	GetPublicDashboardDataV2200,
 	GetPublicDashboardDataV2PathParameters,
 	GetPublicDashboardPanelQueryRangeV2200,
-	GetPublicDashboardPanelQueryRangeV2Params,
 	GetPublicDashboardPanelQueryRangeV2PathParameters,
 	GetPublicDashboardPathParameters,
 	GetPublicDashboardWidgetQueryRange200,
@@ -1913,25 +1912,20 @@ export const invalidateGetPublicDashboardDataV2 = async (
 */
 export const getPublicDashboardPanelQueryRangeV2 = (
 	{ id, key }: GetPublicDashboardPanelQueryRangeV2PathParameters,
-	params?: GetPublicDashboardPanelQueryRangeV2Params,
 	signal?: AbortSignal,
 ) => {
 	return GeneratedAPIInstance<GetPublicDashboardPanelQueryRangeV2200>({
 		url: `/api/v2/public/dashboards/${id}/panels/${key}/query_range`,
 		method: 'GET',
-		params,
 		signal,
 	});
 };

-export const getGetPublicDashboardPanelQueryRangeV2QueryKey = (
-	{ id, key }: GetPublicDashboardPanelQueryRangeV2PathParameters,
-	params?: GetPublicDashboardPanelQueryRangeV2Params,
-) => {
-	return [
-		`/api/v2/public/dashboards/${id}/panels/${key}/query_range`,
-		...(params ? [params] : []),
-	] as const;
+export const getGetPublicDashboardPanelQueryRangeV2QueryKey = ({
+	id,
+	key,
+}: GetPublicDashboardPanelQueryRangeV2PathParameters) => {
+	return [`/api/v2/public/dashboards/${id}/panels/${key}/query_range`] as const;
 };

 export const getGetPublicDashboardPanelQueryRangeV2QueryOptions = <
@@ -1939,7 +1933,6 @@ export const getGetPublicDashboardPanelQueryRangeV2QueryOptions = <
 	TError = ErrorType<RenderErrorResponseDTO>,
 >(
 	{ id, key }: GetPublicDashboardPanelQueryRangeV2PathParameters,
-	params?: GetPublicDashboardPanelQueryRangeV2Params,
 	options?: {
 		query?: UseQueryOptions<
 			Awaited<ReturnType<typeof getPublicDashboardPanelQueryRangeV2>>,
@@ -1952,12 +1945,11 @@ export const getGetPublicDashboardPanelQueryRangeV2QueryOptions = <

 	const queryKey =
 		queryOptions?.queryKey ??
-		getGetPublicDashboardPanelQueryRangeV2QueryKey({ id, key }, params);
+		getGetPublicDashboardPanelQueryRangeV2QueryKey({ id, key });

 	const queryFn: QueryFunction<
 		Awaited<ReturnType<typeof getPublicDashboardPanelQueryRangeV2>>
-	> = ({ signal }) =>
-		getPublicDashboardPanelQueryRangeV2({ id, key }, params, signal);
+	> = ({ signal }) => getPublicDashboardPanelQueryRangeV2({ id, key }, signal);

 	return {
 		queryKey,
@@ -1986,7 +1978,6 @@ export function useGetPublicDashboardPanelQueryRangeV2<
 	TError = ErrorType<RenderErrorResponseDTO>,
 >(
 	{ id, key }: GetPublicDashboardPanelQueryRangeV2PathParameters,
-	params?: GetPublicDashboardPanelQueryRangeV2Params,
 	options?: {
 		query?: UseQueryOptions<
 			Awaited<ReturnType<typeof getPublicDashboardPanelQueryRangeV2>>,
@@ -1997,7 +1988,6 @@ export function useGetPublicDashboardPanelQueryRangeV2<
 ): UseQueryResult<TData, TError> & { queryKey: QueryKey } {
 	const queryOptions = getGetPublicDashboardPanelQueryRangeV2QueryOptions(
 		{ id, key },
-		params,
 		options,
 	);

@@ -2014,16 +2004,10 @@ export function useGetPublicDashboardPanelQueryRangeV2<
 export const invalidateGetPublicDashboardPanelQueryRangeV2 = async (
 	queryClient: QueryClient,
 	{ id, key }: GetPublicDashboardPanelQueryRangeV2PathParameters,
-	params?: GetPublicDashboardPanelQueryRangeV2Params,
 	options?: InvalidateOptions,
 ): Promise<QueryClient> => {
 	await queryClient.invalidateQueries(
-		{
-			queryKey: getGetPublicDashboardPanelQueryRangeV2QueryKey(
-				{ id, key },
-				params,
-			),
-		},
+		{ queryKey: getGetPublicDashboardPanelQueryRangeV2QueryKey({ id, key }) },
 		options,
 	);

--- a/frontend/src/api/generated/services/inframonitoring/index.ts
+++ b/frontend/src/api/generated/services/inframonitoring/index.ts
@@ -21,7 +21,6 @@ import type {
 	GetChecks200,
 	GetChecksParams,
 	InframonitoringtypesPostableClustersDTO,
-	InframonitoringtypesPostableContainersDTO,
 	InframonitoringtypesPostableDaemonSetsDTO,
 	InframonitoringtypesPostableDeploymentsDTO,
 	InframonitoringtypesPostableHostsDTO,
@@ -32,7 +31,6 @@ import type {
 	InframonitoringtypesPostableStatefulSetsDTO,
 	InframonitoringtypesPostableVolumesDTO,
 	ListClusters200,
-	ListContainers200,
 	ListDaemonSets200,
 	ListDeployments200,
 	ListHosts200,
@@ -219,7 +217,7 @@ export const useListClusters = <
 	return useMutation(getListClustersMutationOptions(options));
 };
 /**
- * Returns a paginated list of Kubernetes DaemonSets with key aggregated pod metrics: CPU usage and memory working set summed across pods owned by the daemonset, plus average CPU/memory request and limit utilization (daemonSetCPURequest, daemonSetCPULimit, daemonSetMemoryRequest, daemonSetMemoryLimit). Each row also reports the latest known node-level counters from kube-state-metrics: desiredNodes (k8s.daemonset.desired_scheduled_nodes, the number of nodes the daemonset wants to run on), currentNodes (k8s.daemonset.current_scheduled_nodes, the number of nodes the daemonset currently runs on), readyNodes (k8s.daemonset.ready_nodes, the number of nodes running at least one ready daemon pod) and misscheduledNodes (k8s.daemonset.misscheduled_nodes, the number of nodes running the daemon pod but not supposed to) — note these are node counts, not pod counts. It also reports per-group podCountsByPhase ({ pending, running, succeeded, failed, unknown } from each pod's latest k8s.pod.phase value). Each daemonset includes metadata attributes (k8s.daemonset.name, k8s.namespace.name, k8s.cluster.name). The response type is 'list' for the default k8s.daemonset.name grouping or 'grouped_list' for custom groupBy keys; in both modes every row aggregates pods owned by daemonsets in the group. Supports filtering via a filter expression, custom groupBy, ordering by cpu / cpu_request / cpu_limit / memory / memory_request / memory_limit / desired_nodes / current_nodes / ready_nodes / misscheduled_nodes, and pagination via offset/limit. Also reports whether the requested time range falls before the data retention boundary. Numeric metric fields (daemonSetCPU, daemonSetCPURequest, daemonSetCPULimit, daemonSetMemory, daemonSetMemoryRequest, daemonSetMemoryLimit, desiredNodes, currentNodes, readyNodes, misscheduledNodes) return -1 as a sentinel when no data is available for that field.
+ * Returns a paginated list of Kubernetes DaemonSets with key aggregated pod metrics: CPU usage and memory working set summed across pods owned by the daemonset, plus average CPU/memory request and limit utilization (daemonSetCPURequest, daemonSetCPULimit, daemonSetMemoryRequest, daemonSetMemoryLimit). Each row also reports the latest known node-level counters from kube-state-metrics: desiredNodes (k8s.daemonset.desired_scheduled_nodes, the number of nodes the daemonset wants to run on) and currentNodes (k8s.daemonset.current_scheduled_nodes, the number of nodes the daemonset currently runs on) — note these are node counts, not pod counts. It also reports per-group podCountsByPhase ({ pending, running, succeeded, failed, unknown } from each pod's latest k8s.pod.phase value). Each daemonset includes metadata attributes (k8s.daemonset.name, k8s.namespace.name, k8s.cluster.name). The response type is 'list' for the default k8s.daemonset.name grouping or 'grouped_list' for custom groupBy keys; in both modes every row aggregates pods owned by daemonsets in the group. Supports filtering via a filter expression, custom groupBy, ordering by cpu / cpu_request / cpu_limit / memory / memory_request / memory_limit / desired_nodes / current_nodes, and pagination via offset/limit. Also reports whether the requested time range falls before the data retention boundary. Numeric metric fields (daemonSetCPU, daemonSetCPURequest, daemonSetCPULimit, daemonSetMemory, daemonSetMemoryRequest, daemonSetMemoryLimit, desiredNodes, currentNodes) return -1 as a sentinel when no data is available for that field.
 * @summary List DaemonSets for Infra Monitoring
 */
 export const listDaemonSets = (
@@ -550,89 +548,6 @@ export const useListJobs = <
 > => {
 	return useMutation(getListJobsMutationOptions(options));
 };
-/**
- * Returns a paginated list of Kubernetes containers with key kubeletstats metrics: CPU usage (cores), CPU request/limit utilization, memory working set, and memory request/limit utilization. Each container also reports health signals from the k8s_cluster receiver: status (kubectl-style display status derived from k8s.container.status.state + k8s.container.status.reason), restarts (absolute count from k8s.container.restarts), and ready (ready/not_ready from k8s.container.ready). The row identity is (k8s.pod.uid, k8s.container.name), stable across container restarts. Each container includes metadata attributes (k8s.container.name, k8s.pod.name, container.image.name, container.image.tag, k8s.namespace.name, k8s.node.name, k8s.cluster.name, and workload owner such as deployment/statefulset/daemonset/job). The response type is 'list' for the default (k8s.pod.uid, k8s.container.name) grouping (each row is one container with its current status and ready state) or 'grouped_list' for custom groupBy keys (each row aggregates containers in the group with per-status counts under containerCountsByStatus, per-readiness counts under containerCountsByReady, and restarts as the group sum). Status requires the optional k8s.container.status.state and k8s.container.status.reason metrics; when either is missing, status is omitted and a warning is returned while restarts and ready are still computed. Supports filtering via a filter expression, custom groupBy, ordering by any of the six metrics (cpu, cpu_request, cpu_limit, memory, memory_request, memory_limit), and pagination via offset/limit. Also reports whether the requested time range falls before the data retention boundary. Numeric metric fields (cpu, cpuRequestUtilization, cpuLimitUtilization, memory, memoryRequestUtilization, memoryLimitUtilization) and restarts return -1 as a sentinel when no data is available for that field.
- * @summary List Kubernetes Containers for Infra Monitoring
- */
-export const listContainers = (
-	inframonitoringtypesPostableContainersDTO?: BodyType<InframonitoringtypesPostableContainersDTO>,
-	signal?: AbortSignal,
-) => {
-	return GeneratedAPIInstance<ListContainers200>({
-		url: `/api/v2/infra_monitoring/kube_containers`,
-		method: 'POST',
-		headers: { 'Content-Type': 'application/json' },
-		data: inframonitoringtypesPostableContainersDTO,
-		signal,
-	});
-};
-
-export const getListContainersMutationOptions = <
-	TError = ErrorType<RenderErrorResponseDTO>,
-	TContext = unknown,
->(options?: {
-	mutation?: UseMutationOptions<
-		Awaited<ReturnType<typeof listContainers>>,
-		TError,
-		{ data?: BodyType<InframonitoringtypesPostableContainersDTO> },
-		TContext
-	>;
-}): UseMutationOptions<
-	Awaited<ReturnType<typeof listContainers>>,
-	TError,
-	{ data?: BodyType<InframonitoringtypesPostableContainersDTO> },
-	TContext
-> => {
-	const mutationKey = ['listContainers'];
-	const { mutation: mutationOptions } = options
-		? options.mutation &&
-			'mutationKey' in options.mutation &&
-			options.mutation.mutationKey
-			? options
-			: { ...options, mutation: { ...options.mutation, mutationKey } }
-		: { mutation: { mutationKey } };
-
-	const mutationFn: MutationFunction<
-		Awaited<ReturnType<typeof listContainers>>,
-		{ data?: BodyType<InframonitoringtypesPostableContainersDTO> }
-	> = (props) => {
-		const { data } = props ?? {};
-
-		return listContainers(data);
-	};
-
-	return { mutationFn, ...mutationOptions };
-};
-
-export type ListContainersMutationResult = NonNullable<
-	Awaited<ReturnType<typeof listContainers>>
->;
-export type ListContainersMutationBody =
-	| BodyType<InframonitoringtypesPostableContainersDTO>
-	| undefined;
-export type ListContainersMutationError = ErrorType<RenderErrorResponseDTO>;
-
-/**
- * @summary List Kubernetes Containers for Infra Monitoring
- */
-export const useListContainers = <
-	TError = ErrorType<RenderErrorResponseDTO>,
-	TContext = unknown,
->(options?: {
-	mutation?: UseMutationOptions<
-		Awaited<ReturnType<typeof listContainers>>,
-		TError,
-		{ data?: BodyType<InframonitoringtypesPostableContainersDTO> },
-		TContext
-	>;
-}): UseMutationResult<
-	Awaited<ReturnType<typeof listContainers>>,
-	TError,
-	{ data?: BodyType<InframonitoringtypesPostableContainersDTO> },
-	TContext
-> => {
-	return useMutation(getListContainersMutationOptions(options));
-};
 /**
 * Returns a paginated list of Kubernetes namespaces with key aggregated pod metrics: CPU usage and memory working set (summed across pods in the group), plus per-group podCountsByPhase ({ pending, running, succeeded, failed, unknown } from each pod's latest k8s.pod.phase value in the window). Each namespace includes metadata attributes (k8s.namespace.name, k8s.cluster.name). The response type is 'list' for the default k8s.namespace.name grouping or 'grouped_list' for custom groupBy keys; in both modes every row aggregates pods in the group. Supports filtering via a filter expression, custom groupBy, ordering by cpu / memory, and pagination via offset/limit. Also reports whether the requested time range falls before the data retention boundary. Numeric metric fields (namespaceCPU, namespaceMemory) return -1 as a sentinel when no data is available for that field.
 * @summary List Namespaces for Infra Monitoring
--- a/frontend/src/api/generated/services/sigNoz.schemas.ts
+++ b/frontend/src/api/generated/services/sigNoz.schemas.ts
@@ -2082,39 +2082,6 @@ export interface AuthtypesGettableAuthDomainDTO {
 	updatedAt?: string;
 }

-export interface AuthtypesGettableRoleDTO {
-	/**
-	 * @type string
-	 * @format date-time
-	 */
-	createdAt?: string;
-	/**
-	 * @type string
-	 */
-	description: string;
-	/**
-	 * @type string
-	 */
-	id: string;
-	/**
-	 * @type string
-	 */
-	name: string;
-	/**
-	 * @type string
-	 */
-	orgId: string;
-	/**
-	 * @type string
-	 */
-	type: string;
-	/**
-	 * @type string
-	 * @format date-time
-	 */
-	updatedAt?: string;
-}
-
 export interface AuthtypesGettableTokenDTO {
 	/**
 	 * @type string
@@ -2358,6 +2325,39 @@ export interface AuthtypesPostableUserRoleDTO {
 }

 export interface AuthtypesRoleDTO {
+	/**
+	 * @type string
+	 * @format date-time
+	 */
+	createdAt?: string;
+	/**
+	 * @type string
+	 */
+	description: string;
+	/**
+	 * @type string
+	 */
+	id: string;
+	/**
+	 * @type string
+	 */
+	name: string;
+	/**
+	 * @type string
+	 */
+	orgId: string;
+	/**
+	 * @type string
+	 */
+	type: string;
+	/**
+	 * @type string
+	 * @format date-time
+	 */
+	updatedAt?: string;
+}
+
+export interface AuthtypesRoleWithTransactionGroupsDTO {
 	/**
 	 * @type string
 	 * @format date-time
@@ -2813,7 +2813,7 @@ export enum CloudintegrationtypesServiceIDDTO {
 	cosmosdb = 'cosmosdb',
 	cassandradb = 'cassandradb',
 	redis = 'redis',
-	cloudsql_postgres = 'cloudsql_postgres',
+	cloudsql = 'cloudsql',
 }
 export type CloudintegrationtypesCloudIntegrationServiceDTOAnyOf = {
 	/**
@@ -3631,6 +3631,7 @@ export enum Querybuildertypesv5QueryBuilderQueryGithubComSigNozSignozPkgTypesQue
 }
 export enum TelemetrytypesSourceDTO {
 	meter = 'meter',
+	ai = 'ai',
 }
 export interface Querybuildertypesv5QueryBuilderQueryGithubComSigNozSignozPkgTypesQuerybuildertypesQuerybuildertypesv5LogAggregationDTO {
 	/**
@@ -5005,10 +5006,6 @@ export interface DashboardtypesListedDashboardForUserV2DTO {
 	 * @type string
 	 */
 	image?: string;
-	/**
-	 * @type boolean
-	 */
-	legacy: boolean;
 	/**
 	 * @type boolean
 	 */
@@ -5084,10 +5081,6 @@ export interface DashboardtypesListedDashboardV2DTO {
 	 * @type string
 	 */
 	image?: string;
-	/**
-	 * @type boolean
-	 */
-	legacy: boolean;
 	/**
 	 * @type boolean
 	 */
@@ -5585,7 +5578,6 @@ export enum InframonitoringtypesCheckTypeDTO {
 	namespaces = 'namespaces',
 	clusters = 'clusters',
 	volumes = 'volumes',
-	kube_containers = 'kube_containers',
 }
 export interface InframonitoringtypesMissingMetricsComponentEntryDTO {
 	associatedComponent: InframonitoringtypesAssociatedComponentDTO;
@@ -5669,39 +5661,6 @@ export interface InframonitoringtypesChecksDTO {
 	type: InframonitoringtypesCheckTypeDTO;
 }

-export type InframonitoringtypesClusterRecordDTOCounts = {
-	/**
-	 * @type integer
-	 * @format int64
-	 */
-	daemonSets: number;
-	/**
-	 * @type integer
-	 * @format int64
-	 */
-	deployments: number;
-	/**
-	 * @type integer
-	 * @format int64
-	 */
-	jobs: number;
-	/**
-	 * @type integer
-	 * @format int64
-	 */
-	namespaces: number;
-	/**
-	 * @type integer
-	 * @format int64
-	 */
-	nodes: number;
-	/**
-	 * @type integer
-	 * @format int64
-	 */
-	statefulSets: number;
-};
-
 export type InframonitoringtypesClusterRecordDTOMetaAnyOf = {
 	[key: string]: string;
 };
@@ -5846,10 +5805,6 @@ export interface InframonitoringtypesClusterRecordDTO {
 	 * @type string
 	 */
 	clusterName: string;
-	/**
-	 * @type object
-	 */
-	counts: InframonitoringtypesClusterRecordDTOCounts;
 	/**
 	 * @type object,null
 	 */
@@ -5902,174 +5857,6 @@ export interface InframonitoringtypesClustersDTO {
 	warning?: Querybuildertypesv5QueryWarnDataDTO;
 }

-export interface InframonitoringtypesContainerCountsByReadyDTO {
-	/**
-	 * @type integer
-	 */
-	notReady: number;
-	/**
-	 * @type integer
-	 */
-	ready: number;
-}
-
-export interface InframonitoringtypesContainerCountsByStatusDTO {
-	/**
-	 * @type integer
-	 */
-	completed: number;
-	/**
-	 * @type integer
-	 */
-	containerCannotRun: number;
-	/**
-	 * @type integer
-	 */
-	containerCreating: number;
-	/**
-	 * @type integer
-	 */
-	crashLoopBackOff: number;
-	/**
-	 * @type integer
-	 */
-	createContainerConfigError: number;
-	/**
-	 * @type integer
-	 */
-	errImagePull: number;
-	/**
-	 * @type integer
-	 */
-	error: number;
-	/**
-	 * @type integer
-	 */
-	imagePullBackOff: number;
-	/**
-	 * @type integer
-	 */
-	oomKilled: number;
-	/**
-	 * @type integer
-	 */
-	running: number;
-	/**
-	 * @type integer
-	 */
-	terminated: number;
-	/**
-	 * @type integer
-	 */
-	unknown: number;
-	/**
-	 * @type integer
-	 */
-	waiting: number;
-}
-
-export enum InframonitoringtypesContainerReadyDTO {
-	ready = 'ready',
-	not_ready = 'not_ready',
-	no_data = 'no_data',
-}
-export type InframonitoringtypesContainerRecordDTOMetaAnyOf = {
-	[key: string]: string;
-};
-
-/**
- * @nullable
- */
-export type InframonitoringtypesContainerRecordDTOMeta =
-	InframonitoringtypesContainerRecordDTOMetaAnyOf | null;
-
-export enum InframonitoringtypesContainerStatusDTO {
-	running = 'running',
-	waiting = 'waiting',
-	terminated = 'terminated',
-	crashloopbackoff = 'crashloopbackoff',
-	imagepullbackoff = 'imagepullbackoff',
-	errimagepull = 'errimagepull',
-	createcontainerconfigerror = 'createcontainerconfigerror',
-	containercreating = 'containercreating',
-	oomkilled = 'oomkilled',
-	completed = 'completed',
-	error = 'error',
-	containercannotrun = 'containercannotrun',
-	unknown = 'unknown',
-	no_data = 'no_data',
-}
-export interface InframonitoringtypesContainerRecordDTO {
-	containerCountsByReady: InframonitoringtypesContainerCountsByReadyDTO;
-	containerCountsByStatus: InframonitoringtypesContainerCountsByStatusDTO;
-	/**
-	 * @type string
-	 */
-	containerName: string;
-	/**
-	 * @type number
-	 * @format double
-	 */
-	cpu: number;
-	/**
-	 * @type number
-	 * @format double
-	 */
-	cpuLimitUtilization: number;
-	/**
-	 * @type number
-	 * @format double
-	 */
-	cpuRequestUtilization: number;
-	/**
-	 * @type number
-	 * @format double
-	 */
-	memory: number;
-	/**
-	 * @type number
-	 * @format double
-	 */
-	memoryLimitUtilization: number;
-	/**
-	 * @type number
-	 * @format double
-	 */
-	memoryRequestUtilization: number;
-	/**
-	 * @type object,null
-	 */
-	meta: InframonitoringtypesContainerRecordDTOMeta;
-	/**
-	 * @type string
-	 */
-	podUID: string;
-	ready: InframonitoringtypesContainerReadyDTO;
-	/**
-	 * @type integer
-	 * @format int64
-	 */
-	restarts: number;
-	status: InframonitoringtypesContainerStatusDTO;
-}
-
-export interface InframonitoringtypesContainersDTO {
-	/**
-	 * @type boolean
-	 */
-	endTimeBeforeRetention: boolean;
-	/**
-	 * @type array
-	 */
-	records: InframonitoringtypesContainerRecordDTO[];
-	/**
-	 * @type integer
-	 */
-	total: number;
-	type: InframonitoringtypesResponseTypeDTO;
-	warning?: Querybuildertypesv5QueryWarnDataDTO;
-}
-
 export type InframonitoringtypesDaemonSetRecordDTOMetaAnyOf = {
 	[key: string]: string;
 };
@@ -6127,16 +5914,8 @@ export interface InframonitoringtypesDaemonSetRecordDTO {
 	 * @type object,null
 	 */
 	meta: InframonitoringtypesDaemonSetRecordDTOMeta;
-	/**
-	 * @type integer
-	 */
-	misscheduledNodes: number;
 	podCountsByPhase: InframonitoringtypesPodCountsByPhaseDTO;
 	podCountsByStatus: InframonitoringtypesPodCountsByStatusDTO;
-	/**
-	 * @type integer
-	 */
-	readyNodes: number;
 }

 export interface InframonitoringtypesDaemonSetsDTO {
@@ -6405,29 +6184,6 @@ export interface InframonitoringtypesJobsDTO {
 	warning?: Querybuildertypesv5QueryWarnDataDTO;
 }

-export type InframonitoringtypesNamespaceRecordDTOCounts = {
-	/**
-	 * @type integer
-	 * @format int64
-	 */
-	daemonSets: number;
-	/**
-	 * @type integer
-	 * @format int64
-	 */
-	deployments: number;
-	/**
-	 * @type integer
-	 * @format int64
-	 */
-	jobs: number;
-	/**
-	 * @type integer
-	 * @format int64
-	 */
-	statefulSets: number;
-};
-
 export type InframonitoringtypesNamespaceRecordDTOMetaAnyOf = {
 	[key: string]: string;
 };
@@ -6439,10 +6195,6 @@ export type InframonitoringtypesNamespaceRecordDTOMeta =
 	InframonitoringtypesNamespaceRecordDTOMetaAnyOf | null;

 export interface InframonitoringtypesNamespaceRecordDTO {
-	/**
-	 * @type object
-	 */
-	counts: InframonitoringtypesNamespaceRecordDTOCounts;
 	/**
 	 * @type object,null
 	 */
@@ -6687,33 +6439,6 @@ export interface InframonitoringtypesPostableClustersDTO {
 	start: number;
 }

-export interface InframonitoringtypesPostableContainersDTO {
-	/**
-	 * @type integer
-	 * @format int64
-	 */
-	end: number;
-	filter?: Querybuildertypesv5FilterDTO;
-	/**
-	 * @type array,null
-	 */
-	groupBy?: Querybuildertypesv5GroupByKeyDTO[] | null;
-	/**
-	 * @type integer
-	 */
-	limit: number;
-	/**
-	 * @type integer
-	 */
-	offset?: number;
-	orderBy?: Querybuildertypesv5OrderByDTO;
-	/**
-	 * @type integer
-	 * @format int64
-	 */
-	start: number;
-}
-
 export interface InframonitoringtypesPostableDaemonSetsDTO {
 	/**
 	 * @type integer
@@ -8560,12 +8285,10 @@ export interface RuletypesBasicRuleThresholdDTO {
 	op: RuletypesCompareOperatorDTO;
 	/**
 	 * @type number,null
-	 * @format double
 	 */
 	recoveryTarget?: number | null;
 	/**
 	 * @type number,null
-	 * @format double
 	 */
 	target: number | null;
 	/**
@@ -8759,7 +8482,6 @@ export interface RuletypesRuleConditionDTO {
 	selectedQueryName?: string;
 	/**
 	 * @type number,null
-	 * @format double
 	 */
 	target?: number | null;
 	/**
@@ -9258,76 +8980,6 @@ export interface SpantypesGettableSpanMapperGroupsDTO {
 	items: SpantypesSpanMapperGroupDTO[];
 }

-export enum SpantypesSpanMapperOperationDTO {
-	move = 'move',
-	copy = 'copy',
-}
-export interface SpantypesSpanMapperSourceDTO {
-	context: SpantypesFieldContextDTO;
-	/**
-	 * @type string
-	 */
-	key: string;
-	operation: SpantypesSpanMapperOperationDTO;
-	/**
-	 * @type integer
-	 */
-	priority: number;
-}
-
-export interface SpantypesSpanMapperConfigDTO {
-	/**
-	 * @type array,null
-	 */
-	sources: SpantypesSpanMapperSourceDTO[] | null;
-}
-
-export interface SpantypesSpanMapperDTO {
-	config: SpantypesSpanMapperConfigDTO;
-	/**
-	 * @type string
-	 * @format date-time
-	 */
-	createdAt?: string;
-	/**
-	 * @type string
-	 */
-	createdBy?: string;
-	/**
-	 * @type boolean
-	 */
-	enabled: boolean;
-	fieldContext: SpantypesFieldContextDTO;
-	/**
-	 * @type string
-	 */
-	groupId: string;
-	/**
-	 * @type string
-	 */
-	id: string;
-	/**
-	 * @type string
-	 */
-	name: string;
-	/**
-	 * @type string
-	 * @format date-time
-	 */
-	updatedAt?: string;
-	/**
-	 * @type string
-	 */
-	updatedBy?: string;
-}
-
-export interface SpantypesGettableSpanMappersDTO {
-	/**
-	 * @type array
-	 */
-	items: SpantypesSpanMapperDTO[];
-}
-
 export enum SpantypesSpanAggregationTypeDTO {
 	span_count = 'span_count',
 	execution_time_percentage = 'execution_time_percentage',
@@ -9574,6 +9226,30 @@ export interface SpantypesPostableFlamegraphDTO {
 	selectedSpanId?: string;
 }

+export enum SpantypesSpanMapperOperationDTO {
+	move = 'move',
+	copy = 'copy',
+}
+export interface SpantypesSpanMapperSourceDTO {
+	context: SpantypesFieldContextDTO;
+	/**
+	 * @type string
+	 */
+	key: string;
+	operation: SpantypesSpanMapperOperationDTO;
+	/**
+	 * @type integer
+	 */
+	priority: number;
+}
+
+export interface SpantypesSpanMapperConfigDTO {
+	/**
+	 * @type array,null
+	 */
+	sources: SpantypesSpanMapperSourceDTO[] | null;
+}
+
 export interface SpantypesPostableSpanMapperDTO {
 	config: SpantypesSpanMapperConfigDTO;
 	/**
@@ -9622,6 +9298,45 @@ export interface SpantypesPostableWaterfallDTO {
 	uncollapsedSpans?: string[] | null;
 }

+export interface SpantypesSpanMapperDTO {
+	config: SpantypesSpanMapperConfigDTO;
+	/**
+	 * @type string
+	 * @format date-time
+	 */
+	createdAt?: string;
+	/**
+	 * @type string
+	 */
+	createdBy?: string;
+	/**
+	 * @type boolean
+	 */
+	enabled: boolean;
+	fieldContext: SpantypesFieldContextDTO;
+	/**
+	 * @type string
+	 */
+	group_id: string;
+	/**
+	 * @type string
+	 */
+	id: string;
+	/**
+	 * @type string
+	 */
+	name: string;
+	/**
+	 * @type string
+	 * @format date-time
+	 */
+	updatedAt?: string;
+	/**
+	 * @type string
+	 */
+	updatedBy?: string;
+}
+
 export interface SpantypesUpdatableSpanMapperDTO {
 	config?: SpantypesSpanMapperConfigDTO;
 	/**
@@ -10685,7 +10400,7 @@ export type ListRoles200 = {
 	/**
 	 * @type array
 	 */
-	data: AuthtypesGettableRoleDTO[];
+	data: AuthtypesRoleDTO[];
 	/**
 	 * @type string
 	 */
@@ -10707,7 +10422,7 @@ export type GetRolePathParameters = {
 	id: string;
 };
 export type GetRole200 = {
-	data: AuthtypesRoleDTO;
+	data: AuthtypesRoleWithTransactionGroupsDTO;
 	/**
 	 * @type string
 	 */
@@ -10923,7 +10638,7 @@ export type ListSpanMappersPathParameters = {
 	groupId: string;
 };
 export type ListSpanMappers200 = {
-	data: SpantypesGettableSpanMappersDTO;
+	data: SpantypesGettableSpanMapperGroupsDTO;
 	/**
 	 * @type string
 	 */
@@ -11327,14 +11042,6 @@ export type ListJobs200 = {
 	status: string;
 };

-export type ListContainers200 = {
-	data: InframonitoringtypesContainersDTO;
-	/**
-	 * @type string
-	 */
-	status: string;
-};
-
 export type ListNamespaces200 = {
 	data: InframonitoringtypesNamespacesDTO;
 	/**
@@ -11660,19 +11367,6 @@ export type GetPublicDashboardPanelQueryRangeV2PathParameters = {
 	id: string;
 	key: string;
 };
-export type GetPublicDashboardPanelQueryRangeV2Params = {
-	/**
-	 * @type string
-	 * @description undefined
-	 */
-	startTime?: string;
-	/**
-	 * @type string
-	 * @description undefined
-	 */
-	endTime?: string;
-};
-
 export type GetPublicDashboardPanelQueryRangeV2200 = {
 	data: Querybuildertypesv5QueryRangeResponseDTO;
 	/**
--- a/frontend/src/api/querySuggestions/getKeySuggestions.ts
+++ b/frontend/src/api/querySuggestions/getKeySuggestions.ts
@@ -22,7 +22,6 @@ export const getKeySuggestions = (
 		fieldContext = '',
 		fieldDataType = '',
 		signalSource = '',
-		metricNamespace = '',
 	} = props;

 	const encodedSignal = encodeURIComponent(signal);
@@ -31,9 +30,8 @@ export const getKeySuggestions = (
 	const encodedFieldContext = encodeURIComponent(fieldContext);
 	const encodedFieldDataType = encodeURIComponent(fieldDataType);
 	const encodedSource = encodeURIComponent(signalSource);
-	const encodedMetricNamespace = encodeURIComponent(metricNamespace);

 	return axios.get(
-		`/fields/keys?signal=${encodedSignal}&searchText=${encodedSearchText}&metricName=${encodedMetricName}&fieldContext=${encodedFieldContext}&fieldDataType=${encodedFieldDataType}&source=${encodedSource}&metricNamespace=${encodedMetricNamespace}`,
+		`/fields/keys?signal=${encodedSignal}&searchText=${encodedSearchText}&metricName=${encodedMetricName}&fieldContext=${encodedFieldContext}&fieldDataType=${encodedFieldDataType}&source=${encodedSource}`,
 	);
 };
--- a/frontend/src/auto-import-registry.d.ts
+++ b/frontend/src/auto-import-registry.d.ts
@@ -12,4 +12,5 @@

 import '@signozhq/design-tokens';
 import '@signozhq/icons';
+import '@signozhq/resizable';
 import '@signozhq/ui';
--- a/frontend/src/components/CreateServiceAccountModal/CreateServiceAccountModal.tsx
+++ b/frontend/src/components/CreateServiceAccountModal/CreateServiceAccountModal.tsx
@@ -2,7 +2,7 @@ import { Controller, useForm } from 'react-hook-form';
 import { useQueryClient } from 'react-query';
 import { X } from '@signozhq/icons';
 import { Button } from '@signozhq/ui/button';
-import AuthZButton from 'lib/authz/components/AuthZButton/AuthZButton';
+import AuthZTooltip from 'lib/authz/components/AuthZTooltip/AuthZTooltip';
 import { SACreatePermission } from 'lib/authz/hooks/useAuthZ/permissions/service-account.permissions';
 import { DialogFooter, DialogWrapper } from '@signozhq/ui/dialog';
 import { Input } from '@signozhq/ui/input';
@@ -92,7 +92,6 @@ function CreateServiceAccountModal(): JSX.Element {
 			width="narrow"
 			className="create-sa-modal"
 			disableOutsideClick={isErrorModalVisible}
-			testId="create-service-account-modal"
 		>
 			<div className="create-sa-modal__content">
 				<form
@@ -135,17 +134,18 @@ function CreateServiceAccountModal(): JSX.Element {
 					Cancel
 				</Button>

-				<AuthZButton
-					checks={[SACreatePermission]}
-					type="submit"
-					form="create-sa-form"
-					variant="solid"
-					color="primary"
-					loading={isSubmitting}
-					disabled={!isValid}
-				>
-					Create Service Account
-				</AuthZButton>
+				<AuthZTooltip checks={[SACreatePermission]}>
+					<Button
+						type="submit"
+						form="create-sa-form"
+						variant="solid"
+						color="primary"
+						loading={isSubmitting}
+						disabled={!isValid}
+					>
+						Create Service Account
+					</Button>
+				</AuthZTooltip>
 			</DialogFooter>
 		</DialogWrapper>
 	);
--- a/frontend/src/components/CreateServiceAccountModal/tests/CreateServiceAccountModal.test.tsx
+++ b/frontend/src/components/CreateServiceAccountModal/tests/CreateServiceAccountModal.test.tsx
@@ -1,7 +1,13 @@
 import { toast } from '@signozhq/ui/sonner';
 import { rest, server } from 'mocks-server/server';
 import { NuqsTestingAdapter } from 'nuqs/adapters/testing';
-import { render, screen, userEvent, waitFor } from 'tests/test-utils';
+import {
+	render,
+	screen,
+	userEvent,
+	waitFor,
+	waitForElementToBeRemoved,
+} from 'tests/test-utils';

 import CreateServiceAccountModal from '../CreateServiceAccountModal';

@@ -83,7 +89,7 @@ describe('CreateServiceAccountModal', () => {

 		await waitFor(() => {
 			expect(
-				screen.queryByTestId('create-service-account-modal'),
+				screen.queryByRole('dialog', { name: /New Service Account/i }),
 			).not.toBeInTheDocument();
 		});
 	});
@@ -123,7 +129,7 @@ describe('CreateServiceAccountModal', () => {
 		});

 		expect(
-			screen.getByTestId('create-service-account-modal'),
+			screen.getByRole('dialog', { name: /New Service Account/i }),
 		).toBeInTheDocument();
 	});

@@ -131,14 +137,15 @@ describe('CreateServiceAccountModal', () => {
 		const user = userEvent.setup({ pointerEventsCheck: 0 });
 		renderModal();

-		await screen.findByTestId('create-service-account-modal');
+		const dialog = await screen.findByRole('dialog', {
+			name: /New Service Account/i,
+		});
 		await user.click(screen.getByRole('button', { name: /Cancel/i }));

-		await waitFor(() => {
-			expect(
-				screen.queryByTestId('create-service-account-modal'),
-			).not.toBeInTheDocument();
-		});
+		await waitForElementToBeRemoved(dialog);
+		expect(
+			screen.queryByRole('dialog', { name: /New Service Account/i }),
+		).not.toBeInTheDocument();
 	});

 	it('shows "Name is required" after clearing the name field', async () => {
--- a/frontend/src/components/DownloadOptionsMenu/DownloadOptionsMenu.tsx
+++ b/frontend/src/components/DownloadOptionsMenu/DownloadOptionsMenu.tsx
@@ -3,8 +3,7 @@ import { Button, Popover, Tooltip } from 'antd';
 import { RadioGroup, RadioGroupItem } from '@signozhq/ui/radio-group';
 import { Typography } from '@signozhq/ui/typography';
 import { TelemetryFieldKey } from 'api/v5/v5';
-import { PANEL_TYPES } from 'constants/queryBuilder';
-import { useExportRawData } from 'hooks/useExportData/useServerExport';
+import { useExportRawData } from 'hooks/useDownloadOptionsMenu/useDownloadOptionsMenu';
 import { Download, LoaderCircle } from '@signozhq/icons';
 import { DataSource } from 'types/common/queryBuilder';

@@ -19,13 +18,11 @@ import './DownloadOptionsMenu.styles.scss';
 interface DownloadOptionsMenuProps {
 	dataSource: DataSource;
 	selectedColumns?: TelemetryFieldKey[];
-	panelType?: PANEL_TYPES;
 }

 export default function DownloadOptionsMenu({
 	dataSource,
 	selectedColumns,
-	panelType,
 }: DownloadOptionsMenuProps): JSX.Element {
 	const [exportFormat, setExportFormat] = useState<string>(DownloadFormats.CSV);
 	const [rowLimit, setRowLimit] = useState<number>(DownloadRowCounts.TEN_K);
@@ -36,7 +33,6 @@ export default function DownloadOptionsMenu({

 	const { isDownloading, handleExportRawData } = useExportRawData({
 		dataSource,
-		panelType,
 	});

 	const handleExport = useCallback(async (): Promise<void> => {
--- a/frontend/src/components/ExportMenu/ExportMenu.styles.scss
+++ b/frontend/src/components/ExportMenu/ExportMenu.styles.scss
@@ -1,33 +0,0 @@
-.export-menu-popover {
-	width: 240px;
-	padding: 0 12px 12px 12px;
-
-	.title {
-		display: flex;
-		color: var(--l1-foreground);
-		font-family: Inter;
-		font-size: var(--periscope-font-size-small);
-		font-style: normal;
-		font-weight: 500;
-		line-height: 18px;
-		letter-spacing: 0.88px;
-		text-transform: uppercase;
-		margin-bottom: 8px;
-	}
-
-	.export-format {
-		padding: 12px 4px;
-		display: flex;
-		flex-direction: column;
-
-		// radio option labels — radix popover content inherits the root font
-		// size; pin to the app's 13px base the antd popover used to impose
-		label {
-			font-size: var(--periscope-font-size-base);
-		}
-	}
-
-	.export-button {
-		width: 100%;
-	}
-}
--- a/frontend/src/components/ExportMenu/ExportMenu.tsx
+++ b/frontend/src/components/ExportMenu/ExportMenu.tsx
@@ -1,92 +0,0 @@
-import { Download } from '@signozhq/icons';
-import { Button } from '@signozhq/ui/button';
-import { Popover, PopoverContent, PopoverTrigger } from '@signozhq/ui/popover';
-import { RadioGroup, RadioGroupItem } from '@signozhq/ui/radio-group';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
-import { Typography } from '@signozhq/ui/typography';
-import {
-	ClientExportData,
-	useClientExport,
-} from 'hooks/useExportData/useClientExport';
-import { ExportFormat } from 'lib/exportData/types';
-import { useCallback, useState } from 'react';
-import { Query } from 'types/api/queryBuilder/queryBuilderData';
-import { DataSource } from 'types/common/queryBuilder';
-
-import './ExportMenu.styles.scss';
-
-interface ExportMenuProps {
-	dataSource: DataSource;
-	// The queryRange response object the view holds — the hook picks the
-	// serializer (timeseries / table) from what it carries.
-	data: ClientExportData;
-	query?: Query;
-	yAxisUnit?: string;
-	fileName?: string;
-}
-
-// Download menu for in-memory query results (client-side serialization).
-// The raw/list backend export keeps its own menu in DownloadOptionsMenu.
-export default function ExportMenu({
-	dataSource,
-	data,
-	query,
-	yAxisUnit,
-	fileName,
-}: ExportMenuProps): JSX.Element {
-	const [exportFormat, setExportFormat] = useState<string>(ExportFormat.Csv);
-	const [isPopoverOpen, setIsPopoverOpen] = useState<boolean>(false);
-
-	const { isExporting, handleExport: handleClientExport } = useClientExport({
-		data,
-		query,
-		yAxisUnit,
-		fileName,
-	});
-
-	const handleExport = useCallback((): void => {
-		setIsPopoverOpen(false);
-		handleClientExport({ format: exportFormat as ExportFormat });
-	}, [exportFormat, handleClientExport]);
-
-	return (
-		<Popover open={isPopoverOpen} onOpenChange={setIsPopoverOpen}>
-			<TooltipSimple title="Download">
-				<PopoverTrigger asChild>
-					<Button
-						variant="ghost"
-						color="secondary"
-						size="icon"
-						aria-label="Download"
-						data-testid={`export-menu-${dataSource}`}
-						disabled={isExporting}
-						loading={isExporting}
-					>
-						<Download size={14} />
-					</Button>
-				</PopoverTrigger>
-			</TooltipSimple>
-			<PopoverContent align="end" className="export-menu-popover">
-				<div className="export-format">
-					<Typography.Text className="title">FORMAT</Typography.Text>
-					<RadioGroup value={exportFormat} onChange={setExportFormat}>
-						<RadioGroupItem value={ExportFormat.Csv}>csv</RadioGroupItem>
-						<RadioGroupItem value={ExportFormat.Jsonl}>jsonl</RadioGroupItem>
-					</RadioGroup>
-				</div>
-
-				<Button
-					variant="solid"
-					color="primary"
-					className="export-button"
-					onClick={handleExport}
-					disabled={isExporting}
-					loading={isExporting}
-					prefix={<Download size={16} />}
-				>
-					Export
-				</Button>
-			</PopoverContent>
-		</Popover>
-	);
-}
--- a/frontend/src/components/ExportMenu/tests/ExportMenu.test.tsx
+++ b/frontend/src/components/ExportMenu/tests/ExportMenu.test.tsx
@@ -1,85 +0,0 @@
-import { MetricQueryRangeSuccessResponse } from 'types/api/metrics/getQueryRange';
-import { fireEvent, render, screen } from 'tests/test-utils';
-import { DataSource } from 'types/common/queryBuilder';
-
-import ExportMenu from '../ExportMenu';
-
-const mockHandleExport = jest.fn();
-let mockIsExporting = false;
-
-jest.mock('hooks/useExportData/useClientExport', () => ({
-	useClientExport: (): unknown => ({
-		isExporting: mockIsExporting,
-		handleExport: mockHandleExport,
-	}),
-}));
-
-const data = {
-	statusCode: 200,
-	error: null,
-	message: '',
-	payload: { data: { result: [], resultType: 'time_series' } },
-} as unknown as MetricQueryRangeSuccessResponse;
-
-const TEST_ID = `export-menu-${DataSource.LOGS}`;
-
-function renderMenu(): void {
-	render(
-		<ExportMenu
-			dataSource={DataSource.LOGS}
-			data={data}
-			fileName="logs-timeseries"
-		/>,
-	);
-}
-
-describe('ExportMenu', () => {
-	beforeEach(() => {
-		mockHandleExport.mockReset();
-		mockIsExporting = false;
-	});
-
-	it('renders the download trigger button', () => {
-		renderMenu();
-		expect(screen.getByTestId(TEST_ID)).toBeInTheDocument();
-	});
-
-	it('shows only format options — no shape, row-count, or column controls', () => {
-		renderMenu();
-		fireEvent.click(screen.getByTestId(TEST_ID));
-
-		expect(screen.getByText('FORMAT')).toBeInTheDocument();
-		expect(screen.getByRole('radio', { name: 'csv' })).toBeInTheDocument();
-		expect(screen.getByRole('radio', { name: 'jsonl' })).toBeInTheDocument();
-
-		expect(screen.queryByText('Number of Rows')).not.toBeInTheDocument();
-		expect(screen.queryByText('Columns')).not.toBeInTheDocument();
-		expect(screen.queryByRole('radio', { name: 'long' })).not.toBeInTheDocument();
-		expect(screen.queryByRole('radio', { name: 'wide' })).not.toBeInTheDocument();
-	});
-
-	it('exports as csv by default', () => {
-		renderMenu();
-		fireEvent.click(screen.getByTestId(TEST_ID));
-		fireEvent.click(screen.getByText('Export'));
-
-		expect(mockHandleExport).toHaveBeenCalledTimes(1);
-		expect(mockHandleExport).toHaveBeenCalledWith({ format: 'csv' });
-	});
-
-	it('exports as jsonl when selected', () => {
-		renderMenu();
-		fireEvent.click(screen.getByTestId(TEST_ID));
-		fireEvent.click(screen.getByRole('radio', { name: 'jsonl' }));
-		fireEvent.click(screen.getByText('Export'));
-
-		expect(mockHandleExport).toHaveBeenCalledWith({ format: 'jsonl' });
-	});
-
-	it('disables the trigger while an export is in progress', () => {
-		mockIsExporting = true;
-		renderMenu();
-
-		expect(screen.getByTestId(TEST_ID)).toBeDisabled();
-	});
-});
--- a/frontend/src/components/QueryBuilderV2/QueryV2/QuerySearch/QuerySearch.tsx
+++ b/frontend/src/components/QueryBuilderV2/QueryV2/QuerySearch/QuerySearch.tsx
@@ -89,7 +89,6 @@ interface QuerySearchProps {
 	onChange: (value: string) => void;
 	queryData: IBuilderQuery;
 	dataSource: DataSource;
-	metricNamespace?: string;
 	signalSource?: string;
 	hardcodedAttributeKeys?: QueryKeyDataSuggestionsProps[];
 	onRun?: (query: string) => void;
@@ -108,7 +107,6 @@ function QuerySearch({
 	hardcodedAttributeKeys,
 	showFilterSuggestionsWithoutMetric,
 	initialExpression,
-	metricNamespace,
 }: QuerySearchProps): JSX.Element {
 	const isDarkMode = useIsDarkMode();
 	const [valueSuggestions, setValueSuggestions] = useState<any[]>([]);
@@ -301,7 +299,6 @@ function QuerySearch({
 				searchText: searchText || '',
 				metricName: debouncedMetricName ?? undefined,
 				signalSource: signalSource as 'meter' | '',
-				metricNamespace,
 			});

 			if (response.data.data) {
@@ -334,7 +331,6 @@ function QuerySearch({
 			signalSource,
 			hardcodedAttributeKeys,
 			showFilterSuggestionsWithoutMetric,
-			metricNamespace,
 		],
 	);

--- a/frontend/src/components/QuickFilters/QuickFiltersSettings/OtherFilters.tsx
+++ b/frontend/src/components/QuickFilters/QuickFiltersSettings/OtherFilters.tsx
@@ -20,7 +20,6 @@ function OtherFiltersSkeleton(): JSX.Element {
 				<Skeleton.Input
 					active
 					size="small"
-					className="qf-other-filters-skeleton"
 					// eslint-disable-next-line react/no-array-index-key
 					key={index}
 				/>
--- a/frontend/src/components/RolesSelect/RolesSelect.tsx
+++ b/frontend/src/components/RolesSelect/RolesSelect.tsx
@@ -3,7 +3,7 @@ import { Select } from 'antd';
 import { Checkbox } from '@signozhq/ui/checkbox';
 import { convertToApiError } from 'api/ErrorResponseHandlerForGeneratedAPIs';
 import { useListRoles } from 'api/generated/services/role';
-import type { AuthtypesGettableRoleDTO } from 'api/generated/services/sigNoz.schemas';
+import type { AuthtypesRoleDTO } from 'api/generated/services/sigNoz.schemas';
 import cx from 'classnames';
 import APIError from 'types/api/error';
 import { popupContainer } from 'utils/selectPopupContainer';
@@ -16,7 +16,7 @@ export interface RoleOption {
 }

 export function useRoles(): {
-	roles: AuthtypesGettableRoleDTO[];
+	roles: AuthtypesRoleDTO[];
 	isLoading: boolean;
 	isError: boolean;
 	error: APIError | undefined;
@@ -33,7 +33,7 @@ export function useRoles(): {
 }

 export function getRoleOptions(
-	roles: AuthtypesGettableRoleDTO[],
+	roles: AuthtypesRoleDTO[],
 	valueField: 'id' | 'name',
 ): RoleOption[] {
 	return roles.map((role) => ({
@@ -79,7 +79,7 @@ interface BaseProps {
 	placeholder?: string;
 	className?: string;
 	getPopupContainer?: (trigger: HTMLElement) => HTMLElement;
-	roles?: AuthtypesGettableRoleDTO[];
+	roles?: AuthtypesRoleDTO[];
 	loading?: boolean;
 	isError?: boolean;
 	error?: APIError;
--- a/frontend/src/components/ServiceAccountDrawer/AddKeyModal/KeyFormPhase.tsx
+++ b/frontend/src/components/ServiceAccountDrawer/AddKeyModal/KeyFormPhase.tsx
@@ -4,7 +4,7 @@ import { Button } from '@signozhq/ui/button';
 import { Input } from '@signozhq/ui/input';
 import { ToggleGroupSimple } from '@signozhq/ui/toggle-group';
 import { DatePicker } from 'antd';
-import AuthZButton from 'lib/authz/components/AuthZButton/AuthZButton';
+import AuthZTooltip from 'lib/authz/components/AuthZTooltip/AuthZTooltip';
 import {
 	APIKeyCreatePermission,
 	buildSAAttachPermission,
@@ -109,21 +109,24 @@ function KeyFormPhase({
 					<Button variant="solid" color="secondary" onClick={onClose}>
 						Cancel
 					</Button>
-					<AuthZButton
+					<AuthZTooltip
 						checks={[
 							APIKeyCreatePermission,
 							buildSAAttachPermission(accountId ?? ''),
 						]}
-						authZEnabled={!!accountId}
-						type="submit"
-						form={FORM_ID}
-						variant="solid"
-						color="primary"
-						loading={isSubmitting}
-						disabled={!isValid}
+						enabled={!!accountId}
 					>
-						Create Key
-					</AuthZButton>
+						<Button
+							type="submit"
+							form={FORM_ID}
+							variant="solid"
+							color="primary"
+							loading={isSubmitting}
+							disabled={!isValid}
+						>
+							Create Key
+						</Button>
+					</AuthZTooltip>
 				</div>
 			</div>
 		</>
--- a/frontend/src/components/ServiceAccountDrawer/AddKeyModal/index.tsx
+++ b/frontend/src/components/ServiceAccountDrawer/AddKeyModal/index.tsx
@@ -151,7 +151,6 @@ function AddKeyModal(): JSX.Element {
 			className="add-key-modal"
 			showCloseButton
 			disableOutsideClick={isErrorModalVisible}
-			testId="add-key-modal"
 		>
 			{phase === Phase.FORM && (
 				<KeyFormPhase
--- a/frontend/src/components/ServiceAccountDrawer/DeleteAccountModal.tsx
+++ b/frontend/src/components/ServiceAccountDrawer/DeleteAccountModal.tsx
@@ -1,7 +1,7 @@
 import { useQueryClient } from 'react-query';
 import { Trash2, X } from '@signozhq/icons';
 import { Button } from '@signozhq/ui/button';
-import AuthZButton from 'lib/authz/components/AuthZButton/AuthZButton';
+import AuthZTooltip from 'lib/authz/components/AuthZTooltip/AuthZTooltip';
 import { buildSADeletePermission } from 'lib/authz/hooks/useAuthZ/permissions/service-account.permissions';
 import { DialogWrapper } from '@signozhq/ui/dialog';
 import { toast } from '@signozhq/ui/sonner';
@@ -84,18 +84,20 @@ function DeleteAccountModal(): JSX.Element {
 				<X size={12} />
 				Cancel
 			</Button>
-			<AuthZButton
+			<AuthZTooltip
 				checks={[buildSADeletePermission(accountId ?? '')]}
-				authZEnabled={!!accountId}
-				variant="solid"
-				color="destructive"
-				loading={isDeleting}
-				onClick={handleConfirm}
-				data-testid="confirm-delete-btn"
+				enabled={!!accountId}
 			>
-				<Trash2 size={12} />
-				Delete
-			</AuthZButton>
+				<Button
+					variant="solid"
+					color="destructive"
+					loading={isDeleting}
+					onClick={handleConfirm}
+				>
+					<Trash2 size={12} />
+					Delete
+				</Button>
+			</AuthZTooltip>
 		</div>
 	);

@@ -112,7 +114,6 @@ function DeleteAccountModal(): JSX.Element {
 			className="alert-dialog sa-delete-dialog"
 			showCloseButton={false}
 			disableOutsideClick={isErrorModalVisible}
-			testId="delete-service-account-modal"
 			footer={footer}
 		>
 			{content}
--- a/frontend/src/components/ServiceAccountDrawer/EditKeyModal/EditKeyForm.tsx
+++ b/frontend/src/components/ServiceAccountDrawer/EditKeyModal/EditKeyForm.tsx
@@ -7,7 +7,6 @@ import { Input } from '@signozhq/ui/input';
 import { ToggleGroupSimple } from '@signozhq/ui/toggle-group';
 import { DatePicker } from 'antd';
 import type { ServiceaccounttypesGettableFactorAPIKeyDTO } from 'api/generated/services/sigNoz.schemas';
-import AuthZButton from 'lib/authz/components/AuthZButton/AuthZButton';
 import AuthZTooltip from 'lib/authz/components/AuthZTooltip/AuthZTooltip';
 import {
 	buildAPIKeyDeletePermission,
@@ -159,36 +158,38 @@ function EditKeyForm({
 			</form>

 			<div className="edit-key-modal__footer">
-				<AuthZButton
+				<AuthZTooltip
 					checks={[
 						buildAPIKeyDeletePermission(keyItem?.id ?? ''),
 						buildSADetachPermission(accountId ?? ''),
 					]}
-					authZEnabled={!!accountId && !!keyItem?.id}
-					variant="link"
-					color="destructive"
-					onClick={onRevokeClick}
+					enabled={!!accountId && !!keyItem?.id}
 				>
-					<Trash2 size={12} />
-					Revoke Key
-				</AuthZButton>
+					<Button variant="link" color="destructive" onClick={onRevokeClick}>
+						<Trash2 size={12} />
+						Revoke Key
+					</Button>
+				</AuthZTooltip>
 				<div className="edit-key-modal__footer-right">
 					<Button variant="solid" color="secondary" onClick={onClose}>
 						<X size={12} />
 						Cancel
 					</Button>
-					<AuthZButton
+					<AuthZTooltip
 						checks={[buildAPIKeyUpdatePermission(keyItem?.id ?? '')]}
-						authZEnabled={!!accountId && !!keyItem?.id}
-						type="submit"
-						form={FORM_ID}
-						variant="solid"
-						color="primary"
-						loading={isSaving}
-						disabled={!isDirty}
+						enabled={!!accountId && !!keyItem?.id}
 					>
-						Save Changes
-					</AuthZButton>
+						<Button
+							type="submit"
+							form={FORM_ID}
+							variant="solid"
+							color="primary"
+							loading={isSaving}
+							disabled={!isDirty}
+						>
+							Save Changes
+						</Button>
+					</AuthZTooltip>
 				</div>
 			</div>
 		</>
--- a/frontend/src/components/ServiceAccountDrawer/EditKeyModal/index.tsx
+++ b/frontend/src/components/ServiceAccountDrawer/EditKeyModal/index.tsx
@@ -175,7 +175,6 @@ function EditKeyModal({ keyItem }: EditKeyModalProps): JSX.Element {
 			}
 			showCloseButton={!isRevokeConfirmOpen}
 			disableOutsideClick={isErrorModalVisible}
-			testId="edit-key-modal"
 			footer={
 				isRevokeConfirmOpen ? (
 					<RevokeKeyFooter
--- a/frontend/src/components/ServiceAccountDrawer/KeysTab.tsx
+++ b/frontend/src/components/ServiceAccountDrawer/KeysTab.tsx
@@ -1,13 +1,12 @@
 import React, { useCallback, useMemo } from 'react';
 import { KeyRound, X } from '@signozhq/icons';
-import { Pagination, Skeleton, Table, Tooltip } from 'antd';
+import { Button } from '@signozhq/ui/button';
+import { Skeleton, Table, Tooltip } from 'antd';
 import type { ColumnsType } from 'antd/es/table/interface';
 import type { ServiceaccounttypesGettableFactorAPIKeyDTO } from 'api/generated/services/sigNoz.schemas';
-import AuthZButton from 'lib/authz/components/AuthZButton/AuthZButton';
-import { withAuthZContent } from 'lib/authz/components/withAuthZ/withAuthZContent';
+import AuthZTooltip from 'lib/authz/components/AuthZTooltip/AuthZTooltip';
 import {
 	APIKeyCreatePermission,
-	APIKeyListPermission,
 	buildAPIKeyDeletePermission,
 	buildSAAttachPermission,
 	buildSADetachPermission,
@@ -25,10 +24,10 @@ interface KeysTabProps {
 	keys: ServiceaccounttypesGettableFactorAPIKeyDTO[];
 	isLoading: boolean;
 	isDisabled?: boolean;
+	canUpdate?: boolean;
 	accountId?: string;
 	currentPage: number;
 	pageSize: number;
-	onPageChange: (page: number) => void;
 }

 interface BuildColumnsParams {
@@ -114,26 +113,29 @@ function buildColumns({
 			render: (_, record): JSX.Element => {
 				const tooltipTitle = isDisabled ? 'Service account disabled' : 'Revoke Key';
 				return (
-					<Tooltip title={tooltipTitle}>
-						<AuthZButton
-							checks={[
-								buildAPIKeyDeletePermission(record.id),
-								buildSADetachPermission(accountId),
-							]}
-							authZEnabled={!isDisabled && !!accountId}
-							variant="ghost"
-							size="sm"
-							color="destructive"
-							disabled={isDisabled}
-							onClick={(e): void => {
-								e.stopPropagation();
-								onRevokeClick(record.id);
-							}}
-							className="keys-tab__revoke-btn"
-						>
-							<X size={12} />
-						</AuthZButton>
-					</Tooltip>
+					<AuthZTooltip
+						checks={[
+							buildAPIKeyDeletePermission(record.id),
+							buildSADetachPermission(accountId),
+						]}
+						enabled={!isDisabled && !!accountId}
+					>
+						<Tooltip title={tooltipTitle}>
+							<Button
+								variant="ghost"
+								size="sm"
+								color="destructive"
+								disabled={isDisabled}
+								onClick={(e): void => {
+									e.stopPropagation();
+									onRevokeClick(record.id);
+								}}
+								className="keys-tab__revoke-btn"
+							>
+								<X size={12} />
+							</Button>
+						</Tooltip>
+					</AuthZTooltip>
 				);
 			},
 		},
@@ -147,7 +149,6 @@ function KeysTab({
 	accountId = '',
 	currentPage,
 	pageSize,
-	onPageChange,
 }: KeysTabProps): JSX.Element {
 	const [, setIsAddKeyOpen] = useQueryState(
 		'add-key',
@@ -211,18 +212,21 @@ function KeysTab({
 						Learn more
 					</a>
 				</p>
-				<AuthZButton
+				<AuthZTooltip
 					checks={[APIKeyCreatePermission, buildSAAttachPermission(accountId)]}
-					authZEnabled={!isDisabled && !!accountId}
-					variant="link"
-					color="primary"
-					onClick={async (): Promise<void> => {
-						await setIsAddKeyOpen(true);
-					}}
-					disabled={isDisabled}
+					enabled={!isDisabled && !!accountId}
 				>
-					+ Add your first key
-				</AuthZButton>
+					<Button
+						variant="link"
+						color="primary"
+						onClick={async (): Promise<void> => {
+							await setIsAddKeyOpen(true);
+						}}
+						disabled={isDisabled}
+					>
+						+ Add your first key
+					</Button>
+				</AuthZTooltip>
 			</div>
 		);
 	}
@@ -274,24 +278,6 @@ function KeysTab({
 				})}
 			/>

-			<Pagination
-				current={currentPage}
-				pageSize={pageSize}
-				total={keys.length}
-				showTotal={(total: number, range: number[]): JSX.Element => (
-					<>
-						<span className="sa-drawer__pagination-range">
-							{range[0]} &#8212; {range[1]}
-						</span>
-						<span className="sa-drawer__pagination-total"> of {total}</span>
-					</>
-				)}
-				showSizeChanger={false}
-				hideOnSinglePage
-				onChange={onPageChange}
-				className="sa-drawer__keys-pagination"
-			/>
-
 			<EditKeyModal keyItem={editKey} />

 			<RevokeKeyModal />
@@ -299,7 +285,4 @@ function KeysTab({
 	);
 }

-export default withAuthZContent(KeysTab, {
-	checks: [APIKeyListPermission],
-	fallbackOnLoading: <Skeleton active paragraph={{ rows: 6 }} />,
-});
+export default KeysTab;
--- a/frontend/src/components/ServiceAccountDrawer/OverviewTab.tsx
+++ b/frontend/src/components/ServiceAccountDrawer/OverviewTab.tsx
@@ -4,22 +4,17 @@ import { Badge } from '@signozhq/ui/badge';
 import { Button } from '@signozhq/ui/button';
 import { Input } from '@signozhq/ui/input';
 import { useCopyToClipboard } from 'react-use';
-import type { AuthtypesGettableRoleDTO } from 'api/generated/services/sigNoz.schemas';
+import type { AuthtypesRoleDTO } from 'api/generated/services/sigNoz.schemas';
 import AuthZTooltip from 'lib/authz/components/AuthZTooltip/AuthZTooltip';
-import { withAuthZContent } from 'lib/authz/components/withAuthZ/withAuthZContent';
 import RolesSelect from 'components/RolesSelect';
 import { DATE_TIME_FORMATS } from 'constants/dateTimeFormats';
 import { ServiceAccountRow } from 'container/ServiceAccountsSettings/utils';
-import {
-	buildSAReadPermission,
-	buildSAUpdatePermission,
-} from 'lib/authz/hooks/useAuthZ/permissions/service-account.permissions';
+import { buildSAUpdatePermission } from 'lib/authz/hooks/useAuthZ/permissions/service-account.permissions';
 import { useTimezone } from 'providers/Timezone';
 import APIError from 'types/api/error';

 import SaveErrorItem from './SaveErrorItem';
 import type { SaveError } from './utils';
-import { Skeleton } from 'antd';

 interface OverviewTabProps {
 	account: ServiceAccountRow;
@@ -28,7 +23,8 @@ interface OverviewTabProps {
 	localRoles: string[];
 	onRolesChange: (v: string[]) => void;
 	isDisabled: boolean;
-	availableRoles: AuthtypesGettableRoleDTO[];
+	canUpdate?: boolean;
+	availableRoles: AuthtypesRoleDTO[];
 	rolesLoading?: boolean;
 	rolesError?: boolean;
 	rolesErrorObj?: APIError | undefined;
@@ -43,6 +39,7 @@ function OverviewTab({
 	localRoles,
 	onRolesChange,
 	isDisabled,
+	canUpdate = true,
 	availableRoles,
 	rolesLoading,
 	rolesError,
@@ -89,22 +86,23 @@ function OverviewTab({
 				<label className="sa-drawer__label" htmlFor="sa-name">
 					Name
 				</label>
-				{isDisabled ? (
-					<AuthZTooltip checks={[buildSAUpdatePermission(account.id)]}>
+				{isDisabled || !canUpdate ? (
+					<AuthZTooltip
+						checks={[buildSAUpdatePermission(account.id)]}
+						enabled={!isDisabled && !canUpdate}
+					>
 						<div className="sa-drawer__input-wrapper sa-drawer__input-wrapper--disabled">
 							<span className="sa-drawer__input-text">{localName || '—'}</span>
 							<LockKeyhole size={14} className="sa-drawer__lock-icon" />
 						</div>
 					</AuthZTooltip>
 				) : (
-					<AuthZTooltip checks={[buildSAUpdatePermission(account.id)]}>
-						<Input
-							id="sa-name"
-							value={localName}
-							onChange={(e): void => onNameChange(e.target.value)}
-							placeholder="Enter name"
-						/>
-					</AuthZTooltip>
+					<Input
+						id="sa-name"
+						value={localName}
+						onChange={(e): void => onNameChange(e.target.value)}
+						placeholder="Enter name"
+					/>
 				)}
 			</div>

@@ -222,9 +220,4 @@ function OverviewTab({
 	);
 }

-export default withAuthZContent(OverviewTab, {
-	checks: (props): ReturnType<typeof buildSAReadPermission>[] => [
-		buildSAReadPermission(props.account.id),
-	],
-	fallbackOnLoading: <Skeleton active paragraph={{ rows: 6 }} />,
-});
+export default OverviewTab;
--- a/frontend/src/components/ServiceAccountDrawer/RevokeKeyModal.tsx
+++ b/frontend/src/components/ServiceAccountDrawer/RevokeKeyModal.tsx
@@ -1,7 +1,7 @@
 import { useQueryClient } from 'react-query';
 import { Trash2, X } from '@signozhq/icons';
 import { Button } from '@signozhq/ui/button';
-import AuthZButton from 'lib/authz/components/AuthZButton/AuthZButton';
+import AuthZTooltip from 'lib/authz/components/AuthZTooltip/AuthZTooltip';
 import {
 	buildAPIKeyDeletePermission,
 	buildSADetachPermission,
@@ -45,20 +45,23 @@ export function RevokeKeyFooter({
 				<X size={12} />
 				Cancel
 			</Button>
-			<AuthZButton
+			<AuthZTooltip
 				checks={[
 					buildAPIKeyDeletePermission(keyId ?? ''),
 					buildSADetachPermission(accountId ?? ''),
 				]}
-				authZEnabled={!!accountId && !!keyId}
-				variant="solid"
-				color="destructive"
-				loading={isRevoking}
-				onClick={onConfirm}
+				enabled={!!accountId && !!keyId}
 			>
-				<Trash2 size={12} />
-				Revoke Key
-			</AuthZButton>
+				<Button
+					variant="solid"
+					color="destructive"
+					loading={isRevoking}
+					onClick={onConfirm}
+				>
+					<Trash2 size={12} />
+					Revoke Key
+				</Button>
+			</AuthZTooltip>
 		</>
 	);
 }
@@ -108,7 +111,7 @@ function RevokeKeyModal(): JSX.Element {
 	}

 	function handleCancel(): void {
-		void setRevokeKeyId(null);
+		setRevokeKeyId(null);
 	}

 	return (
--- a/frontend/src/components/ServiceAccountDrawer/ServiceAccountDrawer.tsx
+++ b/frontend/src/components/ServiceAccountDrawer/ServiceAccountDrawer.tsx
@@ -1,17 +1,11 @@
-import React, {
-	useCallback,
-	useEffect,
-	useMemo,
-	useRef,
-	useState,
-} from 'react';
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { useQueryClient } from 'react-query';
 import { Key, LayoutGrid, Plus, Trash2, X } from '@signozhq/icons';
 import { Button } from '@signozhq/ui/button';
 import { DrawerWrapper } from '@signozhq/ui/drawer';
 import { toast } from '@signozhq/ui/sonner';
 import { ToggleGroupSimple } from '@signozhq/ui/toggle-group';
-import { Skeleton } from 'antd';
+import { Pagination, Skeleton } from 'antd';
 import { convertToApiError } from 'api/ErrorResponseHandlerForGeneratedAPIs';
 import {
 	getListServiceAccountsQueryKey,
@@ -22,6 +16,7 @@ import {
 import type { RenderErrorResponseDTO } from 'api/generated/services/sigNoz.schemas';
 import { AxiosError } from 'axios';
 import ErrorInPlace from 'components/ErrorInPlace/ErrorInPlace';
+import PermissionDeniedCallout from 'lib/authz/components/PermissionDeniedCallout/PermissionDeniedCallout';
 import { useRoles } from 'components/RolesSelect';
 import { SA_QUERY_PARAMS } from 'container/ServiceAccountsSettings/constants';
 import {
@@ -33,13 +28,15 @@ import {
 	RoleUpdateFailure,
 	useServiceAccountRoleManager,
 } from 'hooks/serviceAccount/useServiceAccountRoleManager';
-import AuthZButton from 'lib/authz/components/AuthZButton/AuthZButton';
 import {
 	APIKeyCreatePermission,
+	APIKeyListPermission,
 	buildSAAttachPermission,
 	buildSADeletePermission,
+	buildSAReadPermission,
 	buildSAUpdatePermission,
 } from 'lib/authz/hooks/useAuthZ/permissions/service-account.permissions';
+import { useAuthZ } from 'lib/authz/hooks/useAuthZ/useAuthZ';
 import {
 	parseAsBoolean,
 	parseAsInteger,
@@ -50,6 +47,7 @@ import {
 import APIError from 'types/api/error';
 import { toAPIError } from 'utils/errorUtils';

+import AuthZTooltip from 'lib/authz/components/AuthZTooltip/AuthZTooltip';
 import AddKeyModal from './AddKeyModal';
 import DeleteAccountModal from './DeleteAccountModal';
 import KeysTab from './KeysTab';
@@ -72,12 +70,14 @@ function toSaveApiError(err: unknown): APIError {
 	);
 }

+// eslint-disable-next-line sonarjs/cognitive-complexity
 function ServiceAccountDrawer({
 	onSuccess,
 }: ServiceAccountDrawerProps): JSX.Element {
 	const [selectedAccountId, setSelectedAccountId] = useQueryState(
 		SA_QUERY_PARAMS.ACCOUNT,
 	);
+	const open = !!selectedAccountId;
 	const [activeTab, setActiveTab] = useQueryState(
 		SA_QUERY_PARAMS.TAB,
 		parseAsStringEnum<ServiceAccountDrawerTab>(
@@ -100,14 +100,28 @@ function ServiceAccountDrawer({
 		SA_QUERY_PARAMS.DELETE_SA,
 		parseAsBoolean.withDefault(false),
 	);
-
 	const [localName, setLocalName] = useState('');
 	const [localRoles, setLocalRoles] = useState<string[]>([]);
 	const [isSaving, setIsSaving] = useState(false);
 	const [saveErrors, setSaveErrors] = useState<SaveError[]>([]);

 	const queryClient = useQueryClient();
-	const open = !!selectedAccountId;
+
+	const { permissions: drawerPermissions, isLoading: isAuthZLoading } = useAuthZ(
+		selectedAccountId
+			? [
+					buildSAReadPermission(selectedAccountId),
+					buildSAUpdatePermission(selectedAccountId),
+					buildSADeletePermission(selectedAccountId),
+					APIKeyListPermission,
+				]
+			: [],
+		{ enabled: !!selectedAccountId },
+	);
+
+	const canRead =
+		drawerPermissions?.[buildSAReadPermission(selectedAccountId ?? '')]
+			?.isGranted ?? false;

 	const {
 		data: accountData,
@@ -117,7 +131,7 @@ function ServiceAccountDrawer({
 		refetch: refetchAccount,
 	} = useGetServiceAccount(
 		{ id: selectedAccountId ?? '' },
-		{ query: { enabled: !!selectedAccountId } },
+		{ query: { enabled: canRead && !!selectedAccountId } },
 	);

 	const account = useMemo(
@@ -131,7 +145,7 @@ function ServiceAccountDrawer({
 		isLoading: isRolesLoading,
 		applyDiff,
 	} = useServiceAccountRoleManager(selectedAccountId ?? '', {
-		enabled: !!selectedAccountId,
+		enabled: canRead && !!selectedAccountId,
 	});

 	const roleSessionRef = useRef<string | null>(null);
@@ -180,9 +194,16 @@ function ServiceAccountDrawer({
 		refetch: refetchRoles,
 	} = useRoles();

+	const canListKeys =
+		drawerPermissions?.[APIKeyListPermission]?.isGranted ?? false;
+
+	const canUpdate =
+		drawerPermissions?.[buildSAUpdatePermission(selectedAccountId ?? '')]
+			?.isGranted ?? true;
+
 	const { data: keysData, isLoading: keysLoading } = useListServiceAccountKeys(
 		{ id: selectedAccountId ?? '' },
-		{ query: { enabled: !!selectedAccountId } },
+		{ query: { enabled: !!selectedAccountId && canListKeys } },
 	);
 	const keys = keysData?.data ?? [];

@@ -196,6 +217,7 @@ function ServiceAccountDrawer({
 		}
 	}, [keysLoading, keys.length, keysPage, setKeysPage]);

+	// the retry for this mutation is safe due to the api being idempotent on backend
 	const { mutateAsync: updateMutateAsync } = useUpdateServiceAccount();

 	const retryNameUpdate = useCallback(async (): Promise<void> => {
@@ -353,71 +375,23 @@ function ServiceAccountDrawer({
 	]);

 	const handleClose = useCallback((): void => {
-		setSaveErrors([]);
+		void setIsDeleteOpen(null);
+		void setIsAddKeyOpen(null);
+		void setSelectedAccountId(null);
 		void setActiveTab(null);
 		void setKeysPage(null);
 		void setEditKeyId(null);
-		void setIsAddKeyOpen(null);
-		void setIsDeleteOpen(null);
-		void setSelectedAccountId(null);
+		setSaveErrors([]);
 	}, [
+		setSelectedAccountId,
 		setActiveTab,
 		setKeysPage,
 		setEditKeyId,
 		setIsAddKeyOpen,
 		setIsDeleteOpen,
-		setSelectedAccountId,
 	]);

-	const footer = useMemo(
-		() =>
-			activeTab === ServiceAccountDrawerTab.Overview && !isDeleted && open ? (
-				<div className="sa-drawer__footer">
-					<AuthZButton
-						checks={[buildSADeletePermission(selectedAccountId ?? '')]}
-						authZEnabled={!!selectedAccountId}
-						variant="link"
-						color="destructive"
-						onClick={(): void => {
-							void setIsDeleteOpen(true);
-						}}
-					>
-						<Trash2 size={12} />
-						Delete Service Account
-					</AuthZButton>
-					<div className="sa-drawer__footer-right">
-						<Button variant="outlined" color="secondary" onClick={handleClose}>
-							<X size={14} />
-							Cancel
-						</Button>
-						<AuthZButton
-							checks={[buildSAUpdatePermission(selectedAccountId ?? '')]}
-							authZEnabled={!!selectedAccountId}
-							variant="solid"
-							color="primary"
-							loading={isSaving}
-							disabled={!isDirty}
-							onClick={handleSave}
-						>
-							Save Changes
-						</AuthZButton>
-					</div>
-				</div>
-			) : null,
-		[
-			activeTab,
-			isDeleted,
-			open,
-			selectedAccountId,
-			isSaving,
-			isDirty,
-			handleClose,
-			handleSave,
-			setIsDeleteOpen,
-		],
-	);
-
-	const body = (
+	const drawerContent = (
 		<div className="sa-drawer__layout">
 			<div className="sa-drawer__tabs">
 				<ToggleGroupSimple
@@ -459,23 +433,26 @@ function ServiceAccountDrawer({
 					]}
 				/>
 				{activeTab === ServiceAccountDrawerTab.Keys && (
-					<AuthZButton
+					<AuthZTooltip
 						checks={[
 							APIKeyCreatePermission,
 							buildSAAttachPermission(selectedAccountId ?? ''),
 						]}
-						authZEnabled={!isDeleted && !!selectedAccountId}
-						variant="outlined"
-						size="sm"
-						color="secondary"
-						disabled={isDeleted}
-						onClick={(): void => {
-							void setIsAddKeyOpen(true);
-						}}
+						enabled={!isDeleted && !!selectedAccountId}
 					>
-						<Plus size={12} />
-						Add Key
-					</AuthZButton>
+						<Button
+							variant="outlined"
+							size="sm"
+							color="secondary"
+							disabled={isDeleted}
+							onClick={(): void => {
+								void setIsAddKeyOpen(true);
+							}}
+						>
+							<Plus size={12} />
+							Add Key
+						</Button>
+					</AuthZTooltip>
 				)}
 			</div>

@@ -484,7 +461,9 @@ function ServiceAccountDrawer({
 					activeTab === ServiceAccountDrawerTab.Keys ? ' sa-drawer__body--keys' : ''
 				}`}
 			>
-				{isAccountLoading && <Skeleton active paragraph={{ rows: 6 }} />}
+				{(isAuthZLoading || isAccountLoading) && (
+					<Skeleton active paragraph={{ rows: 6 }} />
+				)}
 				{isAccountError && (
 					<ErrorInPlace
 						error={toAPIError(
@@ -493,73 +472,141 @@ function ServiceAccountDrawer({
 						)}
 					/>
 				)}
-				{!isAccountLoading && !isAccountError && (
-					<>
-						{activeTab === ServiceAccountDrawerTab.Overview &&
-							(account ? (
-								<OverviewTab
-									account={account}
-									localName={localName}
-									onNameChange={handleNameChange}
-									localRoles={localRoles}
-									onRolesChange={(roles): void => {
-										setLocalRoles(roles);
-										clearRoleErrors();
-									}}
-									isDisabled={isDeleted}
-									availableRoles={availableRoles}
-									rolesLoading={rolesLoading}
-									rolesError={rolesError}
-									rolesErrorObj={rolesErrorObj}
-									onRefetchRoles={refetchRoles}
-									saveErrors={saveErrors}
-								/>
-							) : (
-								<Skeleton active />
-							))}
-						{activeTab === ServiceAccountDrawerTab.Keys && (
-							<KeysTab
-								keys={keys}
-								isLoading={keysLoading}
-								isDisabled={isDeleted}
-								accountId={selectedAccountId ?? ''}
-								currentPage={keysPage}
-								pageSize={PAGE_SIZE}
-								onPageChange={(page): void => {
-									void setKeysPage(page);
-								}}
-							/>
-						)}
-					</>
-				)}
+				{!isAuthZLoading &&
+					!isAccountLoading &&
+					!isAccountError &&
+					selectedAccountId && (
+						<>
+							{activeTab === ServiceAccountDrawerTab.Overview &&
+								(canRead && account ? (
+									<OverviewTab
+										account={account}
+										localName={localName}
+										onNameChange={handleNameChange}
+										localRoles={localRoles}
+										onRolesChange={(roles): void => {
+											setLocalRoles(roles);
+											clearRoleErrors();
+										}}
+										isDisabled={isDeleted}
+										canUpdate={canUpdate}
+										availableRoles={availableRoles}
+										rolesLoading={rolesLoading}
+										rolesError={rolesError}
+										rolesErrorObj={rolesErrorObj}
+										onRefetchRoles={refetchRoles}
+										saveErrors={saveErrors}
+									/>
+								) : (
+									<PermissionDeniedCallout permissionName="serviceaccount:read" />
+								))}
+							{activeTab === ServiceAccountDrawerTab.Keys &&
+								(canListKeys ? (
+									<KeysTab
+										keys={keys}
+										isLoading={keysLoading}
+										isDisabled={isDeleted}
+										canUpdate={canUpdate}
+										accountId={selectedAccountId}
+										currentPage={keysPage}
+										pageSize={PAGE_SIZE}
+									/>
+								) : (
+									<PermissionDeniedCallout permissionName="factor-api-key:list" />
+								))}
+						</>
+					)}
 			</div>
 		</div>
 	);

-	return (
-		<DrawerWrapper
-			open={open}
-			onOpenChange={(isOpen): void => {
-				if (!isOpen) {
-					handleClose();
-				}
-			}}
-			direction="right"
-			showCloseButton
-			showOverlay={false}
-			title="Service Account Details"
-			className="sa-drawer"
-			width="wide"
-			footer={footer}
-		>
-			{open && (
+	const footer = (
+		<div className="sa-drawer__footer">
+			{activeTab === ServiceAccountDrawerTab.Keys ? (
+				<Pagination
+					current={keysPage}
+					pageSize={PAGE_SIZE}
+					total={keys.length}
+					showTotal={(total: number, range: number[]): JSX.Element => (
+						<>
+							<span className="sa-drawer__pagination-range">
+								{range[0]} &#8212; {range[1]}
+							</span>
+							<span className="sa-drawer__pagination-total"> of {total}</span>
+						</>
+					)}
+					showSizeChanger={false}
+					hideOnSinglePage
+					onChange={(page): void => {
+						void setKeysPage(page);
+					}}
+					className="sa-drawer__keys-pagination"
+				/>
+			) : (
 				<>
-					{body}
-					<DeleteAccountModal />
-					<AddKeyModal />
+					{!isDeleted && (
+						<AuthZTooltip
+							checks={[buildSADeletePermission(selectedAccountId ?? '')]}
+							enabled={!!selectedAccountId}
+						>
+							<Button
+								variant="link"
+								color="destructive"
+								onClick={(): void => {
+									void setIsDeleteOpen(true);
+								}}
+							>
+								<Trash2 size={12} />
+								Delete Service Account
+							</Button>
+						</AuthZTooltip>
+					)}
+					{!isDeleted && (
+						<div className="sa-drawer__footer-right">
+							<Button variant="outlined" color="secondary" onClick={handleClose}>
+								<X size={14} />
+								Cancel
+							</Button>
+							<Button
+								variant="solid"
+								color="primary"
+								loading={isSaving}
+								disabled={!isDirty}
+								onClick={handleSave}
+							>
+								Save Changes
+							</Button>
+						</div>
+					)}
 				</>
 			)}
-		</DrawerWrapper>
+		</div>
+	);
+
+	return (
+		<>
+			<DrawerWrapper
+				open={open}
+				onOpenChange={(isOpen): void => {
+					if (!isOpen) {
+						handleClose();
+					}
+				}}
+				direction="right"
+				showCloseButton
+				showOverlay={false}
+				title="Service Account Details"
+				className="sa-drawer"
+				width="wide"
+				footer={footer}
+			>
+				{drawerContent}
+			</DrawerWrapper>
+
+			<DeleteAccountModal />
+
+			<AddKeyModal />
+		</>
 	);
 }

--- a/frontend/src/components/ServiceAccountDrawer/tests/AddKeyModal.test.tsx
+++ b/frontend/src/components/ServiceAccountDrawer/tests/AddKeyModal.test.tsx
@@ -1,8 +1,13 @@
 import { toast } from '@signozhq/ui/sonner';
-import { setupAuthzAdmin } from 'lib/authz/utils/authz-test-utils';
 import { rest, server } from 'mocks-server/server';
 import { NuqsTestingAdapter } from 'nuqs/adapters/testing';
-import { render, screen, userEvent, waitFor } from 'tests/test-utils';
+import {
+	render,
+	screen,
+	userEvent,
+	waitFor,
+	waitForElementToBeRemoved,
+} from 'tests/test-utils';

 import AddKeyModal from '../AddKeyModal';

@@ -54,7 +59,6 @@ describe('AddKeyModal', () => {
 			rest.post(SA_KEYS_ENDPOINT, (_, res, ctx) =>
 				res(ctx.status(201), ctx.json(createdKeyResponse)),
 			),
-			setupAuthzAdmin(),
 		);
 	});

@@ -91,7 +95,7 @@ describe('AddKeyModal', () => {

 		await screen.findByText('snz_abc123xyz456secret');
 		expect(screen.getByText(/Store the key securely/i)).toBeInTheDocument();
-		expect(screen.getByTestId('add-key-modal')).toBeInTheDocument();
+		await screen.findByRole('dialog', { name: /Key Created Successfully/i });
 	});

 	it('copy button writes key to clipboard and shows toast.success', async () => {
@@ -127,11 +131,9 @@ describe('AddKeyModal', () => {
 		const user = userEvent.setup({ pointerEventsCheck: 0 });
 		renderModal();

-		await screen.findByTestId('add-key-modal');
+		const dialog = await screen.findByRole('dialog', { name: /Add a New Key/i });
 		await user.click(screen.getByRole('button', { name: /Cancel/i }));

-		await waitFor(() => {
-			expect(screen.queryByTestId('add-key-modal')).not.toBeInTheDocument();
-		});
+		await waitForElementToBeRemoved(dialog);
 	});
 });
--- a/frontend/src/components/ServiceAccountDrawer/tests/EditKeyModal.test.tsx
+++ b/frontend/src/components/ServiceAccountDrawer/tests/EditKeyModal.test.tsx
@@ -1,6 +1,5 @@
 import { toast } from '@signozhq/ui/sonner';
 import type { ServiceaccounttypesGettableFactorAPIKeyDTO } from 'api/generated/services/sigNoz.schemas';
-import { setupAuthzAdmin } from 'lib/authz/utils/authz-test-utils';
 import { rest, server } from 'mocks-server/server';
 import { NuqsTestingAdapter } from 'nuqs/adapters/testing';
 import { render, screen, userEvent, waitFor } from 'tests/test-utils';
@@ -62,7 +61,6 @@ describe('EditKeyModal (URL-controlled)', () => {
 			rest.delete(SA_KEY_ENDPOINT, (_, res, ctx) =>
 				res(ctx.status(200), ctx.json({ status: 'success', data: {} })),
 			),
-			setupAuthzAdmin(),
 		);
 	});

@@ -73,7 +71,9 @@ describe('EditKeyModal (URL-controlled)', () => {
 	it('renders nothing when edit-key param is absent', () => {
 		renderModal(null, { account: 'sa-1' });

-		expect(screen.queryByTestId('edit-key-modal')).not.toBeInTheDocument();
+		expect(
+			screen.queryByRole('dialog', { name: /Edit Key Details/i }),
+		).not.toBeInTheDocument();
 	});

 	it('renders key data from prop when edit-key param is set', async () => {
@@ -100,7 +100,9 @@ describe('EditKeyModal (URL-controlled)', () => {
 		});

 		await waitFor(() => {
-			expect(screen.queryByTestId('edit-key-modal')).not.toBeInTheDocument();
+			expect(
+				screen.queryByRole('dialog', { name: /Edit Key Details/i }),
+			).not.toBeInTheDocument();
 		});
 	});

@@ -127,7 +129,9 @@ describe('EditKeyModal (URL-controlled)', () => {
 		expect(latestUrlUpdate.queryString).not.toContain('edit-key=');

 		await waitFor(() => {
-			expect(screen.queryByTestId('edit-key-modal')).not.toBeInTheDocument();
+			expect(
+				screen.queryByRole('dialog', { name: /Edit Key Details/i }),
+			).not.toBeInTheDocument();
 		});
 	});

@@ -139,7 +143,9 @@ describe('EditKeyModal (URL-controlled)', () => {
 		await user.click(screen.getByRole('button', { name: /Revoke Key/i }));

 		// Same dialog, now showing revoke confirmation
-		expect(screen.getByTestId('edit-key-modal')).toBeInTheDocument();
+		await expect(
+			screen.findByRole('dialog', { name: /Revoke Original Key Name/i }),
+		).resolves.toBeInTheDocument();
 		expect(
 			screen.getByText(/Revoking this key will permanently invalidate it/i),
 		).toBeInTheDocument();
@@ -162,7 +168,9 @@ describe('EditKeyModal (URL-controlled)', () => {
 		});

 		await waitFor(() => {
-			expect(screen.queryByTestId('edit-key-modal')).not.toBeInTheDocument();
+			expect(
+				screen.queryByRole('dialog', { name: /Edit Key Details/i }),
+			).not.toBeInTheDocument();
 		});
 	});
 });
--- a/frontend/src/components/ServiceAccountDrawer/tests/KeysTab.test.tsx
+++ b/frontend/src/components/ServiceAccountDrawer/tests/KeysTab.test.tsx
@@ -1,6 +1,5 @@
 import { toast } from '@signozhq/ui/sonner';
 import { ServiceaccounttypesGettableFactorAPIKeyDTO } from 'api/generated/services/sigNoz.schemas';
-import { setupAuthzAdmin } from 'lib/authz/utils/authz-test-utils';
 import { rest, server } from 'mocks-server/server';
 import { NuqsTestingAdapter } from 'nuqs/adapters/testing';
 import { render, screen, userEvent, waitFor } from 'tests/test-utils';
@@ -36,7 +35,7 @@ const keys: ServiceaccounttypesGettableFactorAPIKeyDTO[] = [
 	{
 		id: 'key-2',
 		name: 'Staging Key',
-		expiresAt: 1924948800, // 2030-12-31 12:00 UTC (noon to avoid timezone issues)
+		expiresAt: 1924905600, // 2030-12-31
 		lastObservedAt: '2026-03-10T10:00:00Z',
 		serviceAccountId: 'sa-1',
 	},
@@ -48,7 +47,6 @@ const defaultProps = {
 	isDisabled: false,
 	currentPage: 1,
 	pageSize: 10,
-	onPageChange: jest.fn(),
 };

 function renderKeysTab(
@@ -69,7 +67,6 @@ describe('KeysTab', () => {
 			rest.delete(SA_KEY_ENDPOINT, (_, res, ctx) =>
 				res(ctx.status(200), ctx.json({ status: 'success', data: {} })),
 			),
-			setupAuthzAdmin(),
 		);
 	});

@@ -77,12 +74,9 @@ describe('KeysTab', () => {
 		server.resetHandlers();
 	});

-	it('renders loading state', async () => {
+	it('renders loading state', () => {
 		renderKeysTab({ isLoading: true });
-		// Wait for authz to complete, then check for skeleton
-		await waitFor(() => {
-			expect(document.querySelector('.ant-skeleton')).toBeInTheDocument();
-		});
+		expect(document.querySelector('.ant-skeleton')).toBeInTheDocument();
 	});

 	it('renders empty state when no keys and clicking add sets add-key param', async () => {
@@ -97,9 +91,9 @@ describe('KeysTab', () => {
 			</NuqsTestingAdapter>,
 		);

-		await expect(
-			screen.findByText(/No keys. Start by creating one./i),
-		).resolves.toBeInTheDocument();
+		expect(
+			screen.getByText(/No keys. Start by creating one./i),
+		).toBeInTheDocument();
 		const addBtn = screen.getByRole('button', { name: /\+ Add your first key/i });
 		await user.click(addBtn);
 		expect(onUrlUpdate).toHaveBeenCalledWith(
@@ -109,12 +103,10 @@ describe('KeysTab', () => {
 		);
 	});

-	it('renders table with keys', async () => {
+	it('renders table with keys', () => {
 		renderKeysTab();

-		await expect(
-			screen.findByText('Production Key'),
-		).resolves.toBeInTheDocument();
+		expect(screen.getByText('Production Key')).toBeInTheDocument();
 		expect(screen.getByText('Staging Key')).toBeInTheDocument();
 		expect(screen.getByText('Never')).toBeInTheDocument();
 		expect(screen.getByText('Dec 31, 2030')).toBeInTheDocument();
@@ -130,7 +122,7 @@ describe('KeysTab', () => {
 			</NuqsTestingAdapter>,
 		);

-		const row = (await screen.findByText('Production Key')).closest('tr');
+		const row = screen.getByText('Production Key').closest('tr');
 		if (!row) {
 			throw new Error('Row not found');
 		}
@@ -154,8 +146,6 @@ describe('KeysTab', () => {
 			</NuqsTestingAdapter>,
 		);

-		// Wait for authz to complete and table to render
-		await screen.findByText('Production Key');
 		const revokeBtns = screen
 			.getAllByRole('button')
 			.filter((btn) => btn.className.includes('keys-tab__revoke-btn'));
@@ -173,8 +163,7 @@ describe('KeysTab', () => {

 		renderKeysTab();

-		// Wait for authz to complete and table to render
-		await screen.findByText('Production Key');
+		// Seed the keys cache so RevokeKeyModal can read the key name
 		const revokeBtns = screen
 			.getAllByRole('button')
 			.filter((btn) => btn.className.includes('keys-tab__revoke-btn'));
@@ -188,11 +177,9 @@ describe('KeysTab', () => {
 		});
 	});

-	it('disables actions when isDisabled is true', async () => {
+	it('disables actions when isDisabled is true', () => {
 		renderKeysTab({ isDisabled: true });

-		// Wait for authz to complete and table to render
-		await screen.findByText('Production Key');
 		const revokeBtns = screen
 			.getAllByRole('button')
 			.filter((btn) => btn.className.includes('keys-tab__revoke-btn'));
--- a/frontend/src/components/ServiceAccountDrawer/tests/ServiceAccountDrawer.authz.test.tsx
+++ b/frontend/src/components/ServiceAccountDrawer/tests/ServiceAccountDrawer.authz.test.tsx
@@ -1,3 +1,4 @@
+import type { ReactNode } from 'react';
 import { listRolesSuccessResponse } from 'mocks-server/__mockdata__/roles';
 import { rest, server } from 'mocks-server/server';
 import { NuqsTestingAdapter } from 'nuqs/adapters/testing';
@@ -31,6 +32,30 @@ const activeAccountResponse = {
 	updatedAt: '2026-01-02T00:00:00Z',
 };

+jest.mock('@signozhq/ui/drawer', () => ({
+	...jest.requireActual('@signozhq/ui/drawer'),
+	DrawerWrapper: ({
+		children,
+		footer,
+		open,
+	}: {
+		children?: ReactNode;
+		footer?: ReactNode;
+		open: boolean;
+	}): JSX.Element | null =>
+		open ? (
+			<div>
+				{children}
+				{footer}
+			</div>
+		) : null,
+}));
+
+jest.mock('@signozhq/ui/sonner', () => ({
+	...jest.requireActual('@signozhq/ui/sonner'),
+	toast: { success: jest.fn(), error: jest.fn() },
+}));
+
 function renderDrawer(
 	searchParams: Record<string, string> = { account: 'sa-1' },
 ): ReturnType<typeof render> {
@@ -93,7 +118,7 @@ describe('ServiceAccountDrawer — permissions', () => {
 		renderDrawer();

 		await waitFor(() => {
-			expect(screen.getByText(/read:serviceaccount/)).toBeInTheDocument();
+			expect(screen.getByText(/serviceaccount:read/)).toBeInTheDocument();
 		});
 	});

@@ -115,7 +140,7 @@ describe('ServiceAccountDrawer — permissions', () => {
 		fireEvent.click(screen.getByRole('radio', { name: /keys/i }));

 		await waitFor(() => {
-			expect(screen.getByText(/list:factor-api-key/)).toBeInTheDocument();
+			expect(screen.getByText(/factor-api-key:list/)).toBeInTheDocument();
 		});
 	});

--- a/frontend/src/components/ServiceAccountDrawer/tests/ServiceAccountDrawer.test.tsx
+++ b/frontend/src/components/ServiceAccountDrawer/tests/ServiceAccountDrawer.test.tsx
@@ -1,3 +1,4 @@
+import type { ReactNode } from 'react';
 import { listRolesSuccessResponse } from 'mocks-server/__mockdata__/roles';
 import { rest, server } from 'mocks-server/server';
 import { NuqsTestingAdapter } from 'nuqs/adapters/testing';
@@ -6,6 +7,30 @@ import { setupAuthzAdmin } from 'lib/authz/utils/authz-test-utils';

 import ServiceAccountDrawer from '../ServiceAccountDrawer';

+jest.mock('@signozhq/ui/drawer', () => ({
+	...jest.requireActual('@signozhq/ui/drawer'),
+	DrawerWrapper: ({
+		children,
+		footer,
+		open,
+	}: {
+		children?: ReactNode;
+		footer?: ReactNode;
+		open: boolean;
+	}): JSX.Element | null =>
+		open ? (
+			<div>
+				{children}
+				{footer}
+			</div>
+		) : null,
+}));
+
+jest.mock('@signozhq/ui/sonner', () => ({
+	...jest.requireActual('@signozhq/ui/sonner'),
+	toast: { success: jest.fn(), error: jest.fn() },
+}));
+
 const ROLES_ENDPOINT = '*/api/v1/roles';
 const SA_KEYS_ENDPOINT = '*/api/v1/service_accounts/:id/keys';
 const SA_ENDPOINT = '*/api/v1/service_accounts/sa-1';
@@ -222,20 +247,21 @@ describe('ServiceAccountDrawer', () => {
 			screen.getByRole('button', { name: /Delete Service Account/i }),
 		);

-		await screen.findByTestId('delete-service-account-modal');
-		expect(
-			screen.getByTestId('delete-service-account-modal'),
-		).toBeInTheDocument();
+		const dialog = await screen.findByRole('dialog', {
+			name: /Delete service account CI Bot/i,
+		});
+		expect(dialog).toBeInTheDocument();

-		await user.click(screen.getByTestId('confirm-delete-btn'));
+		const confirmBtns = screen.getAllByRole('button', { name: /^Delete$/i });
+		await user.click(confirmBtns[confirmBtns.length - 1]);

-		await waitFor(
-			() => {
-				expect(deleteSpy).toHaveBeenCalled();
-				expect(screen.queryByDisplayValue('CI Bot')).not.toBeInTheDocument();
-			},
-			{ timeout: 3000 },
-		);
+		await waitFor(() => {
+			expect(deleteSpy).toHaveBeenCalled();
+		});
+
+		await waitFor(() => {
+			expect(screen.queryByDisplayValue('CI Bot')).not.toBeInTheDocument();
+		});
 	});

 	it('deleted account shows read-only name, no Save button, no Delete button', async () => {
--- a/frontend/src/components/TagKeyValueInput/TagKeyValueInput.tsx
+++ b/frontend/src/components/TagKeyValueInput/TagKeyValueInput.tsx
@@ -65,9 +65,7 @@ function TagKeyValueInput({
 	};

 	const handleKeyDown = (e: KeyboardEvent<HTMLInputElement>): void => {
-		// Plain Enter adds the tag; let Cmd/Ctrl+Enter pass through so a host form
-		// (e.g. a modal) can submit on it.
-		if (e.key === 'Enter' && !e.metaKey && !e.ctrlKey) {
+		if (e.key === 'Enter') {
 			e.preventDefault();
 			commit();
 		}
@@ -95,17 +93,11 @@ function TagKeyValueInput({
 	};

 	const handleEditKeyDown = (e: KeyboardEvent<HTMLInputElement>): void => {
-		// Plain Enter commits the edit; let Cmd/Ctrl+Enter pass through so a host
-		// form (e.g. a modal) can submit on it.
-		if (e.key === 'Enter' && !e.metaKey && !e.ctrlKey) {
+		if (e.key === 'Enter') {
 			e.preventDefault();
-			e.stopPropagation();
 			commitEdit();
 		} else if (e.key === 'Escape') {
-			// Contain Escape so it cancels the inline edit instead of bubbling up and
-			// closing the host drawer/modal.
 			e.preventDefault();
-			e.stopPropagation();
 			cancelEdit();
 		}
 	};
--- a/frontend/src/components/TanStackTableView/TanStackCustomTableRow.tsx
+++ b/frontend/src/components/TanStackTableView/TanStackCustomTableRow.tsx
@@ -11,17 +11,17 @@ import { FlatItem, TableRowContext } from './types';

 import tableStyles from './TanStackTable.module.scss';

-type VirtuosoTableRowProps<TData, TItemKey = string> = ComponentProps<
+type VirtuosoTableRowProps<TData> = ComponentProps<
 	NonNullable<
-		TableComponents<FlatItem<TData>, TableRowContext<TData, TItemKey>>['TableRow']
+		TableComponents<FlatItem<TData>, TableRowContext<TData>>['TableRow']
 	>
 >;

-function TanStackCustomTableRow<TData, TItemKey = string>({
+function TanStackCustomTableRow<TData>({
 	item,
 	context,
 	...props
-}: VirtuosoTableRowProps<TData, TItemKey>): JSX.Element {
+}: VirtuosoTableRowProps<TData>): JSX.Element {
 	const rowId = item.row.id;
 	const rowData = item.row.original;

@@ -84,9 +84,9 @@ function TanStackCustomTableRow<TData, TItemKey = string>({
 // This looks overkill but ensures the table is stable and doesn't re-render on every change
 // If you add any new prop to context, remember to update this function
 // eslint-disable-next-line sonarjs/cognitive-complexity
-function areTableRowPropsEqual<TData, TItemKey = string>(
-	prev: Readonly<VirtuosoTableRowProps<TData, TItemKey>>,
-	next: Readonly<VirtuosoTableRowProps<TData, TItemKey>>,
+function areTableRowPropsEqual<TData>(
+	prev: Readonly<VirtuosoTableRowProps<TData>>,
+	next: Readonly<VirtuosoTableRowProps<TData>>,
 ): boolean {
 	if (prev.item.row.id !== next.item.row.id) {
 		return false;
@@ -141,9 +141,7 @@ function areTableRowPropsEqual<TData, TItemKey = string>(
 	return true;
 }

-export default memo(TanStackCustomTableRow, areTableRowPropsEqual as any) as <
-	TData,
-	TItemKey = string,
->(
-	props: VirtuosoTableRowProps<TData, TItemKey>,
-) => JSX.Element;
+export default memo(
+	TanStackCustomTableRow,
+	areTableRowPropsEqual,
+) as typeof TanStackCustomTableRow;
--- a/frontend/src/components/TanStackTableView/TanStackHeaderRow.module.scss
+++ b/frontend/src/components/TanStackTableView/TanStackHeaderRow.module.scss
@@ -2,22 +2,10 @@
 	position: sticky;
 	top: 0;
 	z-index: 2;
-	padding: var(
-			--tanstack-cell-header-padding-top-override,
-			var(--tanstack-cell-padding-top, 0.3rem)
-		)
-		var(
-			--tanstack-cell-header-padding-right-override,
-			var(--tanstack-cell-padding-right, 0.3rem)
-		)
-		var(
-			--tanstack-cell-header-padding-bottom-override,
-			var(--tanstack-cell-padding-bottom, 0.3rem)
-		)
-		var(
-			--tanstack-cell-header-padding-left-override,
-			var(--tanstack-cell-padding-left, 0.3rem)
-		);
+	padding: var(--tanstack-cell-padding-top, 0.3rem)
+		var(--tanstack-cell-padding-right, 0.3rem)
+		var(--tanstack-cell-padding-bottom, 0.3rem)
+		var(--tanstack-cell-padding-left, 0.3rem);
 	transform: translate3d(
 		var(--tanstack-header-translate-x, 0px),
 		var(--tanstack-header-translate-y, 0px),
@@ -251,7 +239,6 @@
 	text-overflow: ellipsis;
 	white-space: nowrap;
 	min-width: 0;
-	width: var(--tanstack-table-header-label-width);
 }

 .tanstackSortIndicator {
--- a/frontend/src/components/TanStackTableView/TanStackRow.tsx
+++ b/frontend/src/components/TanStackTableView/TanStackRow.tsx
@@ -8,23 +8,23 @@ import { TableRowContext } from './types';

 import tableStyles from './TanStackTable.module.scss';

-type TanStackRowCellsProps<TData, TItemKey = string> = {
+type TanStackRowCellsProps<TData> = {
 	row: TanStackRowModel<TData>;
-	context: TableRowContext<TData, TItemKey> | undefined;
+	context: TableRowContext<TData> | undefined;
 	itemKind: 'row' | 'expansion';
 	hasSingleColumn: boolean;
 	columnOrderKey: string;
 	columnVisibilityKey: string;
 };

-function TanStackRowCellsInner<TData, TItemKey = string>({
+function TanStackRowCellsInner<TData>({
 	row,
 	context,
 	itemKind,
 	hasSingleColumn,
 	columnOrderKey: _columnOrderKey,
 	columnVisibilityKey: _columnVisibilityKey,
-}: TanStackRowCellsProps<TData, TItemKey>): JSX.Element {
+}: TanStackRowCellsProps<TData>): JSX.Element {
 	const hasHovered = useIsRowHovered(row.id);
 	const rowData = row.original;
 	const visibleCells = row.getVisibleCells();
@@ -40,10 +40,8 @@ function TanStackRowCellsInner<TData, TItemKey = string>({

 	const handleClick = useCallback(
 		(event: MouseEvent<HTMLTableCellElement>) => {
-			// Fall back to an empty key so row clicks still fire for consumers
-			// that don't provide getRowKey (e.g. Logs Explorer / Live Logs).
 			const keyData = getRowKeyData?.(rowIndex);
-			const itemKey = keyData?.itemKey ?? ('' as TItemKey);
+			const itemKey = keyData?.itemKey ?? '';

 			// Handle ctrl+click or cmd+click (open in new tab)
 			if ((event.ctrlKey || event.metaKey) && onRowClickNewTab) {
@@ -133,8 +131,6 @@ function areRowCellsPropsEqual<TData>(
 const TanStackRowCells = memo(
 	TanStackRowCellsInner,
 	areRowCellsPropsEqual as any,
-) as <T, TItemKey = string>(
-	props: TanStackRowCellsProps<T, TItemKey>,
-) => JSX.Element;
+) as <T>(props: TanStackRowCellsProps<T>) => JSX.Element;

 export default TanStackRowCells;
--- a/frontend/src/components/TanStackTableView/TanStackTable.tsx
+++ b/frontend/src/components/TanStackTableView/TanStackTable.tsx
@@ -67,7 +67,7 @@ const INCREASE_VIEWPORT_BY = { top: 500, bottom: 500 };
 const noopColumnVisibility = (): void => {};

 // eslint-disable-next-line sonarjs/cognitive-complexity
-function TanStackTableInner<TData, TItemKey = string>(
+function TanStackTableInner<TData>(
 	{
 		data,
 		columns,
@@ -107,7 +107,7 @@ function TanStackTableInner<TData, TItemKey = string>(
 		suffixPaginationContent,
 		enableAlternatingRowColors,
 		disableVirtualScroll,
-	}: TanStackTableProps<TData, TItemKey>,
+	}: TanStackTableProps<TData>,
 	forwardedRef: React.ForwardedRef<TanStackTableHandle>,
 ): JSX.Element {
 	if (disableVirtualScroll && onEndReached) {
@@ -193,7 +193,7 @@ function TanStackTableInner<TData, TItemKey = string>(
 		skeletonRowCount,
 	});

-	const { rowKeyData, getRowKeyData } = useRowKeyData<TData, TItemKey>({
+	const { rowKeyData, getRowKeyData } = useRowKeyData({
 		data: effectiveData,
 		isLoading,
 		getRowKey,
@@ -229,7 +229,7 @@ function TanStackTableInner<TData, TItemKey = string>(
 	const tanstackColumns = useMemo<ColumnDef<TData>[]>(
 		() =>
 			effectiveColumns.map((colDef) =>
-				buildTanstackColumnDef<TData, TItemKey>(colDef, isRowActive, getRowKeyData),
+				buildTanstackColumnDef(colDef, isRowActive, getRowKeyData),
 			),
 		[effectiveColumns, isRowActive, getRowKeyData],
 	);
@@ -356,7 +356,7 @@ function TanStackTableInner<TData, TItemKey = string>(
 		[effectiveVisibility, columnIds],
 	);

-	const virtuosoContext = useMemo<TableRowContext<TData, TItemKey>>(
+	const virtuosoContext = useMemo<TableRowContext<TData>>(
 		() => ({
 			getRowStyle,
 			getRowClassName,
@@ -520,15 +520,13 @@ function TanStackTableInner<TData, TItemKey = string>(
 	);

 	type VirtuosoTableComponentProps = ComponentProps<
-		NonNullable<
-			TableComponents<FlatItem<TData>, TableRowContext<TData, TItemKey>>['Table']
-		>
+		NonNullable<TableComponents<FlatItem<TData>, TableRowContext<TData>>['Table']>
 	>;

 	// Use refs in virtuosoComponents to keep the component reference stable during resize
 	// This prevents Virtuoso from re-rendering all rows when columns are resized
 	const virtuosoComponents = useMemo(
-		(): TableComponents<FlatItem<TData>, TableRowContext<TData, TItemKey>> => ({
+		() => ({
 			Table: ({ style, children }: VirtuosoTableComponentProps): JSX.Element => (
 				<table className={tableStyles.tanStackTable} style={style}>
 					<VirtuosoTableColGroup
@@ -584,7 +582,7 @@ function TanStackTableInner<TData, TItemKey = string>(
 							</table>
 						</div>
 					) : (
-						<TableVirtuoso<FlatItem<TData>, TableRowContext<TData, TItemKey>>
+						<TableVirtuoso<FlatItem<TData>, TableRowContext<TData>>
 							className={virtuosoClassName}
 							ref={virtuosoRef}
 							{...restTableScrollerProps}
@@ -662,11 +660,8 @@ function TanStackTableInner<TData, TItemKey = string>(
 	);
 }

-const TanStackTableForward = forwardRef(TanStackTableInner) as <
-	TData,
-	TItemKey = string,
->(
-	props: TanStackTableProps<TData, TItemKey> & {
+const TanStackTableForward = forwardRef(TanStackTableInner) as <TData>(
+	props: TanStackTableProps<TData> & {
 		ref?: React.Ref<TanStackTableHandle>;
 	},
 ) => JSX.Element;
--- a/frontend/src/components/TanStackTableView/tests/TanStackRow.test.tsx
+++ b/frontend/src/components/TanStackTableView/tests/TanStackRow.test.tsx
@@ -57,39 +57,6 @@ describe('TanStackRowCells', () => {
 	});

 	it('calls onRowClick when a cell is clicked', async () => {
-		const user = userEvent.setup();
-		const onRowClick = jest.fn();
-		const ctx: TableRowContext<Row> = {
-			colCount: 1,
-			onRowClick,
-			getRowKeyData: () => ({ finalKey: 'r1', itemKey: 'r1' }),
-			hasSingleColumn: false,
-			columnOrderKey: '',
-			columnVisibilityKey: '',
-		};
-		const row = buildMockRow([{ id: 'body' }]);
-		render(
-			<table>
-				<tbody>
-					<tr>
-						<TanStackRowCells<Row>
-							row={row as never}
-							context={ctx}
-							itemKind="row"
-							hasSingleColumn={false}
-							columnOrderKey=""
-							columnVisibilityKey=""
-						/>
-					</tr>
-				</tbody>
-			</table>,
-		);
-		await user.click(screen.getAllByRole('cell')[0]);
-		expect(onRowClick).toHaveBeenCalledWith({ id: 'r1' }, 'r1');
-	});
-
-	it('fires onRowClick with empty itemKey when getRowKeyData is not provided', async () => {
-		// Mirrors Logs Explorer / Live Logs, which set onRowClick but no getRowKey.
 		const user = userEvent.setup();
 		const onRowClick = jest.fn();
 		const ctx: TableRowContext<Row> = {
@@ -117,6 +84,7 @@ describe('TanStackRowCells', () => {
 			</table>,
 		);
 		await user.click(screen.getAllByRole('cell')[0]);
+		// onRowClick receives (rowData, itemKey) - itemKey is empty when getRowKeyData not provided
 		expect(onRowClick).toHaveBeenCalledWith({ id: 'r1' }, '');
 	});

@@ -129,7 +97,6 @@ describe('TanStackRowCells', () => {
 			onRowClick,
 			onRowDeactivate,
 			isRowActive: () => true,
-			getRowKeyData: () => ({ finalKey: 'r1', itemKey: 'r1' }),
 			hasSingleColumn: false,
 			columnOrderKey: '',
 			columnVisibilityKey: '',
@@ -227,7 +194,6 @@ describe('TanStackRowCells', () => {
 				colCount: 1,
 				onRowClick,
 				onRowClickNewTab,
-				getRowKeyData: () => ({ finalKey: 'r1', itemKey: 'r1' }),
 				hasSingleColumn: false,
 				columnOrderKey: '',
 				columnVisibilityKey: '',
@@ -250,7 +216,7 @@ describe('TanStackRowCells', () => {
 				</table>,
 			);
 			fireEvent.click(screen.getAllByRole('cell')[0], { ctrlKey: true });
-			expect(onRowClickNewTab).toHaveBeenCalledWith({ id: 'r1' }, 'r1');
+			expect(onRowClickNewTab).toHaveBeenCalledWith({ id: 'r1' }, '');
 			expect(onRowClick).not.toHaveBeenCalled();
 		});

@@ -261,7 +227,6 @@ describe('TanStackRowCells', () => {
 				colCount: 1,
 				onRowClick,
 				onRowClickNewTab,
-				getRowKeyData: () => ({ finalKey: 'r1', itemKey: 'r1' }),
 				hasSingleColumn: false,
 				columnOrderKey: '',
 				columnVisibilityKey: '',
@@ -284,7 +249,7 @@ describe('TanStackRowCells', () => {
 				</table>,
 			);
 			fireEvent.click(screen.getAllByRole('cell')[0], { metaKey: true });
-			expect(onRowClickNewTab).toHaveBeenCalledWith({ id: 'r1' }, 'r1');
+			expect(onRowClickNewTab).toHaveBeenCalledWith({ id: 'r1' }, '');
 			expect(onRowClick).not.toHaveBeenCalled();
 		});

@@ -295,7 +260,6 @@ describe('TanStackRowCells', () => {
 				colCount: 1,
 				onRowClick,
 				onRowClickNewTab,
-				getRowKeyData: () => ({ finalKey: 'r1', itemKey: 'r1' }),
 				hasSingleColumn: false,
 				columnOrderKey: '',
 				columnVisibilityKey: '',
--- a/frontend/src/components/TanStackTableView/tests/TanStackTableView.test.tsx
+++ b/frontend/src/components/TanStackTableView/tests/TanStackTableView.test.tsx
@@ -614,34 +614,6 @@ describe('TanStackTableView Integration', () => {
 			);
 		});

-		it('calls onRowClick with object itemKey when getItemKey returns object', async () => {
-			type SelectionParams = { id: string; name: string };
-			const user = userEvent.setup();
-			const onRowClick = jest.fn<void, [unknown, SelectionParams]>();
-
-			renderTanStackTable<
-				(typeof import('./testUtils').defaultData)[0],
-				SelectionParams
-			>({
-				props: {
-					onRowClick,
-					getRowKey: (row) => row.id,
-					getItemKey: (row) => ({ id: row.id, name: row.name }),
-				},
-			});
-
-			await waitFor(() => {
-				expect(screen.getByText('Item 1')).toBeInTheDocument();
-			});
-
-			await user.click(screen.getByText('Item 1'));
-
-			expect(onRowClick).toHaveBeenCalledWith(
-				expect.objectContaining({ id: '1', name: 'Item 1' }),
-				{ id: '1', name: 'Item 1' },
-			);
-		});
-
 		it('applies active class when isRowActive returns true', async () => {
 			renderTanStackTable({
 				props: {
--- a/frontend/src/components/TanStackTableView/tests/testUtils.tsx
+++ b/frontend/src/components/TanStackTableView/tests/testUtils.tsx
@@ -42,14 +42,14 @@ export const defaultData: TestRow[] = [
 	{ id: '3', name: 'Item 3', value: 300 },
 ];

-export type RenderTanStackTableOptions<T, TItemKey = string> = {
-	props?: Partial<TanStackTableProps<T, TItemKey>>;
+export type RenderTanStackTableOptions<T> = {
+	props?: Partial<TanStackTableProps<T>>;
 	queryParams?: Record<string, string>;
 	onUrlUpdate?: OnUrlUpdateFunction;
 };

-export function renderTanStackTable<T = TestRow, TItemKey = string>(
-	options: RenderTanStackTableOptions<T, TItemKey> = {},
+export function renderTanStackTable<T = TestRow>(
+	options: RenderTanStackTableOptions<T> = {},
 ): RenderResult {
 	const { props = {}, queryParams, onUrlUpdate } = options;

@@ -57,7 +57,7 @@ export function renderTanStackTable<T = TestRow, TItemKey = string>(
 		data: defaultData as unknown as T[],
 		columns: defaultColumns as unknown as TableColumnDef<T>[],
 		...props,
-	} as TanStackTableProps<T, TItemKey>;
+	} as TanStackTableProps<T>;

 	return render(
 		<NuqsTestingAdapter searchParams={queryParams} onUrlUpdate={onUrlUpdate}>
@@ -65,7 +65,7 @@ export function renderTanStackTable<T = TestRow, TItemKey = string>(
 				value={{ viewportHeight: 500, itemHeight: 50 }}
 			>
 				<TooltipProvider>
-					<TanStackTable<T, TItemKey> {...mergedProps} />
+					<TanStackTable<T> {...mergedProps} />
 				</TooltipProvider>
 			</VirtuosoMockContext.Provider>
 		</NuqsTestingAdapter>,
--- a/frontend/src/components/TanStackTableView/index.tsx
+++ b/frontend/src/components/TanStackTableView/index.tsx
@@ -123,22 +123,6 @@ export * from './useTableParams';
 * />
 * ```
 *
- * @example Object itemKey — use generic `TItemKey` when selection needs compound keys.
- * ```tsx
- * type SelectionParams = { id: string; cluster: string; namespace: string };
- *
- * <TanStackTable<Row, SelectionParams>
- *   data={data}
- *   columns={columns}
- *   getRowKey={(row) => row.uid}
- *   getItemKey={(row) => ({ id: row.name, cluster: row.cluster, namespace: row.namespace })}
- *   onRowClick={(row, itemKey) => {
- *     // itemKey is typed as SelectionParams
- *     setSelection(itemKey);
- *   }}
- * />
- * ```
- *
 * @example Expandable rows. `renderExpandedRow` receives `(row, rowKey, groupMeta?)`.
 * ```tsx
 * <TanStackTable
--- a/frontend/src/components/TanStackTableView/types.ts
+++ b/frontend/src/components/TanStackTableView/types.ts
@@ -24,15 +24,17 @@ export type TableCellContext<TData, TValue> = {
 	isExpanded: boolean;
 	canExpand: boolean;
 	toggleExpanded: () => void;
+	/** Business/selection key for the row */
+	itemKey: string;
 	/** Group metadata when row is part of a grouped view */
 	groupMeta?: Record<string, string>;
 };

-export type RowKeyData<TItemKey = string> = {
+export type RowKeyData = {
 	/** Final unique key (with duplicate suffix if needed) */
 	finalKey: string;
 	/** Business/selection key */
-	itemKey: TItemKey;
+	itemKey: string;
 	/** Group metadata */
 	groupMeta?: Record<string, string>;
 };
@@ -80,14 +82,14 @@ export type FlatItem<TData> =
 	| { kind: 'row'; row: TanStackRowType<TData> }
 	| { kind: 'expansion'; row: TanStackRowType<TData> };

-export type TableRowContext<TData, TItemKey = string> = {
+export type TableRowContext<TData> = {
 	getRowStyle?: (row: TData) => CSSProperties;
 	getRowClassName?: (row: TData) => string;
 	isRowActive?: (row: TData) => boolean;
 	renderRowActions?: (row: TData) => ReactNode;
-	onRowClick?: (row: TData, itemKey: TItemKey) => void;
+	onRowClick?: (row: TData, itemKey: string) => void;
 	/** Called when ctrl+click or cmd+click on a row */
-	onRowClickNewTab?: (row: TData, itemKey: TItemKey) => void;
+	onRowClickNewTab?: (row: TData, itemKey: string) => void;
 	onRowDeactivate?: () => void;
 	renderExpandedRow?: (
 		row: TData,
@@ -95,7 +97,7 @@ export type TableRowContext<TData, TItemKey = string> = {
 		groupMeta?: Record<string, string>,
 	) => ReactNode;
 	/** Get key data for a row by index */
-	getRowKeyData?: (index: number) => RowKeyData<TItemKey> | undefined;
+	getRowKeyData?: (index: number) => RowKeyData | undefined;
 	colCount: number;
 	isDarkMode?: boolean;
 	/** When set, primitive cell output (string/number/boolean) is wrapped with typography + line-clamp (see `plainTextCellLineClamp` on the table). */
@@ -145,7 +147,7 @@ export type TanstackTableQueryParamsConfig = {
 	expanded?: string;
 };

-export type TanStackTableProps<TData, TItemKey = string> = {
+export type TanStackTableProps<TData> = {
 	data: TData[];
 	columns: TableColumnDef<TData>[];
 	/** Storage key for column state persistence (visibility, sizing, ordering). When set, enables unified column management. */
@@ -170,7 +172,7 @@ export type TanStackTableProps<TData, TItemKey = string> = {
 	 * When set, enables automatic duplicate key detection and group-aware key composition. */
 	getRowKey?: (row: TData) => string;
 	/** Function to get the business/selection key. Defaults to getRowKey result. */
-	getItemKey?: (row: TData) => TItemKey;
+	getItemKey?: (row: TData) => string;
 	/** When set, enables group-aware key generation (prefixes rowKey with group values). */
 	groupBy?: Array<{ key: string }>;
 	/** Extract group metadata from a row. Required when groupBy is set. */
@@ -179,9 +181,9 @@ export type TanStackTableProps<TData, TItemKey = string> = {
 	getRowClassName?: (row: TData) => string;
 	isRowActive?: (row: TData) => boolean;
 	renderRowActions?: (row: TData) => ReactNode;
-	onRowClick?: (row: TData, itemKey: TItemKey) => void;
+	onRowClick?: (row: TData, itemKey: string) => void;
 	/** Called when ctrl+click or cmd+click on a row */
-	onRowClickNewTab?: (row: TData, itemKey: TItemKey) => void;
+	onRowClickNewTab?: (row: TData, itemKey: string) => void;
 	onRowDeactivate?: () => void;
 	activeRowIndex?: number;
 	renderExpandedRow?: (
--- a/frontend/src/components/TanStackTableView/useRowKeyData.ts
+++ b/frontend/src/components/TanStackTableView/useRowKeyData.ts
@@ -1,51 +1,51 @@
 import { useCallback, useMemo } from 'react';

-export interface RowKeyDataItem<TItemKey = string> {
+export interface RowKeyDataItem {
 	/** Final unique key for the row (with dedup suffix if needed) */
 	finalKey: string;
 	/** Item key for tracking (may differ from finalKey) */
-	itemKey: TItemKey;
+	itemKey: string;
 	/** Group metadata when grouped */
 	groupMeta: Record<string, string> | undefined;
 }

-export interface UseRowKeyDataOptions<TData, TItemKey = string> {
+export interface UseRowKeyDataOptions<TData> {
 	data: TData[];
 	isLoading: boolean;
 	getRowKey?: (item: TData) => string;
-	getItemKey?: (item: TData) => TItemKey;
+	getItemKey?: (item: TData) => string;
 	groupBy?: Array<{ key: string }>;
 	getGroupKey?: (item: TData) => Record<string, string>;
 }

-export interface UseRowKeyDataResult<TItemKey = string> {
+export interface UseRowKeyDataResult {
 	/** Array of key data for each row, undefined if getRowKey not provided or loading */
-	rowKeyData: RowKeyDataItem<TItemKey>[] | undefined;
-	getRowKeyData: (index: number) => RowKeyDataItem<TItemKey> | undefined;
+	rowKeyData: RowKeyDataItem[] | undefined;
+	getRowKeyData: (index: number) => RowKeyDataItem | undefined;
 }

 /**
 * Computes unique row keys with duplicate handling and group prefixes.
 */
-export function useRowKeyData<TData, TItemKey = string>({
+export function useRowKeyData<TData>({
 	data,
 	isLoading,
 	getRowKey,
 	getItemKey,
 	groupBy,
 	getGroupKey,
-}: UseRowKeyDataOptions<TData, TItemKey>): UseRowKeyDataResult<TItemKey> {
+}: UseRowKeyDataOptions<TData>): UseRowKeyDataResult {
 	// eslint-disable-next-line sonarjs/cognitive-complexity
-	const rowKeyData = useMemo((): RowKeyDataItem<TItemKey>[] | undefined => {
+	const rowKeyData = useMemo((): RowKeyDataItem[] | undefined => {
 		if (!getRowKey || isLoading) {
 			return undefined;
 		}

 		const keyCount = new Map<string, number>();

-		return data.map((item, index): RowKeyDataItem<TItemKey> => {
+		return data.map((item, index): RowKeyDataItem => {
 			const itemIdentifier = getRowKey(item);
-			const itemKey = getItemKey?.(item) ?? (itemIdentifier as TItemKey);
+			const itemKey = getItemKey?.(item) ?? itemIdentifier;
 			const groupMeta = groupBy?.length ? getGroupKey?.(item) : undefined;

 			// Build rowKey with group prefix when grouped
--- a/frontend/src/components/TanStackTableView/utils.ts
+++ b/frontend/src/components/TanStackTableView/utils.ts
@@ -86,10 +86,10 @@ const buildAccessorFn = <TData>(
 	};
 };

-export function buildTanstackColumnDef<TData, TItemKey = string>(
+export function buildTanstackColumnDef<TData>(
 	colDef: TableColumnDef<TData>,
 	isRowActive?: (row: TData) => boolean,
-	getRowKeyData?: (index: number) => RowKeyData<TItemKey> | undefined,
+	getRowKeyData?: (index: number) => RowKeyData | undefined,
 ): ColumnDef<TData> {
 	const isFixed = colDef.width?.fixed != null;
 	const headerFn =
@@ -140,6 +140,7 @@ export function buildTanstackColumnDef<TData, TItemKey = string>(
 				toggleExpanded: (): void => {
 					row.toggleExpanded();
 				},
+				itemKey: keyData?.itemKey ?? '',
 				groupMeta: keyData?.groupMeta,
 			});
 		},
--- a/frontend/src/constants/localStorage.ts
+++ b/frontend/src/constants/localStorage.ts
@@ -31,6 +31,12 @@ export enum LOCALSTORAGE {
 	METRICS_LIST_OPTIONS = 'METRICS_LIST_OPTIONS',
 	SHOW_EXCEPTIONS_QUICK_FILTERS = 'SHOW_EXCEPTIONS_QUICK_FILTERS',
 	QUICK_FILTERS_SETTINGS_ANNOUNCEMENT = 'QUICK_FILTERS_SETTINGS_ANNOUNCEMENT',
+	QUICK_FILTERS_WIDTH_LOGS = 'QUICK_FILTERS_WIDTH_LOGS',
+	QUICK_FILTERS_WIDTH_TRACES = 'QUICK_FILTERS_WIDTH_TRACES',
+	QUICK_FILTERS_WIDTH_METER = 'QUICK_FILTERS_WIDTH_METER',
+	QUICK_FILTERS_WIDTH_API_MONITORING = 'QUICK_FILTERS_WIDTH_API_MONITORING',
+	QUICK_FILTERS_WIDTH_EXCEPTIONS = 'QUICK_FILTERS_WIDTH_EXCEPTIONS',
+	QUICK_FILTERS_WIDTH_INFRA = 'QUICK_FILTERS_WIDTH_INFRA',
 	FUNNEL_STEPS = 'FUNNEL_STEPS',
 	SPAN_DETAILS_PINNED_ATTRIBUTES = 'SPAN_DETAILS_PINNED_ATTRIBUTES',
 	LAST_USED_CUSTOM_TIME_RANGES = 'LAST_USED_CUSTOM_TIME_RANGES',
--- a/frontend/src/constants/reactQueryKeys.ts
+++ b/frontend/src/constants/reactQueryKeys.ts
@@ -7,7 +7,6 @@ export const REACT_QUERY_KEY = {
 	AUTO_REFRESH_QUERY: 'AUTO_REFRESH_QUERY',

 	GET_PUBLIC_DASHBOARD: 'GET_PUBLIC_DASHBOARD',
-	GET_PUBLIC_DASHBOARD_RESOLVED: 'GET_PUBLIC_DASHBOARD_RESOLVED',
 	GET_PUBLIC_DASHBOARD_META: 'GET_PUBLIC_DASHBOARD_META',
 	GET_PUBLIC_DASHBOARD_WIDGET_DATA: 'GET_PUBLIC_DASHBOARD_WIDGET_DATA',
 	GET_ALL_LICENCES: 'GET_ALL_LICENCES',
--- a/frontend/src/constants/sessionStorage.ts
+++ b/frontend/src/constants/sessionStorage.ts
@@ -1,4 +1,3 @@
 export enum SESSIONSTORAGE {
 	RETRY_LAZY_REFRESHED = 'retry-lazy-refreshed',
-	VIEW_PANEL_HANDOFF = 'view-panel-handoff',
 }
--- a/frontend/src/container/ApiMonitoring/Explorer/Explorer.styles.scss
+++ b/frontend/src/container/ApiMonitoring/Explorer/Explorer.styles.scss
@@ -163,12 +163,23 @@
 	}

 	&.filter-visible {
+		// Width is owned by ResizableBox (inline style); this section is the
+		// ResizableBox root, so it stays position: relative for the drag handle.
 		.api-quick-filter-left-section {
-			width: 260px;
+			.resizable-box__content {
+				display: flex;
+				flex-direction: column;
+			}
+
+			.quick-filters-container {
+				flex: 1;
+				min-height: 0;
+			}
 		}

 		.api-module-right-section {
-			width: calc(100% - 260px);
+			flex: 1;
+			min-width: 0;
 		}
 	}
 }
--- a/frontend/src/container/ApiMonitoring/Explorer/Explorer.tsx
+++ b/frontend/src/container/ApiMonitoring/Explorer/Explorer.tsx
@@ -4,21 +4,49 @@ import logEvent from 'api/common/logEvent';
 import cx from 'classnames';
 import QuickFilters from 'components/QuickFilters/QuickFilters';
 import { QuickFiltersSource, SignalType } from 'components/QuickFilters/types';
+import { LOCALSTORAGE } from 'constants/localStorage';
 import ErrorBoundaryFallback from 'pages/ErrorBoundaryFallback/ErrorBoundaryFallback';
+import { ResizableBox } from 'periscope/components/ResizableBox';
+import usePanelWidth from 'periscope/components/ResizableBox/usePanelWidth';

 import DomainList from './Domains/DomainList';

 import './Explorer.styles.scss';

+const QUICK_FILTERS_DEFAULT_WIDTH = 260;
+const QUICK_FILTERS_MIN_WIDTH = 240;
+const QUICK_FILTERS_MAX_WIDTH = 500;
+
 function Explorer(): JSX.Element {
 	useEffect(() => {
 		logEvent('API Monitoring: Landing page visited', {});
 	}, []);

+	const {
+		initialWidth: quickFiltersInitialWidth,
+		persistWidth: persistQuickFiltersWidth,
+	} = usePanelWidth({
+		storageKey: LOCALSTORAGE.QUICK_FILTERS_WIDTH_API_MONITORING,
+		defaultWidth: QUICK_FILTERS_DEFAULT_WIDTH,
+		minWidth: QUICK_FILTERS_MIN_WIDTH,
+		maxWidth: QUICK_FILTERS_MAX_WIDTH,
+	});
+
 	return (
 		<Sentry.ErrorBoundary fallback={<ErrorBoundaryFallback />}>
 			<div className={cx('api-monitoring-page', 'filter-visible')}>
-				<section className="api-quick-filter-left-section">
+				<ResizableBox
+					handle="right"
+					defaultWidth={QUICK_FILTERS_DEFAULT_WIDTH}
+					initialWidth={quickFiltersInitialWidth}
+					minWidth={QUICK_FILTERS_MIN_WIDTH}
+					maxWidth={QUICK_FILTERS_MAX_WIDTH}
+					onResize={persistQuickFiltersWidth}
+					resetToDefaultOnDoubleClick
+					withHandle
+					className="api-quick-filter-left-section"
+					handleTestId="quick-filters-resize-handle"
+				>
 					<QuickFilters
 						className="qf-api-monitoring"
 						source={QuickFiltersSource.API_MONITORING}
@@ -27,7 +55,7 @@ function Explorer(): JSX.Element {
 						showQueryName={false}
 						handleFilterVisibilityChange={(): void => {}}
 					/>
-				</section>
+				</ResizableBox>
 				<DomainList />
 			</div>
 		</Sentry.ErrorBoundary>
--- a/frontend/src/container/EmptyLogsSearch/EmptyLogsSearch.styles.scss
+++ b/frontend/src/container/EmptyLogsSearch/EmptyLogsSearch.styles.scss
@@ -43,7 +43,7 @@

 				&__title {
 					color: var(--l1-foreground);
-					font-size: var(--periscope-font-size-base);
+					font-size: 14px;
 					font-weight: 500;
 					line-height: 20px;
 					letter-spacing: -0.07px;
@@ -51,14 +51,14 @@

 				&__subtitle {
 					color: var(--l2-foreground);
-					font-size: var(--periscope-font-size-base);
+					font-size: 14px;
 					font-weight: 400;
 					line-height: 20px;
 					letter-spacing: -0.07px;
 				}

 				&__description {
-					font-size: var(--periscope-font-size-base);
+					font-size: 14px;
 					color: var(--l2-foreground);
 					line-height: 20px;
 				}
@@ -67,7 +67,7 @@
 					margin: 0;
 					margin-top: 8px;
 					color: var(--l2-foreground);
-					font-size: var(--periscope-font-size-base);
+					font-size: 14px;
 					font-weight: 400;
 					line-height: 20px;
 					letter-spacing: -0.07px;
@@ -106,7 +106,7 @@
 					border: 1px dashed var(--l1-border);
 					background: transparent;
 					color: var(--l2-foreground);
-					font-size: var(--periscope-font-size-base);
+					font-size: 14px;
 					font-weight: 400;
 					line-height: 18px;
 					letter-spacing: -0.07px;
@@ -120,15 +120,15 @@
 					gap: 6px;
 				}

-				// Stack the message and the resources card; card matches the content
-				// width above it and is capped so it doesn't sprawl in a wide panel.
 				&__row {
 					display: flex;
-					flex-direction: column;
-					align-items: stretch;
-					gap: 16px;
-					width: fit-content;
-					max-width: 600px;
+					flex-direction: row;
+					flex-wrap: wrap;
+					align-items: flex-end;
+					max-width: 825px;
+					gap: 25px;
+					justify-content: center;
+					margin-left: 21px;
 				}

 				&__content {
@@ -142,7 +142,7 @@
 					background: var(--l2-background);
 					border: 1px solid var(--l1-border);
 					border-radius: 4px;
-					width: 100%; // match the content width above
+					width: 332px;
 				}

 				&__resources-title {
@@ -155,6 +155,7 @@
 					text-transform: uppercase;
 					padding: 16px 16px 12px;
 					border-bottom: 1px solid var(--l1-border);
+					height: 46px;
 				}

 				&__resources-links {
--- a/frontend/src/container/GridCardLayout/GridCard/FullView/TableRender/CustomCheckBox.module.scss
+++ b/frontend/src/container/GridCardLayout/GridCard/FullView/TableRender/CustomCheckBox.module.scss
@@ -1,4 +0,0 @@
-.wrapper :global(button[data-color]) {
-	--checkbox-checked-background: var(--series-color);
-	--checkbox-border-color: var(--series-color);
-}
--- a/frontend/src/container/GridCardLayout/GridCard/FullView/TableRender/CustomCheckBox.tsx
+++ b/frontend/src/container/GridCardLayout/GridCard/FullView/TableRender/CustomCheckBox.tsx
@@ -3,7 +3,6 @@ import { Checkbox } from '@signozhq/ui/checkbox';
 import { CSSProperties } from 'react';

 import { CheckBoxProps } from '../types';
-import styles from './CustomCheckBox.module.scss';

 function CustomCheckBox({
 	data,
@@ -16,11 +15,12 @@ function CustomCheckBox({
 	const isChecked = graphVisibilityState[index] || false;

 	const colorStyle = {
-		'--series-color': color,
+		'--checkbox-checked-background': color,
+		'--checkbox-border-color': color,
 	} as CSSProperties;

 	return (
-		<span className={styles.wrapper} style={colorStyle}>
+		<span style={colorStyle}>
 			<Checkbox
 				onChange={(checked): void => checkBoxOnChangeHandler(checked, index)}
 				value={isChecked}
--- a/frontend/src/container/Home/Dashboards/Dashboards.tsx
+++ b/frontend/src/container/Home/Dashboards/Dashboards.tsx
@@ -1,20 +1,15 @@
-import { useEffect, useMemo } from 'react';
+import { useEffect, useState } from 'react';
 import { Link } from 'react-router-dom';
 import { Button, Skeleton } from 'antd';
 import { Badge } from '@signozhq/ui/badge';
 import logEvent from 'api/common/logEvent';
-import { useListDashboardsForUserV2 } from 'api/generated/services/dashboard';
-import {
-	DashboardtypesListOrderDTO,
-	DashboardtypesListSortDTO,
-} from 'api/generated/services/sigNoz.schemas';
 import ROUTES from 'constants/routes';
 import { useGetAllDashboard } from 'hooks/dashboard/useGetAllDashboard';
-import { useIsDashboardV2 } from 'hooks/useIsDashboardV2';
 import { useSafeNavigate } from 'hooks/useSafeNavigate';
 import { ArrowRight, ArrowUpRight, Plus } from '@signozhq/icons';
 import Card from 'periscope/components/Card/Card';
 import { useAppContext } from 'providers/App/App';
+import { Dashboard } from 'types/api/dashboard/getAll';
 import { USER_ROLES } from 'types/roles';
 import { openInNewTab } from 'utils/navigation';

@@ -22,13 +17,6 @@ import dialsUrl from '@/assets/Icons/dials.svg';

 import { getItemIcon } from '../constants';

-// The five most-recent dashboards, normalised across the v1 and v2 list APIs.
-interface RecentDashboard {
-	id: string;
-	title: string;
-	tags: string[];
-}
-
 export default function Dashboards({
 	onUpdateChecklistDoneItem,
 	loadingUserPreferences,
@@ -38,58 +26,33 @@ export default function Dashboards({
 }): JSX.Element {
 	const { safeNavigate } = useSafeNavigate();
 	const { user } = useAppContext();
-	const isDashboardV2 = useIsDashboardV2();

-	// Fetch the recent dashboards from whichever API the `use_dashboard_v2` flag
-	// selects; the inactive one stays disabled so it never fires.
+	const [sortedDashboards, setSortedDashboards] = useState<Dashboard[]>([]);
+
+	// Fetch Dashboards
 	const {
-		data: v1List,
-		isLoading: v1Loading,
-		isError: v1Error,
-	} = useGetAllDashboard({ enabled: !isDashboardV2 });
-
-	const {
-		data: v2List,
-		isLoading: v2Loading,
-		isError: v2Error,
-	} = useListDashboardsForUserV2(
-		{
-			sort: DashboardtypesListSortDTO.updated_at,
-			order: DashboardtypesListOrderDTO.desc,
-			limit: 5,
-			offset: 0,
-		},
-		{ query: { enabled: isDashboardV2 } },
-	);
-
-	const isDashboardListLoading = isDashboardV2 ? v2Loading : v1Loading;
-	const isDashboardListError = isDashboardV2 ? v2Error : v1Error;
-
-	const sortedDashboards = useMemo<RecentDashboard[]>(() => {
-		if (isDashboardV2) {
-			return (v2List?.data?.dashboards ?? []).map((d) => ({
-				id: d.id,
-				title: d.spec?.display?.name ?? d.name,
-				tags: (d.tags ?? []).map((t) => (t.value ? `${t.key}:${t.value}` : t.key)),
-			}));
-		}
-		return [...(v1List?.data ?? [])]
-			.sort(
-				(a, b) => new Date(b.updatedAt).getTime() - new Date(a.updatedAt).getTime(),
-			)
-			.slice(0, 5)
-			.map((d) => ({
-				id: d.id,
-				title: d.data.title,
-				tags: d.data.tags ?? [],
-			}));
-	}, [isDashboardV2, v1List, v2List]);
+		data: dashboardsList,
+		isLoading: isDashboardListLoading,
+		isError: isDashboardListError,
+	} = useGetAllDashboard();

 	useEffect(() => {
+		if (!dashboardsList) {
+			return;
+		}
+
+		const sortedDashboards = dashboardsList.data.sort((a, b) => {
+			const aUpdateAt = new Date(a.updatedAt).getTime();
+			const bUpdateAt = new Date(b.updatedAt).getTime();
+			return bUpdateAt - aUpdateAt;
+		});
+
 		if (sortedDashboards.length > 0 && !loadingUserPreferences) {
 			onUpdateChecklistDoneItem('SETUP_DASHBOARDS');
 		}
-	}, [sortedDashboards, onUpdateChecklistDoneItem, loadingUserPreferences]);
+
+		setSortedDashboards(sortedDashboards.slice(0, 5));
+	}, [dashboardsList, onUpdateChecklistDoneItem, loadingUserPreferences]);

 	const emptyStateCard = (): JSX.Element => (
 		<div className="empty-state-container">
@@ -150,7 +113,7 @@ export default function Dashboards({
 						event.stopPropagation();
 						logEvent('Homepage: Dashboard clicked', {
 							dashboardId: dashboard.id,
-							dashboardName: dashboard.title,
+							dashboardName: dashboard.data.title,
 						});
 						if (event.metaKey || event.ctrlKey) {
 							openInNewTab(getLink());
@@ -180,12 +143,12 @@ export default function Dashboards({
 								/>

 								<div className="alert-rule-item-name home-data-item-name">
-									{dashboard.title}
+									{dashboard.data.title}
 								</div>
 							</div>

 							<div className="alert-rule-item-description home-data-item-tag">
-								{dashboard.tags.map((tag) => (
+								{dashboard.data.tags?.map((tag) => (
 									<Badge color="sienna" variant="outline" key={tag}>
 										{tag}
 									</Badge>
--- a/frontend/src/container/InfraMonitoringHosts/Hosts.tsx
+++ b/frontend/src/container/InfraMonitoringHosts/Hosts.tsx
@@ -6,6 +6,7 @@ import QuickFilters from 'components/QuickFilters/QuickFilters';
 import { QuickFiltersSource } from 'components/QuickFilters/types';
 import { InfraMonitoringEvents } from 'constants/events';
 import { FeatureKeys } from 'constants/features';
+import { LOCALSTORAGE } from 'constants/localStorage';
 import K8sBaseDetails from 'container/InfraMonitoringK8s/Base/K8sBaseDetails';
 import { K8sBaseList } from 'container/InfraMonitoringK8s/Base/K8sBaseList';
 import { K8sBaseFilters } from 'container/InfraMonitoringK8s/Base/types';
@@ -16,6 +17,8 @@ import {
 } from 'container/InfraMonitoringK8s/hooks';
 import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
 import { useQueryOperations } from 'hooks/queryBuilder/useQueryBuilderOperations';
+import { ResizableBox } from 'periscope/components/ResizableBox';
+import usePanelWidth from 'periscope/components/ResizableBox/usePanelWidth';
 import { useAppContext } from 'providers/App/App';
 import { Query } from 'types/api/queryBuilder/queryBuilderData';

@@ -40,8 +43,21 @@ import { getHostsQuickFiltersConfig } from './utils';
 import styles from './InfraMonitoringHosts.module.scss';
 import { ArrowUpToLine, Filter } from '@signozhq/icons';

+const QUICK_FILTERS_DEFAULT_WIDTH = 280;
+const QUICK_FILTERS_MIN_WIDTH = 240;
+const QUICK_FILTERS_MAX_WIDTH = 500;
+
 function Hosts(): JSX.Element {
 	const [showFilters, setShowFilters] = useState(true);
+	const {
+		initialWidth: quickFiltersInitialWidth,
+		persistWidth: persistQuickFiltersWidth,
+	} = usePanelWidth({
+		storageKey: LOCALSTORAGE.QUICK_FILTERS_WIDTH_INFRA,
+		defaultWidth: QUICK_FILTERS_DEFAULT_WIDTH,
+		minWidth: QUICK_FILTERS_MIN_WIDTH,
+		maxWidth: QUICK_FILTERS_MAX_WIDTH,
+	});
 	const [, setCurrentPage] = useInfraMonitoringPageListing();
 	const [urlFilters, setUrlFilters] = useInfraMonitoringFiltersK8s();

@@ -139,7 +155,18 @@ function Hosts(): JSX.Element {
 			<div className={styles.infraMonitoringContainer}>
 				<div className={styles.infraContentRow}>
 					{showFilters && (
-						<div className={styles.quickFiltersContainer}>
+						<ResizableBox
+							handle="right"
+							defaultWidth={QUICK_FILTERS_DEFAULT_WIDTH}
+							initialWidth={quickFiltersInitialWidth}
+							minWidth={QUICK_FILTERS_MIN_WIDTH}
+							maxWidth={QUICK_FILTERS_MAX_WIDTH}
+							onResize={persistQuickFiltersWidth}
+							resetToDefaultOnDoubleClick
+							withHandle
+							className={styles.quickFiltersContainer}
+							handleTestId="quick-filters-resize-handle"
+						>
 							<div className={styles.quickFiltersContainerHeader}>
 								<Typography.Text>Filters</Typography.Text>
 								<Tooltip title="Collapse Filters">
@@ -156,7 +183,7 @@ function Hosts(): JSX.Element {
 								handleFilterVisibilityChange={handleFilterVisibilityChange}
 								onFilterChange={handleQuickFiltersChange}
 							/>
-						</div>
+						</ResizableBox>
 					)}
 					<div
 						className={`${styles.listContainer}${
--- a/frontend/src/container/InfraMonitoringHosts/InfraMonitoringHosts.module.scss
+++ b/frontend/src/container/InfraMonitoringHosts/InfraMonitoringHosts.module.scss
@@ -44,26 +44,20 @@
 }

 .quickFiltersContainer {
-	width: 280px;
-	min-width: 280px;
+	// Width is owned by ResizableBox (inline style). No overflow here: the panel
+	// must not scroll (QuickFilters scrolls its own list internally) — an
+	// overflow on the root would also clip the edge-mounted resize grip.
+	flex-shrink: 0;
 	border-right: 1px solid var(--l1-border);
-	overflow-y: auto;

-	&::-webkit-scrollbar {
-		width: 0.1rem;
-		height: 0.1rem;
+	:global(.resizable-box__content) {
+		display: flex;
+		flex-direction: column;
 	}

-	&::-webkit-scrollbar-track {
-		background: transparent;
-	}
-
-	&::-webkit-scrollbar-thumb {
-		background: var(--accent-primary);
-	}
-
-	&::-webkit-scrollbar-thumb:hover {
-		background: colox-mix(var(--accent-primary), var(--bg-vanilla-100), 20%);
+	:global(.quick-filters-container) {
+		flex: 1;
+		min-height: 0;
 	}

 	:global(.ant-collapse-header) {
@@ -142,7 +136,9 @@
 }

 .listContainerFiltersVisible {
-	max-width: calc(100% - 280px);
+	// Width is driven by flex now that the filters panel is resizable; the list
+	// fills whatever space the (variable-width) panel leaves.
+	max-width: 100%;
 }

 .quickFiltersToggleContainer {
--- a/frontend/src/container/InfraMonitoringHostsV2/Hosts.tsx
+++ b/frontend/src/container/InfraMonitoringHostsV2/Hosts.tsx
@@ -1,37 +1,36 @@
 import { useCallback, useEffect, useRef, useState } from 'react';
 import { Button, Tooltip } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
-import { listHosts } from 'api/generated/services/inframonitoring';
-import {
-	InframonitoringtypesHostRecordDTO,
-	InframonitoringtypesHostStatusDTO,
-	InframonitoringtypesResponseTypeDTO,
-	Querybuildertypesv5OrderDirectionDTO,
-} from 'api/generated/services/sigNoz.schemas';
+import logEvent from 'api/common/logEvent';
 import QuickFilters from 'components/QuickFilters/QuickFilters';
 import { QuickFiltersSource } from 'components/QuickFilters/types';
 import { InfraMonitoringEvents } from 'constants/events';
 import { FeatureKeys } from 'constants/features';
-import { initialQueriesMap } from 'constants/queryBuilder';
-import K8sBaseDetails, {
-	K8sDetailsFilters,
-} from 'container/InfraMonitoringK8sV2/Base/K8sBaseDetails';
+import { LOCALSTORAGE } from 'constants/localStorage';
+import K8sBaseDetails from 'container/InfraMonitoringK8sV2/Base/K8sBaseDetails';
 import { K8sBaseList } from 'container/InfraMonitoringK8sV2/Base/K8sBaseList';
-import StatusFilter from 'container/InfraMonitoringHostsV2/StatusFilter';
 import { K8sBaseFilters } from 'container/InfraMonitoringK8sV2/Base/types';
 import { InfraMonitoringEntity } from 'container/InfraMonitoringK8sV2/constants';
-import { useGetCompositeQueryParam } from 'hooks/queryBuilder/useGetCompositeQueryParam';
+import {
+	useInfraMonitoringFiltersK8s,
+	useInfraMonitoringPageListing,
+} from 'container/InfraMonitoringK8sV2/hooks';
 import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
+import { useQueryOperations } from 'hooks/queryBuilder/useQueryBuilderOperations';
+import { ResizableBox } from 'periscope/components/ResizableBox';
+import usePanelWidth from 'periscope/components/ResizableBox/usePanelWidth';
 import { useAppContext } from 'providers/App/App';
-import { DataSource } from 'types/common/queryBuilder';
+import { Query } from 'types/api/queryBuilder/queryBuilderData';

 import {
+	fetchHostEntityData,
+	fetchHostListData,
 	getHostMetricsQueryPayload,
 	hostDetailsMetadataConfig,
 	hostGetEntityName,
-	hostGetSelectedItemExpression,
-	hostInitialEventsExpression,
-	hostInitialLogTracesExpression,
+	hostGetSelectedItemFilters,
+	hostInitialEventsFilter,
+	hostInitialLogTracesFilter,
 	hostWidgetInfo,
 } from './constants';
 import {
@@ -44,137 +43,100 @@ import { getHostsQuickFiltersConfig } from './utils';
 import styles from './InfraMonitoringHosts.module.scss';
 import { ArrowUpToLine, Filter } from '@signozhq/icons';

+const QUICK_FILTERS_DEFAULT_WIDTH = 280;
+const QUICK_FILTERS_MIN_WIDTH = 240;
+const QUICK_FILTERS_MAX_WIDTH = 500;
+
 function Hosts(): JSX.Element {
 	const [showFilters, setShowFilters] = useState(true);
-
-	const compositeQuery = useGetCompositeQueryParam();
-	const { redirectWithQueryBuilderData } = useQueryBuilder();
-	const isInitialized = useRef(false);
-
-	useEffect(() => {
-		if (isInitialized.current) {
-			return;
-		}
-		isInitialized.current = true;
-
-		if (!compositeQuery) {
-			const defaultQuery = initialQueriesMap[DataSource.METRICS];
-			redirectWithQueryBuilderData({
-				...defaultQuery,
-				builder: {
-					...defaultQuery.builder,
-					queryData: defaultQuery.builder.queryData.map((query) => ({
-						...query,
-						filter: { expression: '' },
-						filters: { items: [], op: 'AND' as const },
-					})),
-				},
-			});
-		}
-	}, [compositeQuery, redirectWithQueryBuilderData]);
+	const {
+		initialWidth: quickFiltersInitialWidth,
+		persistWidth: persistQuickFiltersWidth,
+	} = usePanelWidth({
+		storageKey: LOCALSTORAGE.QUICK_FILTERS_WIDTH_INFRA,
+		defaultWidth: QUICK_FILTERS_DEFAULT_WIDTH,
+		minWidth: QUICK_FILTERS_MIN_WIDTH,
+		maxWidth: QUICK_FILTERS_MAX_WIDTH,
+	});
+	const [, setCurrentPage] = useInfraMonitoringPageListing();
+	const [urlFilters, setUrlFilters] = useInfraMonitoringFiltersK8s();

 	const { featureFlags } = useAppContext();
 	const dotMetricsEnabled =
 		featureFlags?.find((flag) => flag.name === FeatureKeys.DOT_METRICS_ENABLED)
 			?.active || false;

+	const { currentQuery } = useQueryBuilder();
+	const { handleChangeQueryData } = useQueryOperations({
+		index: 0,
+		query: currentQuery.builder.queryData[0],
+		entityVersion: '',
+	});
+
+	// Track previous urlFilters to only sync when the value actually changes
+	// (not when handleChangeQueryData changes due to query updates)
+	const prevUrlFiltersRef = useRef<string | null>(null);
+
+	useEffect(() => {
+		const currentFiltersJson = urlFilters ? JSON.stringify(urlFilters) : null;
+
+		// Only sync if urlFilters value has actually changed
+		if (prevUrlFiltersRef.current !== currentFiltersJson) {
+			prevUrlFiltersRef.current = currentFiltersJson;
+			// Sync filters to query builder, using empty filter when urlFilters is null
+			handleChangeQueryData('filters', urlFilters || { items: [], op: 'and' });
+		}
+		// eslint-disable-next-line react-hooks/exhaustive-deps
+	}, [urlFilters]); // handleChangeQueryData intentionally omitted - we call the current version but don't re-run when it changes
+
 	const handleFilterVisibilityChange = (): void => {
 		setShowFilters(!showFilters);
 	};

+	const handleQuickFiltersChange = (query: Query): void => {
+		const filters = query.builder.queryData[0].filters;
+		// Nuqs batches these calls into a single URL update
+		// The useEffect will sync filters to query builder
+		setUrlFilters(filters || null);
+		setCurrentPage(1);
+		logEvent(InfraMonitoringEvents.FilterApplied, {
+			entity: InfraMonitoringEvents.HostEntity,
+			page: InfraMonitoringEvents.ListPage,
+		});
+	};
+
 	const fetchListData = useCallback(
 		async (filters: K8sBaseFilters, signal?: AbortSignal) => {
-			try {
-				const response = await listHosts(
-					{
-						filter: {
-							expression: filters.filter.expression,
-							filterByStatus: filters.filter.filterByStatus
-								? (filters.filter.filterByStatus as InframonitoringtypesHostStatusDTO)
-								: undefined,
-						},
-						groupBy: filters.groupBy?.map((g) => ({ name: g.name })),
-						offset: filters.offset,
-						limit: filters.limit ?? 10,
-						start: filters.start,
-						end: filters.end,
-						orderBy: filters.orderBy
-							? {
-									key: { name: filters.orderBy.key.name },
-									direction:
-										filters.orderBy.direction === 'asc'
-											? Querybuildertypesv5OrderDirectionDTO.asc
-											: Querybuildertypesv5OrderDirectionDTO.desc,
-								}
-							: undefined,
-					},
-					signal,
-				);
+			filters.orderBy ||= {
+				columnName: 'cpu',
+				order: 'desc',
+			};

-				const data = response.data;
-				return {
-					type:
-						data.type === InframonitoringtypesResponseTypeDTO.grouped_list
-							? ('grouped_list' as const)
-							: ('list' as const),
-					records: data.records,
-					total: data.total,
-					endTimeBeforeRetention: data.endTimeBeforeRetention,
-				};
-			} catch (error) {
-				const errMsg =
-					error instanceof Error ? error.message : 'Failed to fetch hosts';
-				return {
-					type: 'list' as const,
-					records: [] as InframonitoringtypesHostRecordDTO[],
-					total: 0,
-					error: errMsg,
-				};
-			}
+			return fetchHostListData(filters, signal);
 		},
 		[],
 	);

 	const fetchEntityData = useCallback(
 		async (
-			filters: K8sDetailsFilters,
+			filters: Parameters<typeof fetchHostEntityData>[0],
 			signal?: AbortSignal,
-		): Promise<{
-			data: InframonitoringtypesHostRecordDTO | null;
-			error?: string | null;
-		}> => {
-			try {
-				const response = await listHosts(
-					{
-						filter: { expression: filters.filter.expression },
-						start: filters.start,
-						end: filters.end,
-						limit: 1,
-						offset: 0,
-					},
-					signal,
-				);
-
-				return {
-					data: response.data.records.length > 0 ? response.data.records[0] : null,
-				};
-			} catch (error) {
-				const errMsg =
-					error instanceof Error ? error.message : 'Failed to fetch host';
-				return {
-					data: null,
-					error: errMsg,
-				};
-			}
-		},
+		) => fetchHostEntityData(filters, signal),
 		[],
 	);

-	const getInitialLogTracesExpression = useCallback(
-		(host: InframonitoringtypesHostRecordDTO) =>
-			hostInitialLogTracesExpression(host, dotMetricsEnabled),
+	const getSelectedItemFilters = useCallback(
+		(selectedItem: string) =>
+			hostGetSelectedItemFilters(selectedItem, dotMetricsEnabled),
 		[dotMetricsEnabled],
 	);
+
+	const getInitialLogTracesFilters = useCallback(
+		(host: import('api/infraMonitoring/getHostLists').HostData) =>
+			hostInitialLogTracesFilter(host, dotMetricsEnabled),
+		[dotMetricsEnabled],
+	);
+
 	const controlListPrefix = !showFilters ? (
 		<div className={styles.quickFiltersToggleContainer}>
 			<Button
@@ -193,7 +155,18 @@ function Hosts(): JSX.Element {
 			<div className={styles.infraMonitoringContainer}>
 				<div className={styles.infraContentRow}>
 					{showFilters && (
-						<div className={styles.quickFiltersContainer}>
+						<ResizableBox
+							handle="right"
+							defaultWidth={QUICK_FILTERS_DEFAULT_WIDTH}
+							initialWidth={quickFiltersInitialWidth}
+							minWidth={QUICK_FILTERS_MIN_WIDTH}
+							maxWidth={QUICK_FILTERS_MAX_WIDTH}
+							onResize={persistQuickFiltersWidth}
+							resetToDefaultOnDoubleClick
+							withHandle
+							className={styles.quickFiltersContainer}
+							handleTestId="quick-filters-resize-handle"
+						>
 							<div className={styles.quickFiltersContainerHeader}>
 								<Typography.Text>Filters</Typography.Text>
 								<Tooltip title="Collapse Filters">
@@ -208,17 +181,17 @@ function Hosts(): JSX.Element {
 								source={QuickFiltersSource.INFRA_MONITORING}
 								config={getHostsQuickFiltersConfig(dotMetricsEnabled)}
 								handleFilterVisibilityChange={handleFilterVisibilityChange}
+								onFilterChange={handleQuickFiltersChange}
 							/>
-						</div>
+						</ResizableBox>
 					)}
 					<div
 						className={`${styles.listContainer}${
 							showFilters ? ` ${styles.listContainerFiltersVisible}` : ''
 						}`}
 					>
-						<K8sBaseList<InframonitoringtypesHostRecordDTO>
+						<K8sBaseList
 							controlListPrefix={controlListPrefix}
-							leftFilters={<StatusFilter />}
 							entity={InfraMonitoringEntity.HOSTS}
 							tableColumns={hostColumnsConfig}
 							fetchListData={fetchListData}
@@ -232,11 +205,11 @@ function Hosts(): JSX.Element {
 			<K8sBaseDetails
 				category={InfraMonitoringEntity.HOSTS}
 				eventCategory={InfraMonitoringEvents.HostEntity}
-				getSelectedItemExpression={hostGetSelectedItemExpression}
+				getSelectedItemFilters={getSelectedItemFilters}
 				fetchEntityData={fetchEntityData}
 				getEntityName={hostGetEntityName}
-				getInitialLogTracesExpression={getInitialLogTracesExpression}
-				getInitialEventsExpression={hostInitialEventsExpression}
+				getInitialLogTracesFilters={getInitialLogTracesFilters}
+				getInitialEventsFilters={hostInitialEventsFilter}
 				metadataConfig={hostDetailsMetadataConfig}
 				entityWidgetInfo={hostWidgetInfo}
 				getEntityQueryPayload={getHostMetricsQueryPayload}
--- a/frontend/src/container/InfraMonitoringHostsV2/InfraMonitoringHosts.module.scss
+++ b/frontend/src/container/InfraMonitoringHostsV2/InfraMonitoringHosts.module.scss
@@ -25,31 +25,6 @@
 		}
 	}

-	&::-webkit-scrollbar {
-		width: 8px;
-		height: 8px;
-	}
-
-	&::-webkit-scrollbar-track {
-		background: transparent;
-	}
-
-	&::-webkit-scrollbar-thumb {
-		background: color-mix(in srgb, var(--l1-foreground) 20%, transparent);
-		border-radius: 9999px;
-	}
-
-	&::-webkit-scrollbar-thumb:hover {
-		background: color-mix(in srgb, var(--l1-foreground) 30%, transparent);
-	}
-}
-
-.quickFiltersContainer {
-	width: 280px;
-	min-width: 280px;
-	border-right: 1px solid var(--l1-border);
-	overflow-y: auto;
-
 	&::-webkit-scrollbar {
 		width: 0.1rem;
 		height: 0.1rem;
@@ -66,6 +41,24 @@
 	&::-webkit-scrollbar-thumb:hover {
 		background: colox-mix(var(--accent-primary), var(--bg-vanilla-100), 20%);
 	}
+}
+
+.quickFiltersContainer {
+	// Width is owned by ResizableBox (inline style). No overflow here: the panel
+	// must not scroll (QuickFilters scrolls its own list internally) — an
+	// overflow on the root would also clip the edge-mounted resize grip.
+	flex-shrink: 0;
+	border-right: 1px solid var(--l1-border);
+
+	:global(.resizable-box__content) {
+		display: flex;
+		flex-direction: column;
+	}
+
+	:global(.quick-filters-container) {
+		flex: 1;
+		min-height: 0;
+	}

 	:global(.ant-collapse-header) {
 		border-bottom: 1px solid var(--l1-border);
@@ -99,7 +92,7 @@
 		}

 		&::-webkit-scrollbar-thumb:hover {
-			background: var(--accent-primary);
+			background: colox-mix(var(--accent-primary), var(--bg-vanilla-100), 20%);
 		}
 	}
 }
@@ -114,25 +107,42 @@

 .listContainer {
 	flex: 1;
+	min-width: 0;
 	max-width: 100%;
 	display: flex;
 	flex-direction: column;
 	align-items: stretch;
-	min-width: 595px;

 	> * {
 		min-width: 0;
 		max-width: 100%;
 		box-sizing: border-box;
 	}
+
+	> :global(.ant-table-wrapper) {
+		width: 100%;
+		max-width: 100%;
+
+		:global(.ant-spin-container) {
+			display: flex !important;
+			flex-direction: column;
+		}
+
+		:global(.ant-table),
+		:global(.ant-table-container) {
+			max-width: 100%;
+		}
+	}
 }

 .listContainerFiltersVisible {
-	max-width: calc(100% - 280px);
+	// Width is driven by flex now that the filters panel is resizable; the list
+	// fills whatever space the (variable-width) panel leaves.
+	max-width: 100%;
 }

 .quickFiltersToggleContainer {
-	grid-area: quickFilters;
+	padding: 0 8px;
 }

 .infraMonitoringTags {
--- a/frontend/src/container/InfraMonitoringHostsV2/StatusFilter.module.scss
+++ b/frontend/src/container/InfraMonitoringHostsV2/StatusFilter.module.scss
@@ -1,56 +0,0 @@
-.statusFilterContainer {
-	display: flex;
-	align-items: center;
-
-	--toggle-group-item-size: 100%;
-	--toggle-group-radius: 0px 2px 2px 0px;
-	--toggle-group-item-font-size: var(--periscope-font-size-base);
-}
-
-.statusLabel {
-	min-width: max-content;
-	font-size: var(--periscope-font-size-base);
-	font-weight: var(--periscope-font-weight-regular);
-	line-height: 18px;
-
-	border-radius: 2px 0px 0px 2px;
-	border: 1px solid var(--l2-border);
-	border-right: none;
-
-	display: flex;
-	height: 32px;
-	padding: var(--spacing-3) var(--spacing-3) var(--spacing-3) var(--spacing-4);
-	justify-content: center;
-	align-items: center;
-	gap: var(--spacing-2);
-}
-
-.statusToggleGroup {
-	height: 32px;
-}
-
-.statusToggleItem {
-	flex: unset;
-}
-
-.statusDot {
-	width: 8px;
-	height: 8px;
-	min-height: 8px;
-	min-width: 8px;
-	border-radius: 50%;
-	display: inline-block;
-}
-
-.allDot {
-	border: 1px solid var(--text-muted);
-	background-color: var(--bg-slate-100);
-}
-
-.activeDot {
-	background-color: var(--bg-forest-500);
-}
-
-.inactiveDot {
-	background-color: var(--bg-amber-500);
-}
--- a/frontend/src/container/InfraMonitoringHostsV2/StatusFilter.test.tsx
+++ b/frontend/src/container/InfraMonitoringHostsV2/StatusFilter.test.tsx
@@ -1,152 +0,0 @@
-import { QueryClient, QueryClientProvider } from 'react-query';
-// eslint-disable-next-line no-restricted-imports
-import { Provider } from 'react-redux';
-import { MemoryRouter } from 'react-router-dom';
-import { fireEvent, render, screen, waitFor } from '@testing-library/react';
-import {
-	NuqsTestingAdapter,
-	OnUrlUpdateFunction,
-	UrlUpdateEvent,
-} from 'nuqs/adapters/testing';
-import { AppContext } from 'providers/App/App';
-import TimezoneProvider from 'providers/Timezone';
-import store from 'store';
-import { getAppContextMock } from 'tests/test-utils';
-
-import StatusFilter from './StatusFilter';
-
-const queryClient = new QueryClient({
-	defaultOptions: {
-		queries: { retry: false },
-		mutations: { retry: false },
-	},
-});
-
-function renderStatusFilter({
-	searchParams = {},
-	onUrlUpdate,
-}: {
-	searchParams?: Record<string, string>;
-	onUrlUpdate?: OnUrlUpdateFunction;
-}): ReturnType<typeof render> {
-	return render(
-		<MemoryRouter>
-			<TimezoneProvider>
-				<QueryClientProvider client={queryClient}>
-					<Provider store={store}>
-						<AppContext.Provider value={getAppContextMock('ADMIN')}>
-							<NuqsTestingAdapter
-								searchParams={searchParams}
-								onUrlUpdate={onUrlUpdate}
-							>
-								<StatusFilter />
-							</NuqsTestingAdapter>
-						</AppContext.Provider>
-					</Provider>
-				</QueryClientProvider>
-			</TimezoneProvider>
-		</MemoryRouter>,
-	);
-}
-
-describe('StatusFilter', () => {
-	beforeEach(() => {
-		queryClient.clear();
-	});
-
-	it('renders all status options', () => {
-		renderStatusFilter({});
-
-		expect(screen.getByText('Status')).toBeInTheDocument();
-		expect(screen.getByRole('radio', { name: 'All' })).toBeInTheDocument();
-		expect(screen.getByRole('radio', { name: 'Active' })).toBeInTheDocument();
-		expect(screen.getByRole('radio', { name: 'Inactive' })).toBeInTheDocument();
-	});
-
-	it('selects "All" by default when no URL param', () => {
-		renderStatusFilter({});
-
-		const allButton = screen.getByRole('radio', { name: 'All' });
-		expect(allButton).toHaveAttribute('aria-checked', 'true');
-	});
-
-	it('reads "active" from URL and shows Active selected', () => {
-		renderStatusFilter({ searchParams: { statusFilter: 'active' } });
-
-		const activeButton = screen.getByRole('radio', { name: 'Active' });
-		expect(activeButton).toHaveAttribute('aria-checked', 'true');
-	});
-
-	it('reads "inactive" from URL and shows Inactive selected', () => {
-		renderStatusFilter({ searchParams: { statusFilter: 'inactive' } });
-
-		const inactiveButton = screen.getByRole('radio', { name: 'Inactive' });
-		expect(inactiveButton).toHaveAttribute('aria-checked', 'true');
-	});
-
-	it('updates URL to "active" when Active clicked', async () => {
-		const onUrlUpdate = jest.fn<void, [UrlUpdateEvent]>();
-		renderStatusFilter({ onUrlUpdate });
-
-		const activeButton = screen.getByRole('radio', { name: 'Active' });
-		fireEvent.click(activeButton);
-
-		await waitFor(() => {
-			const statusFilterValue = onUrlUpdate.mock.calls
-				.map((call) => call[0].searchParams.get('statusFilter'))
-				.filter(Boolean)
-				.pop();
-			expect(statusFilterValue).toBe('active');
-		});
-	});
-
-	it('updates URL to "inactive" when Inactive clicked', async () => {
-		const onUrlUpdate = jest.fn<void, [UrlUpdateEvent]>();
-		renderStatusFilter({ onUrlUpdate });
-
-		const inactiveButton = screen.getByRole('radio', { name: 'Inactive' });
-		fireEvent.click(inactiveButton);
-
-		await waitFor(() => {
-			const statusFilterValue = onUrlUpdate.mock.calls
-				.map((call) => call[0].searchParams.get('statusFilter'))
-				.filter(Boolean)
-				.pop();
-			expect(statusFilterValue).toBe('inactive');
-		});
-	});
-
-	it('removes statusFilter from URL when All clicked', async () => {
-		const onUrlUpdate = jest.fn<void, [UrlUpdateEvent]>();
-		renderStatusFilter({
-			searchParams: { statusFilter: 'active' },
-			onUrlUpdate,
-		});
-
-		const allButton = screen.getByRole('radio', { name: 'All' });
-		fireEvent.click(allButton);
-
-		await waitFor(() => {
-			const lastCall = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1];
-			expect(lastCall[0].searchParams.get('statusFilter')).toBeNull();
-		});
-	});
-
-	it('resets page when filter changes', async () => {
-		const onUrlUpdate = jest.fn<void, [UrlUpdateEvent]>();
-		renderStatusFilter({
-			searchParams: { page: '3' },
-			onUrlUpdate,
-		});
-
-		const activeButton = screen.getByRole('radio', { name: 'Active' });
-		fireEvent.click(activeButton);
-
-		await waitFor(() => {
-			const lastCall = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1];
-			const pageValue = lastCall[0].searchParams.get('page');
-			// page=1 is default, so nuqs removes it from URL (null) or keeps as "1"
-			expect(pageValue === null || pageValue === '1').toBe(true);
-		});
-	});
-});
--- a/frontend/src/container/InfraMonitoringHostsV2/StatusFilter.tsx
+++ b/frontend/src/container/InfraMonitoringHostsV2/StatusFilter.tsx
@@ -1,63 +0,0 @@
-import { ToggleGroup, ToggleGroupItem } from '@signozhq/ui/toggle-group';
-import {
-	StatusFilterValue,
-	useInfraMonitoringPageListing,
-	useInfraMonitoringStatusFilter,
-} from 'container/InfraMonitoringK8sV2/hooks';
-
-import styles from './StatusFilter.module.scss';
-
-const statusOptions: Array<{
-	label: string;
-	value: StatusFilterValue | 'all';
-}> = [
-	{ label: 'All', value: 'all' },
-	{ label: 'Active', value: 'active' },
-	{ label: 'Inactive', value: 'inactive' },
-];
-
-function StatusFilter(): JSX.Element {
-	const [statusFilter, setStatusFilter] = useInfraMonitoringStatusFilter();
-	const [, setCurrentPage] = useInfraMonitoringPageListing();
-
-	const handleChange = (value: string): void => {
-		if (value !== undefined) {
-			void setStatusFilter(value === 'all' ? '' : (value as StatusFilterValue));
-			void setCurrentPage(1);
-		}
-	};
-
-	return (
-		<div className={styles.statusFilterContainer}>
-			<div className={styles.statusLabel}>Status</div>
-			<ToggleGroup
-				type="single"
-				value={statusFilter === '' ? 'all' : statusFilter}
-				onChange={handleChange}
-				className={styles.statusToggleGroup}
-			>
-				{statusOptions.map((option) => (
-					<ToggleGroupItem
-						key={option.value}
-						value={option.value}
-						aria-label={option.label}
-						className={styles.statusToggleItem}
-					>
-						<span
-							className={`${styles.statusDot} ${
-								option.value === 'active'
-									? styles.activeDot
-									: option.value === 'inactive'
-										? styles.inactiveDot
-										: styles.allDot
-							}`}
-						/>
-						{option.label}
-					</ToggleGroupItem>
-				))}
-			</ToggleGroup>
-		</div>
-	);
-}
-
-export default StatusFilter;
--- a/frontend/src/container/InfraMonitoringHostsV2/constants.tsx
+++ b/frontend/src/container/InfraMonitoringHostsV2/constants.tsx
@@ -4,17 +4,26 @@ import { Badge } from '@signozhq/ui/badge';
 import { Progress } from '@signozhq/ui/progress';
 import { Typography } from '@signozhq/ui/typography';
 import {
-	InframonitoringtypesHostRecordDTO,
-	InframonitoringtypesHostStatusDTO,
-} from 'api/generated/services/sigNoz.schemas';
-import { K8sDetailsMetadataConfig } from 'container/InfraMonitoringK8sV2/Base/K8sBaseDetails';
-import { formatValueForExpression } from 'components/QueryBuilderV2/utils';
-import { INFRA_MONITORING_ATTR_KEYS } from 'container/InfraMonitoringK8sV2/constants';
-import { SelectedItemParams } from 'container/InfraMonitoringK8sV2/hooks';
+	getHostLists,
+	HostData,
+	HostListPayload,
+} from 'api/infraMonitoring/getHostLists';
+import {
+	createFilterItem,
+	K8sDetailsFilters,
+	K8sDetailsMetadataConfig,
+} from 'container/InfraMonitoringK8sV2/Base/K8sBaseDetails';
+import { K8sBaseFilters } from 'container/InfraMonitoringK8sV2/Base/types';
 import {
 	getHostQueryPayload,
 	hostWidgetInfo,
 } from 'container/LogDetailedView/InfraMetrics/constants';
+import {
+	TagFilter,
+	TagFilterItem,
+} from 'types/api/queryBuilder/queryBuilderData';
+
+import { getHostListsQuery } from './utils';

 import infraHostsStyles from './InfraMonitoringHosts.module.scss';

@@ -38,32 +47,24 @@ export function getMemoryProgressColor(percent: number): string {
 	return Color.BG_FOREST_500;
 }

-export type HostDetailMetadataConfigType =
-	K8sDetailsMetadataConfig<InframonitoringtypesHostRecordDTO>;
-export const hostDetailsMetadataConfig: HostDetailMetadataConfigType[] = [
+export const hostDetailsMetadataConfig: K8sDetailsMetadataConfig<HostData>[] = [
 	{
 		label: 'STATUS',
-		getValue: (h): string =>
-			h.status === InframonitoringtypesHostStatusDTO.active
-				? 'ACTIVE'
-				: 'INACTIVE',
-		render: (value, h): React.ReactNode => {
-			const isActive = h.status === InframonitoringtypesHostStatusDTO.active;
-			return (
-				<Badge
-					variant="outline"
-					className={`${infraHostsStyles.infraMonitoringTags} ${
-						isActive ? infraHostsStyles.tagsActive : infraHostsStyles.tagsInactive
-					}`}
-				>
-					{value}
-				</Badge>
-			);
-		},
+		getValue: (h): string => (h.active ? 'ACTIVE' : 'INACTIVE'),
+		render: (value, h): React.ReactNode => (
+			<Badge
+				variant="outline"
+				className={`${infraHostsStyles.infraMonitoringTags} ${
+					h.active ? infraHostsStyles.tagsActive : infraHostsStyles.tagsInactive
+				}`}
+			>
+				{value}
+			</Badge>
+		),
 	},
 	{
 		label: 'OPERATING SYSTEM',
-		getValue: (h): string => h.meta?.['os.type'] || '-',
+		getValue: (h): string => h.os || '-',
 		render: (value): React.ReactNode =>
 			value !== '-' ? (
 				<Badge variant="outline" className={infraHostsStyles.infraMonitoringTags}>
@@ -98,7 +99,7 @@ export const hostDetailsMetadataConfig: HostDetailMetadataConfigType[] = [
 ];

 export function getHostMetricsQueryPayload(
-	host: InframonitoringtypesHostRecordDTO,
+	host: HostData,
 	start: number,
 	end: number,
 	dotMetricsEnabled: boolean,
@@ -108,28 +109,83 @@ export function getHostMetricsQueryPayload(

 export { hostWidgetInfo };

-export const hostGetSelectedItemExpression = (
-	params: SelectedItemParams,
-): string =>
-	`host.name = ${formatValueForExpression(params.selectedItem ?? '')}`;
-
-export function hostInitialLogTracesExpression(
-	host: InframonitoringtypesHostRecordDTO,
+export function hostGetSelectedItemFilters(
+	selectedItem: string,
 	dotMetricsEnabled: boolean,
-): string {
-	const hostKey = dotMetricsEnabled
-		? INFRA_MONITORING_ATTR_KEYS.HOST_NAME
-		: 'host_name';
-	const hostName = formatValueForExpression(host.hostName || '');
-	return `${hostKey} = ${hostName}`;
+): TagFilter {
+	const hostKey = dotMetricsEnabled ? 'host.name' : 'host_name';
+	return {
+		op: 'AND',
+		items: [createFilterItem(hostKey, selectedItem)],
+	};
 }

-export function hostInitialEventsExpression(
-	_host: InframonitoringtypesHostRecordDTO,
-): string {
-	return '';
+export function hostInitialLogTracesFilter(
+	host: HostData,
+	dotMetricsEnabled: boolean,
+): TagFilterItem[] {
+	const hostKey = dotMetricsEnabled ? 'host.name' : 'host_name';
+	return [createFilterItem(hostKey, host.hostName || '')];
 }

-export const hostGetEntityName = (
-	host: InframonitoringtypesHostRecordDTO,
-): string => host.hostName;
+export function hostInitialEventsFilter(_host: HostData): TagFilterItem[] {
+	return [];
+}
+
+export const hostGetEntityName = (host: HostData): string => host.hostName;
+
+export async function fetchHostListData(
+	filters: K8sBaseFilters,
+	signal?: AbortSignal,
+): Promise<{
+	data: HostData[];
+	total: number;
+	error?: string | null;
+	rawData?: unknown;
+}> {
+	const baseQuery = getHostListsQuery();
+	const payload: HostListPayload = {
+		...baseQuery,
+		limit: filters.limit,
+		offset: filters.offset,
+		filters: filters.filters ?? { items: [], op: 'and' },
+		orderBy: filters.orderBy,
+		start: filters.start,
+		end: filters.end,
+		groupBy: filters.groupBy ?? [],
+	};
+
+	const response = await getHostLists(payload, signal);
+
+	return {
+		data: response.payload?.data?.records || [],
+		total: response.payload?.data?.total || 0,
+		error: response.error,
+		rawData: response.payload?.data,
+	};
+}
+
+export async function fetchHostEntityData(
+	filters: K8sDetailsFilters,
+	signal?: AbortSignal,
+): Promise<{ data: HostData | null; error?: string | null }> {
+	const response = await getHostLists(
+		{
+			...getHostListsQuery(),
+			filters: filters.filters,
+			start: filters.start,
+			end: filters.end,
+			limit: 1,
+			offset: 0,
+			groupBy: [],
+		},
+		signal,
+	);
+
+	const records = response.payload?.data?.records || [];
+
+	return {
+		data: records.length > 0 ? records[0] : null,
+		error: response.error,
+	};
+}
--- a/frontend/src/container/InfraMonitoringHostsV2/table.config.tsx
+++ b/frontend/src/container/InfraMonitoringHostsV2/table.config.tsx
@@ -1,91 +1,55 @@
 import React from 'react';
-import { Color } from '@signozhq/design-tokens';
-import { Container } from '@signozhq/icons';
-import {
-	InframonitoringtypesHostRecordDTO,
-	InframonitoringtypesHostStatusDTO,
-} from 'api/generated/services/sigNoz.schemas';
+import { Tooltip } from 'antd';
+import { Badge } from '@signozhq/ui/badge';
+import { HostData } from 'api/infraMonitoring/getHostLists';
 import TanStackTable, { TableColumnDef } from 'components/TanStackTableView';
 import { getGroupByEl } from 'container/InfraMonitoringK8sV2/Base/utils';
 import {
 	EntityProgressBar,
 	ExpandButtonWrapper,
-	GroupedStatusCounts,
 	ValidateColumnValueWrapper,
 } from 'container/InfraMonitoringK8sV2/components';
-import {
-	INFRA_MONITORING_ATTR_KEYS,
-	InfraMonitoringEntity,
-} from 'container/InfraMonitoringK8sV2/constants';
+import { InfraMonitoringEntity } from 'container/InfraMonitoringK8sV2/constants';
 import { useInfraMonitoringGroupBy } from 'container/InfraMonitoringK8sV2/hooks';
-import ColumnHeader from 'container/InfraMonitoringK8sV2/Base/ColumnHeader';
 import EntityGroupHeader from 'container/InfraMonitoringK8sV2/Base/EntityGroupHeader';

 import { HostnameCell } from './utils';

 import styles from './table.module.scss';
-import { Badge, BadgeColor } from '@signozhq/ui/badge';
+import { Container, Info } from '@signozhq/icons';

-const statusMap: Record<
-	InframonitoringtypesHostStatusDTO,
-	{
-		label: string;
-		color: BadgeColor;
-	}
-> = {
-	[InframonitoringtypesHostStatusDTO.active]: {
-		label: 'ACTIVE',
-		color: 'forest',
-	},
-	[InframonitoringtypesHostStatusDTO.inactive]: {
-		label: 'INACTIVE',
-		color: 'amber',
-	},
-	['']: {
-		label: 'UNKNOWN',
-		color: 'secondary',
-	},
-};
-
-function hostRowSource(host: InframonitoringtypesHostRecordDTO): {
-	meta: Record<string, string>;
-} {
+function hostRowSource(host: HostData): { meta: Record<string, string> } {
 	return {
 		meta: {
 			...(host.meta ?? {}),
-			[INFRA_MONITORING_ATTR_KEYS.HOST_NAME]: host.hostName ?? '',
+			host_name: host.hostName ?? '',
+			'host.name': host.hostName ?? '',
+			os_type: host.os ?? '',
+			'os.type': host.os ?? '',
 		},
 	};
 }

-export function getHostRowKey(host: InframonitoringtypesHostRecordDTO): string {
+export function getHostRowKey(host: HostData): string {
 	return host.hostName || 'unknown';
 }

-export function getHostItemKey(
-	host: InframonitoringtypesHostRecordDTO,
-): string {
+export function getHostItemKey(host: HostData): string {
 	return host.hostName ?? '';
 }

-function HostGroupCell({
-	row,
-}: {
-	row: InframonitoringtypesHostRecordDTO;
-}): JSX.Element {
+function HostGroupCell({ row }: { row: HostData }): JSX.Element {
 	const [groupBy] = useInfraMonitoringGroupBy();
 	const synthetic = hostRowSource(row);
 	return getGroupByEl(synthetic, groupBy) as JSX.Element;
 }

-export type HostColumnConfigType =
-	TableColumnDef<InframonitoringtypesHostRecordDTO>;
-export const hostColumnsConfig: HostColumnConfigType[] = [
+export const hostColumnsConfig: TableColumnDef<HostData>[] = [
 	{
 		id: 'hostGroup',
-		header: (): React.ReactNode => <EntityGroupHeader title="Host Group" />,
+		header: (): React.ReactNode => <EntityGroupHeader title="HOST GROUP" />,
 		accessorFn: (row): string => row.hostName ?? '',
-		width: { min: 290 },
+		width: { min: 300 },
 		enableSort: false,
 		enableRemove: false,
 		enableMove: false,
@@ -100,11 +64,7 @@ export const hostColumnsConfig: HostColumnConfigType[] = [
 	{
 		id: 'hostName',
 		header: (): React.ReactNode => (
-			<EntityGroupHeader
-				title="Hostname"
-				icon={<Container size={14} />}
-				docPath="/infrastructure-monitoring/host-monitoring#hostname"
-			/>
+			<EntityGroupHeader title="Hostname" icon={<Container size={14} />} />
 		),
 		accessorFn: (row): string => row.hostName ?? '',
 		width: { min: 290 },
@@ -118,48 +78,27 @@ export const hostColumnsConfig: HostColumnConfigType[] = [
 		),
 	},
 	{
-		id: 'status',
+		id: 'active',
 		header: (): React.ReactNode => (
-			<ColumnHeader
-				tooltip="Sent system metrics in last 10 mins."
-				docPath="/infrastructure-monitoring/host-monitoring#status"
-			>
+			<div className={styles.statusHeader}>
 				Status
-			</ColumnHeader>
+				<Tooltip title="Sent system metrics in last 10 mins">
+					<Info size="md" />
+				</Tooltip>
+			</div>
 		),
-		accessorFn: (row): string => row.status,
-		width: { min: 140 },
+		accessorFn: (row): boolean => row.active,
+		width: { min: 150, default: 150 },
 		enableSort: false,
-		cell: ({ value, groupMeta, row }): React.ReactNode => {
-			const status = value as InframonitoringtypesHostStatusDTO;
-
-			if (groupMeta) {
-				return (
-					<GroupedStatusCounts
-						items={[
-							{
-								value: row.activeHostCount,
-								label: 'Active',
-								color: Color.BG_FOREST_500,
-							},
-							{
-								value: row.inactiveHostCount,
-								label: 'Inactive',
-								color: Color.BG_AMBER_500,
-							},
-						]}
-					/>
-				);
-			}
-
-			const statusDetails = statusMap[status] || statusMap[''];
+		cell: ({ value }): React.ReactNode => {
+			const active = value as boolean;
 			return (
 				<Badge
-					variant="outline"
-					color={statusDetails.color}
-					className={`${styles.statusTag}`}
+					className={`${styles.statusTag} ${
+						active ? styles.statusTagActive : styles.statusTagInactive
+					}`}
 				>
-					{statusDetails.label}
+					{active ? 'ACTIVE' : 'INACTIVE'}
 				</Badge>
 			);
 		},
@@ -167,9 +106,7 @@ export const hostColumnsConfig: HostColumnConfigType[] = [
 	{
 		id: 'cpu',
 		header: (): React.ReactNode => (
-			<ColumnHeader docPath="/infrastructure-monitoring/host-monitoring#cpu-usage">
-				CPU Usage
-			</ColumnHeader>
+			<div className={styles.columnHeaderRight}>CPU Usage</div>
 		),
 		accessorFn: (row): number => row.cpu,
 		width: { min: 220 },
@@ -192,16 +129,15 @@ export const hostColumnsConfig: HostColumnConfigType[] = [
 	{
 		id: 'memory',
 		header: (): React.ReactNode => (
-			<ColumnHeader
-				tooltip="Excluding cache memory."
-				docPath="/infrastructure-monitoring/host-monitoring#memory-usage"
-				className={styles.memoryUsageHeader}
-			>
-				Memory Usage (WSS)
-			</ColumnHeader>
+			<div className={`${styles.columnHeaderRight} ${styles.memoryUsageHeader}`}>
+				Memory Usage
+				<Tooltip title="Excluding cache memory">
+					<Info size="md" />
+				</Tooltip>
+			</div>
 		),
 		accessorFn: (row): number => row.memory,
-		width: { min: 240 },
+		width: { min: 220 },
 		enableSort: true,
 		cell: ({ value }): React.ReactNode => {
 			const memory = value as number;
@@ -221,12 +157,10 @@ export const hostColumnsConfig: HostColumnConfigType[] = [
 	{
 		id: 'wait',
 		header: (): React.ReactNode => (
-			<ColumnHeader docPath="/infrastructure-monitoring/host-monitoring#iowait">
-				IOWait
-			</ColumnHeader>
+			<div className={styles.columnHeaderRight}>IOWait</div>
 		),
 		accessorFn: (row): number => row.wait,
-		width: { min: 120 },
+		width: { min: 100, default: 100 },
 		enableSort: true,
 		cell: ({ value }): React.ReactNode => {
 			const wait = value as number;
@@ -237,9 +171,7 @@ export const hostColumnsConfig: HostColumnConfigType[] = [
 					entity={InfraMonitoringEntity.HOSTS}
 					attribute="IOWait metric"
 				>
-					<TanStackTable.Text>
-						{`${Number((wait * 100).toFixed(1))}%`}
-					</TanStackTable.Text>
+					<TanStackTable.Text>{`${Number((wait * 100).toFixed(1))}%`}</TanStackTable.Text>
 				</ValidateColumnValueWrapper>
 			);
 		},
@@ -247,15 +179,13 @@ export const hostColumnsConfig: HostColumnConfigType[] = [
 	{
 		id: 'load15',
 		header: (): React.ReactNode => (
-			<ColumnHeader docPath="/infrastructure-monitoring/host-monitoring#load-avg">
-				Load Avg (15min)
-			</ColumnHeader>
+			<div className={styles.columnHeaderRight}>Load Avg</div>
 		),
 		accessorFn: (row): number => row.load15,
-		width: { min: 200 },
+		width: { min: 100, default: 100 },
 		enableSort: true,
 		cell: ({ value }): React.ReactNode => {
-			const load15 = Number(value);
+			const load15 = value as number;

 			return (
 				<ValidateColumnValueWrapper
@@ -263,35 +193,9 @@ export const hostColumnsConfig: HostColumnConfigType[] = [
 					entity={InfraMonitoringEntity.HOSTS}
 					attribute="load average metric"
 				>
-					<TanStackTable.Text>{load15.toFixed(2)}</TanStackTable.Text>
+					<TanStackTable.Text>{load15}</TanStackTable.Text>
 				</ValidateColumnValueWrapper>
 			);
 		},
 	},
-	{
-		id: 'diskUsage',
-		header: (): React.ReactNode => (
-			<ColumnHeader docPath="/infrastructure-monitoring/host-monitoring#disk-usage">
-				Disk Usage
-			</ColumnHeader>
-		),
-		accessorFn: (row): number => row.diskUsage,
-		width: { min: 160 },
-		enableSort: true,
-		cell: ({ value }): React.ReactNode => {
-			const diskUsage = value as number;
-
-			return (
-				<div className={styles.progressContainer}>
-					<ValidateColumnValueWrapper
-						value={diskUsage}
-						entity={InfraMonitoringEntity.HOSTS}
-						attribute="disk usage metric"
-					>
-						<EntityProgressBar value={diskUsage} type="disk" />
-					</ValidateColumnValueWrapper>
-				</div>
-			);
-		},
-	},
 ];
--- a/frontend/src/container/InfraMonitoringHostsV2/table.module.scss
+++ b/frontend/src/container/InfraMonitoringHostsV2/table.module.scss
@@ -9,6 +9,13 @@
 	display: block;
 }

+.statusHeader {
+	display: inline-flex;
+	align-items: center;
+	gap: var(--spacing-2);
+	width: 100%;
+}
+
 .columnHeaderRight {
 	text-align: right;
 }
--- a/frontend/src/container/InfraMonitoringHostsV2/utils.tsx
+++ b/frontend/src/container/InfraMonitoringHostsV2/utils.tsx
@@ -2,16 +2,14 @@ import React from 'react';
 import { Color } from '@signozhq/design-tokens';
 import { Tooltip } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
+import { HostListPayload } from 'api/infraMonitoring/getHostLists';
 import {
 	FiltersType,
 	IQuickFiltersConfig,
 } from 'components/QuickFilters/types';
 import { TriangleAlert } from '@signozhq/icons';
-import { INFRA_MONITORING_ATTR_KEYS } from 'container/InfraMonitoringK8sV2/constants';
-import { CellValueTooltip } from 'container/InfraMonitoringK8sV2/components';
 import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse';
 import { DataSource } from 'types/common/queryBuilder';
-import TanStackTable from 'components/TanStackTableView';

 const HOSTNAME_DOCS_URL =
 	'https://signoz.io/docs/infrastructure-monitoring/hostmetrics/#host-name-is-blankempty';
@@ -23,15 +21,13 @@ export function HostnameCell({
 }): React.ReactElement {
 	const isEmpty = !hostName || !hostName.trim();
 	if (!isEmpty) {
-		return (
-			<CellValueTooltip value={hostName}>
-				<TanStackTable.Text>{hostName}</TanStackTable.Text>
-			</CellValueTooltip>
-		);
+		return <div className="hostname-column-value">{hostName}</div>;
 	}
 	return (
-		<>
-			<Typography.Text color="muted">-</Typography.Text>
+		<div className="hostname-cell-missing">
+			<Typography.Text color="muted" className="hostname-cell-placeholder">
+				-
+			</Typography.Text>
 			<Tooltip
 				title={
 					<div>
@@ -64,16 +60,52 @@ export function HostnameCell({
 					<TriangleAlert size={14} color={Color.BG_CHERRY_500} />
 				</span>
 			</Tooltip>
-		</>
+		</div>
 	);
 }

+export const getHostListsQuery = (): HostListPayload => ({
+	filters: {
+		items: [],
+		op: 'and',
+	},
+	groupBy: [],
+	orderBy: { columnName: 'cpu', order: 'desc' },
+});
+
+export const HostsQuickFiltersConfig: IQuickFiltersConfig[] = [
+	{
+		type: FiltersType.CHECKBOX,
+		title: 'Host Name',
+		attributeKey: {
+			key: 'host_name',
+			dataType: DataTypes.String,
+			type: 'resource',
+		},
+		aggregateOperator: 'noop',
+		aggregateAttribute: 'system_cpu_load_average_15m',
+		dataSource: DataSource.METRICS,
+		defaultOpen: true,
+	},
+	{
+		type: FiltersType.CHECKBOX,
+		title: 'OS Type',
+		attributeKey: {
+			key: 'os_type',
+			dataType: DataTypes.String,
+			type: 'resource',
+		},
+		aggregateOperator: 'noop',
+		aggregateAttribute: 'system_cpu_load_average_15m',
+		dataSource: DataSource.METRICS,
+		defaultOpen: true,
+	},
+];
+
 export function getHostsQuickFiltersConfig(
 	dotMetricsEnabled: boolean,
 ): IQuickFiltersConfig[] {
-	const hostNameKey = dotMetricsEnabled
-		? INFRA_MONITORING_ATTR_KEYS.HOST_NAME
-		: 'host_name';
+	const hostNameKey = dotMetricsEnabled ? 'host.name' : 'host_name';
 	const osTypeKey = dotMetricsEnabled ? 'os.type' : 'os_type';
 	const metricName = dotMetricsEnabled
 		? 'system.cpu.load_average.15m'
--- a/frontend/src/container/InfraMonitoringK8s/InfraMonitoringK8s.module.scss
+++ b/frontend/src/container/InfraMonitoringK8s/InfraMonitoringK8s.module.scss
@@ -44,26 +44,15 @@
 }

 .quickFiltersContainer {
-	width: 280px;
-	min-width: 280px;
+	// Width is owned by ResizableBox (inline style). No overflow here: the panel
+	// must not scroll (QuickFilters scrolls its own list internally) — an
+	// overflow on the root would also clip the edge-mounted resize grip.
+	flex-shrink: 0;
 	border-right: 1px solid var(--l1-border);
-	overflow-y: auto;

-	&::-webkit-scrollbar {
-		width: 0.1rem;
-		height: 0.1rem;
-	}
-
-	&::-webkit-scrollbar-track {
-		background: transparent;
-	}
-
-	&::-webkit-scrollbar-thumb {
-		background: var(--accent-primary);
-	}
-
-	&::-webkit-scrollbar-thumb:hover {
-		background: colox-mix(var(--accent-primary), var(--bg-vanilla-100), 20%);
+	:global(.resizable-box__content) {
+		display: flex;
+		flex-direction: column;
 	}

 	:global(.quick-filters) {
@@ -128,7 +117,9 @@
 }

 .listContainerFiltersVisible {
-	max-width: calc(100% - 280px);
+	// Width is driven by flex now that the filters panel is resizable; the list
+	// fills whatever space the (variable-width) panel leaves.
+	max-width: 100%;
 }

 .categorySelectorSection {
@@ -219,8 +210,16 @@

 .quickFiltersSection {
 	flex: 1;
+	min-height: 0;
+	display: flex;
+	flex-direction: column;
 	overflow-y: auto;

+	:global(.quick-filters-container) {
+		flex: 1;
+		min-height: 0;
+	}
+
 	&::-webkit-scrollbar {
 		width: 0.1rem;
 	}
--- a/frontend/src/container/InfraMonitoringK8s/InfraMonitoringK8s.tsx
+++ b/frontend/src/container/InfraMonitoringK8s/InfraMonitoringK8s.tsx
@@ -6,6 +6,7 @@ import logEvent from 'api/common/logEvent';
 import QuickFilters from 'components/QuickFilters/QuickFilters';
 import { QuickFiltersSource } from 'components/QuickFilters/types';
 import { InfraMonitoringEvents } from 'constants/events';
+import { LOCALSTORAGE } from 'constants/localStorage';
 import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
 import { useQueryOperations } from 'hooks/queryBuilder/useQueryBuilderOperations';
 import {
@@ -22,6 +23,8 @@ import {
 	Workflow,
 } from '@signozhq/icons';
 import ErrorBoundaryFallback from 'pages/ErrorBoundaryFallback/ErrorBoundaryFallback';
+import { ResizableBox } from 'periscope/components/ResizableBox';
+import usePanelWidth from 'periscope/components/ResizableBox/usePanelWidth';
 import { Query } from 'types/api/queryBuilder/queryBuilderData';

 import { FeatureKeys } from '../../constants/features';
@@ -56,9 +59,23 @@ import K8sVolumesList from './Volumes/K8sVolumesList';

 import styles from './InfraMonitoringK8s.module.scss';

+const QUICK_FILTERS_DEFAULT_WIDTH = 280;
+const QUICK_FILTERS_MIN_WIDTH = 240;
+const QUICK_FILTERS_MAX_WIDTH = 500;
+
 export default function InfraMonitoringK8s(): JSX.Element {
 	const [showFilters, setShowFilters] = useState(true);

+	const {
+		initialWidth: quickFiltersInitialWidth,
+		persistWidth: persistQuickFiltersWidth,
+	} = usePanelWidth({
+		storageKey: LOCALSTORAGE.QUICK_FILTERS_WIDTH_INFRA,
+		defaultWidth: QUICK_FILTERS_DEFAULT_WIDTH,
+		minWidth: QUICK_FILTERS_MIN_WIDTH,
+		maxWidth: QUICK_FILTERS_MAX_WIDTH,
+	});
+
 	const [selectedCategory, setSelectedCategory] = useInfraMonitoringCategory();
 	const [urlFilters, setUrlFilters] = useInfraMonitoringFiltersK8s();
 	const [, setGroupBy] = useInfraMonitoringGroupBy();
@@ -212,7 +229,18 @@ export default function InfraMonitoringK8s(): JSX.Element {
 			<div className={styles.infraMonitoringContainer}>
 				<div className={styles.infraContentRow}>
 					{showFilters && (
-						<div className={styles.quickFiltersContainer}>
+						<ResizableBox
+							handle="right"
+							defaultWidth={QUICK_FILTERS_DEFAULT_WIDTH}
+							initialWidth={quickFiltersInitialWidth}
+							minWidth={QUICK_FILTERS_MIN_WIDTH}
+							maxWidth={QUICK_FILTERS_MAX_WIDTH}
+							onResize={persistQuickFiltersWidth}
+							resetToDefaultOnDoubleClick
+							withHandle
+							className={styles.quickFiltersContainer}
+							handleTestId="quick-filters-resize-handle"
+						>
 							<div className={styles.categorySelectorSection}>
 								<div className={styles.sectionHeader} data-type="resource">
 									<Typography.Text className={styles.sectionLabel}>
@@ -265,7 +293,7 @@ export default function InfraMonitoringK8s(): JSX.Element {
 									/>
 								)}
 							</div>
-						</div>
+						</ResizableBox>
 					)}

 					<div
--- a/frontend/src/container/InfraMonitoringK8sV2/Base/ColumnHeader.module.scss
+++ b/frontend/src/container/InfraMonitoringK8sV2/Base/ColumnHeader.module.scss
@@ -1,16 +0,0 @@
-.columnHeader {
-	display: inline-flex;
-	align-items: center;
-	gap: var(--spacing-2);
-}
-
-.infoIcon {
-	display: inline-flex;
-	align-items: center;
-	cursor: pointer;
-}
-
-.columnHeaderLabel {
-	text-align: center;
-	padding: var(--spacing-2) var(--spacing-2) var(--spacing-2) 0px;
-}
--- a/frontend/src/container/InfraMonitoringK8sV2/Base/ColumnHeader.tsx
+++ b/frontend/src/container/InfraMonitoringK8sV2/Base/ColumnHeader.tsx
@@ -1,90 +0,0 @@
-import { Info } from '@signozhq/icons';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
-
-import styles from './ColumnHeader.module.scss';
-import cx from 'classnames';
-
-const DOCS_BASE_URL = `${process.env.DOCS_BASE_URL}/docs`;
-
-interface ColumnHeaderProps {
-	children?: React.ReactNode;
-	title?: string;
-	docPath?: string;
-	tooltip?: string;
-	className?: string;
-}
-
-function ColumnHeader({
-	children,
-	title,
-	docPath,
-	tooltip,
-	className,
-}: ColumnHeaderProps): JSX.Element {
-	const renderContent = (): React.ReactNode => {
-		if (children) {
-			return children;
-		}
-
-		if (title) {
-			const parts = title.split('\n');
-			return parts.map((part, index) => (
-				<div key={`${part}-${index}`}>
-					{part}
-					{index < parts.length - 1 && <br />}
-				</div>
-			));
-		}
-
-		return null;
-	};
-
-	const renderInfoIcon = (): React.ReactNode => {
-		if (docPath) {
-			const tooltipTitle = tooltip || 'Not sure what this means?';
-			return (
-				<TooltipSimple
-					arrow
-					title={
-						<>
-							{tooltipTitle}{' '}
-							<a
-								href={`${DOCS_BASE_URL}${docPath}`}
-								target="_blank"
-								rel="noopener"
-								onClick={(e): void => e.stopPropagation()}
-							>
-								Learn more.
-							</a>
-						</>
-					}
-				>
-					<div className={styles.infoIcon}>
-						<Info size="md" />
-					</div>
-				</TooltipSimple>
-			);
-		}
-
-		if (tooltip) {
-			return (
-				<TooltipSimple title={tooltip}>
-					<div className={styles.infoIcon}>
-						<Info size="md" />
-					</div>
-				</TooltipSimple>
-			);
-		}
-
-		return null;
-	};
-
-	return (
-		<div className={cx(styles.columnHeader, className)} data-slot="column-header">
-			<div className={styles.columnHeaderLabel}>{renderContent()}</div>
-			{renderInfoIcon()}
-		</div>
-	);
-}
-
-export default ColumnHeader;
--- a/frontend/src/container/InfraMonitoringK8sV2/Base/EntityGroupHeader.module.scss
+++ b/frontend/src/container/InfraMonitoringK8sV2/Base/EntityGroupHeader.module.scss
@@ -2,16 +2,4 @@
 	display: flex;
 	align-items: center;
 	gap: var(--spacing-5);
-	padding-left: 4px;
-}
-
-.infoIcon {
-	display: inline-flex;
-	align-items: center;
-	color: var(--text-slate-secondary);
-	cursor: pointer;
-
-	&:hover {
-		color: var(--text-slate-primary);
-	}
 }
--- a/frontend/src/container/InfraMonitoringK8sV2/Base/EntityGroupHeader.tsx
+++ b/frontend/src/container/InfraMonitoringK8sV2/Base/EntityGroupHeader.tsx
@@ -1,70 +1,19 @@
-import { Group, Info } from '@signozhq/icons';
-import { TooltipSimple } from '@signozhq/ui/tooltip';
+import { Group } from '@signozhq/icons';

 import styles from './EntityGroupHeader.module.scss';

-const DOCS_BASE_URL = `${process.env.DOCS_BASE_URL}/docs`;
-
 interface EntityGroupHeaderProps {
 	title: string;
 	icon?: React.ReactNode;
-	docPath?: string;
-	tooltip?: string;
 }

 function EntityGroupHeader({
 	title,
 	icon,
-	docPath,
-	tooltip,
 }: EntityGroupHeaderProps): JSX.Element {
-	const renderInfoIcon = (): React.ReactNode => {
-		if (docPath) {
-			const tooltipTitle = tooltip || 'Not sure what this means?';
-			return (
-				<TooltipSimple
-					arrow
-					title={
-						<>
-							{tooltipTitle}{' '}
-							<a
-								href={`${DOCS_BASE_URL}${docPath}`}
-								target="_blank"
-								rel="noopener"
-								onClick={(e): void => e.stopPropagation()}
-							>
-								Learn more.
-							</a>
-						</>
-					}
-				>
-					<span className={styles.infoIcon}>
-						<Info size="md" />
-					</span>
-				</TooltipSimple>
-			);
-		}
-
-		if (tooltip) {
-			return (
-				<TooltipSimple title={tooltip}>
-					<span className={styles.infoIcon}>
-						<Info size="md" />
-					</span>
-				</TooltipSimple>
-			);
-		}
-
-		return null;
-	};
-
 	return (
-		<div className={styles.entityGroupHeader} data-slot="entity-group-header">
-			<span data-slot="icon">
-				{icon || <Group size={14} data-hide-expanded="true" />}
-			</span>{' '}
-			{title}
-			{renderInfoIcon()}
+		<div className={styles.entityGroupHeader}>
+			{icon || <Group size={14} data-hide-expanded="true" />} {title}
 		</div>
 	);
 }
--- a/frontend/src/container/InfraMonitoringK8sV2/Base/K8sBaseDetails.tsx
+++ b/frontend/src/container/InfraMonitoringK8sV2/Base/K8sBaseDetails.tsx
@@ -6,6 +6,7 @@ import React, {
 	useState,
 } from 'react';
 import { useQuery } from 'react-query';
+// eslint-disable-next-line no-restricted-imports
 import { Color, Spacing } from '@signozhq/design-tokens';
 import { Button, Drawer, Tooltip } from 'antd';
 import { ToggleGroupSimple } from '@signozhq/ui/toggle-group';
@@ -13,6 +14,7 @@ import { Divider } from '@signozhq/ui/divider';
 import { Typography } from '@signozhq/ui/typography';
 import logEvent from 'api/common/logEvent';
 import { combineInitialAndUserExpression } from 'components/QueryBuilderV2/QueryV2/QuerySearch/utils';
+import { convertFiltersToExpression } from 'components/QueryBuilderV2/utils';
 import { InfraMonitoringEvents } from 'constants/events';
 import { QueryParams } from 'constants/query';
 import {
@@ -38,11 +40,17 @@ import {
 } from '@signozhq/icons';
 import { isCustomTimeRange, useGlobalTimeStore } from 'store/globalTime';
 import { NANO_SECOND_MULTIPLIER } from 'store/globalTime/utils';
+import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse';
+import {
+	TagFilter,
+	TagFilterItem,
+} from 'types/api/queryBuilder/queryBuilderData';
 import {
 	LogsAggregatorOperator,
 	TracesAggregatorOperator,
 } from 'types/common/queryBuilder';
 import { openInNewTab } from 'utils/navigation';
+import { v4 as uuidv4 } from 'uuid';

 import { InfraMonitoringEntity, VIEW_TYPES } from '../constants';
 import EntityEvents from '../EntityDetailsUtils/EntityEvents';
@@ -52,10 +60,9 @@ import EntityMetrics from '../EntityDetailsUtils/EntityMetrics';
 import EntityTraces from '../EntityDetailsUtils/EntityTraces';
 import { K8S_ENTITY_TRACES_EXPRESSION_KEY } from '../EntityDetailsUtils/EntityTraces/hooks';
 import {
-	SelectedItemParams,
 	useInfraMonitoringEventsFilters,
 	useInfraMonitoringLogFilters,
-	useInfraMonitoringSelectedItemParams,
+	useInfraMonitoringSelectedItem,
 	useInfraMonitoringTracesFilters,
 	useInfraMonitoringView,
 } from '../hooks';
@@ -63,10 +70,6 @@ import LoadingContainer from '../LoadingContainer';

 import '../EntityDetailsUtils/entityDetails.styles.scss';
 import { parseAsString, useQueryState } from 'nuqs';
-import {
-	EntityCountConfig,
-	EntityCountsSection,
-} from './components/EntityCountsSection/EntityCountsSection';

 const TimeRangeOffset = 1000000000;

@@ -76,10 +79,8 @@ export interface K8sDetailsMetadataConfig<T> {
 	render?: (value: string | number, entity: T) => React.ReactNode;
 }

-export type K8sDetailsCountConfig<T> = EntityCountConfig<T>;
-
 export interface K8sDetailsFilters {
-	filter: { expression: string };
+	filters: TagFilter;
 	start: number;
 	end: number;
 }
@@ -88,22 +89,19 @@ export interface K8sBaseDetailsProps<T> {
 	category: InfraMonitoringEntity;
 	eventCategory: string;
 	// Data fetching configuration
-	getSelectedItemExpression: (params: SelectedItemParams) => string;
+	getSelectedItemFilters: (selectedItem: string) => TagFilter;
 	fetchEntityData: (
 		filters: K8sDetailsFilters,
 		signal?: AbortSignal,
 	) => Promise<{ data: T | null; error?: string | null }>;
 	// Entity configuration
 	getEntityName: (entity: T) => string;
-	getInitialLogTracesExpression: (entity: T) => string;
-	getInitialEventsExpression: (entity: T) => string;
+	getInitialLogTracesFilters: (entity: T) => TagFilterItem[];
+	getInitialEventsFilters: (entity: T) => TagFilterItem[];
 	metadataConfig: K8sDetailsMetadataConfig<T>[];
-	countsConfig?: K8sDetailsCountConfig<T>[];
-	getCountsFilterExpression?: (entity: T) => string;
 	entityWidgetInfo: {
 		title: string;
 		yAxisUnit: string;
-		docPath?: string;
 	}[];
 	getEntityQueryPayload: (
 		entity: T,
@@ -136,18 +134,34 @@ export interface K8sBaseDetailsProps<T> {
 	}>;
 }

+export function createFilterItem(
+	key: string,
+	value: string,
+	dataType: DataTypes = DataTypes.String,
+): TagFilterItem {
+	return {
+		id: uuidv4(),
+		key: {
+			key,
+			dataType,
+			type: 'resource',
+			id: `${key}--string--resource--false`,
+		},
+		op: '=',
+		value,
+	};
+}
+
 // eslint-disable-next-line sonarjs/cognitive-complexity
 export default function K8sBaseDetails<T>({
 	category,
 	eventCategory,
-	getSelectedItemExpression,
+	getSelectedItemFilters,
 	fetchEntityData,
 	getEntityName,
-	getInitialLogTracesExpression,
-	getInitialEventsExpression,
+	getInitialLogTracesFilters,
+	getInitialEventsFilters,
 	metadataConfig,
-	countsConfig,
-	getCountsFilterExpression,
 	entityWidgetInfo,
 	getEntityQueryPayload,
 	queryKeyPrefix,
@@ -164,9 +178,7 @@ export default function K8sBaseDetails<T>({

 	const isDarkMode = useIsDarkMode();

-	const [selectedItemParams, setSelectedItemParams] =
-		useInfraMonitoringSelectedItemParams();
-	const selectedItem = selectedItemParams.selectedItem;
+	const [selectedItem, setSelectedItem] = useInfraMonitoringSelectedItem();

 	const entityQueryKey = useMemo(
 		() =>
@@ -174,17 +186,8 @@ export default function K8sBaseDetails<T>({
 				selectedTime,
 				`${queryKeyPrefix}EntityDetails`,
 				selectedItem,
-				selectedItemParams.clusterName,
-				selectedItemParams.namespaceName,
 			),
-		[
-			queryKeyPrefix,
-			selectedItem,
-			selectedItemParams.clusterName,
-			selectedItemParams.namespaceName,
-			selectedTime,
-			getAutoRefreshQueryKey,
-		],
+		[queryKeyPrefix, selectedItem, selectedTime, getAutoRefreshQueryKey],
 	);

 	const {
@@ -198,12 +201,17 @@ export default function K8sBaseDetails<T>({
 			if (!selectedItem) {
 				return { data: null };
 			}
+			const filters = getSelectedItemFilters(selectedItem);
 			const { minTime, maxTime } = getMinMaxTime();
-			const start = Math.floor(minTime / NANO_SECOND_MULTIPLIER);
-			const end = Math.floor(maxTime / NANO_SECOND_MULTIPLIER);
-			const expression = getSelectedItemExpression(selectedItemParams);

-			return fetchEntityData({ filter: { expression }, start, end }, signal);
+			return fetchEntityData(
+				{
+					filters,
+					start: Math.floor(minTime / NANO_SECOND_MULTIPLIER),
+					end: Math.floor(maxTime / NANO_SECOND_MULTIPLIER),
+				},
+				signal,
+			);
 		},
 		enabled: !!selectedItem,
 	});
@@ -215,19 +223,27 @@ export default function K8sBaseDetails<T>({
 		if (!entity) {
 			return '';
 		}
-		return getInitialLogTracesExpression(entity);
-	}, [entity, getInitialLogTracesExpression]);
+		const primaryFiltersOnly = {
+			op: 'AND' as const,
+			items: getInitialLogTracesFilters(entity),
+		};
+		return convertFiltersToExpression(primaryFiltersOnly).expression;
+	}, [entity, getInitialLogTracesFilters]);

 	const eventsInitialExpression = useMemo(() => {
 		if (!entity) {
 			return '';
 		}
-		return getInitialEventsExpression(entity);
-	}, [entity, getInitialEventsExpression]);
+		const primaryFiltersOnly = {
+			op: 'AND' as const,
+			items: getInitialEventsFilters(entity),
+		};
+		return convertFiltersToExpression(primaryFiltersOnly).expression;
+	}, [entity, getInitialEventsFilters]);

 	const handleClose = useCallback((): void => {
-		setSelectedItemParams(null);
-	}, [setSelectedItemParams]);
+		setSelectedItem(null);
+	}, [setSelectedItem]);

 	const entityName = entity ? getEntityName(entity) : '';

@@ -490,19 +506,6 @@ export default function K8sBaseDetails<T>({
 								})}
 							</div>
 						</div>
-
-						{countsConfig &&
-							countsConfig.length > 0 &&
-							selectedItem &&
-							getCountsFilterExpression && (
-								<EntityCountsSection
-									entity={entity}
-									countsConfig={countsConfig}
-									selectedItem={selectedItem}
-									filterExpression={getCountsFilterExpression(entity)}
-									closeDrawer={handleClose}
-								/>
-							)}
 					</div>

 					{!hideDetailViewTabs && (
--- a/frontend/src/container/InfraMonitoringK8sV2/Base/K8sBaseList.module.scss
+++ b/frontend/src/container/InfraMonitoringK8sV2/Base/K8sBaseList.module.scss
@@ -1,10 +1,3 @@
-.tableContainer {
-	display: flex;
-	flex: 1;
-	flex-direction: column;
-	min-height: 0;
-}
-
 .emptyStateContainer {
 	display: flex;
 	flex: 1;
@@ -14,6 +7,7 @@
 }

 .k8SListTable {
+	padding-left: var(--spacing-2);
 	--tanstack-table-header-cell-bg: var(--l2-background);
 	--tanstack-table-header-cell-color: var(--l2-foreground);
 	--tanstack-table-cell-bg: var(--l2-background);
@@ -24,12 +18,9 @@
 	--tanstack-table-resize-handle-hover-bg: var(--l2-border);
 	--tanstack-table-row-height: 42px;

-	--tanstack-table-header-label-width: 100%;
-
 	--tanstack-cell-padding-top-override: 5px;
 	--tanstack-cell-padding-bottom-override: 5px;
-	--tanstack-cell-header-padding-left-override: 5px;
-	--tanstack-cell-padding-left-override: 26px;
+	--tanstack-cell-padding-left-override: 5px;
 	--tanstack-cell-padding-right-override: 5px;

 	--tanstack-expansion-first-col-padding-left: 30px;
--- a/frontend/src/container/InfraMonitoringK8sV2/Base/K8sBaseList.tsx
+++ b/frontend/src/container/InfraMonitoringK8sV2/Base/K8sBaseList.tsx
@@ -1,18 +1,15 @@
 import { useCallback, useEffect, useMemo } from 'react';
-import { useQuery, useQueryClient } from 'react-query';
+import { useQuery } from 'react-query';
 import { Typography } from '@signozhq/ui/typography';
 import logEvent from 'api/common/logEvent';
 import TanStackTable, {
 	TableColumnDef,
-	useCalculatedPageSize,
 	useHiddenColumnIds,
-	useTableParams,
 } from 'components/TanStackTableView';
 import { InfraMonitoringEvents } from 'constants/events';
-import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
+import { parseAsString, useQueryState } from 'nuqs';
 import { useGlobalTimeStore } from 'store/globalTime';
 import { NANO_SECOND_MULTIPLIER } from 'store/globalTime/utils';
-import { Querybuildertypesv5QueryWarnDataDTO } from 'api/generated/services/sigNoz.schemas';
 import { openInNewTab } from 'utils/navigation';

 import {
@@ -20,17 +17,15 @@ import {
 	InfraMonitoringEntity,
 } from '../constants';
 import {
-	SelectedItemParams,
+	useInfraMonitoringFiltersK8s,
 	useInfraMonitoringGroupBy,
 	useInfraMonitoringOrderBy,
-	useInfraMonitoringSelectedItemParams,
-	useInfraMonitoringStatusFilter,
+	useInfraMonitoringPageListing,
+	useInfraMonitoringPageSizeListing,
 } from '../hooks';
-import { useInfraMonitoringLineClamp } from '../components';
 import { K8sEmptyState } from './K8sEmptyState';
 import { K8sExpandedRow } from './K8sExpandedRow';
 import K8sHeader from './K8sHeader';
-import { K8sPaginationWarning } from './K8sPaginationWarning';
 import { K8sBaseFilters } from './types';
 import { getGroupedByMeta } from './utils';

@@ -43,51 +38,37 @@ export type K8sBaseListEmptyStateContext = {
 	totalCount: number;
 	hasFilters: boolean;
 	isLoading: boolean;
-	endTimeBeforeRetention?: boolean;
 	rawData?: unknown;
 };

 /** Base type constraint for K8s entity data */
-export type K8sEntityData = { meta?: Record<string, string> | null };
+export type K8sEntityData = { meta?: Record<string, string> };

-export type K8sBaseListProps<
-	T extends K8sEntityData,
-	TItemKey extends string | SelectedItemParams = string,
-> = {
+export type K8sBaseListProps<T extends K8sEntityData> = {
 	controlListPrefix?: React.ReactNode;
-	leftFilters?: React.ReactNode;
 	entity: InfraMonitoringEntity;
 	tableColumns: TableColumnDef<T>[];
 	fetchListData: (
 		filters: K8sBaseFilters,
 		signal?: AbortSignal,
 	) => Promise<{
-		type?: 'list' | 'grouped_list';
-		records?: T[];
-		data?: T[];
+		data: T[];
 		total: number;
 		error?: string | null;
 		rawData?: unknown;
-		endTimeBeforeRetention?: boolean;
-		warning?: Querybuildertypesv5QueryWarnDataDTO | null;
 	}>;
 	/** Function to get the unique key for a row. */
 	getRowKey?: (record: T) => string;
-	/** Function to get the item key used for selection. Can return string or SelectedItemParams. */
-	getItemKey?: (record: T) => TItemKey;
+	/** Function to get the item key used for selection. Defaults to getRowKey if not provided. */
+	getItemKey?: (record: T) => string;
 	eventCategory: InfraMonitoringEvents;
 	renderEmptyState?: (
 		context: K8sBaseListEmptyStateContext,
 	) => React.ReactNode | null;
-	extraQueryKeyParts?: string[];
 };

-export function K8sBaseList<
-	T extends K8sEntityData,
-	TItemKey extends string | SelectedItemParams = string,
->({
+export function K8sBaseList<T extends K8sEntityData>({
 	controlListPrefix,
-	leftFilters,
 	entity,
 	tableColumns,
 	fetchListData,
@@ -95,42 +76,20 @@ export function K8sBaseList<
 	getItemKey,
 	eventCategory,
 	renderEmptyState,
-	extraQueryKeyParts = [],
-}: K8sBaseListProps<T, TItemKey>): JSX.Element {
-	const { currentQuery } = useQueryBuilder();
-	const expression = currentQuery.builder.queryData[0]?.filter?.expression || '';
-	const lineClamp = useInfraMonitoringLineClamp();
+}: K8sBaseListProps<T>): JSX.Element {
+	const [queryFilters] = useInfraMonitoringFiltersK8s();
+	const [currentPage] = useInfraMonitoringPageListing();
+	const [currentPageSize] = useInfraMonitoringPageSizeListing();
 	const [groupBy] = useInfraMonitoringGroupBy();
 	const [orderBy] = useInfraMonitoringOrderBy();
-	const [statusFilter] = useInfraMonitoringStatusFilter();
-	const [selectedItemParams, setSelectedItemParams] =
-		useInfraMonitoringSelectedItemParams();
-	const selectedItem = selectedItemParams.selectedItem;
+	const [selectedItem, setSelectedItem] = useQueryState(
+		'selectedItem',
+		parseAsString,
+	);

 	const columnStorageKey = `k8s-${entity}-columns`;
 	const hiddenColumnIds = useHiddenColumnIds(columnStorageKey);

-	const { containerRef, calculatedPageSize } = useCalculatedPageSize({
-		rowHeight: 42,
-	});
-
-	const {
-		page: currentPage,
-		limit: currentPageSize,
-		setLimit,
-	} = useTableParams(
-		{
-			page: INFRA_MONITORING_K8S_PARAMS_KEYS.PAGE,
-			limit: INFRA_MONITORING_K8S_PARAMS_KEYS.PAGE_SIZE,
-		},
-		{
-			page: 1,
-			limit: 10,
-			storageKey: `k8s-${entity}`,
-			calculatedPageSize,
-		},
-	);
-
 	const selectedTime = useGlobalTimeStore((s) => s.selectedTime);
 	const refreshInterval = useGlobalTimeStore((s) => s.refreshInterval);
 	const isRefreshEnabled = useGlobalTimeStore((s) => s.isRefreshEnabled);
@@ -146,11 +105,9 @@ export function K8sBaseList<
 			entity,
 			String(currentPageSize),
 			String(currentPage),
-			expression || '',
+			JSON.stringify(queryFilters),
 			JSON.stringify(orderBy),
 			JSON.stringify(groupBy),
-			statusFilter,
-			...extraQueryKeyParts,
 		);
 	}, [
 		getAutoRefreshQueryKey,
@@ -158,64 +115,35 @@ export function K8sBaseList<
 		entity,
 		currentPageSize,
 		currentPage,
-		expression,
+		queryFilters,
 		orderBy,
 		groupBy,
-		statusFilter,
-		extraQueryKeyParts,
 	]);

-	const queryClient = useQueryClient();
-
-	const { data, isLoading, isFetching, isError } = useQuery({
+	const { data, isLoading, isError } = useQuery({
 		queryKey,
-		queryFn: async ({ signal }) => {
+		queryFn: ({ signal }) => {
 			const { minTime, maxTime } = getMinMaxTime();
-			const start = Math.floor(minTime / NANO_SECOND_MULTIPLIER);
-			const end = Math.floor(maxTime / NANO_SECOND_MULTIPLIER);

-			const response = await fetchListData(
+			return fetchListData(
 				{
-					filter: {
-						expression: expression || '',
-						filterByStatus:
-							statusFilter === 'active' || statusFilter === 'inactive'
-								? statusFilter
-								: undefined,
-					},
-					groupBy:
-						groupBy && groupBy.length > 0
-							? groupBy.map((g) => ({ name: g }))
-							: undefined,
-					offset: (currentPage - 1) * currentPageSize,
 					limit: currentPageSize,
-					start,
-					end,
-					orderBy: orderBy
-						? { key: { name: orderBy.columnName }, direction: orderBy.order }
-						: undefined,
+					offset: (currentPage - 1) * currentPageSize,
+					filters: queryFilters || { items: [], op: 'AND' },
+					start: Math.floor(minTime / NANO_SECOND_MULTIPLIER),
+					end: Math.floor(maxTime / NANO_SECOND_MULTIPLIER),
+					orderBy: orderBy || undefined,
+					groupBy: groupBy?.length > 0 ? groupBy : undefined,
 				},
 				signal,
 			);
-			return {
-				data: response.records || response.data || [],
-				total: response.total,
-				error: response.error,
-				endTimeBeforeRetention: response.endTimeBeforeRetention,
-				rawData: response.rawData ?? response,
-				warning: response.warning ?? null,
-			};
 		},
 		refetchInterval: isRefreshEnabled ? refreshInterval : false,
 	});

-	const cancelQuery = useCallback((): void => {
-		void queryClient.cancelQueries({ queryKey });
-	}, [queryClient, queryKey]);
-
 	const pageData = data?.data ?? [];
 	const totalCount = data?.total || 0;
-	const hasFilters = !!expression?.trim();
+	const hasFilters = (queryFilters?.items?.length ?? 0) > 0;

 	const getGroupKeyFn = useCallback(
 		(item: T) => getGroupedByMeta(item, groupBy),
@@ -223,7 +151,7 @@ export function K8sBaseList<
 	);

 	useEffect(() => {
-		void logEvent(InfraMonitoringEvents.PageVisited, {
+		logEvent(InfraMonitoringEvents.PageVisited, {
 			entity: InfraMonitoringEvents.K8sEntity,
 			page: InfraMonitoringEvents.ListPage,
 			category: eventCategory,
@@ -232,65 +160,32 @@ export function K8sBaseList<
 	}, [eventCategory, totalCount]);

 	const handleRowClick = useCallback(
-		(_record: T, itemKey: TItemKey): void => {
+		(_record: T, itemKey: string): void => {
 			if (groupBy.length === 0) {
-				if (typeof itemKey === 'object' && itemKey !== null) {
-					setSelectedItemParams(itemKey);
-				} else {
-					setSelectedItemParams({
-						selectedItem: itemKey,
-						clusterName: null,
-						namespaceName: null,
-					});
-				}
+				setSelectedItem(itemKey);
 			}

-			void logEvent(InfraMonitoringEvents.ItemClicked, {
+			logEvent(InfraMonitoringEvents.ItemClicked, {
 				entity: InfraMonitoringEvents.K8sEntity,
 				page: InfraMonitoringEvents.ListPage,
 				category: eventCategory,
 			});
 		},
-		[eventCategory, groupBy.length, setSelectedItemParams],
+		[eventCategory, groupBy.length, setSelectedItem],
 	);

 	const handleRowClickNewTab = useCallback(
-		(_record: T, itemKey: TItemKey): void => {
+		(_record: T, itemKey: string): void => {
 			if (groupBy.length > 0) {
 				return;
 			}

-			// Build URL with selectedItem params
+			// Build URL with selectedItem param
 			const url = new URL(window.location.href);
-			if (typeof itemKey === 'object' && itemKey !== null) {
-				const params = itemKey;
-				if (params.selectedItem) {
-					url.searchParams.set(
-						INFRA_MONITORING_K8S_PARAMS_KEYS.SELECTED_ITEM,
-						params.selectedItem,
-					);
-				}
-				if (params.clusterName) {
-					url.searchParams.set(
-						INFRA_MONITORING_K8S_PARAMS_KEYS.SELECTED_ITEM_CLUSTER_NAME,
-						params.clusterName,
-					);
-				}
-				if (params.namespaceName) {
-					url.searchParams.set(
-						INFRA_MONITORING_K8S_PARAMS_KEYS.SELECTED_ITEM_NAMESPACE_NAME,
-						params.namespaceName,
-					);
-				}
-			} else {
-				url.searchParams.set(
-					INFRA_MONITORING_K8S_PARAMS_KEYS.SELECTED_ITEM,
-					itemKey,
-				);
-			}
+			url.searchParams.set('selectedItem', itemKey);
 			openInNewTab(url.pathname + url.search);

-			void logEvent(InfraMonitoringEvents.ItemClicked, {
+			logEvent(InfraMonitoringEvents.ItemClicked, {
 				entity: InfraMonitoringEvents.K8sEntity,
 				page: InfraMonitoringEvents.ListPage,
 				category: eventCategory,
@@ -313,25 +208,17 @@ export function K8sBaseList<
 			rowKey: string,
 			groupMeta?: Record<string, string>,
 		): JSX.Element => (
-			<K8sExpandedRow<T, TItemKey>
+			<K8sExpandedRow<T>
 				rowKey={rowKey}
 				groupMeta={groupMeta}
 				entity={entity}
 				tableColumns={expandedRowColumns}
 				fetchListData={fetchListData}
-				extraQueryKeyParts={extraQueryKeyParts}
 				getRowKey={getRowKey}
 				getItemKey={getItemKey}
 			/>
 		),
-		[
-			entity,
-			fetchListData,
-			getRowKey,
-			getItemKey,
-			expandedRowColumns,
-			extraQueryKeyParts,
-		],
+		[entity, fetchListData, getRowKey, getItemKey, expandedRowColumns],
 	);

 	const getRowCanExpand = useCallback(
@@ -347,78 +234,64 @@ export function K8sBaseList<
 		totalCount,
 		hasFilters,
 		isLoading: showTableLoadingState,
-		endTimeBeforeRetention: data?.endTimeBeforeRetention,
 		rawData: data?.rawData,
 	}) || (
 		<K8sEmptyState
 			isError={isError}
 			error={data?.error}
 			isLoading={showTableLoadingState}
-			endTimeBeforeRetention={data?.endTimeBeforeRetention}
+			rawData={data?.rawData}
 		/>
 	);

 	const showEmptyState = !showTableLoadingState && pageData.length === 0;

-	const paginationWarningContent = data?.warning ? (
-		<K8sPaginationWarning warning={data.warning} />
-	) : null;
-
 	return (
 		<>
 			<K8sHeader
 				controlListPrefix={controlListPrefix}
-				leftFilters={leftFilters}
 				entity={entity}
 				showAutoRefresh={!selectedItem}
 				columns={tableColumns}
 				columnStorageKey={columnStorageKey}
-				isFetching={isFetching}
-				cancelQuery={cancelQuery}
 			/>
-			<div ref={containerRef} className={styles.tableContainer}>
-				{isError && (
-					<Typography>
-						{data?.error?.toString() || 'Something went wrong'}
-					</Typography>
-				)}
+			{isError && (
+				<Typography>{data?.error?.toString() || 'Something went wrong'}</Typography>
+			)}

-				{showEmptyState ? (
-					<div className={styles.emptyStateContainer}>{emptyTableMessage}</div>
-				) : (
-					<TanStackTable<T, TItemKey>
-						data={pageData}
-						columns={tableColumns}
-						columnStorageKey={columnStorageKey}
-						isLoading={showTableLoadingState}
-						getRowKey={getRowKey}
-						getItemKey={getItemKey}
-						groupBy={groupBy.map((g) => ({ key: g }))}
-						getGroupKey={getGroupKeyFn}
-						onRowClick={handleRowClick}
-						onRowClickNewTab={handleRowClickNewTab}
-						renderExpandedRow={isGroupedByAttribute ? renderExpandedRow : undefined}
-						getRowCanExpand={isGroupedByAttribute ? getRowCanExpand : undefined}
-						className={cx(styles.k8SListTable, expandedRowColumns)}
-						enableQueryParams={{
-							page: INFRA_MONITORING_K8S_PARAMS_KEYS.PAGE,
-							limit: INFRA_MONITORING_K8S_PARAMS_KEYS.PAGE_SIZE,
-							orderBy: INFRA_MONITORING_K8S_PARAMS_KEYS.ORDER_BY,
-							expanded: INFRA_MONITORING_K8S_PARAMS_KEYS.EXPANDED,
-						}}
-						pagination={{
-							total: totalCount,
-							showTotalCount: true,
-							totalCountLabel: entity.charAt(0).toUpperCase() + entity.slice(1),
-							calculatedPageSize,
-							onLimitChange: setLimit,
-						}}
-						plainTextCellLineClamp={lineClamp}
-						prefixPaginationContent={paginationWarningContent}
-						paginationClassname={styles.paginationContainer}
-					/>
-				)}
-			</div>
+			{showEmptyState ? (
+				<div className={styles.emptyStateContainer}>{emptyTableMessage}</div>
+			) : (
+				<TanStackTable<T>
+					data={pageData}
+					columns={tableColumns}
+					columnStorageKey={columnStorageKey}
+					isLoading={showTableLoadingState}
+					getRowKey={getRowKey}
+					getItemKey={getItemKey}
+					groupBy={groupBy}
+					getGroupKey={getGroupKeyFn}
+					onRowClick={handleRowClick}
+					onRowClickNewTab={handleRowClickNewTab}
+					renderExpandedRow={isGroupedByAttribute ? renderExpandedRow : undefined}
+					getRowCanExpand={isGroupedByAttribute ? getRowCanExpand : undefined}
+					className={cx(styles.k8SListTable, expandedRowColumns)}
+					enableQueryParams={{
+						page: INFRA_MONITORING_K8S_PARAMS_KEYS.PAGE,
+						limit: INFRA_MONITORING_K8S_PARAMS_KEYS.PAGE_SIZE,
+						orderBy: INFRA_MONITORING_K8S_PARAMS_KEYS.ORDER_BY,
+						expanded: INFRA_MONITORING_K8S_PARAMS_KEYS.EXPANDED,
+					}}
+					pagination={{
+						total: totalCount,
+						defaultLimit: 10,
+						defaultPage: 1,
+						showTotalCount: true,
+						totalCountLabel: entity.charAt(0).toUpperCase() + entity.slice(1),
+					}}
+					paginationClassname={styles.paginationContainer}
+				/>
+			)}
 		</>
 	);
 }
--- a/frontend/src/container/InfraMonitoringK8sV2/Base/K8sEmptyState.tsx
+++ b/frontend/src/container/InfraMonitoringK8sV2/Base/K8sEmptyState.tsx
@@ -11,6 +11,12 @@ import type { K8sBaseListEmptyStateContext } from './K8sBaseList';

 import styles from './K8sEmptyState.module.scss';

+export interface K8sListResponseMetadata {
+	sentAnyHostMetricsData?: boolean;
+	isSendingK8SAgentMetrics?: boolean;
+	endTimeBeforeRetention?: boolean;
+}
+
 type K8sEmptyStateProps = Partial<K8sBaseListEmptyStateContext>;

 const handleContactSupport = (isCloudUser: boolean): void => {
@@ -25,7 +31,7 @@ export function K8sEmptyState({
 	isError,
 	error,
 	isLoading,
-	endTimeBeforeRetention,
+	rawData,
 }: K8sEmptyStateProps): JSX.Element | null {
 	const { isCloudUser } = useGetTenantLicense();

@@ -64,7 +70,47 @@ export function K8sEmptyState({
 		);
 	}

-	if (endTimeBeforeRetention) {
+	const metadata = rawData as K8sListResponseMetadata | undefined;
+
+	if (metadata?.sentAnyHostMetricsData === false) {
+		return (
+			<div className={styles.container}>
+				<div className={styles.content}>
+					<img className={styles.eyesEmoji} src={eyesEmojiUrl} alt="eyes emoji" />
+					<div className={styles.noDataMessage}>
+						<h5 className={styles.title}>No host metrics data received yet</h5>
+						<span className={styles.message}>
+							Please refer to{' '}
+							<a
+								href="https://signoz.io/docs/infrastructure-monitoring/hostmetrics/"
+								target="_blank"
+								rel="noreferrer"
+							>
+								our documentation
+							</a>{' '}
+							to learn how to send host metrics.
+						</span>
+					</div>
+				</div>
+			</div>
+		);
+	}
+
+	if (metadata?.isSendingK8SAgentMetrics) {
+		return (
+			<div className={styles.container}>
+				<div className={styles.content}>
+					<img className={styles.eyesEmoji} src={eyesEmojiUrl} alt="eyes emoji" />
+					<span className={styles.message}>
+						To see K8s metrics, upgrade to the latest version of SigNoz k8s-infra
+						chart. Please contact support if you need help.
+					</span>
+				</div>
+			</div>
+		);
+	}
+
+	if (metadata?.endTimeBeforeRetention) {
 		return (
 			<div className={styles.container}>
 				<div className={styles.content}>
--- a/frontend/src/container/InfraMonitoringK8sV2/Base/K8sExpandedRow.tsx
+++ b/frontend/src/container/InfraMonitoringK8sV2/Base/K8sExpandedRow.tsx
@@ -1,7 +1,5 @@
 import { useCallback, useEffect, useMemo } from 'react';
 import { useQuery } from 'react-query';
-import { useLocation } from 'react-router-dom';
-import { Querybuildertypesv5QueryWarnDataDTO } from 'api/generated/services/sigNoz.schemas';
 import { Button } from '@signozhq/ui/button';
 import { Typography } from '@signozhq/ui/typography';
 import TanStackTable, {
@@ -9,80 +7,63 @@ import TanStackTable, {
 	TableColumnDef,
 	TanStackTableStateProvider,
 } from 'components/TanStackTableView';
-import { QueryParams } from 'constants/query';
 import { CornerDownRight } from '@signozhq/icons';
-import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
-import { useSafeNavigate } from 'hooks/useSafeNavigate';
-import useUrlQuery from 'hooks/useUrlQuery';
-import { v4 as uuid } from 'uuid';
 import { useQueryState } from 'nuqs';
 import { useGlobalTimeStore } from 'store/globalTime';
 import { NANO_SECOND_MULTIPLIER } from 'store/globalTime/utils';
+import { IBuilderQuery } from 'types/api/queryBuilder/queryBuilderData';
 import { parseAsJsonNoValidate } from 'utils/nuqsParsers';

 import { InfraMonitoringEntity } from '../constants';
 import {
-	SelectedItemParams,
+	useInfraMonitoringFiltersK8s,
 	useInfraMonitoringGroupBy,
 	useInfraMonitoringOrderBy,
 	useInfraMonitoringPageListing,
-	useInfraMonitoringSelectedItemParams,
+	useInfraMonitoringSelectedItem,
 } from '../hooks';
 import { K8sBaseFilters } from './types';

 import styles from './K8sExpandedRow.module.scss';
-import { buildExpressionFromGroupMeta } from './utils';

 const EXPANDED_ROW_LIMIT = 10;

-export type K8sExpandedRowProps<T, TItemKey = string> = {
+export type K8sExpandedRowProps<T> = {
 	/** Pre-computed row key from parent table (includes group prefix + duplicate handling) */
 	rowKey: string;
 	/** Group metadata for building filters */
 	groupMeta?: Record<string, string>;
 	entity: InfraMonitoringEntity;
 	tableColumns: TableColumnDef<T>[];
-	/** API fetch function for expanded row data */
-	fetchListData?: (
+	fetchListData: (
 		filters: K8sBaseFilters,
 		signal?: AbortSignal,
 	) => Promise<{
-		type?: 'list' | 'grouped_list';
-		records?: T[];
-		data?: T[];
+		data: T[];
 		total: number;
 		error?: string | null;
 		rawData?: unknown;
-		warning?: Querybuildertypesv5QueryWarnDataDTO | null;
 	}>;
-	/** Extra parts to include in the react-query cache key (e.g., status filter). */
-	extraQueryKeyParts?: string[];
 	/** Function to get the unique key for a row. */
 	getRowKey?: (record: T) => string;
 	/** Function to get the item key used for selection. Defaults to getRowKey if not provided. */
-	getItemKey?: (record: T) => TItemKey;
+	getItemKey?: (record: T) => string;
 };

-export function K8sExpandedRow<T, TItemKey = string>({
+export function K8sExpandedRow<T>({
 	rowKey,
 	groupMeta,
 	entity,
 	tableColumns,
 	fetchListData,
-	extraQueryKeyParts = [],
 	getRowKey,
 	getItemKey,
-}: K8sExpandedRowProps<T, TItemKey>): JSX.Element {
+}: K8sExpandedRowProps<T>): JSX.Element {
 	const [, setGroupBy] = useInfraMonitoringGroupBy();
 	const [, setCurrentPage] = useInfraMonitoringPageListing();
-	const { currentQuery } = useQueryBuilder();
-	const parentExpression =
-		currentQuery.builder.queryData[0]?.filter?.expression || '';
-	const [, setSelectedItemParams] = useInfraMonitoringSelectedItemParams();
+	const [queryFilters, setFilters] = useInfraMonitoringFiltersK8s();
+	const [, setSelectedItem] = useInfraMonitoringSelectedItem();
 	const [, setMainOrderBy] = useInfraMonitoringOrderBy();
-	const { safeNavigate } = useSafeNavigate();
-	const urlQuery = useUrlQuery();
-	const location = useLocation();

 	const orderByParamKey = useMemo(
 		() => `orderBy_${rowKey.replace(/[^a-zA-Z0-9]/g, '_')}`,
@@ -104,10 +85,35 @@ export function K8sExpandedRow<T, TItemKey = string>({

 	const storageKey = `k8s-${entity}-columns-expanded`;

-	const expressionForRecord = useMemo(
-		() => buildExpressionFromGroupMeta(parentExpression || '', groupMeta),
-		[parentExpression, groupMeta],
-	);
+	const createFiltersForRecord = useCallback((): NonNullable<
+		IBuilderQuery['filters']
+	> => {
+		const baseFilters: IBuilderQuery['filters'] = {
+			items: [...(queryFilters?.items || [])],
+			op: 'and',
+		};
+
+		const metaKeys = groupMeta ?? {};
+
+		for (const key of Object.keys(metaKeys)) {
+			const value = metaKeys[key];
+			// Skip empty values to avoid creating invalid filters
+			if (value === '' || value === undefined || value === null) {
+				continue;
+			}
+			baseFilters.items.push({
+				key: {
+					key,
+					type: 'resource',
+				},
+				op: '=',
+				value,
+				id: key,
+			});
+		}
+
+		return baseFilters;
+	}, [queryFilters?.items, groupMeta]);

 	const selectedTime = useGlobalTimeStore((s) => s.selectedTime);
 	const refreshInterval = useGlobalTimeStore((s) => s.refreshInterval);
@@ -124,9 +130,8 @@ export function K8sExpandedRow<T, TItemKey = string>({
 			'k8sExpandedRow',
 			JSON.stringify(groupMeta),
 			rowKey,
-			expressionForRecord,
+			JSON.stringify(queryFilters),
 			JSON.stringify(orderBy),
-			...extraQueryKeyParts,
 		);
 	}, [
 		getAutoRefreshQueryKey,
@@ -134,91 +139,49 @@ export function K8sExpandedRow<T, TItemKey = string>({
 		entity,
 		groupMeta,
 		rowKey,
-		expressionForRecord,
+		queryFilters,
 		orderBy,
-		extraQueryKeyParts,
 	]);

 	const { data, isLoading, isError } = useQuery({
 		queryKey,
 		queryFn: async ({ signal }) => {
-			if (!fetchListData) {
-				return { data: [] as T[], total: 0 };
-			}
 			const { minTime, maxTime } = getMinMaxTime();

-			const response = await fetchListData(
+			return await fetchListData(
 				{
-					filter: { expression: expressionForRecord },
 					limit: EXPANDED_ROW_LIMIT,
 					offset: 0,
+					filters: createFiltersForRecord(),
 					start: Math.floor(minTime / NANO_SECOND_MULTIPLIER),
 					end: Math.floor(maxTime / NANO_SECOND_MULTIPLIER),
-					orderBy: orderBy
-						? { key: { name: orderBy.columnName }, direction: orderBy.order }
-						: undefined,
+					orderBy: orderBy || undefined,
 					groupBy: undefined,
 				},
 				signal,
 			);
-
-			return {
-				data: response.records || response.data || [],
-				total: response.total,
-				error: response.error,
-			};
 		},
 		staleTime: 1000 * 60 * 30,
 		refetchInterval: isRefreshEnabled ? refreshInterval : false,
-		enabled: !!fetchListData,
 	});

 	const expandedData = data?.data ?? [];

 	const handleRowClick = useCallback(
-		(_row: T, itemKey: TItemKey): void => {
-			if (typeof itemKey === 'object' && itemKey !== null) {
-				setSelectedItemParams(itemKey as unknown as SelectedItemParams);
-			} else {
-				setSelectedItemParams({
-					selectedItem: itemKey as string,
-					clusterName: null,
-					namespaceName: null,
-				});
-			}
+		(_row: T, itemKey: string): void => {
+			setSelectedItem(itemKey);
 		},
-		[setSelectedItemParams],
+		[setSelectedItem],
 	);

 	const handleViewAllClick = (): void => {
-		void setGroupBy([]);
-		void setCurrentPage(1);
+		const filters = createFiltersForRecord();
+		setGroupBy([]);
+		setCurrentPage(1);
+		setFilters(filters);
 		if (orderBy) {
-			void setMainOrderBy(orderBy);
+			setMainOrderBy(orderBy);
 		}
-
-		const updatedQuery = {
-			...currentQuery,
-			id: uuid(),
-			builder: {
-				...currentQuery.builder,
-				queryData: [
-					{
-						...(currentQuery.builder.queryData[0] || {}),
-						filter: { expression: expressionForRecord },
-						filters: { items: [], op: 'AND' as const },
-					},
-				],
-			},
-		};
-
-		const newUrlQuery = new URLSearchParams(urlQuery.toString());
-		newUrlQuery.set(
-			QueryParams.compositeQuery,
-			encodeURIComponent(JSON.stringify(updatedQuery)),
-		);
-
-		safeNavigate(`${location.pathname}?${newUrlQuery.toString()}`);
 	};

 	const total = data?.total ?? 0;
@@ -248,7 +211,7 @@ export function K8sExpandedRow<T, TItemKey = string>({

 			<div data-testid="expanded-table">
 				<TanStackTableStateProvider>
-					<TanStackTable<T, TItemKey>
+					<TanStackTable<T>
 						data={expandedData}
 						columns={tableColumns}
 						columnStorageKey={storageKey}
--- a/frontend/src/container/InfraMonitoringK8sV2/Base/K8sFiltersSidePanel.module.scss
+++ b/frontend/src/container/InfraMonitoringK8sV2/Base/K8sFiltersSidePanel.module.scss
@@ -24,37 +24,11 @@
 .columnsList {
 	display: flex;
 	flex-direction: column;
-
-	[data-slot='icon'] {
-		display: none;
-	}
-
-	[data-slot='entity-group-header'] {
-		padding-left: 0;
-	}
-
-	[data-slot='column-header'] {
-		display: flex;
-		width: auto;
-
-		span {
-			padding: 0;
-			text-align: left;
-		}
-
-		br {
-			display: none;
-		}
-	}
 }

 .columnItem {
 	justify-content: flex-start !important;
 	width: 100%;
-
-	> span {
-		width: auto !important;
-	}
 }

 .horizontalDivider {
--- a/frontend/src/container/InfraMonitoringK8sV2/Base/K8sFiltersSidePanel.tsx
+++ b/frontend/src/container/InfraMonitoringK8sV2/Base/K8sFiltersSidePanel.tsx
@@ -1,4 +1,4 @@
-import { ReactNode, useMemo } from 'react';
+import { useMemo } from 'react';
 import { Button } from '@signozhq/ui/button';
 import { DrawerWrapper } from '@signozhq/ui/drawer';
 import {
@@ -12,7 +12,7 @@ import styles from './K8sFiltersSidePanel.module.scss';

 type ColumnPickerItem = {
 	id: string;
-	label: ReactNode;
+	label: string;
 	canBeHidden: boolean;
 	visibilityBehavior:
 		| 'hidden-on-expand'
@@ -20,16 +20,15 @@ type ColumnPickerItem = {
 		| 'always-visible';
 };

-function renderHeader(header: string | (() => ReactNode)): ReactNode {
-	return typeof header === 'function' ? header() : header;
-}
-
+/**
+ * Converts TableColumnDef to column picker item format
+ */
 function toColumnPickerItems<T>(
 	columns: TableColumnDef<T>[],
 ): ColumnPickerItem[] {
 	return columns.map((col) => ({
 		id: col.id,
-		label: renderHeader(col.header),
+		label: typeof col.header === 'string' ? col.header : col.id,
 		canBeHidden: col.canBeHidden !== false && col.enableRemove !== false,
 		visibilityBehavior: col.visibilityBehavior ?? 'always-visible',
 	}));
--- a/frontend/src/container/InfraMonitoringK8sV2/Base/K8sGroupCell.tsx
+++ b/frontend/src/container/InfraMonitoringK8sV2/Base/K8sGroupCell.tsx
@@ -2,7 +2,7 @@ import { getGroupByEl } from './utils';
 import { useInfraMonitoringGroupBy } from '../hooks';

 interface K8sEntityWithMeta {
-	meta?: Record<string, string> | null;
+	meta?: Record<string, string>;
 }

 function K8sGroupCell<T extends K8sEntityWithMeta>({
--- a/frontend/src/container/InfraMonitoringK8sV2/Base/K8sHeader.module.scss
+++ b/frontend/src/container/InfraMonitoringK8sV2/Base/K8sHeader.module.scss
@@ -1,14 +1,13 @@
 .k8SListControls {
 	padding: var(--spacing-4);
 	display: flex;
-	flex-direction: column;
-	align-items: stretch;
+	justify-content: space-between;
+	align-items: center;
 	gap: var(--spacing-4);
-	width: 100%;

 	:global(.ant-select-selector) {
 		border-radius: 2px;
-		border: 1px solid var(--l2-border) !important;
+		border: 1px solid var(--border) !important;
 		background-color: var(--l2-background) !important;

 		input {
@@ -21,81 +20,28 @@
 	}
 }

-.k8SListControlsRow {
+.k8SListControlsLeft {
+	flex: 1;
 	display: flex;
+	align-items: center;
 	flex-wrap: wrap;
 	gap: var(--spacing-4);
-	width: 100%;
-	align-items: center;
-	justify-content: flex-end;
-}

-.k8SQbSearchContainer {
-	width: 100%;
-}
-
-.k8SFiltersGroupByRow {
-	display: flex;
-	flex: 1 1 auto;
-	align-items: center;
-	justify-content: flex-end;
-	gap: var(--spacing-4);
-	min-width: 0;
-
-	@media (max-width: 1600px) {
-		flex: 1 1 100%;
-		order: 9;
+	.k8SQbSearchContainer {
+		flex: 1;
+		min-width: 240px;
+		max-width: 60%;
 	}
 }

 .k8SAttributeSearchContainer {
-	flex: 1 1 240px;
-	max-width: 400px;
+	flex: 1;
+	min-width: 240px;
+	max-width: 40%;
 	display: flex;
 	align-items: center;
 }

-.k8SRunButton {
-	flex: 0 0 auto;
-}
-
-.k8SFiltersButton {
-	flex: 0 0 auto;
-}
-
-.k8SDateTimeSelection {
-	flex: 0 0 auto;
-	display: flex;
-	justify-content: flex-end;
-
-	--date-time-selector-border-color: var(--l2-border);
-
-	@media (max-width: 1200px) {
-		flex: 1 1 100%;
-		order: 10;
-	}
-
-	:global(.timeSelection-input) {
-		height: 32px;
-	}
-
-	:global(.ant-input-affix-wrapper) {
-		border-color: var(--l2-border);
-
-		&:hover {
-			border-color: var(--l2-border) !important;
-		}
-	}
-
-	:global(.refresh-actions .ant-form-item-control-input) {
-		&,
-		:global(.ant-btn) {
-			height: 30px;
-			min-height: unset;
-		}
-	}
-}
-
 .groupByLabel {
 	min-width: max-content;
 	font-size: var(--periscope-font-size-base, 13px);
@@ -104,7 +50,7 @@
 	letter-spacing: -0.07px;

 	border-radius: 2px 0px 0px 2px;
-	border: 1px solid var(--l2-border);
+	border: 1px solid var(--border);
 	border-right: none;
 	border-top-right-radius: 0px;
 	border-bottom-right-radius: 0px;
@@ -118,8 +64,6 @@
 }

 .groupBySelect {
-	width: 100%;
-
 	:global(.ant-select-selector) {
 		border-left: none;
 		border-top-left-radius: 0px;
--- a/frontend/src/container/InfraMonitoringK8sV2/Base/K8sHeader.tsx
+++ b/frontend/src/container/InfraMonitoringK8sV2/Base/K8sHeader.tsx
@@ -1,215 +1,167 @@
-import React, { useCallback, useMemo, useRef, useState } from 'react';
-import { useLocation } from 'react-router-dom';
+import React, { useCallback, useMemo, useState } from 'react';
 import { Button } from '@signozhq/ui/button';
 import { Select } from 'antd';
 import logEvent from 'api/common/logEvent';
-import { useGetFieldsKeys } from 'api/generated/services/fields';
-import {
-	TelemetrytypesFieldContextDTO,
-	TelemetrytypesSignalDTO,
-} from 'api/generated/services/sigNoz.schemas';
 import { TableColumnDef } from 'components/TanStackTableView';
-import QuerySearch from 'components/QueryBuilderV2/QueryV2/QuerySearch/QuerySearch';
 import { InfraMonitoringEvents } from 'constants/events';
-import { QueryParams } from 'constants/query';
-import RunQueryBtn from 'container/QueryBuilder/components/RunQueryBtn/RunQueryBtn';
+import { FeatureKeys } from 'constants/features';
+import { initialQueriesMap } from 'constants/queryBuilder';
+import QueryBuilderSearch from 'container/QueryBuilder/filters/QueryBuilderSearch';
 import DateTimeSelectionV2 from 'container/TopNav/DateTimeSelectionV2';
-import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
-import { IBuilderQuery } from 'types/api/queryBuilder/queryBuilderData';
-import { useSafeNavigate } from 'hooks/useSafeNavigate';
+import { useGetAggregateKeys } from 'hooks/queryBuilder/useGetAggregateKeys';
+import { useQueryOperations } from 'hooks/queryBuilder/useQueryBuilderOperations';
 import { SlidersHorizontal } from '@signozhq/icons';
-import { v4 as uuid } from 'uuid';
-import {
-	useGlobalTimeQueryInvalidate,
-	useGlobalTimeStore,
-} from 'store/globalTime';
-import { NANO_SECOND_MULTIPLIER } from 'store/globalTime/utils';
+import { useAppContext } from 'providers/App/App';
+import { IBuilderQuery } from 'types/api/queryBuilder/queryBuilderData';
 import { DataSource } from 'types/common/queryBuilder';

 import {
-	ENTITY_FILTER_PLACEHOLDERS,
+	GetK8sEntityToAggregateAttribute,
 	InfraMonitoringEntity,
-	METRIC_NAMESPACE_BY_ENTITY,
 } from '../constants';
 import {
+	useInfraMonitoringFiltersK8s,
 	useInfraMonitoringGroupBy,
 	useInfraMonitoringPageListing,
 } from '../hooks';
 import K8sFiltersSidePanel from './K8sFiltersSidePanel';

 import styles from './K8sHeader.module.scss';
-import { TooltipSimple } from '@signozhq/ui/tooltip';

 interface K8sHeaderProps<TData> {
 	controlListPrefix?: React.ReactNode;
-	leftFilters?: React.ReactNode;
 	entity: InfraMonitoringEntity;
 	showAutoRefresh: boolean;
 	columns: TableColumnDef<TData>[];
 	columnStorageKey: string;
-	isFetching?: boolean;
-	cancelQuery: () => void;
 }

 function K8sHeader<TData>({
 	controlListPrefix,
-	leftFilters,
 	entity,
 	showAutoRefresh,
 	columns,
 	columnStorageKey,
-	isFetching = false,
-	cancelQuery,
 }: K8sHeaderProps<TData>): JSX.Element {
 	const [isFiltersSidePanelOpen, setIsFiltersSidePanelOpen] = useState(false);
-	// null = user never touched the search box; fall back to the current
-	// query expression on Run so an untouched search doesn't wipe filters
-	const stagedExpressionRef = useRef<string | null>(null);
+	const [urlFilters, setUrlFilters] = useInfraMonitoringFiltersK8s();

-	const { currentQuery } = useQueryBuilder();
-	const { safeNavigate } = useSafeNavigate();
-	const location = useLocation();
-	const invalidateQueries = useGlobalTimeQueryInvalidate();
+	const currentQuery = initialQueriesMap[DataSource.METRICS];

-	const queryData = useMemo(
-		(): IBuilderQuery => ({
-			...currentQuery.builder.queryData[0],
-			aggregateOperator: 'noop',
-		}),
-		[currentQuery],
+	const updatedCurrentQuery = useMemo(() => {
+		let { filters } = currentQuery.builder.queryData[0];
+		if (urlFilters) {
+			filters = urlFilters;
+		}
+		return {
+			...currentQuery,
+			builder: {
+				...currentQuery.builder,
+				queryData: [
+					{
+						...currentQuery.builder.queryData[0],
+						aggregateOperator: 'noop',
+						aggregateAttribute: {
+							...currentQuery.builder.queryData[0].aggregateAttribute,
+						},
+						filters,
+					},
+				],
+			},
+		};
+	}, [currentQuery, urlFilters]);
+
+	const query = useMemo(
+		() => updatedCurrentQuery?.builder?.queryData[0] || null,
+		[updatedCurrentQuery],
 	);

+	const { handleChangeQueryData } = useQueryOperations({
+		index: 0,
+		query: currentQuery.builder.queryData[0],
+		entityVersion: '',
+	});
+
 	const [, setCurrentPage] = useInfraMonitoringPageListing();
+	const handleChangeTagFilters = useCallback(
+		(value: IBuilderQuery['filters']) => {
+			setUrlFilters(value || null);
+			handleChangeQueryData('filters', value);
+			setCurrentPage(1);

-	const handleRunQuery = useCallback(
-		(newExpression?: string): void => {
-			const currentExpression =
-				currentQuery.builder.queryData[0]?.filter?.expression || '';
-			const finalExpression = newExpression ?? currentExpression;
-			void setCurrentPage(1);
-
-			const updatedQuery = {
-				...currentQuery,
-				id: uuid(),
-				builder: {
-					...currentQuery.builder,
-					queryData: currentQuery.builder.queryData.map((query, idx) =>
-						idx === 0
-							? {
-									...query,
-									filter: { expression: finalExpression || '' },
-									filters: { items: [], op: 'AND' as const },
-								}
-							: query,
-					),
-				},
-			};
-
-			// Use window.location.search to get fresh URL params (avoids stale hook state)
-			const newUrlQuery = new URLSearchParams(window.location.search);
-			newUrlQuery.set(
-				QueryParams.compositeQuery,
-				encodeURIComponent(JSON.stringify(updatedQuery)),
-			);
-
-			safeNavigate(`${location.pathname}?${newUrlQuery.toString()}`);
-			void invalidateQueries();
-
-			if (finalExpression?.trim()) {
-				void logEvent(InfraMonitoringEvents.FilterApplied, {
+			if (value?.items && value?.items?.length > 0) {
+				logEvent(InfraMonitoringEvents.FilterApplied, {
 					entity: InfraMonitoringEvents.K8sEntity,
 					page: InfraMonitoringEvents.ListPage,
-					category: entity,
+					category: InfraMonitoringEvents.Pod,
 				});
 			}
 		},
-		[
-			currentQuery,
-			safeNavigate,
-			location.pathname,
-			setCurrentPage,
-			entity,
-			invalidateQueries,
-		],
+		[handleChangeQueryData, setCurrentPage, setUrlFilters],
 	);

-	const handleStageRunQuery = useCallback((): void => {
-		handleRunQuery(stagedExpressionRef.current ?? undefined);
-	}, [handleRunQuery]);
-
-	const handleExpressionChange = useCallback((value: string): void => {
-		stagedExpressionRef.current = value;
-	}, []);
-
-	const handleCancelQuery = useCallback((): void => {
-		cancelQuery();
-	}, [cancelQuery]);
-
-	const getMinMaxTime = useGlobalTimeStore((s) => s.getMinMaxTime);
-	const { minTime, maxTime } = getMinMaxTime();
-	const startUnixMilli = Math.floor(minTime / NANO_SECOND_MULTIPLIER);
-	const endUnixMilli = Math.floor(maxTime / NANO_SECOND_MULTIPLIER);
+	const { featureFlags } = useAppContext();
+	const dotMetricsEnabled =
+		featureFlags?.find((flag) => flag.name === FeatureKeys.DOT_METRICS_ENABLED)
+			?.active || false;

 	const { data: groupByFiltersData, isLoading: isLoadingGroupByFilters } =
-		useGetFieldsKeys(
+		useGetAggregateKeys(
 			{
-				signal: TelemetrytypesSignalDTO.metrics,
-				metricNamespace: METRIC_NAMESPACE_BY_ENTITY[entity],
-				limit: 100,
-				startUnixMilli,
-				endUnixMilli,
-				fieldContext: TelemetrytypesFieldContextDTO.resource,
-				// the search text is intentionally not included
-				// searchText: expression,
+				dataSource: currentQuery.builder.queryData[0].dataSource,
+				aggregateAttribute: GetK8sEntityToAggregateAttribute(
+					entity,
+					dotMetricsEnabled,
+				),
+				aggregateOperator: 'noop',
+				searchText: '',
+				tagType: '',
 			},
 			{
-				query: {
-					queryKey: ['getFieldsKeys', entity, startUnixMilli, endUnixMilli],
-				},
+				queryKey: [currentQuery.builder.queryData[0].dataSource, 'noop'],
 			},
+			true,
+			entity,
 		);

-	const flatFieldKeys = useMemo(() => {
-		const keys = groupByFiltersData?.data?.keys;
-		if (!keys) {
-			return [];
-		}
-
-		const allKeys = Object.values(keys).flat();
-		const seen = new Set<string>();
-
-		return allKeys.filter((field) => {
-			if (seen.has(field.name)) {
-				return false;
-			}
-			seen.add(field.name);
-			return true;
-		});
-	}, [groupByFiltersData]);
-
 	const groupByOptions = useMemo(
 		() =>
-			flatFieldKeys.map((field) => ({
-				value: field.name,
-				label: field.name,
-			})),
-		[flatFieldKeys],
+			groupByFiltersData?.payload?.attributeKeys?.map((filter) => ({
+				value: filter.key,
+				label: filter.key,
+			})) || [],
+		[groupByFiltersData],
 	);

 	const [groupBy, setGroupBy] = useInfraMonitoringGroupBy();

 	const handleGroupByChange = useCallback(
-		(value: string[]) => {
-			void setCurrentPage(1);
-			void setGroupBy(value);
+		(value: IBuilderQuery['groupBy']) => {
+			const newGroupBy = [];

-			void logEvent(InfraMonitoringEvents.GroupByChanged, {
+			for (let index = 0; index < value.length; index++) {
+				const element = value[index] as unknown as string;
+
+				const key = groupByFiltersData?.payload?.attributeKeys?.find(
+					(k) => k.key === element,
+				);
+
+				if (key) {
+					newGroupBy.push(key);
+				}
+			}
+
+			// Reset pagination on switching to groupBy
+			setCurrentPage(1);
+			setGroupBy(newGroupBy);
+
+			logEvent(InfraMonitoringEvents.GroupByChanged, {
 				entity: InfraMonitoringEvents.K8sEntity,
 				page: InfraMonitoringEvents.ListPage,
 				category: InfraMonitoringEvents.Pod,
 			});
 		},
-		[setCurrentPage, setGroupBy],
+		[groupByFiltersData, setCurrentPage, setGroupBy],
 	);

 	const onClickOutside = useCallback(() => {
@@ -218,69 +170,53 @@ function K8sHeader<TData>({

 	return (
 		<div className={styles.k8SListControls}>
-			<div className={styles.k8SListControlsRow}>
+			<div className={styles.k8SListControlsLeft}>
 				{controlListPrefix}

-				<div className={styles.k8SFiltersGroupByRow}>
-					{leftFilters}
-
-					<div className={styles.k8SAttributeSearchContainer}>
-						<div className={styles.groupByLabel}>Group by</div>
-						<Select
-							className={styles.groupBySelect}
-							loading={isLoadingGroupByFilters}
-							mode="multiple"
-							value={groupBy}
-							allowClear
-							maxTagCount="responsive"
-							placeholder="Search for attribute"
-							options={groupByOptions}
-							onChange={handleGroupByChange}
-						/>
-					</div>
-				</div>
-
-				<div className={styles.k8SDateTimeSelection}>
-					<DateTimeSelectionV2
-						showAutoRefresh={showAutoRefresh}
-						showRefreshText={false}
-						hideShareModal
+				<div className={styles.k8SQbSearchContainer}>
+					<QueryBuilderSearch
+						query={query as IBuilderQuery}
+						onChange={handleChangeTagFilters}
+						isInfraMonitoring
+						disableNavigationShortcuts
+						entity={entity}
 					/>
 				</div>

-				<RunQueryBtn
-					isLoadingQueries={isFetching}
-					onStageRunQuery={handleStageRunQuery}
-					handleCancelQuery={handleCancelQuery}
-					className={styles.k8SRunButton}
-				/>
-
-				<TooltipSimple title="Click to add more columns to this table">
-					<Button
-						type="button"
-						variant="outlined"
-						size="icon"
-						color="secondary"
-						data-testid="k8s-list-filters-button"
-						onClick={(): void => setIsFiltersSidePanelOpen(true)}
-						className={styles.k8SFiltersButton}
-					>
-						<SlidersHorizontal size={14} />
-					</Button>
-				</TooltipSimple>
+				<div className={styles.k8SAttributeSearchContainer}>
+					<div className={styles.groupByLabel}> Group by </div>
+					<Select
+						className={styles.groupBySelect}
+						loading={isLoadingGroupByFilters}
+						mode="multiple"
+						value={groupBy}
+						allowClear
+						maxTagCount="responsive"
+						placeholder="Search for attribute"
+						style={{ width: '100%' }}
+						options={groupByOptions}
+						onChange={handleGroupByChange}
+					/>
+				</div>
 			</div>

-			<div className={styles.k8SQbSearchContainer}>
-				<QuerySearch
-					queryData={queryData}
-					dataSource={DataSource.METRICS}
-					onChange={handleExpressionChange}
-					onRun={handleRunQuery}
-					signalSource=""
-					showFilterSuggestionsWithoutMetric
-					placeholder={ENTITY_FILTER_PLACEHOLDERS[entity]}
-					metricNamespace={METRIC_NAMESPACE_BY_ENTITY[entity]}
+			<div className={styles.k8SListControlsRight}>
+				<DateTimeSelectionV2
+					showAutoRefresh={showAutoRefresh}
+					showRefreshText={false}
+					hideShareModal
 				/>
+
+				<Button
+					type="button"
+					variant="ghost"
+					size="icon"
+					color="none"
+					data-testid="k8s-list-filters-button"
+					onClick={(): void => setIsFiltersSidePanelOpen(true)}
+				>
+					<SlidersHorizontal size={14} />
+				</Button>
 			</div>

 			<K8sFiltersSidePanel
--- a/frontend/src/container/InfraMonitoringK8sV2/Base/K8sPaginationWarning.module.scss
+++ b/frontend/src/container/InfraMonitoringK8sV2/Base/K8sPaginationWarning.module.scss
@@ -1,15 +0,0 @@
-.paginationWarning {
-	border: 1px solid var(--callout-warning-border);
-	background-color: var(--callout-warning-background);
-
-	padding: var(--spacing-2) var(--spacing-4);
-	display: flex;
-	justify-content: center;
-	align-items: center;
-
-	gap: var(--spacing-4);
-}
-
-.warningIcon {
-	cursor: pointer;
-}
--- a/frontend/src/container/InfraMonitoringK8sV2/Base/K8sPaginationWarning.tsx
+++ b/frontend/src/container/InfraMonitoringK8sV2/Base/K8sPaginationWarning.tsx
@@ -1,37 +0,0 @@
-import { Color } from '@signozhq/design-tokens';
-import WarningPopover from 'components/WarningPopover/WarningPopover';
-import { Querybuildertypesv5QueryWarnDataDTO } from 'api/generated/services/sigNoz.schemas';
-
-import styles from './K8sPaginationWarning.module.scss';
-import TriangleAlert from '@signozhq/icons/TriangleAlert';
-
-export type K8sPaginationWarningProps = {
-	warning: Querybuildertypesv5QueryWarnDataDTO;
-};
-
-export function K8sPaginationWarning({
-	warning,
-}: K8sPaginationWarningProps): JSX.Element {
-	return (
-		<span data-testid="k8s-list-warning-popover">
-			<WarningPopover
-				warningData={{
-					code: 'WARNING',
-					message: warning.message ?? '',
-					url: warning.url ?? '',
-					warnings:
-						warning.warnings?.map((w) => ({ message: w.message ?? '' })) ?? [],
-				}}
-			>
-				<div className={styles.paginationWarning}>
-					Your data contains some warnings
-					<TriangleAlert
-						size={16}
-						className={styles.warningIcon}
-						color={Color.BG_AMBER_500}
-					/>
-				</div>
-			</WarningPopover>
-		</span>
-	);
-}
--- a/frontend/src/container/InfraMonitoringK8sV2/Base/tests/K8sBaseList.test.tsx
+++ b/frontend/src/container/InfraMonitoringK8sV2/Base/tests/K8sBaseList.test.tsx
@@ -22,16 +22,6 @@ import { openInNewTab } from 'utils/navigation';
 import { TableColumnDef } from 'components/TanStackTableView';

 import { InfraMonitoringEntity } from '../../constants';
-import { SelectedItemParams } from '../../hooks';
-
-window.ResizeObserver =
-	window.ResizeObserver ||
-	jest.fn().mockImplementation(() => ({
-		disconnect: jest.fn(),
-		observe: jest.fn(),
-		unobserve: jest.fn(),
-	}));
-
 import { K8sBaseList, K8sBaseListProps, K8sEntityData } from '../K8sBaseList';

 jest.mock('utils/navigation', () => ({
@@ -166,14 +156,11 @@ function createTestColumnsWithGroup(): TableColumnDef<TestItemWithGroup>[] {
 }

 // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
-function renderComponent<
-	T extends K8sEntityData,
-	TItemKey extends string | SelectedItemParams = string,
->({
+function renderComponent<T extends K8sEntityData>({
 	queryParams,
 	onUrlUpdate,
 	...props
-}: K8sBaseListProps<T, TItemKey> & {
+}: K8sBaseListProps<T> & {
 	queryParams?: Record<string, string>;
 	onUrlUpdate?: OnUrlUpdateFunction;
 }) {
@@ -200,7 +187,7 @@ function renderComponent<
 										value={{ viewportHeight: 800, itemHeight: 50 }}
 									>
 										<TooltipProvider>
-											<K8sBaseList<T, TItemKey> {...props} />
+											<K8sBaseList {...props} />
 										</TooltipProvider>
 									</VirtuosoMockContext.Provider>
 								</NuqsTestingAdapter>
@@ -219,10 +206,8 @@ describe('K8sBaseList', () => {
 		const itemId2 = Math.random().toString(36).slice(7);
 		const onUrlUpdateMock = jest.fn<void, [UrlUpdateEvent]>();
 		const fetchListDataMock = jest.fn<
-			ReturnType<
-				NonNullable<K8sBaseListProps<TestItemWithTitle>['fetchListData']>
-			>,
-			Parameters<NonNullable<K8sBaseListProps<TestItemWithTitle>['fetchListData']>>
+			ReturnType<K8sBaseListProps<TestItemWithTitle>['fetchListData']>,
+			Parameters<K8sBaseListProps<TestItemWithTitle>['fetchListData']>
 		>();

 		beforeEach(() => {
@@ -274,10 +259,7 @@ describe('K8sBaseList', () => {
 			const [filters] = fetchListDataMock.mock.calls[0];
 			expect(filters.limit).toBe(10);
 			expect(filters.offset).toBe(0);
-			expect(filters.filter).toStrictEqual({
-				expression: '',
-				filterByStatus: undefined,
-			});
+			expect(filters.filters).toStrictEqual({ items: [], op: 'AND' });
 			expect(filters.groupBy).toBeUndefined();
 			expect(filters.orderBy).toBeUndefined();
 		});
@@ -437,11 +419,11 @@ describe('K8sBaseList', () => {
 		});
 	});

-	describe('with URL params (orderBy, groupBy old format, pagination)', () => {
+	describe('with URL params (orderBy, groupBy, pagination)', () => {
 		const onUrlUpdateMock = jest.fn<void, [UrlUpdateEvent]>();
 		const fetchListDataMock = jest.fn<
-			ReturnType<NonNullable<K8sBaseListProps<TestItem>['fetchListData']>>,
-			Parameters<NonNullable<K8sBaseListProps<TestItem>['fetchListData']>>
+			ReturnType<K8sBaseListProps<TestItem>['fetchListData']>,
+			Parameters<K8sBaseListProps<TestItem>['fetchListData']>
 		>();
 		const groupByValue = [
 			{ key: 'k8s.namespace.name', dataType: 'string', type: 'resource' },
@@ -480,11 +462,8 @@ describe('K8sBaseList', () => {
 			});

 			const [filters] = fetchListDataMock.mock.calls[0];
-			expect(filters.orderBy).toStrictEqual({
-				key: { name: 'cpu' },
-				direction: 'desc',
-			});
-			expect(filters.groupBy).toStrictEqual([{ name: 'k8s.namespace.name' }]);
+			expect(filters.orderBy).toStrictEqual({ columnName: 'cpu', order: 'desc' });
+			expect(filters.groupBy).toStrictEqual(groupByValue);
 			expect(filters.offset).toBe(20); // (3 - 1) * 10 = 20
 			expect(filters.limit).toBe(10);
 		});
@@ -508,84 +487,14 @@ describe('K8sBaseList', () => {
 				(c) => c[0].groupBy && c[0].groupBy.length > 0,
 			);
 			expect(callWithGroupBy).toBeDefined();
-			expect(callWithGroupBy?.[0].groupBy).toStrictEqual([
-				{ name: 'k8s.namespace.name' },
-			]);
-		});
-	});
-
-	describe('with URL params (groupBy new format - string array)', () => {
-		const onUrlUpdateMock = jest.fn<void, [UrlUpdateEvent]>();
-		const fetchListDataMock = jest.fn<
-			ReturnType<NonNullable<K8sBaseListProps<TestItem>['fetchListData']>>,
-			Parameters<NonNullable<K8sBaseListProps<TestItem>['fetchListData']>>
-		>();
-		const groupByValue = ['k8s.namespace.name'];
-
-		beforeEach(() => {
-			onUrlUpdateMock.mockClear();
-			fetchListDataMock.mockClear();
-			fetchListDataMock.mockResolvedValue({
-				data: [
-					{ id: 'namespace-default', meta: { 'k8s.namespace.name': 'default' } },
-				],
-				total: 50,
-				error: null,
-			});
-
-			renderComponent<TestItem>({
-				onUrlUpdate: onUrlUpdateMock,
-				entity: InfraMonitoringEntity.PODS,
-				eventCategory: InfraMonitoringEvents.Pod,
-				fetchListData: fetchListDataMock,
-				queryParams: {
-					orderBy: JSON.stringify({ columnName: 'cpu', order: 'desc' }),
-					groupBy: JSON.stringify(groupByValue),
-					page: '3',
-				},
-				tableColumns: createTestColumns(),
-				getRowKey: (row): string => row.id,
-				getItemKey: (row): string => row.id,
-			});
-		});
-
-		it('should call fetchListData with groupBy from new format URL', async () => {
-			await waitFor(() => {
-				expect(fetchListDataMock).toHaveBeenCalled();
-			});
-
-			const [filters] = fetchListDataMock.mock.calls[0];
-			expect(filters.groupBy).toStrictEqual([{ name: 'k8s.namespace.name' }]);
-		});
-
-		it('should render expand icons when groupBy is set with new format', async () => {
-			await waitFor(() => {
-				expect(screen.getByText('namespace-default')).toBeInTheDocument();
-			});
-
-			const expandButtons = screen.getAllByRole('button');
-			expect(expandButtons.length).toBeGreaterThan(0);
-		});
-
-		it('should render data with new groupBy format', async () => {
-			await waitFor(() => {
-				expect(screen.getByText('namespace-default')).toBeInTheDocument();
-			});
-
-			const callWithGroupBy = fetchListDataMock.mock.calls.find(
-				(c) => c[0].groupBy && c[0].groupBy.length > 0,
-			);
-			expect(callWithGroupBy).toBeDefined();
-			expect(callWithGroupBy?.[0].groupBy).toStrictEqual([
-				{ name: 'k8s.namespace.name' },
-			]);
+			expect(callWithGroupBy?.[0].groupBy).toStrictEqual(groupByValue);
 		});
 	});

 	describe('with empty data', () => {
 		const fetchListDataMock = jest.fn<
-			ReturnType<NonNullable<K8sBaseListProps<TestItem>['fetchListData']>>,
-			Parameters<NonNullable<K8sBaseListProps<TestItem>['fetchListData']>>
+			ReturnType<K8sBaseListProps<TestItem>['fetchListData']>,
+			Parameters<K8sBaseListProps<TestItem>['fetchListData']>
 		>();

 		beforeEach(() => {
@@ -594,6 +503,10 @@ describe('K8sBaseList', () => {
 				data: [],
 				total: 0,
 				error: null,
+				rawData: {
+					sentAnyHostMetricsData: true,
+					isSendingK8SAgentMetrics: false,
+				},
 			});

 			renderComponent<TestItem>({
@@ -621,8 +534,8 @@ describe('K8sBaseList', () => {

 	describe('with error response', () => {
 		const fetchListDataMock = jest.fn<
-			ReturnType<NonNullable<K8sBaseListProps<TestItem>['fetchListData']>>,
-			Parameters<NonNullable<K8sBaseListProps<TestItem>['fetchListData']>>
+			ReturnType<K8sBaseListProps<TestItem>['fetchListData']>,
+			Parameters<K8sBaseListProps<TestItem>['fetchListData']>
 		>();

 		beforeEach(() => {
@@ -656,10 +569,10 @@ describe('K8sBaseList', () => {
 		});
 	});

-	describe('with end time before retention (endTimeBeforeRetention=true)', () => {
+	describe('with no metrics data (sentAnyHostMetricsData=false)', () => {
 		const fetchListDataMock = jest.fn<
-			ReturnType<NonNullable<K8sBaseListProps<TestItem>['fetchListData']>>,
-			Parameters<NonNullable<K8sBaseListProps<TestItem>['fetchListData']>>
+			ReturnType<K8sBaseListProps<TestItem>['fetchListData']>,
+			Parameters<K8sBaseListProps<TestItem>['fetchListData']>
 		>();

 		beforeEach(() => {
@@ -668,7 +581,96 @@ describe('K8sBaseList', () => {
 				data: [],
 				total: 0,
 				error: null,
-				endTimeBeforeRetention: true,
+				rawData: {
+					sentAnyHostMetricsData: false,
+					isSendingK8SAgentMetrics: false,
+				},
+			});
+
+			renderComponent<TestItem>({
+				entity: InfraMonitoringEntity.PODS,
+				eventCategory: InfraMonitoringEvents.Pod,
+				fetchListData: fetchListDataMock,
+				tableColumns: createTestColumns(),
+				getRowKey: (row): string => row.id,
+				getItemKey: (row): string => row.id,
+			});
+		});
+
+		it('should display no metrics data message', async () => {
+			await waitFor(() => {
+				expect(
+					screen.getByText(/No host metrics data received yet/i),
+				).toBeInTheDocument();
+			});
+		});
+
+		it('should display link to documentation', async () => {
+			await waitFor(() => {
+				const link = screen.getByRole('link', { name: /our documentation/i });
+				expect(link).toBeInTheDocument();
+				expect(link).toHaveAttribute(
+					'href',
+					'https://signoz.io/docs/infrastructure-monitoring/hostmetrics/',
+				);
+			});
+		});
+	});
+
+	describe('with incorrect K8s agent metrics (isSendingK8SAgentMetrics=true)', () => {
+		const fetchListDataMock = jest.fn<
+			ReturnType<K8sBaseListProps<TestItem>['fetchListData']>,
+			Parameters<K8sBaseListProps<TestItem>['fetchListData']>
+		>();
+
+		beforeEach(() => {
+			fetchListDataMock.mockClear();
+			fetchListDataMock.mockResolvedValue({
+				data: [],
+				total: 0,
+				error: null,
+				rawData: {
+					sentAnyHostMetricsData: true,
+					isSendingK8SAgentMetrics: true,
+				},
+			});
+
+			renderComponent<TestItem>({
+				entity: InfraMonitoringEntity.PODS,
+				eventCategory: InfraMonitoringEvents.Pod,
+				fetchListData: fetchListDataMock,
+				tableColumns: createTestColumns(),
+				getRowKey: (row): string => row.id,
+				getItemKey: (row): string => row.id,
+			});
+		});
+
+		it('should display upgrade message', async () => {
+			await waitFor(() => {
+				expect(
+					screen.getByText(/upgrade to the latest version of SigNoz k8s-infra/i),
+				).toBeInTheDocument();
+			});
+		});
+	});
+
+	describe('with end time before retention (endTimeBeforeRetention=true)', () => {
+		const fetchListDataMock = jest.fn<
+			ReturnType<K8sBaseListProps<TestItem>['fetchListData']>,
+			Parameters<K8sBaseListProps<TestItem>['fetchListData']>
+		>();
+
+		beforeEach(() => {
+			fetchListDataMock.mockClear();
+			fetchListDataMock.mockResolvedValue({
+				data: [],
+				total: 0,
+				error: null,
+				rawData: {
+					sentAnyHostMetricsData: true,
+					isSendingK8SAgentMetrics: false,
+					endTimeBeforeRetention: true,
+				},
 			});

 			renderComponent<TestItem>({
@@ -695,8 +697,8 @@ describe('K8sBaseList', () => {

 	describe('column visibility based on TanStack columns', () => {
 		const fetchListDataMock = jest.fn<
-			ReturnType<NonNullable<K8sBaseListProps<TestItemWithName>['fetchListData']>>,
-			Parameters<NonNullable<K8sBaseListProps<TestItemWithName>['fetchListData']>>
+			ReturnType<K8sBaseListProps<TestItemWithName>['fetchListData']>,
+			Parameters<K8sBaseListProps<TestItemWithName>['fetchListData']>
 		>();

 		beforeEach(() => {
@@ -734,10 +736,8 @@ describe('K8sBaseList', () => {

 	describe('column behavior with groupBy (expanded/collapsed)', () => {
 		const fetchListDataMock = jest.fn<
-			ReturnType<
-				NonNullable<K8sBaseListProps<TestItemWithGroup>['fetchListData']>
-			>,
-			Parameters<NonNullable<K8sBaseListProps<TestItemWithGroup>['fetchListData']>>
+			ReturnType<K8sBaseListProps<TestItemWithGroup>['fetchListData']>,
+			Parameters<K8sBaseListProps<TestItemWithGroup>['fetchListData']>
 		>();

 		beforeEach(() => {
@@ -807,8 +807,8 @@ describe('K8sBaseList', () => {

 	describe('column visibility in expanded row (nested table)', () => {
 		const fetchListDataMock = jest.fn<
-			ReturnType<NonNullable<K8sBaseListProps<TestItem>['fetchListData']>>,
-			Parameters<NonNullable<K8sBaseListProps<TestItem>['fetchListData']>>
+			ReturnType<K8sBaseListProps<TestItem>['fetchListData']>,
+			Parameters<K8sBaseListProps<TestItem>['fetchListData']>
 		>();
 		const groupByValue = [
 			{ key: 'k8s.namespace.name', dataType: 'string', type: 'resource' },
@@ -852,8 +852,8 @@ describe('K8sBaseList', () => {

 	describe('TanStack table column rendering', () => {
 		const fetchListDataMock = jest.fn<
-			ReturnType<NonNullable<K8sBaseListProps<TestItemWithName>['fetchListData']>>,
-			Parameters<NonNullable<K8sBaseListProps<TestItemWithName>['fetchListData']>>
+			ReturnType<K8sBaseListProps<TestItemWithName>['fetchListData']>,
+			Parameters<K8sBaseListProps<TestItemWithName>['fetchListData']>
 		>();

 		beforeEach(() => {
@@ -909,149 +909,4 @@ describe('K8sBaseList', () => {
 			});
 		});
 	});
-
-	describe('with warnings from API', () => {
-		const fetchListDataMock = jest.fn<
-			ReturnType<NonNullable<K8sBaseListProps<TestItem>['fetchListData']>>,
-			Parameters<NonNullable<K8sBaseListProps<TestItem>['fetchListData']>>
-		>();
-
-		beforeEach(() => {
-			fetchListDataMock.mockClear();
-			fetchListDataMock.mockResolvedValue({
-				data: [{ id: 'item-1' }],
-				total: 1,
-				error: null,
-				warning: {
-					message: 'Some data may be incomplete',
-					url: 'https://docs.example.com/partial-data',
-					warnings: [{ message: 'Node xyz did not report metrics' }],
-				},
-			});
-
-			renderComponent<TestItem>({
-				entity: InfraMonitoringEntity.PODS,
-				eventCategory: InfraMonitoringEvents.Pod,
-				fetchListData: fetchListDataMock,
-				tableColumns: createTestColumns(),
-				getRowKey: (row): string => row.id,
-				getItemKey: (row): string => row.id,
-			});
-		});
-
-		it('should render warning popover in pagination area', async () => {
-			await waitFor(() => {
-				expect(screen.getByTestId('k8s-list-warning-popover')).toBeInTheDocument();
-			});
-		});
-	});
-
-	describe('with object itemKey (selectedItem + cluster + namespace params)', () => {
-		const itemId = 'obj-item';
-		const onUrlUpdateMock = jest.fn<void, [UrlUpdateEvent]>();
-		const fetchListDataMock = jest.fn<
-			ReturnType<
-				NonNullable<K8sBaseListProps<TestItemWithTitle>['fetchListData']>
-			>,
-			Parameters<NonNullable<K8sBaseListProps<TestItemWithTitle>['fetchListData']>>
-		>();
-
-		const getLatestParam = (key: string): string | undefined =>
-			onUrlUpdateMock.mock.calls
-				.map((call) => call[0].searchParams.get(key))
-				.filter(Boolean)
-				.pop() as string | undefined;
-
-		beforeEach(() => {
-			onUrlUpdateMock.mockClear();
-			fetchListDataMock.mockClear();
-			openInNewTabMock.mockClear();
-			fetchListDataMock.mockResolvedValue({
-				data: [{ id: `PodId:${itemId}`, title: `PodTitle:${itemId}` }],
-				total: 1,
-				error: null,
-			});
-		});
-
-		it('should set selectedItem, cluster and namespace params on row click', async () => {
-			const user = userEvent.setup();
-
-			renderComponent<TestItemWithTitle, SelectedItemParams>({
-				onUrlUpdate: onUrlUpdateMock,
-				entity: InfraMonitoringEntity.PODS,
-				eventCategory: InfraMonitoringEvents.Pod,
-				fetchListData: fetchListDataMock,
-				tableColumns: createTestColumnsWithTitle(),
-				getRowKey: (row): string => row.id,
-				getItemKey: (row): SelectedItemParams => ({
-					selectedItem: row.id,
-					clusterName: 'prod-cluster',
-					namespaceName: 'default-ns',
-				}),
-			});
-
-			const firstRowEl = await screen.findByText(`PodId:${itemId}`);
-			await user.click(firstRowEl);
-
-			await waitFor(() => {
-				expect(getLatestParam('selectedItem')).toBe(`PodId:${itemId}`);
-				expect(getLatestParam('selectedItemClusterName')).toBe('prod-cluster');
-				expect(getLatestParam('selectedItemNamespaceName')).toBe('default-ns');
-			});
-		});
-
-		it('should include cluster and namespace params in new tab URL on ctrl+click', async () => {
-			renderComponent<TestItemWithTitle, SelectedItemParams>({
-				onUrlUpdate: onUrlUpdateMock,
-				entity: InfraMonitoringEntity.PODS,
-				eventCategory: InfraMonitoringEvents.Pod,
-				fetchListData: fetchListDataMock,
-				tableColumns: createTestColumnsWithTitle(),
-				getRowKey: (row): string => row.id,
-				getItemKey: (row): SelectedItemParams => ({
-					selectedItem: row.id,
-					clusterName: 'prod-cluster',
-					namespaceName: 'default-ns',
-				}),
-			});
-
-			const firstRow = await screen.findByText(`PodId:${itemId}`);
-			fireEvent.click(firstRow, { ctrlKey: true });
-
-			await waitFor(() => {
-				expect(openInNewTabMock).toHaveBeenCalledTimes(1);
-			});
-			const url = openInNewTabMock.mock.calls[0][0] as string;
-			expect(url).toContain(`selectedItem=PodId%3A${itemId}`);
-			expect(url).toContain('selectedItemClusterName=prod-cluster');
-			expect(url).toContain('selectedItemNamespaceName=default-ns');
-		});
-
-		it('should omit null cluster/namespace params in new tab URL', async () => {
-			renderComponent<TestItemWithTitle, SelectedItemParams>({
-				onUrlUpdate: onUrlUpdateMock,
-				entity: InfraMonitoringEntity.PODS,
-				eventCategory: InfraMonitoringEvents.Pod,
-				fetchListData: fetchListDataMock,
-				tableColumns: createTestColumnsWithTitle(),
-				getRowKey: (row): string => row.id,
-				getItemKey: (row): SelectedItemParams => ({
-					selectedItem: row.id,
-					clusterName: null,
-					namespaceName: null,
-				}),
-			});
-
-			const firstRow = await screen.findByText(`PodId:${itemId}`);
-			fireEvent.click(firstRow, { ctrlKey: true });
-
-			await waitFor(() => {
-				expect(openInNewTabMock).toHaveBeenCalledTimes(1);
-			});
-			const url = openInNewTabMock.mock.calls[0][0] as string;
-			expect(url).toContain(`selectedItem=PodId%3A${itemId}`);
-			expect(url).not.toContain('selectedItemClusterName');
-			expect(url).not.toContain('selectedItemNamespaceName');
-		});
-	});
 });
--- a/frontend/src/container/InfraMonitoringK8sV2/Base/tests/utils.build-expression.test.ts
+++ b/frontend/src/container/InfraMonitoringK8sV2/Base/tests/utils.build-expression.test.ts
@@ -1,132 +0,0 @@
-import {
-	buildEventsExpression,
-	buildExpressionFromSelectedItemParams,
-	buildLogsTracesExpression,
-} from 'container/InfraMonitoringK8sV2/Base/utils';
-
-describe('buildExpressionFromSelectedItemParams', () => {
-	it('should build expression from params with all values', () => {
-		const result = buildExpressionFromSelectedItemParams(
-			{
-				selectedItem: 'nginx',
-				clusterName: 'prod',
-				namespaceName: 'default',
-			},
-			'k8s.deployment.name',
-		);
-
-		expect(result).toBe(
-			"k8s.deployment.name = 'nginx' AND k8s.cluster.name = 'prod' AND k8s.namespace.name = 'default'",
-		);
-	});
-
-	it('should skip null values', () => {
-		const result = buildExpressionFromSelectedItemParams(
-			{
-				selectedItem: 'nginx',
-				clusterName: null,
-				namespaceName: 'default',
-			},
-			'k8s.deployment.name',
-		);
-
-		expect(result).toBe(
-			"k8s.deployment.name = 'nginx' AND k8s.namespace.name = 'default'",
-		);
-	});
-
-	it('should handle only selectedItem', () => {
-		const result = buildExpressionFromSelectedItemParams(
-			{
-				selectedItem: 'pod-123',
-				clusterName: null,
-				namespaceName: null,
-			},
-			'k8s.pod.uid',
-		);
-
-		expect(result).toBe("k8s.pod.uid = 'pod-123'");
-	});
-});
-
-describe('buildEventsExpression', () => {
-	it('should build expression with kind, name, cluster and attribute-context namespace', () => {
-		const result = buildEventsExpression({
-			objectKind: 'Deployment',
-			objectName: 'nginx',
-			clusterName: 'prod',
-			namespaceName: 'default',
-		});
-
-		expect(result).toBe(
-			"k8s.object.kind = 'Deployment' AND k8s.object.name = 'nginx' AND k8s.cluster.name = 'prod' AND attribute.k8s.namespace.name = 'default'",
-		);
-	});
-
-	it('should always include kind and name, even when name is empty', () => {
-		const result = buildEventsExpression({
-			objectKind: 'Node',
-			objectName: '',
-		});
-
-		expect(result).toBe("k8s.object.kind = 'Node' AND k8s.object.name = ''");
-	});
-
-	it('should skip cluster and namespace clauses when values are missing', () => {
-		const result = buildEventsExpression({
-			objectKind: 'Pod',
-			objectName: 'pod-1',
-			clusterName: null,
-			namespaceName: undefined,
-		});
-
-		expect(result).toBe("k8s.object.kind = 'Pod' AND k8s.object.name = 'pod-1'");
-	});
-
-	it('should escape values with quotes', () => {
-		const result = buildEventsExpression({
-			objectKind: 'Pod',
-			objectName: "po'd",
-			namespaceName: 'ns-1',
-		});
-
-		expect(result).toBe(
-			`k8s.object.kind = 'Pod' AND k8s.object.name = 'po\\'d' AND attribute.k8s.namespace.name = 'ns-1'`,
-		);
-	});
-});
-
-describe('buildLogsTracesExpression', () => {
-	it('should build expression with main attribute, cluster and namespace', () => {
-		const result = buildLogsTracesExpression({
-			mainAttributeKey: 'k8s.deployment.name',
-			mainAttributeValue: 'nginx',
-			clusterName: 'prod',
-			namespaceName: 'default',
-		});
-
-		expect(result).toBe(
-			"k8s.deployment.name = 'nginx' AND k8s.cluster.name = 'prod' AND k8s.namespace.name = 'default'",
-		);
-	});
-
-	it('should skip clauses with empty values', () => {
-		const result = buildLogsTracesExpression({
-			mainAttributeKey: 'k8s.node.name',
-			mainAttributeValue: 'node-1',
-			clusterName: '',
-			namespaceName: null,
-		});
-
-		expect(result).toBe("k8s.node.name = 'node-1'");
-	});
-
-	it('should return empty string when all values are missing', () => {
-		const result = buildLogsTracesExpression({
-			mainAttributeKey: 'k8s.pod.name',
-			mainAttributeValue: '',
-		});
-
-		expect(result).toBe('');
-	});
-});
--- a/frontend/src/container/InfraMonitoringK8sV2/Base/components/EntityCountsSection/EntityCountsSection.module.scss
+++ b/frontend/src/container/InfraMonitoringK8sV2/Base/components/EntityCountsSection/EntityCountsSection.module.scss
@@ -1,41 +0,0 @@
-.countsContainer {
-	display: flex;
-	gap: var(--spacing-6);
-	margin-top: var(--spacing-8);
-	flex-wrap: wrap;
-}
-
-.countCard {
-	position: relative;
-	flex: 1;
-	min-width: 120px;
-	max-width: 180px;
-	border: 1px solid var(--l3-border);
-	border-radius: 4px;
-	display: flex;
-	flex-direction: column;
-	gap: var(--spacing-2);
-	padding: var(--spacing-6);
-}
-
-.countLabel {
-	color: var(--l2-foreground);
-	letter-spacing: var(--letter-spacing-wide);
-	text-transform: uppercase;
-}
-
-.countValue {
-	color: var(--l1-foreground);
-	font-family: var(--periscope-font-family-mono);
-	font-size: var(--font-size-xl);
-}
-
-.navigateButton {
-	position: absolute;
-	top: var(--spacing-4);
-	right: var(--spacing-4);
-
-	--button-padding: var(--spacing-1);
-	--button-height: 24px;
-	--button-width: 24px;
-}
--- a/frontend/src/container/InfraMonitoringK8sV2/Base/components/EntityCountsSection/EntityCountsSection.tsx
+++ b/frontend/src/container/InfraMonitoringK8sV2/Base/components/EntityCountsSection/EntityCountsSection.tsx
@@ -1,107 +0,0 @@
-import { Tooltip } from 'antd';
-import { Button } from '@signozhq/ui/button';
-import { Typography } from '@signozhq/ui/typography';
-import { Compass } from '@signozhq/icons';
-import { QueryParams } from 'constants/query';
-import { initialQueriesMap } from 'constants/queryBuilder';
-import ROUTES from 'constants/routes';
-import { Link } from 'react-router-dom';
-import { DataSource } from 'types/common/queryBuilder';
-import { v4 as uuid } from 'uuid';
-
-import {
-	INFRA_MONITORING_K8S_PARAMS_KEYS,
-	InfraMonitoringEntity,
-} from '../../../constants';
-import styles from './EntityCountsSection.module.scss';
-
-export interface EntityCountConfig<T> {
-	label: string;
-	getValue: (entity: T) => number;
-	targetCategory: InfraMonitoringEntity;
-}
-
-interface EntityCountsSectionProps<T> {
-	entity: T;
-	countsConfig: EntityCountConfig<T>[];
-	selectedItem: string;
-	filterExpression: string;
-	closeDrawer: () => void;
-}
-
-export function EntityCountsSection<T>({
-	entity,
-	countsConfig,
-	selectedItem,
-	filterExpression,
-	closeDrawer,
-}: EntityCountsSectionProps<T>): JSX.Element {
-	const buildNavigationUrl = (targetCategory: InfraMonitoringEntity): string => {
-		const defaultQuery = initialQueriesMap[DataSource.METRICS];
-
-		const compositeQuery = {
-			...defaultQuery,
-			id: uuid(),
-			builder: {
-				...defaultQuery.builder,
-				queryData: defaultQuery.builder.queryData.map((query) => ({
-					...query,
-					filter: { expression: filterExpression },
-					filters: { items: [], op: 'AND' as const },
-				})),
-			},
-		};
-
-		// TODO(H4ad): After https://github.com/SigNoz/signoz/pull/12038, inherit custom time of drawer to list
-		const urlParams = new URLSearchParams();
-		urlParams.set(INFRA_MONITORING_K8S_PARAMS_KEYS.CATEGORY, targetCategory);
-		urlParams.set(
-			QueryParams.compositeQuery,
-			encodeURIComponent(JSON.stringify(compositeQuery)),
-		);
-
-		return `${ROUTES.INFRASTRUCTURE_MONITORING_KUBERNETES}?${urlParams.toString()}`;
-	};
-
-	return (
-		<div className={styles.countsContainer}>
-			{countsConfig.map((config) => (
-				<div
-					key={config.label}
-					className={styles.countCard}
-					data-testid={`count-card-${config.label.toLowerCase().replace(/\s+/g, '-')}`}
-				>
-					<Typography.Text
-						color="muted"
-						size="small"
-						weight="medium"
-						className={styles.countLabel}
-					>
-						{config.label}
-					</Typography.Text>
-					<Typography.Text className={styles.countValue} size="xl" weight="semibold">
-						{config.getValue(entity) || '-'}
-					</Typography.Text>
-					<Link
-						to={buildNavigationUrl(config.targetCategory)}
-						onClick={closeDrawer}
-						data-testid={`navigate-${config.label.toLowerCase().replace(/\s+/g, '-')}`}
-					>
-						<Tooltip
-							title={`View ${config.label.toLowerCase()} of '${selectedItem}'`}
-							placement="top"
-						>
-							<Button
-								size="icon"
-								variant="ghost"
-								color="secondary"
-								className={styles.navigateButton}
-								prefix={<Compass size={14} />}
-							/>
-						</Tooltip>
-					</Link>
-				</div>
-			))}
-		</div>
-	);
-}
--- a/frontend/src/container/InfraMonitoringK8sV2/Base/types.ts
+++ b/frontend/src/container/InfraMonitoringK8sV2/Base/types.ts
@@ -1,25 +1,16 @@
+import { BaseAutocompleteData } from 'types/api/queryBuilder/queryAutocompleteResponse';
+import { TagFilter } from 'types/api/queryBuilder/queryBuilderData';
+
+import { OrderBySchemaType } from '../schemas';
+
 export type K8sBaseFilters = {
-	filter: {
-		expression: string;
-		filterByStatus?: 'active' | 'inactive' | '';
-	};
-	groupBy?: Array<{ name: string }>;
+	filters: TagFilter;
+	groupBy?: BaseAutocompleteData[];
 	offset?: number;
 	limit?: number;
 	start: number;
 	end: number;
-	orderBy?: {
-		key: { name: string };
-		direction: 'asc' | 'desc';
-	};
-};
-
-export type K8sListResponse<T> = {
-	type: 'list' | 'grouped_list';
-	records: T[];
-	total: number;
-	endTimeBeforeRetention?: boolean;
-	error?: string | null;
+	orderBy?: OrderBySchemaType;
 };

 /**
--- a/frontend/src/container/InfraMonitoringK8sV2/Base/utils.tsx
+++ b/frontend/src/container/InfraMonitoringK8sV2/Base/utils.tsx
@@ -1,13 +1,8 @@
 import { Badge } from '@signozhq/ui/badge';
+import { BaseAutocompleteData } from 'types/api/queryBuilder/queryAutocompleteResponse';
+import { IBuilderQuery } from 'types/api/queryBuilder/queryBuilderData';

 import styles from './utils.module.scss';
-import { TagFilterItem } from 'types/api/queryBuilder/queryBuilderData';
-import {
-	convertFiltersToExpression,
-	formatValueForExpression,
-} from 'components/QueryBuilderV2/utils';
-import { SelectedItemParams } from 'container/InfraMonitoringK8sV2/hooks';
-import { INFRA_MONITORING_ATTR_KEYS } from 'container/InfraMonitoringK8sV2/constants';

 const dotToUnder: Record<string, string> = {
 	'os.type': 'os_type',
@@ -27,13 +22,15 @@ const dotToUnder: Record<string, string> = {
 	'k8s.persistentvolumeclaim.name': 'k8s_persistentvolumeclaim_name',
 };

-export function getGroupedByMeta<
-	T extends { meta?: Record<string, string> | null },
->(itemData: T, groupBy: string[]): Record<string, string> {
+export function getGroupedByMeta<T extends { meta?: Record<string, string> }>(
+	itemData: T,
+	groupBy: BaseAutocompleteData[],
+): Record<string, string> {
 	const result: Record<string, string> = {};
 	const meta = itemData.meta ?? {};

-	groupBy.forEach((rawKey) => {
+	groupBy.forEach((group) => {
+		const rawKey = group.key as string;
 		const metaKey = (dotToUnder[rawKey] ?? rawKey) as keyof typeof meta;
 		result[rawKey] = (meta[metaKey] || meta[rawKey]) ?? '';
 	});
@@ -41,13 +38,45 @@ export function getGroupedByMeta<
 	return result;
 }

-export function getGroupByEl<
-	T extends { meta?: Record<string, string> | null },
->(itemData: T, groupBy: string[]): React.ReactNode {
+export function getRowKey<T extends { meta?: Record<string, string> }>(
+	itemData: T,
+	getItemIdentifier: () => string,
+	groupBy: BaseAutocompleteData[],
+): string {
+	const nodeIdentifier = getItemIdentifier();
+	const meta = itemData.meta ?? {};
+
+	if (groupBy.length === 0) {
+		return nodeIdentifier || JSON.stringify(meta);
+	}
+
+	const groupedMeta = getGroupedByMeta(itemData, groupBy);
+	const groupKey = Object.values(groupedMeta).join('-');
+
+	if (groupKey && nodeIdentifier) {
+		return `${groupKey}-${nodeIdentifier}`;
+	}
+	if (groupKey) {
+		return groupKey;
+	}
+	if (nodeIdentifier) {
+		return nodeIdentifier;
+	}
+
+	return JSON.stringify(meta);
+}
+
+export function getGroupByEl<T extends { meta?: Record<string, string> }>(
+	itemData: T,
+	groupBy: IBuilderQuery['groupBy'],
+): React.ReactNode {
 	const groupByValues: string[] = [];
 	const meta = itemData.meta ?? {};

-	groupBy.forEach((rawKey) => {
+	groupBy.forEach((group) => {
+		const rawKey = group.key as string;
+
+		// Choose mapped key if present, otherwise use rawKey
 		const metaKey = (dotToUnder[rawKey] ?? rawKey) as keyof typeof meta;
 		const value = meta[metaKey] || meta[rawKey] || '<no-value>';

@@ -69,116 +98,3 @@ export function getGroupByEl<
 		</div>
 	);
 }
-
-export function buildExpressionFromGroupMeta(
-	parentExpression: string,
-	groupMeta: Record<string, string> | undefined,
-): string {
-	const items: TagFilterItem[] = Object.entries(groupMeta ?? {})
-		.filter(([, value]) => value !== '' && value !== undefined && value !== null)
-		.map(([key, value]) => ({
-			key: { key, type: 'resource' },
-			op: '=',
-			value,
-			id: key,
-		}));
-
-	const metaExpression = convertFiltersToExpression({
-		items,
-		op: 'AND',
-	}).expression;
-
-	const parent = parentExpression?.trim();
-	if (parent && metaExpression) {
-		return `${parent} AND ${metaExpression}`;
-	}
-	return parent || metaExpression;
-}
-
-export interface EventsExpressionParams {
-	objectKind: string;
-	objectName: string;
-	clusterName?: string | null;
-	namespaceName?: string | null;
-}
-
-export function buildEventsExpression(params: EventsExpressionParams): string {
-	const clauses: string[] = [
-		`${INFRA_MONITORING_ATTR_KEYS.K8S_OBJECT_KIND} = ${formatValueForExpression(params.objectKind)}`,
-		`${INFRA_MONITORING_ATTR_KEYS.K8S_OBJECT_NAME} = ${formatValueForExpression(params.objectName)}`,
-	];
-
-	if (params.clusterName) {
-		clauses.push(
-			`${INFRA_MONITORING_ATTR_KEYS.K8S_CLUSTER_NAME} = ${formatValueForExpression(params.clusterName)}`,
-		);
-	}
-
-	// the other attributes are resource., and fallbacks correctly without prefix
-	// this one needs attribute. prefix otherwise it fails the query
-	if (params.namespaceName) {
-		clauses.push(
-			`attribute.${INFRA_MONITORING_ATTR_KEYS.K8S_NAMESPACE_NAME} = ${formatValueForExpression(params.namespaceName)}`,
-		);
-	}
-
-	return clauses.join(' AND ');
-}
-
-export interface LogsTracesExpressionParams {
-	mainAttributeKey: string;
-	mainAttributeValue?: string | null;
-	clusterName?: string | null;
-	namespaceName?: string | null;
-}
-
-export function buildLogsTracesExpression(
-	params: LogsTracesExpressionParams,
-): string {
-	const clauses: string[] = [];
-
-	if (params.mainAttributeValue) {
-		clauses.push(
-			`${params.mainAttributeKey} = ${formatValueForExpression(params.mainAttributeValue)}`,
-		);
-	}
-
-	if (params.clusterName) {
-		clauses.push(
-			`${INFRA_MONITORING_ATTR_KEYS.K8S_CLUSTER_NAME} = ${formatValueForExpression(params.clusterName)}`,
-		);
-	}
-
-	if (params.namespaceName) {
-		clauses.push(
-			`${INFRA_MONITORING_ATTR_KEYS.K8S_NAMESPACE_NAME} = ${formatValueForExpression(params.namespaceName)}`,
-		);
-	}
-
-	return clauses.join(' AND ');
-}
-
-export function buildExpressionFromSelectedItemParams(
-	params: SelectedItemParams,
-	mainAttributeKey: string,
-): string {
-	const clauses: string[] = [];
-
-	if (params.selectedItem) {
-		clauses.push(
-			`${mainAttributeKey} = ${formatValueForExpression(params.selectedItem)}`,
-		);
-	}
-	if (params.clusterName) {
-		clauses.push(
-			`${INFRA_MONITORING_ATTR_KEYS.K8S_CLUSTER_NAME} = ${formatValueForExpression(params.clusterName)}`,
-		);
-	}
-	if (params.namespaceName) {
-		clauses.push(
-			`${INFRA_MONITORING_ATTR_KEYS.K8S_NAMESPACE_NAME} = ${formatValueForExpression(params.namespaceName)}`,
-		);
-	}
-
-	return clauses.join(' AND ');
-}
--- a/frontend/src/container/InfraMonitoringK8sV2/Clusters/K8sClustersList.tsx
+++ b/frontend/src/container/InfraMonitoringK8sV2/Clusters/K8sClustersList.tsx
@@ -1,26 +1,21 @@
-import { useCallback } from 'react';
-import { listClusters } from 'api/generated/services/inframonitoring';
-import {
-	InframonitoringtypesClusterRecordDTO,
-	InframonitoringtypesResponseTypeDTO,
-	Querybuildertypesv5OrderDirectionDTO,
-} from 'api/generated/services/sigNoz.schemas';
+import React, { useCallback } from 'react';
 import { InfraMonitoringEvents } from 'constants/events';
+import { FeatureKeys } from 'constants/features';
+import { useAppContext } from 'providers/App/App';

 import K8sBaseDetails, { K8sDetailsFilters } from '../Base/K8sBaseDetails';
 import { K8sBaseList } from '../Base/K8sBaseList';
 import { K8sBaseFilters } from '../Base/types';
 import { InfraMonitoringEntity } from '../constants';
+import { getK8sClustersList, K8sClusterData } from './api';
 import {
 	clusterWidgetInfo,
 	getClusterMetricsQueryPayload,
-	k8sClusterDetailsCountsConfig,
 	k8sClusterDetailsMetadataConfig,
-	k8sClusterGetCountsFilterExpression,
 	k8sClusterGetEntityName,
-	k8sClusterGetSelectedItemExpression,
-	k8sClusterInitialEventsExpression,
-	k8sClusterInitialLogTracesExpression,
+	k8sClusterGetSelectedItemFilters,
+	k8sClusterInitialEventsFilter,
+	k8sClusterInitialLogTracesFilter,
 } from './constants';
 import {
 	getK8sClusterItemKey,
@@ -33,93 +28,66 @@ function K8sClustersList({
 }: {
 	controlListPrefix?: React.ReactNode;
 }): JSX.Element {
+	const { featureFlags } = useAppContext();
+	const dotMetricsEnabled =
+		featureFlags?.find((flag) => flag.name === FeatureKeys.DOT_METRICS_ENABLED)
+			?.active || false;
+
 	const fetchListData = useCallback(
 		async (filters: K8sBaseFilters, signal?: AbortSignal) => {
-			try {
-				const response = await listClusters(
-					{
-						filter: { expression: filters.filter.expression },
-						groupBy: filters.groupBy?.map((g) => ({ name: g.name })),
-						offset: filters.offset,
-						limit: filters.limit ?? 10,
-						start: filters.start,
-						end: filters.end,
-						orderBy: filters.orderBy
-							? {
-									key: { name: filters.orderBy.key.name },
-									direction:
-										filters.orderBy.direction === 'asc'
-											? Querybuildertypesv5OrderDirectionDTO.asc
-											: Querybuildertypesv5OrderDirectionDTO.desc,
-								}
-							: undefined,
-					},
-					signal,
-				);
+			filters.orderBy ||= {
+				columnName: 'cpu',
+				order: 'desc',
+			};

-				const data = response.data;
-				return {
-					type:
-						data.type === InframonitoringtypesResponseTypeDTO.grouped_list
-							? ('grouped_list' as const)
-							: ('list' as const),
-					records: data.records,
-					total: data.total,
-					endTimeBeforeRetention: data.endTimeBeforeRetention,
-					warning: data.warning,
-				};
-			} catch (error) {
-				const errMsg =
-					error instanceof Error ? error.message : 'Failed to fetch clusters';
-				return {
-					type: 'list' as const,
-					records: [] as InframonitoringtypesClusterRecordDTO[],
-					total: 0,
-					error: errMsg,
-				};
-			}
+			const response = await getK8sClustersList(
+				filters,
+				signal,
+				undefined,
+				dotMetricsEnabled,
+			);
+
+			return {
+				data: response.payload?.data.records || [],
+				total: response.payload?.data.total || 0,
+				error: response.error,
+				rawData: response.payload?.data,
+			};
 		},
-		[],
+		[dotMetricsEnabled],
 	);

 	const fetchEntityData = useCallback(
 		async (
 			filters: K8sDetailsFilters,
 			signal?: AbortSignal,
-		): Promise<{
-			data: InframonitoringtypesClusterRecordDTO | null;
-			error?: string | null;
-		}> => {
-			try {
-				const response = await listClusters(
-					{
-						filter: { expression: filters.filter.expression },
-						start: filters.start,
-						end: filters.end,
-						limit: 1,
-						offset: 0,
-					},
-					signal,
-				);
+		): Promise<{ data: K8sClusterData | null; error?: string | null }> => {
+			const response = await getK8sClustersList(
+				{
+					filters: filters.filters,
+					start: filters.start,
+					end: filters.end,
+					limit: 1,
+					offset: 0,
+				},
+				signal,
+				undefined,
+				dotMetricsEnabled,
+			);

-				return {
-					data: response.data.records.length > 0 ? response.data.records[0] : null,
-				};
-			} catch (error) {
-				const errMsg =
-					error instanceof Error ? error.message : 'Failed to fetch cluster';
-				return {
-					data: null,
-					error: errMsg,
-				};
-			}
+			const records = response.payload?.data.records || [];
+
+			return {
+				data: records.length > 0 ? records[0] : null,
+				error: response.error,
+			};
 		},
-		[],
+		[dotMetricsEnabled],
 	);

 	return (
 		<>
-			<K8sBaseList<InframonitoringtypesClusterRecordDTO>
+			<K8sBaseList<K8sClusterData>
 				controlListPrefix={controlListPrefix}
 				entity={InfraMonitoringEntity.CLUSTERS}
 				tableColumns={k8sClustersColumnsConfig}
@@ -129,17 +97,15 @@ function K8sClustersList({
 				eventCategory={InfraMonitoringEvents.Cluster}
 			/>

-			<K8sBaseDetails<InframonitoringtypesClusterRecordDTO>
+			<K8sBaseDetails<K8sClusterData>
 				category={InfraMonitoringEntity.CLUSTERS}
 				eventCategory={InfraMonitoringEvents.Cluster}
-				getSelectedItemExpression={k8sClusterGetSelectedItemExpression}
+				getSelectedItemFilters={k8sClusterGetSelectedItemFilters}
 				fetchEntityData={fetchEntityData}
 				getEntityName={k8sClusterGetEntityName}
-				getInitialLogTracesExpression={k8sClusterInitialLogTracesExpression}
-				getInitialEventsExpression={k8sClusterInitialEventsExpression}
+				getInitialLogTracesFilters={k8sClusterInitialLogTracesFilter}
+				getInitialEventsFilters={k8sClusterInitialEventsFilter}
 				metadataConfig={k8sClusterDetailsMetadataConfig}
-				countsConfig={k8sClusterDetailsCountsConfig}
-				getCountsFilterExpression={k8sClusterGetCountsFilterExpression}
 				entityWidgetInfo={clusterWidgetInfo}
 				getEntityQueryPayload={getClusterMetricsQueryPayload}
 				queryKeyPrefix="cluster"
--- a/frontend/src/container/InfraMonitoringK8sV2/Clusters/api.ts
+++ b/frontend/src/container/InfraMonitoringK8sV2/Clusters/api.ts
@@ -0,0 +1,125 @@
+import axios from 'api';
+import { ErrorResponseHandler } from 'api/ErrorResponseHandler';
+import { UnderscoreToDotMap } from 'api/utils';
+import { AxiosError } from 'axios';
+import { ErrorResponse, SuccessResponse } from 'types/api';
+import { BaseAutocompleteData } from 'types/api/queryBuilder/queryAutocompleteResponse';
+import { TagFilter } from 'types/api/queryBuilder/queryBuilderData';
+
+import { K8sBaseFilters } from '../Base/types';
+
+export interface K8sClustersListPayload {
+	filters: TagFilter;
+	groupBy?: BaseAutocompleteData[];
+	offset?: number;
+	limit?: number;
+	orderBy?: {
+		columnName: string;
+		order: 'asc' | 'desc';
+	};
+}
+
+export interface K8sClusterData {
+	clusterUID: string;
+	cpuUsage: number;
+	cpuAllocatable: number;
+	memoryUsage: number;
+	memoryAllocatable: number;
+	meta: {
+		k8s_cluster_name: string;
+		k8s_cluster_uid: string;
+	};
+}
+
+export interface K8sClustersListResponse {
+	status: string;
+	data: {
+		type: string;
+		records: K8sClusterData[];
+		groups: null;
+		total: number;
+		sentAnyHostMetricsData: boolean;
+		isSendingK8SAgentMetrics: boolean;
+	};
+}
+
+// TODO(H4ad): Erase this whole file when migrating to openapi
+export const clustersMetaMap = [
+	{ dot: 'k8s.cluster.name', under: 'k8s_cluster_name' },
+	{ dot: 'k8s.cluster.uid', under: 'k8s_cluster_uid' },
+] as const;
+
+export function mapClustersMeta(
+	raw: Record<string, unknown>,
+): K8sClusterData['meta'] {
+	const out: Record<string, unknown> = { ...raw };
+	clustersMetaMap.forEach(({ dot, under }) => {
+		if (dot in raw) {
+			const v = raw[dot];
+			out[under] = typeof v === 'string' ? v : raw[under];
+		}
+	});
+	return out as K8sClusterData['meta'];
+}
+
+export const getK8sClustersList = async (
+	props: K8sBaseFilters,
+	signal?: AbortSignal,
+	headers?: Record<string, string>,
+	dotMetricsEnabled = false,
+): Promise<SuccessResponse<K8sClustersListResponse> | ErrorResponse> => {
+	try {
+		const requestProps = dotMetricsEnabled
+			? {
+					...props,
+					filters: {
+						...props.filters,
+						items: props.filters.items.reduce<typeof props.filters.items>(
+							(acc, item) => {
+								if (item.value === undefined) {
+									return acc;
+								}
+								if (
+									item.key &&
+									typeof item.key === 'object' &&
+									'key' in item.key &&
+									typeof item.key.key === 'string'
+								) {
+									const mappedKey = UnderscoreToDotMap[item.key.key] ?? item.key.key;
+									acc.push({
+										...item,
+										key: { ...item.key, key: mappedKey },
+									});
+								} else {
+									acc.push(item);
+								}
+								return acc;
+							},
+							[] as typeof props.filters.items,
+						),
+					},
+				}
+			: props;
+
+		const response = await axios.post('/clusters/list', requestProps, {
+			signal,
+			headers,
+		});
+		const payload: K8sClustersListResponse = response.data;
+
+		payload.data.records = payload.data.records.map((record) => ({
+			...record,
+			meta: mapClustersMeta(record.meta as Record<string, unknown>),
+		}));
+
+		return {
+			statusCode: 200,
+			error: null,
+			message: 'Success',
+			payload,
+			params: requestProps,
+		};
+	} catch (error) {
+		return ErrorResponseHandler(error as AxiosError);
+	}
+};
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
nityanandagohain	d250f190a7	Squashed commit of the following: commit 6d0b607f41b80583b2f4dc015c728d57fd0a3f6a Author: nityanandagohain <nityanandagohain@gmail.com> Date: Wed Jul 15 10:30:43 2026 +0530 fix: update tests commit 20f42474b0901e49cc745155a2c70bb829988a94 Merge: 36dca5dab0 `31efe177a4` Author: nityanandagohain <nityanandagohain@gmail.com> Date: Tue Jul 14 23:09:00 2026 +0530 Merge branch 'issue_5601': scoped-trace builder package + port aggregations Merges the telemetryscopedtraces refactor (generic scoped-trace topology moved out of telemetryai, feature-flagged gen_ai key enrichment, tracefield. context classification) and ports the scalar/time-series work onto it: - trace_aggregation.go / trace_having.go now live in telemetryscopedtraces - trace-level HAVING resolution composes the canonical pkg/variables replacement (dynamic __all__ drops a condition for any operator) with the standard filter pipeline, so values still bind as args - buildPerTraceScan adopts the merged embedExpr placeholder/arg checking - ColumnProvider gains ActivityGateAlias; gen_ai provider gates trace-level aggregations on llm_call_count commit 36dca5dab0c0abb08aeb2645fee07f28cc764eb8 Author: nityanandagohain <nityanandagohain@gmail.com> Date: Tue Jul 14 23:09:00 2026 +0530 feat: trace-level aggregations for scalar/time-series and trace-scoped span list - trace.-prefixed aggregations (avg(trace.output_tokens), count(trace.trace_id), arithmetic) run over window-clipped per-trace values via a native CTE pipeline - a trace-level filter condition qualifies traces in scalar/time-series/raw via __qualified / __trace_scope, resource-fingerprint pruned like the trace list - trace-level filter conditions resolve through the standard filter pipeline (bound args, operators, query variables) against the per-trace column aliases - per-trace rows with no LLM span in the window are dropped from trace-level aggregations (LLM-activity gate) - targeted rejections for group-by/order-by on trace-level columns	2026-07-15 12:38:57 +05:30
nityanandagohain	97c49c870b	feat: support ai trace aggregate filtering in ai span list	2026-07-15 12:27:55 +05:30
nityanandagohain	31efe177a4	fix: address comments	2026-07-14 18:53:30 +05:30
nityanandagohain	d502d12ac3	fix: update openapi	2026-07-10 14:27:07 +05:30
nityanandagohain	bd9f15a716	fix: update integration test	2026-07-10 14:21:16 +05:30
nityanandagohain	813ef988c9	fix: edge cases and correct cost key	2026-07-10 12:06:34 +05:30
nityanandagohain	40e6799285	fix: add resource fingerprint cte	2026-07-10 00:36:25 +05:30
nityanandagohain	1caa60a3cd	fix: cleanup and more tests	2026-07-09 23:54:05 +05:30
nityanandagohain	3f781f0083	fix: more cleanup	2026-07-09 12:39:01 +05:30
nityanandagohain	6aec05cf7a	fix: more tests	2026-07-09 08:45:22 +05:30
nityanandagohain	683a52f35a	fix: take perf into consideration	2026-07-09 08:45:22 +05:30
nityanandagohain	e924fa1e62	feat: support llm trace list and span list	2026-07-09 08:45:20 +05:30