refactor: extending width of uptime gauge panel

docs/api/openapi.yml

@@ -1495,6 +1495,7 @@ components:
       - cassandradb
       - redis
       - cloudsql_postgres
+      - memorystore_redis
       type: string
     CloudintegrationtypesServiceMetadata:
       properties:
@@ -4259,34 +4260,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 +4280,6 @@ components:
       - nodeCountsByReadiness
       - podCountsByPhase
       - podCountsByStatus
-      - counts
       - meta
       type: object
     InframonitoringtypesClusters:
@@ -4829,26 +4801,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 +4824,6 @@ components:
       - namespaceMemory
       - podCountsByPhase
       - podCountsByStatus
-      - counts
       - meta
       type: object
     InframonitoringtypesNamespaces:
@@ -8048,15 +7999,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 +8151,7 @@ components:
           type: boolean
         fieldContext:
           $ref: '#/components/schemas/SpantypesFieldContext'
-        groupId:
+        group_id:
           type: string
         id:
           type: string
@@ -8222,7 +8164,7 @@ components:
           type: string
       required:
       - id
-      - groupId
+      - group_id
       - name
       - fieldContext
       - config
@@ -13801,7 +13743,7 @@ paths:
               schema:
                 properties:
                   data:
-                    $ref: '#/components/schemas/SpantypesGettableSpanMappers'
+                    $ref: '#/components/schemas/SpantypesGettableSpanMapperGroups'
                   status:
                     type: string
                 required:

frontend/src/api/generated/services/sigNoz.schemas.ts

