feat(infra-monitoring): allow order by primary name column in v2 apis (#11264 )

* chore: baseline setup * chore: endpoint detail update * chore: added logic for hosts v3 api * fix: bug fix * chore: disk usage * chore: added validate function * chore: added some unit tests * chore: return status as a string * chore: yarn generate api * chore: removed isSendingK8sAgentsMetricsCode * chore: moved funcs * chore: added validation on order by * chore: added pods list logic * chore: updated openapi yml * chore: updated spec * chore: pods api meta start time * chore: nil pointer check * chore: nil pointer dereference fix in req.Filter * chore: added temporalities of metrics * chore: added pods metrics temporality * chore: unified composite key function * chore: code improvements * chore: added pods list api updates * chore: hostStatusNone added for clarity that this field can be left empty as well in payload * chore: yarn generate api * chore: return errors from getMetadata and lint fix * chore: return errors from getMetadata and lint fix * chore: added hostName logic * chore: modified getMetadata query * chore: add type for response and files rearrange * chore: warnings added passing from queryResponse warning to host lists response struct * chore: added better metrics existence check * chore: added a TODO remark * chore: added required metrics check * chore: distributed samples table to local table change for get metadata * chore: frontend fix * chore: endpoint correction * chore: endpoint modification openapi * chore: escape backtick to prevent sql injection * chore: rearrage * chore: improvements * chore: validate order by to validate function * chore: improved description * chore: added TODOs and made filterByStatus a part of filter struct * chore: ignore empty string hosts in get active hosts * feat(infra-monitoring): v2 hosts list - return counts of active & inactive hosts for custom group by attributes (#10956) * chore: add functionality for showing active and inactive counts in custom group by * chore: bug fix * chore: added subquery for active and total count * chore: ignore empty string hosts in get active hosts * fix: sinceUnixMilli for determining active hosts compute once per request * chore: refactor code * chore: rename HostsList -> ListHosts * chore: rearrangement * chore: inframonitoring types renaming * chore: added types package * chore: file structure further breakdown for clarity * chore: comments correction * chore: removed temporalities * chore: pods code restructuring * chore: comments resolve * chore: added json tag required: true * chore: removed pod metric temporalities * chore: removed internal server error * chore: added status unauthorized * chore: remove a defensive nil map check, the function ensure non-nil map when err nil * chore: cleanup and rename * chore: make sort stable in case of tiebreaker by comparing composite group by keys * chore: regen api client for inframonitoring Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * chore: added phase counts feature * chore: added queries for pod phase counts in custom group by * chore: added required tags * chore: added support for pod phase unknown * chore: removed pods - order by phase * chore: improved api description to document -1 as no data in numeric fields * fix: rebase fixes * chore: added unknown phase count * fix: isPodUIDInGroupBy in buildPodRecords * chore: 3 cte --> 2 cte * chore: pod phase with local table of time series as counts * chore: comment correction * chore: corrected comment * chore: value column for samples table added * chore: removed query G for phase counts * chore: rename variable * chore: added PodPhaseNum constants to types * feat(infra-monitoring): v2 pods list apis - phase counts when custom grouping (#11088) * chore: added phase counts feature * chore: added queries for pod phase counts in custom group by * chore: added unknown phase count * fix: isPodUIDInGroupBy in buildPodRecords * chore: 3 cte --> 2 cte * chore: pod phase with local table of time series as counts * chore: comment correction * chore: corrected comment * chore: value column for samples table added * chore: removed query G for phase counts * chore: rename variable * chore: added PodPhaseNum constants to types * chore: nodes list v2 full blown * chore: metadata fix * chore: updated comment * chore: namespaces code * chore: v2 nodes api * chore: rename * chore: v2 clusters list api * chore: namespaces code * chore: rename * chore: review clusters PR * chore: pvcs code added * chore: updated endpoint and spec * chore: pvcs todo * chore: added condition * chore: added filter * chore: added code for deployments * chore: query nit * chore: statefulsets code added * chore: base filter added * chore: added base deployments change * chore: added base condition * chore: v2 jobs list api added * chore: added daemonsets api * chore: added pod phase counts * chore: for pods and nodes, replace none with no_data * chore: node and pod counts structs added * chore: namespace record uses PodCountsByPhase * chore: cluster record uses PodCountsByPhase, NodeCountsByReadiness * chore: deployment record uses PodCountsByPhase * chore: statefulset record uses PodCountsByPhase * chore: job record uses PodCountsByPhase * chore: daemonset record uses PodCountsByPhase * chore: added remaining metrics to check * chore: metrics existence check * chore: statefulset metrics added * chore: added jobs metrics * chore: added metrics * chore: feature added * chore: cosmetic changes * chore: replaced common order by key with entity specific attr key * chore: moved paginateByName to types and added unit tests * chore: added pageGroups * chore: assert added instead of require --------- Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: Ashwin Bhatkal <ashwin96@gmail.com>
feat(trace-details): promote ExpandableValue to periscope + dropdown z-index fix (#11393 )
2026-05-21 17:30:32 +01:00 · 2026-05-21 14:55:14 +00:00 · 2026-05-21 12:19:51 +00:00 · 2026-05-21 10:51:36 +00:00
77 changed files with 1739 additions and 298 deletions
--- a/frontend/src/components/NoAuthBanner/NoAuthBanner.tsx
+++ b/frontend/src/components/NoAuthBanner/NoAuthBanner.tsx
@@ -13,7 +13,7 @@ export function NoAuthBanner(): JSX.Element {
 			Impersonation mode: authentication is disabled. Anyone with access to this
 			instance has admin privileges.{' '}
 			<a
-				href="https://signoz.io/docs/manage/administrator-guide/configuration/impersonation-mode/"
+				href="https://signoz.io/docs/manage/administrator-guide/configuration/no-auth-mode/"
 				target="_blank"
 				rel="noreferrer"
 			>
--- a/frontend/src/container/DashboardContainer/visualization/hooks/tests/usePanelContextMenu.test.ts
+++ b/frontend/src/container/DashboardContainer/visualization/hooks/tests/usePanelContextMenu.test.ts
@@ -0,0 +1,147 @@
+import { renderHook } from '@testing-library/react';
+import { UseQueryResult } from 'react-query';
+import { SuccessResponse } from 'types/api';
+import { Widgets } from 'types/api/dashboard/getAll';
+import { MetricRangePayloadProps } from 'types/api/metrics/getQueryRange';
+
+import { usePanelContextMenu } from '../usePanelContextMenu';
+
+// The hook composes `useCoordinates` (popover state) and `useGraphContextMenu`
+// (menu items). We mock both so the test focuses on the `enableDrillDown` gate
+// rather than the implementation of the menu wiring itself.
+const onClickMock = jest.fn();
+jest.mock('periscope/components/ContextMenu', () => ({
+	useCoordinates: (): unknown => ({
+		coordinates: null,
+		popoverPosition: null,
+		clickedData: null,
+		onClose: jest.fn(),
+		subMenu: null,
+		onClick: onClickMock,
+		setSubMenu: jest.fn(),
+	}),
+}));
+
+jest.mock('container/QueryTable/Drilldown/useGraphContextMenu', () => ({
+	__esModule: true,
+	default: (): { menuItemsConfig: { header: string; items: string } } => ({
+		menuItemsConfig: { header: 'menu-header', items: 'menu-items' },
+	}),
+}));
+
+jest.mock('container/QueryTable/Drilldown/drilldownUtils', () => ({
+	getUplotClickData: jest.fn(() => ({
+		coord: { x: 1, y: 2 },
+		record: { queryName: 'A', filters: [] },
+		label: 'lbl',
+		seriesColor: '#abc',
+	})),
+}));
+
+jest.mock('container/PanelWrapper/utils', () => ({
+	isApmMetric: jest.fn(() => false),
+	getTimeRangeFromStepInterval: jest.fn(() => ({ start: 0, end: 0 })),
+}));
+
+const mockWidget = { id: 'w-1', query: {} } as unknown as Widgets;
+const mockQueryResponse = {
+	data: undefined,
+	isLoading: false,
+} as unknown as UseQueryResult<
+	SuccessResponse<MetricRangePayloadProps, unknown>,
+	Error
+>;
+
+describe('usePanelContextMenu', () => {
+	beforeEach(() => {
+		onClickMock.mockClear();
+	});
+
+	it('returns empty menuItemsConfig when enableDrillDown is false', () => {
+		const { result } = renderHook(() =>
+			usePanelContextMenu({
+				widget: mockWidget,
+				queryResponse: mockQueryResponse,
+				enableDrillDown: false,
+			}),
+		);
+
+		expect(result.current.menuItemsConfig).toStrictEqual({});
+	});
+
+	it('returns wired menuItemsConfig when enableDrillDown is true', () => {
+		const { result } = renderHook(() =>
+			usePanelContextMenu({
+				widget: mockWidget,
+				queryResponse: mockQueryResponse,
+				enableDrillDown: true,
+			}),
+		);
+
+		expect(result.current.menuItemsConfig).toStrictEqual({
+			header: 'menu-header',
+			items: 'menu-items',
+		});
+	});
+
+	it('clickHandlerWithContextMenu is a no-op when enableDrillDown is false', () => {
+		const { result } = renderHook(() =>
+			usePanelContextMenu({
+				widget: mockWidget,
+				queryResponse: mockQueryResponse,
+				enableDrillDown: false,
+			}),
+		);
+
+		result.current.clickHandlerWithContextMenu(
+			100, // xValue
+			200, // yValue
+			0, // mouseX
+			0, // mouseY
+			{ serviceName: 'svc' }, // metric
+			{ queryName: 'A', inFocusOrNot: true }, // queryData
+			10, // absoluteMouseX
+			20, // absoluteMouseY
+			{}, // axesData
+			{ seriesIndex: 0, seriesName: 'A', value: 1, color: '#abc' }, // focusedSeries
+		);
+
+		expect(onClickMock).not.toHaveBeenCalled();
+	});
+
+	it('clickHandlerWithContextMenu opens popover when enableDrillDown is true', () => {
+		const { result } = renderHook(() =>
+			usePanelContextMenu({
+				widget: mockWidget,
+				queryResponse: mockQueryResponse,
+				enableDrillDown: true,
+			}),
+		);
+
+		result.current.clickHandlerWithContextMenu(
+			100,
+			200,
+			0,
+			0,
+			{ serviceName: 'svc' },
+			{ queryName: 'A', inFocusOrNot: true },
+			10,
+			20,
+			{},
+			{ seriesIndex: 0, seriesName: 'A', value: 1, color: '#abc' },
+		);
+
+		expect(onClickMock).toHaveBeenCalledTimes(1);
+	});
+
+	it('defaults to disabled when enableDrillDown is not provided', () => {
+		const { result } = renderHook(() =>
+			usePanelContextMenu({
+				widget: mockWidget,
+				queryResponse: mockQueryResponse,
+			}),
+		);
+
+		expect(result.current.menuItemsConfig).toStrictEqual({});
+	});
+});
--- a/frontend/src/container/DashboardContainer/visualization/hooks/usePanelContextMenu.ts
+++ b/frontend/src/container/DashboardContainer/visualization/hooks/usePanelContextMenu.ts
@@ -21,11 +21,13 @@ interface UseTimeSeriesContextMenuParams {
 		SuccessResponse<MetricRangePayloadProps, unknown>,
 		Error
 	>;
+	enableDrillDown?: boolean;
 }

 export const usePanelContextMenu = ({
 	widget,
 	queryResponse,
+	enableDrillDown = false,
 }: UseTimeSeriesContextMenuParams): {
 	coordinates: { x: number; y: number } | null;
 	popoverPosition: PopoverPosition | null;
@@ -61,6 +63,9 @@ export const usePanelContextMenu = ({

 	const clickHandlerWithContextMenu = useCallback(
 		(...args: any[]) => {
+			if (!enableDrillDown) {
+				return;
+			}
 			const [
 				xValue,
 				_yvalue,
@@ -112,14 +117,14 @@ export const usePanelContextMenu = ({
 				});
 			}
 		},
-		[onClick, queryResponse],
+		[enableDrillDown, onClick, queryResponse],
 	);

 	return {
 		coordinates,
 		popoverPosition,
 		onClose,
-		menuItemsConfig,
+		menuItemsConfig: enableDrillDown ? menuItemsConfig : {},
 		clickHandlerWithContextMenu,
 	};
 };
--- a/frontend/src/container/DashboardContainer/visualization/panels/BarPanel/BarPanel.tsx
+++ b/frontend/src/container/DashboardContainer/visualization/panels/BarPanel/BarPanel.tsx
@@ -31,6 +31,7 @@ function BarPanel(props: PanelWrapperProps): JSX.Element {
 		isFullViewMode,
 		onToggleModelHandler,
 		groupByPerQuery,
+		enableDrillDown = false,
 	} = props;
 	const uPlotRef = useRef<uPlot | null>(null);
 	const graphRef = useRef<HTMLDivElement>(null);
@@ -61,6 +62,7 @@ function BarPanel(props: PanelWrapperProps): JSX.Element {
 	} = usePanelContextMenu({
 		widget,
 		queryResponse,
+		enableDrillDown,
 	});

 	const config = useMemo(() => {
--- a/frontend/src/container/DashboardContainer/visualization/panels/TimeSeriesPanel/TimeSeriesPanel.tsx
+++ b/frontend/src/container/DashboardContainer/visualization/panels/TimeSeriesPanel/TimeSeriesPanel.tsx
@@ -31,6 +31,7 @@ function TimeSeriesPanel(props: PanelWrapperProps): JSX.Element {
 		isFullViewMode,
 		onToggleModelHandler,
 		groupByPerQuery,
+		enableDrillDown = false,
 	} = props;
 	const graphRef = useRef<HTMLDivElement>(null);
 	const [minTimeScale, setMinTimeScale] = useState<number>();
@@ -60,6 +61,7 @@ function TimeSeriesPanel(props: PanelWrapperProps): JSX.Element {
 	} = usePanelContextMenu({
 		widget,
 		queryResponse,
+		enableDrillDown,
 	});

 	const chartData = useMemo(() => {
--- a/frontend/src/container/GridCardLayout/GridCard/FullView/index.tsx
+++ b/frontend/src/container/GridCardLayout/GridCard/FullView/index.tsx
@@ -292,6 +292,8 @@ function FullView({
 		return <Spinner height="100%" size="large" tip="Loading..." />;
 	}

+	const showEditBtn = editWidget && dashboardEditView;
+
 	return (
 		<div className="full-view-container">
 			<OverlayScrollbar>
@@ -306,7 +308,7 @@ function FullView({
 												Reset Query
 											</Button>
 										)}
-										{editWidget && (
+										{showEditBtn && (
 											<Button
 												className="switch-edit-btn"
 												disabled={response.isFetching || response.isLoading}
--- a/frontend/src/container/MetricsApplication/Tabs/DBCall.tsx
+++ b/frontend/src/container/MetricsApplication/Tabs/DBCall.tsx
@@ -30,7 +30,12 @@ import { v4 as uuid } from 'uuid';

 import { FeatureKeys } from '../../../constants/features';
 import { useAppContext } from '../../../providers/App/App';
-import { GraphTitle, MENU_ITEMS, SERVICE_CHART_ID } from '../constant';
+import {
+	GraphTitle,
+	MENU_ITEMS,
+	SERVICE_CHART_ID,
+	SERVICE_DETAIL_DRILLDOWN_ENABLED,
+} from '../constant';
 import { getWidgetQueryBuilder } from '../MetricsApplication.factory';
 import { Card, GraphContainer, Row } from '../styles';
 import { Button } from './styles';
@@ -206,6 +211,7 @@ function DBCall(): JSX.Element {
 							}}
 							onDragSelect={onDragSelect}
 							version={ENTITY_VERSION_V4}
+							enableDrillDown={SERVICE_DETAIL_DRILLDOWN_ENABLED}
 						/>
 					</GraphContainer>
 				</Card>
@@ -244,6 +250,7 @@ function DBCall(): JSX.Element {
 							}}
 							onDragSelect={onDragSelect}
 							version={ENTITY_VERSION_V4}
+							enableDrillDown={SERVICE_DETAIL_DRILLDOWN_ENABLED}
 						/>
 					</GraphContainer>
 				</Card>
--- a/frontend/src/container/MetricsApplication/Tabs/External.tsx
+++ b/frontend/src/container/MetricsApplication/Tabs/External.tsx
@@ -32,7 +32,12 @@ import { v4 as uuid } from 'uuid';

 import { FeatureKeys } from '../../../constants/features';
 import { useAppContext } from '../../../providers/App/App';
-import { GraphTitle, legend, MENU_ITEMS } from '../constant';
+import {
+	GraphTitle,
+	legend,
+	MENU_ITEMS,
+	SERVICE_DETAIL_DRILLDOWN_ENABLED,
+} from '../constant';
 import { getWidgetQueryBuilder } from '../MetricsApplication.factory';
 import { Card, GraphContainer, Row } from '../styles';
 import GraphControlsPanel from './Overview/GraphControlsPanel/GraphControlsPanel';
@@ -279,6 +284,7 @@ function External(): JSX.Element {
 								}}
 								onDragSelect={onDragSelect}
 								version={ENTITY_VERSION_V4}
+								enableDrillDown={SERVICE_DETAIL_DRILLDOWN_ENABLED}
 							/>
 						</GraphContainer>
 					</Card>
@@ -322,6 +328,7 @@ function External(): JSX.Element {
 								}}
 								onDragSelect={onDragSelect}
 								version={ENTITY_VERSION_V4}
+								enableDrillDown={SERVICE_DETAIL_DRILLDOWN_ENABLED}
 							/>
 						</GraphContainer>
 					</Card>
@@ -366,6 +373,7 @@ function External(): JSX.Element {
 								}
 								onDragSelect={onDragSelect}
 								version={ENTITY_VERSION_V4}
+								enableDrillDown={SERVICE_DETAIL_DRILLDOWN_ENABLED}
 							/>
 						</GraphContainer>
 					</Card>
@@ -409,6 +417,7 @@ function External(): JSX.Element {
 								}}
 								onDragSelect={onDragSelect}
 								version={ENTITY_VERSION_V4}
+								enableDrillDown={SERVICE_DETAIL_DRILLDOWN_ENABLED}
 							/>
 						</GraphContainer>
 					</Card>
--- a/frontend/src/container/MetricsApplication/Tabs/Overview/ApDex/ApDexMetrics.tsx
+++ b/frontend/src/container/MetricsApplication/Tabs/Overview/ApDex/ApDexMetrics.tsx
@@ -15,6 +15,7 @@ import DisplayThreshold from 'container/GridCardLayout/WidgetHeader/DisplayThres
 import {
 	GraphTitle,
 	SERVICE_CHART_ID,
+	SERVICE_DETAIL_DRILLDOWN_ENABLED,
 } from 'container/MetricsApplication/constant';
 import { getWidgetQueryBuilder } from 'container/MetricsApplication/MetricsApplication.factory';
 import { apDexMetricsQueryBuilderQueries } from 'container/MetricsApplication/MetricsPageQueries/OverviewQueries';
@@ -105,6 +106,7 @@ function ApDexMetrics({
 			threshold={threshold}
 			isQueryEnabled={isQueryEnabled}
 			version={ENTITY_VERSION_V4}
+			enableDrillDown={SERVICE_DETAIL_DRILLDOWN_ENABLED}
 		/>
 	);
 }
--- a/frontend/src/container/MetricsApplication/Tabs/Overview/ServiceOverview.tsx
+++ b/frontend/src/container/MetricsApplication/Tabs/Overview/ServiceOverview.tsx
@@ -8,6 +8,7 @@ import Graph from 'container/GridCardLayout/GridCard';
 import {
 	GraphTitle,
 	SERVICE_CHART_ID,
+	SERVICE_DETAIL_DRILLDOWN_ENABLED,
 } from 'container/MetricsApplication/constant';
 import { getWidgetQueryBuilder } from 'container/MetricsApplication/MetricsApplication.factory';
 import { latency } from 'container/MetricsApplication/MetricsPageQueries/OverviewQueries';
@@ -138,6 +139,7 @@ function ServiceOverview({
 							onClickHandler={handleGraphClick('Service')}
 							isQueryEnabled={isQueryEnabled}
 							version={ENTITY_VERSION_V4}
+							enableDrillDown={SERVICE_DETAIL_DRILLDOWN_ENABLED}
 						/>
 					)}
 				</GraphContainer>
--- a/frontend/src/container/MetricsApplication/Tabs/Overview/TopLevelOperations.tsx
+++ b/frontend/src/container/MetricsApplication/Tabs/Overview/TopLevelOperations.tsx
@@ -4,6 +4,7 @@ import axios from 'axios';
 import { SOMETHING_WENT_WRONG } from 'constants/api';
 import { ENTITY_VERSION_V4 } from 'constants/app';
 import Graph from 'container/GridCardLayout/GridCard';
+import { SERVICE_DETAIL_DRILLDOWN_ENABLED } from 'container/MetricsApplication/constant';
 import { Card, GraphContainer } from 'container/MetricsApplication/styles';
 import { OnClickPluginOpts } from 'lib/uPlotLib/plugins/onClickPlugin';
 import { Widgets } from 'types/api/dashboard/getAll';
@@ -43,6 +44,7 @@ function TopLevelOperation({
 							onDragSelect={onDragSelect}
 							isQueryEnabled={!topLevelOperationsIsLoading}
 							version={ENTITY_VERSION_V4}
+							enableDrillDown={SERVICE_DETAIL_DRILLDOWN_ENABLED}
 						/>
 					)}
 				</GraphContainer>
--- a/frontend/src/container/MetricsApplication/constant.ts
+++ b/frontend/src/container/MetricsApplication/constant.ts
@@ -25,6 +25,8 @@ export const OPERATION_LEGENDS = ['Operations'];

 export const MENU_ITEMS = [MenuItemKeys.View, MenuItemKeys.CreateAlerts];

+export const SERVICE_DETAIL_DRILLDOWN_ENABLED = true;
+
 export enum FORMULA {
 	ERROR_PERCENTAGE = 'A*100/B',
 	DATABASE_CALLS_AVG_DURATION = 'A/B',
--- a/frontend/src/container/MySettings/UserInfo/UserInfo.styles.scss
+++ b/frontend/src/container/MySettings/UserInfo/UserInfo.styles.scss
@@ -127,12 +127,6 @@
 				flex-direction: column;
 				gap: 8px;
 				padding-bottom: 16px;
-
-				.password-error-text {
-					font-size: var(--font-size-xs);
-					color: var(--bg-cherry-400);
-					margin-top: 2px;
-				}
 			}

 			.ant-color-picker-trigger {
--- a/frontend/src/container/MySettings/UserInfo/index.tsx
+++ b/frontend/src/container/MySettings/UserInfo/index.tsx
@@ -1,27 +1,25 @@
 import { useState } from 'react';
+import { useTranslation } from 'react-i18next';
 import { Button, Input, Modal } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
 import logEvent from 'api/common/logEvent';
-import { ErrorResponseHandlerV2 } from 'api/ErrorResponseHandlerV2';
 import {
 	updateMyPassword,
 	useUpdateMyUserV2,
 } from 'api/generated/services/users';
-import { toast } from '@signozhq/ui/sonner';
+import { useNotifications } from 'hooks/useNotifications';
 import { Check, FileTerminal, Mail, User } from '@signozhq/icons';
 import { useAppContext } from 'providers/App/App';
-import { useErrorModal } from 'providers/ErrorModalProvider';
 import APIError from 'types/api/error';
-import { ErrorV2Resp } from 'types/api';
-import { AxiosError } from 'axios';

 import '../MySettings.styles.scss';
 import './UserInfo.styles.scss';

 function UserInfo(): JSX.Element {
 	const { user, org, updateUser } = useAppContext();
+	const { t } = useTranslation(['routes', 'settings', 'common']);

-	const { showErrorModal } = useErrorModal();
+	const { notifications } = useNotifications();
 	const { mutateAsync: updateMyUser } = useUpdateMyUserV2();

 	const [currentPassword, setCurrentPassword] = useState<string>('');
@@ -49,8 +47,6 @@ function UserInfo(): JSX.Element {

 	const hideResetPasswordModal = (): void => {
 		setIsResetPasswordModalOpen(false);
-		setCurrentPassword('');
-		setUpdatePassword('');
 	};

 	const onChangePasswordClickHandler = async (): Promise<void> => {
@@ -61,29 +57,27 @@ function UserInfo(): JSX.Element {
 				newPassword: updatePassword,
 				oldPassword: currentPassword,
 			});
-			toast.success('Password updated successfully');
+			notifications.success({
+				message: t('success', {
+					ns: 'common',
+				}),
+			});
 			hideResetPasswordModal();
 			setIsLoading(false);
 		} catch (error) {
 			setIsLoading(false);
-			try {
-				ErrorResponseHandlerV2(error as AxiosError<ErrorV2Resp>);
-			} catch (apiError) {
-				showErrorModal(apiError as APIError);
-			}
+			notifications.error({
+				message: (error as APIError).error.error.code,
+				description: (error as APIError).error.error.message,
+			});
 		}
 	};

-	const passwordsMatch =
-		currentPassword.length > 0 &&
-		updatePassword.length > 0 &&
-		currentPassword === updatePassword;
-
 	const isResetPasswordDisabled =
 		isLoading ||
 		currentPassword.length === 0 ||
 		updatePassword.length === 0 ||
-		passwordsMatch;
+		currentPassword === updatePassword;

 	const onSaveHandler = async (): Promise<void> => {
 		void logEvent('Account Settings: Name Updated', {
@@ -100,7 +94,11 @@ function UserInfo(): JSX.Element {
 			setIsLoading(true);
 			await updateMyUser({ data: { displayName: changedName } });

-			toast.success('Name updated successfully');
+			notifications.success({
+				message: t('success', {
+					ns: 'common',
+				}),
+			});
 			updateUser({
 				...user,
 				displayName: changedName,
@@ -108,11 +106,10 @@ function UserInfo(): JSX.Element {
 			setIsLoading(false);
 			hideUpdateNameModal();
 		} catch (error) {
-			try {
-				ErrorResponseHandlerV2(error as AxiosError<ErrorV2Resp>);
-			} catch (apiError) {
-				showErrorModal(apiError as APIError);
-			}
+			notifications.error({
+				message: (error as APIError).getErrorCode(),
+				description: (error as APIError).getErrorMessage(),
+			});
 		}
 		setIsLoading(false);
 	};
@@ -169,7 +166,7 @@ function UserInfo(): JSX.Element {
 						type="primary"
 						icon={<Check size={16} />}
 						onClick={onSaveHandler}
-						loading={isLoading}
+						disabled={isLoading}
 						data-testid="update-name-btn"
 					>
 						Update name
@@ -181,11 +178,7 @@ function UserInfo(): JSX.Element {
 					<Input
 						placeholder="e.g. John Doe"
 						value={changedName}
-						disabled={isLoading}
 						onChange={(e): void => setChangedName(e.target.value)}
-						onPressEnter={(): void => {
-							void onSaveHandler();
-						}}
 					/>
 				</div>
 			</Modal>
@@ -195,7 +188,6 @@ function UserInfo(): JSX.Element {
 				title={<span className="title">Reset password</span>}
 				open={isResetPasswordModalOpen}
 				closable
-				destroyOnClose
 				onCancel={hideResetPasswordModal}
 				footer={[
 					<Button
@@ -205,8 +197,7 @@ function UserInfo(): JSX.Element {
 						}`}
 						icon={<Check size={16} />}
 						onClick={onChangePasswordClickHandler}
-						loading={isLoading}
-						disabled={isResetPasswordDisabled}
+						disabled={isLoading || isResetPasswordDisabled}
 						data-testid="reset-password-btn"
 					>
 						Reset password
@@ -227,11 +218,6 @@ function UserInfo(): JSX.Element {
 							type="password"
 							autoComplete="off"
 							visibilityToggle
-							onPressEnter={(): void => {
-								if (!isResetPasswordDisabled) {
-									void onChangePasswordClickHandler();
-								}
-							}}
 						/>
 					</div>

@@ -249,18 +235,7 @@ function UserInfo(): JSX.Element {
 							type="password"
 							autoComplete="off"
 							visibilityToggle={false}
-							status={passwordsMatch ? 'error' : ''}
-							onPressEnter={(): void => {
-								if (!isResetPasswordDisabled) {
-									void onChangePasswordClickHandler();
-								}
-							}}
 						/>
-						{passwordsMatch && (
-							<span className="password-error-text">
-								New password must be different from current password
-							</span>
-						)}
 					</div>
 				</div>
 			</Modal>
--- a/frontend/src/container/MySettings/tests/MySettings.test.tsx
+++ b/frontend/src/container/MySettings/tests/MySettings.test.tsx
@@ -8,23 +8,11 @@ import {
 	waitFor,
 	within,
 } from 'tests/test-utils';
-import APIError from 'types/api/error';
-import { toast } from '@signozhq/ui/sonner';

 const toggleThemeFunction = jest.fn();
 const logEventFunction = jest.fn();
 const copyToClipboardFn = jest.fn();
 const editUserFn = jest.fn();
-const updateMyPasswordFn = jest.fn();
-const showErrorModalFn = jest.fn();
-
-jest.mock('@signozhq/ui/sonner', () => ({
-	...jest.requireActual('@signozhq/ui/sonner'),
-	toast: {
-		success: jest.fn(),
-		error: jest.fn(),
-	},
-}));

 jest.mock('react-use', () => ({
 	__esModule: true,
@@ -36,21 +24,12 @@ jest.mock('react-use', () => ({

 jest.mock('api/generated/services/users', () => ({
 	...jest.requireActual('api/generated/services/users'),
-	updateMyPassword: (...args: unknown[]): Promise<unknown> =>
-		updateMyPasswordFn(...args),
 	useUpdateMyUserV2: jest.fn(() => ({
 		mutateAsync: (...args: unknown[]): Promise<unknown> => editUserFn(...args),
 		isLoading: false,
 	})),
 }));

-jest.mock('providers/ErrorModalProvider', () => ({
-	...jest.requireActual('providers/ErrorModalProvider'),
-	useErrorModal: jest.fn(() => ({
-		showErrorModal: showErrorModalFn,
-	})),
-}));
-
 jest.mock('hooks/useDarkMode', () => ({
 	__esModule: true,
 	useIsDarkMode: jest.fn(() => true),
@@ -86,12 +65,12 @@ const NEW_PASSWORD_TEST_ID = 'new-password-textbox';
 const UPDATE_NAME_BUTTON_TEST_ID = 'update-name-btn';
 const RESET_PASSWORD_BUTTON_TEST_ID = 'reset-password-btn';
 const UPDATE_NAME_BUTTON_TEXT = 'Update name';
+const PASSWORD_VALIDATION_MESSAGE_TEST_ID = 'password-validation-message';

 describe('MySettings Flows', () => {
 	beforeEach(() => {
 		jest.clearAllMocks();
 		editUserFn.mockResolvedValue({});
-		updateMyPasswordFn.mockResolvedValue({});
 		render(<MySettingsContainer />);
 	});

@@ -173,7 +152,9 @@ describe('MySettings Flows', () => {
 			fireEvent.click(modalUpdateNameButton);

 			await waitFor(() =>
-				expect(toast.success).toHaveBeenCalledWith('Name updated successfully'),
+				expect(successNotification).toHaveBeenCalledWith({
+					message: 'success',
+				}),
 			);
 		});
 	});
@@ -200,131 +181,22 @@ describe('MySettings Flows', () => {
 			expect(screen.getByTestId(NEW_PASSWORD_TEST_ID)).toBeInTheDocument();
 		});

-		it('Should show inline error when new password matches current password', async () => {
+		it('Should display validation error if password is less than 8 characters', async () => {
 			const resetPasswordButtons = screen.getAllByText(RESET_PASSWORD_BUTTON_TEXT);
 			fireEvent.click(resetPasswordButtons[0]);

+			const currentPasswordTextbox = screen.getByTestId(CURRENT_PASSWORD_TEST_ID);
 			act(() => {
-				fireEvent.change(screen.getByTestId(CURRENT_PASSWORD_TEST_ID), {
-					target: { value: 'samePassword1' },
-				});
-				fireEvent.change(screen.getByTestId(NEW_PASSWORD_TEST_ID), {
-					target: { value: 'samePassword1' },
-				});
+				fireEvent.change(currentPasswordTextbox, { target: { value: '123' } });
 			});

-			expect(
-				screen.getByText('New password must be different from current password'),
-			).toBeInTheDocument();
-			expect(screen.getByTestId(RESET_PASSWORD_BUTTON_TEST_ID)).toBeDisabled();
-		});
-
-		it('Should hide inline error when passwords are changed to be different', async () => {
-			const resetPasswordButtons = screen.getAllByText(RESET_PASSWORD_BUTTON_TEXT);
-			fireEvent.click(resetPasswordButtons[0]);
-
-			act(() => {
-				fireEvent.change(screen.getByTestId(CURRENT_PASSWORD_TEST_ID), {
-					target: { value: 'samePassword1' },
-				});
-				fireEvent.change(screen.getByTestId(NEW_PASSWORD_TEST_ID), {
-					target: { value: 'samePassword1' },
-				});
-			});
-
-			act(() => {
-				fireEvent.change(screen.getByTestId(NEW_PASSWORD_TEST_ID), {
-					target: { value: 'differentPassword1' },
-				});
-			});
-
-			expect(
-				screen.queryByText('New password must be different from current password'),
-			).not.toBeInTheDocument();
-		});
-
-		it('Should show error modal when password reset API returns an error', async () => {
-			updateMyPasswordFn.mockRejectedValue(
-				new Error('Current password is incorrect'),
-			);
-
-			const resetPasswordButtons = screen.getAllByText(RESET_PASSWORD_BUTTON_TEXT);
-			fireEvent.click(resetPasswordButtons[0]);
-
-			act(() => {
-				fireEvent.change(screen.getByTestId(CURRENT_PASSWORD_TEST_ID), {
-					target: { value: 'oldPassword1' },
-				});
-				fireEvent.change(screen.getByTestId(NEW_PASSWORD_TEST_ID), {
-					target: { value: 'newPassword1' },
-				});
-			});
-
-			fireEvent.click(screen.getByTestId(RESET_PASSWORD_BUTTON_TEST_ID));
-
 			await waitFor(() => {
-				expect(showErrorModalFn).toHaveBeenCalledWith(expect.any(APIError));
-			});
-		});
-
-		it('Should show success toast and close modal on successful password reset', async () => {
-			const resetPasswordButtons = screen.getAllByText(RESET_PASSWORD_BUTTON_TEXT);
-			fireEvent.click(resetPasswordButtons[0]);
-
-			act(() => {
-				fireEvent.change(screen.getByTestId(CURRENT_PASSWORD_TEST_ID), {
-					target: { value: 'oldPassword1' },
-				});
-				fireEvent.change(screen.getByTestId(NEW_PASSWORD_TEST_ID), {
-					target: { value: 'newPassword1' },
-				});
-			});
-
-			fireEvent.click(screen.getByTestId(RESET_PASSWORD_BUTTON_TEST_ID));
-
-			await waitFor(() => {
-				expect(toast.success).toHaveBeenCalledWith('Password updated successfully');
-				expect(
-					screen.queryByTestId(CURRENT_PASSWORD_TEST_ID),
-				).not.toBeInTheDocument();
-			});
-		});
-
-		it('Should clear password fields when modal is cancelled', async () => {
-			const resetPasswordButtons = screen.getAllByText(RESET_PASSWORD_BUTTON_TEXT);
-			fireEvent.click(resetPasswordButtons[0]);
-
-			act(() => {
-				fireEvent.change(screen.getByTestId(CURRENT_PASSWORD_TEST_ID), {
-					target: { value: 'somePassword' },
-				});
-				fireEvent.change(screen.getByTestId(NEW_PASSWORD_TEST_ID), {
-					target: { value: 'otherPassword' },
-				});
-			});
-
-			expect(screen.getByTestId(CURRENT_PASSWORD_TEST_ID)).toHaveValue(
-				'somePassword',
-			);
-
-			// Close the modal
-			const closeButton = document.querySelector(
-				'.reset-password-modal .ant-modal-close',
-			) as HTMLElement;
-			fireEvent.click(closeButton);
-
-			// Reopen the modal
-			await waitFor(() => {
-				expect(
-					screen.queryByTestId(CURRENT_PASSWORD_TEST_ID),
-				).not.toBeInTheDocument();
-			});
-
-			fireEvent.click(screen.getAllByText(RESET_PASSWORD_BUTTON_TEXT)[0]);
-
-			await waitFor(() => {
-				expect(screen.getByTestId(CURRENT_PASSWORD_TEST_ID)).toHaveValue('');
-				expect(screen.getByTestId(NEW_PASSWORD_TEST_ID)).toHaveValue('');
+				// Use getByTestId for the validation message (if present in your modal/component)
+				if (screen.queryByTestId(PASSWORD_VALIDATION_MESSAGE_TEST_ID)) {
+					expect(
+						screen.getByTestId(PASSWORD_VALIDATION_MESSAGE_TEST_ID),
+					).toBeInTheDocument();
+				}
 			});
 		});

--- a/frontend/src/container/QueryTable/Drilldown/tests/drilldownUtils.test.tsx
+++ b/frontend/src/container/QueryTable/Drilldown/tests/drilldownUtils.test.tsx
@@ -169,9 +169,10 @@ describe('drilldownUtils', () => {

 			// Verify transformations were applied
 			if (filterExpression) {
-				// Rule 2: operation → name
-				expect(filterExpression).toContain(`name = 'GET'`);
+				// `operation` rewrites to `name` via source-side pass, then `name`
+				// is dropped by the logs target-side pass (logs has no span-name).
 				expect(filterExpression).not.toContain(`operation = 'GET'`);
+				expect(filterExpression).not.toContain(`name = 'GET'`);

 				// Rule 3: span.kind → kind
 				expect(filterExpression).toContain(`${spanKindKey} = '${spanKindServer}'`);
@@ -262,8 +263,9 @@ describe('drilldownUtils', () => {
 			const filterExpression = result?.builder.queryData[0]?.filter?.expression;

 			if (filterExpression) {
-				// All transformations should be applied
-				expect(filterExpression).toContain(`name = 'POST'`);
+				// `operation` rewrites to `name` then drops for logs target.
+				expect(filterExpression).not.toContain(`operation = 'POST'`);
+				expect(filterExpression).not.toContain(`name = 'POST'`);
 				expect(filterExpression).toContain(`${spanKindKey} = '${spanKindClient}'`);
 				expect(filterExpression).toContain(`status_code_string = 'Error'`);
 				expect(filterExpression).toContain(`http.status_code = 500`);
@@ -410,8 +412,9 @@ describe('drilldownUtils', () => {
 			const filterExpression = result?.builder.queryData[0]?.filter?.expression;

 			if (filterExpression) {
-				// Transformed attributes
-				expect(filterExpression).toContain(`name = 'GET'`);
+				// `operation` rewrites to `name` then drops for logs target.
+				expect(filterExpression).not.toContain(`operation = 'GET'`);
+				expect(filterExpression).not.toContain(`name = 'GET'`);
 				expect(filterExpression).toContain(`${spanKindKey} = '${spanKindServer}'`);

 				// Preserved non-metric attributes
@@ -499,4 +502,189 @@ describe('drilldownUtils', () => {
 			});
 		});
 	});
+
+	describe('getViewQuery target-aware sanitisation (serviceName / name)', () => {
+		const makeQuery = (
+			expression: string,
+			dataSource: 'traces' | 'logs' | 'metrics' = 'traces',
+		): Query => ({
+			id: 'src-query',
+			queryType: 'builder' as any,
+			builder: {
+				queryData: [
+					{
+						queryName: 'src',
+						dataSource: dataSource as any,
+						aggregations: [{ metricName: 'non_apm_metric' }] as any,
+						groupBy: [],
+						expression: '',
+						disabled: false,
+						functions: [],
+						legend: '',
+						having: [],
+						limit: null,
+						stepInterval: undefined,
+						orderBy: [],
+						filter: { expression },
+					},
+				],
+				queryFormulas: [],
+				queryTraceOperator: [],
+			},
+			promql: [],
+			clickhouse_sql: [],
+		});
+
+		it('rewrites serviceName -> service.name when drilling to logs', () => {
+			const result = getViewQuery(
+				makeQuery(`serviceName = 'svc'`),
+				[],
+				'view_logs',
+				'src',
+			);
+			const expr = result?.builder.queryData[0]?.filter?.expression || '';
+			expect(expr).toContain(`service.name = 'svc'`);
+			expect(expr).not.toContain('serviceName');
+		});
+
+		it('rewrites serviceName -> service.name when drilling to traces', () => {
+			const result = getViewQuery(
+				makeQuery(`serviceName = 'svc'`),
+				[],
+				'view_traces',
+				'src',
+			);
+			const expr = result?.builder.queryData[0]?.filter?.expression || '';
+			expect(expr).toContain(`service.name = 'svc'`);
+			expect(expr).not.toContain('serviceName');
+		});
+
+		it('drops `name` clause when drilling to logs', () => {
+			const result = getViewQuery(
+				makeQuery(`name = 'GET /api'`),
+				[],
+				'view_logs',
+				'src',
+			);
+			const expr = result?.builder.queryData[0]?.filter?.expression || '';
+			expect(expr).not.toContain(`name = 'GET /api'`);
+		});
+
+		it('keeps `name` clause when drilling to traces', () => {
+			const result = getViewQuery(
+				makeQuery(`name = 'GET /api'`),
+				[],
+				'view_traces',
+				'src',
+			);
+			const expr = result?.builder.queryData[0]?.filter?.expression || '';
+			expect(expr).toContain(`name = 'GET /api'`);
+		});
+
+		it('combined: drilling to logs rewrites serviceName and drops name', () => {
+			const result = getViewQuery(
+				makeQuery(`serviceName = 'svc' AND name = 'GET /api'`),
+				[],
+				'view_logs',
+				'src',
+			);
+			const expr = result?.builder.queryData[0]?.filter?.expression || '';
+			expect(expr).toContain(`service.name = 'svc'`);
+			expect(expr).not.toContain('serviceName');
+			expect(expr).not.toContain(`name = 'GET /api'`);
+		});
+
+		it('combined: drilling to traces rewrites serviceName and keeps name', () => {
+			const result = getViewQuery(
+				makeQuery(`serviceName = 'svc' AND name = 'GET /api'`),
+				[],
+				'view_traces',
+				'src',
+			);
+			const expr = result?.builder.queryData[0]?.filter?.expression || '';
+			expect(expr).toContain(`service.name = 'svc'`);
+			expect(expr).toContain(`name = 'GET /api'`);
+			expect(expr).not.toContain('serviceName');
+		});
+
+		it('metric-APM source -> traces target preserves existing operation -> name rewrite', () => {
+			const metricsQuery: Query = {
+				id: 'apm-metrics',
+				queryType: 'builder' as any,
+				builder: {
+					queryData: [
+						{
+							queryName: 'm',
+							dataSource: 'metrics' as any,
+							aggregations: [{ metricName: 'signoz_calls_total' }] as any,
+							groupBy: [],
+							expression: '',
+							disabled: false,
+							functions: [],
+							legend: '',
+							having: [],
+							limit: null,
+							stepInterval: undefined,
+							orderBy: [],
+							filter: { expression: `operation = 'GET'` },
+						},
+					],
+					queryFormulas: [],
+					queryTraceOperator: [],
+				},
+				promql: [],
+				clickhouse_sql: [],
+			};
+			const result = getViewQuery(metricsQuery, [], 'view_traces', 'm');
+			const expr = result?.builder.queryData[0]?.filter?.expression || '';
+			expect(expr).toContain(`name = 'GET'`);
+			expect(expr).not.toContain(`operation = 'GET'`);
+		});
+
+		it('metric-APM source -> logs target: operation rewrites to name, then dropped', () => {
+			const metricsQuery: Query = {
+				id: 'apm-metrics',
+				queryType: 'builder' as any,
+				builder: {
+					queryData: [
+						{
+							queryName: 'm',
+							dataSource: 'metrics' as any,
+							aggregations: [{ metricName: 'signoz_calls_total' }] as any,
+							groupBy: [],
+							expression: '',
+							disabled: false,
+							functions: [],
+							legend: '',
+							having: [],
+							limit: null,
+							stepInterval: undefined,
+							orderBy: [],
+							filter: { expression: `operation = 'GET'` },
+						},
+					],
+					queryFormulas: [],
+					queryTraceOperator: [],
+				},
+				promql: [],
+				clickhouse_sql: [],
+			};
+			const result = getViewQuery(metricsQuery, [], 'view_logs', 'm');
+			const expr = result?.builder.queryData[0]?.filter?.expression || '';
+			expect(expr).not.toContain(`operation = 'GET'`);
+			expect(expr).not.toContain(`name = 'GET'`);
+		});
+
+		it('drilling to metrics does not apply target-side sanitisation', () => {
+			const result = getViewQuery(
+				makeQuery(`serviceName = 'svc' AND name = 'GET /api'`),
+				[],
+				'view_metrics',
+				'src',
+			);
+			const expr = result?.builder.queryData[0]?.filter?.expression || '';
+			expect(expr).toContain('serviceName');
+			expect(expr).toContain(`name = 'GET /api'`);
+		});
+	});
 });
--- a/frontend/src/container/QueryTable/Drilldown/drilldownUtils.tsx
+++ b/frontend/src/container/QueryTable/Drilldown/drilldownUtils.tsx
@@ -7,8 +7,10 @@ import {
 import ROUTES from 'constants/routes';
 import { isApmMetric } from 'container/PanelWrapper/utils';
 import {
+	applyMappingsToExpression,
+	DRILLDOWN_TO_LOGS_MAPPINGS,
+	DRILLDOWN_TO_TRACES_MAPPINGS,
 	METRIC_TO_LOGS_TRACES_MAPPINGS,
-	replaceKeysAndValuesInExpression,
 } from 'container/QueryTable/Drilldown/metricsCorrelationUtils';
 import cloneDeep from 'lodash-es/cloneDeep';
 import {
@@ -347,27 +349,41 @@ export const getViewQuery = (
 	newQuery.builder.queryData[0].filter = newFilterExpression;

 	try {
-		// ===========================================
-		// TEMP LOGIC - TO BE REMOVED LATER
-		// ===========================================
-		// Apply metric-to-logs/traces transformations
+		// Drill-down filter sanitisation. Two stages:
+		//   1. Source-side: rewrite metric-APM-specific keys (operation, span.kind,
+		//      status.code) so they map onto trace/log columns.
+		//   2. Target-side: normalise legacy keys to OTel-canonical (`serviceName`
+		//      -> `service.name`) and drop keys with no equivalent in the target
+		//      datasource (e.g. `name` for logs).
+		let expression = newFilterExpression?.expression || '';
+
 		const specificQuery = getQueryData(query, queryName);
 		const isMetricQuery = specificQuery?.dataSource === 'metrics';
 		const metricName = (specificQuery?.aggregations?.[0] as MetricAggregation)
 			?.metricName;

 		if (isMetricQuery && isApmMetric(metricName || '')) {
-			const transformedExpression = replaceKeysAndValuesInExpression(
-				newFilterExpression?.expression || '',
+			expression = applyMappingsToExpression(
+				expression,
 				METRIC_TO_LOGS_TRACES_MAPPINGS,
 			);
-			newQuery.builder.queryData[0].filter = {
-				expression: transformedExpression || '',
-			};
 		}
-		// ===========================================
+
+		if (key === 'view_logs') {
+			expression = applyMappingsToExpression(
+				expression,
+				DRILLDOWN_TO_LOGS_MAPPINGS,
+			);
+		} else if (key === 'view_traces') {
+			expression = applyMappingsToExpression(
+				expression,
+				DRILLDOWN_TO_TRACES_MAPPINGS,
+			);
+		}
+
+		newQuery.builder.queryData[0].filter = { expression };
 	} catch (error) {
-		console.error('Error transforming metrics to logs/traces:', error);
+		console.error('Error sanitising drilldown filter expression:', error);
 	}

 	return newQuery;
--- a/frontend/src/container/QueryTable/Drilldown/metricsCorrelationUtils.tsx
+++ b/frontend/src/container/QueryTable/Drilldown/metricsCorrelationUtils.tsx
@@ -1,5 +1,8 @@
 /* eslint-disable sonarjs/cognitive-complexity */
-import { formatValueForExpression } from 'components/QueryBuilderV2/utils';
+import {
+	formatValueForExpression,
+	removeKeysFromExpression,
+} from 'components/QueryBuilderV2/utils';
 import { getOperatorValue } from 'container/QueryBuilder/filters/QueryBuilderSearch/utils';
 import { IQueryPair } from 'types/antlrQueryTypes';
 import { extractQueryPairs } from 'utils/queryContextUtils';
@@ -8,7 +11,7 @@ import { isFunctionOperator, isNonValueOperator } from 'utils/tokenUtils';

 type KeyValueMapping = {
 	attribute: string;
-	newAttribute: string;
+	newAttribute: string | null;
 	valueMappings: Record<string, string>;
 };

@@ -40,8 +43,33 @@ export const METRIC_TO_LOGS_TRACES_MAPPINGS: KeyValueMapping[] = [
 	},
 ];

+export const DRILLDOWN_TO_LOGS_MAPPINGS: KeyValueMapping[] = [
+	{
+		attribute: 'serviceName',
+		newAttribute: 'service.name',
+		valueMappings: {},
+	},
+	{
+		attribute: 'name',
+		newAttribute: null,
+		valueMappings: {},
+	},
+];
+
+export const DRILLDOWN_TO_TRACES_MAPPINGS: KeyValueMapping[] = [
+	{
+		attribute: 'serviceName',
+		newAttribute: 'service.name',
+		valueMappings: {},
+	},
+];
+
 // Logic for rewriting key/values in an expression using provided mappings.
-function modifyKeyVal(pair: IQueryPair, mapping: KeyValueMapping): string {
+// Callers must pre-filter mappings to ensure newAttribute is non-null.
+function modifyKeyVal(
+	pair: IQueryPair,
+	mapping: KeyValueMapping & { newAttribute: string },
+): string {
 	const newKey = mapping.newAttribute;
 	const op = pair.operator;

@@ -107,8 +135,18 @@ export function replaceKeysAndValuesInExpression(
 		return expression;
 	}

-	const attributeToMapping = new Map<string, KeyValueMapping>(
-		mappingList.map((m) => [m.attribute.trim().toLowerCase(), m]),
+	// Only rewrite mappings (newAttribute non-null) are processed here.
+	// Drops are handled separately by applyMappingsToExpression via removeKeysFromExpression.
+	const attributeToMapping = new Map<
+		string,
+		KeyValueMapping & { newAttribute: string }
+	>(
+		mappingList
+			.filter(
+				(m): m is KeyValueMapping & { newAttribute: string } =>
+					m.newAttribute !== null,
+			)
+			.map((m) => [m.attribute.trim().toLowerCase(), m]),
 	);

 	const pairs: IQueryPair[] = extractQueryPairs(expression);
@@ -179,3 +217,26 @@ export function replaceKeysAndValuesInExpression(

 	return resultParts.join('');
 }
+
+// Apply a list of mappings to a filter expression. Rewrites are applied first
+// (newAttribute is a string), then drops (newAttribute is null) via the
+// ANTLR-parser-based removeKeysFromExpression which handles AND/OR/NOT/paren
+// elision correctly.
+export function applyMappingsToExpression(
+	expression: string,
+	mappings: KeyValueMapping[],
+): string {
+	if (!expression || !mappings || mappings.length === 0) {
+		return expression;
+	}
+
+	const dropKeys = mappings
+		.filter((m) => m.newAttribute === null)
+		.map((m) => m.attribute);
+
+	let result = replaceKeysAndValuesInExpression(expression, mappings);
+	if (dropKeys.length > 0) {
+		result = removeKeysFromExpression(result, dropKeys);
+	}
+	return result;
+}
--- a/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/SpanDetailsPanel.module.scss
+++ b/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/SpanDetailsPanel.module.scss
@@ -119,6 +119,12 @@
 	flex-shrink: 0;
 }

+.statusMessageBadge {
+	width: 100%;
+	min-width: 0;
+	box-sizing: border-box;
+}
+
 .traceId {
 	color: var(--accent-primary);
 	overflow: hidden;
--- a/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/config.tsx
+++ b/frontend/src/pages/TraceDetailsV3/SpanDetailsPanel/config.tsx
@@ -1,5 +1,6 @@
 import { ReactNode } from 'react';
 import { Badge } from '@signozhq/ui/badge';
+import ExpandableValue from 'periscope/components/ExpandableValue';
 import { SpanV3 } from 'types/api/trace/getTraceV3';

 import styles from './SpanDetailsPanel.module.scss';
@@ -48,7 +49,15 @@ export const HIGHLIGHTED_OPTIONS: HighlightedOption[] = [
 		label: 'STATUS MESSAGE',
 		render: (span): ReactNode | null =>
 			span.status_message ? (
-				<Badge color="vanilla">{span.status_message}</Badge>
+				<ExpandableValue value={span.status_message} title="Status message">
+					<Badge
+						color="vanilla"
+						textEllipsis="end"
+						className={styles.statusMessageBadge}
+					>
+						{span.status_message}
+					</Badge>
+				</ExpandableValue>
 			) : null,
 	},
 ];
--- a/frontend/src/pages/TraceDetailsV3/TraceDetailsHeader/TraceOptionsMenu.module.scss
+++ b/frontend/src/pages/TraceDetailsV3/TraceDetailsHeader/TraceOptionsMenu.module.scss
@@ -0,0 +1,3 @@
+.traceOptionsDropdown {
+	z-index: 1100;
+}
--- a/frontend/src/pages/TraceDetailsV3/TraceDetailsHeader/TraceOptionsMenu.tsx
+++ b/frontend/src/pages/TraceDetailsV3/TraceDetailsHeader/TraceOptionsMenu.tsx
@@ -6,6 +6,8 @@ import { Ellipsis } from '@signozhq/icons';

 import { useTraceStore } from '../stores/traceStore';

+import styles from './TraceOptionsMenu.module.scss';
+
 interface TraceOptionsMenuProps {
 	showTraceDetails: boolean;
 	onToggleTraceDetails: () => void;
@@ -82,7 +84,11 @@ function TraceOptionsMenu({
 	]);

 	return (
-		<Dropdown menu={{ items: menuItems }} align="start">
+		<Dropdown
+			menu={{ items: menuItems }}
+			align="start"
+			className={styles.traceOptionsDropdown}
+		>
 			<Button
 				variant="ghost"
 				size="icon"
--- a/frontend/src/periscope/components/ExpandableValue/ExpandableValue.module.scss
+++ b/frontend/src/periscope/components/ExpandableValue/ExpandableValue.module.scss
@@ -0,0 +1,49 @@
+.trigger {
+	display: block;
+	min-width: 0;
+	max-width: 100%;
+	overflow: hidden;
+
+	[data-truncated='true'] {
+		pointer-events: none;
+	}
+}
+
+.tooltipContent {
+	display: flex;
+	flex-direction: column;
+	gap: 8px;
+	max-width: 480px;
+	padding: 8px;
+}
+
+.preview {
+	margin: 0;
+	max-height: 220px;
+	overflow: auto;
+	white-space: pre-wrap;
+	word-break: break-word;
+	font-family: var(--font-family-mono, monospace);
+	font-size: 12px;
+	line-height: 1.4;
+}
+
+.expandButton {
+	align-self: flex-end;
+}
+
+.dialog {
+	max-width: 80vw;
+	width: 80vw;
+}
+
+.fullValue {
+	margin: 0;
+	max-height: 70vh;
+	overflow: auto;
+	white-space: pre-wrap;
+	word-break: break-word;
+	font-family: var(--font-family-mono, monospace);
+	font-size: 13px;
+	line-height: 1.5;
+}
--- a/frontend/src/periscope/components/ExpandableValue/ExpandableValue.tsx
+++ b/frontend/src/periscope/components/ExpandableValue/ExpandableValue.tsx
@@ -0,0 +1,78 @@
+import { ReactNode, useState } from 'react';
+import { Button } from '@signozhq/ui/button';
+import { DialogWrapper } from '@signozhq/ui/dialog';
+import {
+	TooltipContent,
+	TooltipProvider,
+	TooltipRoot,
+	TooltipTrigger,
+} from '@signozhq/ui/tooltip';
+import { Fullscreen } from '@signozhq/icons';
+
+import styles from './ExpandableValue.module.scss';
+
+const DEFAULT_THRESHOLD = 100;
+const DEFAULT_DIALOG_TITLE = 'Value';
+
+const DEFAULT_Z_INDEX = 1100;
+
+interface ExpandableValueProps {
+	value: string;
+	title?: string;
+	threshold?: number;
+	zIndex?: number;
+	children: ReactNode;
+}
+
+function ExpandableValue({
+	value,
+	title = DEFAULT_DIALOG_TITLE,
+	threshold = DEFAULT_THRESHOLD,
+	zIndex = DEFAULT_Z_INDEX,
+	children,
+}: ExpandableValueProps): JSX.Element {
+	const [isDialogOpen, setIsDialogOpen] = useState(false);
+
+	if (value.length <= threshold) {
+		return <>{children}</>;
+	}
+
+	return (
+		<TooltipProvider>
+			<TooltipRoot>
+				<TooltipTrigger asChild>
+					<span className={styles.trigger}>{children}</span>
+				</TooltipTrigger>
+				<TooltipContent
+					className={styles.tooltipContent}
+					side="top"
+					style={{ zIndex }}
+				>
+					<pre className={styles.preview}>{value}</pre>
+					<Button
+						variant="outlined"
+						color="secondary"
+						size="sm"
+						prefix={<Fullscreen size={14} />}
+						onClick={(): void => setIsDialogOpen(true)}
+						className={styles.expandButton}
+					>
+						Expand
+					</Button>
+				</TooltipContent>
+			</TooltipRoot>
+
+			<DialogWrapper
+				title={title}
+				open={isDialogOpen}
+				onOpenChange={setIsDialogOpen}
+				className={styles.dialog}
+				style={{ zIndex }}
+			>
+				<pre className={styles.fullValue}>{value}</pre>
+			</DialogWrapper>
+		</TooltipProvider>
+	);
+}
+
+export default ExpandableValue;
--- a/frontend/src/periscope/components/ExpandableValue/index.ts
+++ b/frontend/src/periscope/components/ExpandableValue/index.ts
@@ -0,0 +1 @@
+export { default } from './ExpandableValue';
--- a/pkg/modules/inframonitoring/implinframonitoring/clusters.go
+++ b/pkg/modules/inframonitoring/implinframonitoring/clusters.go
@@ -26,7 +26,7 @@ func buildClusterRecords(
 	records := make([]inframonitoringtypes.ClusterRecord, 0, len(pageGroups))
 	for _, labels := range pageGroups {
 		compositeKey := compositeKeyFromLabels(labels, groupBy)
-		clusterName := labels[clusterNameAttrKey]
+		clusterName := labels[inframonitoringtypes.ClusterNameAttrKey]

 		record := inframonitoringtypes.ClusterRecord{ // initialize with default values
 			ClusterName:              clusterName,
@@ -87,6 +87,9 @@ func (m *module) getTopClusterGroups(
 	metadataMap map[string]map[string]string,
 ) ([]map[string]string, error) {
 	orderByKey := req.OrderBy.Key.Name
+	if orderByKey == inframonitoringtypes.ClusterNameAttrKey {
+		return inframonitoringtypes.PaginateMetadataByName(metadataMap, req.GroupBy, req.OrderBy.Direction, req.Offset, req.Limit, inframonitoringtypes.ClusterNameAttrKey), nil
+	}
 	queryNamesForOrderBy := orderByToClustersQueryNames[orderByKey]
 	rankingQueryName := queryNamesForOrderBy[len(queryNamesForOrderBy)-1]

--- a/pkg/modules/inframonitoring/implinframonitoring/clusters_constants.go
+++ b/pkg/modules/inframonitoring/implinframonitoring/clusters_constants.go
@@ -7,14 +7,9 @@ import (
 	"github.com/SigNoz/signoz/pkg/types/telemetrytypes"
 )

-// TODO(nikhilmantri0902): change to k8s.cluster.uid after showing the missing
-// data banner. Carried forward from v1 (see k8sClusterUIDAttrKey in
-// pkg/query-service/app/inframetrics/clusters.go).
-const clusterNameAttrKey = "k8s.cluster.name"
-
 var clusterNameGroupByKey = qbtypes.GroupByKey{
 	TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{
-		Name:          clusterNameAttrKey,
+		Name:          inframonitoringtypes.ClusterNameAttrKey,
 		FieldContext:  telemetrytypes.FieldContextResource,
 		FieldDataType: telemetrytypes.FieldDataTypeString,
 	},
--- a/pkg/modules/inframonitoring/implinframonitoring/daemonsets.go
+++ b/pkg/modules/inframonitoring/implinframonitoring/daemonsets.go
@@ -25,7 +25,7 @@ func buildDaemonSetRecords(
 	records := make([]inframonitoringtypes.DaemonSetRecord, 0, len(pageGroups))
 	for _, labels := range pageGroups {
 		compositeKey := compositeKeyFromLabels(labels, groupBy)
-		daemonSetName := labels[daemonSetNameAttrKey]
+		daemonSetName := labels[inframonitoringtypes.DaemonSetNameAttrKey]

 		record := inframonitoringtypes.DaemonSetRecord{ // initialize with default values
 			DaemonSetName:          daemonSetName,
@@ -95,6 +95,9 @@ func (m *module) getTopDaemonSetGroups(
 	metadataMap map[string]map[string]string,
 ) ([]map[string]string, error) {
 	orderByKey := req.OrderBy.Key.Name
+	if orderByKey == inframonitoringtypes.DaemonSetNameAttrKey {
+		return inframonitoringtypes.PaginateMetadataByName(metadataMap, req.GroupBy, req.OrderBy.Direction, req.Offset, req.Limit, inframonitoringtypes.DaemonSetNameAttrKey), nil
+	}
 	queryNamesForOrderBy := orderByToDaemonSetsQueryNames[orderByKey]
 	rankingQueryName := queryNamesForOrderBy[len(queryNamesForOrderBy)-1]

--- a/pkg/modules/inframonitoring/implinframonitoring/daemonsets_constants.go
+++ b/pkg/modules/inframonitoring/implinframonitoring/daemonsets_constants.go
@@ -7,14 +7,11 @@ import (
 	"github.com/SigNoz/signoz/pkg/types/telemetrytypes"
 )

-const (
-	daemonSetNameAttrKey     = "k8s.daemonset.name"
-	daemonSetsBaseFilterExpr = "k8s.daemonset.name != ''"
-)
+const daemonSetsBaseFilterExpr = "k8s.daemonset.name != ''"

 var daemonSetNameGroupByKey = qbtypes.GroupByKey{
 	TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{
-		Name:          daemonSetNameAttrKey,
+		Name:          inframonitoringtypes.DaemonSetNameAttrKey,
 		FieldContext:  telemetrytypes.FieldContextResource,
 		FieldDataType: telemetrytypes.FieldDataTypeString,
 	},
--- a/pkg/modules/inframonitoring/implinframonitoring/deployments.go
+++ b/pkg/modules/inframonitoring/implinframonitoring/deployments.go
@@ -25,7 +25,7 @@ func buildDeploymentRecords(
 	records := make([]inframonitoringtypes.DeploymentRecord, 0, len(pageGroups))
 	for _, labels := range pageGroups {
 		compositeKey := compositeKeyFromLabels(labels, groupBy)
-		deploymentName := labels[deploymentNameAttrKey]
+		deploymentName := labels[inframonitoringtypes.DeploymentNameAttrKey]

 		record := inframonitoringtypes.DeploymentRecord{ // initialize with default values
 			DeploymentName:          deploymentName,
@@ -95,6 +95,9 @@ func (m *module) getTopDeploymentGroups(
 	metadataMap map[string]map[string]string,
 ) ([]map[string]string, error) {
 	orderByKey := req.OrderBy.Key.Name
+	if orderByKey == inframonitoringtypes.DeploymentNameAttrKey {
+		return inframonitoringtypes.PaginateMetadataByName(metadataMap, req.GroupBy, req.OrderBy.Direction, req.Offset, req.Limit, inframonitoringtypes.DeploymentNameAttrKey), nil
+	}
 	queryNamesForOrderBy := orderByToDeploymentsQueryNames[orderByKey]
 	rankingQueryName := queryNamesForOrderBy[len(queryNamesForOrderBy)-1]

--- a/pkg/modules/inframonitoring/implinframonitoring/deployments_constants.go
+++ b/pkg/modules/inframonitoring/implinframonitoring/deployments_constants.go
@@ -7,14 +7,11 @@ import (
 	"github.com/SigNoz/signoz/pkg/types/telemetrytypes"
 )

-const (
-	deploymentNameAttrKey     = "k8s.deployment.name"
-	deploymentsBaseFilterExpr = "k8s.deployment.name != ''"
-)
+const deploymentsBaseFilterExpr = "k8s.deployment.name != ''"

 var deploymentNameGroupByKey = qbtypes.GroupByKey{
 	TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{
-		Name:          deploymentNameAttrKey,
+		Name:          inframonitoringtypes.DeploymentNameAttrKey,
 		FieldContext:  telemetrytypes.FieldContextResource,
 		FieldDataType: telemetrytypes.FieldDataTypeString,
 	},
--- a/pkg/modules/inframonitoring/implinframonitoring/hosts.go
+++ b/pkg/modules/inframonitoring/implinframonitoring/hosts.go
@@ -38,7 +38,7 @@ func (m *module) getPerGroupHostStatusCounts(
 		uint64(req.Start), uint64(req.End), nil,
 	)

-	hostNameExpr := fmt.Sprintf("JSONExtractString(labels, '%s')", hostNameAttrKey)
+	hostNameExpr := fmt.Sprintf("JSONExtractString(labels, '%s')", inframonitoringtypes.HostNameAttrKey)

 	sb := sqlbuilder.NewSelectBuilder()
 	selectCols := make([]string, 0, len(req.GroupBy)+2)
@@ -48,7 +48,7 @@ func (m *module) getPerGroupHostStatusCounts(
 		)
 	}

-	activeHostsSQ := m.getActiveHostsQuery(metricNames, hostNameAttrKey, sinceUnixMilli)
+	activeHostsSQ := m.getActiveHostsQuery(metricNames, inframonitoringtypes.HostNameAttrKey, sinceUnixMilli)
 	selectCols = append(selectCols,
 		fmt.Sprintf("uniqExactIf(%s, %s GLOBAL IN (%s)) AS active_host_count", hostNameExpr, hostNameExpr, sb.Var(activeHostsSQ)),
 		fmt.Sprintf("uniqExactIf(%s, %s != '') AS total_host_count", hostNameExpr, hostNameExpr),
@@ -142,7 +142,7 @@ func buildHostRecords(
 	records := make([]inframonitoringtypes.HostRecord, 0, len(pageGroups))
 	for _, labels := range pageGroups {
 		compositeKey := compositeKeyFromLabels(labels, groupBy)
-		hostName := labels[hostNameAttrKey]
+		hostName := labels[inframonitoringtypes.HostNameAttrKey]

 		activeStatus := inframonitoringtypes.HostStatusNone
 		activeHostCount := 0
@@ -216,6 +216,9 @@ func (m *module) getTopHostGroups(
 	metadataMap map[string]map[string]string,
 ) ([]map[string]string, error) {
 	orderByKey := req.OrderBy.Key.Name
+	if orderByKey == inframonitoringtypes.HostNameAttrKey {
+		return inframonitoringtypes.PaginateMetadataByName(metadataMap, req.GroupBy, req.OrderBy.Direction, req.Offset, req.Limit, inframonitoringtypes.HostNameAttrKey), nil
+	}
 	queryNamesForOrderBy := orderByToHostsQueryNames[orderByKey]
 	// The last entry is the formula/query whose value we sort by.
 	rankingQueryName := queryNamesForOrderBy[len(queryNamesForOrderBy)-1]
@@ -281,7 +284,7 @@ func (m *module) applyHostsActiveStatusFilter(req *inframonitoringtypes.Postable
 	if req.Filter.FilterByStatus == inframonitoringtypes.HostStatusInactive {
 		op = "NOT IN"
 	}
-	statusClause := fmt.Sprintf("%s %s (%s)", hostNameAttrKey, op, strings.Join(activeHosts, ", "))
+	statusClause := fmt.Sprintf("%s %s (%s)", inframonitoringtypes.HostNameAttrKey, op, strings.Join(activeHosts, ", "))
 	req.Filter.Expression = mergeFilterExpressions(req.Filter.Expression, statusClause)
 	return false
 }
--- a/pkg/modules/inframonitoring/implinframonitoring/hosts_constants.go
+++ b/pkg/modules/inframonitoring/implinframonitoring/hosts_constants.go
@@ -7,14 +7,10 @@ import (
 	"github.com/SigNoz/signoz/pkg/types/telemetrytypes"
 )

-const (
-	hostNameAttrKey = "host.name"
-)
-
 // Helper group-by key used across all queries.
 var hostNameGroupByKey = qbtypes.GroupByKey{
 	TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{
-		Name:          hostNameAttrKey,
+		Name:          inframonitoringtypes.HostNameAttrKey,
 		FieldContext:  telemetrytypes.FieldContextResource,
 		FieldDataType: telemetrytypes.FieldDataTypeString,
 	},
--- a/pkg/modules/inframonitoring/implinframonitoring/jobs.go
+++ b/pkg/modules/inframonitoring/implinframonitoring/jobs.go
@@ -25,7 +25,7 @@ func buildJobRecords(
 	records := make([]inframonitoringtypes.JobRecord, 0, len(pageGroups))
 	for _, labels := range pageGroups {
 		compositeKey := compositeKeyFromLabels(labels, groupBy)
-		jobName := labels[jobNameAttrKey]
+		jobName := labels[inframonitoringtypes.JobNameAttrKey]

 		record := inframonitoringtypes.JobRecord{ // initialize with default values
 			JobName:               jobName,
@@ -103,6 +103,9 @@ func (m *module) getTopJobGroups(
 	metadataMap map[string]map[string]string,
 ) ([]map[string]string, error) {
 	orderByKey := req.OrderBy.Key.Name
+	if orderByKey == inframonitoringtypes.JobNameAttrKey {
+		return inframonitoringtypes.PaginateMetadataByName(metadataMap, req.GroupBy, req.OrderBy.Direction, req.Offset, req.Limit, inframonitoringtypes.JobNameAttrKey), nil
+	}
 	queryNamesForOrderBy := orderByToJobsQueryNames[orderByKey]
 	rankingQueryName := queryNamesForOrderBy[len(queryNamesForOrderBy)-1]

--- a/pkg/modules/inframonitoring/implinframonitoring/jobs_constants.go
+++ b/pkg/modules/inframonitoring/implinframonitoring/jobs_constants.go
@@ -7,14 +7,11 @@ import (
 	"github.com/SigNoz/signoz/pkg/types/telemetrytypes"
 )

-const (
-	jobNameAttrKey     = "k8s.job.name"
-	jobsBaseFilterExpr = "k8s.job.name != ''"
-)
+const jobsBaseFilterExpr = "k8s.job.name != ''"

 var jobNameGroupByKey = qbtypes.GroupByKey{
 	TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{
-		Name:          jobNameAttrKey,
+		Name:          inframonitoringtypes.JobNameAttrKey,
 		FieldContext:  telemetrytypes.FieldContextResource,
 		FieldDataType: telemetrytypes.FieldDataTypeString,
 	},
--- a/pkg/modules/inframonitoring/implinframonitoring/module.go
+++ b/pkg/modules/inframonitoring/implinframonitoring/module.go
@@ -100,7 +100,7 @@ func (m *module) ListHosts(ctx context.Context, orgID valuer.UUID, req *inframon
 	// Determine active hosts: those with metrics reported in the last 10 minutes.
 	// Compute the cutoff once so every downstream query/subquery agrees on what "active" means.
 	sinceUnixMilli := time.Now().Add(-10 * time.Minute).UTC().UnixMilli()
-	activeHostsMap, err := m.getActiveHosts(ctx, hostsTableMetricNamesList, hostNameAttrKey, sinceUnixMilli)
+	activeHostsMap, err := m.getActiveHosts(ctx, hostsTableMetricNamesList, inframonitoringtypes.HostNameAttrKey, sinceUnixMilli)
 	if err != nil {
 		return nil, err
 	}
@@ -146,7 +146,7 @@ func (m *module) ListHosts(ctx context.Context, orgID valuer.UUID, req *inframon
 	// When host.name is not in groupBy, we need to run an additional query to get the counts per group for the current page,
 	// using the same filter expression as the main query (including user filters + page groups IN clause).
 	hostCounts := make(map[string]groupHostStatusCounts)
-	isHostNameInGroupBy := isKeyInGroupByAttrs(req.GroupBy, hostNameAttrKey)
+	isHostNameInGroupBy := isKeyInGroupByAttrs(req.GroupBy, inframonitoringtypes.HostNameAttrKey)
 	if !isHostNameInGroupBy {
 		hostCounts, err = m.getPerGroupHostStatusCounts(ctx, req, hostsTableMetricNamesList, pageGroups, sinceUnixMilli)
 		if err != nil {
@@ -324,7 +324,7 @@ func (m *module) ListNodes(ctx context.Context, orgID valuer.UUID, req *inframon
 		return nil, err
 	}

-	isNodeNameInGroupBy := isKeyInGroupByAttrs(req.GroupBy, nodeNameAttrKey)
+	isNodeNameInGroupBy := isKeyInGroupByAttrs(req.GroupBy, inframonitoringtypes.NodeNameAttrKey)
 	resp.Records = buildNodeRecords(isNodeNameInGroupBy, queryResp, pageGroups, req.GroupBy, metadataMap, nodeConditionCounts, podPhaseCounts)
 	resp.Warning = queryResp.Warning

--- a/pkg/modules/inframonitoring/implinframonitoring/namespaces.go
+++ b/pkg/modules/inframonitoring/implinframonitoring/namespaces.go
@@ -24,7 +24,7 @@ func buildNamespaceRecords(
 	records := make([]inframonitoringtypes.NamespaceRecord, 0, len(pageGroups))
 	for _, labels := range pageGroups {
 		compositeKey := compositeKeyFromLabels(labels, groupBy)
-		namespaceName := labels[namespaceNameAttrKey]
+		namespaceName := labels[inframonitoringtypes.NamespaceNameAttrKey]

 		record := inframonitoringtypes.NamespaceRecord{ // initialize with default values
 			NamespaceName:   namespaceName,
@@ -70,6 +70,9 @@ func (m *module) getTopNamespaceGroups(
 	metadataMap map[string]map[string]string,
 ) ([]map[string]string, error) {
 	orderByKey := req.OrderBy.Key.Name
+	if orderByKey == inframonitoringtypes.NamespaceNameAttrKey {
+		return inframonitoringtypes.PaginateMetadataByName(metadataMap, req.GroupBy, req.OrderBy.Direction, req.Offset, req.Limit, inframonitoringtypes.NamespaceNameAttrKey), nil
+	}
 	queryNamesForOrderBy := orderByToNamespacesQueryNames[orderByKey]
 	rankingQueryName := queryNamesForOrderBy[len(queryNamesForOrderBy)-1]

--- a/pkg/modules/inframonitoring/implinframonitoring/namespaces_constants.go
+++ b/pkg/modules/inframonitoring/implinframonitoring/namespaces_constants.go
@@ -7,13 +7,9 @@ import (
 	"github.com/SigNoz/signoz/pkg/types/telemetrytypes"
 )

-const (
-	namespaceNameAttrKey = "k8s.namespace.name"
-)
-
 var namespaceNameGroupByKey = qbtypes.GroupByKey{
 	TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{
-		Name:          namespaceNameAttrKey,
+		Name:          inframonitoringtypes.NamespaceNameAttrKey,
 		FieldContext:  telemetrytypes.FieldContextResource,
 		FieldDataType: telemetrytypes.FieldDataTypeString,
 	},
--- a/pkg/modules/inframonitoring/implinframonitoring/nodes.go
+++ b/pkg/modules/inframonitoring/implinframonitoring/nodes.go
@@ -33,7 +33,7 @@ func buildNodeRecords(
 	records := make([]inframonitoringtypes.NodeRecord, 0, len(pageGroups))
 	for _, labels := range pageGroups {
 		compositeKey := compositeKeyFromLabels(labels, groupBy)
-		nodeName := labels[nodeNameAttrKey]
+		nodeName := labels[inframonitoringtypes.NodeNameAttrKey]

 		record := inframonitoringtypes.NodeRecord{ // initialize with default values
 			NodeName:              nodeName,
@@ -105,6 +105,9 @@ func (m *module) getTopNodeGroups(
 	metadataMap map[string]map[string]string,
 ) ([]map[string]string, error) {
 	orderByKey := req.OrderBy.Key.Name
+	if orderByKey == inframonitoringtypes.NodeNameAttrKey {
+		return inframonitoringtypes.PaginateMetadataByName(metadataMap, req.GroupBy, req.OrderBy.Direction, req.Offset, req.Limit, inframonitoringtypes.NodeNameAttrKey), nil
+	}
 	queryNamesForOrderBy := orderByToNodesQueryNames[orderByKey]
 	rankingQueryName := queryNamesForOrderBy[len(queryNamesForOrderBy)-1]

@@ -201,7 +204,7 @@ func (m *module) getPerGroupNodeConditionCounts(
 	timeSeriesFPs := sqlbuilder.NewSelectBuilder()
 	timeSeriesFPsSelectCols := []string{
 		"fingerprint",
-		fmt.Sprintf("JSONExtractString(labels, %s) AS node_name", timeSeriesFPs.Var(nodeNameAttrKey)),
+		fmt.Sprintf("JSONExtractString(labels, %s) AS node_name", timeSeriesFPs.Var(inframonitoringtypes.NodeNameAttrKey)),
 	}
 	for _, key := range groupBy {
 		timeSeriesFPsSelectCols = append(timeSeriesFPsSelectCols,
--- a/pkg/modules/inframonitoring/implinframonitoring/nodes_constants.go
+++ b/pkg/modules/inframonitoring/implinframonitoring/nodes_constants.go
@@ -7,14 +7,11 @@ import (
 	"github.com/SigNoz/signoz/pkg/types/telemetrytypes"
 )

-const (
-	nodeNameAttrKey         = "k8s.node.name"
-	nodeConditionMetricName = "k8s.node.condition_ready"
-)
+const nodeConditionMetricName = "k8s.node.condition_ready"

 var nodeNameGroupByKey = qbtypes.GroupByKey{
 	TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{
-		Name:          nodeNameAttrKey,
+		Name:          inframonitoringtypes.NodeNameAttrKey,
 		FieldContext:  telemetrytypes.FieldContextResource,
 		FieldDataType: telemetrytypes.FieldDataTypeString,
 	},
--- a/pkg/modules/inframonitoring/implinframonitoring/pods.go
+++ b/pkg/modules/inframonitoring/implinframonitoring/pods.go
@@ -124,6 +124,9 @@ func (m *module) getTopPodGroups(
 	metadataMap map[string]map[string]string,
 ) ([]map[string]string, error) {
 	orderByKey := req.OrderBy.Key.Name
+	if orderByKey == inframonitoringtypes.PodNameAttrKey {
+		return inframonitoringtypes.PaginateMetadataByName(metadataMap, req.GroupBy, req.OrderBy.Direction, req.Offset, req.Limit, inframonitoringtypes.PodNameAttrKey), nil
+	}
 	queryNamesForOrderBy := orderByToPodsQueryNames[orderByKey]
 	rankingQueryName := queryNamesForOrderBy[len(queryNamesForOrderBy)-1]

--- a/pkg/modules/inframonitoring/implinframonitoring/statefulsets.go
+++ b/pkg/modules/inframonitoring/implinframonitoring/statefulsets.go
@@ -25,7 +25,7 @@ func buildStatefulSetRecords(
 	records := make([]inframonitoringtypes.StatefulSetRecord, 0, len(pageGroups))
 	for _, labels := range pageGroups {
 		compositeKey := compositeKeyFromLabels(labels, groupBy)
-		statefulSetName := labels[statefulSetNameAttrKey]
+		statefulSetName := labels[inframonitoringtypes.StatefulSetNameAttrKey]

 		record := inframonitoringtypes.StatefulSetRecord{ // initialize with default values
 			StatefulSetName:          statefulSetName,
@@ -95,6 +95,9 @@ func (m *module) getTopStatefulSetGroups(
 	metadataMap map[string]map[string]string,
 ) ([]map[string]string, error) {
 	orderByKey := req.OrderBy.Key.Name
+	if orderByKey == inframonitoringtypes.StatefulSetNameAttrKey {
+		return inframonitoringtypes.PaginateMetadataByName(metadataMap, req.GroupBy, req.OrderBy.Direction, req.Offset, req.Limit, inframonitoringtypes.StatefulSetNameAttrKey), nil
+	}
 	queryNamesForOrderBy := orderByToStatefulSetsQueryNames[orderByKey]
 	rankingQueryName := queryNamesForOrderBy[len(queryNamesForOrderBy)-1]

--- a/pkg/modules/inframonitoring/implinframonitoring/statefulsets_constants.go
+++ b/pkg/modules/inframonitoring/implinframonitoring/statefulsets_constants.go
@@ -7,14 +7,11 @@ import (
 	"github.com/SigNoz/signoz/pkg/types/telemetrytypes"
 )

-const (
-	statefulSetNameAttrKey     = "k8s.statefulset.name"
-	statefulSetsBaseFilterExpr = "k8s.statefulset.name != ''"
-)
+const statefulSetsBaseFilterExpr = "k8s.statefulset.name != ''"

 var statefulSetNameGroupByKey = qbtypes.GroupByKey{
 	TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{
-		Name:          statefulSetNameAttrKey,
+		Name:          inframonitoringtypes.StatefulSetNameAttrKey,
 		FieldContext:  telemetrytypes.FieldContextResource,
 		FieldDataType: telemetrytypes.FieldDataTypeString,
 	},
--- a/pkg/modules/inframonitoring/implinframonitoring/volumes.go
+++ b/pkg/modules/inframonitoring/implinframonitoring/volumes.go
@@ -23,7 +23,7 @@ func buildVolumeRecords(
 	records := make([]inframonitoringtypes.VolumeRecord, 0, len(pageGroups))
 	for _, labels := range pageGroups {
 		compositeKey := compositeKeyFromLabels(labels, groupBy)
-		pvcName := labels[persistentVolumeClaimNameAttrKey]
+		pvcName := labels[inframonitoringtypes.PersistentVolumeClaimNameAttrKey]

 		record := inframonitoringtypes.VolumeRecord{ // initialize with default values
 			PersistentVolumeClaimName: pvcName,
@@ -75,6 +75,9 @@ func (m *module) getTopVolumeGroups(
 	metadataMap map[string]map[string]string,
 ) ([]map[string]string, error) {
 	orderByKey := req.OrderBy.Key.Name
+	if orderByKey == inframonitoringtypes.PersistentVolumeClaimNameAttrKey {
+		return inframonitoringtypes.PaginateMetadataByName(metadataMap, req.GroupBy, req.OrderBy.Direction, req.Offset, req.Limit, inframonitoringtypes.PersistentVolumeClaimNameAttrKey), nil
+	}
 	queryNamesForOrderBy := orderByToVolumesQueryNames[orderByKey]
 	rankingQueryName := queryNamesForOrderBy[len(queryNamesForOrderBy)-1]

--- a/pkg/modules/inframonitoring/implinframonitoring/volumes_constants.go
+++ b/pkg/modules/inframonitoring/implinframonitoring/volumes_constants.go
@@ -7,14 +7,11 @@ import (
 	"github.com/SigNoz/signoz/pkg/types/telemetrytypes"
 )

-const (
-	persistentVolumeClaimNameAttrKey = "k8s.persistentvolumeclaim.name"
-	volumesBaseFilterExpr            = "k8s.persistentvolumeclaim.name != ''"
-)
+const volumesBaseFilterExpr = "k8s.persistentvolumeclaim.name != ''"

 var pvcNameGroupByKey = qbtypes.GroupByKey{
 	TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{
-		Name:          persistentVolumeClaimNameAttrKey,
+		Name:          inframonitoringtypes.PersistentVolumeClaimNameAttrKey,
 		FieldContext:  telemetrytypes.FieldContextResource,
 		FieldDataType: telemetrytypes.FieldDataTypeString,
 	},
--- a/pkg/types/inframonitoringtypes/clusters.go
+++ b/pkg/types/inframonitoringtypes/clusters.go
@@ -19,8 +19,8 @@ type Clusters struct {

 type ClusterRecord struct {
 	// TODO(nikhilmantri0902): once the underlying attr key is migrated to
-	// k8s.cluster.uid (see clusterNameAttrKey TODO in implinframonitoring),
-	// surface ClusterUID alongside (or replace) ClusterName.
+	// k8s.cluster.uid (see ClusterNameAttrKey), surface ClusterUID alongside
+	// (or replace) ClusterName.
 	ClusterName              string                `json:"clusterName" required:"true"`
 	ClusterCPU               float64               `json:"clusterCPU" required:"true"`
 	ClusterCPUAllocatable    float64               `json:"clusterCPUAllocatable" required:"true"`
@@ -88,6 +88,9 @@ func (req *PostableClusters) Validate() error {
 		if req.OrderBy.Direction != qbtypes.OrderDirectionAsc && req.OrderBy.Direction != qbtypes.OrderDirectionDesc {
 			return errors.NewInvalidInputf(errors.CodeInvalidInput, "invalid order by direction: %s", req.OrderBy.Direction)
 		}
+		if req.OrderBy.Key.Name == ClusterNameAttrKey && len(req.GroupBy) > 0 {
+			return errors.NewInvalidInputf(errors.CodeInvalidInput, "order by '%s' is only allowed when groupBy is empty", ClusterNameAttrKey)
+		}
 	}

 	return nil
--- a/pkg/types/inframonitoringtypes/clusters_constants.go
+++ b/pkg/types/inframonitoringtypes/clusters_constants.go
@@ -1,5 +1,7 @@
 package inframonitoringtypes

+const ClusterNameAttrKey = "k8s.cluster.name"
+
 const (
 	ClustersOrderByCPU               = "cpu"
 	ClustersOrderByCPUAllocatable    = "cpu_allocatable"
@@ -12,4 +14,5 @@ var ClustersValidOrderByKeys = []string{
 	ClustersOrderByCPUAllocatable,
 	ClustersOrderByMemory,
 	ClustersOrderByMemoryAllocatable,
+	ClusterNameAttrKey,
 }
--- a/pkg/types/inframonitoringtypes/clusters_test.go
+++ b/pkg/types/inframonitoringtypes/clusters_test.go
@@ -275,6 +275,57 @@ func TestPostableClusters_Validate(t *testing.T) {
 			},
 			wantErr: true,
 		},
+		{
+			name: "orderBy name asc with empty groupBy is valid",
+			req: &PostableClusters{
+				Start:  1000,
+				End:    2000,
+				Limit:  100,
+				Offset: 0,
+				OrderBy: &qbtypes.OrderBy{
+					Key: qbtypes.OrderByKey{
+						TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: ClusterNameAttrKey},
+					},
+					Direction: qbtypes.OrderDirectionAsc,
+				},
+			},
+			wantErr: false,
+		},
+		{
+			name: "orderBy name desc with empty groupBy is valid",
+			req: &PostableClusters{
+				Start:  1000,
+				End:    2000,
+				Limit:  100,
+				Offset: 0,
+				OrderBy: &qbtypes.OrderBy{
+					Key: qbtypes.OrderByKey{
+						TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: ClusterNameAttrKey},
+					},
+					Direction: qbtypes.OrderDirectionDesc,
+				},
+			},
+			wantErr: false,
+		},
+		{
+			name: "orderBy name with non-empty groupBy is rejected",
+			req: &PostableClusters{
+				Start:  1000,
+				End:    2000,
+				Limit:  100,
+				Offset: 0,
+				GroupBy: []qbtypes.GroupByKey{
+					{TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: "k8s.cluster.name"}},
+				},
+				OrderBy: &qbtypes.OrderBy{
+					Key: qbtypes.OrderByKey{
+						TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: ClusterNameAttrKey},
+					},
+					Direction: qbtypes.OrderDirectionAsc,
+				},
+			},
+			wantErr: true,
+		},
 	}

 	for _, tt := range tests {
--- a/pkg/types/inframonitoringtypes/daemonsets.go
+++ b/pkg/types/inframonitoringtypes/daemonsets.go
@@ -88,6 +88,9 @@ func (req *PostableDaemonSets) Validate() error {
 		if req.OrderBy.Direction != qbtypes.OrderDirectionAsc && req.OrderBy.Direction != qbtypes.OrderDirectionDesc {
 			return errors.NewInvalidInputf(errors.CodeInvalidInput, "invalid order by direction: %s", req.OrderBy.Direction)
 		}
+		if req.OrderBy.Key.Name == DaemonSetNameAttrKey && len(req.GroupBy) > 0 {
+			return errors.NewInvalidInputf(errors.CodeInvalidInput, "order by '%s' is only allowed when groupBy is empty", DaemonSetNameAttrKey)
+		}
 	}

 	return nil
--- a/pkg/types/inframonitoringtypes/daemonsets_constants.go
+++ b/pkg/types/inframonitoringtypes/daemonsets_constants.go
@@ -1,12 +1,14 @@
 package inframonitoringtypes

+const DaemonSetNameAttrKey = "k8s.daemonset.name"
+
 const (
-	DaemonSetsOrderByCPU            = "cpu"
-	DaemonSetsOrderByCPURequest     = "cpu_request"
-	DaemonSetsOrderByCPULimit       = "cpu_limit"
-	DaemonSetsOrderByMemory         = "memory"
-	DaemonSetsOrderByMemoryRequest  = "memory_request"
-	DaemonSetsOrderByMemoryLimit    = "memory_limit"
+	DaemonSetsOrderByCPU           = "cpu"
+	DaemonSetsOrderByCPURequest    = "cpu_request"
+	DaemonSetsOrderByCPULimit      = "cpu_limit"
+	DaemonSetsOrderByMemory        = "memory"
+	DaemonSetsOrderByMemoryRequest = "memory_request"
+	DaemonSetsOrderByMemoryLimit   = "memory_limit"
 	DaemonSetsOrderByDesiredNodes  = "desired_nodes"
 	DaemonSetsOrderByCurrentNodes  = "current_nodes"
 )
@@ -20,4 +22,5 @@ var DaemonSetsValidOrderByKeys = []string{
 	DaemonSetsOrderByMemoryLimit,
 	DaemonSetsOrderByDesiredNodes,
 	DaemonSetsOrderByCurrentNodes,
+	DaemonSetNameAttrKey,
 }
--- a/pkg/types/inframonitoringtypes/daemonsets_test.go
+++ b/pkg/types/inframonitoringtypes/daemonsets_test.go
@@ -257,6 +257,63 @@ func TestPostableDaemonSets_Validate(t *testing.T) {
 			},
 			wantErr: true,
 		},
+		{
+			name: "orderBy name asc with empty groupBy is valid",
+			req: &PostableDaemonSets{
+				Start:  1000,
+				End:    2000,
+				Limit:  100,
+				Offset: 0,
+				OrderBy: &qbtypes.OrderBy{
+					Key: qbtypes.OrderByKey{
+						TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{
+							Name: DaemonSetNameAttrKey,
+						},
+					},
+					Direction: qbtypes.OrderDirectionAsc,
+				},
+			},
+			wantErr: false,
+		},
+		{
+			name: "orderBy name desc with empty groupBy is valid",
+			req: &PostableDaemonSets{
+				Start:  1000,
+				End:    2000,
+				Limit:  100,
+				Offset: 0,
+				OrderBy: &qbtypes.OrderBy{
+					Key: qbtypes.OrderByKey{
+						TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{
+							Name: DaemonSetNameAttrKey,
+						},
+					},
+					Direction: qbtypes.OrderDirectionDesc,
+				},
+			},
+			wantErr: false,
+		},
+		{
+			name: "orderBy name with non-empty groupBy is rejected",
+			req: &PostableDaemonSets{
+				Start:  1000,
+				End:    2000,
+				Limit:  100,
+				Offset: 0,
+				GroupBy: []qbtypes.GroupByKey{
+					{TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: "k8s.namespace.name"}},
+				},
+				OrderBy: &qbtypes.OrderBy{
+					Key: qbtypes.OrderByKey{
+						TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{
+							Name: DaemonSetNameAttrKey,
+						},
+					},
+					Direction: qbtypes.OrderDirectionAsc,
+				},
+			},
+			wantErr: true,
+		},
 	}

 	for _, tt := range tests {
--- a/pkg/types/inframonitoringtypes/deployments.go
+++ b/pkg/types/inframonitoringtypes/deployments.go
@@ -88,6 +88,9 @@ func (req *PostableDeployments) Validate() error {
 		if req.OrderBy.Direction != qbtypes.OrderDirectionAsc && req.OrderBy.Direction != qbtypes.OrderDirectionDesc {
 			return errors.NewInvalidInputf(errors.CodeInvalidInput, "invalid order by direction: %s", req.OrderBy.Direction)
 		}
+		if req.OrderBy.Key.Name == DeploymentNameAttrKey && len(req.GroupBy) > 0 {
+			return errors.NewInvalidInputf(errors.CodeInvalidInput, "order by '%s' is only allowed when groupBy is empty", DeploymentNameAttrKey)
+		}
 	}

 	return nil
--- a/pkg/types/inframonitoringtypes/deployments_constants.go
+++ b/pkg/types/inframonitoringtypes/deployments_constants.go
@@ -1,5 +1,7 @@
 package inframonitoringtypes

+const DeploymentNameAttrKey = "k8s.deployment.name"
+
 const (
 	DeploymentsOrderByCPU           = "cpu"
 	DeploymentsOrderByCPURequest    = "cpu_request"
@@ -20,4 +22,5 @@ var DeploymentsValidOrderByKeys = []string{
 	DeploymentsOrderByMemoryLimit,
 	DeploymentsOrderByDesiredPods,
 	DeploymentsOrderByAvailablePods,
+	DeploymentNameAttrKey,
 }
--- a/pkg/types/inframonitoringtypes/deployments_test.go
+++ b/pkg/types/inframonitoringtypes/deployments_test.go
@@ -257,6 +257,57 @@ func TestPostableDeployments_Validate(t *testing.T) {
 			},
 			wantErr: true,
 		},
+		{
+			name: "orderBy name asc with empty groupBy is valid",
+			req: &PostableDeployments{
+				Start:  1000,
+				End:    2000,
+				Limit:  100,
+				Offset: 0,
+				OrderBy: &qbtypes.OrderBy{
+					Key: qbtypes.OrderByKey{
+						TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: DeploymentNameAttrKey},
+					},
+					Direction: qbtypes.OrderDirectionAsc,
+				},
+			},
+			wantErr: false,
+		},
+		{
+			name: "orderBy name desc with empty groupBy is valid",
+			req: &PostableDeployments{
+				Start:  1000,
+				End:    2000,
+				Limit:  100,
+				Offset: 0,
+				OrderBy: &qbtypes.OrderBy{
+					Key: qbtypes.OrderByKey{
+						TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: DeploymentNameAttrKey},
+					},
+					Direction: qbtypes.OrderDirectionDesc,
+				},
+			},
+			wantErr: false,
+		},
+		{
+			name: "orderBy name with non-empty groupBy is rejected",
+			req: &PostableDeployments{
+				Start:  1000,
+				End:    2000,
+				Limit:  100,
+				Offset: 0,
+				GroupBy: []qbtypes.GroupByKey{
+					{TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: "k8s.namespace.name"}},
+				},
+				OrderBy: &qbtypes.OrderBy{
+					Key: qbtypes.OrderByKey{
+						TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: DeploymentNameAttrKey},
+					},
+					Direction: qbtypes.OrderDirectionAsc,
+				},
+			},
+			wantErr: true,
+		},
 	}

 	for _, tt := range tests {
--- a/pkg/types/inframonitoringtypes/hosts.go
+++ b/pkg/types/inframonitoringtypes/hosts.go
@@ -100,6 +100,9 @@ func (req *PostableHosts) Validate() error {
 		if req.OrderBy.Direction != qbtypes.OrderDirectionAsc && req.OrderBy.Direction != qbtypes.OrderDirectionDesc {
 			return errors.NewInvalidInputf(errors.CodeInvalidInput, "invalid order by direction: %s", req.OrderBy.Direction)
 		}
+		if req.OrderBy.Key.Name == HostNameAttrKey && len(req.GroupBy) > 0 {
+			return errors.NewInvalidInputf(errors.CodeInvalidInput, "order by '%s' is only allowed when groupBy is empty", HostNameAttrKey)
+		}
 	}

 	return nil
--- a/pkg/types/inframonitoringtypes/hosts_constants.go
+++ b/pkg/types/inframonitoringtypes/hosts_constants.go
@@ -20,6 +20,8 @@ func (HostStatus) Enum() []any {
 	}
 }

+const HostNameAttrKey = "host.name"
+
 const (
 	HostsOrderByCPU       = "cpu"
 	HostsOrderByMemory    = "memory"
@@ -34,4 +36,5 @@ var HostsValidOrderByKeys = []string{
 	HostsOrderByWait,
 	HostsOrderByDiskUsage,
 	HostsOrderByLoad15,
+	HostNameAttrKey,
 }
--- a/pkg/types/inframonitoringtypes/hosts_test.go
+++ b/pkg/types/inframonitoringtypes/hosts_test.go
@@ -228,6 +228,57 @@ func TestHostsListRequest_Validate(t *testing.T) {
 			},
 			wantErr: true,
 		},
+		{
+			name: "orderBy name asc with empty groupBy is valid",
+			req: &PostableHosts{
+				Start:  1000,
+				End:    2000,
+				Limit:  100,
+				Offset: 0,
+				OrderBy: &qbtypes.OrderBy{
+					Key: qbtypes.OrderByKey{
+						TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: HostNameAttrKey},
+					},
+					Direction: qbtypes.OrderDirectionAsc,
+				},
+			},
+			wantErr: false,
+		},
+		{
+			name: "orderBy name desc with empty groupBy is valid",
+			req: &PostableHosts{
+				Start:  1000,
+				End:    2000,
+				Limit:  100,
+				Offset: 0,
+				OrderBy: &qbtypes.OrderBy{
+					Key: qbtypes.OrderByKey{
+						TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: HostNameAttrKey},
+					},
+					Direction: qbtypes.OrderDirectionDesc,
+				},
+			},
+			wantErr: false,
+		},
+		{
+			name: "orderBy name with non-empty groupBy is rejected",
+			req: &PostableHosts{
+				Start:  1000,
+				End:    2000,
+				Limit:  100,
+				Offset: 0,
+				GroupBy: []qbtypes.GroupByKey{
+					{TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: "os.type"}},
+				},
+				OrderBy: &qbtypes.OrderBy{
+					Key: qbtypes.OrderByKey{
+						TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: HostNameAttrKey},
+					},
+					Direction: qbtypes.OrderDirectionAsc,
+				},
+			},
+			wantErr: true,
+		},
 	}

 	for _, tt := range tests {
--- a/pkg/types/inframonitoringtypes/jobs.go
+++ b/pkg/types/inframonitoringtypes/jobs.go
@@ -90,6 +90,9 @@ func (req *PostableJobs) Validate() error {
 		if req.OrderBy.Direction != qbtypes.OrderDirectionAsc && req.OrderBy.Direction != qbtypes.OrderDirectionDesc {
 			return errors.NewInvalidInputf(errors.CodeInvalidInput, "invalid order by direction: %s", req.OrderBy.Direction)
 		}
+		if req.OrderBy.Key.Name == JobNameAttrKey && len(req.GroupBy) > 0 {
+			return errors.NewInvalidInputf(errors.CodeInvalidInput, "order by '%s' is only allowed when groupBy is empty", JobNameAttrKey)
+		}
 	}

 	return nil
--- a/pkg/types/inframonitoringtypes/jobs_constants.go
+++ b/pkg/types/inframonitoringtypes/jobs_constants.go
@@ -1,5 +1,7 @@
 package inframonitoringtypes

+const JobNameAttrKey = "k8s.job.name"
+
 const (
 	JobsOrderByCPU                   = "cpu"
 	JobsOrderByCPURequest            = "cpu_request"
@@ -24,4 +26,5 @@ var JobsValidOrderByKeys = []string{
 	JobsOrderByActivePods,
 	JobsOrderByFailedPods,
 	JobsOrderBySuccessfulPods,
+	JobNameAttrKey,
 }
--- a/pkg/types/inframonitoringtypes/jobs_test.go
+++ b/pkg/types/inframonitoringtypes/jobs_test.go
@@ -293,6 +293,57 @@ func TestPostableJobs_Validate(t *testing.T) {
 			},
 			wantErr: true,
 		},
+		{
+			name: "orderBy name asc with empty groupBy is valid",
+			req: &PostableJobs{
+				Start:  1000,
+				End:    2000,
+				Limit:  100,
+				Offset: 0,
+				OrderBy: &qbtypes.OrderBy{
+					Key: qbtypes.OrderByKey{
+						TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: JobNameAttrKey},
+					},
+					Direction: qbtypes.OrderDirectionAsc,
+				},
+			},
+			wantErr: false,
+		},
+		{
+			name: "orderBy name desc with empty groupBy is valid",
+			req: &PostableJobs{
+				Start:  1000,
+				End:    2000,
+				Limit:  100,
+				Offset: 0,
+				OrderBy: &qbtypes.OrderBy{
+					Key: qbtypes.OrderByKey{
+						TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: JobNameAttrKey},
+					},
+					Direction: qbtypes.OrderDirectionDesc,
+				},
+			},
+			wantErr: false,
+		},
+		{
+			name: "orderBy name with non-empty groupBy is rejected",
+			req: &PostableJobs{
+				Start:  1000,
+				End:    2000,
+				Limit:  100,
+				Offset: 0,
+				GroupBy: []qbtypes.GroupByKey{
+					{TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: "k8s.namespace.name"}},
+				},
+				OrderBy: &qbtypes.OrderBy{
+					Key: qbtypes.OrderByKey{
+						TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: JobNameAttrKey},
+					},
+					Direction: qbtypes.OrderDirectionAsc,
+				},
+			},
+			wantErr: true,
+		},
 	}

 	for _, tt := range tests {
--- a/pkg/types/inframonitoringtypes/namespaces.go
+++ b/pkg/types/inframonitoringtypes/namespaces.go
@@ -82,6 +82,9 @@ func (req *PostableNamespaces) Validate() error {
 		if req.OrderBy.Direction != qbtypes.OrderDirectionAsc && req.OrderBy.Direction != qbtypes.OrderDirectionDesc {
 			return errors.NewInvalidInputf(errors.CodeInvalidInput, "invalid order by direction: %s", req.OrderBy.Direction)
 		}
+		if req.OrderBy.Key.Name == NamespaceNameAttrKey && len(req.GroupBy) > 0 {
+			return errors.NewInvalidInputf(errors.CodeInvalidInput, "order by '%s' is only allowed when groupBy is empty", NamespaceNameAttrKey)
+		}
 	}

 	return nil
--- a/pkg/types/inframonitoringtypes/namespaces_constants.go
+++ b/pkg/types/inframonitoringtypes/namespaces_constants.go
@@ -1,5 +1,7 @@
 package inframonitoringtypes

+const NamespaceNameAttrKey = "k8s.namespace.name"
+
 const (
 	NamespacesOrderByCPU    = "cpu"
 	NamespacesOrderByMemory = "memory"
@@ -8,4 +10,5 @@ const (
 var NamespacesValidOrderByKeys = []string{
 	NamespacesOrderByCPU,
 	NamespacesOrderByMemory,
+	NamespaceNameAttrKey,
 }
--- a/pkg/types/inframonitoringtypes/namespaces_test.go
+++ b/pkg/types/inframonitoringtypes/namespaces_test.go
@@ -221,6 +221,57 @@ func TestPostableNamespaces_Validate(t *testing.T) {
 			},
 			wantErr: true,
 		},
+		{
+			name: "orderBy name asc with empty groupBy is valid",
+			req: &PostableNamespaces{
+				Start:  1000,
+				End:    2000,
+				Limit:  100,
+				Offset: 0,
+				OrderBy: &qbtypes.OrderBy{
+					Key: qbtypes.OrderByKey{
+						TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: NamespaceNameAttrKey},
+					},
+					Direction: qbtypes.OrderDirectionAsc,
+				},
+			},
+			wantErr: false,
+		},
+		{
+			name: "orderBy name desc with empty groupBy is valid",
+			req: &PostableNamespaces{
+				Start:  1000,
+				End:    2000,
+				Limit:  100,
+				Offset: 0,
+				OrderBy: &qbtypes.OrderBy{
+					Key: qbtypes.OrderByKey{
+						TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: NamespaceNameAttrKey},
+					},
+					Direction: qbtypes.OrderDirectionDesc,
+				},
+			},
+			wantErr: false,
+		},
+		{
+			name: "orderBy name with non-empty groupBy is rejected",
+			req: &PostableNamespaces{
+				Start:  1000,
+				End:    2000,
+				Limit:  100,
+				Offset: 0,
+				GroupBy: []qbtypes.GroupByKey{
+					{TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: "k8s.cluster.name"}},
+				},
+				OrderBy: &qbtypes.OrderBy{
+					Key: qbtypes.OrderByKey{
+						TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: NamespaceNameAttrKey},
+					},
+					Direction: qbtypes.OrderDirectionAsc,
+				},
+			},
+			wantErr: true,
+		},
 	}

 	for _, tt := range tests {
--- a/pkg/types/inframonitoringtypes/nodes.go
+++ b/pkg/types/inframonitoringtypes/nodes.go
@@ -93,6 +93,9 @@ func (req *PostableNodes) Validate() error {
 		if req.OrderBy.Direction != qbtypes.OrderDirectionAsc && req.OrderBy.Direction != qbtypes.OrderDirectionDesc {
 			return errors.NewInvalidInputf(errors.CodeInvalidInput, "invalid order by direction: %s", req.OrderBy.Direction)
 		}
+		if req.OrderBy.Key.Name == NodeNameAttrKey && len(req.GroupBy) > 0 {
+			return errors.NewInvalidInputf(errors.CodeInvalidInput, "order by '%s' is only allowed when groupBy is empty", NodeNameAttrKey)
+		}
 	}

 	return nil
--- a/pkg/types/inframonitoringtypes/nodes_constants.go
+++ b/pkg/types/inframonitoringtypes/nodes_constants.go
@@ -27,6 +27,8 @@ const (
 	NodeConditionNumNotReady = 0
 )

+const NodeNameAttrKey = "k8s.node.name"
+
 const (
 	NodesOrderByCPU               = "cpu"
 	NodesOrderByCPUAllocatable    = "cpu_allocatable"
@@ -39,4 +41,5 @@ var NodesValidOrderByKeys = []string{
 	NodesOrderByCPUAllocatable,
 	NodesOrderByMemory,
 	NodesOrderByMemoryAllocatable,
+	NodeNameAttrKey,
 }
--- a/pkg/types/inframonitoringtypes/nodes_test.go
+++ b/pkg/types/inframonitoringtypes/nodes_test.go
@@ -239,6 +239,57 @@ func TestPostableNodes_Validate(t *testing.T) {
 			},
 			wantErr: true,
 		},
+		{
+			name: "orderBy name asc with empty groupBy is valid",
+			req: &PostableNodes{
+				Start:  1000,
+				End:    2000,
+				Limit:  100,
+				Offset: 0,
+				OrderBy: &qbtypes.OrderBy{
+					Key: qbtypes.OrderByKey{
+						TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: NodeNameAttrKey},
+					},
+					Direction: qbtypes.OrderDirectionAsc,
+				},
+			},
+			wantErr: false,
+		},
+		{
+			name: "orderBy name desc with empty groupBy is valid",
+			req: &PostableNodes{
+				Start:  1000,
+				End:    2000,
+				Limit:  100,
+				Offset: 0,
+				OrderBy: &qbtypes.OrderBy{
+					Key: qbtypes.OrderByKey{
+						TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: NodeNameAttrKey},
+					},
+					Direction: qbtypes.OrderDirectionDesc,
+				},
+			},
+			wantErr: false,
+		},
+		{
+			name: "orderBy name with non-empty groupBy is rejected",
+			req: &PostableNodes{
+				Start:  1000,
+				End:    2000,
+				Limit:  100,
+				Offset: 0,
+				GroupBy: []qbtypes.GroupByKey{
+					{TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: "k8s.cluster.name"}},
+				},
+				OrderBy: &qbtypes.OrderBy{
+					Key: qbtypes.OrderByKey{
+						TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: NodeNameAttrKey},
+					},
+					Direction: qbtypes.OrderDirectionAsc,
+				},
+			},
+			wantErr: true,
+		},
 	}

 	for _, tt := range tests {
--- a/pkg/types/inframonitoringtypes/pagination.go
+++ b/pkg/types/inframonitoringtypes/pagination.go
@@ -0,0 +1,55 @@
+package inframonitoringtypes
+
+import (
+	"sort"
+
+	qbtypes "github.com/SigNoz/signoz/pkg/types/querybuildertypes/querybuildertypesv5"
+)
+
+// PaginateMetadataByName returns metadataMap groups sorted by name
+// (lexicographic, asc or desc), paginated by offset/limit, and rebuilt into
+// label maps using groupBy. When sortByMetaKey is non-empty, groups are sorted
+// by metadataMap[k][sortByMetaKey]; otherwise sorted by composite key directly.
+func PaginateMetadataByName(
+	metadataMap map[string]map[string]string,
+	groupBy []qbtypes.GroupByKey,
+	direction qbtypes.OrderDirection,
+	offset, limit int,
+	sortByMetaKey string,
+) []map[string]string {
+
+	pageGroups := make([]map[string]string, 0)
+	if offset >= len(metadataMap) {
+		return pageGroups
+	}
+	type entry struct{ compositeKey, sortVal string }
+	entries := make([]entry, 0, len(metadataMap))
+	for ck, meta := range metadataMap {
+		sv := ck
+		if sortByMetaKey != "" {
+			sv = meta[sortByMetaKey]
+		}
+		entries = append(entries, entry{compositeKey: ck, sortVal: sv})
+	}
+	sort.Slice(entries, func(i, j int) bool {
+		if entries[i].sortVal != entries[j].sortVal {
+			if direction == qbtypes.OrderDirectionAsc {
+				return entries[i].sortVal < entries[j].sortVal
+			}
+			return entries[i].sortVal > entries[j].sortVal
+		}
+		return entries[i].compositeKey < entries[j].compositeKey
+	})
+
+	end := min(offset+limit, len(entries))
+
+	for _, e := range entries[offset:end] {
+		attrs := metadataMap[e.compositeKey]
+		labels := make(map[string]string, len(groupBy))
+		for _, gb := range groupBy {
+			labels[gb.Name] = attrs[gb.Name]
+		}
+		pageGroups = append(pageGroups, labels)
+	}
+	return pageGroups
+}
--- a/pkg/types/inframonitoringtypes/pagination_test.go
+++ b/pkg/types/inframonitoringtypes/pagination_test.go
@@ -0,0 +1,371 @@
+package inframonitoringtypes
+
+import (
+	"testing"
+
+	qbtypes "github.com/SigNoz/signoz/pkg/types/querybuildertypes/querybuildertypesv5"
+	"github.com/SigNoz/signoz/pkg/types/telemetrytypes"
+	"github.com/stretchr/testify/assert"
+)
+
+func gbKey(name string) qbtypes.GroupByKey {
+	return qbtypes.GroupByKey{TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: name}}
+}
+
+// fiveHostMap returns a metadataMap with 5 host entries h1..h5.
+func fiveHostMap() map[string]map[string]string {
+	m := make(map[string]map[string]string, 5)
+	for _, n := range []string{"h1", "h2", "h3", "h4", "h5"} {
+		m[n] = map[string]string{"host.name": n}
+	}
+	return m
+}
+
+func TestPaginateMetadataByName(t *testing.T) {
+	hostGB := []qbtypes.GroupByKey{gbKey("host.name")}
+
+	tests := []struct {
+		name          string
+		metadataMap   map[string]map[string]string
+		groupBy       []qbtypes.GroupByKey
+		direction     qbtypes.OrderDirection
+		offset, limit int
+		sortByMetaKey string
+		want          []map[string]string
+		wantNotNil    bool // assert empty non-nil slice instead of comparing to want
+	}{
+		// A. Array out of bounds
+		{
+			name:          "offset_equals_len",
+			metadataMap:   fiveHostMap(),
+			groupBy:       hostGB,
+			direction:     qbtypes.OrderDirectionAsc,
+			offset:        5,
+			limit:         10,
+			sortByMetaKey: "host.name",
+			wantNotNil:    true,
+		},
+		{
+			name:          "offset_way_past_len",
+			metadataMap:   fiveHostMap(),
+			groupBy:       hostGB,
+			direction:     qbtypes.OrderDirectionAsc,
+			offset:        100,
+			limit:         10,
+			sortByMetaKey: "host.name",
+			wantNotNil:    true,
+		},
+		{
+			name:          "offset_plus_limit_exceeds_len",
+			metadataMap:   fiveHostMap(),
+			groupBy:       hostGB,
+			direction:     qbtypes.OrderDirectionAsc,
+			offset:        3,
+			limit:         10,
+			sortByMetaKey: "host.name",
+			want: []map[string]string{
+				{"host.name": "h4"},
+				{"host.name": "h5"},
+			},
+		},
+		{
+			name:          "limit_exceeds_len",
+			metadataMap:   fiveHostMap(),
+			groupBy:       hostGB,
+			direction:     qbtypes.OrderDirectionAsc,
+			offset:        0,
+			limit:         100,
+			sortByMetaKey: "host.name",
+			want: []map[string]string{
+				{"host.name": "h1"},
+				{"host.name": "h2"},
+				{"host.name": "h3"},
+				{"host.name": "h4"},
+				{"host.name": "h5"},
+			},
+		},
+		{
+			name:          "limit_zero",
+			metadataMap:   fiveHostMap(),
+			groupBy:       hostGB,
+			direction:     qbtypes.OrderDirectionAsc,
+			offset:        0,
+			limit:         0,
+			sortByMetaKey: "host.name",
+			wantNotNil:    true, // expect empty non-nil slice
+		},
+		{
+			name:          "empty_map",
+			metadataMap:   map[string]map[string]string{},
+			groupBy:       hostGB,
+			direction:     qbtypes.OrderDirectionAsc,
+			offset:        0,
+			limit:         10,
+			sortByMetaKey: "host.name",
+			wantNotNil:    true,
+		},
+		{
+			name:          "exact_page",
+			metadataMap:   fiveHostMap(),
+			groupBy:       hostGB,
+			direction:     qbtypes.OrderDirectionAsc,
+			offset:        0,
+			limit:         5,
+			sortByMetaKey: "host.name",
+			want: []map[string]string{
+				{"host.name": "h1"},
+				{"host.name": "h2"},
+				{"host.name": "h3"},
+				{"host.name": "h4"},
+				{"host.name": "h5"},
+			},
+		},
+		{
+			name:          "mid_page",
+			metadataMap:   fiveHostMap(),
+			groupBy:       hostGB,
+			direction:     qbtypes.OrderDirectionAsc,
+			offset:        2,
+			limit:         2,
+			sortByMetaKey: "host.name",
+			want: []map[string]string{
+				{"host.name": "h3"},
+				{"host.name": "h4"},
+			},
+		},
+		{
+			name:          "last_single",
+			metadataMap:   fiveHostMap(),
+			groupBy:       hostGB,
+			direction:     qbtypes.OrderDirectionAsc,
+			offset:        4,
+			limit:         1,
+			sortByMetaKey: "host.name",
+			want: []map[string]string{
+				{"host.name": "h5"},
+			},
+		},
+
+		// B. Nil / missing
+		{
+			name:          "nil_map",
+			metadataMap:   nil,
+			groupBy:       hostGB,
+			direction:     qbtypes.OrderDirectionAsc,
+			offset:        0,
+			limit:         10,
+			sortByMetaKey: "host.name",
+			wantNotNil:    true,
+		},
+		{
+			name: "nil_groupBy",
+			metadataMap: map[string]map[string]string{
+				"h1": {"host.name": "h1"},
+				"h2": {"host.name": "h2"},
+			},
+			groupBy:       nil,
+			direction:     qbtypes.OrderDirectionAsc,
+			offset:        0,
+			limit:         10,
+			sortByMetaKey: "host.name",
+			want: []map[string]string{
+				{},
+				{},
+			},
+		},
+		{
+			name: "empty_groupBy",
+			metadataMap: map[string]map[string]string{
+				"h1": {"host.name": "h1"},
+				"h2": {"host.name": "h2"},
+			},
+			groupBy:       []qbtypes.GroupByKey{},
+			direction:     qbtypes.OrderDirectionAsc,
+			offset:        0,
+			limit:         10,
+			sortByMetaKey: "host.name",
+			want: []map[string]string{
+				{},
+				{},
+			},
+		},
+		{
+			name: "missing_key_in_entry",
+			metadataMap: map[string]map[string]string{
+				"h1": {"host.name": "h1", "os.type": "linux"},
+				"h2": {"host.name": "h2"}, // os.type absent
+			},
+			groupBy:       []qbtypes.GroupByKey{gbKey("host.name"), gbKey("os.type")},
+			direction:     qbtypes.OrderDirectionAsc,
+			offset:        0,
+			limit:         10,
+			sortByMetaKey: "host.name",
+			want: []map[string]string{
+				{"host.name": "h1", "os.type": "linux"},
+				{"host.name": "h2", "os.type": ""},
+			},
+		},
+		{
+			name: "nil_inner_map",
+			metadataMap: map[string]map[string]string{
+				"h1": nil,
+				"h2": {"host.name": "h2"},
+			},
+			groupBy:       hostGB,
+			direction:     qbtypes.OrderDirectionAsc,
+			offset:        0,
+			limit:         10,
+			sortByMetaKey: "host.name",
+			// sortVal for h1 = "" (nil map read), for h2 = "h2".
+			// Asc order: "" < "h2", so h1 first.
+			want: []map[string]string{
+				{"host.name": ""},
+				{"host.name": "h2"},
+			},
+		},
+		{
+			name: "sortByMetaKey_empty_sorts_by_compositeKey",
+			metadataMap: map[string]map[string]string{
+				"x\x00z": {"a": "x", "b": "z"},
+				"x\x00y": {"a": "x", "b": "y"},
+			},
+			groupBy:       []qbtypes.GroupByKey{gbKey("a"), gbKey("b")},
+			direction:     qbtypes.OrderDirectionAsc,
+			offset:        0,
+			limit:         10,
+			sortByMetaKey: "",
+			want: []map[string]string{
+				{"a": "x", "b": "y"},
+				{"a": "x", "b": "z"},
+			},
+		},
+		{
+			name: "sortByMetaKey_absent_in_some_entries",
+			metadataMap: map[string]map[string]string{
+				"h1": {"host.name": "h1"},
+				"h2": {}, // host.name absent
+				"h3": {"host.name": "h3"},
+			},
+			groupBy:       hostGB,
+			direction:     qbtypes.OrderDirectionAsc,
+			offset:        0,
+			limit:         10,
+			sortByMetaKey: "host.name",
+			// h2 sortVal="" sorts first; then h1, h3.
+			want: []map[string]string{
+				{"host.name": ""},
+				{"host.name": "h1"},
+				{"host.name": "h3"},
+			},
+		},
+
+		// C. Sort direction
+		{
+			name: "asc",
+			metadataMap: map[string]map[string]string{
+				"h2": {"host.name": "h2"},
+				"h1": {"host.name": "h1"},
+				"h3": {"host.name": "h3"},
+			},
+			groupBy:       hostGB,
+			direction:     qbtypes.OrderDirectionAsc,
+			offset:        0,
+			limit:         10,
+			sortByMetaKey: "host.name",
+			want: []map[string]string{
+				{"host.name": "h1"},
+				{"host.name": "h2"},
+				{"host.name": "h3"},
+			},
+		},
+		{
+			name: "desc",
+			metadataMap: map[string]map[string]string{
+				"h2": {"host.name": "h2"},
+				"h1": {"host.name": "h1"},
+				"h3": {"host.name": "h3"},
+			},
+			groupBy:       hostGB,
+			direction:     qbtypes.OrderDirectionDesc,
+			offset:        0,
+			limit:         10,
+			sortByMetaKey: "host.name",
+			want: []map[string]string{
+				{"host.name": "h3"},
+				{"host.name": "h2"},
+				{"host.name": "h1"},
+			},
+		},
+		{
+			name: "zero_value_direction_falls_into_desc",
+			metadataMap: map[string]map[string]string{
+				"h2": {"host.name": "h2"},
+				"h1": {"host.name": "h1"},
+				"h3": {"host.name": "h3"},
+			},
+			groupBy:       hostGB,
+			direction:     qbtypes.OrderDirection{},
+			offset:        0,
+			limit:         10,
+			sortByMetaKey: "host.name",
+			want: []map[string]string{
+				{"host.name": "h3"},
+				{"host.name": "h2"},
+				{"host.name": "h1"},
+			},
+		},
+		{
+			name: "tie_breaks_on_compositeKey_asc",
+			metadataMap: map[string]map[string]string{
+				"a\x00b": {"k": "a", "x": "tie"},
+				"a\x00c": {"k": "a", "x": "tie"},
+			},
+			groupBy:       []qbtypes.GroupByKey{gbKey("k"), gbKey("x")},
+			direction:     qbtypes.OrderDirectionDesc,
+			offset:        0,
+			limit:         10,
+			sortByMetaKey: "x",
+			// Both sortVals "tie"; tie-break on compositeKey asc:
+			// "a\x00b" < "a\x00c", so b first.
+			want: []map[string]string{
+				{"k": "a", "x": "tie"},
+				{"k": "a", "x": "tie"},
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got := PaginateMetadataByName(
+				tt.metadataMap,
+				tt.groupBy,
+				tt.direction,
+				tt.offset,
+				tt.limit,
+				tt.sortByMetaKey,
+			)
+			if tt.wantNotNil {
+				assert.NotNil(t, got)
+				assert.Len(t, got, 0)
+				return
+			}
+			assert.Equal(t, tt.want, got)
+		})
+	}
+}
+
+func TestPaginateMetadataByName_Deterministic(t *testing.T) {
+	m := make(map[string]map[string]string, 10)
+	// 10 entries, several with tied host.name values to force compositeKey tie-break.
+	for i, n := range []string{"a", "a", "b", "b", "c", "d", "e", "e", "f", "g"} {
+		ck := n + "\x00" + string(rune('0'+i))
+		m[ck] = map[string]string{"host.name": n, "id": string(rune('0' + i))}
+	}
+	gb := []qbtypes.GroupByKey{gbKey("host.name"), gbKey("id")}
+
+	first := PaginateMetadataByName(m, gb, qbtypes.OrderDirectionAsc, 0, 10, "host.name")
+	for i := range 50 {
+		got := PaginateMetadataByName(m, gb, qbtypes.OrderDirectionAsc, 0, 10, "host.name")
+		assert.Equal(t, first, got, "iteration %d differed — map-iteration nondeterminism leaked through sort", i)
+	}
+}
--- a/pkg/types/inframonitoringtypes/pods.go
+++ b/pkg/types/inframonitoringtypes/pods.go
@@ -98,6 +98,9 @@ func (req *PostablePods) Validate() error {
 		if req.OrderBy.Direction != qbtypes.OrderDirectionAsc && req.OrderBy.Direction != qbtypes.OrderDirectionDesc {
 			return errors.NewInvalidInputf(errors.CodeInvalidInput, "invalid order by direction: %s", req.OrderBy.Direction)
 		}
+		if req.OrderBy.Key.Name == PodNameAttrKey && len(req.GroupBy) > 0 {
+			return errors.NewInvalidInputf(errors.CodeInvalidInput, "order by '%s' is only allowed when groupBy is empty", PodNameAttrKey)
+		}
 	}

 	return nil
--- a/pkg/types/inframonitoringtypes/pods_constants.go
+++ b/pkg/types/inframonitoringtypes/pods_constants.go
@@ -36,6 +36,8 @@ const (
 	PodPhaseNumUnknown   = 5
 )

+const PodNameAttrKey = "k8s.pod.name"
+
 const (
 	PodsOrderByCPU           = "cpu"
 	PodsOrderByCPURequest    = "cpu_request"
@@ -52,4 +54,5 @@ var PodsValidOrderByKeys = []string{
 	PodsOrderByMemory,
 	PodsOrderByMemoryRequest,
 	PodsOrderByMemoryLimit,
+	PodNameAttrKey,
 }
--- a/pkg/types/inframonitoringtypes/pods_test.go
+++ b/pkg/types/inframonitoringtypes/pods_test.go
@@ -203,6 +203,57 @@ func TestPostablePods_Validate(t *testing.T) {
 			},
 			wantErr: true,
 		},
+		{
+			name: "orderBy name asc with empty groupBy is valid",
+			req: &PostablePods{
+				Start:  1000,
+				End:    2000,
+				Limit:  100,
+				Offset: 0,
+				OrderBy: &qbtypes.OrderBy{
+					Key: qbtypes.OrderByKey{
+						TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: PodNameAttrKey},
+					},
+					Direction: qbtypes.OrderDirectionAsc,
+				},
+			},
+			wantErr: false,
+		},
+		{
+			name: "orderBy name desc with empty groupBy is valid",
+			req: &PostablePods{
+				Start:  1000,
+				End:    2000,
+				Limit:  100,
+				Offset: 0,
+				OrderBy: &qbtypes.OrderBy{
+					Key: qbtypes.OrderByKey{
+						TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: PodNameAttrKey},
+					},
+					Direction: qbtypes.OrderDirectionDesc,
+				},
+			},
+			wantErr: false,
+		},
+		{
+			name: "orderBy name with non-empty groupBy is rejected",
+			req: &PostablePods{
+				Start:  1000,
+				End:    2000,
+				Limit:  100,
+				Offset: 0,
+				GroupBy: []qbtypes.GroupByKey{
+					{TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: "k8s.namespace.name"}},
+				},
+				OrderBy: &qbtypes.OrderBy{
+					Key: qbtypes.OrderByKey{
+						TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: PodNameAttrKey},
+					},
+					Direction: qbtypes.OrderDirectionAsc,
+				},
+			},
+			wantErr: true,
+		},
 	}

 	for _, tt := range tests {
--- a/pkg/types/inframonitoringtypes/statefulsets.go
+++ b/pkg/types/inframonitoringtypes/statefulsets.go
@@ -88,6 +88,9 @@ func (req *PostableStatefulSets) Validate() error {
 		if req.OrderBy.Direction != qbtypes.OrderDirectionAsc && req.OrderBy.Direction != qbtypes.OrderDirectionDesc {
 			return errors.NewInvalidInputf(errors.CodeInvalidInput, "invalid order by direction: %s", req.OrderBy.Direction)
 		}
+		if req.OrderBy.Key.Name == StatefulSetNameAttrKey && len(req.GroupBy) > 0 {
+			return errors.NewInvalidInputf(errors.CodeInvalidInput, "order by '%s' is only allowed when groupBy is empty", StatefulSetNameAttrKey)
+		}
 	}

 	return nil
--- a/pkg/types/inframonitoringtypes/statefulsets_constants.go
+++ b/pkg/types/inframonitoringtypes/statefulsets_constants.go
@@ -1,5 +1,7 @@
 package inframonitoringtypes

+const StatefulSetNameAttrKey = "k8s.statefulset.name"
+
 const (
 	StatefulSetsOrderByCPU           = "cpu"
 	StatefulSetsOrderByCPURequest    = "cpu_request"
@@ -20,4 +22,5 @@ var StatefulSetsValidOrderByKeys = []string{
 	StatefulSetsOrderByMemoryLimit,
 	StatefulSetsOrderByDesiredPods,
 	StatefulSetsOrderByCurrentPods,
+	StatefulSetNameAttrKey,
 }
--- a/pkg/types/inframonitoringtypes/statefulsets_test.go
+++ b/pkg/types/inframonitoringtypes/statefulsets_test.go
@@ -257,6 +257,57 @@ func TestPostableStatefulSets_Validate(t *testing.T) {
 			},
 			wantErr: true,
 		},
+		{
+			name: "orderBy name asc with empty groupBy is valid",
+			req: &PostableStatefulSets{
+				Start:  1000,
+				End:    2000,
+				Limit:  100,
+				Offset: 0,
+				OrderBy: &qbtypes.OrderBy{
+					Key: qbtypes.OrderByKey{
+						TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: StatefulSetNameAttrKey},
+					},
+					Direction: qbtypes.OrderDirectionAsc,
+				},
+			},
+			wantErr: false,
+		},
+		{
+			name: "orderBy name desc with empty groupBy is valid",
+			req: &PostableStatefulSets{
+				Start:  1000,
+				End:    2000,
+				Limit:  100,
+				Offset: 0,
+				OrderBy: &qbtypes.OrderBy{
+					Key: qbtypes.OrderByKey{
+						TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: StatefulSetNameAttrKey},
+					},
+					Direction: qbtypes.OrderDirectionDesc,
+				},
+			},
+			wantErr: false,
+		},
+		{
+			name: "orderBy name with non-empty groupBy is rejected",
+			req: &PostableStatefulSets{
+				Start:  1000,
+				End:    2000,
+				Limit:  100,
+				Offset: 0,
+				GroupBy: []qbtypes.GroupByKey{
+					{TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: "k8s.namespace.name"}},
+				},
+				OrderBy: &qbtypes.OrderBy{
+					Key: qbtypes.OrderByKey{
+						TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: StatefulSetNameAttrKey},
+					},
+					Direction: qbtypes.OrderDirectionAsc,
+				},
+			},
+			wantErr: true,
+		},
 	}

 	for _, tt := range tests {
--- a/pkg/types/inframonitoringtypes/volumes.go
+++ b/pkg/types/inframonitoringtypes/volumes.go
@@ -85,6 +85,9 @@ func (req *PostableVolumes) Validate() error {
 		if req.OrderBy.Direction != qbtypes.OrderDirectionAsc && req.OrderBy.Direction != qbtypes.OrderDirectionDesc {
 			return errors.NewInvalidInputf(errors.CodeInvalidInput, "invalid order by direction: %s", req.OrderBy.Direction)
 		}
+		if req.OrderBy.Key.Name == PersistentVolumeClaimNameAttrKey && len(req.GroupBy) > 0 {
+			return errors.NewInvalidInputf(errors.CodeInvalidInput, "order by '%s' is only allowed when groupBy is empty", PersistentVolumeClaimNameAttrKey)
+		}
 	}

 	return nil
--- a/pkg/types/inframonitoringtypes/volumes_constants.go
+++ b/pkg/types/inframonitoringtypes/volumes_constants.go
@@ -1,5 +1,7 @@
 package inframonitoringtypes

+const PersistentVolumeClaimNameAttrKey = "k8s.persistentvolumeclaim.name"
+
 const (
 	VolumesOrderByAvailable  = "available"
 	VolumesOrderByCapacity   = "capacity"
@@ -16,4 +18,5 @@ var VolumesValidOrderByKeys = []string{
 	VolumesOrderByInodes,
 	VolumesOrderByInodesFree,
 	VolumesOrderByInodesUsed,
+	PersistentVolumeClaimNameAttrKey,
 }
--- a/pkg/types/inframonitoringtypes/volumes_test.go
+++ b/pkg/types/inframonitoringtypes/volumes_test.go
@@ -221,6 +221,57 @@ func TestPostableVolumes_Validate(t *testing.T) {
 			},
 			wantErr: true,
 		},
+		{
+			name: "orderBy name asc with empty groupBy is valid",
+			req: &PostableVolumes{
+				Start:  1000,
+				End:    2000,
+				Limit:  100,
+				Offset: 0,
+				OrderBy: &qbtypes.OrderBy{
+					Key: qbtypes.OrderByKey{
+						TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: PersistentVolumeClaimNameAttrKey},
+					},
+					Direction: qbtypes.OrderDirectionAsc,
+				},
+			},
+			wantErr: false,
+		},
+		{
+			name: "orderBy name desc with empty groupBy is valid",
+			req: &PostableVolumes{
+				Start:  1000,
+				End:    2000,
+				Limit:  100,
+				Offset: 0,
+				OrderBy: &qbtypes.OrderBy{
+					Key: qbtypes.OrderByKey{
+						TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: PersistentVolumeClaimNameAttrKey},
+					},
+					Direction: qbtypes.OrderDirectionDesc,
+				},
+			},
+			wantErr: false,
+		},
+		{
+			name: "orderBy name with non-empty groupBy is rejected",
+			req: &PostableVolumes{
+				Start:  1000,
+				End:    2000,
+				Limit:  100,
+				Offset: 0,
+				GroupBy: []qbtypes.GroupByKey{
+					{TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: "k8s.namespace.name"}},
+				},
+				OrderBy: &qbtypes.OrderBy{
+					Key: qbtypes.OrderByKey{
+						TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: PersistentVolumeClaimNameAttrKey},
+					},
+					Direction: qbtypes.OrderDirectionAsc,
+				},
+			},
+			wantErr: true,
+		},
 	}

 	for _, tt := range tests {
				`@@ -0,0 +1 @@`
				`export { default } from './ExpandableValue';`