@@ -2814,6 +2814,7 @@ export enum CloudintegrationtypesServiceIDDTO {
 	cassandradb = 'cassandradb',
 	redis = 'redis',
 	cloudsql_postgres = 'cloudsql_postgres',
+	memorystore_redis = 'memorystore_redis',
 }
 export type CloudintegrationtypesCloudIntegrationServiceDTOAnyOf = {
 	/**
@@ -5669,39 +5670,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 +5814,6 @@ export interface InframonitoringtypesClusterRecordDTO {
 	 * @type string
 	 */
 	clusterName: string;
-	/**
-	 * @type object
-	 */
-	counts: InframonitoringtypesClusterRecordDTOCounts;
 	/**
 	 * @type object,null
 	 */
@@ -6405,29 +6369,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 +6380,6 @@ export type InframonitoringtypesNamespaceRecordDTOMeta =
 	InframonitoringtypesNamespaceRecordDTOMetaAnyOf | null;
 
 export interface InframonitoringtypesNamespaceRecordDTO {
-	/**
-	 * @type object
-	 */
-	counts: InframonitoringtypesNamespaceRecordDTOCounts;
 	/**
 	 * @type object,null
 	 */
@@ -9258,76 +9195,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 +9441,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 +9513,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;
 	/**
@@ -10923,7 +10853,7 @@ export type ListSpanMappersPathParameters = {
 	groupId: string;
 };
 export type ListSpanMappers200 = {
-	data: SpantypesGettableSpanMappersDTO;
+	data: SpantypesGettableSpanMapperGroupsDTO;
 	/**
 	 * @type string
 	 */

frontend/src/components/DownloadOptionsMenu/DownloadOptionsMenu.tsx

@@ -3,7 +3,6 @@ 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 { 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> => {

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;

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;

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;

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: '',

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: {

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>,

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

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?: (

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

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,
 			});
 		},

frontend/src/container/InfraMonitoringHostsV2/Hosts.tsx

@@ -1,17 +1,13 @@
 import { useCallback, useEffect, useRef, useState } from 'react';
 import { Button, Tooltip } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
-import { convertToApiError } from 'api/ErrorResponseHandlerForGeneratedAPIs';
 import { listHosts } from 'api/generated/services/inframonitoring';
 import {
 	InframonitoringtypesHostRecordDTO,
 	InframonitoringtypesHostStatusDTO,
 	InframonitoringtypesResponseTypeDTO,
 	Querybuildertypesv5OrderDirectionDTO,
-	RenderErrorResponseDTO,
 } from 'api/generated/services/sigNoz.schemas';
-import { AxiosError } from 'axios';
-import APIError from 'types/api/error';
 import QuickFilters from 'components/QuickFilters/QuickFilters';
 import { QuickFiltersSource } from 'components/QuickFilters/types';
 import { InfraMonitoringEvents } from 'constants/events';
@@ -126,12 +122,13 @@ function Hosts(): JSX.Element {
 					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:
-						convertToApiError(error as AxiosError<RenderErrorResponseDTO>) ?? null,
+					error: errMsg,
 				};
 			}
 		},
@@ -144,7 +141,7 @@ function Hosts(): JSX.Element {
 			signal?: AbortSignal,
 		): Promise<{
 			data: InframonitoringtypesHostRecordDTO | null;
-			error?: APIError | null;
+			error?: string | null;
 		}> => {
 			try {
 				const response = await listHosts(
@@ -162,10 +159,11 @@ function Hosts(): JSX.Element {
 					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:
-						convertToApiError(error as AxiosError<RenderErrorResponseDTO>) ?? null,
+					error: errMsg,
 				};
 			}
 		},

frontend/src/container/InfraMonitoringHostsV2/constants.tsx

@@ -10,7 +10,6 @@ import {
 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';
 import {
 	getHostQueryPayload,
 	hostWidgetInfo,
@@ -108,10 +107,8 @@ export function getHostMetricsQueryPayload(
 
 export { hostWidgetInfo };
 
-export const hostGetSelectedItemExpression = (
-	params: SelectedItemParams,
-): string =>
-	`host.name = ${formatValueForExpression(params.selectedItem ?? '')}`;
+export const hostGetSelectedItemExpression = (hostName: string): string =>
+	`host.name = ${formatValueForExpression(hostName)}`;
 
 export function hostInitialLogTracesExpression(
 	host: InframonitoringtypesHostRecordDTO,

frontend/src/container/InfraMonitoringK8sV2/Base/ColumnHeader.tsx

@@ -51,7 +51,7 @@ function ColumnHeader({
 							<a
 								href={`${DOCS_BASE_URL}${docPath}`}
 								target="_blank"
-								rel="noopener"
+								rel="noopener noreferrer"
 								onClick={(e): void => e.stopPropagation()}
 							>
 								Learn more.

frontend/src/container/InfraMonitoringK8sV2/Base/EntityGroupHeader.tsx

@@ -30,7 +30,7 @@ function EntityGroupHeader({
 							<a
 								href={`${DOCS_BASE_URL}${docPath}`}
 								target="_blank"
-								rel="noopener"
+								rel="noopener noreferrer"
 								onClick={(e): void => e.stopPropagation()}
 							>
 								Learn more.

frontend/src/container/InfraMonitoringK8sV2/Base/K8sBaseDetails.tsx

@@ -12,8 +12,6 @@ import { ToggleGroupSimple } from '@signozhq/ui/toggle-group';
 import { Divider } from '@signozhq/ui/divider';
 import { Typography } from '@signozhq/ui/typography';
 import logEvent from 'api/common/logEvent';
-import ErrorContent from 'components/ErrorModal/components/ErrorContent';
-import APIError from 'types/api/error';
 import { combineInitialAndUserExpression } from 'components/QueryBuilderV2/QueryV2/QuerySearch/utils';
 import { InfraMonitoringEvents } from 'constants/events';
 import { QueryParams } from 'constants/query';
@@ -54,10 +52,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';
@@ -65,10 +62,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;
 
@@ -78,8 +71,6 @@ export interface K8sDetailsMetadataConfig<T> {
 	render?: (value: string | number, entity: T) => React.ReactNode;
 }
 
-export type K8sDetailsCountConfig<T> = EntityCountConfig<T>;
-
 export interface K8sDetailsFilters {
 	filter: { expression: string };
 	start: number;
@@ -90,22 +81,19 @@ export interface K8sBaseDetailsProps<T> {
 	category: InfraMonitoringEntity;
 	eventCategory: string;
 	// Data fetching configuration
-	getSelectedItemExpression: (params: SelectedItemParams) => string;
+	getSelectedItemExpression: (selectedItem: string) => string;
 	fetchEntityData: (
 		filters: K8sDetailsFilters,
 		signal?: AbortSignal,
-	) => Promise<{ data: T | null; error?: APIError | null }>;
+	) => Promise<{ data: T | null; error?: string | null }>;
 	// Entity configuration
 	getEntityName: (entity: T) => string;
 	getInitialLogTracesExpression: (entity: T) => string;
 	getInitialEventsExpression: (entity: T) => string;
 	metadataConfig: K8sDetailsMetadataConfig<T>[];
-	countsConfig?: K8sDetailsCountConfig<T>[];
-	getCountsFilterExpression?: (entity: T) => string;
 	entityWidgetInfo: {
 		title: string;
 		yAxisUnit: string;
-		docPath?: string;
 	}[];
 	getEntityQueryPayload: (
 		entity: T,
@@ -148,8 +136,6 @@ export default function K8sBaseDetails<T>({
 	getInitialLogTracesExpression,
 	getInitialEventsExpression,
 	metadataConfig,
-	countsConfig,
-	getCountsFilterExpression,
 	entityWidgetInfo,
 	getEntityQueryPayload,
 	queryKeyPrefix,
@@ -166,9 +152,7 @@ export default function K8sBaseDetails<T>({
 
 	const isDarkMode = useIsDarkMode();
 
-	const [selectedItemParams, setSelectedItemParams] =
-		useInfraMonitoringSelectedItemParams();
-	const selectedItem = selectedItemParams.selectedItem;
+	const [selectedItem, setSelectedItem] = useInfraMonitoringSelectedItem();
 
 	const entityQueryKey = useMemo(
 		() =>
@@ -176,17 +160,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 {
@@ -203,7 +178,7 @@ export default function K8sBaseDetails<T>({
 			const { minTime, maxTime } = getMinMaxTime();
 			const start = Math.floor(minTime / NANO_SECOND_MULTIPLIER);
 			const end = Math.floor(maxTime / NANO_SECOND_MULTIPLIER);
-			const expression = getSelectedItemExpression(selectedItemParams);
+			const expression = getSelectedItemExpression(selectedItem);
 
 			return fetchEntityData({ filter: { expression }, start, end }, signal);
 		},
@@ -228,8 +203,8 @@ export default function K8sBaseDetails<T>({
 	}, [entity, getInitialEventsExpression]);
 
 	const handleClose = useCallback((): void => {
-		setSelectedItemParams(null);
-	}, [setSelectedItemParams]);
+		setSelectedItem(null);
+	}, [setSelectedItem]);
 
 	const entityName = entity ? getEntityName(entity) : '';
 
@@ -449,18 +424,12 @@ export default function K8sBaseDetails<T>({
 			{isEntityLoading && <LoadingContainer />}
 			{(isEntityError || hasResponseError) && (
 				<div className="entity-error-container">
-					<ErrorContent
-						error={
-							entityResponse?.error ??
-							(entityError instanceof APIError ? entityError : null) ?? {
-								code: 500,
-								message:
-									entityError instanceof Error
-										? entityError.message
-										: 'Failed to load entity details',
-							}
-						}
-					/>
+					<Typography.Text color="danger">
+						{entityResponse?.error ||
+							(entityError instanceof Error
+								? entityError.message
+								: 'Failed to load entity details')}
+					</Typography.Text>
 				</div>
 			)}
 			{entity && !isEntityLoading && !hasResponseError && (
@@ -498,19 +467,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 && (

frontend/src/container/InfraMonitoringK8sV2/Base/K8sBaseList.tsx

@@ -10,21 +10,19 @@ import TanStackTable, {
 } 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 APIError from 'types/api/error';
 
 import {
 	INFRA_MONITORING_K8S_PARAMS_KEYS,
 	InfraMonitoringEntity,
 } from '../constants';
 import {
-	SelectedItemParams,
 	useInfraMonitoringGroupBy,
 	useInfraMonitoringOrderBy,
-	useInfraMonitoringSelectedItemParams,
 	useInfraMonitoringStatusFilter,
 } from '../hooks';
 import { useInfraMonitoringLineClamp } from '../components';
@@ -34,14 +32,13 @@ import K8sHeader from './K8sHeader';
 import { K8sPaginationWarning } from './K8sPaginationWarning';
 import { K8sBaseFilters } from './types';
 import { getGroupedByMeta } from './utils';
-import { K8sInstrumentationChecksCallout } from './components/K8sInstrumentationChecksCallout/K8sInstrumentationChecksCallout';
 
 import styles from './K8sBaseList.module.scss';
 import cx from 'classnames';
 
 export type K8sBaseListEmptyStateContext = {
 	isError: boolean;
-	error?: APIError | null;
+	error?: string | null;
 	totalCount: number;
 	hasFilters: boolean;
 	isLoading: boolean;
@@ -52,10 +49,7 @@ export type K8sBaseListEmptyStateContext = {
 /** Base type constraint for K8s entity data */
 export type K8sEntityData = { meta?: Record<string, string> | null };
 
-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;
@@ -68,15 +62,15 @@ export type K8sBaseListProps<
 		records?: T[];
 		data?: T[];
 		total: number;
-		error?: APIError | null;
+		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,
@@ -84,10 +78,7 @@ export type K8sBaseListProps<
 	extraQueryKeyParts?: string[];
 };
 
-export function K8sBaseList<
-	T extends K8sEntityData,
-	TItemKey extends string | SelectedItemParams = string,
->({
+export function K8sBaseList<T extends K8sEntityData>({
 	controlListPrefix,
 	leftFilters,
 	entity,
@@ -98,16 +89,17 @@ export function K8sBaseList<
 	eventCategory,
 	renderEmptyState,
 	extraQueryKeyParts = [],
-}: K8sBaseListProps<T, TItemKey>): JSX.Element {
+}: K8sBaseListProps<T>): JSX.Element {
 	const { currentQuery } = useQueryBuilder();
 	const expression = currentQuery.builder.queryData[0]?.filter?.expression || '';
 	const lineClamp = useInfraMonitoringLineClamp();
 	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);
@@ -234,17 +226,9 @@ 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,
-					});
-				}
+				void setSelectedItem(itemKey);
 			}
 
 			void logEvent(InfraMonitoringEvents.ItemClicked, {
@@ -253,43 +237,18 @@ export function K8sBaseList<
 				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, {
@@ -315,7 +274,7 @@ export function K8sBaseList<
 			rowKey: string,
 			groupMeta?: Record<string, string>,
 		): JSX.Element => (
-			<K8sExpandedRow<T, TItemKey>
+			<K8sExpandedRow<T>
 				rowKey={rowKey}
 				groupMeta={groupMeta}
 				entity={entity}
@@ -379,8 +338,6 @@ export function K8sBaseList<
 				cancelQuery={cancelQuery}
 			/>
 			<div ref={containerRef} className={styles.tableContainer}>
-				<K8sInstrumentationChecksCallout entity={entity} />
-
 				{isError && (
 					<Typography>
 						{data?.error?.toString() || 'Something went wrong'}
@@ -390,7 +347,7 @@ export function K8sBaseList<
 				{showEmptyState ? (
 					<div className={styles.emptyStateContainer}>{emptyTableMessage}</div>
 				) : (
-					<TanStackTable<T, TItemKey>
+					<TanStackTable<T>
 						data={pageData}
 						columns={tableColumns}
 						columnStorageKey={columnStorageKey}

frontend/src/container/InfraMonitoringK8sV2/Base/K8sEmptyState.module.scss

@@ -44,11 +44,13 @@
 	width: 32px;
 }
 
-.errorContent {
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	gap: var(--spacing-3);
-	max-width: 500px;
-	padding: 24px;
+.errorIcon {
+	color: var(--danger-background);
+}
+
+.actions {
+	display: flex;
+	align-items: center;
+	gap: 8px;
+	margin-top: 16px;
 }

frontend/src/container/InfraMonitoringK8sV2/Base/K8sEmptyState.tsx

@@ -1,4 +1,8 @@
-import ErrorContent from 'components/ErrorModal/components/ErrorContent';
+import { useCallback } from 'react';
+import { Button } from '@signozhq/ui/button';
+import { useGetTenantLicense } from 'hooks/useGetTenantLicense';
+import history from 'lib/history';
+import { LifeBuoy, TriangleAlert } from '@signozhq/icons';
 
 import emptyStateUrl from '@/assets/Icons/emptyState.svg';
 import eyesEmojiUrl from '@/assets/Images/eyesEmoji.svg';
@@ -9,12 +13,26 @@ import styles from './K8sEmptyState.module.scss';
 
 type K8sEmptyStateProps = Partial<K8sBaseListEmptyStateContext>;
 
+const handleContactSupport = (isCloudUser: boolean): void => {
+	if (isCloudUser) {
+		history.push('/support');
+	} else {
+		window.open('https://signoz.io/slack', '_blank');
+	}
+};
+
 export function K8sEmptyState({
 	isError,
 	error,
 	isLoading,
 	endTimeBeforeRetention,
 }: K8sEmptyStateProps): JSX.Element | null {
+	const { isCloudUser } = useGetTenantLicense();
+
+	const handleSupport = useCallback(() => {
+		handleContactSupport(isCloudUser);
+	}, [isCloudUser]);
+
 	if (isLoading) {
 		return null;
 	}
@@ -22,15 +40,25 @@ export function K8sEmptyState({
 	if (isError || error) {
 		return (
 			<div className={styles.container}>
-				<div className={styles.errorContent}>
-					<ErrorContent
-						error={
-							error ?? {
-								code: 500,
-								message: 'An error occurred while fetching data.',
-							}
-						}
-					/>
+				<div className={styles.content}>
+					<TriangleAlert size={32} className={styles.errorIcon} />
+					<span className={styles.message}>
+						{error || 'An error occurred while fetching data.'}
+					</span>
+					<p>
+						Our team is getting on top to resolve this. Please reach out to support if
+						the issue persists.
+					</p>
+					<div className={styles.actions}>
+						<Button
+							onClick={handleSupport}
+							variant="solid"
+							color="secondary"
+							prefix={<LifeBuoy size={14} />}
+						>
+							Contact Support
+						</Button>
+					</div>
 				</div>
 			</div>
 		);

frontend/src/container/InfraMonitoringK8sV2/Base/K8sExpandedRow.tsx

@@ -4,7 +4,6 @@ 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 APIError from 'types/api/error';
 import TanStackTable, {
 	SortState,
 	TableColumnDef,
@@ -23,11 +22,10 @@ import { parseAsJsonNoValidate } from 'utils/nuqsParsers';
 
 import { InfraMonitoringEntity } from '../constants';
 import {
-	SelectedItemParams,
 	useInfraMonitoringGroupBy,
 	useInfraMonitoringOrderBy,
 	useInfraMonitoringPageListing,
-	useInfraMonitoringSelectedItemParams,
+	useInfraMonitoringSelectedItem,
 } from '../hooks';
 import { K8sBaseFilters } from './types';
 
@@ -36,7 +34,7 @@ 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 */
@@ -52,7 +50,7 @@ export type K8sExpandedRowProps<T, TItemKey = string> = {
 		records?: T[];
 		data?: T[];
 		total: number;
-		error?: APIError | null;
+		error?: string | null;
 		rawData?: unknown;
 		warning?: Querybuildertypesv5QueryWarnDataDTO | null;
 	}>;
@@ -61,10 +59,10 @@ export type K8sExpandedRowProps<T, TItemKey = 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,
@@ -73,13 +71,13 @@ export function K8sExpandedRow<T, TItemKey = string>({
 	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 [, setSelectedItem] = useInfraMonitoringSelectedItem();
 	const [, setMainOrderBy] = useInfraMonitoringOrderBy();
 	const { safeNavigate } = useSafeNavigate();
 	const urlQuery = useUrlQuery();
@@ -177,18 +175,10 @@ export function K8sExpandedRow<T, TItemKey = string>({
 	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 => {
+			void setSelectedItem(itemKey);
 		},
-		[setSelectedItemParams],
+		[setSelectedItem],
 	);
 
 	const handleViewAllClick = (): void => {
@@ -249,7 +239,7 @@ export function K8sExpandedRow<T, TItemKey = string>({
 
 			<div data-testid="expanded-table">
 				<TanStackTableStateProvider>
-					<TanStackTable<T, TItemKey>
+					<TanStackTable<T>
 						data={expandedData}
 						columns={tableColumns}
 						columnStorageKey={storageKey}

frontend/src/container/InfraMonitoringK8sV2/Base/__tests__/K8sBaseList.test.tsx

@@ -9,8 +9,6 @@ import { TooltipProvider } from '@signozhq/ui/tooltip';
 import { fireEvent, render, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { InfraMonitoringEvents } from 'constants/events';
-import { server } from 'mocks-server/server';
-import { rest } from 'msw';
 import {
 	NuqsTestingAdapter,
 	OnUrlUpdateFunction,
@@ -19,13 +17,11 @@ import {
 import { AppProvider } from 'providers/App/App';
 import TimezoneProvider from 'providers/Timezone';
 import store from 'store';
-import APIError from 'types/api/error';
 import { openInNewTab } from 'utils/navigation';
 
 import { TableColumnDef } from 'components/TanStackTableView';
 
 import { InfraMonitoringEntity } from '../../constants';
-import { SelectedItemParams } from '../../hooks';
 
 window.ResizeObserver =
 	window.ResizeObserver ||
@@ -169,14 +165,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;
 }) {
@@ -203,7 +196,7 @@ function renderComponent<
 										value={{ viewportHeight: 800, itemHeight: 50 }}
 									>
 										<TooltipProvider>
-											<K8sBaseList<T, TItemKey> {...props} />
+											<K8sBaseList {...props} />
 										</TooltipProvider>
 									</VirtuosoMockContext.Provider>
 								</NuqsTestingAdapter>
@@ -633,15 +626,7 @@ describe('K8sBaseList', () => {
 			fetchListDataMock.mockResolvedValue({
 				data: [],
 				total: 0,
-				error: new APIError({
-					httpStatusCode: 500,
-					error: {
-						code: '500',
-						message: 'Failed to fetch pods',
-						url: '',
-						errors: [],
-					},
-				}),
+				error: 'Failed to fetch pods',
 			});
 
 			renderComponent<TestItem>({
@@ -956,413 +941,4 @@ describe('K8sBaseList', () => {
 			});
 		});
 	});
-
-	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');
-		});
-	});
-
-	describe('instrumentation checks callout', () => {
-		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,
-			});
-		});
-
-		it('should not render callout when ready is true', async () => {
-			server.use(
-				rest.get('http://localhost/api/v2/infra_monitoring/checks', (_, res, ctx) =>
-					res(
-						ctx.json({
-							status: 'success',
-							data: {
-								ready: true,
-								type: 'pods',
-								presentDefaultEnabledMetrics: [
-									{
-										associatedComponent: { name: 'otel-collector' },
-										metrics: ['k8s.pod.cpu.usage'],
-									},
-								],
-							},
-						}),
-					),
-				),
-			);
-
-			renderComponent<TestItem>({
-				entity: InfraMonitoringEntity.PODS,
-				eventCategory: InfraMonitoringEvents.Pod,
-				fetchListData: fetchListDataMock,
-				tableColumns: createTestColumns(),
-				getRowKey: (row): string => row.id,
-				getItemKey: (row): string => row.id,
-			});
-
-			await screen.findByText('item-1');
-
-			expect(screen.queryByText('Instrumentation checks')).not.toBeInTheDocument();
-		});
-
-		it('should not render callout when no entries exist', async () => {
-			server.use(
-				rest.get('http://localhost/api/v2/infra_monitoring/checks', (_, res, ctx) =>
-					res(
-						ctx.json({
-							status: 'success',
-							data: {
-								ready: false,
-								type: 'pods',
-								presentDefaultEnabledMetrics: null,
-								presentOptionalMetrics: null,
-								presentRequiredAttributes: null,
-								missingDefaultEnabledMetrics: null,
-								missingOptionalMetrics: null,
-								missingRequiredAttributes: null,
-							},
-						}),
-					),
-				),
-			);
-
-			renderComponent<TestItem>({
-				entity: InfraMonitoringEntity.PODS,
-				eventCategory: InfraMonitoringEvents.Pod,
-				fetchListData: fetchListDataMock,
-				tableColumns: createTestColumns(),
-				getRowKey: (row): string => row.id,
-				getItemKey: (row): string => row.id,
-			});
-
-			await screen.findByText('item-1');
-
-			expect(screen.queryByText('Instrumentation checks')).not.toBeInTheDocument();
-		});
-
-		it('should render callout with present entries', async () => {
-			server.use(
-				rest.get('http://localhost/api/v2/infra_monitoring/checks', (_, res, ctx) =>
-					res(
-						ctx.json({
-							status: 'success',
-							data: {
-								ready: false,
-								type: 'pods',
-								presentDefaultEnabledMetrics: [
-									{
-										associatedComponent: { name: 'otel-collector' },
-										metrics: ['k8s.pod.cpu.usage', 'k8s.pod.memory.usage'],
-									},
-								],
-								presentOptionalMetrics: null,
-								presentRequiredAttributes: null,
-								missingDefaultEnabledMetrics: null,
-								missingOptionalMetrics: null,
-								missingRequiredAttributes: null,
-							},
-						}),
-					),
-				),
-			);
-
-			renderComponent<TestItem>({
-				entity: InfraMonitoringEntity.PODS,
-				eventCategory: InfraMonitoringEvents.Pod,
-				fetchListData: fetchListDataMock,
-				tableColumns: createTestColumns(),
-				getRowKey: (row): string => row.id,
-				getItemKey: (row): string => row.id,
-			});
-
-			await screen.findByText('Instrumentation checks');
-
-			await expect(
-				screen.findByText('Default enabled metrics'),
-			).resolves.toBeInTheDocument();
-			await expect(
-				screen.findByText('k8s.pod.cpu.usage, k8s.pod.memory.usage'),
-			).resolves.toBeInTheDocument();
-			await expect(
-				screen.findByText('otel-collector'),
-			).resolves.toBeInTheDocument();
-		});
-
-		it('should render callout with missing entries', async () => {
-			server.use(
-				rest.get('http://localhost/api/v2/infra_monitoring/checks', (_, res, ctx) =>
-					res(
-						ctx.json({
-							status: 'success',
-							data: {
-								ready: false,
-								type: 'pods',
-								presentDefaultEnabledMetrics: null,
-								presentOptionalMetrics: null,
-								presentRequiredAttributes: null,
-								missingDefaultEnabledMetrics: [
-									{
-										associatedComponent: { name: 'otel-collector' },
-										metrics: ['k8s.pod.cpu.limit'],
-										documentationLink: 'https://example.com/docs',
-									},
-								],
-								missingOptionalMetrics: null,
-								missingRequiredAttributes: null,
-							},
-						}),
-					),
-				),
-			);
-
-			renderComponent<TestItem>({
-				entity: InfraMonitoringEntity.PODS,
-				eventCategory: InfraMonitoringEvents.Pod,
-				fetchListData: fetchListDataMock,
-				tableColumns: createTestColumns(),
-				getRowKey: (row): string => row.id,
-				getItemKey: (row): string => row.id,
-			});
-
-			await screen.findByText('Instrumentation checks');
-
-			await expect(
-				screen.findByText('Missing default metrics'),
-			).resolves.toBeInTheDocument();
-			await expect(
-				screen.findByText('k8s.pod.cpu.limit'),
-			).resolves.toBeInTheDocument();
-			await expect(screen.findByText('Learn here')).resolves.toBeInTheDocument();
-		});
-
-		it('should trigger recheck on button click', async () => {
-			let recheckCallCount = 0;
-			server.use(
-				rest.get(
-					'http://localhost/api/v2/infra_monitoring/checks',
-					(_, res, ctx) => {
-						recheckCallCount++;
-						return res(
-							ctx.json({
-								status: 'success',
-								data: {
-									ready: false,
-									type: 'pods',
-									presentDefaultEnabledMetrics: [
-										{
-											associatedComponent: { name: 'otel-collector' },
-											metrics: ['k8s.pod.cpu.usage'],
-										},
-									],
-								},
-							}),
-						);
-					},
-				),
-			);
-
-			const user = userEvent.setup();
-
-			renderComponent<TestItem>({
-				entity: InfraMonitoringEntity.PODS,
-				eventCategory: InfraMonitoringEvents.Pod,
-				fetchListData: fetchListDataMock,
-				tableColumns: createTestColumns(),
-				getRowKey: (row): string => row.id,
-				getItemKey: (row): string => row.id,
-			});
-
-			await screen.findByText('Instrumentation checks');
-
-			const initialCallCount = recheckCallCount;
-
-			const recheckBtn = screen.getByTestId('instrumentation-checks-recheck-btn');
-			await user.click(recheckBtn);
-
-			await waitFor(() => {
-				expect(recheckCallCount).toBeGreaterThan(initialCallCount);
-			});
-		});
-
-		it('should render both present and missing entries', async () => {
-			server.use(
-				rest.get('http://localhost/api/v2/infra_monitoring/checks', (_, res, ctx) =>
-					res(
-						ctx.json({
-							status: 'success',
-							data: {
-								ready: false,
-								type: 'pods',
-								presentDefaultEnabledMetrics: [
-									{
-										associatedComponent: { name: 'otel-collector' },
-										metrics: ['k8s.pod.cpu.usage'],
-									},
-								],
-								presentOptionalMetrics: null,
-								presentRequiredAttributes: [
-									{
-										associatedComponent: { name: 'otel-collector' },
-										attributes: ['k8s.namespace.name'],
-									},
-								],
-								missingDefaultEnabledMetrics: [
-									{
-										associatedComponent: { name: 'otel-collector' },
-										metrics: ['k8s.pod.memory.limit'],
-									},
-								],
-								missingOptionalMetrics: null,
-								missingRequiredAttributes: null,
-							},
-						}),
-					),
-				),
-			);
-
-			renderComponent<TestItem>({
-				entity: InfraMonitoringEntity.PODS,
-				eventCategory: InfraMonitoringEvents.Pod,
-				fetchListData: fetchListDataMock,
-				tableColumns: createTestColumns(),
-				getRowKey: (row): string => row.id,
-				getItemKey: (row): string => row.id,
-			});
-
-			await screen.findByText('Instrumentation checks');
-
-			// Present entries
-			await expect(
-				screen.findByText('Default enabled metrics'),
-			).resolves.toBeInTheDocument();
-			await expect(
-				screen.findByText('k8s.pod.cpu.usage'),
-			).resolves.toBeInTheDocument();
-			await expect(
-				screen.findByText('Required attributes'),
-			).resolves.toBeInTheDocument();
-			await expect(
-				screen.findByText('k8s.namespace.name'),
-			).resolves.toBeInTheDocument();
-
-			// Missing entries
-			await expect(
-				screen.findByText('Missing default metrics'),
-			).resolves.toBeInTheDocument();
-			await expect(
-				screen.findByText('k8s.pod.memory.limit'),
-			).resolves.toBeInTheDocument();
-		});
-	});
 });

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('');
-	});
-});

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;
-}

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>
-	);
-}

frontend/src/container/InfraMonitoringK8sV2/Base/components/K8sInstrumentationChecksCallout/K8sInstrumentationChecksCallout.module.scss

@@ -1,24 +0,0 @@
-.checkContainer {
-	padding: 0px var(--spacing-4) var(--spacing-4) var(--spacing-4);
-
-	position: relative;
-}
-
-.container {
-	display: flex;
-	flex-direction: column;
-	gap: 8px;
-	width: 100%;
-}
-
-.header {
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-}
-
-.entriesList {
-	display: flex;
-	flex-direction: column;
-	gap: 4px;
-}

frontend/src/container/InfraMonitoringK8sV2/Base/components/K8sInstrumentationChecksCallout/K8sInstrumentationChecksCallout.tsx

@@ -1,162 +0,0 @@
-import { MouseEvent, useCallback, useMemo, useState } from 'react';
-import { useQueryClient } from 'react-query';
-import { Button } from '@signozhq/ui/button';
-import { Callout } from '@signozhq/ui/callout';
-import { RefreshCw } from '@signozhq/icons';
-import setLocalStorage from 'api/browser/localstorage/set';
-import {
-	invalidateGetChecks,
-	useGetChecks,
-} from 'api/generated/services/inframonitoring';
-import { InframonitoringtypesCheckTypeDTO } from 'api/generated/services/sigNoz.schemas';
-import { InfraMonitoringEntity } from '../../../constants';
-
-import styles from './K8sInstrumentationChecksCallout.module.scss';
-import { MissingEntryRow } from './MissingEntryRow';
-import { PresentEntryRow } from './PresentEntryRow';
-import {
-	ENTITY_TO_CHECK_TYPE,
-	getStorageKey,
-	hasAnyEntries,
-	hasMissingEntries,
-	readExpandedState,
-} from './utils';
-
-export interface InstrumentationChecksCalloutProps {
-	entity: InfraMonitoringEntity;
-}
-
-export function K8sInstrumentationChecksCallout({
-	entity,
-}: InstrumentationChecksCalloutProps): JSX.Element | null {
-	const checkType = ENTITY_TO_CHECK_TYPE[entity];
-	const queryClient = useQueryClient();
-
-	const [isExpanded, setIsExpanded] = useState(() => readExpandedState(entity));
-
-	const { data, isLoading, isFetching } = useGetChecks(
-		{ type: checkType as InframonitoringtypesCheckTypeDTO },
-		{ query: { enabled: !!checkType } },
-	);
-
-	const handleRecheck = useCallback(
-		(e: MouseEvent): void => {
-			e.preventDefault();
-			e.stopPropagation();
-
-			if (checkType) {
-				void invalidateGetChecks(queryClient, { type: checkType });
-			}
-		},
-		[queryClient, checkType],
-	);
-
-	const handleExpandToggle = useCallback((): void => {
-		setIsExpanded((prev) => {
-			const next = !prev;
-			setLocalStorage(getStorageKey(entity), String(next));
-			return next;
-		});
-	}, [entity]);
-
-	const checksData = data?.data;
-
-	const hasMissingItems = useMemo(
-		() => (checksData ? hasMissingEntries(checksData) : false),
-		[checksData],
-	);
-
-	if (!checkType || isLoading) {
-		return null;
-	}
-
-	if (!checksData || checksData.ready) {
-		return null;
-	}
-
-	if (!hasAnyEntries(checksData)) {
-		return null;
-	}
-
-	return (
-		<div className={styles.checkContainer}>
-			<Callout
-				type={hasMissingItems ? 'warning' : 'info'}
-				showIcon
-				size="medium"
-				title={
-					<div className={styles.header}>
-						Instrumentation checks
-						<Button
-							variant="outlined"
-							color="warning"
-							size="sm"
-							onClick={handleRecheck}
-							loading={isFetching}
-							prefix={<RefreshCw size={12} />}
-							data-testid="instrumentation-checks-recheck-btn"
-						>
-							Recheck
-						</Button>
-					</div>
-				}
-				action="expandable"
-				defaultExpanded={isExpanded}
-				onClick={handleExpandToggle}
-			>
-				<div className={styles.container} onClick={(e) => e.stopPropagation()}>
-					<div className={styles.entriesList}>
-						{checksData.presentDefaultEnabledMetrics?.map((entry) => (
-							<PresentEntryRow
-								key={`present-default-${entry.associatedComponent.name}`}
-								entry={entry}
-								typeLabel="Default enabled metrics"
-								itemType="metrics"
-							/>
-						))}
-						{checksData.presentOptionalMetrics?.map((entry) => (
-							<PresentEntryRow
-								key={`present-optional-${entry.associatedComponent.name}`}
-								entry={entry}
-								typeLabel="Optional metrics"
-								itemType="metrics"
-							/>
-						))}
-						{checksData.presentRequiredAttributes?.map((entry) => (
-							<PresentEntryRow
-								key={`present-attrs-${entry.associatedComponent.name}`}
-								entry={entry}
-								typeLabel="Required attributes"
-								itemType="attributes"
-							/>
-						))}
-						{checksData.missingDefaultEnabledMetrics?.map((entry) => (
-							<MissingEntryRow
-								key={`missing-default-${entry.associatedComponent.name}`}
-								entry={entry}
-								typeLabel="Missing default metrics"
-								itemType="metrics"
-							/>
-						))}
-						{checksData.missingOptionalMetrics?.map((entry) => (
-							<MissingEntryRow
-								key={`missing-optional-${entry.associatedComponent.name}`}
-								entry={entry}
-								typeLabel="Missing optional metrics"
-								itemType="metrics"
-							/>
-						))}
-						{checksData.missingRequiredAttributes?.map((entry) => (
-							<MissingEntryRow
-								key={`missing-attrs-${entry.associatedComponent.name}`}
-								entry={entry}
-								typeLabel="Missing required attributes"
-								itemType="attributes"
-							/>
-						))}
-					</div>
-				</div>
-			</Callout>
-		</div>
-	);
-}

frontend/src/container/InfraMonitoringK8sV2/Base/components/K8sInstrumentationChecksCallout/MissingEntryRow.module.scss

@@ -1,27 +0,0 @@
-.entryRow {
-	display: flex;
-	align-items: center;
-	gap: 6px;
-	flex-wrap: wrap;
-	color: var(--l1-foreground);
-}
-
-.missingIcon {
-	color: var(--warning-background);
-	flex-shrink: 0;
-}
-
-.learnMoreLink {
-	display: inline-flex;
-	align-items: center;
-	gap: 4px;
-	margin-left: 4px;
-
-	svg {
-		margin-left: 4px;
-	}
-}
-
-.divider {
-	--divider-color: var(--callout-warning-border);
-}

frontend/src/container/InfraMonitoringK8sV2/Base/components/K8sInstrumentationChecksCallout/MissingEntryRow.tsx

@@ -1,66 +0,0 @@
-import styles from './MissingEntryRow.module.scss';
-import { ExternalLink, TriangleAlert } from '@signozhq/icons';
-import { Typography } from '@signozhq/ui/typography';
-import { Divider } from '@signozhq/ui/divider';
-import type {
-	InframonitoringtypesMissingAttributesComponentEntryDTO,
-	InframonitoringtypesMissingMetricsComponentEntryDTO,
-} from 'api/generated/services/sigNoz.schemas';
-
-type MissingEntryRowProps =
-	| {
-			entry: InframonitoringtypesMissingMetricsComponentEntryDTO;
-			typeLabel: string;
-			itemType: 'metrics';
-	  }
-	| {
-			entry: InframonitoringtypesMissingAttributesComponentEntryDTO;
-			typeLabel: string;
-			itemType: 'attributes';
-	  };
-
-export function MissingEntryRow({
-	entry,
-	typeLabel,
-	itemType,
-}: MissingEntryRowProps): JSX.Element {
-	const items = itemType === 'metrics' ? entry.metrics : entry.attributes;
-
-	return (
-		<div className={styles.entryRow}>
-			<TriangleAlert size={14} className={styles.missingIcon} />
-			<Typography.Text size="base" weight="medium">
-				{typeLabel}
-			</Typography.Text>
-			<Typography.Text size="base" color="muted">
-				-
-			</Typography.Text>
-			<Typography.Text
-				size="base"
-				weight="semibold"
-				className={styles.entryRowMetric}
-			>
-				{items?.join(', ')}
-			</Typography.Text>
-			<Typography.Text size="base" color="muted">
-				-
-			</Typography.Text>
-			<Typography.Text size="base" italic color="muted">
-				{entry.associatedComponent.name}
-			</Typography.Text>
-			{entry.documentationLink && (
-				<Typography.Link
-					href={entry.documentationLink}
-					target="_blank"
-					rel="noopener noreferrer"
-					size="base"
-					className={styles.learnMoreLink}
-				>
-					Learn here
-					<ExternalLink size={12} />
-				</Typography.Link>
-			)}
-			<Divider className={styles.divider} />
-		</div>
-	);
-}

frontend/src/container/InfraMonitoringK8sV2/Base/components/K8sInstrumentationChecksCallout/PresentEntryRow.module.scss

@@ -1,16 +0,0 @@
-.entryRow {
-	display: flex;
-	align-items: center;
-	gap: 6px;
-	flex-wrap: wrap;
-	color: var(--l1-foreground);
-}
-
-.presentIcon {
-	color: var(--success-background);
-	flex-shrink: 0;
-}
-
-.divider {
-	--divider-color: var(--callout-warning-border);
-}

frontend/src/container/InfraMonitoringK8sV2/Base/components/K8sInstrumentationChecksCallout/PresentEntryRow.tsx

@@ -1,54 +0,0 @@
-import styles from './PresentEntryRow.module.scss';
-import { CircleCheck } from '@signozhq/icons';
-import { Typography } from '@signozhq/ui/typography';
-import { Divider } from '@signozhq/ui/divider';
-import type {
-	InframonitoringtypesAttributesComponentEntryDTO,
-	InframonitoringtypesMetricsComponentEntryDTO,
-} from 'api/generated/services/sigNoz.schemas';
-
-type PresentEntryRowProps =
-	| {
-			entry: InframonitoringtypesMetricsComponentEntryDTO;
-			typeLabel: string;
-			itemType: 'metrics';
-	  }
-	| {
-			entry: InframonitoringtypesAttributesComponentEntryDTO;
-			typeLabel: string;
-			itemType: 'attributes';
-	  };
-
-export function PresentEntryRow({
-	entry,
-	typeLabel,
-	itemType,
-}: PresentEntryRowProps): JSX.Element {
-	const items = itemType === 'metrics' ? entry.metrics : entry.attributes;
-
-	return (
-		<div className={styles.entryRow}>
-			<CircleCheck size={14} className={styles.presentIcon} />
-			<Typography.Text size="base" weight="medium">
-				{typeLabel}
-			</Typography.Text>
-			<Typography.Text size="base" color="muted">
-				-
-			</Typography.Text>
-			<Typography.Text
-				size="base"
-				weight="semibold"
-				className={styles.entryRowMetric}
-			>
-				{items?.join(', ')}
-			</Typography.Text>
-			<Typography.Text size="base" color="muted">
-				-
-			</Typography.Text>
-			<Typography.Text size="base" italic color="muted">
-				{entry.associatedComponent.name}
-			</Typography.Text>
-			<Divider className={styles.divider} />
-		</div>
-	);
-}

frontend/src/container/InfraMonitoringK8sV2/Base/components/K8sInstrumentationChecksCallout/utils.tsx

@@ -1,60 +0,0 @@
-import getLocalStorage from 'api/browser/localstorage/get';
-import {
-	InframonitoringtypesChecksDTO,
-	InframonitoringtypesCheckTypeDTO,
-} from 'api/generated/services/sigNoz.schemas';
-import { InfraMonitoringEntity } from '../../../constants';
-
-export const ENTITY_TO_CHECK_TYPE: Record<
-	InfraMonitoringEntity,
-	InframonitoringtypesCheckTypeDTO
-> = {
-	[InfraMonitoringEntity.HOSTS]: InframonitoringtypesCheckTypeDTO.hosts,
-	[InfraMonitoringEntity.PODS]: InframonitoringtypesCheckTypeDTO.pods,
-	[InfraMonitoringEntity.NODES]: InframonitoringtypesCheckTypeDTO.nodes,
-	[InfraMonitoringEntity.NAMESPACES]:
-		InframonitoringtypesCheckTypeDTO.namespaces,
-	[InfraMonitoringEntity.CLUSTERS]: InframonitoringtypesCheckTypeDTO.clusters,
-	[InfraMonitoringEntity.DEPLOYMENTS]:
-		InframonitoringtypesCheckTypeDTO.deployments,
-	[InfraMonitoringEntity.STATEFULSETS]:
-		InframonitoringtypesCheckTypeDTO.statefulsets,
-	[InfraMonitoringEntity.DAEMONSETS]:
-		InframonitoringtypesCheckTypeDTO.daemonsets,
-	[InfraMonitoringEntity.JOBS]: InframonitoringtypesCheckTypeDTO.jobs,
-	[InfraMonitoringEntity.VOLUMES]: InframonitoringtypesCheckTypeDTO.volumes,
-	[InfraMonitoringEntity.CONTAINERS]:
-		InframonitoringtypesCheckTypeDTO.kube_containers,
-};
-
-export function hasMissingEntries(
-	data: InframonitoringtypesChecksDTO,
-): boolean {
-	return (
-		(data.missingDefaultEnabledMetrics?.length ?? 0) > 0 ||
-		(data.missingOptionalMetrics?.length ?? 0) > 0 ||
-		(data.missingRequiredAttributes?.length ?? 0) > 0
-	);
-}
-
-export function hasAnyEntries(data: InframonitoringtypesChecksDTO): boolean {
-	return (
-		(data.presentDefaultEnabledMetrics?.length ?? 0) > 0 ||
-		(data.presentOptionalMetrics?.length ?? 0) > 0 ||
-		(data.presentRequiredAttributes?.length ?? 0) > 0 ||
-		(data.missingDefaultEnabledMetrics?.length ?? 0) > 0 ||
-		(data.missingOptionalMetrics?.length ?? 0) > 0 ||
-		(data.missingRequiredAttributes?.length ?? 0) > 0
-	);
-}
-
-const STORAGE_PREFIX = '@signozhq/k8s-instrumentation-checks-expanded';
-
-export function getStorageKey(entity: InfraMonitoringEntity): string {
-	return `${STORAGE_PREFIX}-${entity}`;
-}
-
-export function readExpandedState(entity: InfraMonitoringEntity): boolean {
-	const stored = getLocalStorage(getStorageKey(entity));
-	return stored === null ? true : stored === 'true';
-}

frontend/src/container/InfraMonitoringK8sV2/Base/utils.tsx

@@ -2,12 +2,7 @@ import { Badge } from '@signozhq/ui/badge';
 
 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';
+import { convertFiltersToExpression } from 'components/QueryBuilderV2/utils';
 
 const dotToUnder: Record<string, string> = {
 	'os.type': 'os_type',
@@ -94,91 +89,3 @@ export function buildExpressionFromGroupMeta(
 	}
 	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 ');
-}

frontend/src/container/InfraMonitoringK8sV2/Clusters/K8sClustersList.tsx

@@ -1,15 +1,11 @@
 import { useCallback } from 'react';
-import { convertToApiError } from 'api/ErrorResponseHandlerForGeneratedAPIs';
 import { listClusters } from 'api/generated/services/inframonitoring';
-import { RenderErrorResponseDTO } from 'api/generated/services/sigNoz.schemas';
-import { AxiosError } from 'axios';
 import {
 	InframonitoringtypesClusterRecordDTO,
 	InframonitoringtypesResponseTypeDTO,
 	Querybuildertypesv5OrderDirectionDTO,
 } from 'api/generated/services/sigNoz.schemas';
 import { InfraMonitoringEvents } from 'constants/events';
-import APIError from 'types/api/error';
 
 import K8sBaseDetails, { K8sDetailsFilters } from '../Base/K8sBaseDetails';
 import { K8sBaseList } from '../Base/K8sBaseList';
@@ -18,9 +14,7 @@ import { InfraMonitoringEntity } from '../constants';
 import {
 	clusterWidgetInfo,
 	getClusterMetricsQueryPayload,
-	k8sClusterDetailsCountsConfig,
 	k8sClusterDetailsMetadataConfig,
-	k8sClusterGetCountsFilterExpression,
 	k8sClusterGetEntityName,
 	k8sClusterGetSelectedItemExpression,
 	k8sClusterInitialEventsExpression,
@@ -73,12 +67,13 @@ function K8sClustersList({
 					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:
-						convertToApiError(error as AxiosError<RenderErrorResponseDTO>) ?? null,
+					error: errMsg,
 				};
 			}
 		},
@@ -91,7 +86,7 @@ function K8sClustersList({
 			signal?: AbortSignal,
 		): Promise<{
 			data: InframonitoringtypesClusterRecordDTO | null;
-			error?: APIError | null;
+			error?: string | null;
 		}> => {
 			try {
 				const response = await listClusters(
@@ -109,10 +104,11 @@ function K8sClustersList({
 					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:
-						convertToApiError(error as AxiosError<RenderErrorResponseDTO>) ?? null,
+					error: errMsg,
 				};
 			}
 		},
@@ -140,8 +136,6 @@ function K8sClustersList({
 				getInitialLogTracesExpression={k8sClusterInitialLogTracesExpression}
 				getInitialEventsExpression={k8sClusterInitialEventsExpression}
 				metadataConfig={k8sClusterDetailsMetadataConfig}
-				countsConfig={k8sClusterDetailsCountsConfig}
-				getCountsFilterExpression={k8sClusterGetCountsFilterExpression}
 				entityWidgetInfo={clusterWidgetInfo}
 				getEntityQueryPayload={getClusterMetricsQueryPayload}
 				queryKeyPrefix="cluster"

frontend/src/container/InfraMonitoringK8sV2/Clusters/constants.ts

@@ -6,131 +6,67 @@ import { EQueryType } from 'types/common/dashboard';
 import { DataSource, ReduceOperators } from 'types/common/queryBuilder';
 import { v4 } from 'uuid';
 
-import {
-	K8sDetailsCountConfig,
-	K8sDetailsMetadataConfig,
-} from '../Base/K8sBaseDetails';
+import { K8sDetailsMetadataConfig } from '../Base/K8sBaseDetails';
 import { formatValueForExpression } from 'components/QueryBuilderV2/utils';
-import {
-	INFRA_MONITORING_ATTR_KEYS,
-	InfraMonitoringEntity,
-} from '../constants';
-import { SelectedItemParams } from '../hooks';
-import {
-	buildEventsExpression,
-	buildLogsTracesExpression,
-} from 'container/InfraMonitoringK8sV2/Base/utils';
+import { INFRA_MONITORING_ATTR_KEYS } from '../constants';
 
 export const k8sClusterGetSelectedItemExpression = (
-	params: SelectedItemParams,
-): string =>
-	`k8s.cluster.name = ${formatValueForExpression(params.selectedItem ?? '')}`;
+	selectedItemId: string,
+): string => `k8s.cluster.name = ${formatValueForExpression(selectedItemId)}`;
 
 export const k8sClusterDetailsMetadataConfig: K8sDetailsMetadataConfig<InframonitoringtypesClusterRecordDTO>[] =
 	[{ label: 'Cluster Name', getValue: (p): string => p.clusterName || '' }];
 
-export const k8sClusterDetailsCountsConfig: K8sDetailsCountConfig<InframonitoringtypesClusterRecordDTO>[] =
-	[
-		{
-			label: 'Namespaces',
-			getValue: (p): number => p.counts?.namespaces ?? 0,
-			targetCategory: InfraMonitoringEntity.NAMESPACES,
-		},
-		{
-			label: 'Nodes',
-			getValue: (p): number => p.counts?.nodes ?? 0,
-			targetCategory: InfraMonitoringEntity.NODES,
-		},
-		{
-			label: 'Deployments',
-			getValue: (p): number => p.counts?.deployments ?? 0,
-			targetCategory: InfraMonitoringEntity.DEPLOYMENTS,
-		},
-		{
-			label: 'StatefulSets',
-			getValue: (p): number => p.counts?.statefulSets ?? 0,
-			targetCategory: InfraMonitoringEntity.STATEFULSETS,
-		},
-		{
-			label: 'DaemonSets',
-			getValue: (p): number => p.counts?.daemonSets ?? 0,
-			targetCategory: InfraMonitoringEntity.DAEMONSETS,
-		},
-		{
-			label: 'Jobs',
-			getValue: (p): number => p.counts?.jobs ?? 0,
-			targetCategory: InfraMonitoringEntity.JOBS,
-		},
-	];
-
 export const k8sClusterInitialEventsExpression = (
 	item: InframonitoringtypesClusterRecordDTO,
-): string =>
-	buildEventsExpression({
-		objectKind: 'Cluster',
-		objectName: item.clusterName || '',
-	});
+): string => {
+	const objectName = formatValueForExpression(item.clusterName || '');
+	return `${INFRA_MONITORING_ATTR_KEYS.K8S_OBJECT_KIND} = 'Cluster' AND ${INFRA_MONITORING_ATTR_KEYS.K8S_OBJECT_NAME} = ${objectName}`;
+};
 
 export const k8sClusterInitialLogTracesExpression = (
 	item: InframonitoringtypesClusterRecordDTO,
-): string =>
-	buildLogsTracesExpression({
-		mainAttributeKey: INFRA_MONITORING_ATTR_KEYS.K8S_CLUSTER_NAME,
-		mainAttributeValue: item.clusterName,
-	});
+): string => {
+	const clusterName = formatValueForExpression(item.clusterName || '');
+	return `${INFRA_MONITORING_ATTR_KEYS.K8S_CLUSTER_NAME} = ${clusterName}`;
+};
 
 export const k8sClusterGetEntityName = (
 	item: InframonitoringtypesClusterRecordDTO,
 ): string => item.clusterName || '';
 
-export const k8sClusterGetCountsFilterExpression = (
-	item: InframonitoringtypesClusterRecordDTO,
-): string =>
-	`k8s.cluster.name = ${formatValueForExpression(item.clusterName ?? '')}`;
-
 export const clusterWidgetInfo = [
 	{
 		title: 'CPU Usage, allocatable',
 		yAxisUnit: '',
-		docPath:
-			'/infrastructure-monitoring/kubernetes/clusters/#cpu-usage-allocatable',
 	},
 	{
 		title: 'Memory Usage, allocatable',
 		yAxisUnit: 'bytes',
-		docPath:
-			'/infrastructure-monitoring/kubernetes/clusters/#memory-usage-allocatable',
 	},
 	{
 		title: 'Ready Nodes',
 		yAxisUnit: '',
-		docPath: '/infrastructure-monitoring/kubernetes/clusters/#ready-nodes',
 	},
 	{
 		title: 'NotReady Nodes',
 		yAxisUnit: '',
-		docPath: '/infrastructure-monitoring/kubernetes/clusters/#notready-nodes',
 	},
 	{
 		title: 'Deployments available and desired',
 		yAxisUnit: '',
-		docPath:
-			'/infrastructure-monitoring/kubernetes/clusters/#deployments-available-and-desired',
 	},
 	{
 		title: 'Statefulset pods',
 		yAxisUnit: '',
-		docPath: '/infrastructure-monitoring/kubernetes/clusters/#statefulset-pods',
 	},
 	{
 		title: 'Daemonset nodes',
 		yAxisUnit: '',
-		docPath: '/infrastructure-monitoring/kubernetes/clusters/#daemonset-nodes',
 	},
 	{
 		title: 'Jobs',
 		yAxisUnit: '',
-		docPath: '/infrastructure-monitoring/kubernetes/clusters/#jobs',
 	},
 ];
 

frontend/src/container/InfraMonitoringK8sV2/DaemonSets/K8sDaemonSetsList.tsx

@@ -1,20 +1,15 @@
 import { useCallback } from 'react';
-import { convertToApiError } from 'api/ErrorResponseHandlerForGeneratedAPIs';
 import { listDaemonSets } from 'api/generated/services/inframonitoring';
-import { RenderErrorResponseDTO } from 'api/generated/services/sigNoz.schemas';
-import { AxiosError } from 'axios';
 import {
 	InframonitoringtypesDaemonSetRecordDTO,
 	InframonitoringtypesResponseTypeDTO,
 	Querybuildertypesv5OrderDirectionDTO,
 } from 'api/generated/services/sigNoz.schemas';
 import { InfraMonitoringEvents } from 'constants/events';
-import APIError from 'types/api/error';
 import K8sBaseDetails, { K8sDetailsFilters } from '../Base/K8sBaseDetails';
 import { K8sBaseList } from '../Base/K8sBaseList';
 import { K8sBaseFilters } from '../Base/types';
 import { InfraMonitoringEntity } from '../constants';
-import { SelectedItemParams } from '../hooks';
 import {
 	daemonSetWidgetInfo,
 	getDaemonSetMetricsQueryPayload,
@@ -69,12 +64,13 @@ function K8sDaemonSetsList({
 					warning: data.warning,
 				};
 			} catch (error) {
+				const errMsg =
+					error instanceof Error ? error.message : 'Failed to fetch daemonsets';
 				return {
 					type: 'list' as const,
 					records: [] as InframonitoringtypesDaemonSetRecordDTO[],
 					total: 0,
-					error:
-						convertToApiError(error as AxiosError<RenderErrorResponseDTO>) ?? null,
+					error: errMsg,
 				};
 			}
 		},
@@ -86,7 +82,7 @@ function K8sDaemonSetsList({
 			signal?: AbortSignal,
 		): Promise<{
 			data: InframonitoringtypesDaemonSetRecordDTO | null;
-			error?: APIError | null;
+			error?: string | null;
 		}> => {
 			try {
 				const response = await listDaemonSets(
@@ -103,10 +99,11 @@ function K8sDaemonSetsList({
 					data: response.data.records.length > 0 ? response.data.records[0] : null,
 				};
 			} catch (error) {
+				const errMsg =
+					error instanceof Error ? error.message : 'Failed to fetch daemonset';
 				return {
 					data: null,
-					error:
-						convertToApiError(error as AxiosError<RenderErrorResponseDTO>) ?? null,
+					error: errMsg,
 				};
 			}
 		},
@@ -114,7 +111,7 @@ function K8sDaemonSetsList({
 	);
 	return (
 		<>
-			<K8sBaseList<InframonitoringtypesDaemonSetRecordDTO, SelectedItemParams>
+			<K8sBaseList<InframonitoringtypesDaemonSetRecordDTO>
 				controlListPrefix={controlListPrefix}
 				entity={InfraMonitoringEntity.DAEMONSETS}
 				tableColumns={k8sDaemonSetsColumnsConfig}

frontend/src/container/InfraMonitoringK8sV2/DaemonSets/constants.ts

@@ -7,21 +7,13 @@ import { DataSource, ReduceOperators } from 'types/common/queryBuilder';
 import { v4 } from 'uuid';
 
 import { K8sDetailsMetadataConfig } from '../Base/K8sBaseDetails';
+import { formatValueForExpression } from 'components/QueryBuilderV2/utils';
 import { INFRA_MONITORING_ATTR_KEYS } from '../constants';
-import { SelectedItemParams } from '../hooks';
-import {
-	buildEventsExpression,
-	buildExpressionFromSelectedItemParams,
-	buildLogsTracesExpression,
-} from 'container/InfraMonitoringK8sV2/Base/utils';
 
 export const k8sDaemonSetGetSelectedItemExpression = (
-	params: SelectedItemParams,
+	selectedItemId: string,
 ): string =>
-	buildExpressionFromSelectedItemParams(
-		params,
-		INFRA_MONITORING_ATTR_KEYS.K8S_DAEMONSET_NAME,
-	);
+	`${INFRA_MONITORING_ATTR_KEYS.K8S_DAEMONSET_NAME} = ${formatValueForExpression(selectedItemId)}`;
 
 export const k8sDaemonSetDetailsMetadataConfig: K8sDetailsMetadataConfig<InframonitoringtypesDaemonSetRecordDTO>[] =
 	[
@@ -45,23 +37,12 @@ export const k8sDaemonSetDetailsMetadataConfig: K8sDetailsMetadataConfig<Inframo
 export const k8sDaemonSetInitialEventsExpression = (
 	item: InframonitoringtypesDaemonSetRecordDTO,
 ): string =>
-	buildEventsExpression({
-		objectKind: 'DaemonSet',
-		objectName: item.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_DAEMONSET_NAME] ?? '',
-		clusterName: item.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_CLUSTER_NAME],
-		namespaceName: item.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_NAMESPACE_NAME],
-	});
+	`${INFRA_MONITORING_ATTR_KEYS.K8S_OBJECT_KIND} = 'DaemonSet' AND ${INFRA_MONITORING_ATTR_KEYS.K8S_OBJECT_NAME} = ${formatValueForExpression(item.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_DAEMONSET_NAME] ?? '')}`;
 
 export const k8sDaemonSetInitialLogTracesExpression = (
 	item: InframonitoringtypesDaemonSetRecordDTO,
 ): string =>
-	buildLogsTracesExpression({
-		mainAttributeKey: INFRA_MONITORING_ATTR_KEYS.K8S_DAEMONSET_NAME,
-		mainAttributeValue:
-			item.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_DAEMONSET_NAME],
-		clusterName: item.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_CLUSTER_NAME],
-		namespaceName: item.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_NAMESPACE_NAME],
-	});
+	`${INFRA_MONITORING_ATTR_KEYS.K8S_DAEMONSET_NAME} = ${formatValueForExpression(item.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_DAEMONSET_NAME] ?? '')} AND ${INFRA_MONITORING_ATTR_KEYS.K8S_NAMESPACE_NAME} = ${formatValueForExpression(item.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_NAMESPACE_NAME] ?? '')}`;
 
 export const k8sDaemonSetGetEntityName = (
 	item: InframonitoringtypesDaemonSetRecordDTO,
@@ -71,25 +52,18 @@ export const daemonSetWidgetInfo = [
 	{
 		title: 'CPU usage, request, limits',
 		yAxisUnit: '',
-		docPath:
-			'/infrastructure-monitoring/kubernetes/daemonsets/#cpu-usage-request-limits',
 	},
 	{
 		title: 'Memory usage, request, limits',
 		yAxisUnit: 'bytes',
-		docPath:
-			'/infrastructure-monitoring/kubernetes/daemonsets/#memory-usage-request-limits',
 	},
 	{
 		title: 'Network IO',
 		yAxisUnit: 'binBps',
-		docPath: '/infrastructure-monitoring/kubernetes/daemonsets/#network-io',
 	},
 	{
 		title: 'Network errors count',
 		yAxisUnit: '',
-		docPath:
-			'/infrastructure-monitoring/kubernetes/daemonsets/#network-errors-count',
 	},
 ];
 
@@ -141,40 +115,6 @@ export const getDaemonSetMetricsQueryPayload = (
 		? 'k8s.namespace.name'
 		: 'k8s_namespace_name';
 
-	const k8sClusterNameKey = dotMetricsEnabled
-		? 'k8s.cluster.name'
-		: 'k8s_cluster_name';
-
-	const clusterName =
-		daemonSet.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_CLUSTER_NAME] ?? '';
-	const namespaceName =
-		daemonSet.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_NAMESPACE_NAME] ?? '';
-
-	const filters = [
-		{
-			id: 'f1',
-			key: {
-				dataType: DataTypes.String,
-				id: 'k8s_cluster_name--string--tag--false',
-				key: k8sClusterNameKey,
-				type: 'tag',
-			},
-			op: '=',
-			value: clusterName,
-		},
-		{
-			id: 'f2',
-			key: {
-				dataType: DataTypes.String,
-				id: 'k8s_namespace_name--string--tag--false',
-				key: k8sNamespaceNameKey,
-				type: 'tag',
-			},
-			op: '=',
-			value: namespaceName,
-		},
-	];
-
 	return [
 		{
 			selectedTime: 'GLOBAL_TIME',
@@ -208,7 +148,19 @@ export const getDaemonSetMetricsQueryPayload = (
 											daemonSet.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_DAEMONSET_NAME] ??
 											'',
 									},
-									...filters,
+									{
+										id: '47b3adae',
+										key: {
+											dataType: DataTypes.String,
+											id: 'k8s_namespace_name--string--tag--false',
+											key: k8sNamespaceNameKey,
+											type: 'tag',
+										},
+										op: '=',
+										value:
+											daemonSet.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_NAMESPACE_NAME] ??
+											'',
+									},
 								],
 								op: 'AND',
 							},
@@ -250,7 +202,19 @@ export const getDaemonSetMetricsQueryPayload = (
 											daemonSet.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_DAEMONSET_NAME] ??
 											'',
 									},
-									...filters,
+									{
+										id: '47b3adae',
+										key: {
+											dataType: DataTypes.String,
+											id: 'k8s_namespace_name--string--tag--false',
+											key: k8sNamespaceNameKey,
+											type: 'tag',
+										},
+										op: '=',
+										value:
+											daemonSet.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_NAMESPACE_NAME] ??
+											'',
+									},
 								],
 								op: 'AND',
 							},
@@ -292,7 +256,19 @@ export const getDaemonSetMetricsQueryPayload = (
 											daemonSet.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_DAEMONSET_NAME] ??
 											'',
 									},
-									...filters,
+									{
+										id: '47b3adae',
+										key: {
+											dataType: DataTypes.String,
+											id: 'k8s_namespace_name--string--tag--false',
+											key: k8sNamespaceNameKey,
+											type: 'tag',
+										},
+										op: '=',
+										value:
+											daemonSet.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_NAMESPACE_NAME] ??
+											'',
+									},
 								],
 								op: 'AND',
 							},
@@ -368,7 +344,19 @@ export const getDaemonSetMetricsQueryPayload = (
 											daemonSet.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_DAEMONSET_NAME] ??
 											'',
 									},
-									...filters,
+									{
+										id: '47b3adae',
+										key: {
+											dataType: DataTypes.String,
+											id: 'k8s_namespace_name--string--tag--false',
+											key: k8sNamespaceNameKey,
+											type: 'tag',
+										},
+										op: '=',
+										value:
+											daemonSet.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_NAMESPACE_NAME] ??
+											'',
+									},
 								],
 								op: 'AND',
 							},
@@ -410,7 +398,19 @@ export const getDaemonSetMetricsQueryPayload = (
 											daemonSet.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_DAEMONSET_NAME] ??
 											'',
 									},
-									...filters,
+									{
+										id: '47b3adae',
+										key: {
+											dataType: DataTypes.String,
+											id: 'k8s_namespace_name--string--tag--false',
+											key: k8sNamespaceNameKey,
+											type: 'tag',
+										},
+										op: '=',
+										value:
+											daemonSet.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_NAMESPACE_NAME] ??
+											'',
+									},
 								],
 								op: 'AND',
 							},
@@ -452,7 +452,19 @@ export const getDaemonSetMetricsQueryPayload = (
 											daemonSet.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_DAEMONSET_NAME] ??
 											'',
 									},
-									...filters,
+									{
+										id: '47b3adae',
+										key: {
+											dataType: DataTypes.String,
+											id: 'k8s_namespace_name--string--tag--false',
+											key: k8sNamespaceNameKey,
+											type: 'tag',
+										},
+										op: '=',
+										value:
+											daemonSet.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_NAMESPACE_NAME] ??
+											'',
+									},
 								],
 								op: 'AND',
 							},
@@ -528,7 +540,19 @@ export const getDaemonSetMetricsQueryPayload = (
 											daemonSet.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_DAEMONSET_NAME] ??
 											'',
 									},
-									...filters,
+									{
+										id: '47b3adae',
+										key: {
+											dataType: DataTypes.String,
+											id: 'k8s_namespace_name--string--tag--false',
+											key: k8sNamespaceNameKey,
+											type: 'tag',
+										},
+										op: '=',
+										value:
+											daemonSet.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_NAMESPACE_NAME] ??
+											'',
+									},
 								],
 								op: 'AND',
 							},
@@ -617,7 +641,19 @@ export const getDaemonSetMetricsQueryPayload = (
 											daemonSet.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_DAEMONSET_NAME] ??
 											'',
 									},
-									...filters,
+									{
+										id: '47b3adae',
+										key: {
+											dataType: DataTypes.String,
+											id: 'k8s_namespace_name--string--tag--false',
+											key: k8sNamespaceNameKey,
+											type: 'tag',
+										},
+										op: '=',
+										value:
+											daemonSet.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_NAMESPACE_NAME] ??
+											'',
+									},
 								],
 								op: 'AND',
 							},

frontend/src/container/InfraMonitoringK8sV2/DaemonSets/table.config.tsx

@@ -6,7 +6,6 @@ import { ExpandButtonWrapper } from 'container/InfraMonitoringK8sV2/components';
 import ColumnHeader from '../Base/ColumnHeader';
 import EntityGroupHeader from '../Base/EntityGroupHeader';
 import K8sGroupCell from '../Base/K8sGroupCell';
-import { SelectedItemParams } from '../hooks';
 import { formatBytes, getPodPhaseStatusItems } from '../commonUtils';
 import {
 	CellValueTooltip,
@@ -32,15 +31,8 @@ export function getK8sDaemonSetRowKey(
 
 export function getK8sDaemonSetItemKey(
 	daemonSet: InframonitoringtypesDaemonSetRecordDTO,
-): SelectedItemParams {
-	return {
-		selectedItem:
-			daemonSet.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_DAEMONSET_NAME] ?? null,
-		clusterName:
-			daemonSet.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_CLUSTER_NAME] ?? null,
-		namespaceName:
-			daemonSet.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_NAMESPACE_NAME] ?? null,
-	};
+): string {
+	return daemonSet.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_DAEMONSET_NAME] || '';
 }
 
 export type DaemonSetTableColumnConfig =
@@ -140,38 +132,28 @@ export const k8sDaemonSetsColumnsConfig: DaemonSetTableColumnConfig[] = [
 		},
 	},
 	{
-		id: 'scheduled_nodes',
+		id: 'node_status',
 		header: (): React.ReactNode => (
-			<ColumnHeader docPath="/infrastructure-monitoring/kubernetes/daemonsets#scheduled-nodes">
-				Scheduled Nodes
+			<ColumnHeader docPath="/infrastructure-monitoring/kubernetes/daemonsets#node-status">
+				Node Status
 			</ColumnHeader>
 		),
 		accessorFn: (row): number => row.currentNodes,
-		width: { min: 210 },
+		width: { min: 180 },
 		enableSort: false,
 		enableResize: true,
 		cell: ({ row }): React.ReactNode => (
 			<GroupedStatusCounts
 				items={[
-					{
-						value: row.readyNodes,
-						label: 'Ready',
-						color: Color.BG_FOREST_500,
-					},
 					{
 						value: row.currentNodes,
 						label: 'Current',
-						color: Color.BG_ROBIN_500,
+						color: Color.BG_FOREST_500,
 					},
 					{
 						value: row.desiredNodes,
 						label: 'Desired',
-						color: Color.BG_SAKURA_400,
-					},
-					{
-						value: row.misscheduledNodes,
-						label: 'Misscheduled',
-						color: Color.BG_AMBER_500,
+						color: Color.BG_ROBIN_500,
 					},
 				]}
 			/>
@@ -330,30 +312,6 @@ export const k8sDaemonSetsColumnsConfig: DaemonSetTableColumnConfig[] = [
 			);
 		},
 	},
-	{
-		id: 'ready_nodes',
-		header: (): React.ReactNode => (
-			<ColumnHeader docPath="/infrastructure-monitoring/kubernetes/daemonsets#ready">
-				Ready Nodes
-			</ColumnHeader>
-		),
-		accessorFn: (row): number => row.readyNodes,
-		width: { min: 140 },
-		enableSort: true,
-		defaultVisibility: false,
-		cell: ({ value }): React.ReactNode => {
-			const readyNodes = value as number;
-			return (
-				<ValidateColumnValueWrapper
-					value={readyNodes}
-					entity={InfraMonitoringEntity.DAEMONSETS}
-					attribute="ready node"
-				>
-					<TanStackTable.Text>{readyNodes}</TanStackTable.Text>
-				</ValidateColumnValueWrapper>
-			);
-		},
-	},
 	{
 		id: 'current_nodes',
 		header: (): React.ReactNode => (
@@ -402,28 +360,4 @@ export const k8sDaemonSetsColumnsConfig: DaemonSetTableColumnConfig[] = [
 			);
 		},
 	},
-	{
-		id: 'misscheduled_nodes',
-		header: (): React.ReactNode => (
-			<ColumnHeader docPath="/infrastructure-monitoring/kubernetes/daemonsets#misscheduled">
-				Misscheduled Nodes
-			</ColumnHeader>
-		),
-		accessorFn: (row): number => row.misscheduledNodes,
-		width: { min: 140 },
-		enableSort: true,
-		defaultVisibility: false,
-		cell: ({ value }): React.ReactNode => {
-			const misscheduledNodes = value as number;
-			return (
-				<ValidateColumnValueWrapper
-					value={misscheduledNodes}
-					entity={InfraMonitoringEntity.DAEMONSETS}
-					attribute="misscheduled node"
-				>
-					<TanStackTable.Text>{misscheduledNodes}</TanStackTable.Text>
-				</ValidateColumnValueWrapper>
-			);
-		},
-	},
 ];

frontend/src/container/InfraMonitoringK8sV2/Deployments/K8sDeploymentsList.tsx

@@ -1,21 +1,16 @@
 import { useCallback } from 'react';
-import { convertToApiError } from 'api/ErrorResponseHandlerForGeneratedAPIs';
 import { listDeployments } from 'api/generated/services/inframonitoring';
-import { RenderErrorResponseDTO } from 'api/generated/services/sigNoz.schemas';
-import { AxiosError } from 'axios';
 import {
 	InframonitoringtypesDeploymentRecordDTO,
 	InframonitoringtypesResponseTypeDTO,
 	Querybuildertypesv5OrderDirectionDTO,
 } from 'api/generated/services/sigNoz.schemas';
 import { InfraMonitoringEvents } from 'constants/events';
-import APIError from 'types/api/error';
 
 import K8sBaseDetails, { K8sDetailsFilters } from '../Base/K8sBaseDetails';
 import { K8sBaseList } from '../Base/K8sBaseList';
 import { K8sBaseFilters } from '../Base/types';
 import { InfraMonitoringEntity } from '../constants';
-import { SelectedItemParams } from '../hooks';
 import {
 	deploymentWidgetInfo,
 	getDeploymentMetricsQueryPayload,
@@ -72,12 +67,13 @@ function K8sDeploymentsList({
 					warning: data.warning,
 				};
 			} catch (error) {
+				const errMsg =
+					error instanceof Error ? error.message : 'Failed to fetch deployments';
 				return {
 					type: 'list' as const,
 					records: [] as InframonitoringtypesDeploymentRecordDTO[],
 					total: 0,
-					error:
-						convertToApiError(error as AxiosError<RenderErrorResponseDTO>) ?? null,
+					error: errMsg,
 				};
 			}
 		},
@@ -90,7 +86,7 @@ function K8sDeploymentsList({
 			signal?: AbortSignal,
 		): Promise<{
 			data: InframonitoringtypesDeploymentRecordDTO | null;
-			error?: APIError | null;
+			error?: string | null;
 		}> => {
 			try {
 				const response = await listDeployments(
@@ -108,10 +104,11 @@ function K8sDeploymentsList({
 					data: response.data.records.length > 0 ? response.data.records[0] : null,
 				};
 			} catch (error) {
+				const errMsg =
+					error instanceof Error ? error.message : 'Failed to fetch deployment';
 				return {
 					data: null,
-					error:
-						convertToApiError(error as AxiosError<RenderErrorResponseDTO>) ?? null,
+					error: errMsg,
 				};
 			}
 		},
@@ -120,7 +117,7 @@ function K8sDeploymentsList({
 
 	return (
 		<>
-			<K8sBaseList<InframonitoringtypesDeploymentRecordDTO, SelectedItemParams>
+			<K8sBaseList<InframonitoringtypesDeploymentRecordDTO>
 				controlListPrefix={controlListPrefix}
 				entity={InfraMonitoringEntity.DEPLOYMENTS}
 				tableColumns={k8sDeploymentsColumnsConfig}

frontend/src/container/InfraMonitoringK8sV2/Deployments/constants.ts

@@ -7,21 +7,13 @@ import { DataSource, ReduceOperators } from 'types/common/queryBuilder';
 import { v4 } from 'uuid';
 
 import { K8sDetailsMetadataConfig } from '../Base/K8sBaseDetails';
+import { formatValueForExpression } from 'components/QueryBuilderV2/utils';
 import { INFRA_MONITORING_ATTR_KEYS } from '../constants';
-import { SelectedItemParams } from '../hooks';
-import {
-	buildEventsExpression,
-	buildExpressionFromSelectedItemParams,
-	buildLogsTracesExpression,
-} from 'container/InfraMonitoringK8sV2/Base/utils';
 
 export const k8sDeploymentGetSelectedItemExpression = (
-	params: SelectedItemParams,
+	selectedItemId: string,
 ): string =>
-	buildExpressionFromSelectedItemParams(
-		params,
-		INFRA_MONITORING_ATTR_KEYS.K8S_DEPLOYMENT_NAME,
-	);
+	`${INFRA_MONITORING_ATTR_KEYS.K8S_DEPLOYMENT_NAME} = ${formatValueForExpression(selectedItemId)}`;
 
 export const k8sDeploymentDetailsMetadataConfig: K8sDetailsMetadataConfig<InframonitoringtypesDeploymentRecordDTO>[] =
 	[
@@ -44,24 +36,24 @@ export const k8sDeploymentDetailsMetadataConfig: K8sDetailsMetadataConfig<Infram
 
 export const k8sDeploymentInitialEventsExpression = (
 	item: InframonitoringtypesDeploymentRecordDTO,
-): string =>
-	buildEventsExpression({
-		objectKind: 'Deployment',
-		objectName: item.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_DEPLOYMENT_NAME] ?? '',
-		clusterName: item.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_CLUSTER_NAME],
-		namespaceName: item.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_NAMESPACE_NAME],
-	});
+): string => {
+	const objectName = formatValueForExpression(
+		item.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_DEPLOYMENT_NAME] ?? '',
+	);
+	return `${INFRA_MONITORING_ATTR_KEYS.K8S_OBJECT_KIND} = 'Deployment' AND ${INFRA_MONITORING_ATTR_KEYS.K8S_OBJECT_NAME} = ${objectName}`;
+};
 
 export const k8sDeploymentInitialLogTracesExpression = (
 	item: InframonitoringtypesDeploymentRecordDTO,
-): string =>
-	buildLogsTracesExpression({
-		mainAttributeKey: INFRA_MONITORING_ATTR_KEYS.K8S_DEPLOYMENT_NAME,
-		mainAttributeValue:
-			item.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_DEPLOYMENT_NAME],
-		clusterName: item.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_CLUSTER_NAME],
-		namespaceName: item.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_NAMESPACE_NAME],
-	});
+): string => {
+	const deploymentName = formatValueForExpression(
+		item.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_DEPLOYMENT_NAME] ?? '',
+	);
+	const namespaceName = formatValueForExpression(
+		item.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_NAMESPACE_NAME] ?? '',
+	);
+	return `${INFRA_MONITORING_ATTR_KEYS.K8S_DEPLOYMENT_NAME} = ${deploymentName} AND ${INFRA_MONITORING_ATTR_KEYS.K8S_NAMESPACE_NAME} = ${namespaceName}`;
+};
 
 export const k8sDeploymentGetEntityName = (
 	item: InframonitoringtypesDeploymentRecordDTO,
@@ -71,25 +63,18 @@ export const deploymentWidgetInfo = [
 	{
 		title: 'CPU usage, request, limits',
 		yAxisUnit: '',
-		docPath:
-			'/infrastructure-monitoring/kubernetes/deployments/#cpu-usage-request-limits',
 	},
 	{
 		title: 'Memory usage, request, limits',
 		yAxisUnit: 'bytes',
-		docPath:
-			'/infrastructure-monitoring/kubernetes/deployments/#memory-usage-request-limits',
 	},
 	{
 		title: 'Network IO',
 		yAxisUnit: 'binBps',
-		docPath: '/infrastructure-monitoring/kubernetes/deployments/#network-io',
 	},
 	{
 		title: 'Network error count',
 		yAxisUnit: '',
-		docPath:
-			'/infrastructure-monitoring/kubernetes/deployments/#network-error-count',
 	},
 ];
 
@@ -136,43 +121,6 @@ export const getDeploymentMetricsQueryPayload = (
 		: 'k8s_deployment_name';
 
 	const k8sPodNameKey = dotMetricsEnabled ? 'k8s.pod.name' : 'k8s_pod_name';
-	const k8sClusterNameKey = dotMetricsEnabled
-		? 'k8s.cluster.name'
-		: 'k8s_cluster_name';
-	const k8sNamespaceNameKey = dotMetricsEnabled
-		? 'k8s.namespace.name'
-		: 'k8s_namespace_name';
-
-	const clusterName =
-		deployment.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_CLUSTER_NAME] ?? '';
-
-	const namespaceName =
-		deployment.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_NAMESPACE_NAME] ?? '';
-
-	const filters = [
-		{
-			id: 'f1',
-			key: {
-				dataType: DataTypes.String,
-				id: 'k8s_cluster_name--string--tag--false',
-				key: k8sClusterNameKey,
-				type: 'tag',
-			},
-			op: '=',
-			value: clusterName,
-		},
-		{
-			id: 'f2',
-			key: {
-				dataType: DataTypes.String,
-				id: 'k8s_namespace_name--string--tag--false',
-				key: k8sNamespaceNameKey,
-				type: 'tag',
-			},
-			op: '=',
-			value: namespaceName,
-		},
-	];
 
 	return [
 		{
@@ -207,7 +155,6 @@ export const getDeploymentMetricsQueryPayload = (
 											deployment.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_DEPLOYMENT_NAME] ??
 											'',
 									},
-									...filters,
 								],
 								op: 'AND',
 							},
@@ -249,7 +196,6 @@ export const getDeploymentMetricsQueryPayload = (
 											deployment.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_DEPLOYMENT_NAME] ??
 											'',
 									},
-									...filters,
 								],
 								op: 'AND',
 							},
@@ -291,7 +237,6 @@ export const getDeploymentMetricsQueryPayload = (
 											deployment.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_DEPLOYMENT_NAME] ??
 											'',
 									},
-									...filters,
 								],
 								op: 'AND',
 							},
@@ -367,7 +312,6 @@ export const getDeploymentMetricsQueryPayload = (
 											deployment.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_DEPLOYMENT_NAME] ??
 											'',
 									},
-									...filters,
 								],
 								op: 'AND',
 							},
@@ -409,7 +353,6 @@ export const getDeploymentMetricsQueryPayload = (
 											deployment.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_DEPLOYMENT_NAME] ??
 											'',
 									},
-									...filters,
 								],
 								op: 'AND',
 							},
@@ -451,7 +394,6 @@ export const getDeploymentMetricsQueryPayload = (
 											deployment.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_DEPLOYMENT_NAME] ??
 											'',
 									},
-									...filters,
 								],
 								op: 'AND',
 							},
@@ -527,7 +469,6 @@ export const getDeploymentMetricsQueryPayload = (
 											deployment.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_DEPLOYMENT_NAME] ??
 											'',
 									},
-									...filters,
 								],
 								op: 'AND',
 							},
@@ -616,7 +557,6 @@ export const getDeploymentMetricsQueryPayload = (
 											deployment.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_DEPLOYMENT_NAME] ??
 											'',
 									},
-									...filters,
 								],
 								op: 'AND',
 							},

frontend/src/container/InfraMonitoringK8sV2/Deployments/table.config.tsx

@@ -6,7 +6,6 @@ import { ExpandButtonWrapper } from 'container/InfraMonitoringK8sV2/components';
 import ColumnHeader from '../Base/ColumnHeader';
 import EntityGroupHeader from '../Base/EntityGroupHeader';
 import K8sGroupCell from '../Base/K8sGroupCell';
-import { SelectedItemParams } from '../hooks';
 import { formatBytes, getPodPhaseStatusItems } from '../commonUtils';
 import {
 	CellValueTooltip,
@@ -32,15 +31,8 @@ export function getK8sDeploymentRowKey(
 
 export function getK8sDeploymentItemKey(
 	deployment: InframonitoringtypesDeploymentRecordDTO,
-): SelectedItemParams {
-	return {
-		selectedItem:
-			deployment.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_DEPLOYMENT_NAME] ?? null,
-		clusterName:
-			deployment.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_CLUSTER_NAME] ?? null,
-		namespaceName:
-			deployment.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_NAMESPACE_NAME] ?? null,
-	};
+): string {
+	return deployment.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_DEPLOYMENT_NAME] || '';
 }
 
 export const k8sDeploymentsColumnsConfig: TableColumnDef<InframonitoringtypesDeploymentRecordDTO>[] =
@@ -133,10 +125,10 @@ export const k8sDeploymentsColumnsConfig: TableColumnDef<InframonitoringtypesDep
 			},
 		},
 		{
-			id: 'pod_replicas',
+			id: 'replica_status',
 			header: (): React.ReactNode => (
-				<ColumnHeader docPath="/infrastructure-monitoring/kubernetes/deployments#pod-replicas">
-					Pod Replicas
+				<ColumnHeader docPath="/infrastructure-monitoring/kubernetes/deployments#replica-status">
+					Replica Status
 				</ColumnHeader>
 			),
 			accessorFn: (row): number => row.availablePods,

frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityMetrics/ChartHeader.module.scss

@@ -1,32 +0,0 @@
-.chartHeader {
-	display: inline-flex;
-	align-items: center;
-	gap: var(--spacing-2);
-}
-
-.infoIcon {
-	display: inline-flex;
-	align-items: center;
-	color: var(--l2-foreground);
-	cursor: pointer;
-
-	&:hover {
-		color: var(--text-slate-primary);
-	}
-}
-
-.metricsExplorerLink {
-	display: inline-flex;
-	align-items: center;
-	color: var(--l2-foreground);
-	transition: opacity 0.2s;
-
-	&:hover {
-		color: var(--l3-foreground);
-	}
-}
-
-.chartHeaderLabel {
-	font-size: var(--periscope-font-size-base);
-	color: var(--l2-foreground);
-}

frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityMetrics/ChartHeader.tsx

@@ -1,83 +0,0 @@
-import { Link } from 'react-router-dom';
-import { Compass, Info } from '@signozhq/icons';
-import { Tooltip } from 'antd';
-
-import styles from './ChartHeader.module.scss';
-
-const DOCS_BASE_URL = `${process.env.DOCS_BASE_URL}/docs`;
-
-interface ChartHeaderProps {
-	title: string;
-	docPath?: string;
-	tooltip?: string;
-	metricsExplorerUrl?: string;
-	metricsExplorerTestId?: string;
-}
-
-function ChartHeader({
-	title,
-	docPath,
-	tooltip,
-	metricsExplorerUrl,
-	metricsExplorerTestId = 'open-metrics-explorer',
-}: ChartHeaderProps): JSX.Element {
-	const renderInfoIcon = (): React.ReactNode => {
-		if (docPath) {
-			const tooltipTitle = tooltip || 'Not sure what this represents?';
-			return (
-				<Tooltip
-					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} data-testid="chart-header-info-icon">
-						<Info size="md" />
-					</span>
-				</Tooltip>
-			);
-		}
-
-		if (tooltip) {
-			return (
-				<Tooltip title={tooltip}>
-					<span className={styles.infoIcon} data-testid="chart-header-info-icon">
-						<Info size="md" />
-					</span>
-				</Tooltip>
-			);
-		}
-
-		return null;
-	};
-
-	return (
-		<div className={styles.chartHeader} data-testid="chart-header">
-			<span className={styles.chartHeaderLabel}>{title}</span>
-			{renderInfoIcon()}
-			{metricsExplorerUrl && (
-				<Tooltip title="Open in Metrics Explorer">
-					<Link
-						to={metricsExplorerUrl}
-						className={styles.metricsExplorerLink}
-						data-testid={metricsExplorerTestId}
-					>
-						<Compass size={14} />
-					</Link>
-				</Tooltip>
-			)}
-		</div>
-	);
-}
-
-export default ChartHeader;

frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityMetrics/EntityMetrics.module.scss

@@ -14,6 +14,28 @@
 	box-sizing: border-box;
 }
 
+.entityMetricsTitleContainer {
+	display: flex;
+	align-items: center;
+	gap: 8px;
+}
+
+.entityMetricsTitle {
+	font-size: var(--periscope-font-size-base);
+	color: var(--l2-foreground);
+}
+
+.metricsExplorerLink {
+	display: flex;
+	align-items: center;
+	color: var(--l2-foreground);
+	transition: opacity 0.2s;
+
+	&:hover {
+		color: var(--l3-foreground);
+	}
+}
+
 .metricsHeader {
 	display: flex;
 	justify-content: flex-end;

frontend/src/container/InfraMonitoringK8sV2/EntityDetailsUtils/EntityMetrics/EntityMetrics.tsx

@@ -1,6 +1,8 @@
 import { useCallback, useMemo, useRef } from 'react';
 import { UseQueryResult } from 'react-query';
-import { Skeleton } from 'antd';
+import { Link } from 'react-router-dom';
+import { Compass } from '@signozhq/icons';
+import { Skeleton, Tooltip } from 'antd';
 import cx from 'classnames';
 import { PANEL_TYPES } from 'constants/queryBuilder';
 import TimeSeries from 'container/DashboardContainer/visualization/charts/TimeSeries/TimeSeries';
@@ -22,7 +24,6 @@ import { MetricRangePayloadProps } from 'types/api/metrics/getQueryRange';
 import { getMetricsExplorerUrl } from 'utils/explorerUtils';
 
 import { buildEntityMetricsChartConfig } from './configBuilder';
-import ChartHeader from './ChartHeader';
 
 import { useEntityMetrics } from './hooks';
 import { isKeyNotFoundError } from '../utils';
@@ -46,7 +47,6 @@ interface EntityMetricsProps<T> {
 	entityWidgetInfo: {
 		title: string;
 		yAxisUnit: string;
-		docPath?: string;
 	}[];
 	getEntityQueryPayload: (
 		node: T,
@@ -207,24 +207,31 @@ function EntityMetrics<T>({
 						key={entityWidgetInfo[idx].title}
 						className={styles.entityMetricsCol}
 					>
-						<ChartHeader
-							title={entityWidgetInfo[idx].title}
-							docPath={entityWidgetInfo[idx].docPath}
-							metricsExplorerUrl={
-								queryPayloads[idx] && queryPayloads[idx].graphType !== PANEL_TYPES.TABLE
-									? getMetricsExplorerUrl({
-											query: queryPayloads[idx].query,
-											...(selectedInterval && selectedInterval !== 'custom'
-												? { relativeTime: selectedInterval }
-												: {
-														startTimeMs: timeRange.startTime * 1000,
-														endTimeMs: timeRange.endTime * 1000,
-													}),
-										})
-									: undefined
-							}
-							metricsExplorerTestId={`open-metrics-explorer-${idx}`}
-						/>
+						<div className={styles.entityMetricsTitleContainer}>
+							<span className={styles.entityMetricsTitle}>
+								{entityWidgetInfo[idx].title}
+							</span>
+							{queryPayloads[idx] &&
+								queryPayloads[idx].graphType !== PANEL_TYPES.TABLE && (
+									<Tooltip title="Open in Metrics Explorer">
+										<Link
+											to={getMetricsExplorerUrl({
+												query: queryPayloads[idx].query,
+												...(selectedInterval && selectedInterval !== 'custom'
+													? { relativeTime: selectedInterval }
+													: {
+															startTimeMs: timeRange.startTime * 1000,
+															endTimeMs: timeRange.endTime * 1000,
+														}),
+											})}
+											className={styles.metricsExplorerLink}
+											data-testid={`open-metrics-explorer-${idx}`}
+										>
+											<Compass size={14} />
+										</Link>
+									</Tooltip>
+								)}
+						</div>
 						<div className={styles.entityMetricsCard} ref={graphRef}>
 							{renderCardContent(query, idx)}
 						</div>

frontend/src/container/InfraMonitoringK8sV2/InfraMonitoringK8s.tsx

@@ -44,7 +44,7 @@ import {
 	useInfraMonitoringCategory,
 	useInfraMonitoringGroupBy,
 	useInfraMonitoringOrderBy,
-	useInfraMonitoringSelectedItemParams,
+	useInfraMonitoringSelectedItem,
 } from './hooks';
 import K8sJobsList from './Jobs/K8sJobsList';
 import K8sNamespacesList from './Namespaces/K8sNamespacesList';
@@ -63,7 +63,7 @@ export default function InfraMonitoringK8s(): JSX.Element {
 	const [selectedCategory, setSelectedCategory] = useInfraMonitoringCategory();
 	const [, setGroupBy] = useInfraMonitoringGroupBy();
 	const [, setOrderBy] = useInfraMonitoringOrderBy();
-	const [, setSelectedItemParams] = useInfraMonitoringSelectedItemParams();
+	const [, setSelectedItem] = useInfraMonitoringSelectedItem();
 
 	const compositeQuery = useGetCompositeQueryParam();
 	const { currentQuery, redirectWithQueryBuilderData } = useQueryBuilder();
@@ -179,7 +179,7 @@ export default function InfraMonitoringK8s(): JSX.Element {
 			void setSelectedCategory(key as string);
 			void setOrderBy(null);
 			void setGroupBy(null);
-			setSelectedItemParams(null);
+			void setSelectedItem(null);
 			redirectWithQueryBuilderData({
 				...currentQuery,
 				builder: {

frontend/src/container/InfraMonitoringK8sV2/Jobs/K8sJobsList.tsx

@@ -1,21 +1,16 @@
 import { useCallback } from 'react';
-import { convertToApiError } from 'api/ErrorResponseHandlerForGeneratedAPIs';
 import { listJobs } from 'api/generated/services/inframonitoring';
-import { RenderErrorResponseDTO } from 'api/generated/services/sigNoz.schemas';
-import { AxiosError } from 'axios';
 import {
 	InframonitoringtypesJobRecordDTO,
 	InframonitoringtypesResponseTypeDTO,
 	Querybuildertypesv5OrderDirectionDTO,
 } from 'api/generated/services/sigNoz.schemas';
 import { InfraMonitoringEvents } from 'constants/events';
-import APIError from 'types/api/error';
 
 import K8sBaseDetails, { K8sDetailsFilters } from '../Base/K8sBaseDetails';
 import { K8sBaseList } from '../Base/K8sBaseList';
 import { K8sBaseFilters } from '../Base/types';
 import { InfraMonitoringEntity } from '../constants';
-import { SelectedItemParams } from '../hooks';
 import {
 	getJobMetricsQueryPayload,
 	jobWidgetInfo,
@@ -72,12 +67,13 @@ function K8sJobsList({
 					warning: data.warning,
 				};
 			} catch (error) {
+				const errMsg =
+					error instanceof Error ? error.message : 'Failed to fetch jobs';
 				return {
 					type: 'list' as const,
 					records: [] as InframonitoringtypesJobRecordDTO[],
 					total: 0,
-					error:
-						convertToApiError(error as AxiosError<RenderErrorResponseDTO>) ?? null,
+					error: errMsg,
 				};
 			}
 		},
@@ -90,7 +86,7 @@ function K8sJobsList({
 			signal?: AbortSignal,
 		): Promise<{
 			data: InframonitoringtypesJobRecordDTO | null;
-			error?: APIError | null;
+			error?: string | null;
 		}> => {
 			try {
 				const response = await listJobs(
@@ -108,10 +104,11 @@ function K8sJobsList({
 					data: response.data.records.length > 0 ? response.data.records[0] : null,
 				};
 			} catch (error) {
+				const errMsg =
+					error instanceof Error ? error.message : 'Failed to fetch job';
 				return {
 					data: null,
-					error:
-						convertToApiError(error as AxiosError<RenderErrorResponseDTO>) ?? null,
+					error: errMsg,
 				};
 			}
 		},
@@ -120,7 +117,7 @@ function K8sJobsList({
 
 	return (
 		<>
-			<K8sBaseList<InframonitoringtypesJobRecordDTO, SelectedItemParams>
+			<K8sBaseList<InframonitoringtypesJobRecordDTO>
 				controlListPrefix={controlListPrefix}
 				entity={InfraMonitoringEntity.JOBS}
 				tableColumns={k8sJobsColumnsConfig}

frontend/src/container/InfraMonitoringK8sV2/Jobs/constants.ts

@@ -7,21 +7,13 @@ import { DataSource, ReduceOperators } from 'types/common/queryBuilder';
 import { v4 } from 'uuid';
 
 import { K8sDetailsMetadataConfig } from '../Base/K8sBaseDetails';
+import { formatValueForExpression } from 'components/QueryBuilderV2/utils';
 import { INFRA_MONITORING_ATTR_KEYS } from '../constants';
-import { SelectedItemParams } from '../hooks';
-import {
-	buildEventsExpression,
-	buildExpressionFromSelectedItemParams,
-	buildLogsTracesExpression,
-} from 'container/InfraMonitoringK8sV2/Base/utils';
 
 export const k8sJobGetSelectedItemExpression = (
-	params: SelectedItemParams,
+	selectedItemId: string,
 ): string =>
-	buildExpressionFromSelectedItemParams(
-		params,
-		INFRA_MONITORING_ATTR_KEYS.K8S_JOB_NAME,
-	);
+	`${INFRA_MONITORING_ATTR_KEYS.K8S_JOB_NAME} = ${formatValueForExpression(selectedItemId)}`;
 
 export const k8sJobDetailsMetadataConfig: K8sDetailsMetadataConfig<InframonitoringtypesJobRecordDTO>[] =
 	[
@@ -44,23 +36,24 @@ export const k8sJobDetailsMetadataConfig: K8sDetailsMetadataConfig<Inframonitori
 
 export const k8sJobInitialEventsExpression = (
 	item: InframonitoringtypesJobRecordDTO,
-): string =>
-	buildEventsExpression({
-		objectKind: 'Job',
-		objectName: item.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_JOB_NAME] ?? '',
-		clusterName: item.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_CLUSTER_NAME],
-		namespaceName: item.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_NAMESPACE_NAME],
-	});
+): string => {
+	const name = formatValueForExpression(
+		item.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_JOB_NAME] ?? '',
+	);
+	return `${INFRA_MONITORING_ATTR_KEYS.K8S_OBJECT_KIND} = 'Job' AND ${INFRA_MONITORING_ATTR_KEYS.K8S_OBJECT_NAME} = ${name}`;
+};
 
 export const k8sJobInitialLogTracesExpression = (
 	item: InframonitoringtypesJobRecordDTO,
-): string =>
-	buildLogsTracesExpression({
-		mainAttributeKey: INFRA_MONITORING_ATTR_KEYS.K8S_JOB_NAME,
-		mainAttributeValue: item.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_JOB_NAME],
-		clusterName: item.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_CLUSTER_NAME],
-		namespaceName: item.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_NAMESPACE_NAME],
-	});
+): string => {
+	const jobName = formatValueForExpression(
+		item.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_JOB_NAME] ?? '',
+	);
+	const namespaceName = formatValueForExpression(
+		item.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_NAMESPACE_NAME] ?? '',
+	);
+	return `${INFRA_MONITORING_ATTR_KEYS.K8S_JOB_NAME} = ${jobName} AND ${INFRA_MONITORING_ATTR_KEYS.K8S_NAMESPACE_NAME} = ${namespaceName}`;
+};
 
 export const k8sJobGetEntityName = (
 	item: InframonitoringtypesJobRecordDTO,
@@ -70,22 +63,18 @@ export const jobWidgetInfo = [
 	{
 		title: 'CPU usage',
 		yAxisUnit: '',
-		docPath: '/infrastructure-monitoring/kubernetes/jobs/#cpu-usage',
 	},
 	{
 		title: 'Memory Usage',
 		yAxisUnit: 'bytes',
-		docPath: '/infrastructure-monitoring/kubernetes/jobs/#memory-usage',
 	},
 	{
 		title: 'Network IO',
 		yAxisUnit: 'binBps',
-		docPath: '/infrastructure-monitoring/kubernetes/jobs/#network-io',
 	},
 	{
 		title: 'Network errors count',
 		yAxisUnit: '',
-		docPath: '/infrastructure-monitoring/kubernetes/jobs/#network-errors-count',
 	},
 ];
 
@@ -108,54 +97,10 @@ export const getJobMetricsQueryPayload = (
 		? 'k8s.pod.network.errors'
 		: 'k8s_pod_network_errors';
 	const k8sJobNameKey = dotMetricsEnabled ? 'k8s.job.name' : 'k8s_job_name';
-	const k8sClusterNameKey = dotMetricsEnabled
-		? 'k8s.cluster.name'
-		: 'k8s_cluster_name';
 	const k8sNamespaceNameKey = dotMetricsEnabled
 		? 'k8s.namespace.name'
 		: 'k8s_namespace_name';
 
-	const clusterName =
-		job.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_CLUSTER_NAME] ?? '';
-	const namespaceName =
-		job.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_NAMESPACE_NAME] ?? '';
-
-	const filters = [
-		{
-			id: 'f1',
-			key: {
-				dataType: DataTypes.String,
-				id: 'k8s_job_name--string--tag--false',
-				key: k8sJobNameKey,
-				type: 'tag',
-			},
-			op: '=',
-			value: job.jobName,
-		},
-		{
-			id: 'f2',
-			key: {
-				dataType: DataTypes.String,
-				id: 'k8s_cluster_name--string--tag--false',
-				key: k8sClusterNameKey,
-				type: 'tag',
-			},
-			op: '=',
-			value: clusterName,
-		},
-		{
-			id: 'f3',
-			key: {
-				dataType: DataTypes.String,
-				id: 'k8s_namespace_name--string--tag--false',
-				key: k8sNamespaceNameKey,
-				type: 'tag',
-			},
-			op: '=',
-			value: namespaceName,
-		},
-	];
-
 	return [
 		{
 			selectedTime: 'GLOBAL_TIME',
@@ -175,7 +120,31 @@ export const getJobMetricsQueryPayload = (
 							disabled: false,
 							expression: 'A',
 							filters: {
-								items: [...filters],
+								items: [
+									{
+										id: '6b59b690',
+										key: {
+											dataType: DataTypes.String,
+											id: 'k8s_job_name--string--tag--false',
+											key: k8sJobNameKey,
+											type: 'tag',
+										},
+										op: '=',
+										value: job.jobName,
+									},
+									{
+										id: '47b3adae',
+										key: {
+											dataType: DataTypes.String,
+											id: 'k8s_namespace_name--string--tag--false',
+											key: k8sNamespaceNameKey,
+											type: 'tag',
+										},
+										op: '=',
+										value:
+											job.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_NAMESPACE_NAME] ?? '',
+									},
+								],
 								op: 'AND',
 							},
 							functions: [],
@@ -236,7 +205,31 @@ export const getJobMetricsQueryPayload = (
 							disabled: false,
 							expression: 'A',
 							filters: {
-								items: [...filters],
+								items: [
+									{
+										id: '8c217f4d',
+										key: {
+											dataType: DataTypes.String,
+											id: 'k8s_job_name--string--tag--false',
+											key: k8sJobNameKey,
+											type: 'tag',
+										},
+										op: '=',
+										value: job.jobName,
+									},
+									{
+										id: '47b3adae',
+										key: {
+											dataType: DataTypes.String,
+											id: 'k8s_namespace_name--string--tag--false',
+											key: k8sNamespaceNameKey,
+											type: 'tag',
+										},
+										op: '=',
+										value:
+											job.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_NAMESPACE_NAME] ?? '',
+									},
+								],
 								op: 'AND',
 							},
 							functions: [],
@@ -297,7 +290,31 @@ export const getJobMetricsQueryPayload = (
 							disabled: false,
 							expression: 'A',
 							filters: {
-								items: [...filters],
+								items: [
+									{
+										id: '2bbf9d0c',
+										key: {
+											dataType: DataTypes.String,
+											id: 'k8s_job_name--string--tag--false',
+											key: k8sJobNameKey,
+											type: 'tag',
+										},
+										op: '=',
+										value: job.jobName,
+									},
+									{
+										id: '47b3adae',
+										key: {
+											dataType: DataTypes.String,
+											id: 'k8s_namespace_name--string--tag--false',
+											key: k8sNamespaceNameKey,
+											type: 'tag',
+										},
+										op: '=',
+										value:
+											job.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_NAMESPACE_NAME] ?? '',
+									},
+								],
 								op: 'AND',
 							},
 							functions: [],
@@ -371,7 +388,31 @@ export const getJobMetricsQueryPayload = (
 							disabled: false,
 							expression: 'A',
 							filters: {
-								items: [...filters],
+								items: [
+									{
+										id: '448e6cf7',
+										key: {
+											dataType: DataTypes.String,
+											id: 'k8s_job_name--string--tag--false',
+											key: k8sJobNameKey,
+											type: 'tag',
+										},
+										op: '=',
+										value: job.jobName,
+									},
+									{
+										id: '47b3adae',
+										key: {
+											dataType: DataTypes.String,
+											id: 'k8s_namespace_name--string--tag--false',
+											key: k8sNamespaceNameKey,
+											type: 'tag',
+										},
+										op: '=',
+										value:
+											job.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_NAMESPACE_NAME] ?? '',
+									},
+								],
 								op: 'AND',
 							},
 							functions: [],

frontend/src/container/InfraMonitoringK8sV2/Jobs/table.config.tsx

@@ -6,7 +6,6 @@ import { ExpandButtonWrapper } from 'container/InfraMonitoringK8sV2/components';
 import ColumnHeader from '../Base/ColumnHeader';
 import EntityGroupHeader from '../Base/EntityGroupHeader';
 import K8sGroupCell from '../Base/K8sGroupCell';
-import { SelectedItemParams } from '../hooks';
 import { formatBytes, getPodPhaseStatusItems } from '../commonUtils';
 import {
 	CellValueTooltip,
@@ -28,13 +27,8 @@ export function getK8sJobRowKey(job: InframonitoringtypesJobRecordDTO): string {
 
 export function getK8sJobItemKey(
 	job: InframonitoringtypesJobRecordDTO,
-): SelectedItemParams {
-	return {
-		selectedItem: job.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_JOB_NAME] ?? null,
-		clusterName: job.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_CLUSTER_NAME] ?? null,
-		namespaceName:
-			job.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_NAMESPACE_NAME] ?? null,
-	};
+): string {
+	return job.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_JOB_NAME] || '';
 }
 
 export type JobTableColumnConfig =
@@ -132,10 +126,10 @@ export const k8sJobsColumnsConfig: JobTableColumnConfig[] = [
 		},
 	},
 	{
-		id: 'completion',
+		id: 'completion_status',
 		header: (): React.ReactNode => (
-			<ColumnHeader docPath="/infrastructure-monitoring/kubernetes/jobs#completion">
-				Completions
+			<ColumnHeader docPath="/infrastructure-monitoring/kubernetes/jobs#completion-status">
+				Completion Status
 			</ColumnHeader>
 		),
 		accessorFn: (row): number => row.successfulPods,
@@ -155,7 +149,7 @@ export const k8sJobsColumnsConfig: JobTableColumnConfig[] = [
 					{
 						value: row.desiredSuccessfulPods,
 						label: 'Desired',
-						color: Color.BG_AMBER_500,
+						color: Color.BG_ROBIN_500,
 					},
 				]}
 			/>

frontend/src/container/InfraMonitoringK8sV2/Namespaces/K8sNamespacesList.tsx

@@ -1,26 +1,19 @@
 import { useCallback } from 'react';
-import { convertToApiError } from 'api/ErrorResponseHandlerForGeneratedAPIs';
 import { listNamespaces } from 'api/generated/services/inframonitoring';
-import { RenderErrorResponseDTO } from 'api/generated/services/sigNoz.schemas';
-import { AxiosError } from 'axios';
 import {
 	InframonitoringtypesNamespaceRecordDTO,
 	InframonitoringtypesResponseTypeDTO,
 	Querybuildertypesv5OrderDirectionDTO,
 } from 'api/generated/services/sigNoz.schemas';
 import { InfraMonitoringEvents } from 'constants/events';
-import APIError from 'types/api/error';
 
 import K8sBaseDetails, { K8sDetailsFilters } from '../Base/K8sBaseDetails';
 import { K8sBaseList } from '../Base/K8sBaseList';
 import { K8sBaseFilters } from '../Base/types';
 import { InfraMonitoringEntity } from '../constants';
-import { SelectedItemParams } from '../hooks';
 import {
 	getNamespaceMetricsQueryPayload,
-	k8sNamespaceDetailsCountsConfig,
 	k8sNamespaceDetailsMetadataConfig,
-	k8sNamespaceGetCountsFilterExpression,
 	k8sNamespaceGetEntityName,
 	k8sNamespaceGetSelectedItemExpression,
 	k8sNamespaceInitialEventsExpression,
@@ -74,12 +67,13 @@ function K8sNamespacesList({
 					warning: data.warning,
 				};
 			} catch (error) {
+				const errMsg =
+					error instanceof Error ? error.message : 'Failed to fetch namespaces';
 				return {
 					type: 'list' as const,
 					records: [] as InframonitoringtypesNamespaceRecordDTO[],
 					total: 0,
-					error:
-						convertToApiError(error as AxiosError<RenderErrorResponseDTO>) ?? null,
+					error: errMsg,
 				};
 			}
 		},
@@ -92,7 +86,7 @@ function K8sNamespacesList({
 			signal?: AbortSignal,
 		): Promise<{
 			data: InframonitoringtypesNamespaceRecordDTO | null;
-			error?: APIError | null;
+			error?: string | null;
 		}> => {
 			try {
 				const response = await listNamespaces(
@@ -110,10 +104,11 @@ function K8sNamespacesList({
 					data: response.data.records.length > 0 ? response.data.records[0] : null,
 				};
 			} catch (error) {
+				const errMsg =
+					error instanceof Error ? error.message : 'Failed to fetch namespace';
 				return {
 					data: null,
-					error:
-						convertToApiError(error as AxiosError<RenderErrorResponseDTO>) ?? null,
+					error: errMsg,
 				};
 			}
 		},
@@ -122,7 +117,7 @@ function K8sNamespacesList({
 
 	return (
 		<>
-			<K8sBaseList<InframonitoringtypesNamespaceRecordDTO, SelectedItemParams>
+			<K8sBaseList<InframonitoringtypesNamespaceRecordDTO>
 				controlListPrefix={controlListPrefix}
 				entity={InfraMonitoringEntity.NAMESPACES}
 				tableColumns={k8sNamespacesColumnsConfig}
@@ -141,8 +136,6 @@ function K8sNamespacesList({
 				getInitialLogTracesExpression={k8sNamespaceInitialLogTracesExpression}
 				getInitialEventsExpression={k8sNamespaceInitialEventsExpression}
 				metadataConfig={k8sNamespaceDetailsMetadataConfig}
-				countsConfig={k8sNamespaceDetailsCountsConfig}
-				getCountsFilterExpression={k8sNamespaceGetCountsFilterExpression}
 				entityWidgetInfo={namespaceWidgetInfo}
 				getEntityQueryPayload={getNamespaceMetricsQueryPayload}
 				queryKeyPrefix="namespace"

frontend/src/container/InfraMonitoringK8sV2/Namespaces/constants.ts

@@ -6,29 +6,14 @@ import { EQueryType } from 'types/common/dashboard';
 import { DataSource, ReduceOperators } from 'types/common/queryBuilder';
 import { v4 } from 'uuid';
 
-import {
-	K8sDetailsCountConfig,
-	K8sDetailsMetadataConfig,
-} from '../Base/K8sBaseDetails';
-import {
-	INFRA_MONITORING_ATTR_KEYS,
-	InfraMonitoringEntity,
-} from '../constants';
-import { SelectedItemParams } from '../hooks';
+import { K8sDetailsMetadataConfig } from '../Base/K8sBaseDetails';
 import { formatValueForExpression } from 'components/QueryBuilderV2/utils';
-import {
-	buildEventsExpression,
-	buildExpressionFromSelectedItemParams,
-	buildLogsTracesExpression,
-} from 'container/InfraMonitoringK8sV2/Base/utils';
+import { INFRA_MONITORING_ATTR_KEYS } from '../constants';
 
 export const k8sNamespaceGetSelectedItemExpression = (
-	params: SelectedItemParams,
+	selectedItemId: string,
 ): string =>
-	buildExpressionFromSelectedItemParams(
-		params,
-		INFRA_MONITORING_ATTR_KEYS.K8S_NAMESPACE_NAME,
-	);
+	`${INFRA_MONITORING_ATTR_KEYS.K8S_NAMESPACE_NAME} = ${formatValueForExpression(selectedItemId)}`;
 
 export const k8sNamespaceDetailsMetadataConfig: K8sDetailsMetadataConfig<InframonitoringtypesNamespaceRecordDTO>[] =
 	[
@@ -40,124 +25,64 @@ export const k8sNamespaceDetailsMetadataConfig: K8sDetailsMetadataConfig<Inframo
 		},
 	];
 
-export const k8sNamespaceDetailsCountsConfig: K8sDetailsCountConfig<InframonitoringtypesNamespaceRecordDTO>[] =
-	[
-		{
-			label: 'Deployments',
-			getValue: (p): number => p.counts?.deployments ?? 0,
-			targetCategory: InfraMonitoringEntity.DEPLOYMENTS,
-		},
-		{
-			label: 'StatefulSets',
-			getValue: (p): number => p.counts?.statefulSets ?? 0,
-			targetCategory: InfraMonitoringEntity.STATEFULSETS,
-		},
-		{
-			label: 'DaemonSets',
-			getValue: (p): number => p.counts?.daemonSets ?? 0,
-			targetCategory: InfraMonitoringEntity.DAEMONSETS,
-		},
-		{
-			label: 'Jobs',
-			getValue: (p): number => p.counts?.jobs ?? 0,
-			targetCategory: InfraMonitoringEntity.JOBS,
-		},
-	];
-
 export const k8sNamespaceInitialEventsExpression = (
 	item: InframonitoringtypesNamespaceRecordDTO,
-): string =>
-	buildEventsExpression({
-		objectKind: 'Namespace',
-		objectName: item.namespaceName || '',
-		clusterName: item.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_CLUSTER_NAME],
-	});
+): string => {
+	const name = formatValueForExpression(item.namespaceName || '');
+	return `${INFRA_MONITORING_ATTR_KEYS.K8S_OBJECT_KIND} = 'Namespace' AND ${INFRA_MONITORING_ATTR_KEYS.K8S_OBJECT_NAME} = ${name}`;
+};
 
 export const k8sNamespaceInitialLogTracesExpression = (
 	item: InframonitoringtypesNamespaceRecordDTO,
-): string =>
-	buildLogsTracesExpression({
-		mainAttributeKey: INFRA_MONITORING_ATTR_KEYS.K8S_NAMESPACE_NAME,
-		mainAttributeValue: item.namespaceName,
-		clusterName: item.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_CLUSTER_NAME],
-	});
+): string => {
+	const name = formatValueForExpression(item.namespaceName || '');
+	return `${INFRA_MONITORING_ATTR_KEYS.K8S_NAMESPACE_NAME} = ${name}`;
+};
 
 export const k8sNamespaceGetEntityName = (
 	item: InframonitoringtypesNamespaceRecordDTO,
 ): string => item.namespaceName || '';
 
-export const k8sNamespaceGetCountsFilterExpression = (
-	item: InframonitoringtypesNamespaceRecordDTO,
-): string => {
-	const clusterName = item.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_CLUSTER_NAME];
-	const clauses: string[] = [];
-
-	if (clusterName) {
-		clauses.push(
-			`${INFRA_MONITORING_ATTR_KEYS.K8S_CLUSTER_NAME} = ${formatValueForExpression(clusterName)}`,
-		);
-	}
-	if (item.namespaceName) {
-		clauses.push(
-			`${INFRA_MONITORING_ATTR_KEYS.K8S_NAMESPACE_NAME} = ${formatValueForExpression(item.namespaceName)}`,
-		);
-	}
-
-	return clauses.join(' AND ');
-};
-
 export const namespaceWidgetInfo = [
 	{
 		title: 'CPU Usage (cores)',
 		yAxisUnit: '',
-		docPath: '/infrastructure-monitoring/kubernetes/namespaces/#cpu-usage-cores',
 	},
 	{
 		title: 'Memory Usage (bytes)',
 		yAxisUnit: 'bytes',
-		docPath:
-			'/infrastructure-monitoring/kubernetes/namespaces/#memory-usage-bytes',
 	},
 	{
 		title: 'Pods CPU (top 10)',
 		yAxisUnit: '',
-		docPath: '/infrastructure-monitoring/kubernetes/namespaces/#pods-cpu-top-10',
 	},
 	{
 		title: 'Pods Memory (top 10)',
 		yAxisUnit: 'bytes',
-		docPath:
-			'/infrastructure-monitoring/kubernetes/namespaces/#pods-memory-top-10',
 	},
 	{
 		title: 'Network rate',
 		yAxisUnit: 'binBps',
-		docPath: '/infrastructure-monitoring/kubernetes/namespaces/#network-rate',
 	},
 	{
 		title: 'Network errors',
 		yAxisUnit: '',
-		docPath: '/infrastructure-monitoring/kubernetes/namespaces/#network-errors',
 	},
 	{
-		title: 'StatefulSets (pods)',
+		title: 'StatefulSets',
 		yAxisUnit: '',
-		docPath: '/infrastructure-monitoring/kubernetes/namespaces/#statefulsets',
 	},
 	{
-		title: 'ReplicaSets (pods)',
+		title: 'ReplicaSets',
 		yAxisUnit: '',
-		docPath: '/infrastructure-monitoring/kubernetes/namespaces/#replicasets',
 	},
 	{
-		title: 'DaemonSets (nodes)',
+		title: 'DaemonSets',
 		yAxisUnit: '',
-		docPath: '/infrastructure-monitoring/kubernetes/namespaces/#daemonsets',
 	},
 	{
-		title: 'Deployments (pods)',
+		title: 'Deployments',
 		yAxisUnit: '',
-		docPath: '/infrastructure-monitoring/kubernetes/namespaces/#deployments',
 	},
 ];
 
@@ -254,24 +179,6 @@ export const getNamespaceMetricsQueryPayload = (
 		'k8s.deployment.name',
 		'k8s_deployment_name',
 	);
-	const k8sClusterNameKey = getKey('k8s.cluster.name', 'k8s_cluster_name');
-
-	const clusterName =
-		namespace.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_CLUSTER_NAME] ?? '';
-
-	const filters = [
-		{
-			id: 'f1',
-			key: {
-				dataType: DataTypes.String,
-				id: 'k8s_cluster_name--string--tag--false',
-				key: k8sClusterNameKey,
-				type: 'tag',
-			},
-			op: '=',
-			value: clusterName,
-		},
-	];
 
 	return [
 		{
@@ -304,7 +211,6 @@ export const getNamespaceMetricsQueryPayload = (
 										op: '=',
 										value: namespace.namespaceName,
 									},
-									...filters,
 								],
 								op: 'AND',
 							},
@@ -344,7 +250,6 @@ export const getNamespaceMetricsQueryPayload = (
 										op: '=',
 										value: namespace.namespaceName,
 									},
-									...filters,
 								],
 								op: 'AND',
 							},
@@ -384,7 +289,6 @@ export const getNamespaceMetricsQueryPayload = (
 										op: '=',
 										value: namespace.namespaceName,
 									},
-									...filters,
 								],
 								op: 'AND',
 							},
@@ -424,7 +328,6 @@ export const getNamespaceMetricsQueryPayload = (
 										op: '=',
 										value: namespace.namespaceName,
 									},
-									...filters,
 								],
 								op: 'AND',
 							},
@@ -498,7 +401,6 @@ export const getNamespaceMetricsQueryPayload = (
 										op: '=',
 										value: namespace.namespaceName,
 									},
-									...filters,
 								],
 								op: 'AND',
 							},
@@ -538,7 +440,6 @@ export const getNamespaceMetricsQueryPayload = (
 										op: '=',
 										value: namespace.namespaceName,
 									},
-									...filters,
 								],
 								op: 'AND',
 							},
@@ -578,7 +479,6 @@ export const getNamespaceMetricsQueryPayload = (
 										op: '=',
 										value: namespace.namespaceName,
 									},
-									...filters,
 								],
 								op: 'AND',
 							},
@@ -618,7 +518,6 @@ export const getNamespaceMetricsQueryPayload = (
 										op: '=',
 										value: namespace.namespaceName,
 									},
-									...filters,
 								],
 								op: 'AND',
 							},
@@ -658,7 +557,6 @@ export const getNamespaceMetricsQueryPayload = (
 										op: '=',
 										value: namespace.namespaceName,
 									},
-									...filters,
 								],
 								op: 'AND',
 							},
@@ -698,7 +596,6 @@ export const getNamespaceMetricsQueryPayload = (
 										op: '=',
 										value: namespace.namespaceName,
 									},
-									...filters,
 								],
 								op: 'AND',
 							},
@@ -772,7 +669,6 @@ export const getNamespaceMetricsQueryPayload = (
 										op: '=',
 										value: namespace.namespaceName,
 									},
-									...filters,
 								],
 								op: 'AND',
 							},
@@ -853,7 +749,6 @@ export const getNamespaceMetricsQueryPayload = (
 										op: '=',
 										value: namespace.namespaceName,
 									},
-									...filters,
 								],
 								op: 'AND',
 							},
@@ -934,7 +829,6 @@ export const getNamespaceMetricsQueryPayload = (
 										op: '=',
 										value: namespace.namespaceName,
 									},
-									...filters,
 								],
 								op: 'AND',
 							},
@@ -1021,7 +915,6 @@ export const getNamespaceMetricsQueryPayload = (
 										op: '=',
 										value: namespace.namespaceName,
 									},
-									...filters,
 								],
 								op: 'AND',
 							},
@@ -1108,7 +1001,6 @@ export const getNamespaceMetricsQueryPayload = (
 										op: '=',
 										value: namespace.namespaceName,
 									},
-									...filters,
 								],
 								op: 'AND',
 							},
@@ -1155,7 +1047,6 @@ export const getNamespaceMetricsQueryPayload = (
 										op: '=',
 										value: namespace.namespaceName,
 									},
-									...filters,
 								],
 								op: 'AND',
 							},
@@ -1202,7 +1093,6 @@ export const getNamespaceMetricsQueryPayload = (
 										op: '=',
 										value: namespace.namespaceName,
 									},
-									...filters,
 								],
 								op: 'AND',
 							},
@@ -1283,7 +1173,6 @@ export const getNamespaceMetricsQueryPayload = (
 										op: '=',
 										value: namespace.namespaceName,
 									},
-									...filters,
 								],
 								op: 'AND',
 							},
@@ -1336,7 +1225,6 @@ export const getNamespaceMetricsQueryPayload = (
 										op: '=',
 										value: namespace.namespaceName,
 									},
-									...filters,
 								],
 								op: 'AND',
 							},
@@ -1423,7 +1311,6 @@ export const getNamespaceMetricsQueryPayload = (
 										op: '=',
 										value: namespace.namespaceName,
 									},
-									...filters,
 								],
 								op: 'AND',
 							},
@@ -1470,7 +1357,6 @@ export const getNamespaceMetricsQueryPayload = (
 										op: '=',
 										value: namespace.namespaceName,
 									},
-									...filters,
 								],
 								op: 'AND',
 							},
@@ -1517,7 +1403,6 @@ export const getNamespaceMetricsQueryPayload = (
 										op: '=',
 										value: namespace.namespaceName,
 									},
-									...filters,
 								],
 								op: 'AND',
 							},
@@ -1564,7 +1449,6 @@ export const getNamespaceMetricsQueryPayload = (
 										op: '=',
 										value: namespace.namespaceName,
 									},
-									...filters,
 								],
 								op: 'AND',
 							},
@@ -1645,7 +1529,6 @@ export const getNamespaceMetricsQueryPayload = (
 										op: '=',
 										value: namespace.namespaceName,
 									},
-									...filters,
 								],
 								op: 'AND',
 							},
@@ -1692,7 +1575,6 @@ export const getNamespaceMetricsQueryPayload = (
 										op: '=',
 										value: namespace.namespaceName,
 									},
-									...filters,
 								],
 								op: 'AND',
 							},

frontend/src/container/InfraMonitoringK8sV2/Namespaces/table.config.tsx

@@ -16,7 +16,6 @@ import {
 	INFRA_MONITORING_ATTR_KEYS,
 	InfraMonitoringEntity,
 } from '../constants';
-import { SelectedItemParams } from '../hooks';
 
 export function getK8sNamespaceRowKey(
 	namespace: InframonitoringtypesNamespaceRecordDTO,
@@ -30,15 +29,8 @@ export function getK8sNamespaceRowKey(
 
 export function getK8sNamespaceItemKey(
 	namespace: InframonitoringtypesNamespaceRecordDTO,
-): SelectedItemParams {
-	return {
-		selectedItem:
-			namespace.namespaceName ??
-			namespace.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_NAMESPACE_NAME] ??
-			null,
-		clusterName:
-			namespace.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_CLUSTER_NAME] ?? null,
-	};
+): string {
+	return namespace.namespaceName;
 }
 
 export type NamespaceTableColumnConfig =

frontend/src/container/InfraMonitoringK8sV2/Nodes/K8sNodesList.tsx

@@ -1,15 +1,11 @@
 import { useCallback } from 'react';
-import { convertToApiError } from 'api/ErrorResponseHandlerForGeneratedAPIs';
 import { listNodes } from 'api/generated/services/inframonitoring';
-import { RenderErrorResponseDTO } from 'api/generated/services/sigNoz.schemas';
-import { AxiosError } from 'axios';
 import {
 	InframonitoringtypesNodeRecordDTO,
 	InframonitoringtypesResponseTypeDTO,
 	Querybuildertypesv5OrderDirectionDTO,
 } from 'api/generated/services/sigNoz.schemas';
 import { InfraMonitoringEvents } from 'constants/events';
-import APIError from 'types/api/error';
 
 import K8sBaseDetails, { K8sDetailsFilters } from '../Base/K8sBaseDetails';
 import { K8sBaseList } from '../Base/K8sBaseList';
@@ -71,12 +67,13 @@ function K8sNodesList({
 					warning: data.warning,
 				};
 			} catch (error) {
+				const errMsg =
+					error instanceof Error ? error.message : 'Failed to fetch nodes';
 				return {
 					type: 'list' as const,
 					records: [] as InframonitoringtypesNodeRecordDTO[],
 					total: 0,
-					error:
-						convertToApiError(error as AxiosError<RenderErrorResponseDTO>) ?? null,
+					error: errMsg,
 				};
 			}
 		},
@@ -89,7 +86,7 @@ function K8sNodesList({
 			signal?: AbortSignal,
 		): Promise<{
 			data: InframonitoringtypesNodeRecordDTO | null;
-			error?: APIError | null;
+			error?: string | null;
 		}> => {
 			try {
 				const response = await listNodes(
@@ -107,10 +104,11 @@ function K8sNodesList({
 					data: response.data.records.length > 0 ? response.data.records[0] : null,
 				};
 			} catch (error) {
+				const errMsg =
+					error instanceof Error ? error.message : 'Failed to fetch node';
 				return {
 					data: null,
-					error:
-						convertToApiError(error as AxiosError<RenderErrorResponseDTO>) ?? null,
+					error: errMsg,
 				};
 			}
 		},

frontend/src/container/InfraMonitoringK8sV2/Nodes/constants.ts

@@ -7,19 +7,13 @@ import { DataSource, ReduceOperators } from 'types/common/queryBuilder';
 import { v4 } from 'uuid';
 
 import { formatValueForExpression } from 'components/QueryBuilderV2/utils';
-import {
-	buildEventsExpression,
-	buildLogsTracesExpression,
-} from 'container/InfraMonitoringK8sV2/Base/utils';
 
 import { K8sDetailsMetadataConfig } from '../Base/K8sBaseDetails';
 import { INFRA_MONITORING_ATTR_KEYS } from '../constants';
-import { SelectedItemParams } from '../hooks';
 
 export const k8sNodeGetSelectedItemExpression = (
-	params: SelectedItemParams,
-): string =>
-	`k8s.node.name = ${formatValueForExpression(params.selectedItem ?? '')}`;
+	selectedItemId: string,
+): string => `k8s.node.name = ${formatValueForExpression(selectedItemId)}`;
 
 export const k8sNodeDetailsMetadataConfig: K8sDetailsMetadataConfig<InframonitoringtypesNodeRecordDTO>[] =
 	[
@@ -34,20 +28,12 @@ export const k8sNodeDetailsMetadataConfig: K8sDetailsMetadataConfig<Inframonitor
 export const k8sNodeInitialEventsExpression = (
 	item: InframonitoringtypesNodeRecordDTO,
 ): string =>
-	buildEventsExpression({
-		objectKind: 'Node',
-		objectName: item.nodeName || '',
-		clusterName: item.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_CLUSTER_NAME],
-	});
+	`${INFRA_MONITORING_ATTR_KEYS.K8S_OBJECT_KIND} = 'Node' AND ${INFRA_MONITORING_ATTR_KEYS.K8S_OBJECT_NAME} = ${formatValueForExpression(item.nodeName || '')}`;
 
 export const k8sNodeInitialLogTracesExpression = (
 	item: InframonitoringtypesNodeRecordDTO,
 ): string =>
-	buildLogsTracesExpression({
-		mainAttributeKey: INFRA_MONITORING_ATTR_KEYS.K8S_NODE_NAME,
-		mainAttributeValue: item.nodeName,
-		clusterName: item.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_CLUSTER_NAME],
-	});
+	`${INFRA_MONITORING_ATTR_KEYS.K8S_NODE_NAME} = ${formatValueForExpression(item.nodeName || '')} AND ${INFRA_MONITORING_ATTR_KEYS.K8S_CLUSTER_NAME} = ${formatValueForExpression(item.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_CLUSTER_NAME] || '')}`;
 
 export const k8sNodeGetEntityName = (
 	item: InframonitoringtypesNodeRecordDTO,
@@ -57,53 +43,42 @@ export const nodeWidgetInfo = [
 	{
 		title: 'CPU Usage (cores)',
 		yAxisUnit: '',
-		docPath: '/infrastructure-monitoring/kubernetes/nodes/#cpu-usage-cores',
 	},
 	{
 		title: 'Memory Usage (bytes)',
 		yAxisUnit: 'bytes',
-		docPath: '/infrastructure-monitoring/kubernetes/nodes/#memory-usage-bytes',
 	},
 	{
 		title: 'CPU Usage (%)',
 		yAxisUnit: 'percentunit',
-		docPath: '/infrastructure-monitoring/kubernetes/nodes/#cpu-usage-',
 	},
 	{
 		title: 'Memory Usage (%)',
 		yAxisUnit: 'percentunit',
-		docPath: '/infrastructure-monitoring/kubernetes/nodes/#memory-usage-',
 	},
 	{
 		title: 'Pods by CPU (top 10)',
 		yAxisUnit: '',
-		docPath: '/infrastructure-monitoring/kubernetes/nodes/#pods-by-cpu-top-10',
 	},
 	{
 		title: 'Pods by Memory (top 10)',
 		yAxisUnit: 'bytes',
-		docPath: '/infrastructure-monitoring/kubernetes/nodes/#pods-by-memory-top-10',
 	},
 	{
 		title: 'Network error count',
 		yAxisUnit: '',
-		docPath: '/infrastructure-monitoring/kubernetes/nodes/#network-error-count',
 	},
 	{
 		title: 'Network IO rate',
 		yAxisUnit: 'binBps',
-		docPath: '/infrastructure-monitoring/kubernetes/nodes/#network-io-rate',
 	},
 	{
 		title: 'Filesystem usage (bytes)',
 		yAxisUnit: 'bytes',
-		docPath:
-			'/infrastructure-monitoring/kubernetes/nodes/#filesystem-usage-bytes',
 	},
 	{
 		title: 'Filesystem usage (%)',
 		yAxisUnit: 'percentunit',
-		docPath: '/infrastructure-monitoring/kubernetes/nodes/#filesystem-usage-',
 	},
 ];
 

frontend/src/container/InfraMonitoringK8sV2/Pods/K8sPodLists.tsx

@@ -1,15 +1,11 @@
 import { useCallback } from 'react';
-import { convertToApiError } from 'api/ErrorResponseHandlerForGeneratedAPIs';
 import { listPods } from 'api/generated/services/inframonitoring';
-import { RenderErrorResponseDTO } from 'api/generated/services/sigNoz.schemas';
-import { AxiosError } from 'axios';
 import {
 	InframonitoringtypesPodRecordDTO,
 	InframonitoringtypesResponseTypeDTO,
 	Querybuildertypesv5OrderDirectionDTO,
 } from 'api/generated/services/sigNoz.schemas';
 import { InfraMonitoringEvents } from 'constants/events';
-import APIError from 'types/api/error';
 
 import K8sBaseDetails, { K8sDetailsFilters } from '../Base/K8sBaseDetails';
 import { K8sBaseList } from '../Base/K8sBaseList';
@@ -71,12 +67,13 @@ function K8sPodsList({
 					warning: data.warning,
 				};
 			} catch (error) {
+				const errMsg =
+					error instanceof Error ? error.message : 'Failed to fetch pods';
 				return {
 					type: 'list' as const,
 					records: [] as InframonitoringtypesPodRecordDTO[],
 					total: 0,
-					error:
-						convertToApiError(error as AxiosError<RenderErrorResponseDTO>) ?? null,
+					error: errMsg,
 				};
 			}
 		},
@@ -89,7 +86,7 @@ function K8sPodsList({
 			signal?: AbortSignal,
 		): Promise<{
 			data: InframonitoringtypesPodRecordDTO | null;
-			error?: APIError | null;
+			error?: string | null;
 		}> => {
 			try {
 				const response = await listPods(
@@ -107,10 +104,11 @@ function K8sPodsList({
 					data: response.data.records.length > 0 ? response.data.records[0] : null,
 				};
 			} catch (error) {
+				const errMsg =
+					error instanceof Error ? error.message : 'Failed to fetch pod';
 				return {
 					data: null,
-					error:
-						convertToApiError(error as AxiosError<RenderErrorResponseDTO>) ?? null,
+					error: errMsg,
 				};
 			}
 		},

frontend/src/container/InfraMonitoringK8sV2/Pods/constants.ts

@@ -8,17 +8,11 @@ import { v4 } from 'uuid';
 
 import { K8sDetailsMetadataConfig } from '../Base/K8sBaseDetails';
 import { formatValueForExpression } from 'components/QueryBuilderV2/utils';
-import {
-	buildEventsExpression,
-	buildLogsTracesExpression,
-} from 'container/InfraMonitoringK8sV2/Base/utils';
 import { INFRA_MONITORING_ATTR_KEYS } from '../constants';
-import { SelectedItemParams } from '../hooks';
 
 export const k8sPodGetSelectedItemExpression = (
-	params: SelectedItemParams,
-): string =>
-	`k8s.pod.uid = ${formatValueForExpression(params.selectedItem ?? '')}`;
+	selectedItemId: string,
+): string => `k8s.pod.uid = ${formatValueForExpression(selectedItemId)}`;
 
 export const k8sPodDetailsMetadataConfig: K8sDetailsMetadataConfig<InframonitoringtypesPodRecordDTO>[] =
 	[
@@ -41,23 +35,21 @@ export const k8sPodDetailsMetadataConfig: K8sDetailsMetadataConfig<Inframonitori
 
 export const k8sPodInitialEventsExpression = (
 	pod: InframonitoringtypesPodRecordDTO,
-): string =>
-	buildEventsExpression({
-		objectKind: 'Pod',
-		objectName: pod.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_POD_NAME] || '',
-		clusterName: pod.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_CLUSTER_NAME],
-		namespaceName: pod.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_NAMESPACE_NAME],
-	});
+): string => {
+	const podName = formatValueForExpression(
+		pod.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_POD_NAME] || '',
+	);
+	return `${INFRA_MONITORING_ATTR_KEYS.K8S_OBJECT_KIND} = 'Pod' AND ${INFRA_MONITORING_ATTR_KEYS.K8S_OBJECT_NAME} = ${podName}`;
+};
 
 export const k8sPodInitialLogTracesExpression = (
 	pod: InframonitoringtypesPodRecordDTO,
-): string =>
-	buildLogsTracesExpression({
-		mainAttributeKey: INFRA_MONITORING_ATTR_KEYS.K8S_POD_NAME,
-		mainAttributeValue: pod.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_POD_NAME],
-		clusterName: pod.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_CLUSTER_NAME],
-		namespaceName: pod.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_NAMESPACE_NAME],
-	});
+): string => {
+	const podName = formatValueForExpression(
+		pod.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_POD_NAME] || '',
+	);
+	return `${INFRA_MONITORING_ATTR_KEYS.K8S_POD_NAME} = ${podName}`;
+};
 
 export const k8sPodGetEntityName = (
 	pod: InframonitoringtypesPodRecordDTO,
@@ -67,74 +59,54 @@ export const podWidgetInfo = [
 	{
 		title: 'CPU Usage (cores)',
 		yAxisUnit: '',
-		docPath: '/infrastructure-monitoring/kubernetes/pods/#cpu-usage-cores-1',
 	},
 	{
 		title: 'CPU Request, Limit Utilization',
 		yAxisUnit: 'percentunit',
-		docPath:
-			'/infrastructure-monitoring/kubernetes/pods/#cpu-request-limit-utilization',
 	},
 	{
 		title: 'Memory Usage (bytes)',
 		yAxisUnit: 'bytes',
-		docPath: '/infrastructure-monitoring/kubernetes/pods/#memory-usage-bytes',
 	},
 	{
 		title: 'Memory Request, Limit Utilization',
 		yAxisUnit: 'percentunit',
-		docPath:
-			'/infrastructure-monitoring/kubernetes/pods/#memory-request-limit-utilization',
 	},
 	{
 		title: 'Memory by State',
 		yAxisUnit: 'bytes',
-		docPath: '/infrastructure-monitoring/kubernetes/pods/#memory-by-state',
 	},
 	{
 		title: 'Memory Major Page Faults',
 		yAxisUnit: '',
-		docPath:
-			'/infrastructure-monitoring/kubernetes/pods/#memory-major-page-faults',
 	},
 	{
 		title: 'CPU Usage by Container (cores)',
 		yAxisUnit: '',
-		docPath:
-			'/infrastructure-monitoring/kubernetes/pods/#cpu-usage-by-container-cores',
 	},
 	{
 		title: 'CPU Request, Limit Utilization by Container',
 		yAxisUnit: 'percentunit',
-		docPath:
-			'/infrastructure-monitoring/kubernetes/pods/#cpu-request-limit-utilization-by-container',
 	},
 	{
 		title: 'Memory Usage by Container (bytes)',
 		yAxisUnit: 'bytes',
-		docPath:
-			'/infrastructure-monitoring/kubernetes/pods/#memory-usage-by-container-bytes',
 	},
 	{
 		title: 'Memory Request, Limit Utilization by Container',
 		yAxisUnit: 'percentunit',
-		docPath:
-			'/infrastructure-monitoring/kubernetes/pods/#memory-request-limit-utilization-by-container',
 	},
 	{
 		title: 'Network rate',
 		yAxisUnit: 'binBps',
-		docPath: '/infrastructure-monitoring/kubernetes/pods/#network-rate',
 	},
 	{
 		title: 'Network errors',
 		yAxisUnit: '',
-		docPath: '/infrastructure-monitoring/kubernetes/pods/#network-errors',
 	},
 	{
 		title: 'File system (bytes)',
 		yAxisUnit: 'bytes',
-		docPath: '/infrastructure-monitoring/kubernetes/pods/#file-system-bytes',
 	},
 ];
 

frontend/src/container/InfraMonitoringK8sV2/Pods/table.config.tsx

@@ -152,11 +152,7 @@ export const k8sPodColumnsConfig: PodTableColumnConfig[] = [
 	},
 	{
 		id: 'podAge',
-		header: (): React.ReactNode => (
-			<ColumnHeader docPath="/infrastructure-monitoring/kubernetes/pods#age">
-				Age
-			</ColumnHeader>
-		),
+		header: 'Age',
 		accessorFn: (row): number => row.podAge,
 		width: { min: 100 },
 		enableSort: false,
@@ -320,11 +316,7 @@ export const k8sPodColumnsConfig: PodTableColumnConfig[] = [
 	},
 	{
 		id: 'namespace',
-		header: (): React.ReactNode => (
-			<ColumnHeader docPath="/infrastructure-monitoring/kubernetes/pods#additional-columns">
-				Namespace
-			</ColumnHeader>
-		),
+		header: 'Namespace',
 		accessorFn: (row): string =>
 			row.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_NAMESPACE_NAME] || '',
 		width: { default: 100 },
@@ -336,11 +328,7 @@ export const k8sPodColumnsConfig: PodTableColumnConfig[] = [
 	},
 	{
 		id: 'node',
-		header: (): React.ReactNode => (
-			<ColumnHeader docPath="/infrastructure-monitoring/kubernetes/pods#additional-columns">
-				Node
-			</ColumnHeader>
-		),
+		header: 'Node',
 		accessorFn: (row): string =>
 			row.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_NODE_NAME] || '',
 		width: { default: 100 },
@@ -352,11 +340,7 @@ export const k8sPodColumnsConfig: PodTableColumnConfig[] = [
 	},
 	{
 		id: 'cluster',
-		header: (): React.ReactNode => (
-			<ColumnHeader docPath="/infrastructure-monitoring/kubernetes/pods#additional-columns">
-				Cluster
-			</ColumnHeader>
-		),
+		header: 'Cluster',
 		accessorFn: (row): string =>
 			row.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_CLUSTER_NAME] || '',
 		width: { default: 100 },

frontend/src/container/InfraMonitoringK8sV2/StatefulSets/K8sStatefulSetsList.tsx

@@ -1,21 +1,16 @@
 import { useCallback } from 'react';
-import { convertToApiError } from 'api/ErrorResponseHandlerForGeneratedAPIs';
 import { listStatefulSets } from 'api/generated/services/inframonitoring';
-import { RenderErrorResponseDTO } from 'api/generated/services/sigNoz.schemas';
-import { AxiosError } from 'axios';
 import {
 	InframonitoringtypesResponseTypeDTO,
 	InframonitoringtypesStatefulSetRecordDTO,
 	Querybuildertypesv5OrderDirectionDTO,
 } from 'api/generated/services/sigNoz.schemas';
 import { InfraMonitoringEvents } from 'constants/events';
-import APIError from 'types/api/error';
 
 import K8sBaseDetails, { K8sDetailsFilters } from '../Base/K8sBaseDetails';
 import { K8sBaseList } from '../Base/K8sBaseList';
 import { K8sBaseFilters } from '../Base/types';
 import { InfraMonitoringEntity } from '../constants';
-import { SelectedItemParams } from '../hooks';
 import {
 	getStatefulSetMetricsQueryPayload,
 	k8sStatefulSetDetailsMetadataConfig,
@@ -72,12 +67,13 @@ function K8sStatefulSetsList({
 					warning: data.warning,
 				};
 			} catch (error) {
+				const errMsg =
+					error instanceof Error ? error.message : 'Failed to fetch statefulsets';
 				return {
 					type: 'list' as const,
 					records: [] as InframonitoringtypesStatefulSetRecordDTO[],
 					total: 0,
-					error:
-						convertToApiError(error as AxiosError<RenderErrorResponseDTO>) ?? null,
+					error: errMsg,
 				};
 			}
 		},
@@ -90,7 +86,7 @@ function K8sStatefulSetsList({
 			signal?: AbortSignal,
 		): Promise<{
 			data: InframonitoringtypesStatefulSetRecordDTO | null;
-			error?: APIError | null;
+			error?: string | null;
 		}> => {
 			try {
 				const response = await listStatefulSets(
@@ -108,10 +104,11 @@ function K8sStatefulSetsList({
 					data: response.data.records.length > 0 ? response.data.records[0] : null,
 				};
 			} catch (error) {
+				const errMsg =
+					error instanceof Error ? error.message : 'Failed to fetch statefulset';
 				return {
 					data: null,
-					error:
-						convertToApiError(error as AxiosError<RenderErrorResponseDTO>) ?? null,
+					error: errMsg,
 				};
 			}
 		},
@@ -120,7 +117,7 @@ function K8sStatefulSetsList({
 
 	return (
 		<>
-			<K8sBaseList<InframonitoringtypesStatefulSetRecordDTO, SelectedItemParams>
+			<K8sBaseList<InframonitoringtypesStatefulSetRecordDTO>
 				controlListPrefix={controlListPrefix}
 				entity={InfraMonitoringEntity.STATEFULSETS}
 				tableColumns={k8sStatefulSetsColumnsConfig}

frontend/src/container/InfraMonitoringK8sV2/StatefulSets/constants.ts

@@ -7,21 +7,13 @@ import { DataSource, ReduceOperators } from 'types/common/queryBuilder';
 import { v4 } from 'uuid';
 
 import { K8sDetailsMetadataConfig } from '../Base/K8sBaseDetails';
+import { formatValueForExpression } from 'components/QueryBuilderV2/utils';
 import { INFRA_MONITORING_ATTR_KEYS } from '../constants';
-import { SelectedItemParams } from '../hooks';
-import {
-	buildEventsExpression,
-	buildExpressionFromSelectedItemParams,
-	buildLogsTracesExpression,
-} from 'container/InfraMonitoringK8sV2/Base/utils';
 
 export const k8sStatefulSetGetSelectedItemExpression = (
-	params: SelectedItemParams,
+	selectedItemId: string,
 ): string =>
-	buildExpressionFromSelectedItemParams(
-		params,
-		INFRA_MONITORING_ATTR_KEYS.K8S_STATEFULSET_NAME,
-	);
+	`${INFRA_MONITORING_ATTR_KEYS.K8S_STATEFULSET_NAME} = ${formatValueForExpression(selectedItemId)}`;
 
 export const k8sStatefulSetDetailsMetadataConfig: K8sDetailsMetadataConfig<InframonitoringtypesStatefulSetRecordDTO>[] =
 	[
@@ -30,11 +22,6 @@ export const k8sStatefulSetDetailsMetadataConfig: K8sDetailsMetadataConfig<Infra
 			getValue: (p): string =>
 				p.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_STATEFULSET_NAME] ?? '',
 		},
-		{
-			label: 'Cluster Name',
-			getValue: (p): string =>
-				p.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_CLUSTER_NAME] ?? '',
-		},
 		{
 			label: 'Namespace Name',
 			getValue: (p): string =>
@@ -44,25 +31,24 @@ export const k8sStatefulSetDetailsMetadataConfig: K8sDetailsMetadataConfig<Infra
 
 export const k8sStatefulSetInitialEventsExpression = (
 	item: InframonitoringtypesStatefulSetRecordDTO,
-): string =>
-	buildEventsExpression({
-		objectKind: 'StatefulSet',
-		objectName:
-			item.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_STATEFULSET_NAME] ?? '',
-		clusterName: item.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_CLUSTER_NAME],
-		namespaceName: item.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_NAMESPACE_NAME],
-	});
+): string => {
+	const objectName = formatValueForExpression(
+		item.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_STATEFULSET_NAME] ?? '',
+	);
+	return `${INFRA_MONITORING_ATTR_KEYS.K8S_OBJECT_KIND} = 'StatefulSet' AND ${INFRA_MONITORING_ATTR_KEYS.K8S_OBJECT_NAME} = ${objectName}`;
+};
 
 export const k8sStatefulSetInitialLogTracesExpression = (
 	item: InframonitoringtypesStatefulSetRecordDTO,
-): string =>
-	buildLogsTracesExpression({
-		mainAttributeKey: INFRA_MONITORING_ATTR_KEYS.K8S_STATEFULSET_NAME,
-		mainAttributeValue:
-			item.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_STATEFULSET_NAME],
-		clusterName: item.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_CLUSTER_NAME],
-		namespaceName: item.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_NAMESPACE_NAME],
-	});
+): string => {
+	const statefulSetName = formatValueForExpression(
+		item.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_STATEFULSET_NAME] ?? '',
+	);
+	const namespaceName = formatValueForExpression(
+		item.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_NAMESPACE_NAME] ?? '',
+	);
+	return `${INFRA_MONITORING_ATTR_KEYS.K8S_STATEFULSET_NAME} = ${statefulSetName} AND ${INFRA_MONITORING_ATTR_KEYS.K8S_NAMESPACE_NAME} = ${namespaceName}`;
+};
 
 export const k8sStatefulSetGetEntityName = (
 	item: InframonitoringtypesStatefulSetRecordDTO,
@@ -72,37 +58,26 @@ export const statefulSetWidgetInfo = [
 	{
 		title: 'CPU usage, request, limits',
 		yAxisUnit: '',
-		docPath:
-			'/infrastructure-monitoring/kubernetes/statefulsets/#cpu-usage-request-limits',
 	},
 	{
 		title: 'CPU request, limit util (%)',
 		yAxisUnit: 'percentunit',
-		docPath:
-			'/infrastructure-monitoring/kubernetes/statefulsets/#cpu-request-limit-utilization-',
 	},
 	{
 		title: 'Memory usage, request, limits',
 		yAxisUnit: 'bytes',
-		docPath:
-			'/infrastructure-monitoring/kubernetes/statefulsets/#memory-usage-request-limits',
 	},
 	{
 		title: 'Memory request, limit util (%)',
 		yAxisUnit: 'percentunit',
-		docPath:
-			'/infrastructure-monitoring/kubernetes/statefulsets/#memory-request-limit-utilization-',
 	},
 	{
 		title: 'Network IO',
 		yAxisUnit: 'binBps',
-		docPath: '/infrastructure-monitoring/kubernetes/statefulsets/#network-io',
 	},
 	{
 		title: 'Network errors count',
 		yAxisUnit: '',
-		docPath:
-			'/infrastructure-monitoring/kubernetes/statefulsets/#network-errors-count',
 	},
 ];
 
@@ -118,42 +93,7 @@ export const getStatefulSetMetricsQueryPayload = (
 	const k8sNamespaceNameKey = dotMetricsEnabled
 		? INFRA_MONITORING_ATTR_KEYS.K8S_NAMESPACE_NAME
 		: 'k8s_namespace_name';
-	const k8sPodNameKey = dotMetricsEnabled
-		? INFRA_MONITORING_ATTR_KEYS.K8S_POD_NAME
-		: 'k8s_pod_name';
-	const k8sClusterNameKey = dotMetricsEnabled
-		? INFRA_MONITORING_ATTR_KEYS.K8S_CLUSTER_NAME
-		: 'k8s_cluster_name';
-
-	const clusterName =
-		statefulSet.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_CLUSTER_NAME] ?? '';
-	const namespaceName =
-		statefulSet.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_NAMESPACE_NAME] ?? '';
-
-	const filters = [
-		{
-			id: 'f2',
-			key: {
-				dataType: DataTypes.String,
-				id: 'k8s_namespace_name--string--tag--false',
-				key: k8sNamespaceNameKey,
-				type: 'tag',
-			},
-			op: '=',
-			value: namespaceName,
-		},
-		{
-			id: 'f3',
-			key: {
-				dataType: DataTypes.String,
-				id: 'k8s_cluster_name--string--tag--false',
-				key: k8sClusterNameKey,
-				type: 'tag',
-			},
-			op: '=',
-			value: clusterName,
-		},
-	];
+	const k8sPodNameKey = dotMetricsEnabled ? 'k8s.pod.name' : 'k8s_pod_name';
 
 	const k8sPodCpuUtilKey = dotMetricsEnabled
 		? 'k8s.pod.cpu.usage'
@@ -228,7 +168,19 @@ export const getStatefulSetMetricsQueryPayload = (
 												INFRA_MONITORING_ATTR_KEYS.K8S_STATEFULSET_NAME
 											] ?? '',
 									},
-									...filters,
+									{
+										id: 'f2',
+										key: {
+											dataType: DataTypes.String,
+											id: 'ns_name',
+											key: k8sNamespaceNameKey,
+											type: 'tag',
+										},
+										op: '=',
+										value:
+											statefulSet.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_NAMESPACE_NAME] ??
+											'',
+									},
 								],
 								op: 'AND',
 							},
@@ -271,7 +223,19 @@ export const getStatefulSetMetricsQueryPayload = (
 												INFRA_MONITORING_ATTR_KEYS.K8S_STATEFULSET_NAME
 											] ?? '',
 									},
-									...filters,
+									{
+										id: 'f2',
+										key: {
+											dataType: DataTypes.String,
+											id: 'ns_name',
+											key: k8sNamespaceNameKey,
+											type: 'tag',
+										},
+										op: '=',
+										value:
+											statefulSet.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_NAMESPACE_NAME] ??
+											'',
+									},
 								],
 								op: 'AND',
 							},
@@ -314,7 +278,19 @@ export const getStatefulSetMetricsQueryPayload = (
 												INFRA_MONITORING_ATTR_KEYS.K8S_STATEFULSET_NAME
 											] ?? '',
 									},
-									...filters,
+									{
+										id: 'f2',
+										key: {
+											dataType: DataTypes.String,
+											id: 'ns_name',
+											key: k8sNamespaceNameKey,
+											type: 'tag',
+										},
+										op: '=',
+										value:
+											statefulSet.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_NAMESPACE_NAME] ??
+											'',
+									},
 								],
 								op: 'AND',
 							},
@@ -377,7 +353,19 @@ export const getStatefulSetMetricsQueryPayload = (
 												INFRA_MONITORING_ATTR_KEYS.K8S_STATEFULSET_NAME
 											] ?? '',
 									},
-									...filters,
+									{
+										id: 'f2',
+										key: {
+											dataType: DataTypes.String,
+											id: 'ns_name',
+											key: k8sNamespaceNameKey,
+											type: 'tag',
+										},
+										op: '=',
+										value:
+											statefulSet.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_NAMESPACE_NAME] ??
+											'',
+									},
 								],
 								op: 'AND',
 							},
@@ -420,7 +408,19 @@ export const getStatefulSetMetricsQueryPayload = (
 												INFRA_MONITORING_ATTR_KEYS.K8S_STATEFULSET_NAME
 											] ?? '',
 									},
-									...filters,
+									{
+										id: 'f2',
+										key: {
+											dataType: DataTypes.String,
+											id: 'ns_name',
+											key: k8sNamespaceNameKey,
+											type: 'tag',
+										},
+										op: '=',
+										value:
+											statefulSet.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_NAMESPACE_NAME] ??
+											'',
+									},
 								],
 								op: 'AND',
 							},
@@ -483,7 +483,19 @@ export const getStatefulSetMetricsQueryPayload = (
 												INFRA_MONITORING_ATTR_KEYS.K8S_STATEFULSET_NAME
 											] ?? '',
 									},
-									...filters,
+									{
+										id: 'f2',
+										key: {
+											dataType: DataTypes.String,
+											id: 'ns_name',
+											key: k8sNamespaceNameKey,
+											type: 'tag',
+										},
+										op: '=',
+										value:
+											statefulSet.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_NAMESPACE_NAME] ??
+											'',
+									},
 								],
 								op: 'AND',
 							},
@@ -513,7 +525,7 @@ export const getStatefulSetMetricsQueryPayload = (
 							filters: {
 								items: [
 									{
-										id: 'f1',
+										id: 'f3',
 										key: {
 											dataType: DataTypes.String,
 											id: 'pod_name',
@@ -526,7 +538,19 @@ export const getStatefulSetMetricsQueryPayload = (
 												INFRA_MONITORING_ATTR_KEYS.K8S_STATEFULSET_NAME
 											] ?? '',
 									},
-									...filters,
+									{
+										id: 'f2',
+										key: {
+											dataType: DataTypes.String,
+											id: 'ns_name',
+											key: k8sNamespaceNameKey,
+											type: 'tag',
+										},
+										op: '=',
+										value:
+											statefulSet.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_NAMESPACE_NAME] ??
+											'',
+									},
 								],
 								op: 'AND',
 							},
@@ -569,7 +593,19 @@ export const getStatefulSetMetricsQueryPayload = (
 												INFRA_MONITORING_ATTR_KEYS.K8S_STATEFULSET_NAME
 											] ?? '',
 									},
-									...filters,
+									{
+										id: 'f2',
+										key: {
+											dataType: DataTypes.String,
+											id: 'ns_name',
+											key: k8sNamespaceNameKey,
+											type: 'tag',
+										},
+										op: '=',
+										value:
+											statefulSet.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_NAMESPACE_NAME] ??
+											'',
+									},
 								],
 								op: 'AND',
 							},
@@ -632,7 +668,19 @@ export const getStatefulSetMetricsQueryPayload = (
 												INFRA_MONITORING_ATTR_KEYS.K8S_STATEFULSET_NAME
 											] ?? '',
 									},
-									...filters,
+									{
+										id: 'f2',
+										key: {
+											dataType: DataTypes.String,
+											id: 'ns_name',
+											key: k8sNamespaceNameKey,
+											type: 'tag',
+										},
+										op: '=',
+										value:
+											statefulSet.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_NAMESPACE_NAME] ??
+											'',
+									},
 								],
 								op: 'AND',
 							},
@@ -675,7 +723,19 @@ export const getStatefulSetMetricsQueryPayload = (
 												INFRA_MONITORING_ATTR_KEYS.K8S_STATEFULSET_NAME
 											] ?? '',
 									},
-									...filters,
+									{
+										id: 'f2',
+										key: {
+											dataType: DataTypes.String,
+											id: 'ns_name',
+											key: k8sNamespaceNameKey,
+											type: 'tag',
+										},
+										op: '=',
+										value:
+											statefulSet.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_NAMESPACE_NAME] ??
+											'',
+									},
 								],
 								op: 'AND',
 							},
@@ -738,7 +798,19 @@ export const getStatefulSetMetricsQueryPayload = (
 												INFRA_MONITORING_ATTR_KEYS.K8S_STATEFULSET_NAME
 											] ?? '',
 									},
-									...filters,
+									{
+										id: 'f2',
+										key: {
+											dataType: DataTypes.String,
+											id: 'ns_name',
+											key: k8sNamespaceNameKey,
+											type: 'tag',
+										},
+										op: '=',
+										value:
+											statefulSet.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_NAMESPACE_NAME] ??
+											'',
+									},
 								],
 								op: 'AND',
 							},
@@ -814,7 +886,19 @@ export const getStatefulSetMetricsQueryPayload = (
 												INFRA_MONITORING_ATTR_KEYS.K8S_STATEFULSET_NAME
 											] ?? '',
 									},
-									...filters,
+									{
+										id: 'f2',
+										key: {
+											dataType: DataTypes.String,
+											id: 'ns_name',
+											key: k8sNamespaceNameKey,
+											type: 'tag',
+										},
+										op: '=',
+										value:
+											statefulSet.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_NAMESPACE_NAME] ??
+											'',
+									},
 								],
 								op: 'AND',
 							},

frontend/src/container/InfraMonitoringK8sV2/StatefulSets/table.config.tsx

@@ -6,7 +6,6 @@ import { ExpandButtonWrapper } from 'container/InfraMonitoringK8sV2/components';
 import ColumnHeader from '../Base/ColumnHeader';
 import EntityGroupHeader from '../Base/EntityGroupHeader';
 import K8sGroupCell from '../Base/K8sGroupCell';
-import { SelectedItemParams } from '../hooks';
 import { formatBytes, getPodPhaseStatusItems } from '../commonUtils';
 import {
 	CellValueTooltip,
@@ -32,15 +31,10 @@ export function getK8sStatefulSetRowKey(
 
 export function getK8sStatefulSetItemKey(
 	statefulSet: InframonitoringtypesStatefulSetRecordDTO,
-): SelectedItemParams {
-	return {
-		selectedItem:
-			statefulSet.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_STATEFULSET_NAME] ?? null,
-		clusterName:
-			statefulSet.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_CLUSTER_NAME] ?? null,
-		namespaceName:
-			statefulSet.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_NAMESPACE_NAME] ?? null,
-	};
+): string {
+	return (
+		statefulSet.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_STATEFULSET_NAME] || ''
+	);
 }
 
 export const k8sStatefulSetsColumnsConfig: TableColumnDef<InframonitoringtypesStatefulSetRecordDTO>[] =
@@ -141,10 +135,10 @@ export const k8sStatefulSetsColumnsConfig: TableColumnDef<InframonitoringtypesSt
 			},
 		},
 		{
-			id: 'pod_replicas',
+			id: 'pod_status',
 			header: (): React.ReactNode => (
-				<ColumnHeader docPath="/infrastructure-monitoring/kubernetes/statefulsets#pod-replicas">
-					Pod Replicas
+				<ColumnHeader docPath="/infrastructure-monitoring/kubernetes/statefulsets#pod-status">
+					Pod Status
 				</ColumnHeader>
 			),
 			accessorFn: (row): number => row.currentPods,

frontend/src/container/InfraMonitoringK8sV2/Volumes/K8sVolumesList.tsx

@@ -1,21 +1,16 @@
 import { useCallback } from 'react';
-import { convertToApiError } from 'api/ErrorResponseHandlerForGeneratedAPIs';
 import { listVolumes } from 'api/generated/services/inframonitoring';
-import { RenderErrorResponseDTO } from 'api/generated/services/sigNoz.schemas';
-import { AxiosError } from 'axios';
 import {
 	InframonitoringtypesResponseTypeDTO,
 	InframonitoringtypesVolumeRecordDTO,
 	Querybuildertypesv5OrderDirectionDTO,
 } from 'api/generated/services/sigNoz.schemas';
 import { InfraMonitoringEvents } from 'constants/events';
-import APIError from 'types/api/error';
 
 import K8sBaseDetails, { K8sDetailsFilters } from '../Base/K8sBaseDetails';
 import { K8sBaseList } from '../Base/K8sBaseList';
 import { K8sBaseFilters } from '../Base/types';
 import { InfraMonitoringEntity } from '../constants';
-import { SelectedItemParams } from '../hooks';
 import {
 	getVolumeMetricsQueryPayload,
 	k8sVolumeDetailsMetadataConfig,
@@ -72,12 +67,13 @@ function K8sVolumesList({
 					warning: data.warning,
 				};
 			} catch (error) {
+				const errMsg =
+					error instanceof Error ? error.message : 'Failed to fetch volumes';
 				return {
 					type: 'list' as const,
 					records: [] as InframonitoringtypesVolumeRecordDTO[],
 					total: 0,
-					error:
-						convertToApiError(error as AxiosError<RenderErrorResponseDTO>) ?? null,
+					error: errMsg,
 				};
 			}
 		},
@@ -90,7 +86,7 @@ function K8sVolumesList({
 			signal?: AbortSignal,
 		): Promise<{
 			data: InframonitoringtypesVolumeRecordDTO | null;
-			error?: APIError | null;
+			error?: string | null;
 		}> => {
 			try {
 				const response = await listVolumes(
@@ -108,10 +104,11 @@ function K8sVolumesList({
 					data: response.data.records.length > 0 ? response.data.records[0] : null,
 				};
 			} catch (error) {
+				const errMsg =
+					error instanceof Error ? error.message : 'Failed to fetch volume';
 				return {
 					data: null,
-					error:
-						convertToApiError(error as AxiosError<RenderErrorResponseDTO>) ?? null,
+					error: errMsg,
 				};
 			}
 		},
@@ -120,7 +117,7 @@ function K8sVolumesList({
 
 	return (
 		<>
-			<K8sBaseList<InframonitoringtypesVolumeRecordDTO, SelectedItemParams>
+			<K8sBaseList<InframonitoringtypesVolumeRecordDTO>
 				controlListPrefix={controlListPrefix}
 				entity={InfraMonitoringEntity.VOLUMES}
 				tableColumns={k8sVolumesColumnsConfig}

frontend/src/container/InfraMonitoringK8sV2/Volumes/constants.ts

@@ -6,22 +6,15 @@ import { EQueryType } from 'types/common/dashboard';
 import { DataSource, ReduceOperators } from 'types/common/queryBuilder';
 import { v4 } from 'uuid';
 
+import { formatValueForExpression } from 'components/QueryBuilderV2/utils';
+
 import { K8sDetailsMetadataConfig } from '../Base/K8sBaseDetails';
 import { INFRA_MONITORING_ATTR_KEYS } from '../constants';
-import { SelectedItemParams } from '../hooks';
-import {
-	buildEventsExpression,
-	buildExpressionFromSelectedItemParams,
-	buildLogsTracesExpression,
-} from 'container/InfraMonitoringK8sV2/Base/utils';
 
 export const k8sVolumeGetSelectedItemExpression = (
-	params: SelectedItemParams,
+	selectedItemId: string,
 ): string =>
-	buildExpressionFromSelectedItemParams(
-		params,
-		INFRA_MONITORING_ATTR_KEYS.K8S_PERSISTENT_VOLUME_CLAIM_NAME,
-	);
+	`${INFRA_MONITORING_ATTR_KEYS.K8S_PERSISTENT_VOLUME_CLAIM_NAME} = ${formatValueForExpression(selectedItemId)}`;
 
 export const k8sVolumeDetailsMetadataConfig: K8sDetailsMetadataConfig<InframonitoringtypesVolumeRecordDTO>[] =
 	[
@@ -43,23 +36,22 @@ export const k8sVolumeDetailsMetadataConfig: K8sDetailsMetadataConfig<Inframonit
 
 export const k8sVolumeInitialEventsExpression = (
 	item: InframonitoringtypesVolumeRecordDTO,
-): string =>
-	buildEventsExpression({
-		objectKind: 'PersistentVolumeClaim',
-		objectName: item.persistentVolumeClaimName || '',
-		clusterName: item.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_CLUSTER_NAME],
-		namespaceName: item.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_NAMESPACE_NAME],
-	});
+): string => {
+	const objectName = formatValueForExpression(
+		item.persistentVolumeClaimName || '',
+	);
+	return `${INFRA_MONITORING_ATTR_KEYS.K8S_OBJECT_KIND} = 'PersistentVolumeClaim' AND ${INFRA_MONITORING_ATTR_KEYS.K8S_OBJECT_NAME} = ${objectName}`;
+};
 
 export const k8sVolumeInitialLogTracesExpression = (
 	item: InframonitoringtypesVolumeRecordDTO,
-): string =>
-	buildLogsTracesExpression({
-		mainAttributeKey: INFRA_MONITORING_ATTR_KEYS.K8S_PERSISTENT_VOLUME_CLAIM_NAME,
-		mainAttributeValue: item.persistentVolumeClaimName,
-		clusterName: item.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_CLUSTER_NAME],
-		namespaceName: item.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_NAMESPACE_NAME],
-	});
+): string => {
+	const pvcName = formatValueForExpression(item.persistentVolumeClaimName || '');
+	const namespaceName = formatValueForExpression(
+		item.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_NAMESPACE_NAME] || '',
+	);
+	return `${INFRA_MONITORING_ATTR_KEYS.K8S_PERSISTENT_VOLUME_CLAIM_NAME} = ${pvcName} AND ${INFRA_MONITORING_ATTR_KEYS.K8S_NAMESPACE_NAME} = ${namespaceName}`;
+};
 
 export const k8sVolumeGetEntityName = (
 	item: InframonitoringtypesVolumeRecordDTO,
@@ -69,27 +61,22 @@ export const volumeWidgetInfo = [
 	{
 		title: 'Volume available',
 		yAxisUnit: 'bytes',
-		docPath: '/infrastructure-monitoring/kubernetes/volumes/#volume-available',
 	},
 	{
 		title: 'Volume capacity',
 		yAxisUnit: 'bytes',
-		docPath: '/infrastructure-monitoring/kubernetes/volumes/#volume-capacity',
 	},
 	{
 		title: 'Volume inodes used',
 		yAxisUnit: 'short',
-		docPath: '/infrastructure-monitoring/kubernetes/volumes/#volume-inodes-used',
 	},
 	{
 		title: 'Volume inodes',
 		yAxisUnit: 'short',
-		docPath: '/infrastructure-monitoring/kubernetes/volumes/#volume-inodes',
 	},
 	{
 		title: 'Volume inodes free',
 		yAxisUnit: 'short',
-		docPath: '/infrastructure-monitoring/kubernetes/volumes/#volume-inodes-free',
 	},
 ];
 

frontend/src/container/InfraMonitoringK8sV2/Volumes/table.config.tsx

@@ -1,5 +1,6 @@
-import TanStackTable, { TableColumnDef } from 'components/TanStackTableView';
+import { TableColumnDef } from 'components/TanStackTableView';
 import { InframonitoringtypesVolumeRecordDTO } from 'api/generated/services/sigNoz.schemas';
+import TanStackTable from 'components/TanStackTableView';
 import { ExpandButtonWrapper } from 'container/InfraMonitoringK8sV2/components';
 
 import ColumnHeader from '../Base/ColumnHeader';
@@ -11,7 +12,6 @@ import {
 	INFRA_MONITORING_ATTR_KEYS,
 	InfraMonitoringEntity,
 } from '../constants';
-import { SelectedItemParams } from '../hooks';
 import { HardDrive } from '@signozhq/icons';
 
 export function getK8sVolumeRowKey(
@@ -26,17 +26,8 @@ export function getK8sVolumeRowKey(
 
 export function getK8sVolumeItemKey(
 	volume: InframonitoringtypesVolumeRecordDTO,
-): SelectedItemParams {
-	return {
-		selectedItem:
-			volume.persistentVolumeClaimName ??
-			volume.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_PERSISTENT_VOLUME_CLAIM_NAME] ??
-			null,
-		clusterName:
-			volume.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_CLUSTER_NAME] ?? null,
-		namespaceName:
-			volume.meta?.[INFRA_MONITORING_ATTR_KEYS.K8S_NAMESPACE_NAME] ?? null,
-	};
+): string {
+	return volume.persistentVolumeClaimName;
 }
 
 export type VolumeTableColumnConfig =

frontend/src/container/InfraMonitoringK8sV2/constants.ts

@@ -897,8 +897,6 @@ export const INFRA_MONITORING_K8S_PARAMS_KEYS = {
 	PAGE_SIZE: 'pageSize',
 	EXPANDED: 'expanded',
 	SELECTED_ITEM: 'selectedItem',
-	SELECTED_ITEM_CLUSTER_NAME: 'selectedItemClusterName',
-	SELECTED_ITEM_NAMESPACE_NAME: 'selectedItemNamespaceName',
 };
 
 /** Metric namespace prefixes for /fields/keys and /fields/values APIs */

frontend/src/container/InfraMonitoringK8sV2/hooks.ts

@@ -5,10 +5,8 @@ import {
 	parseAsJson,
 	parseAsString,
 	useQueryState,
-	useQueryStates,
 	UseQueryStateReturn,
 } from 'nuqs';
-import { useCallback, useMemo } from 'react';
 import {
 	IBuilderQuery,
 	TagFilter,
@@ -130,70 +128,16 @@ export const useInfraMonitoringCategory = (): UseQueryStateReturn<
 		parseAsString.withDefault(K8sCategories.PODS).withOptions(defaultNuqsOptions),
 	);
 
-export interface SelectedItemParams {
-	selectedItem: string | null;
-	clusterName?: string | null;
-	namespaceName?: string | null;
-}
-
-const selectedItemParamsParsers = {
-	[INFRA_MONITORING_K8S_PARAMS_KEYS.SELECTED_ITEM]: parseAsString,
-	[INFRA_MONITORING_K8S_PARAMS_KEYS.SELECTED_ITEM_CLUSTER_NAME]: parseAsString,
-	[INFRA_MONITORING_K8S_PARAMS_KEYS.SELECTED_ITEM_NAMESPACE_NAME]: parseAsString,
+export const useInfraMonitoringSelectedItem = (): UseQueryStateReturn<
+	string,
+	string | undefined
+> => {
+	return useQueryState(
+		INFRA_MONITORING_K8S_PARAMS_KEYS.SELECTED_ITEM,
+		parseAsString,
+	);
 };
 
-export type UseSelectedItemParamsReturn = [
-	SelectedItemParams,
-	(params: SelectedItemParams | null) => void,
-];
-
-export const useInfraMonitoringSelectedItemParams =
-	(): UseSelectedItemParamsReturn => {
-		const [rawParams, setRawParams] = useQueryStates(
-			selectedItemParamsParsers,
-			defaultNuqsOptions,
-		);
-
-		const params: SelectedItemParams = useMemo(
-			() => ({
-				selectedItem:
-					rawParams[INFRA_MONITORING_K8S_PARAMS_KEYS.SELECTED_ITEM] ?? null,
-				clusterName:
-					rawParams[INFRA_MONITORING_K8S_PARAMS_KEYS.SELECTED_ITEM_CLUSTER_NAME] ??
-					null,
-				namespaceName:
-					rawParams[INFRA_MONITORING_K8S_PARAMS_KEYS.SELECTED_ITEM_NAMESPACE_NAME] ??
-					null,
-			}),
-			[rawParams],
-		);
-
-		const setParams = useCallback(
-			(newParams: Partial<SelectedItemParams> | null): void => {
-				if (newParams === null) {
-					void setRawParams({
-						[INFRA_MONITORING_K8S_PARAMS_KEYS.SELECTED_ITEM]: null,
-						[INFRA_MONITORING_K8S_PARAMS_KEYS.SELECTED_ITEM_CLUSTER_NAME]: null,
-						[INFRA_MONITORING_K8S_PARAMS_KEYS.SELECTED_ITEM_NAMESPACE_NAME]: null,
-					});
-					return;
-				}
-
-				void setRawParams({
-					[INFRA_MONITORING_K8S_PARAMS_KEYS.SELECTED_ITEM]:
-						newParams.selectedItem ?? null,
-					[INFRA_MONITORING_K8S_PARAMS_KEYS.SELECTED_ITEM_CLUSTER_NAME]:
-						newParams.clusterName ?? null,
-					[INFRA_MONITORING_K8S_PARAMS_KEYS.SELECTED_ITEM_NAMESPACE_NAME]:
-						newParams.namespaceName ?? null,
-				});
-			},
-			[setRawParams],
-		);
-
-		return [params, setParams];
-	};
-
 export const useInfraMonitoringStatusFilter = (): UseQueryStateReturn<
 	string,
 	string

frontend/src/container/LLMObservability/AttributeMapping/__tests__/fixtures.ts

@@ -30,7 +30,7 @@ export function makeGroup(overrides: Partial<MapperGroup> = {}): MapperGroup {
 export function makeMapper(overrides: Partial<Mapper> = {}): Mapper {
 	return {
 		id: 'mapper-1',
-		groupId: 'group-1',
+		group_id: 'group-1',
 		name: 'gen_ai.request.model',
 		enabled: true,
 		fieldContext: FieldContext.attribute,
@@ -89,5 +89,5 @@ export const mockGroups: MapperGroup[] = [
 ];
 
 export const mockMappers: Mapper[] = [
-	makeMapper({ id: 'mapper-1', groupId: 'group-1' }),
+	makeMapper({ id: 'mapper-1', group_id: 'group-1' }),
 ];

frontend/src/container/LLMObservability/Settings/ModelPricing/UnpricedModelsTab/__tests__/UnpricedModelsTab.test.tsx

@@ -89,20 +89,21 @@ describe('UnpricedModelsTab (integration)', () => {
 		await screen.findByTestId(`unpriced-model-name-${MODEL}`);
 		await selectRule(user, MODEL, 'rule-openai');
 
+		const trigger = screen.getByTestId(`map-to-select-${MODEL}`);
 		expect(
-			within(screen.getByTestId(`map-to-select-${MODEL}`)).getByText(
-				'openai:gpt-4o ($3.00/$9.00)',
-			),
+			within(trigger).getByText('openai:gpt-4o ($3.00/$9.00)'),
 		).toBeInTheDocument();
 
 		await user.click(await screen.findByTestId('unpriced-map-cancel-btn'));
 
-		await waitFor(() => {
-			const trigger = screen.getByTestId(`map-to-select-${MODEL}`);
+		await waitFor(() =>
 			expect(
-				within(trigger).getByText('Select / Create a pricing model'),
-			).toBeInTheDocument();
-		});
+				within(trigger).queryByText('openai:gpt-4o ($3.00/$9.00)'),
+			).not.toBeInTheDocument(),
+		);
+		expect(
+			within(trigger).getByText('Select / Create a pricing model'),
+		).toBeInTheDocument();
 	});
 
 	it('commits the mapping in one request when confirmed', async () => {

frontend/src/container/LogDetailedView/InfraMetrics/constants.ts

@@ -2872,72 +2872,17 @@ export const nodeWidgetInfo = [
 ];
 
 export const hostWidgetInfo = [
-	{
-		title: 'CPU Usage',
-		yAxisUnit: 'percentunit',
-		docPath: '/infrastructure-monitoring/host-monitoring/#cpu-usage',
-	},
-	{
-		title: 'Memory Usage',
-		yAxisUnit: 'bytes',
-		docPath: '/infrastructure-monitoring/host-monitoring/#memory-usage',
-	},
-	{
-		title: 'System Load Average',
-		yAxisUnit: '',
-		docPath: '/infrastructure-monitoring/host-monitoring/#system-load-average',
-	},
-	{
-		title: 'Network usage (bytes)',
-		yAxisUnit: 'bytes',
-		docPath: '/infrastructure-monitoring/host-monitoring/#network-usage-bytes',
-	},
-	{
-		title: 'Network usage (packet/s)',
-		yAxisUnit: 'pps',
-		docPath: '/infrastructure-monitoring/host-monitoring/#network-usage-packetss',
-	},
-	{
-		title: 'Network errors',
-		yAxisUnit: 'short',
-		docPath: '/infrastructure-monitoring/host-monitoring/#network-errors',
-	},
-	{
-		title: 'Network drops',
-		yAxisUnit: 'short',
-		docPath: '/infrastructure-monitoring/host-monitoring/#network-drops',
-	},
-	{
-		title: 'Network connections',
-		yAxisUnit: 'short',
-		docPath: '/infrastructure-monitoring/host-monitoring/#network-connections',
-	},
-	{
-		title: 'System disk io (bytes transferred)',
-		yAxisUnit: 'bytes',
-		docPath: '/infrastructure-monitoring/host-monitoring/#system-disk-io-bytes',
-	},
-	{
-		title: 'System disk operations/s',
-		yAxisUnit: 'short',
-		docPath:
-			'/infrastructure-monitoring/host-monitoring/#system-disk-operationss',
-	},
-	{
-		title: 'Queue size',
-		yAxisUnit: 'short',
-		docPath: '/infrastructure-monitoring/host-monitoring/#queue-size',
-	},
-	{
-		title: 'System disk operation time/s',
-		yAxisUnit: 's',
-		docPath:
-			'/infrastructure-monitoring/host-monitoring/#system-disk-operation-times',
-	},
-	{
-		title: 'Disk Usage (%) by mountpoint',
-		yAxisUnit: 'percentunit',
-		docPath:
-			'/infrastructure-monitoring/host-monitoring/#disk-usage--by-mountpoint',
-	},
+	{ title: 'CPU Usage', yAxisUnit: 'percentunit' },
+	{ title: 'Memory Usage', yAxisUnit: 'bytes' },
+	{ title: 'System Load Average', yAxisUnit: '' },
+	{ title: 'Network usage (bytes)', yAxisUnit: 'bytes' },
+	{ title: 'Network usage (packet/s)', yAxisUnit: 'pps' },
+	{ title: 'Network errors', yAxisUnit: 'short' },
+	{ title: 'Network drops', yAxisUnit: 'short' },
+	{ title: 'Network connections', yAxisUnit: 'short' },
+	{ title: 'System disk io (bytes transferred)', yAxisUnit: 'bytes' },
+	{ title: 'System disk operations/s', yAxisUnit: 'short' },
+	{ title: 'Queue size', yAxisUnit: 'short' },
+	{ title: 'System disk operation time/s', yAxisUnit: 's' },
+	{ title: 'Disk Usage (%) by mountpoint', yAxisUnit: 'percentunit' },
 ];

frontend/src/container/LogsExplorerViews/LogsExplorerViews.styles.scss

@@ -191,6 +191,14 @@
 				min-height: 0;
 				overflow-y: visible;
 
+				.time-series-view-container-header {
+					display: flex;
+					justify-content: flex-start;
+					align-items: center;
+					padding: 12px;
+					flex-shrink: 0;
+				}
+
 				.time-series-view {
 					flex-shrink: 0;
 					height: 65vh;

frontend/src/container/LogsExplorerViews/index.tsx

@@ -32,6 +32,7 @@ import {
 	getListQuery,
 	getQueryByPanelType,
 } from 'container/LogsExplorerViews/explorerUtils';
+import { BuilderUnitsFilter } from 'container/QueryBuilder/filters/BuilderUnitsFilter';
 import TimeSeriesView from 'container/TimeSeriesView/TimeSeriesView';
 import { useCopyLogLink } from 'hooks/logs/useCopyLogLink';
 import { useGetExplorerQueryRange } from 'hooks/queryBuilder/useGetExplorerQueryRange';
@@ -460,17 +461,18 @@ function LogsExplorerViewsContainer({
 					)}
 					{selectedPanelType === PANEL_TYPES.TIME_SERIES && !showLiveLogs && (
 						<div className="time-series-view-container">
+							<div className="time-series-view-container-header">
+								<BuilderUnitsFilter onChange={onUnitChange} yAxisUnit={yAxisUnit} />
+							</div>
 							<TimeSeriesView
 								isLoading={isLoading || isFetching}
 								data={data}
 								isError={isError}
 								error={error as APIError}
 								yAxisUnit={yAxisUnit}
-								onYAxisUnitChange={onUnitChange}
 								isFilterApplied={!isEmpty(listQuery?.filters?.items)}
 								dataSource={DataSource.LOGS}
 								setWarning={setWarning}
-								allowExport
 							/>
 						</div>
 					)}

frontend/src/container/MetricsExplorer/Explorer/TimeSeries.tsx

@@ -311,7 +311,6 @@ function TimeSeries({
 									dataSource={DataSource.METRICS}
 									error={queries[index].error as APIError}
 									setWarning={setWarning}
-									allowExport
 								/>
 							</div>
 						);

frontend/src/container/TimeSeriesView/TimeSeriesView.styles.scss

@@ -3,14 +3,6 @@
 	min-height: 350px;
 	padding: 0px 12px;
 
-	&__header {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		padding: 12px 0;
-		flex-shrink: 0;
-	}
-
 	.ant-card-body {
 		height: 50vh;
 		min-height: 350px;

frontend/src/container/TimeSeriesView/TimeSeriesView.tsx

@@ -16,7 +16,6 @@ import Uplot from 'components/Uplot';
 import { QueryParams } from 'constants/query';
 import { PANEL_TYPES } from 'constants/queryBuilder';
 import EmptyLogsSearch from 'container/EmptyLogsSearch/EmptyLogsSearch';
-import { BuilderUnitsFilter } from 'container/QueryBuilder/filters/BuilderUnitsFilter';
 import { getLocalStorageGraphVisibilityState } from 'container/GridCardLayout/GridCard/utils';
 import { LogsLoading } from 'container/LogsLoading/LogsLoading';
 import EmptyMetricsSearch from 'container/MetricsExplorer/Explorer/EmptyMetricsSearch';
@@ -42,14 +41,11 @@ import { SuccessResponse, Warning } from 'types/api';
 import { LegendPosition } from 'types/api/dashboard/getAll';
 import APIError from 'types/api/error';
 import { MetricRangePayloadProps } from 'types/api/metrics/getQueryRange';
-import { QueryRangeResponseV5 } from 'types/api/v5/queryRange';
 import { DataSource } from 'types/common/queryBuilder';
 import { GlobalReducer } from 'types/reducer/globalTime';
 import uPlot from 'uplot';
 import { getTimeRange } from 'utils/getTimeRange';
 
-import TimeseriesExportMenu from './TimeseriesExportMenu';
-
 import './TimeSeriesView.styles.scss';
 
 function TimeSeriesView({
@@ -63,8 +59,6 @@ function TimeSeriesView({
 	setWarning,
 	panelType = PANEL_TYPES.TIME_SERIES,
 	stackBarChart = false,
-	allowExport = false,
-	onYAxisUnitChange,
 }: TimeSeriesViewProps): JSX.Element {
 	const graphRef = useRef<HTMLDivElement>(null);
 
@@ -250,33 +244,10 @@ function TimeSeriesView({
 		[baseChartOptions, stackedBands],
 	);
 
-	const showExport = allowExport && !!data?.rawV5Response;
-	const showHeader = showExport || !!onYAxisUnitChange;
-
 	return (
 		<div className="time-series-view">
 			{isError && error && <ErrorInPlace error={error as APIError} />}
 
-			{showHeader && (
-				<div className="time-series-view__header">
-					<div>
-						{onYAxisUnitChange && (
-							<BuilderUnitsFilter onChange={onYAxisUnitChange} yAxisUnit={yAxisUnit} />
-						)}
-					</div>
-					{showExport && data?.rawV5Response && (
-						<TimeseriesExportMenu
-							dataSource={dataSource}
-							yAxisUnit={yAxisUnit}
-							queryResponse={data.rawV5Response}
-							query={currentQuery}
-							legendMap={data.legendMap}
-							fileName={`${dataSource}-timeseries`}
-						/>
-					)}
-				</div>
-			)}
-
 			<div
 				className="graph-container"
 				style={{ height: '100%', width: '100%' }}
@@ -324,11 +295,7 @@ function TimeSeriesView({
 }
 
 interface TimeSeriesViewProps {
-	data?: SuccessResponse<MetricRangePayloadProps> & {
-		warning?: Warning;
-		rawV5Response?: QueryRangeResponseV5;
-		legendMap?: Record<string, string>;
-	};
+	data?: SuccessResponse<MetricRangePayloadProps> & { warning?: Warning };
 	yAxisUnit?: string;
 	isLoading: boolean;
 	isError: boolean;
@@ -338,11 +305,6 @@ interface TimeSeriesViewProps {
 	setWarning?: Dispatch<SetStateAction<Warning | undefined>>;
 	panelType?: PANEL_TYPES;
 	stackBarChart?: boolean;
-	// Opt-in: render the client-side export menu (Logs explorer for now).
-	allowExport?: boolean;
-	// Opt-in: render the y-axis unit selector in the header (views without their
-	// own selector, e.g. Logs). Metrics keeps its separate YAxisUnitSelector.
-	onYAxisUnitChange?: (value: string) => void;
 }
 
 TimeSeriesView.defaultProps = {

frontend/src/container/TimeSeriesView/TimeseriesExportMenu.styles.scss

@@ -1,33 +0,0 @@
-.timeseries-export-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%;
-	}
-}

frontend/src/container/TimeSeriesView/TimeseriesExportMenu.tsx

@@ -1,91 +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 { useClientExport } from 'hooks/useExportData/useClientExport';
-import { ExportFormat } from 'lib/exportData/types';
-import { useCallback, useState } from 'react';
-import { Query } from 'types/api/queryBuilder/queryBuilderData';
-import { QueryRangeResponseV5 } from 'types/api/v5/queryRange';
-import { DataSource } from 'types/common/queryBuilder';
-
-import './TimeseriesExportMenu.styles.scss';
-
-interface TimeseriesExportMenuProps {
-	dataSource: DataSource;
-	queryResponse: QueryRangeResponseV5;
-	query?: Query;
-	yAxisUnit?: string;
-	legendMap?: Record<string, string>;
-	fileName?: string;
-}
-
-// Download menu for in-memory timeseries data (client-side serialization).
-// The raw/list backend export keeps its own menu in DownloadOptionsMenu.
-export default function TimeseriesExportMenu({
-	dataSource,
-	queryResponse,
-	query,
-	yAxisUnit,
-	legendMap,
-	fileName,
-}: TimeseriesExportMenuProps): JSX.Element {
-	const [exportFormat, setExportFormat] = useState<string>(ExportFormat.Csv);
-	const [isPopoverOpen, setIsPopoverOpen] = useState<boolean>(false);
-
-	const { isExporting, handleExport: handleClientExport } = useClientExport({
-		response: queryResponse,
-		query,
-		yAxisUnit,
-		legendMap,
-		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={`timeseries-export-${dataSource}`}
-						disabled={isExporting}
-						loading={isExporting}
-					>
-						<Download size={14} />
-					</Button>
-				</PopoverTrigger>
-			</TooltipSimple>
-			<PopoverContent align="end" className="timeseries-export-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>
-	);
-}

frontend/src/container/TimeSeriesView/__tests__/TimeSeriesView.test.tsx

@@ -1,138 +0,0 @@
-import { render } from '@testing-library/react';
-import { MemoryRouter } from 'react-router-dom';
-// eslint-disable-next-line no-restricted-imports
-import { Provider } from 'react-redux';
-import configureStore from 'redux-mock-store';
-import store from 'store';
-import { DataSource } from 'types/common/queryBuilder';
-
-import TimeSeriesView from '../TimeSeriesView';
-
-jest.mock('components/Uplot', () => ({
-	__esModule: true,
-	default: (): JSX.Element => <div data-testid="uplot-chart" />,
-}));
-
-jest.mock('../TimeseriesExportMenu', () => ({
-	__esModule: true,
-	default: (): JSX.Element => <div data-testid="timeseries-export-menu" />,
-}));
-
-jest.mock('container/QueryBuilder/filters/BuilderUnitsFilter', () => ({
-	BuilderUnitsFilter: (): JSX.Element => (
-		<div data-testid="builder-units-filter" />
-	),
-}));
-
-jest.mock('hooks/queryBuilder/useQueryBuilder', () => ({
-	useQueryBuilder: (): unknown => ({ currentQuery: null }),
-}));
-
-jest.mock('lib/uPlotLib/getUplotChartOptions', () => ({
-	getUPlotChartOptions: (): unknown => ({}),
-}));
-
-jest.mock('lib/uPlotLib/utils/getUplotChartData', () => ({
-	getUPlotChartData: (): number[][] => [
-		[1, 2],
-		[3, 4],
-	],
-}));
-
-jest.mock(
-	'container/DashboardContainer/visualization/charts/utils/stackSeriesUtils',
-	() => ({ stackSeries: (): unknown => ({ data: [], bands: [] }) }),
-);
-
-jest.mock('container/GridCardLayout/GridCard/utils', () => ({
-	getLocalStorageGraphVisibilityState: (): unknown => ({
-		graphVisibilityStates: [],
-	}),
-}));
-
-jest.mock('providers/Timezone', () => ({
-	useTimezone: (): unknown => ({ timezone: { value: 'UTC' } }),
-}));
-
-jest.mock('hooks/useDimensions', () => ({
-	useResizeObserver: (): unknown => ({ width: 800, height: 400 }),
-}));
-
-jest.mock('api/common/logEvent', () => ({
-	__esModule: true,
-	default: jest.fn(),
-}));
-
-const mockStore = configureStore([])({ ...store.getState() });
-
-const rawV5Response = {
-	type: 'time_series',
-	data: { results: [] },
-	meta: {},
-};
-
-function makeData(withRawV5: boolean): any {
-	return {
-		statusCode: 200,
-		error: null,
-		message: '',
-		payload: { data: { result: [], resultType: '' } },
-		...(withRawV5 ? { rawV5Response, legendMap: {} } : {}),
-	};
-}
-
-function renderView(props: {
-	allowExport?: boolean;
-	withRawV5?: boolean;
-	onYAxisUnitChange?: (value: string) => void;
-}): ReturnType<typeof render> {
-	const { allowExport, withRawV5 = true, onYAxisUnitChange } = props;
-	return render(
-		<Provider store={mockStore}>
-			<MemoryRouter>
-				<TimeSeriesView
-					isLoading={false}
-					isError={false}
-					isFilterApplied
-					dataSource={DataSource.LOGS}
-					data={makeData(withRawV5)}
-					allowExport={allowExport}
-					onYAxisUnitChange={onYAxisUnitChange}
-				/>
-			</MemoryRouter>
-		</Provider>,
-	);
-}
-
-describe('TimeSeriesView header gating', () => {
-	it('renders the export menu when allowExport is set and raw V5 data is present', () => {
-		const { queryByTestId } = renderView({ allowExport: true });
-		expect(queryByTestId('timeseries-export-menu')).toBeInTheDocument();
-	});
-
-	it('renders no export menu without allowExport', () => {
-		const { queryByTestId } = renderView({});
-		expect(queryByTestId('timeseries-export-menu')).not.toBeInTheDocument();
-	});
-
-	it('renders no export menu when the raw V5 response is missing', () => {
-		const { queryByTestId } = renderView({ allowExport: true, withRawV5: false });
-		expect(queryByTestId('timeseries-export-menu')).not.toBeInTheDocument();
-	});
-
-	it('renders the unit selector only when onYAxisUnitChange is passed', () => {
-		const withUnit = renderView({ onYAxisUnitChange: jest.fn() });
-		expect(withUnit.queryByTestId('builder-units-filter')).toBeInTheDocument();
-		withUnit.unmount();
-
-		const withoutUnit = renderView({ allowExport: true });
-		expect(
-			withoutUnit.queryByTestId('builder-units-filter'),
-		).not.toBeInTheDocument();
-	});
-
-	it('renders no header row when neither export nor unit selector is enabled', () => {
-		const { container } = renderView({ withRawV5: false });
-		expect(container.querySelector('.time-series-view__header')).toBeNull();
-	});
-});

frontend/src/container/TimeSeriesView/__tests__/TimeseriesExportMenu.test.tsx

@@ -1,84 +0,0 @@
-import { fireEvent, render, screen } from 'tests/test-utils';
-import { QueryRangeResponseV5 } from 'types/api/v5/queryRange';
-import { DataSource } from 'types/common/queryBuilder';
-
-import TimeseriesExportMenu from '../TimeseriesExportMenu';
-
-const mockHandleExport = jest.fn();
-let mockIsExporting = false;
-
-jest.mock('hooks/useExportData/useClientExport', () => ({
-	useClientExport: (): unknown => ({
-		isExporting: mockIsExporting,
-		handleExport: mockHandleExport,
-	}),
-}));
-
-const response = {
-	type: 'time_series',
-	data: { results: [] },
-	meta: {},
-} as unknown as QueryRangeResponseV5;
-
-const TEST_ID = `timeseries-export-${DataSource.LOGS}`;
-
-function renderMenu(): void {
-	render(
-		<TimeseriesExportMenu
-			dataSource={DataSource.LOGS}
-			queryResponse={response}
-			fileName="logs-timeseries"
-		/>,
-	);
-}
-
-describe('TimeseriesExportMenu', () => {
-	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();
-	});
-});

frontend/src/container/TimeSeriesView/utils.ts

@@ -1,41 +1,10 @@
 import { SuccessResponse } from 'types/api/index';
 import { MetricRangePayloadProps } from 'types/api/metrics/getQueryRange';
-import { QueryRangeResponseV5, TimeSeriesData } from 'types/api/v5/queryRange';
 import { QueryData } from 'types/api/widgets/getQuery';
 
-type ConvertibleData = SuccessResponse<MetricRangePayloadProps> & {
-	rawV5Response?: QueryRangeResponseV5;
-};
-
-// Applies the same ns→ms conversion to the raw V5 tree, so client-side export
-// serializes the values the chart displays (not the original nanoseconds).
-function convertRawV5ValuesToMs(
-	response: QueryRangeResponseV5,
-): QueryRangeResponseV5 {
-	if (response.type !== 'time_series') {
-		return response;
-	}
-
-	const results = (response.data.results as TimeSeriesData[]).map((result) => ({
-		...result,
-		aggregations: (result.aggregations ?? []).map((bucket) => ({
-			...bucket,
-			series: (bucket.series ?? []).map((series) => ({
-				...series,
-				values: (series.values ?? []).map((value) => ({
-					...value,
-					value: value.value / 1000000,
-				})),
-			})),
-		})),
-	}));
-
-	return { ...response, data: { ...response.data, results } };
-}
-
 export const convertDataValueToMs = (
-	data?: ConvertibleData,
-): ConvertibleData | undefined => {
+	data?: SuccessResponse<MetricRangePayloadProps>,
+): SuccessResponse<MetricRangePayloadProps> | undefined => {
 	const convertedData = data;
 
 	const convertedResult: QueryData[] = data?.payload?.data?.result
@@ -53,11 +22,5 @@ export const convertDataValueToMs = (
 		convertedData.payload.data.result = convertedResult;
 	}
 
-	if (convertedData?.rawV5Response) {
-		convertedData.rawV5Response = convertRawV5ValuesToMs(
-			convertedData.rawV5Response,
-		);
-	}
-
 	return convertedData;
 };

frontend/src/container/TracesExplorer/TracesView/index.tsx

@@ -11,7 +11,6 @@ import {
 import { useSelector } from 'react-redux';
 import { Typography } from '@signozhq/ui/typography';
 import logEvent from 'api/common/logEvent';
-import DownloadOptionsMenu from 'components/DownloadOptionsMenu/DownloadOptionsMenu';
 import ErrorInPlace from 'components/ErrorInPlace/ErrorInPlace';
 import { ResizeTable } from 'components/ResizeTable';
 import { ENTITY_VERSION_V5 } from 'constants/app';
@@ -153,11 +152,6 @@ function TracesView({
 					</Typography>
 
 					<div className="trace-explorer-controls">
-						<DownloadOptionsMenu
-							dataSource={DataSource.TRACES}
-							panelType={PANEL_TYPES.TRACE}
-						/>
-
 						<TraceExplorerControls
 							isLoading={isLoading}
 							totalCount={responseData?.length || 0}

frontend/src/hooks/useExportData/useServerExport.ts

@@ -19,7 +19,6 @@ interface ExportOptions {
 
 interface UseExportRawDataProps {
 	dataSource: DataSource;
-	panelType?: PANEL_TYPES;
 }
 
 interface UseExportRawDataReturn {
@@ -29,7 +28,6 @@ interface UseExportRawDataReturn {
 
 export function useExportRawData({
 	dataSource,
-	panelType = PANEL_TYPES.LIST,
 }: UseExportRawDataProps): UseExportRawDataReturn {
 	const [isDownloading, setIsDownloading] = useState<boolean>(false);
 
@@ -85,7 +83,7 @@ export function useExportRawData({
 
 				const { queryPayload } = prepareQueryRangePayloadV5({
 					query: exportQuery,
-					graphType: panelType,
+					graphType: PANEL_TYPES.LIST,
 					selectedTime: 'GLOBAL_TIME',
 					globalSelectedInterval,
 				});
@@ -98,7 +96,7 @@ export function useExportRawData({
 				setIsDownloading(false);
 			}
 		},
-		[stagedQuery, globalSelectedInterval, dataSource, panelType],
+		[stagedQuery, globalSelectedInterval, dataSource],
 	);
 
 	return { isDownloading, handleExportRawData };

frontend/src/hooks/useIntersectionObserver.ts

@@ -4,8 +4,6 @@ export function useIntersectionObserver<T extends HTMLElement>(
 	ref: RefObject<T>,
 	options?: IntersectionObserverInit,
 	isObserverOnce?: boolean,
-	/** Defer observation by this many ms to let a transient mount layout settle. */
-	startDelayMs = 0,
 ): boolean {
 	const [isIntersecting, setIntersecting] = useState(false);
 
@@ -25,28 +23,16 @@ export function useIntersectionObserver<T extends HTMLElement>(
 			}
 		}, options);
 
-		const startObserving = (): void => {
-			if (currentReference) {
-				observer.observe(currentReference);
-			}
-		};
-
-		let timer: ReturnType<typeof setTimeout> | undefined;
-		if (startDelayMs > 0) {
-			timer = setTimeout(startObserving, startDelayMs);
-		} else {
-			startObserving();
+		if (currentReference) {
+			observer.observe(currentReference);
 		}
 
 		return (): void => {
-			if (timer) {
-				clearTimeout(timer);
-			}
 			if (currentReference) {
 				observer.unobserve(currentReference);
 			}
 		};
-	}, [ref, options, isObserverOnce, startDelayMs]);
+	}, [ref, options, isObserverOnce]);
 
 	return isIntersecting;
 }

frontend/src/lib/dashboard/getQueryResults.ts

@@ -22,11 +22,7 @@ import { SuccessResponseV2, Warning } from 'types/api';
 import { IDashboardVariable } from 'types/api/dashboard/getAll';
 import { MetricQueryRangeSuccessResponse } from 'types/api/metrics/getQueryRange';
 import { IBuilderQuery, Query } from 'types/api/queryBuilder/queryBuilderData';
-import {
-	ExecStats,
-	MetricRangePayloadV5,
-	QueryRangeResponseV5,
-} from 'types/api/v5/queryRange';
+import { ExecStats, MetricRangePayloadV5 } from 'types/api/v5/queryRange';
 import { QueryData } from 'types/api/widgets/getQuery';
 import { EQueryType } from 'types/common/dashboard';
 import { DataSource } from 'types/common/queryBuilder';
@@ -196,8 +192,6 @@ export async function GetMetricQueryRange(
 		| SuccessResponseV2<MetricRangePayloadV5>;
 	let warning: Warning | undefined;
 	let meta: ExecStats | undefined;
-	// Raw V5 response, kept before it's converted to legacy — powers client-side export.
-	let rawV5Response: QueryRangeResponseV5 | undefined;
 
 	const panelType = props.originalGraphType || props.graphType;
 
@@ -274,8 +268,6 @@ export async function GetMetricQueryRange(
 				endTime: props.end * 1000,
 			});
 
-			rawV5Response = publicResponse.data.data;
-
 			// Convert V5 response to legacy format for components
 			response = convertV5ResponseToLegacy(
 				{
@@ -296,8 +288,6 @@ export async function GetMetricQueryRange(
 				headers,
 			);
 
-			rawV5Response = v5Response.data.data;
-
 			// Convert V5 response to legacy format for components
 			response = convertV5ResponseToLegacy(
 				{
@@ -376,8 +366,6 @@ export async function GetMetricQueryRange(
 		...response,
 		warning,
 		meta,
-		rawV5Response,
-		legendMap,
 	};
 }
 

frontend/src/lib/exportData/__tests__/exportScalarData.test.ts

@@ -1,94 +0,0 @@
-import { SuccessResponse } from 'types/api';
-import { MetricRangePayloadProps } from 'types/api/metrics/getQueryRange';
-import { Query } from 'types/api/queryBuilder/queryBuilderData';
-
-import { exportScalarData } from '../exportScalarData';
-
-const query = {
-	queryType: 'builder',
-	builder: {
-		queryData: [
-			{
-				queryName: 'A',
-				dataSource: 'logs',
-				aggregations: [{ expression: 'count()' }],
-				groupBy: [
-					{ key: 'service.name', dataType: 'string', type: 'tag', id: 'svc' },
-				],
-				legend: '',
-			},
-		],
-		queryFormulas: [],
-	},
-} as unknown as Query;
-
-function makeResponse(
-	tables: {
-		queryName: string;
-		columns: { name: string; id?: string; isValueColumn: boolean }[];
-		rows: Record<string, string | number>[];
-	}[],
-): SuccessResponse<MetricRangePayloadProps> {
-	return {
-		statusCode: 200,
-		error: null,
-		message: '',
-		payload: {
-			data: {
-				resultType: 'scalar',
-				result: tables.map((table) => ({
-					queryName: table.queryName,
-					legend: '',
-					series: null,
-					list: null,
-					table: {
-						columns: table.columns.map((col) => ({
-							...col,
-							queryName: table.queryName,
-						})),
-						rows: table.rows.map((row) => ({ data: row })),
-					},
-				})),
-			},
-		},
-	} as unknown as SuccessResponse<MetricRangePayloadProps>;
-}
-
-describe('exportScalarData', () => {
-	it('serializes the table exactly as QueryTable prepares it', () => {
-		const data = makeResponse([
-			{
-				queryName: 'A',
-				columns: [
-					{ name: 'service.name', id: 'service.name', isValueColumn: false },
-					{ name: 'count()', id: 'A', isValueColumn: true },
-				],
-				rows: [
-					{ 'service.name': 'frontend', A: 120 },
-					{ 'service.name': 'cart', A: 80 },
-				],
-			},
-		]);
-
-		const table = exportScalarData({ data, query });
-
-		// group + aggregation columns, raw values, on-screen order — inherited
-		// 1:1 from createTableColumnsFromQuery (the renderer's own preparer)
-		expect(table).toStrictEqual({
-			headers: ['service.name', 'count()'],
-			rows: [
-				['frontend', 120],
-				['cart', 80],
-			],
-		});
-	});
-
-	it('returns an empty table for an empty response', () => {
-		const table = exportScalarData({
-			data: makeResponse([]),
-			query,
-		});
-
-		expect(table.rows).toStrictEqual([]);
-	});
-});

frontend/src/lib/exportData/__tests__/exportTableData.test.ts

@@ -1,58 +0,0 @@
-import { exportTableData } from '../exportTableData';
-
-const columns = [
-	{ name: 'service.name', key: 'service.name' },
-	{ name: 'count()', key: 'A', isValueColumn: true },
-	{ name: 'avg(duration)', key: 'B', isValueColumn: true },
-];
-
-describe('exportTableData', () => {
-	it('serializes raw values in display column order', () => {
-		const table = exportTableData({
-			columns,
-			dataSource: [
-				{ 'service.name': 'frontend', A: 120, B: 45.5 },
-				{ 'service.name': 'cart', A: 80, B: 12 },
-			],
-		});
-
-		expect(table).toStrictEqual({
-			headers: ['service.name', 'count()', 'avg(duration)'],
-			rows: [
-				['frontend', 120, 45.5],
-				['cart', 80, 12],
-			],
-		});
-	});
-
-	it('appends column units to value columns only, skipping display-only ids', () => {
-		const table = exportTableData({
-			columns,
-			dataSource: [{ 'service.name': 'frontend', A: 120, B: 45.5 }],
-			columnUnits: { A: 'short', B: 'ms', 'service.name': 'ms' },
-		});
-
-		// group column never gets a unit; 'short' is display-only and skipped
-		expect(table.headers).toStrictEqual([
-			'service.name',
-			'count()',
-			'avg(duration) (ms)',
-		]);
-	});
-
-	it('marks missing cells as blank gaps', () => {
-		const table = exportTableData({
-			columns,
-			dataSource: [{ 'service.name': 'frontend', A: 120 }],
-		});
-
-		expect(table.rows).toStrictEqual([['frontend', 120, '']]);
-	});
-
-	it('returns a headers-only table for empty data', () => {
-		expect(exportTableData({ columns, dataSource: [] })).toStrictEqual({
-			headers: ['service.name', 'count()', 'avg(duration)'],
-			rows: [],
-		});
-	});
-});

frontend/src/lib/exportData/__tests__/exportTimeseriesData.test.ts

@@ -81,18 +81,6 @@ describe('exportTimeseriesData', () => {
 		]);
 	});
 
-	it('omits display-only format ids (short/none) from headers', () => {
-		const data = [
-			makeQuery('A', [{ series: [makeSeries({ service: 'a' }, [[1000, 1]])] }]),
-		];
-
-		const short = exportTimeseriesData({ data, yAxisUnit: 'short' });
-		expect(short.headers[short.headers.length - 1]).toBe('value');
-
-		const none = exportTimeseriesData({ data, yAxisUnit: 'none' });
-		expect(none.headers[none.headers.length - 1]).toBe('value');
-	});
-
 	it('multi-query: query is its own column; label keys are unioned', () => {
 		const data = [
 			makeQuery('A', [{ series: [makeSeries({ service: 'x' }, [[1000, 1]])] }]),

frontend/src/lib/exportData/exportScalarData.ts

@@ -1,48 +0,0 @@
-import { createTableColumnsFromQuery } from 'lib/query/createTableColumnsFromQuery';
-import { SuccessResponse } from 'types/api';
-import { MetricRangePayloadProps } from 'types/api/metrics/getQueryRange';
-import { Query } from 'types/api/queryBuilder/queryBuilderData';
-import { QueryDataV3 } from 'types/api/widgets/getQuery';
-
-import { exportTableData } from './exportTableData';
-import { SerializedTable } from './types';
-
-interface ExportScalarDataArgs {
-	// The queryRange response object the table mount already holds (the
-	// formatForWeb payload carrying webTables).
-	data?: SuccessResponse<MetricRangePayloadProps>;
-	query: Query;
-}
-
-/**
- * Serializes a scalar/table queryRange response into a table — via
- * createTableColumnsFromQuery, the exact preparer QueryTable renders from, so
- * the export inherits the on-screen merge, naming and column order 1:1.
- */
-export function exportScalarData({
-	data,
-	query,
-}: ExportScalarDataArgs): SerializedTable {
-	const queryTableData = (data?.payload?.data?.newResult?.data?.result ||
-		data?.payload?.data?.result ||
-		[]) as QueryDataV3[];
-
-	const { columns, dataSource } = createTableColumnsFromQuery({
-		query,
-		queryTableData,
-	});
-
-	return exportTableData({
-		// antd widens title/dataIndex; createTableColumnsFromQuery always sets strings
-		columns: columns.map((column) => {
-			const rawIndex = 'dataIndex' in column ? column.dataIndex : undefined;
-			const key =
-				typeof rawIndex === 'string' || typeof rawIndex === 'number'
-					? String(rawIndex)
-					: '';
-			const name = typeof column.title === 'string' ? column.title : key;
-			return { name, key: key || name };
-		}),
-		dataSource: dataSource as unknown as Record<string, unknown>[],
-	});
-}

frontend/src/lib/exportData/exportTableData.ts

@@ -1,46 +0,0 @@
-import { SerializedTable } from './types';
-import { withUnit } from './withUnit';
-
-/** Generic table-model column — any prepared table (QueryTable, dashboard
- * tables, plain antd tables) adapts to this in a line or two. */
-export interface ExportTableColumn {
-	/** Display name, used as the export header (column order = array order). */
-	name: string;
-	/** Key into each dataSource record. */
-	key: string;
-	isValueColumn?: boolean;
-}
-
-interface ExportTableDataArgs {
-	columns: ExportTableColumn[];
-	dataSource: Record<string, unknown>[];
-	/** Per-column display unit, keyed by column key (dashboards; absent in explorer). */
-	columnUnits?: Record<string, string>;
-}
-
-/**
- * Serializes a prepared table model into a format-agnostic table — raw values
- * in display column order (lossless; no cell formatting applied).
- */
-export function exportTableData({
-	columns,
-	dataSource,
-	columnUnits,
-}: ExportTableDataArgs): SerializedTable {
-	const headers = columns.map((column) =>
-		column.isValueColumn
-			? withUnit(column.name, columnUnits?.[column.key])
-			: column.name,
-	);
-
-	const rows = dataSource.map((record) =>
-		columns.map((column) => {
-			const value = record[column.key];
-			return value === undefined || value === null
-				? ''
-				: (value as string | number);
-		}),
-	);
-
-	return { headers, rows };
-}

frontend/src/lib/exportData/exportTimeseriesData.ts

@@ -5,7 +5,6 @@ import { TimeSeries, TimeSeriesData } from 'types/api/v5/queryRange';
 import { QueryData } from 'types/api/widgets/getQuery';
 
 import { SerializedTable } from './types';
-import { withUnit } from './withUnit';
 
 interface ExportTimeseriesDataArgs {
 	data: TimeSeriesData[];
@@ -99,6 +98,11 @@ function flatten(
 	return flat;
 }
 
+// Appends the y-axis unit to the value header: `value` → `value (ms)`.
+function withUnit(header: string, yAxisUnit?: string): string {
+	return yAxisUnit ? `${header} (${yAxisUnit})` : header;
+}
+
 function toIso(timestamp: number): string {
 	return new Date(timestamp).toISOString();
 }

frontend/src/lib/exportData/withUnit.ts

@@ -1,11 +0,0 @@
-// Display-format ids, not physical units — meaningful on a chart axis
-// (compact-number formatting) but misleading in an export header.
-const DISPLAY_ONLY_UNITS = new Set(['short', 'none']);
-
-/** Appends a unit to a header: `value` → `value (ms)`. Skips display-only ids. */
-export function withUnit(header: string, unit?: string): string {
-	if (!unit || DISPLAY_ONLY_UNITS.has(unit)) {
-		return header;
-	}
-	return `${header} (${unit})`;
-}

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelsAndSectionsLayout/Panel/Panel.tsx

@@ -92,7 +92,6 @@ function Panel({
 					panelId={panelId}
 					data={data}
 					isFetching={isFetching}
-					isVisible={isVisible}
 					isPreviousData={isPreviousData}
 					error={error}
 					refetch={refetch}

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelBody/PanelBody.tsx

@@ -23,8 +23,6 @@ interface PanelBodyProps {
 	panelId: string;
 	data: PanelQueryData;
 	isFetching: boolean;
-	/** Panel not yet scrolled into view — its fetch is deferred, so show the loader rather than NoData. */
-	isVisible?: boolean;
 	/** Showing a prior page's data while the next loads; forwarded so list renderers can show skeletons. */
 	isPreviousData?: boolean;
 	error: Error | null;
@@ -56,7 +54,6 @@ function PanelBody({
 	panelId,
 	data,
 	isFetching,
-	isVisible,
 	isPreviousData,
 	error,
 	refetch,
@@ -108,9 +105,9 @@ function PanelBody({
 		);
 	}
 
-	// Full-panel loader on first fetch or while the fetch is deferred (off-screen); a refetch
-	// over existing data keeps the renderer mounted, empty data loads via NoData.
-	if ((isFetching || isVisible === false) && !hasData) {
+	// Full-panel loader only on first fetch; a refetch over existing data keeps the renderer
+	// mounted (e.g. list page change). A refetch over empty data loads via NoData.
+	if (isFetching && !hasData) {
 		return <PanelLoader />;
 	}
 

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelBody/__tests__/PanelBody.test.tsx

@@ -79,21 +79,6 @@ describe('PanelBody', () => {
 		expect(screen.queryByTestId('mock-renderer')).not.toBeInTheDocument();
 	});
 
-	it('shows the loader while the fetch is deferred (panel not yet scrolled into view)', () => {
-		render(
-			<PanelBody
-				{...baseProps}
-				panel={runnablePanel()}
-				data={{} as PanelQueryData}
-				isFetching={false}
-				isVisible={false}
-			/>,
-		);
-
-		expect(screen.getByTestId('panel-loading')).toBeInTheDocument();
-		expect(screen.queryByTestId('mock-renderer')).not.toBeInTheDocument();
-	});
-
 	it('keeps the renderer mounted during a refetch over existing data (e.g. list page change)', () => {
 		render(
 			<PanelBody

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelsAndSectionsLayout/Panel/ViewPanelModal/ViewPanelModalHeader.tsx

@@ -113,8 +113,8 @@ function ViewPanelModalHeader({
 				/>
 				<Button
 					size="icon"
-					variant="outlined"
-					color="secondary"
+					variant="solid"
+					color="primary"
 					onClick={onRefresh}
 					disabled={isFetching}
 					aria-label="Refresh"

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelsAndSectionsLayout/Section/SectionGrid/SectionGrid.tsx

@@ -22,7 +22,6 @@ function SectionGrid({
 	sections,
 }: SectionGridProps): JSX.Element {
 	const isEditable = useDashboardStore((s) => s.isEditable);
-
 	const rglLayout = useMemo<Layout[]>(
 		() =>
 			items.map((item) => ({

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelsAndSectionsLayout/Section/SectionGrid/SectionGridItem.tsx

@@ -10,10 +10,6 @@ const VIEWPORT_OBSERVER_OPTIONS: IntersectionObserverInit = {
 	rootMargin: '200px',
 };
 
-// Start observing after RGL's mount unfold settles, so a panel that only
-// transiently overlaps the viewport during layout doesn't fire a throwaway fetch.
-const OBSERVER_START_DELAY_MS = 350;
-
 interface SectionGridItemProps {
 	panel: DashboardtypesPanelDTO;
 	panelId: string;
@@ -21,9 +17,9 @@ interface SectionGridItemProps {
 }
 
 /**
- * Lazy-loads a single panel: tracks its live viewport intersection and passes it to
- * the presentational Panel as `isVisible`, so a board of many panels only fetches
- * (and refetches on time change / auto-refresh) what's on screen.
+ * Lazy-loads a single panel: watches its own viewport intersection (latched) and
+ * passes it to the presentational Panel as `isVisible`, so a board of many panels
+ * only fetches what's on screen.
  */
 function SectionGridItem({
 	panel,
@@ -34,10 +30,7 @@ function SectionGridItem({
 	const isVisible = useIntersectionObserver(
 		containerRef,
 		VIEWPORT_OBSERVER_OPTIONS,
-		// Not once: track the live viewport so a time change / auto-refresh only
-		// refetches on-screen panels (off-screen ones stay query-disabled).
-		false,
-		OBSERVER_START_DELAY_MS,
+		true,
 	);
 	useScrollIntoView(panelId, containerRef);
 

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelsAndSectionsLayout/Section/hooks/__tests__/useScrollIntoView.test.ts

@@ -23,7 +23,7 @@ describe('useScrollIntoView', () => {
 
 		expect(scrollIntoView).toHaveBeenCalledWith({
 			behavior: 'smooth',
-			block: 'center',
+			block: 'start',
 		});
 		expect(useScrollIntoViewStore.getState().scrollTargetId).toBeNull();
 	});
@@ -38,7 +38,7 @@ describe('useScrollIntoView', () => {
 
 		expect(scrollIntoView).toHaveBeenCalledWith({
 			behavior: 'smooth',
-			block: 'center',
+			block: 'start',
 		});
 		expect(useScrollIntoViewStore.getState().scrollTargetId).toBeNull();
 	});

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelsAndSectionsLayout/Section/hooks/useScrollIntoView.ts

@@ -9,7 +9,7 @@ import { useScrollIntoViewStore } from '../../../store/useScrollIntoViewStore';
 export function useScrollIntoView(
 	id: string,
 	ref: RefObject<HTMLElement>,
-	block: ScrollLogicalPosition = 'center',
+	block: ScrollLogicalPosition = 'start',
 ): void {
 	const scrollTargetId = useScrollIntoViewStore((s) => s.scrollTargetId);
 	const setScrollTargetId = useScrollIntoViewStore((s) => s.setScrollTargetId);

frontend/src/pages/DashboardPageV2/DashboardContainer/hooks/useGetQueryRangeV5.ts

@@ -57,8 +57,5 @@ export function useGetQueryRangeV5({
 		retry: retryUnlessClientError,
 		keepPreviousData,
 		cacheTime,
-		// A resolved window is immutable per key, so a panel scrolled back into view
-		// serves cache instead of refetching; a key change or manual refetch still runs.
-		staleTime: Infinity,
 	});
 }

frontend/src/pages/TracesExplorer/TimeSeriesView/index.tsx

@@ -10,6 +10,7 @@ import { useSelector } from 'react-redux';
 import { ENTITY_VERSION_V5 } from 'constants/app';
 import { initialQueriesMap, PANEL_TYPES } from 'constants/queryBuilder';
 import { REACT_QUERY_KEY } from 'constants/reactQueryKeys';
+import { BuilderUnitsFilter } from 'container/QueryBuilder/filters';
 import TimeSeriesView from 'container/TimeSeriesView/TimeSeriesView';
 import { convertDataValueToMs } from 'container/TimeSeriesView/utils';
 import { useGetQueryRange } from 'hooks/queryBuilder/useGetQueryRange';
@@ -115,6 +116,9 @@ function TimeSeriesViewContainer({
 
 	return (
 		<div className="trace-explorer-time-series-view-container">
+			<div className="trace-explorer-time-series-view-container-header">
+				<BuilderUnitsFilter onChange={onUnitChange} yAxisUnit={yAxisUnit} />
+			</div>
 			<TimeSeriesView
 				isFilterApplied={isFilterApplied}
 				isError={isError}
@@ -122,10 +126,8 @@ function TimeSeriesViewContainer({
 				isLoading={isLoading || isFetching}
 				data={responseData}
 				yAxisUnit={yAxisUnit}
-				onYAxisUnitChange={onUnitChange}
 				dataSource={dataSource}
 				setWarning={setWarning}
-				allowExport
 			/>
 		</div>
 	);