Merge branch 'main' of github.com:SigNoz/signoz into feat/field-selector-migration

* fix: back button issue

* chore: add unit test

* fix : test cases

---------

Co-authored-by: Gaurav Tewari <tewarig@users.noreply.github.com>

.github/CODEOWNERS

@@ -118,6 +118,9 @@ go.mod @therealpandey
 
 /tests/integration/ @therealpandey
 
+# e2e tests
+/tests/e2e/ @AshwinBhatkal
+
 # Flagger Owners
 
 /pkg/flagger/ @therealpandey
@@ -162,3 +165,7 @@ go.mod @therealpandey
 /frontend/src/lib/dashboard/ @SigNoz/pulse-frontend
 /frontend/src/lib/dashboardVariables/ @SigNoz/pulse-frontend
 /frontend/src/components/NewSelect/ @SigNoz/pulse-frontend
+
+## Dashboard V2
+/frontend/src/pages/DashboardPageV2/ @SigNoz/pulse-frontend
+/frontend/src/pages/DashboardsListPageV2/ @SigNoz/pulse-frontend

frontend/plugins/rules/no-antd-components.mjs

@@ -14,8 +14,11 @@
  */
 
 const BANNED_COMPONENTS = {
-	Typography: 'Use @signozhq/ui Typography instead of antd Typography.',
+	Typography:
+		'Use @signozhq/ui/typography Typography instead of antd Typography.',
+	Switch: 'Use @signozhq/ui/switch Switch instead of antd Switch.',
 	Badge: 'Use @signozhq/ui/badge instead of antd Badge.',
+	Progress: 'Use @signozhq/ui/progress instead of antd Progress.',
 };
 
 export default {

frontend/src/components/CeleryOverview/CeleryOverviewTable/CeleryOverviewTable.styles.scss

@@ -51,13 +51,6 @@
 				background: var(--l1-background);
 			}
 
-			.progress-container {
-				.ant-progress-bg {
-					height: 8px !important;
-					border-radius: 4px;
-				}
-			}
-
 			.ant-table-tbody > tr:hover > td {
 				background: color-mix(in srgb, var(--l1-foreground) 4%, transparent);
 			}

frontend/src/components/CeleryOverview/CeleryOverviewTable/CeleryOverviewTable.tsx

@@ -9,13 +9,13 @@ import {
 	Flex,
 	Input,
 	InputRef,
-	Progress,
 	Space,
 	Spin,
 	TableColumnsType,
 	TableColumnType,
 	Tooltip,
 } from 'antd';
+import { Progress } from '@signozhq/ui/progress';
 import { Typography } from '@signozhq/ui/typography';
 import type { FilterDropdownProps } from 'antd/lib/table/interface';
 import logEvent from 'api/common/logEvent';
@@ -59,7 +59,7 @@ function ProgressRender(item: string | number): JSX.Element {
 			<Progress
 				percent={percent}
 				strokeLinecap="butt"
-				size="small"
+				showInfo
 				strokeColor={((): string => {
 					const cpuPercent = percent;
 					if (cpuPercent >= 90) {

frontend/src/components/HeaderRightSection/ShareURLModal.tsx

@@ -4,7 +4,8 @@ import { useSelector } from 'react-redux';
 import { matchPath, useLocation } from 'react-router-dom';
 import { useCopyToClipboard } from 'react-use';
 import { Color } from '@signozhq/design-tokens';
-import { Button, Switch } from 'antd';
+import { Button } from 'antd';
+import { Switch } from '@signozhq/ui/switch';
 import { Typography } from '@signozhq/ui/typography';
 import logEvent from 'api/common/logEvent';
 import { QueryParams } from 'constants/query';
@@ -125,9 +126,8 @@ function ShareURLModal(): JSX.Element {
 								<Info size={14} color={Color.BG_AMBER_600} />
 							)}
 							<Switch
-								checked={enableAbsoluteTime}
+								value={enableAbsoluteTime}
 								disabled={!isValidateRelativeTime}
-								size="small"
 								onChange={(): void => {
 									setEnableAbsoluteTime((prev) => !prev);
 								}}

frontend/src/components/Logs/TableView/useLogsTableColumns.tsx

@@ -69,6 +69,8 @@ export function useLogsTableColumns({
 					id: 'timestamp',
 					header: 'Timestamp',
 					accessorFn: (log): unknown => log.timestamp,
+					canBeHidden: false,
+					enableRemove: false,
 					width: { default: 170, min: 170 },
 					cell: ({ value }): ReactElement => {
 						const ts = value as string | number;
@@ -92,6 +94,7 @@ export function useLogsTableColumns({
 					header: 'Body',
 					accessorFn: (log): string => getBodyDisplayString(log.body),
 					canBeHidden: false,
+					enableRemove: false,
 					width: { default: '100%', min: 300 },
 					cell: ({ value, isActive }): ReactElement => (
 						<TanStackTable.Text

frontend/src/components/LogsFormatOptionsMenu/__tests__/LogsFormatOptionsMenu.test.tsx

@@ -62,6 +62,7 @@ describe('LogsFormatOptionsMenu (unit)', () => {
 						onSearch: jest.fn(),
 						onSelect: jest.fn(),
 						onRemove: jest.fn(),
+						onReorder: jest.fn(),
 					},
 				}}
 			/>,

frontend/src/components/QuickFilters/QuickFilters.tsx

@@ -14,7 +14,8 @@ import {
 	ComboboxList,
 	ComboboxTrigger,
 } from '@signozhq/ui/combobox';
-import { Skeleton, Switch, Tooltip } from 'antd';
+import { Skeleton, Tooltip } from 'antd';
+import { Switch } from '@signozhq/ui/switch';
 import { Typography } from '@signozhq/ui/typography';
 import getLocalStorageKey from 'api/browser/localstorage/get';
 import setLocalStorageKey from 'api/browser/localstorage/set';
@@ -281,9 +282,8 @@ export default function QuickFilters(props: IQuickFiltersProps): JSX.Element {
 				<div className="api-quick-filters-header">
 					<Typography.Text>Show IP addresses</Typography.Text>
 					<Switch
-						size="small"
 						style={{ marginLeft: 'auto' }}
-						checked={showIP ?? true}
+						value={showIP ?? true}
 						onChange={(checked): void => {
 							logEvent('API Monitoring: Show IP addresses clicked', {
 								showIP: checked,

frontend/src/components/ResizeTable/DynamicColumnTable.tsx

@@ -4,7 +4,8 @@ import type {
 	TableColumnsType as ColumnsType,
 	TableColumnType as ColumnType,
 } from 'antd';
-import { Button, Dropdown, Flex, MenuProps, Switch } from 'antd';
+import { Button, Dropdown, Flex, MenuProps } from 'antd';
+import { Switch } from '@signozhq/ui/switch';
 import logEvent from 'api/common/logEvent';
 import LaunchChatSupport from 'components/LaunchChatSupport/LaunchChatSupport';
 import { useSafeNavigate } from 'hooks/useSafeNavigate';
@@ -60,9 +61,7 @@ function DynamicColumnTable({
 
 	const onToggleHandler =
 		(index: number, column: ColumnGroupType<any> | ColumnType<any>) =>
-		(checked: boolean, event: React.MouseEvent<HTMLButtonElement>): void => {
-			event.stopPropagation();
-
+		(checked: boolean): void => {
 			if (shouldSendAlertsLogEvent) {
 				logEvent('Alert: Column toggled', {
 					column: column?.title,
@@ -88,10 +87,14 @@ function DynamicColumnTable({
 	const items: MenuProps['items'] =
 		dynamicColumns?.map((column, index) => ({
 			label: (
-				<div className="dynamicColumnsTable-items">
+				<div
+					className="dynamicColumnsTable-items"
+					onClick={(e): void => e.stopPropagation()}
+					role="presentation"
+				>
 					<div>{column.title?.toString()}</div>
 					<Switch
-						checked={columnsData?.findIndex((c) => c.key === column.key) !== -1}
+						value={columnsData?.findIndex((c) => c.key === column.key) !== -1}
 						onChange={onToggleHandler(index, column)}
 					/>
 				</div>

frontend/src/components/TanStackTableView/TanStackTable.tsx

@@ -308,9 +308,7 @@ function TanStackTableInner<TData>(
 	});
 
 	const hasSingleColumn = useMemo(
-		() =>
-			effectiveColumns.filter((c) => !c.pin && c.enableRemove !== false).length <=
-			1,
+		() => effectiveColumns.filter((c) => !c.pin).length <= 1,
 		[effectiveColumns],
 	);
 

frontend/src/container/AlertHistory/Statistics/TopContributorsCard/TopContributorsCard.styles.scss

@@ -45,6 +45,10 @@
 	.contributors-row {
 		height: 80px;
 	}
+	.top-contributors-progress {
+		--progress-background: transparent;
+	}
+
 	&__content {
 		.ant-table {
 			&-cell {

frontend/src/container/AlertHistory/Statistics/TopContributorsCard/TopContributorsRows.tsx

@@ -1,6 +1,7 @@
 import { HTMLAttributes } from 'react';
 import { Color } from '@signozhq/design-tokens';
-import { Progress, Table, TableColumnsType as ColumnsType } from 'antd';
+import { Table, TableColumnsType as ColumnsType } from 'antd';
+import { Progress } from '@signozhq/ui/progress';
 import logEvent from 'api/common/logEvent';
 import { ConditionalAlertPopover } from 'container/AlertHistory/AlertPopover/AlertPopover';
 import AlertLabels from 'pages/AlertDetails/AlertHeader/AlertLabels/AlertLabels';
@@ -51,8 +52,8 @@ function TopContributorsRows({
 					<Progress
 						percent={(count / totalCurrentTriggers) * 100}
 						showInfo={false}
-						trailColor="rgba(255, 255, 255, 0)"
 						strokeColor={Color.BG_ROBIN_500}
+						className="top-contributors-progress"
 					/>
 				</ConditionalAlertPopover>
 			),

frontend/src/container/ApiMonitoring/Explorer/Domains/DomainDetails/DomainDetails.styles.scss

@@ -141,12 +141,9 @@
 
 			.progress-container {
 				width: 158px;
-				.ant-progress {
-					margin: 0;
 
-					.ant-progress-text {
-						font-weight: 600;
-					}
+				span {
+					font-weight: 600;
 				}
 			}
 

frontend/src/container/ApiMonitoring/Explorer/Domains/DomainDetails/TopErrors.tsx

@@ -1,7 +1,8 @@
 import { useMemo, useState } from 'react';
 import { QueryFunctionContext, useQueries, useQuery } from 'react-query';
-import { Spin, Switch, Table, Tooltip } from 'antd';
+import { Spin, Table, Tooltip } from 'antd';
 import { Info, Loader } from '@signozhq/icons';
+import { Switch } from '@signozhq/ui/switch';
 import { Typography } from '@signozhq/ui/typography';
 import { getQueryRangeV5 } from 'api/v5/queryRange/getQueryRange';
 import { MetricRangePayloadV5, ScalarData } from 'api/v5/v5';
@@ -170,11 +171,7 @@ function TopErrors({
 					/>
 				</div>
 				<div style={{ display: 'flex', alignItems: 'center', gap: '8px' }}>
-					<Switch
-						checked={showStatusCodeErrors}
-						onChange={setShowStatusCodeErrors}
-						size="small"
-					/>
+					<Switch value={showStatusCodeErrors} onChange={setShowStatusCodeErrors} />
 					<span style={{ color: 'white', fontSize: '14px' }}>
 						Status Message Exists
 					</span>

frontend/src/container/ApiMonitoring/Explorer/Domains/DomainDetails/components/DomainMetrics.tsx

@@ -1,7 +1,8 @@
 import { useMemo } from 'react';
 import { useQueries } from 'react-query';
 import { Color } from '@signozhq/design-tokens';
-import { Progress, Skeleton, Tooltip } from 'antd';
+import { Skeleton, Tooltip } from 'antd';
+import { Progress } from '@signozhq/ui/progress';
 import { Typography } from '@signozhq/ui/typography';
 import { ENTITY_VERSION_V5 } from 'constants/app';
 import { REACT_QUERY_KEY } from 'constants/reactQueryKeys';
@@ -136,12 +137,11 @@ function DomainMetrics({
 							<Tooltip title={formattedDomainMetricsData.errorRate}>
 								{formattedDomainMetricsData.errorRate !== '-' ? (
 									<Progress
-										status="active"
 										percent={Number(
 											Number(formattedDomainMetricsData.errorRate).toFixed(2),
 										)}
 										strokeLinecap="butt"
-										size="small"
+										showInfo
 										strokeColor={((): string => {
 											const errorRatePercent = Number(
 												Number(formattedDomainMetricsData.errorRate).toFixed(2),

frontend/src/container/ApiMonitoring/Explorer/Domains/DomainDetails/components/EndPointMetrics.tsx

@@ -1,7 +1,8 @@
 import { useMemo } from 'react';
 import { UseQueryResult } from 'react-query';
 import { Color } from '@signozhq/design-tokens';
-import { Progress, Skeleton, Tooltip } from 'antd';
+import { Skeleton, Tooltip } from 'antd';
+import { Progress } from '@signozhq/ui/progress';
 import { Typography } from '@signozhq/ui/typography';
 import {
 	getDisplayValue,
@@ -80,10 +81,9 @@ function EndPointMetrics({
 							<Tooltip title={metricsData?.errorRate}>
 								{metricsData?.errorRate !== '-' ? (
 									<Progress
-										status="active"
 										percent={Number(Number(metricsData?.errorRate ?? 0).toFixed(2))}
 										strokeLinecap="butt"
-										size="small"
+										showInfo
 										strokeColor={((): string => {
 											const errorRatePercent = Number(
 												Number(metricsData?.errorRate ?? 0).toFixed(2),

frontend/src/container/ApiMonitoring/utils.tsx

@@ -1,6 +1,7 @@
 import { ReactNode } from 'react';
 import { Color } from '@signozhq/design-tokens';
-import { Progress, TableColumnType as ColumnType, Tag, Tooltip } from 'antd';
+import { TableColumnType as ColumnType, Tag, Tooltip } from 'antd';
+import { Progress } from '@signozhq/ui/progress';
 import { convertFiltersToExpressionWithExistingQuery } from 'components/QueryBuilderV2/utils';
 import {
 	FiltersType,
@@ -257,10 +258,9 @@ export const columnsConfig: ColumnType<APIDomainsRowData>[] = [
 				errorRate === 'n/a' || errorRate === '-' ? 0 : errorRate;
 			return (
 				<Progress
-					status="active"
 					percent={Number((errorRateValue as number).toFixed(2))}
 					strokeLinecap="butt"
-					size="small"
+					showInfo
 					strokeColor={((): string => {
 						const errorRatePercent = Number((errorRateValue as number).toFixed(2));
 						if (errorRatePercent >= 90) {
@@ -1022,14 +1022,13 @@ export const getEndPointsColumnsConfig = (
 		className: `column`,
 		render: (errorRate: number | string): React.ReactNode => (
 			<Progress
-				status="active"
 				percent={Number(
 					(
 						(errorRate === 'n/a' || errorRate === '-' ? 0 : errorRate) as number
 					).toFixed(1),
 				)}
 				strokeLinecap="butt"
-				size="small"
+				showInfo
 				strokeColor={((): string => {
 					const errorRatePercent = Number((errorRate as number).toFixed(1));
 					if (errorRatePercent >= 90) {
@@ -2514,10 +2513,9 @@ export const dependentServicesColumns: ColumnType<DependentServicesData>[] = [
 		render: (errorPercentage: number | string): React.ReactNode =>
 			errorPercentage !== '-' ? (
 				<Progress
-					status="active"
 					percent={Number((errorPercentage as number).toFixed(2))}
 					strokeLinecap="butt"
-					size="small"
+					showInfo
 					strokeColor={((): string => {
 						const errorPercentagePercent = Number(
 							(errorPercentage as number).toFixed(2),
@@ -3022,14 +3020,13 @@ export const getAllEndpointsWidgetData = (
 		),
 		F1: (errorRate: any): ReactNode => (
 			<Progress
-				status="active"
 				percent={Number(
 					(
 						(errorRate === 'n/a' || errorRate === '-' ? 0 : errorRate) as number
 					).toFixed(2),
 				)}
 				strokeLinecap="butt"
-				size="small"
+				showInfo
 				strokeColor={((): string => {
 					const errorRatePercent = Number(
 						(

frontend/src/container/CreateAlertV2/AlertCondition/utils.tsx

@@ -1,4 +1,5 @@
-import { Button, Flex, SelectProps, Switch } from 'antd';
+import { Button, Flex, SelectProps } from 'antd';
+import { Switch } from '@signozhq/ui/switch';
 import { Typography } from '@signozhq/ui/typography';
 import type { BaseOptionType, DefaultOptionType } from 'antd/es/select';
 import { getInvolvedQueriesInTraceOperator } from 'components/QueryBuilderV2/QueryV2/TraceOperator/utils/utils';
@@ -419,8 +420,8 @@ export function RoutingPolicyBanner({
 			</Typography.Text>
 			<div className="routing-policies-info-banner-right">
 				<Switch
-					checked={notificationSettings.routingPolicies}
-					data-testid="routing-policies-switch"
+					value={notificationSettings.routingPolicies}
+					testId="routing-policies-switch"
 					onChange={(value): void => {
 						setNotificationSettings({
 							type: 'SET_ROUTING_POLICIES',

frontend/src/container/CreateAlertV2/EvaluationSettings/AdvancedOptionItem/AdvancedOptionItem.tsx

@@ -1,5 +1,6 @@
 import { useEffect, useState } from 'react';
-import { Switch, Tooltip } from 'antd';
+import { Tooltip } from 'antd';
+import { Switch } from '@signozhq/ui/switch';
 import { Typography } from '@signozhq/ui/typography';
 import { Info } from '@signozhq/icons';
 
@@ -49,7 +50,7 @@ function AdvancedOptionItem({
 				>
 					{input}
 				</div>
-				<Switch onChange={handleOnToggle} checked={showInput} />
+				<Switch onChange={handleOnToggle} value={showInput} />
 			</div>
 		</div>
 	);

frontend/src/container/DashboardContainer/DashboardSettings/DashboardVariableSettings/VariableItem/VariableItem.tsx

@@ -5,7 +5,8 @@ import { useQuery } from 'react-query';
 import { useSelector } from 'react-redux';
 import { orange } from '@ant-design/colors';
 import { Color } from '@signozhq/design-tokens';
-import { Button, Collapse, Input, Select, Switch, Tag } from 'antd';
+import { Button, Collapse, Input, Select, Tag } from 'antd';
+import { Switch } from '@signozhq/ui/switch';
 import { Typography } from '@signozhq/ui/typography';
 import dashboardVariablesQuery from 'api/dashboard/variables/dashboardVariablesQuery';
 import cx from 'classnames';
@@ -763,7 +764,7 @@ function VariableItem({
 									</Typography>
 								</LabelContainer>
 								<Switch
-									checked={variableMultiSelect}
+									value={variableMultiSelect}
 									onChange={(e): void => {
 										setVariableMultiSelect(e);
 										if (!e) {
@@ -780,7 +781,7 @@ function VariableItem({
 										</Typography>
 									</LabelContainer>
 									<Switch
-										checked={variableShowALLOption}
+										value={variableShowALLOption}
 										onChange={(e): void => setVariableShowALLOption(e)}
 									/>
 								</VariableItemRow>

frontend/src/container/FormAlertChannels/index.tsx

@@ -1,6 +1,7 @@
 import { Dispatch, ReactElement, SetStateAction } from 'react';
 import { useTranslation } from 'react-i18next';
-import { Form, FormInstance, Input, Select, Switch } from 'antd';
+import { Form, FormInstance, Input, Select } from 'antd';
+import { Switch } from '@signozhq/ui/switch';
 import { Typography } from '@signozhq/ui/typography';
 import type { Store } from 'antd/lib/form/interface';
 import ROUTES from 'constants/routes';
@@ -82,8 +83,8 @@ function FormAlertChannels({
 					name="send_resolved"
 				>
 					<Switch
-						defaultChecked={initialValue?.send_resolved}
-						data-testid="field-send-resolved-checkbox"
+						defaultValue={initialValue?.send_resolved}
+						testId="field-send-resolved-checkbox"
 						onChange={(value): void => {
 							setSelectedConfig((state) => ({
 								...state,

frontend/src/container/FormAlertRules/BasicInfo.tsx

@@ -2,7 +2,8 @@ import { useCallback, useEffect, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useQuery } from 'react-query';
 import { Plus } from '@signozhq/icons';
-import { Button, Flex, Form, Select, Switch, Tooltip } from 'antd';
+import { Button, Flex, Form, Select, Tooltip } from 'antd';
+import { Switch } from '@signozhq/ui/switch';
 import getAll from 'api/channels/getAll';
 import logEvent from 'api/common/logEvent';
 import { ALERTS_DATA_SOURCE_MAP } from 'constants/alerts';
@@ -198,10 +199,10 @@ function BasicInfo({
 						placement="right"
 					>
 						<Switch
-							checked={shouldBroadCastToAllChannels}
+							value={shouldBroadCastToAllChannels}
 							onChange={handleBroadcastToAllChannels}
 							disabled={noChannels || !!isLoading}
-							data-testid="alert-broadcast-to-all-channels"
+							testId="alert-broadcast-to-all-channels"
 						/>
 					</Tooltip>
 				</FormItemMedium>

frontend/src/container/Home/StepsProgress/StepsProgress.styles.scss

@@ -39,7 +39,5 @@
 
 	width: 100% !important;
 
-	.ant-progress-steps-outer {
-		width: 100% !important;
-	}
+	--progress-width: 100%;
 }

frontend/src/container/Home/StepsProgress/StepsProgress.tsx

@@ -1,4 +1,4 @@
-import { Progress } from 'antd';
+import { Progress } from '@signozhq/ui/progress';
 
 import { ChecklistItem } from '../HomeChecklist/HomeChecklist';
 
@@ -15,9 +15,7 @@ function StepsProgress({
 
 	const totalChecklistItems = checklistItems.length;
 
-	const progress = Math.round(
-		(completedChecklistItems.length / totalChecklistItems) * 100,
-	);
+	const progress = (completedChecklistItems.length / totalChecklistItems) * 100;
 
 	return (
 		<div className="steps-progress-container">

frontend/src/container/InfraMonitoringHosts/constants.tsx

@@ -1,6 +1,7 @@
 import React from 'react';
 import { Color } from '@signozhq/design-tokens';
-import { Progress, Tag } from 'antd';
+import { Tag } from 'antd';
+import { Progress } from '@signozhq/ui/progress';
 import { Typography } from '@signozhq/ui/typography';
 import {
 	getHostLists,
@@ -79,8 +80,8 @@ export const hostDetailsMetadataConfig: K8sDetailsMetadataConfig<HostData>[] = [
 		render: (value): React.ReactNode => (
 			<Progress
 				percent={Number(Number(value).toFixed(1))}
-				size="small"
 				strokeColor={getProgressColor(Number(value))}
+				showInfo
 			/>
 		),
 	},
@@ -90,8 +91,8 @@ export const hostDetailsMetadataConfig: K8sDetailsMetadataConfig<HostData>[] = [
 		render: (value): React.ReactNode => (
 			<Progress
 				percent={Number(Number(value).toFixed(1))}
-				size="small"
 				strokeColor={getMemoryProgressColor(Number(value))}
+				showInfo
 			/>
 		),
 	},

frontend/src/container/InfraMonitoringHosts/table.module.scss

@@ -60,11 +60,6 @@
 	& > div {
 		width: 100%;
 	}
-
-	:global(.ant-progress-bg) {
-		height: 8px !important;
-		border-radius: 4px;
-	}
 }
 
 .progressBar {

frontend/src/container/InfraMonitoringK8s/EntityDetailsUtils/entityDetails.styles.scss

@@ -103,12 +103,8 @@
 			.progress-container {
 				width: 158px;
 
-				.ant-progress {
-					margin: 0;
-
-					.ant-progress-text {
-						font-weight: 600;
-					}
+				span {
+					font-weight: 600;
 				}
 			}
 
@@ -292,10 +288,6 @@
 			}
 
 			.progress-container {
-				.ant-progress-bg {
-					height: 8px !important;
-					border-radius: 4px;
-				}
 			}
 
 			.ant-table-tbody > tr:hover > td {

frontend/src/container/InfraMonitoringK8s/components/EntityProgressBar.tsx

@@ -1,4 +1,4 @@
-import { Progress } from 'antd';
+import { Progress } from '@signozhq/ui/progress';
 import TanStackTable from 'components/TanStackTableView';
 import {
 	getMemoryProgressColor,
@@ -53,7 +53,6 @@ export function EntityProgressBar({
 			<Progress
 				percent={percentage}
 				strokeLinecap="butt"
-				size="small"
 				status="normal"
 				strokeColor={getStrokeColor(type, value)}
 				className={styles.progressBar}

frontend/src/container/IngestionSettings/MultiIngestionSettings.tsx

@@ -15,13 +15,13 @@ import {
 	Modal,
 	Row,
 	Select,
-	Switch,
 	Table,
 	TablePaginationConfig,
 	TableProps as AntDTableProps,
 	Tag,
 	Tooltip,
 } from 'antd';
+import { Switch } from '@signozhq/ui/switch';
 import { Typography } from '@signozhq/ui/typography';
 import type { NotificationInstance } from 'antd/es/notification/interface';
 import type { CollapseProps } from 'antd/lib';
@@ -1180,8 +1180,7 @@ function MultiIngestionSettings(): JSX.Element {
 																					<div className="limit-enable-disable-toggle">
 																						<Form.Item name="enableDailyLimit">
 																							<Switch
-																								size="small"
-																								checked={activeSignal?.config?.day?.enabled}
+																								value={activeSignal?.config?.day?.enabled}
 																								onChange={(value): void => {
 																									setActiveSignal((prev) =>
 																										prev
@@ -1270,8 +1269,7 @@ function MultiIngestionSettings(): JSX.Element {
 																					<div className="limit-enable-disable-toggle">
 																						<Form.Item name="enableSecondLimit">
 																							<Switch
-																								size="small"
-																								checked={activeSignal?.config?.second?.enabled}
+																								value={activeSignal?.config?.second?.enabled}
 																								onChange={(value): void => {
 																									setActiveSignal((prev) =>
 																										prev

frontend/src/container/ListOfDashboard/DashboardsList.tsx

@@ -21,11 +21,11 @@ import {
 	Modal,
 	Popover,
 	Skeleton,
-	Switch,
 	Table,
 	Tag,
 	Tooltip,
 } from 'antd';
+import { Switch } from '@signozhq/ui/switch';
 import { Typography } from '@signozhq/ui/typography';
 import type { TableProps } from 'antd/lib';
 import getLocalStorageKey from 'api/browser/localstorage/get';
@@ -965,8 +965,7 @@ function DashboardsList(): JSX.Element {
 							<div className="connection-line" />
 							<div className="right">
 								<Switch
-									size="small"
-									checked
+									value
 									disabled
 									onChange={(check): void =>
 										setVisibleColumns((prev) => ({
@@ -985,9 +984,8 @@ function DashboardsList(): JSX.Element {
 							<div className="connection-line" />
 							<div className="right">
 								<Switch
-									size="small"
 									disabled
-									checked
+									value
 									onChange={(check): void =>
 										setVisibleColumns((prev) => ({
 											...prev,
@@ -1005,8 +1003,7 @@ function DashboardsList(): JSX.Element {
 							<div className="connection-line" />
 							<div className="right">
 								<Switch
-									size="small"
-									checked={visibleColumns.updatedAt}
+									value={visibleColumns.updatedAt}
 									onChange={(check): void =>
 										setVisibleColumns((prev) => ({
 											...prev,
@@ -1024,8 +1021,7 @@ function DashboardsList(): JSX.Element {
 							<div className="connection-line" />
 							<div className="right">
 								<Switch
-									size="small"
-									checked={visibleColumns.updatedBy}
+									value={visibleColumns.updatedBy}
 									onChange={(check): void =>
 										setVisibleColumns((prev) => ({
 											...prev,

frontend/src/container/LiveLogs/LiveLogsContainer/index.tsx

@@ -1,6 +1,6 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { useLocation } from 'react-router-dom';
-import { Switch } from 'antd';
+import { Switch } from '@signozhq/ui/switch';
 import { Typography } from '@signozhq/ui/typography';
 import LogsFormatOptionsMenu from 'components/LogsFormatOptionsMenu/LogsFormatOptionsMenu';
 import { MAX_LOGS_LIST_SIZE } from 'constants/liveTail';
@@ -228,9 +228,8 @@ function LiveLogsContainer({
 					<div className="live-logs-frequency-chart-view-controller">
 						<Typography>Frequency chart</Typography>
 						<Switch
-							size="small"
-							checked={showLiveLogsFrequencyChart}
-							defaultChecked
+							value={showLiveLogsFrequencyChart}
+							defaultValue
 							onChange={handleToggleFrequencyChart}
 						/>
 					</div>

frontend/src/container/LiveLogs/LiveLogsList/index.tsx

@@ -16,7 +16,6 @@ import { useLogsTableColumns } from 'components/Logs/TableView/useLogsTableColum
 import OverlayScrollbar from 'components/OverlayScrollbar/OverlayScrollbar';
 import type { TanStackTableHandle } from 'components/TanStackTableView';
 import TanStackTable from 'components/TanStackTableView';
-import { useHiddenColumnIds } from 'components/TanStackTableView/useColumnStore';
 import { CARD_BODY_STYLE } from 'constants/card';
 import { LOCALSTORAGE } from 'constants/localStorage';
 import { OptionFormatTypes } from 'constants/optionsFormatTypes';
@@ -24,13 +23,11 @@ import { QueryParams } from 'constants/query';
 import { InfinityWrapperStyled } from 'container/LogsExplorerList/styles';
 import { convertKeysToColumnFields } from 'container/LogsExplorerList/utils';
 import { useOptionsMenu } from 'container/OptionsMenu';
-import { defaultLogsSelectedColumns } from 'container/OptionsMenu/constants';
 import { useCopyLogLink } from 'hooks/logs/useCopyLogLink';
 import useLogDetailHandlers from 'hooks/logs/useLogDetailHandlers';
 import useScrollToLog from 'hooks/logs/useScrollToLog';
 import { useIsDarkMode } from 'hooks/useDarkMode';
 import { useEventSource } from 'providers/EventSource';
-import { usePreferenceContext } from 'providers/preferences/context/PreferenceContextProvider';
 // interfaces
 import { ILog } from 'types/api/logs/log';
 import { DataSource, StringOperators } from 'types/common/queryBuilder';
@@ -54,9 +51,6 @@ function LiveLogsList({
 	const { isConnectionLoading } = useEventSource();
 
 	const { activeLogId } = useCopyLogLink();
-	const { logs: logsPreferences } = usePreferenceContext();
-	const hiddenColumnIds = useHiddenColumnIds(LOCALSTORAGE.LOGS_LIST_COLUMNS);
-	const hasReconciledHiddenColumnsRef = useRef(false);
 
 	const {
 		activeLog,
@@ -72,7 +66,7 @@ function LiveLogsList({
 		[logs],
 	);
 
-	const { options } = useOptionsMenu({
+	const { options, config } = useOptionsMenu({
 		storageKey: LOCALSTORAGE.LOGS_LIST_OPTIONS,
 		dataSource: DataSource.LOGS,
 		aggregateOperator: StringOperators.NOOP,
@@ -83,16 +77,7 @@ function LiveLogsList({
 		[formattedLogs, activeLogId],
 	);
 
-	const selectedFields = convertKeysToColumnFields([
-		...defaultLogsSelectedColumns,
-		...options.selectColumns,
-	]);
-
-	const syncedSelectedColumns = useMemo(
-		() =>
-			options.selectColumns.filter(({ name }) => !hiddenColumnIds.includes(name)),
-		[options.selectColumns, hiddenColumnIds],
-	);
+	const selectedFields = convertKeysToColumnFields(options.selectColumns);
 
 	const logsColumns = useLogsTableColumns({
 		fields: selectedFields,
@@ -100,30 +85,6 @@ function LiveLogsList({
 		appendTo: 'end',
 	});
 
-	useEffect(() => {
-		if (hasReconciledHiddenColumnsRef.current) {
-			return;
-		}
-
-		hasReconciledHiddenColumnsRef.current = true;
-
-		if (syncedSelectedColumns.length === options.selectColumns.length) {
-			return;
-		}
-
-		logsPreferences.updateColumns(syncedSelectedColumns);
-	}, [logsPreferences, options.selectColumns.length, syncedSelectedColumns]);
-
-	const handleColumnRemove = useCallback(
-		(columnId: string) => {
-			const updatedColumns = options.selectColumns.filter(
-				({ name }) => name !== columnId,
-			);
-			logsPreferences.updateColumns(updatedColumns);
-		},
-		[options.selectColumns, logsPreferences],
-	);
-
 	const makeOnLogCopy = useCallback(
 		(log: ILog) =>
 			(event: MouseEvent<HTMLElement>): void => {
@@ -237,7 +198,7 @@ function LiveLogsList({
 							ref={ref as React.Ref<TanStackTableHandle>}
 							columns={logsColumns}
 							columnStorageKey={LOCALSTORAGE.LOGS_LIST_COLUMNS}
-							onColumnRemove={handleColumnRemove}
+							onColumnRemove={config?.addColumn?.onRemove}
 							plainTextCellLineClamp={options.maxLines}
 							cellTypographySize={options.fontSize}
 							data={formattedLogs}

frontend/src/container/LogDetailedView/JsonView.tsx

@@ -1,7 +1,7 @@
 import { useMemo, useState } from 'react';
 import MEditor, { EditorProps, Monaco } from '@monaco-editor/react';
 import { Color } from '@signozhq/design-tokens';
-import { Switch } from 'antd';
+import { Switch } from '@signozhq/ui/switch';
 import { Typography } from '@signozhq/ui/typography';
 import { useIsDarkMode } from 'hooks/useDarkMode';
 
@@ -81,7 +81,7 @@ function JSONView({ logData }: JSONViewProps): JSX.Element {
 				<div className="log-switch">
 					<div className="wrap-word-switch">
 						<Typography.Text>Wrap text</Typography.Text>
-						<Switch checked={isWrapWord} onChange={handleWrapWord} size="small" />
+						<Switch value={isWrapWord} onChange={handleWrapWord} />
 					</div>
 				</div>
 			</div>

frontend/src/container/LogDetailedView/Overview.tsx

@@ -2,7 +2,8 @@ import { ReactNode, useState } from 'react';
 import MEditor, { EditorProps, Monaco } from '@monaco-editor/react';
 import { Color } from '@signozhq/design-tokens';
 import { Button } from '@signozhq/ui/button';
-import { Collapse, Divider, Input, Switch, Tag } from 'antd';
+import { Switch } from '@signozhq/ui/switch';
+import { Collapse, Divider, Input, Tag } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
 import { AddToQueryHOCProps } from 'components/Logs/AddToQueryHOC';
 import { ChangeViewFunctionType } from 'container/ExplorerOptions/types';
@@ -136,7 +137,7 @@ function Overview({
 								<div className="log-switch">
 									<div className="wrap-word-switch">
 										<Typography.Text>Wrap text</Typography.Text>
-										<Switch checked={isWrapWord} onChange={handleWrapWord} size="small" />
+										<Switch value={isWrapWord} onChange={handleWrapWord} />
 									</div>
 								</div>
 							</div>

frontend/src/container/LogsExplorerList/index.tsx

@@ -18,21 +18,19 @@ import OverlayScrollbar from 'components/OverlayScrollbar/OverlayScrollbar';
 import Spinner from 'components/Spinner';
 import type { TanStackTableHandle } from 'components/TanStackTableView';
 import TanStackTable from 'components/TanStackTableView';
-import { useHiddenColumnIds } from 'components/TanStackTableView/useColumnStore';
+import type { TableColumnDef } from 'components/TanStackTableView/types';
 import { CARD_BODY_STYLE } from 'constants/card';
 import { LOCALSTORAGE } from 'constants/localStorage';
 import { QueryParams } from 'constants/query';
 import EmptyLogsSearch from 'container/EmptyLogsSearch/EmptyLogsSearch';
 import { LogsLoading } from 'container/LogsLoading/LogsLoading';
 import { useOptionsMenu } from 'container/OptionsMenu';
-import { defaultLogsSelectedColumns } from 'container/OptionsMenu/constants';
 import { FontSize } from 'container/OptionsMenu/types';
 import { useCopyLogLink } from 'hooks/logs/useCopyLogLink';
 import useLogDetailHandlers from 'hooks/logs/useLogDetailHandlers';
 import useScrollToLog from 'hooks/logs/useScrollToLog';
 import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
 import { useIsDarkMode } from 'hooks/useDarkMode';
-import { usePreferenceContext } from 'providers/preferences/context/PreferenceContextProvider';
 import APIError from 'types/api/error';
 // interfaces
 import { ILog } from 'types/api/logs/log';
@@ -69,10 +67,6 @@ function LogsExplorerList({
 	const [, setCopy] = useCopyToClipboard();
 	const isDarkMode = useIsDarkMode();
 	const { activeLogId } = useCopyLogLink();
-	const { logs: logsPreferences } = usePreferenceContext();
-	const hiddenColumnIds = useHiddenColumnIds(LOCALSTORAGE.LOGS_LIST_COLUMNS);
-	const hasReconciledHiddenColumnsRef = useRef(false);
-
 	const {
 		activeLog,
 		onAddToQuery,
@@ -81,7 +75,7 @@ function LogsExplorerList({
 		handleCloseLogDetail,
 	} = useLogDetailHandlers();
 
-	const { options } = useOptionsMenu({
+	const { options, config } = useOptionsMenu({
 		storageKey: LOCALSTORAGE.LOGS_LIST_OPTIONS,
 		dataSource: DataSource.LOGS,
 		aggregateOperator:
@@ -97,28 +91,15 @@ function LogsExplorerList({
 	);
 
 	const selectedFields = useMemo(
-		() =>
-			convertKeysToColumnFields([
-				...defaultLogsSelectedColumns,
-				...options.selectColumns,
-			]),
-		[options],
+		() => convertKeysToColumnFields(options.selectColumns),
+		[options.selectColumns],
 	);
 
-	const syncedSelectedColumns = useMemo(
-		() =>
-			options.selectColumns.filter(({ name }) => !hiddenColumnIds.includes(name)),
-		[options.selectColumns, hiddenColumnIds],
-	);
-
-	const handleColumnRemove = useCallback(
-		(columnId: string) => {
-			const updatedColumns = options.selectColumns.filter(
-				({ name }) => name !== columnId,
-			);
-			logsPreferences.updateColumns(updatedColumns);
+	const handleColumnOrderChange = useCallback(
+		(cols: TableColumnDef<ILog>[]): void => {
+			config?.addColumn?.onReorder(cols.map((c) => c.id));
 		},
-		[options.selectColumns, logsPreferences],
+		[config],
 	);
 
 	const logsColumns = useLogsTableColumns({
@@ -161,20 +142,6 @@ function LogsExplorerList({
 		}
 	}, [isLoading, isFetching, isError, logs.length]);
 
-	useEffect(() => {
-		if (hasReconciledHiddenColumnsRef.current) {
-			return;
-		}
-
-		hasReconciledHiddenColumnsRef.current = true;
-
-		if (syncedSelectedColumns.length === options.selectColumns.length) {
-			return;
-		}
-
-		logsPreferences.updateColumns(syncedSelectedColumns);
-	}, [logsPreferences, options.selectColumns.length, syncedSelectedColumns]);
-
 	const getItemContent = useCallback(
 		(_: number, log: ILog): JSX.Element => {
 			if (options.format === 'raw') {
@@ -237,7 +204,8 @@ function LogsExplorerList({
 					ref={ref as React.Ref<TanStackTableHandle>}
 					columns={logsColumns}
 					columnStorageKey={LOCALSTORAGE.LOGS_LIST_COLUMNS}
-					onColumnRemove={handleColumnRemove}
+					onColumnRemove={config?.addColumn?.onRemove}
+					onColumnOrderChange={handleColumnOrderChange}
 					plainTextCellLineClamp={options.maxLines}
 					cellTypographySize={options.fontSize}
 					data={logs}

frontend/src/container/LogsExplorerViews/LogsActionsContainer.tsx

@@ -1,4 +1,4 @@
-import { Switch } from 'antd';
+import { Switch } from '@signozhq/ui/switch';
 import { Typography } from '@signozhq/ui/typography';
 import DownloadOptionsMenu from 'components/DownloadOptionsMenu/DownloadOptionsMenu';
 import LogsFormatOptionsMenu from 'components/LogsFormatOptionsMenu/LogsFormatOptionsMenu';
@@ -69,9 +69,8 @@ function LogsActionsContainer({
 						<div className="frequency-chart-view-controller">
 							<Typography>Frequency chart</Typography>
 							<Switch
-								size="small"
-								checked={showFrequencyChart}
-								defaultChecked
+								value={showFrequencyChart}
+								defaultValue
 								onChange={handleToggleFrequencyChart}
 							/>
 						</div>

frontend/src/container/MetricsApplication/TopOperationsTable.tsx

@@ -5,11 +5,11 @@ import { useParams } from 'react-router-dom';
 import { Search } from '@signozhq/icons';
 import {
 	InputRef,
-	Switch,
 	TableColumnsType as ColumnsType,
 	TableColumnType as ColumnType,
 	Tooltip,
 } from 'antd';
+import { Switch } from '@signozhq/ui/switch';
 import { Typography } from '@signozhq/ui/typography';
 import { ResizeTable } from 'components/ResizeTable';
 import TextToolTip from 'components/TextToolTip';
@@ -212,11 +212,7 @@ function TopOperationsTable({
 					/>
 				</div>
 				<div className="top-operation__entry-point">
-					<Switch
-						checked={isEntryPoint}
-						onChange={onEntryPointToggle}
-						size="small"
-					/>
+					<Switch value={isEntryPoint} onChange={onEntryPointToggle} />
 					<span className="top-operation__entry-point-label">Entrypoint Spans</span>
 					<TextToolTip
 						text={entryPointSpanInfo.text}

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

@@ -2,7 +2,8 @@ import { useCallback, useEffect, useMemo, useState } from 'react';
 import { useQueryClient } from 'react-query';
 import { useSearchParams } from 'react-router-dom-v5-compat';
 import * as Sentry from '@sentry/react';
-import { Switch, Tooltip } from 'antd';
+import { Tooltip } from 'antd';
+import { Switch } from '@signozhq/ui/switch';
 import logEvent from 'api/common/logEvent';
 import { QueryBuilderV2 } from 'components/QueryBuilderV2/QueryBuilderV2';
 import WarningPopover from 'components/WarningPopover/WarningPopover';
@@ -358,10 +359,9 @@ function Explorer(): JSX.Element {
 							title={oneChartPerQueryDisabledTooltip}
 						>
 							<Switch
-								checked={showOneChartPerQuery}
+								value={showOneChartPerQuery}
 								onChange={handleToggleShowOneChartPerQuery}
 								disabled={disableOneChartPerQuery || splitedQueries.length <= 1}
-								size="small"
 							/>
 						</Tooltip>
 					</div>

frontend/src/container/MetricsExplorer/Inspect/GraphView.tsx

@@ -2,7 +2,8 @@ import { useEffect, useMemo, useRef, useState } from 'react';
 // eslint-disable-next-line no-restricted-imports
 import { useSelector } from 'react-redux';
 import { Color } from '@signozhq/design-tokens';
-import { Button, Skeleton, Switch } from 'antd';
+import { Button, Skeleton } from 'antd';
+import { Switch } from '@signozhq/ui/switch';
 import { Typography } from '@signozhq/ui/typography';
 import logEvent from 'api/common/logEvent';
 import Uplot from 'components/Uplot';
@@ -206,7 +207,7 @@ function GraphView({
 				</Button.Group>
 				<div className="view-toggle-button">
 					<Switch
-						checked={viewType === 'graph'}
+						value={viewType === 'graph'}
 						onChange={(checked): void => {
 							const newViewType = checked ? 'graph' : 'table';
 							setViewType(newViewType);

frontend/src/container/MetricsExplorer/Summary/Summary.styles.scss

@@ -142,13 +142,6 @@
 				}
 			}
 
-			.progress-container {
-				.ant-progress-bg {
-					height: 8px !important;
-					border-radius: 4px;
-				}
-			}
-
 			.ant-table-tbody > tr:hover > td {
 				background: color-mix(in srgb, var(--l1-foreground) 4%, transparent);
 			}

frontend/src/container/MySettings/TimezoneAdaptation/TimezoneAdaptation.tsx

@@ -1,6 +1,6 @@
 import { useMemo } from 'react';
 import { Color } from '@signozhq/design-tokens';
-import { Switch } from 'antd';
+import { Switch } from '@signozhq/ui/switch';
 import logEvent from 'api/common/logEvent';
 import { Delete } from '@signozhq/icons';
 import { useTimezone } from 'providers/Timezone';
@@ -49,10 +49,10 @@ function TimezoneAdaptation(): JSX.Element {
 			<div className="timezone-adaption__header">
 				<h2 className="timezone-adaption__title">Adapt to my timezone</h2>
 				<Switch
-					checked={isAdaptationEnabled}
+					value={isAdaptationEnabled}
 					onChange={handleSwitchChange}
 					style={getSwitchStyles()}
-					data-testid="timezone-adaptation-switch"
+					testId="timezone-adaptation-switch"
 				/>
 			</div>
 

frontend/src/container/MySettings/index.tsx

@@ -1,6 +1,7 @@
 import { useEffect, useState } from 'react';
 import { useMutation } from 'react-query';
-import { Radio, RadioChangeEvent, Switch, Tag } from 'antd';
+import { Radio, RadioChangeEvent, Tag } from 'antd';
+import { Switch } from '@signozhq/ui/switch';
 import setLocalStorageApi from 'api/browser/localstorage/set';
 import logEvent from 'api/common/logEvent';
 import updateUserPreference from 'api/v1/user/preferences/name/update';
@@ -218,10 +219,10 @@ function MySettings(): JSX.Element {
 						<div className="user-preference-section-content-item-title-action">
 							Keep the primary sidebar always open{' '}
 							<Switch
-								checked={sideNavPinned}
+								value={sideNavPinned}
 								onChange={handleSideNavPinnedChange}
-								loading={isUpdatingUserPreference}
-								data-testid="side-nav-pinned-switch"
+								disabled={isUpdatingUserPreference}
+								testId="side-nav-pinned-switch"
 							/>
 						</div>
 

frontend/src/container/NewWidget/RightContainer/SettingSections/ChartAppearanceSection/ChartAppearanceSection.tsx

@@ -1,5 +1,5 @@
 import { Dispatch, SetStateAction } from 'react';
-import { Switch } from 'antd';
+import { Switch } from '@signozhq/ui/switch';
 import { Typography } from '@signozhq/ui/typography';
 import {
 	FillMode,
@@ -73,7 +73,7 @@ export default function ChartAppearanceSection({
 							Display individual data points on the chart
 						</Typography.Text>
 					</div>
-					<Switch size="small" checked={showPoints} onChange={setShowPoints} />
+					<Switch value={showPoints} onChange={setShowPoints} />
 				</section>
 			)}
 			{allowSpanGaps && (

frontend/src/container/NewWidget/RightContainer/SettingSections/HistogramBucketsSection/HistogramBucketsSection.tsx

@@ -1,5 +1,6 @@
 import { Dispatch, SetStateAction } from 'react';
-import { InputNumber, Switch } from 'antd';
+import { InputNumber } from 'antd';
+import { Switch } from '@signozhq/ui/switch';
 import { Typography } from '@signozhq/ui/typography';
 
 import SettingsSection from '../../components/SettingsSection/SettingsSection';
@@ -61,8 +62,7 @@ export default function HistogramBucketsSection({
 						</span>
 					</Typography.Text>
 					<Switch
-						checked={combineHistogram}
-						size="small"
+						value={combineHistogram}
 						onChange={(checked): void => setCombineHistogram(checked)}
 					/>
 				</section>

frontend/src/container/NewWidget/RightContainer/SettingSections/VisualizationSettingsSection/VisualizationSettingsSection.tsx

@@ -1,5 +1,6 @@
 import { Dispatch, SetStateAction, useEffect, useState } from 'react';
-import { Select, Switch } from 'antd';
+import { Select } from 'antd';
+import { Switch } from '@signozhq/ui/switch';
 import { Typography } from '@signozhq/ui/typography';
 import TimePreference from 'components/TimePreferenceDropDown';
 import { PANEL_TYPES } from 'constants/queryBuilder';
@@ -104,8 +105,7 @@ export default function VisualizationSettingsSection({
 				<section className="stack-chart control-container">
 					<Typography.Text className="section-heading">Stack series</Typography.Text>
 					<Switch
-						checked={stackedBarChart}
-						size="small"
+						value={stackedBarChart}
 						onChange={(checked): void => setStackedBarChart(checked)}
 					/>
 				</section>
@@ -120,8 +120,7 @@ export default function VisualizationSettingsSection({
 						</Typography.Text>
 					</div>
 					<Switch
-						checked={isFillSpans}
-						size="small"
+						value={isFillSpans}
 						onChange={(checked): void => setIsFillSpans(checked)}
 					/>
 				</section>

frontend/src/container/NewWidget/__test__/NewWidget.test.tsx

@@ -341,10 +341,10 @@ describe('Stacking bar in new panel', () => {
 		const section = container.querySelector('.stack-chart');
 		expect(section).toBeInTheDocument();
 
-		// Verify switch is present and enabled (ant-switch-checked)
-		const switchBtn = section?.querySelector('.ant-switch');
+		// Verify switch is present and enabled
+		const switchBtn = section?.querySelector('[role="switch"]');
 		expect(switchBtn).toBeInTheDocument();
-		expect(switchBtn).toHaveClass('ant-switch-checked');
+		expect(switchBtn).toHaveAttribute('data-state', 'checked');
 
 		// Check that stack series is present and checked
 		checkStackSeriesState(container, true);

frontend/src/container/OptionsMenu/__test__/ensureLogsRequiredColumns.test.ts

@@ -0,0 +1,79 @@
+import { TelemetryFieldKey } from 'api/v5/v5';
+
+import {
+	defaultLogsSelectedColumns,
+	ensureLogsRequiredColumns,
+} from '../constants';
+
+const TIMESTAMP = defaultLogsSelectedColumns.find(
+	(c) => c.name === 'timestamp',
+);
+const BODY = defaultLogsSelectedColumns.find((c) => c.name === 'body');
+
+if (!TIMESTAMP || !BODY) {
+	throw new Error('defaults missing timestamp/body — test fixture invalid');
+}
+
+const ATTR_A: TelemetryFieldKey = {
+	name: 'service.name',
+	signal: 'logs',
+	fieldContext: 'resource',
+	fieldDataType: 'string',
+};
+const ATTR_B: TelemetryFieldKey = {
+	name: 'severity_text',
+	signal: 'logs',
+	fieldContext: 'log',
+	fieldDataType: 'string',
+};
+
+describe('ensureLogsRequiredColumns', () => {
+	it('prepends both timestamp + body to an empty list', () => {
+		expect(ensureLogsRequiredColumns([])).toStrictEqual([TIMESTAMP, BODY]);
+	});
+
+	it('prepends only `body` when `timestamp` is already present', () => {
+		expect(ensureLogsRequiredColumns([TIMESTAMP, ATTR_A])).toStrictEqual([
+			BODY,
+			TIMESTAMP,
+			ATTR_A,
+		]);
+	});
+
+	it('prepends only `timestamp` when `body` is already present', () => {
+		expect(ensureLogsRequiredColumns([BODY, ATTR_A])).toStrictEqual([
+			TIMESTAMP,
+			BODY,
+			ATTR_A,
+		]);
+	});
+
+	it('returns the same array when both are present (no duplicates, original order preserved)', () => {
+		const input = [TIMESTAMP, BODY, ATTR_A, ATTR_B];
+		expect(ensureLogsRequiredColumns(input)).toBe(input);
+	});
+
+	it('preserves a non-default order when both are present', () => {
+		const input = [ATTR_A, BODY, ATTR_B, TIMESTAMP];
+		expect(ensureLogsRequiredColumns(input)).toStrictEqual(input);
+	});
+
+	it('prepends both when neither is present in a list of user attributes', () => {
+		expect(ensureLogsRequiredColumns([ATTR_A, ATTR_B])).toStrictEqual([
+			TIMESTAMP,
+			BODY,
+			ATTR_A,
+			ATTR_B,
+		]);
+	});
+
+	it('does not duplicate if a required column appears twice in the input', () => {
+		// Tolerant of malformed input — invariant only adds *missing* required
+		// columns; it does not deduplicate existing entries (that's a separate
+		// concern, not its job).
+		const input = [BODY, BODY, ATTR_A];
+		const result = ensureLogsRequiredColumns(input);
+		expect(result.filter((c) => c.name === 'timestamp')).toHaveLength(1);
+		expect(result[0]).toStrictEqual(TIMESTAMP);
+	});
+});

frontend/src/container/OptionsMenu/constants.ts

@@ -35,6 +35,32 @@ export const defaultLogsSelectedColumns: TelemetryFieldKey[] = [
 	},
 ];
 
+const LOGS_REQUIRED_COLUMNS = ['timestamp', 'body'] as const;
+
+/**
+ * Always-on invariant: every logs selectColumns array must contain `body` and
+ * `timestamp`. Applied at both loader and writer boundaries so the picker, the
+ * table, and persisted state can never diverge into a "missing required
+ * column" state.
+ */
+export function ensureLogsRequiredColumns(
+	columns: TelemetryFieldKey[],
+): TelemetryFieldKey[] {
+	const missing = LOGS_REQUIRED_COLUMNS.filter(
+		(name) => !columns.some((c) => c.name === name),
+	);
+	if (missing.length === 0) {
+		return columns;
+	}
+	const defaultsByName = new Map(
+		defaultLogsSelectedColumns.map((c) => [c.name, c]),
+	);
+	const prepended = missing
+		.map((name) => defaultsByName.get(name))
+		.filter((c): c is TelemetryFieldKey => c !== undefined);
+	return [...prepended, ...columns];
+}
+
 export const defaultTraceSelectedColumns: TelemetryFieldKey[] = [
 	{
 		name: 'service.name',

frontend/src/container/OptionsMenu/types.ts

@@ -40,5 +40,6 @@ export type OptionsMenuConfig = {
 		isFetching: boolean;
 		value: TelemetryFieldKey[];
 		onRemove: (key: string) => void;
+		onReorder: (orderedIds: string[]) => void;
 	};
 };

frontend/src/container/OptionsMenu/useOptionsMenu.ts

@@ -187,30 +187,6 @@ const useOptionsMenu = ({
 			searchedAttributesDataV5?.data.data.keys || {},
 		).flat();
 		if (searchedAttributesDataList.length) {
-			if (dataSource === DataSource.LOGS) {
-				const logsSelectedColumns: TelemetryFieldKey[] =
-					defaultLogsSelectedColumns.map((e) => ({
-						...e,
-						name: e.name,
-						signal: e.signal as SignalType,
-						fieldContext: e.fieldContext as FieldContext,
-						fieldDataType: e.fieldDataType as FieldDataType,
-					}));
-				return [
-					...logsSelectedColumns,
-					...searchedAttributesDataList
-						.filter((attribute) => attribute.name !== 'body')
-						// eslint-disable-next-line sonarjs/no-identical-functions
-						.map((e) => ({
-							...e,
-							name: e.name,
-							signal: e.signal as SignalType,
-							fieldContext: e.fieldContext as FieldContext,
-							fieldDataType: e.fieldDataType as FieldDataType,
-						})),
-				];
-			}
-			// eslint-disable-next-line sonarjs/no-identical-functions
 			return searchedAttributesDataList.map((e) => ({
 				...e,
 				name: e.name,
@@ -297,24 +273,9 @@ const useOptionsMenu = ({
 				return [...acc, column];
 			}, [] as TelemetryFieldKey[]);
 
-			const optionsData: OptionsQuery = {
-				...defaultOptionsQuery,
-				selectColumns: newSelectedColumns,
-				format: preferences?.formatting?.format || defaultOptionsQuery.format,
-				maxLines: preferences?.formatting?.maxLines || defaultOptionsQuery.maxLines,
-				fontSize: preferences?.formatting?.fontSize || defaultOptionsQuery.fontSize,
-			};
-
 			updateColumns(newSelectedColumns);
-			handleRedirectWithOptionsData(optionsData);
 		},
-		[
-			searchedAttributeKeys,
-			selectedColumnKeys,
-			preferences,
-			handleRedirectWithOptionsData,
-			updateColumns,
-		],
+		[searchedAttributeKeys, selectedColumnKeys, preferences, updateColumns],
 	);
 
 	const handleRemoveSelectedColumn = useCallback(
@@ -327,27 +288,12 @@ const useOptionsMenu = ({
 				notifications.error({
 					message: 'There must be at least one selected column',
 				});
-			} else {
-				const optionsData: OptionsQuery = {
-					...defaultOptionsQuery,
-					selectColumns: newSelectedColumns || [],
-					format: preferences?.formatting?.format || defaultOptionsQuery.format,
-					maxLines:
-						preferences?.formatting?.maxLines || defaultOptionsQuery.maxLines,
-					fontSize:
-						preferences?.formatting?.fontSize || defaultOptionsQuery.fontSize,
-				};
-				updateColumns(newSelectedColumns || []);
-				handleRedirectWithOptionsData(optionsData);
+				return;
 			}
+
+			updateColumns(newSelectedColumns || []);
 		},
-		[
-			dataSource,
-			notifications,
-			preferences,
-			handleRedirectWithOptionsData,
-			updateColumns,
-		],
+		[dataSource, notifications, preferences, updateColumns],
 	);
 
 	const handleFormatChange = useCallback(
@@ -414,6 +360,18 @@ const useOptionsMenu = ({
 		setSearchText(value);
 	}, []);
 
+	const reorderSelectColumns = useCallback(
+		(orderedIds: string[]): void => {
+			const current = preferences?.columns ?? [];
+			const byName = new Map(current.map((f) => [f.name, f]));
+			const reordered = orderedIds
+				.map((id) => byName.get(id))
+				.filter((f): f is TelemetryFieldKey => f !== undefined);
+			updateColumns(reordered);
+		},
+		[preferences, updateColumns],
+	);
+
 	const handleFocus = (): void => {
 		setIsFocused(true);
 	};
@@ -436,6 +394,7 @@ const useOptionsMenu = ({
 				onSelect: handleSelectColumns,
 				onRemove: handleRemoveSelectedColumn,
 				onSearch: handleSearchAttribute,
+				onReorder: reorderSelectColumns,
 			},
 			format: {
 				value: preferences?.formatting?.format || defaultOptionsQuery.format,
@@ -457,6 +416,7 @@ const useOptionsMenu = ({
 			handleSelectColumns,
 			handleRemoveSelectedColumn,
 			handleSearchAttribute,
+			reorderSelectColumns,
 			handleFormatChange,
 			handleMaxLinesChange,
 			handleFontSizeChange,

frontend/src/container/OrganizationSettings/AuthDomain/__tests__/AuthDomain.test.tsx

@@ -58,6 +58,26 @@ describe('AuthDomain', () => {
 			});
 		});
 
+		it('reflects ssoEnabled state from nested config in each row toggle', async () => {
+			server.use(
+				rest.get(AUTH_DOMAINS_LIST_ENDPOINT, (_, res, ctx) =>
+					res(ctx.status(200), ctx.json(mockDomainsListResponse)),
+				),
+			);
+
+			render(<AuthDomain />);
+
+			// mockDomainsListResponse rows:
+			//   [0] signoz.io   → config.ssoEnabled: true
+			//   [1] example.com → config.ssoEnabled: false
+			//   [2] corp.io     → config.ssoEnabled: true
+			const switches = await screen.findAllByRole('switch');
+			expect(switches).toHaveLength(3);
+			expect(switches[0]).toBeChecked();
+			expect(switches[1]).not.toBeChecked();
+			expect(switches[2]).toBeChecked();
+		});
+
 		it('renders empty state when no domains exist', async () => {
 			server.use(
 				rest.get(AUTH_DOMAINS_LIST_ENDPOINT, (_, res, ctx) =>

frontend/src/container/OrganizationSettings/AuthDomain/index.tsx

@@ -121,14 +121,14 @@ function AuthDomain(): JSX.Element {
 			},
 			{
 				title: 'Enforce SSO',
-				dataIndex: 'ssoEnabled',
+				dataIndex: ['config', 'ssoEnabled'],
 				key: 'ssoEnabled',
 				width: 80,
 				render: (
 					value: boolean,
 					record: AuthtypesGettableAuthDomainDTO,
 				): JSX.Element => (
-					<SSOEnforcementToggle isDefaultChecked={value} record={record} />
+					<SSOEnforcementToggle isDefaultChecked={!!value} record={record} />
 				),
 			},
 			{

frontend/src/container/PaginatedTraceFlamegraph/PaginatedTraceFlamegraph.styles.scss

@@ -87,12 +87,7 @@
 
 					.service-progress-indicator {
 						width: fit-content;
-						margin-inline-end: 0px !important;
-						margin-bottom: 0px !important;
-
-						.ant-progress-inner {
-							width: 30px;
-						}
+						--progress-width: 30px;
 					}
 
 					.percent-value {

frontend/src/container/PaginatedTraceFlamegraph/PaginatedTraceFlamegraph.tsx

@@ -1,6 +1,7 @@
 import { useEffect, useMemo, useState } from 'react';
 import { useParams } from 'react-router-dom';
-import { Progress, Skeleton, Tooltip } from 'antd';
+import { Skeleton, Tooltip } from 'antd';
+import { Progress } from '@signozhq/ui/progress';
 import { Typography } from '@signozhq/ui/typography';
 import { AxiosError } from 'axios';
 import Spinner from 'components/Spinner';

frontend/src/container/PipelinePage/PipelineListsView/AddNewProcessor/FormFields/JsonFlattening.tsx

@@ -1,6 +1,7 @@
 import { useEffect, useState } from 'react';
 import { Info } from '@signozhq/icons';
-import { Flex, Form, Input, Space, Switch, Tooltip } from 'antd';
+import { Switch } from '@signozhq/ui/switch';
+import { Flex, Form, Input, Space, Tooltip } from 'antd';
 import { ProcessorData } from 'types/api/pipeline/def';
 
 import { PREDEFINED_MAPPING } from '../config';
@@ -58,11 +59,7 @@ function JsonFlattening({
 				initialValue={isAdd ? true : selectedProcessorData?.enable_paths}
 			>
 				<Space>
-					<Switch
-						size="small"
-						checked={enablePaths}
-						onChange={handleEnablePathsChange}
-					/>
+					<Switch value={enablePaths} onChange={handleEnablePathsChange} />
 					Enable Paths
 				</Space>
 			</Form.Item>
@@ -79,11 +76,7 @@ function JsonFlattening({
 
 			<Form.Item className="json-flattening-form__item">
 				<Space>
-					<Switch
-						size="small"
-						checked={enableMapping}
-						onChange={handleEnableMappingChange}
-					/>
+					<Switch value={enableMapping} onChange={handleEnableMappingChange} />
 					<Flex gap="8px" align="center">
 						Enable Mapping
 						<Tooltip title="The order of filled keys will determine the priority of keys i.e. earlier keys have higher precedence">

frontend/src/container/PipelinePage/PipelineListsView/AddNewProcessor/ProcessorForm.tsx

@@ -1,5 +1,6 @@
 import { useTranslation } from 'react-i18next';
-import { Form, Input, Select, Space, Switch } from 'antd';
+import { Form, Input, Select, Space } from 'antd';
+import { Switch } from '@signozhq/ui/switch';
 import { ModalFooterTitle } from 'container/PipelinePage/styles';
 import { ProcessorData } from 'types/api/pipeline/def';
 
@@ -92,8 +93,7 @@ function ProcessorFieldInput({
 					>
 						<Space>
 							<Switch
-								size="small"
-								checked={form.getFieldValue('enable_flattening')}
+								value={form.getFieldValue('enable_flattening')}
 								onChange={(checked: boolean): void => {
 									form.setFieldValue('enable_flattening', checked);
 								}}

frontend/src/container/PipelinePage/PipelineListsView/TableComponents/DragAction.tsx

@@ -1,5 +1,5 @@
 import { GripVertical } from '@signozhq/icons';
-import { Switch } from 'antd';
+import { Switch } from '@signozhq/ui/switch';
 
 import { holdIconStyle } from '../config';
 import { LastActionColumn } from '../styles';
@@ -7,7 +7,7 @@ import { LastActionColumn } from '../styles';
 function DragAction({ isEnabled, onChange }: DragActionProps): JSX.Element {
 	return (
 		<LastActionColumn>
-			<Switch defaultChecked={isEnabled} onChange={onChange} />
+			<Switch defaultValue={isEnabled} onChange={onChange} />
 			<GripVertical size="lg" style={holdIconStyle} />
 		</LastActionColumn>
 	);

frontend/src/container/PipelinePage/tests/PipelineListsView.test.tsx

@@ -191,7 +191,7 @@ describe('PipelinePage container test', () => {
 		await fireEvent.click(expandIcon[0]);
 
 		const switchToggle = document.querySelector(
-			'.ant-table-expanded-row .ant-switch',
+			'.ant-table-expanded-row [role="switch"]',
 		);
 
 		expect(switchToggle).toBeChecked();
@@ -244,7 +244,7 @@ describe('PipelinePage container test', () => {
 		const addNewPipelineBtn = getByText('add_new_pipeline');
 		expect(addNewPipelineBtn).toBeInTheDocument();
 
-		const switchToggle = document.querySelectorAll('.ant-switch');
+		const switchToggle = document.querySelectorAll('[role="switch"]');
 
 		expect(switchToggle[0]).not.toBeChecked();
 		await fireEvent.click(switchToggle[0] as HTMLElement);

frontend/src/container/PipelinePage/tests/__snapshots__/DragAction.test.tsx.snap

@@ -21,26 +21,25 @@ exports[`PipelinePage container test should render DragAction section 1`] = `
 <div
     class="c0"
   >
-    <button
-      aria-checked="true"
-      class="ant-switch css-dev-only-do-not-override-2i2tap ant-switch-checked"
-      role="switch"
-      type="button"
+    <div
+      class="_switch-wrapper_jbsv7_1"
     >
-      <div
-        class="ant-switch-handle"
-      />
-      <span
-        class="ant-switch-inner"
+      <button
+        aria-checked="true"
+        class="_switch_jbsv7_1"
+        data-color="robin"
+        data-state="checked"
+        id=":r0:"
+        role="switch"
+        type="button"
+        value="on"
       >
         <span
-          class="ant-switch-inner-checked"
+          class="_switch__thumb_jbsv7_59"
+          data-state="checked"
         />
-        <span
-          class="ant-switch-inner-unchecked"
-        />
-      </span>
-    </button>
+      </button>
+    </div>
     <svg
       style="font-size: 1rem; cursor: move;"
     />

frontend/src/container/TopNav/DateTimeSelectionV2/__tests__/DateTimeSelectionV2.edge-cases.test.tsx

@@ -0,0 +1,258 @@
+import {
+	act,
+	fireEvent,
+	render,
+	screen,
+	waitFor,
+} from '@testing-library/react';
+
+import DateTimeSelection from '../index';
+import {
+	__resetSearchParamsGetter,
+	__setSearchParamsGetterForTest,
+} from '../utils/getUnstableCurrentSearchParams';
+import { queryClient, TestWrapper } from './testUtils';
+
+const mockSafeNavigate = jest.fn();
+jest.mock('hooks/useSafeNavigate', () => ({
+	useSafeNavigate: (): { safeNavigate: jest.Mock } => ({
+		safeNavigate: mockSafeNavigate,
+	}),
+}));
+
+jest.mock('container/NewExplorerCTA', () => ({
+	__esModule: true,
+	default: (): null => null,
+}));
+
+jest.mock('components/CustomTimePicker/CustomTimePicker', () => ({
+	__esModule: true,
+	default: ({
+		onSelect,
+	}: {
+		onSelect: (value: string) => void;
+	}): JSX.Element => (
+		<div data-testid="custom-time-picker">
+			<button
+				type="button"
+				data-testid="select-15m"
+				onClick={(): void => onSelect('15m')}
+			>
+				15m
+			</button>
+			<button
+				type="button"
+				data-testid="select-1h"
+				onClick={(): void => onSelect('1h')}
+			>
+				1h
+			</button>
+			<button
+				type="button"
+				data-testid="select-6h"
+				onClick={(): void => onSelect('6h')}
+			>
+				6h
+			</button>
+			<button
+				type="button"
+				data-testid="select-custom"
+				onClick={(): void => onSelect('custom')}
+			>
+				Custom
+			</button>
+		</div>
+	),
+}));
+
+describe('DateTimeSelectionV2 - Edge Cases', () => {
+	let currentSearchParams: URLSearchParams;
+
+	beforeEach(() => {
+		jest.clearAllMocks();
+		mockSafeNavigate.mockClear();
+		queryClient.clear();
+	});
+
+	afterEach(() => {
+		__resetSearchParamsGetter();
+	});
+
+	describe('Fresh Params at Navigation Time (Core Fix)', () => {
+		it('should read params at navigation time, not render time', async () => {
+			currentSearchParams = new URLSearchParams('relativeTime=30m');
+			__setSearchParamsGetterForTest(() => currentSearchParams);
+
+			render(
+				<TestWrapper
+					initialSearchParams="relativeTime=30m"
+					onUrlUpdate={(event): void => {
+						currentSearchParams = event.searchParams;
+					}}
+				>
+					<DateTimeSelection showAutoRefresh />
+				</TestWrapper>,
+			);
+
+			await waitFor(() => {
+				expect(screen.getByTestId('custom-time-picker')).toBeInTheDocument();
+			});
+
+			currentSearchParams = new URLSearchParams(
+				'relativeTime=30m&externalParam=addedLater',
+			);
+
+			mockSafeNavigate.mockClear();
+
+			act(() => {
+				fireEvent.click(screen.getByTestId('select-1h'));
+			});
+
+			await waitFor(() => {
+				expect(mockSafeNavigate).toHaveBeenCalled();
+			});
+
+			const navigatedUrl = mockSafeNavigate.mock.calls[
+				mockSafeNavigate.mock.calls.length - 1
+			][0] as string;
+
+			expect(navigatedUrl).toContain('relativeTime=1h');
+			expect(navigatedUrl).toContain('externalParam=addedLater');
+		});
+
+		it('should preserve multiple externally added params', async () => {
+			currentSearchParams = new URLSearchParams('relativeTime=30m');
+			__setSearchParamsGetterForTest(() => currentSearchParams);
+
+			render(
+				<TestWrapper initialSearchParams="relativeTime=30m">
+					<DateTimeSelection showAutoRefresh />
+				</TestWrapper>,
+			);
+
+			await waitFor(() => {
+				expect(screen.getByTestId('custom-time-picker')).toBeInTheDocument();
+			});
+
+			currentSearchParams = new URLSearchParams(
+				'relativeTime=30m&yAxisUnit=bytes&groupBy=host&view=table',
+			);
+
+			mockSafeNavigate.mockClear();
+
+			act(() => {
+				fireEvent.click(screen.getByTestId('select-6h'));
+			});
+
+			await waitFor(() => {
+				expect(mockSafeNavigate).toHaveBeenCalled();
+			});
+
+			const navigatedUrl = mockSafeNavigate.mock.calls[
+				mockSafeNavigate.mock.calls.length - 1
+			][0] as string;
+
+			expect(navigatedUrl).toContain('relativeTime=6h');
+			expect(navigatedUrl).toContain('yAxisUnit=bytes');
+			expect(navigatedUrl).toContain('groupBy=host');
+			expect(navigatedUrl).toContain('view=table');
+		});
+	});
+
+	describe('Empty and Special Values', () => {
+		it('should handle empty URL params gracefully', async () => {
+			currentSearchParams = new URLSearchParams('');
+			__setSearchParamsGetterForTest(() => currentSearchParams);
+
+			render(
+				<TestWrapper initialSearchParams="">
+					<DateTimeSelection showAutoRefresh />
+				</TestWrapper>,
+			);
+
+			await waitFor(() => {
+				expect(screen.getByTestId('custom-time-picker')).toBeInTheDocument();
+			});
+
+			mockSafeNavigate.mockClear();
+
+			act(() => {
+				fireEvent.click(screen.getByTestId('select-15m'));
+			});
+
+			await waitFor(() => {
+				expect(mockSafeNavigate).toHaveBeenCalled();
+			});
+
+			const navigatedUrl = mockSafeNavigate.mock.calls[
+				mockSafeNavigate.mock.calls.length - 1
+			][0] as string;
+
+			expect(navigatedUrl).toContain('relativeTime=15m');
+		});
+
+		it('should handle special characters in preserved params', async () => {
+			currentSearchParams = new URLSearchParams(
+				'relativeTime=30m&filter=name%3D%22test%22',
+			);
+			__setSearchParamsGetterForTest(() => currentSearchParams);
+
+			render(
+				<TestWrapper initialSearchParams="relativeTime=30m&filter=name%3D%22test%22">
+					<DateTimeSelection showAutoRefresh />
+				</TestWrapper>,
+			);
+
+			await waitFor(() => {
+				expect(screen.getByTestId('custom-time-picker')).toBeInTheDocument();
+			});
+
+			mockSafeNavigate.mockClear();
+
+			act(() => {
+				fireEvent.click(screen.getByTestId('select-1h'));
+			});
+
+			await waitFor(() => {
+				expect(mockSafeNavigate).toHaveBeenCalled();
+			});
+
+			const navigatedUrl = mockSafeNavigate.mock.calls[
+				mockSafeNavigate.mock.calls.length - 1
+			][0] as string;
+
+			expect(navigatedUrl).toContain('relativeTime=1h');
+			expect(navigatedUrl).toContain('filter=');
+		});
+
+		it('should not navigate when selecting custom (opens picker instead)', async () => {
+			currentSearchParams = new URLSearchParams('relativeTime=30m');
+			__setSearchParamsGetterForTest(() => currentSearchParams);
+
+			render(
+				<TestWrapper initialSearchParams="relativeTime=30m">
+					<DateTimeSelection showAutoRefresh />
+				</TestWrapper>,
+			);
+
+			await waitFor(() => {
+				expect(screen.getByTestId('custom-time-picker')).toBeInTheDocument();
+			});
+
+			mockSafeNavigate.mockClear();
+
+			act(() => {
+				fireEvent.click(screen.getByTestId('select-custom'));
+			});
+
+			await new Promise((resolve) => setTimeout(resolve, 100));
+
+			const customNavigationCalls = mockSafeNavigate.mock.calls.filter((call) => {
+				const url = call[0] as string;
+				return url.includes('startTime=') || url.includes('endTime=');
+			});
+
+			expect(customNavigationCalls).toHaveLength(0);
+		});
+	});
+});

frontend/src/container/TopNav/DateTimeSelectionV2/__tests__/DateTimeSelectionV2.modal-mode.test.tsx

@@ -0,0 +1,180 @@
+import {
+	act,
+	fireEvent,
+	render,
+	screen,
+	waitFor,
+} from '@testing-library/react';
+
+import DateTimeSelection from '../index';
+import {
+	__resetSearchParamsGetter,
+	__setSearchParamsGetterForTest,
+} from '../utils/getUnstableCurrentSearchParams';
+import { queryClient, TestWrapper } from './testUtils';
+
+const mockSafeNavigate = jest.fn();
+jest.mock('hooks/useSafeNavigate', () => ({
+	useSafeNavigate: (): { safeNavigate: jest.Mock } => ({
+		safeNavigate: mockSafeNavigate,
+	}),
+}));
+
+jest.mock('container/NewExplorerCTA', () => ({
+	__esModule: true,
+	default: (): null => null,
+}));
+
+let mockOnCustomDateHandler: ((range: [unknown, unknown]) => void) | null =
+	null;
+let mockOnValidCustomDateChange: ((data: { timeStr: string }) => void) | null =
+	null;
+
+jest.mock('components/CustomTimePicker/CustomTimePicker', () => ({
+	__esModule: true,
+	default: ({
+		onSelect,
+		onCustomDateHandler,
+		onValidCustomDateChange,
+	}: {
+		onSelect: (value: string) => void;
+		onCustomDateHandler?: (range: [unknown, unknown]) => void;
+		onValidCustomDateChange?: (data: { timeStr: string }) => void;
+	}): JSX.Element => {
+		mockOnCustomDateHandler = onCustomDateHandler || null;
+		mockOnValidCustomDateChange = onValidCustomDateChange || null;
+
+		return (
+			<div data-testid="custom-time-picker">
+				<button
+					type="button"
+					data-testid="select-1h"
+					onClick={(): void => onSelect('1h')}
+				>
+					1h
+				</button>
+			</div>
+		);
+	},
+}));
+
+describe('DateTimeSelectionV2 - Modal Mode', () => {
+	let currentSearchParams: URLSearchParams;
+
+	beforeEach(() => {
+		jest.clearAllMocks();
+		mockSafeNavigate.mockClear();
+		queryClient.clear();
+		mockOnCustomDateHandler = null;
+		mockOnValidCustomDateChange = null;
+	});
+
+	afterEach(() => {
+		__resetSearchParamsGetter();
+	});
+
+	it('should call onTimeChange instead of navigating for relative time', async () => {
+		currentSearchParams = new URLSearchParams('relativeTime=30m');
+		__setSearchParamsGetterForTest(() => currentSearchParams);
+
+		const mockOnTimeChange = jest.fn();
+
+		render(
+			<TestWrapper initialSearchParams="relativeTime=30m">
+				<DateTimeSelection
+					showAutoRefresh
+					isModalTimeSelection
+					onTimeChange={mockOnTimeChange}
+				/>
+			</TestWrapper>,
+		);
+
+		await waitFor(() => {
+			expect(screen.getByTestId('custom-time-picker')).toBeInTheDocument();
+		});
+
+		mockSafeNavigate.mockClear();
+
+		act(() => {
+			fireEvent.click(screen.getByTestId('select-1h'));
+		});
+
+		await waitFor(() => {
+			expect(mockOnTimeChange).toHaveBeenCalledWith('1h');
+		});
+
+		expect(mockSafeNavigate).not.toHaveBeenCalled();
+	});
+
+	it('should call onTimeChange with custom and timestamps for custom date', async () => {
+		currentSearchParams = new URLSearchParams('relativeTime=30m');
+		__setSearchParamsGetterForTest(() => currentSearchParams);
+
+		const mockOnTimeChange = jest.fn();
+
+		render(
+			<TestWrapper initialSearchParams="relativeTime=30m">
+				<DateTimeSelection
+					showAutoRefresh
+					isModalTimeSelection
+					onTimeChange={mockOnTimeChange}
+				/>
+			</TestWrapper>,
+		);
+
+		await waitFor(() => {
+			expect(screen.getByTestId('custom-time-picker')).toBeInTheDocument();
+		});
+
+		const startMoment = { toDate: (): Date => new Date(1700000000000) };
+		const endMoment = { toDate: (): Date => new Date(1700003600000) };
+
+		mockSafeNavigate.mockClear();
+
+		act(() => {
+			mockOnCustomDateHandler?.([startMoment, endMoment]);
+		});
+
+		await waitFor(() => {
+			expect(mockOnTimeChange).toHaveBeenCalledWith(
+				'custom',
+				[1700000000000, 1700003600000],
+			);
+		});
+
+		expect(mockSafeNavigate).not.toHaveBeenCalled();
+	});
+
+	it('should call onTimeChange for valid custom date string in modal', async () => {
+		currentSearchParams = new URLSearchParams('relativeTime=30m');
+		__setSearchParamsGetterForTest(() => currentSearchParams);
+
+		const mockOnTimeChange = jest.fn();
+
+		render(
+			<TestWrapper initialSearchParams="relativeTime=30m">
+				<DateTimeSelection
+					showAutoRefresh
+					isModalTimeSelection
+					onTimeChange={mockOnTimeChange}
+				/>
+			</TestWrapper>,
+		);
+
+		await waitFor(() => {
+			expect(screen.getByTestId('custom-time-picker')).toBeInTheDocument();
+		});
+
+		mockSafeNavigate.mockClear();
+
+		act(() => {
+			mockOnValidCustomDateChange?.({ timeStr: '4h' });
+		});
+
+		await waitFor(() => {
+			expect(mockOnTimeChange).toHaveBeenCalledWith('4h');
+		});
+
+		expect(mockSafeNavigate).not.toHaveBeenCalled();
+	});
+});

frontend/src/container/TopNav/DateTimeSelectionV2/__tests__/DateTimeSelectionV2.regression.test.tsx

@@ -0,0 +1,207 @@
+// eslint-disable-next-line no-restricted-imports
+import { Provider } from 'react-redux';
+import { MemoryRouter, Route } from 'react-router-dom';
+import { NuqsTestingAdapter } from 'nuqs/adapters/testing';
+import { QueryClient, QueryClientProvider } from 'react-query';
+import {
+	act,
+	fireEvent,
+	render,
+	screen,
+	waitFor,
+} from '@testing-library/react';
+import { parseAsString, useQueryState } from 'nuqs';
+import { AppContext } from 'providers/App/App';
+import TimezoneProvider from 'providers/Timezone';
+import { QueryBuilderProvider } from 'providers/QueryBuilder';
+import configureStore from 'redux-mock-store';
+import thunk from 'redux-thunk';
+import store from 'store';
+import { getAppContextMock } from 'tests/test-utils';
+import { CompatRouter } from 'react-router-dom-v5-compat';
+
+import DateTimeSelection from '../index';
+import {
+	__resetSearchParamsGetter,
+	__setSearchParamsGetterForTest,
+} from '../utils/getUnstableCurrentSearchParams';
+
+const queryClient = new QueryClient({
+	defaultOptions: {
+		queries: { refetchOnWindowFocus: false, retry: false },
+		mutations: { retry: false },
+	},
+});
+
+const mockStore = configureStore([thunk]);
+
+const mockSafeNavigate = jest.fn();
+jest.mock('hooks/useSafeNavigate', () => ({
+	useSafeNavigate: (): { safeNavigate: jest.Mock } => ({
+		safeNavigate: mockSafeNavigate,
+	}),
+}));
+
+jest.mock('components/CustomTimePicker/CustomTimePicker', () => ({
+	__esModule: true,
+	default: ({
+		onSelect,
+	}: {
+		onSelect: (value: string) => void;
+	}): JSX.Element => (
+		<div data-testid="custom-time-picker">
+			<button
+				type="button"
+				data-testid="select-1h"
+				onClick={(): void => onSelect('1h')}
+			>
+				1h
+			</button>
+		</div>
+	),
+}));
+
+jest.mock('container/NewExplorerCTA', () => ({
+	__esModule: true,
+	default: (): null => null,
+}));
+
+function NuqsParamSetter({ paramValue }: { paramValue: string }): JSX.Element {
+	const [, setYAxisUnit] = useQueryState(
+		'yAxisUnit',
+		parseAsString.withDefault(''),
+	);
+
+	return (
+		<button
+			type="button"
+			data-testid="set-nuqs-param"
+			onClick={(): void => {
+				setYAxisUnit(paramValue);
+			}}
+		>
+			Set yAxisUnit
+		</button>
+	);
+}
+
+interface WrapperProps {
+	children: React.ReactNode;
+	initialSearchParams?: string;
+	initialPath?: string;
+	onUrlUpdate?: (event: { searchParams: URLSearchParams }) => void;
+}
+
+function TestWrapper({
+	children,
+	initialSearchParams = '',
+	initialPath = '/services',
+	onUrlUpdate,
+}: WrapperProps): JSX.Element {
+	const initialEntry = initialSearchParams
+		? `${initialPath}?${initialSearchParams}`
+		: initialPath;
+
+	const mockedStore = mockStore({
+		...store.getState(),
+		app: {
+			...store.getState().app,
+			role: 'ADMIN',
+			user: {
+				userId: 'test-user-id',
+				email: 'test@signoz.io',
+				name: 'TestUser',
+				profilePictureURL: '',
+				accessJwt: '',
+				refreshJwt: '',
+			},
+			isLoggedIn: true,
+		},
+	});
+
+	return (
+		<MemoryRouter initialEntries={[initialEntry]}>
+			<CompatRouter>
+				<NuqsTestingAdapter
+					searchParams={initialSearchParams}
+					onUrlUpdate={onUrlUpdate}
+				>
+					<QueryClientProvider client={queryClient}>
+						<Provider store={mockedStore}>
+							<AppContext.Provider value={getAppContextMock('ADMIN')}>
+								<TimezoneProvider>
+									<QueryBuilderProvider>
+										<Route path="*">{children}</Route>
+									</QueryBuilderProvider>
+								</TimezoneProvider>
+							</AppContext.Provider>
+						</Provider>
+					</QueryClientProvider>
+				</NuqsTestingAdapter>
+			</CompatRouter>
+		</MemoryRouter>
+	);
+}
+
+describe('REGRESSION: DateTimeSelectionV2 preserves nuqs query params on time change', () => {
+	let currentSearchParams: URLSearchParams;
+
+	beforeEach(() => {
+		jest.clearAllMocks();
+		mockSafeNavigate.mockClear();
+		queryClient.clear();
+
+		// Initialize with test's initial search params
+		currentSearchParams = new URLSearchParams('relativeTime=30m');
+		__setSearchParamsGetterForTest(() => currentSearchParams);
+	});
+
+	afterEach(() => {
+		__resetSearchParamsGetter();
+	});
+
+	it('should preserve yAxisUnit param set via nuqs when changing time selection', async () => {
+		render(
+			<TestWrapper
+				initialSearchParams="relativeTime=30m"
+				onUrlUpdate={(event): void => {
+					// Sync nuqs URL updates to our mock getter
+					// This simulates how window.location.search would be updated in real browser
+					currentSearchParams = event.searchParams;
+				}}
+			>
+				<NuqsParamSetter paramValue="bytes" />
+				<DateTimeSelection showAutoRefresh />
+			</TestWrapper>,
+		);
+
+		await waitFor(() => {
+			expect(screen.getByTestId('custom-time-picker')).toBeInTheDocument();
+		});
+
+		act(() => {
+			fireEvent.click(screen.getByTestId('set-nuqs-param'));
+		});
+
+		await waitFor(() => {
+			expect(currentSearchParams.get('yAxisUnit')).toBe('bytes');
+		});
+
+		mockSafeNavigate.mockClear();
+
+		act(() => {
+			fireEvent.click(screen.getByTestId('select-1h'));
+		});
+
+		await waitFor(() => {
+			expect(mockSafeNavigate).toHaveBeenCalled();
+		});
+
+		const navigatedUrl = mockSafeNavigate.mock.calls[
+			mockSafeNavigate.mock.calls.length - 1
+		][0] as string;
+
+		expect(navigatedUrl).toContain('relativeTime=1h');
+		expect(navigatedUrl).toContain('yAxisUnit=bytes');
+	});
+});

frontend/src/container/TopNav/DateTimeSelectionV2/__tests__/DateTimeSelectionV2.routes.test.tsx

@@ -0,0 +1,133 @@
+import { render, screen, waitFor } from '@testing-library/react';
+import ROUTES from 'constants/routes';
+
+import DateTimeSelection from '../index';
+import {
+	__resetSearchParamsGetter,
+	__setSearchParamsGetterForTest,
+} from '../utils/getUnstableCurrentSearchParams';
+import { queryClient, TestWrapper } from './testUtils';
+
+const mockSafeNavigate = jest.fn();
+jest.mock('hooks/useSafeNavigate', () => ({
+	useSafeNavigate: (): { safeNavigate: jest.Mock } => ({
+		safeNavigate: mockSafeNavigate,
+	}),
+}));
+
+jest.mock('container/NewExplorerCTA', () => ({
+	__esModule: true,
+	default: (): null => null,
+}));
+
+jest.mock('components/CustomTimePicker/CustomTimePicker', () => ({
+	__esModule: true,
+	default: (): JSX.Element => <div data-testid="custom-time-picker" />,
+}));
+
+describe('DateTimeSelectionV2 - Route-Specific Behavior', () => {
+	let currentSearchParams: URLSearchParams;
+
+	beforeEach(() => {
+		jest.clearAllMocks();
+		mockSafeNavigate.mockClear();
+		queryClient.clear();
+	});
+
+	afterEach(() => {
+		__resetSearchParamsGetter();
+	});
+
+	describe('Alert Pages', () => {
+		it('should set default time for alert overview when no time params', async () => {
+			currentSearchParams = new URLSearchParams('otherParam=value');
+			__setSearchParamsGetterForTest(() => currentSearchParams);
+
+			render(
+				<TestWrapper
+					initialSearchParams="otherParam=value"
+					initialPath={ROUTES.ALERT_OVERVIEW}
+				>
+					<DateTimeSelection showAutoRefresh defaultRelativeTime="6h" />
+				</TestWrapper>,
+			);
+
+			await waitFor(() => {
+				expect(mockSafeNavigate).toHaveBeenCalled();
+			});
+
+			const navigatedUrl = mockSafeNavigate.mock.calls[0][0] as string;
+			expect(navigatedUrl).toContain('relativeTime=6h');
+			expect(navigatedUrl).toContain('otherParam=value');
+		});
+
+		it('should set default time for alert history when no time params', async () => {
+			currentSearchParams = new URLSearchParams('filter=active');
+			__setSearchParamsGetterForTest(() => currentSearchParams);
+
+			render(
+				<TestWrapper
+					initialSearchParams="filter=active"
+					initialPath={ROUTES.ALERT_HISTORY}
+				>
+					<DateTimeSelection showAutoRefresh defaultRelativeTime="6h" />
+				</TestWrapper>,
+			);
+
+			await waitFor(() => {
+				expect(mockSafeNavigate).toHaveBeenCalled();
+			});
+
+			const navigatedUrl = mockSafeNavigate.mock.calls[0][0] as string;
+			expect(navigatedUrl).toContain('relativeTime=6h');
+		});
+
+		it('should NOT override existing time params on alert pages', async () => {
+			currentSearchParams = new URLSearchParams('relativeTime=1h&filter=active');
+			__setSearchParamsGetterForTest(() => currentSearchParams);
+
+			render(
+				<TestWrapper
+					initialSearchParams="relativeTime=1h&filter=active"
+					initialPath={ROUTES.ALERT_OVERVIEW}
+				>
+					<DateTimeSelection showAutoRefresh defaultRelativeTime="6h" />
+				</TestWrapper>,
+			);
+
+			await waitFor(() => {
+				expect(screen.getByTestId('custom-time-picker')).toBeInTheDocument();
+			});
+
+			const calls = mockSafeNavigate.mock.calls;
+			if (calls.length > 0) {
+				const lastUrl = calls[calls.length - 1][0] as string;
+				expect(lastUrl).toContain('relativeTime=1h');
+			}
+		});
+	});
+
+	describe('disableUrlSync Behavior', () => {
+		it('should not sync URL on mount when disableUrlSync is true', async () => {
+			currentSearchParams = new URLSearchParams('');
+			__setSearchParamsGetterForTest(() => currentSearchParams);
+
+			render(
+				<TestWrapper initialSearchParams="" initialPath="/services">
+					<DateTimeSelection showAutoRefresh disableUrlSync />
+				</TestWrapper>,
+			);
+
+			await waitFor(() => {
+				expect(screen.getByTestId('custom-time-picker')).toBeInTheDocument();
+			});
+
+			const syncCalls = mockSafeNavigate.mock.calls.filter((call) => {
+				const url = call[0] as string;
+				return url.includes('relativeTime=') && !url.includes('services?');
+			});
+
+			expect(syncCalls).toHaveLength(0);
+		});
+	});
+});

frontend/src/container/TopNav/DateTimeSelectionV2/__tests__/DateTimeSelectionV2.time-selection.test.tsx

@@ -0,0 +1,353 @@
+import {
+	act,
+	fireEvent,
+	render,
+	screen,
+	waitFor,
+} from '@testing-library/react';
+
+import DateTimeSelection from '../index';
+import {
+	__resetSearchParamsGetter,
+	__setSearchParamsGetterForTest,
+} from '../utils/getUnstableCurrentSearchParams';
+import { queryClient, TestWrapper, createMockMoment } from './testUtils';
+
+const mockSafeNavigate = jest.fn();
+jest.mock('hooks/useSafeNavigate', () => ({
+	useSafeNavigate: (): { safeNavigate: jest.Mock } => ({
+		safeNavigate: mockSafeNavigate,
+	}),
+}));
+
+jest.mock('container/NewExplorerCTA', () => ({
+	__esModule: true,
+	default: (): null => null,
+}));
+
+let mockOnCustomDateHandler: ((range: [unknown, unknown]) => void) | null =
+	null;
+let mockOnValidCustomDateChange: ((data: { timeStr: string }) => void) | null =
+	null;
+
+jest.mock('components/CustomTimePicker/CustomTimePicker', () => ({
+	__esModule: true,
+	default: ({
+		onSelect,
+		onCustomDateHandler,
+		onValidCustomDateChange,
+	}: {
+		onSelect: (value: string) => void;
+		onCustomDateHandler?: (range: [unknown, unknown]) => void;
+		onValidCustomDateChange?: (data: { timeStr: string }) => void;
+	}): JSX.Element => {
+		mockOnCustomDateHandler = onCustomDateHandler || null;
+		mockOnValidCustomDateChange = onValidCustomDateChange || null;
+
+		return (
+			<div data-testid="custom-time-picker">
+				<button
+					type="button"
+					data-testid="select-15m"
+					onClick={(): void => onSelect('15m')}
+				>
+					15m
+				</button>
+				<button
+					type="button"
+					data-testid="select-1h"
+					onClick={(): void => onSelect('1h')}
+				>
+					1h
+				</button>
+				<button
+					type="button"
+					data-testid="select-6h"
+					onClick={(): void => onSelect('6h')}
+				>
+					6h
+				</button>
+			</div>
+		);
+	},
+}));
+
+describe('DateTimeSelectionV2 - Time Selection', () => {
+	let currentSearchParams: URLSearchParams;
+
+	beforeEach(() => {
+		jest.clearAllMocks();
+		mockSafeNavigate.mockClear();
+		queryClient.clear();
+		mockOnCustomDateHandler = null;
+		mockOnValidCustomDateChange = null;
+	});
+
+	afterEach(() => {
+		__resetSearchParamsGetter();
+	});
+
+	describe('Relative Time', () => {
+		it('should update relativeTime and remove startTime/endTime', async () => {
+			currentSearchParams = new URLSearchParams(
+				'startTime=1000&endTime=2000&otherParam=keep',
+			);
+			__setSearchParamsGetterForTest(() => currentSearchParams);
+
+			render(
+				<TestWrapper initialSearchParams="startTime=1000&endTime=2000&otherParam=keep">
+					<DateTimeSelection showAutoRefresh />
+				</TestWrapper>,
+			);
+
+			await waitFor(() => {
+				expect(screen.getByTestId('custom-time-picker')).toBeInTheDocument();
+			});
+
+			mockSafeNavigate.mockClear();
+
+			act(() => {
+				fireEvent.click(screen.getByTestId('select-15m'));
+			});
+
+			await waitFor(() => {
+				expect(mockSafeNavigate).toHaveBeenCalled();
+			});
+
+			const navigatedUrl = mockSafeNavigate.mock.calls[
+				mockSafeNavigate.mock.calls.length - 1
+			][0] as string;
+
+			expect(navigatedUrl).toContain('relativeTime=15m');
+			expect(navigatedUrl).not.toContain('startTime=');
+			expect(navigatedUrl).not.toContain('endTime=');
+			expect(navigatedUrl).toContain('otherParam=keep');
+		});
+
+		it('should remove activeLogId param on time change', async () => {
+			currentSearchParams = new URLSearchParams(
+				'relativeTime=30m&activeLogId=log123',
+			);
+			__setSearchParamsGetterForTest(() => currentSearchParams);
+
+			render(
+				<TestWrapper initialSearchParams="relativeTime=30m&activeLogId=log123">
+					<DateTimeSelection showAutoRefresh />
+				</TestWrapper>,
+			);
+
+			await waitFor(() => {
+				expect(screen.getByTestId('custom-time-picker')).toBeInTheDocument();
+			});
+
+			mockSafeNavigate.mockClear();
+
+			act(() => {
+				fireEvent.click(screen.getByTestId('select-1h'));
+			});
+
+			await waitFor(() => {
+				expect(mockSafeNavigate).toHaveBeenCalled();
+			});
+
+			const navigatedUrl = mockSafeNavigate.mock.calls[
+				mockSafeNavigate.mock.calls.length - 1
+			][0] as string;
+
+			expect(navigatedUrl).toContain('relativeTime=1h');
+			expect(navigatedUrl).not.toContain('activeLogId');
+		});
+
+		it('should update compositeQuery with new ID when present', async () => {
+			const compositeQuery = encodeURIComponent(
+				JSON.stringify({ id: 'old-id', builder: { queryData: [] } }),
+			);
+			currentSearchParams = new URLSearchParams(
+				`relativeTime=30m&compositeQuery=${compositeQuery}`,
+			);
+			__setSearchParamsGetterForTest(() => currentSearchParams);
+
+			render(
+				<TestWrapper
+					initialSearchParams={`relativeTime=30m&compositeQuery=${compositeQuery}`}
+				>
+					<DateTimeSelection showAutoRefresh />
+				</TestWrapper>,
+			);
+
+			await waitFor(() => {
+				expect(screen.getByTestId('custom-time-picker')).toBeInTheDocument();
+			});
+
+			mockSafeNavigate.mockClear();
+
+			act(() => {
+				fireEvent.click(screen.getByTestId('select-6h'));
+			});
+
+			await waitFor(() => {
+				expect(mockSafeNavigate).toHaveBeenCalled();
+			});
+
+			const navigatedUrl = mockSafeNavigate.mock.calls[
+				mockSafeNavigate.mock.calls.length - 1
+			][0] as string;
+
+			expect(navigatedUrl).toContain('compositeQuery=');
+			expect(navigatedUrl).not.toContain('old-id');
+		});
+
+		it('should preserve all non-time URL params', async () => {
+			currentSearchParams = new URLSearchParams(
+				'relativeTime=30m&param1=a&param2=b&param3=c',
+			);
+			__setSearchParamsGetterForTest(() => currentSearchParams);
+
+			render(
+				<TestWrapper initialSearchParams="relativeTime=30m&param1=a&param2=b&param3=c">
+					<DateTimeSelection showAutoRefresh />
+				</TestWrapper>,
+			);
+
+			await waitFor(() => {
+				expect(screen.getByTestId('custom-time-picker')).toBeInTheDocument();
+			});
+
+			mockSafeNavigate.mockClear();
+
+			act(() => {
+				fireEvent.click(screen.getByTestId('select-1h'));
+			});
+
+			await waitFor(() => {
+				expect(mockSafeNavigate).toHaveBeenCalled();
+			});
+
+			const navigatedUrl = mockSafeNavigate.mock.calls[
+				mockSafeNavigate.mock.calls.length - 1
+			][0] as string;
+
+			expect(navigatedUrl).toContain('relativeTime=1h');
+			expect(navigatedUrl).toContain('param1=a');
+			expect(navigatedUrl).toContain('param2=b');
+			expect(navigatedUrl).toContain('param3=c');
+		});
+	});
+
+	describe('Custom Date Range', () => {
+		it('should set startTime/endTime and remove relativeTime', async () => {
+			currentSearchParams = new URLSearchParams('relativeTime=30m&keepThis=yes');
+			__setSearchParamsGetterForTest(() => currentSearchParams);
+
+			render(
+				<TestWrapper initialSearchParams="relativeTime=30m&keepThis=yes">
+					<DateTimeSelection showAutoRefresh />
+				</TestWrapper>,
+			);
+
+			await waitFor(() => {
+				expect(screen.getByTestId('custom-time-picker')).toBeInTheDocument();
+			});
+
+			const startMoment = createMockMoment(1700000000000);
+			const endMoment = createMockMoment(1700003600000);
+
+			mockSafeNavigate.mockClear();
+
+			act(() => {
+				mockOnCustomDateHandler?.([startMoment, endMoment]);
+			});
+
+			await waitFor(() => {
+				expect(mockSafeNavigate).toHaveBeenCalled();
+			});
+
+			const navigatedUrl = mockSafeNavigate.mock.calls[
+				mockSafeNavigate.mock.calls.length - 1
+			][0] as string;
+
+			expect(navigatedUrl).toContain('startTime=1700000000000');
+			expect(navigatedUrl).toContain('endTime=1700003600000');
+			expect(navigatedUrl).not.toContain('relativeTime=');
+			expect(navigatedUrl).toContain('keepThis=yes');
+		});
+
+		it('should update compositeQuery when present for custom date', async () => {
+			const compositeQuery = encodeURIComponent(
+				JSON.stringify({ id: 'old-id', builder: { queryData: [] } }),
+			);
+			currentSearchParams = new URLSearchParams(
+				`relativeTime=30m&compositeQuery=${compositeQuery}`,
+			);
+			__setSearchParamsGetterForTest(() => currentSearchParams);
+
+			render(
+				<TestWrapper
+					initialSearchParams={`relativeTime=30m&compositeQuery=${compositeQuery}`}
+				>
+					<DateTimeSelection showAutoRefresh />
+				</TestWrapper>,
+			);
+
+			await waitFor(() => {
+				expect(screen.getByTestId('custom-time-picker')).toBeInTheDocument();
+			});
+
+			const startMoment = createMockMoment(1700000000000);
+			const endMoment = createMockMoment(1700003600000);
+
+			mockSafeNavigate.mockClear();
+
+			act(() => {
+				mockOnCustomDateHandler?.([startMoment, endMoment]);
+			});
+
+			await waitFor(() => {
+				expect(mockSafeNavigate).toHaveBeenCalled();
+			});
+
+			const navigatedUrl = mockSafeNavigate.mock.calls[
+				mockSafeNavigate.mock.calls.length - 1
+			][0] as string;
+
+			expect(navigatedUrl).toContain('compositeQuery=');
+			expect(navigatedUrl).not.toContain('old-id');
+		});
+	});
+
+	describe('Valid Custom Date String', () => {
+		it('should handle shorthand date format and preserve params', async () => {
+			currentSearchParams = new URLSearchParams('relativeTime=30m&filter=active');
+			__setSearchParamsGetterForTest(() => currentSearchParams);
+
+			render(
+				<TestWrapper initialSearchParams="relativeTime=30m&filter=active">
+					<DateTimeSelection showAutoRefresh />
+				</TestWrapper>,
+			);
+
+			await waitFor(() => {
+				expect(screen.getByTestId('custom-time-picker')).toBeInTheDocument();
+			});
+
+			mockSafeNavigate.mockClear();
+
+			act(() => {
+				mockOnValidCustomDateChange?.({ timeStr: '2h' });
+			});
+
+			await waitFor(() => {
+				expect(mockSafeNavigate).toHaveBeenCalled();
+			});
+
+			const navigatedUrl = mockSafeNavigate.mock.calls[
+				mockSafeNavigate.mock.calls.length - 1
+			][0] as string;
+
+			expect(navigatedUrl).toContain('relativeTime=2h');
+			expect(navigatedUrl).toContain('filter=active');
+			expect(navigatedUrl).not.toContain('startTime=');
+			expect(navigatedUrl).not.toContain('endTime=');
+		});
+	});
+});

frontend/src/container/TopNav/DateTimeSelectionV2/__tests__/testUtils.tsx

@@ -0,0 +1,95 @@
+// eslint-disable-next-line no-restricted-imports
+import { Provider } from 'react-redux';
+import { MemoryRouter, Route } from 'react-router-dom';
+import { NuqsTestingAdapter } from 'nuqs/adapters/testing';
+import { QueryClient, QueryClientProvider } from 'react-query';
+import { AppContext } from 'providers/App/App';
+import TimezoneProvider from 'providers/Timezone';
+import { QueryBuilderProvider } from 'providers/QueryBuilder';
+import configureStore from 'redux-mock-store';
+import thunk from 'redux-thunk';
+import store from 'store';
+import { getAppContextMock } from 'tests/test-utils';
+import { CompatRouter } from 'react-router-dom-v5-compat';
+
+export const queryClient = new QueryClient({
+	defaultOptions: {
+		queries: { refetchOnWindowFocus: false, retry: false },
+		mutations: { retry: false },
+	},
+});
+
+export const mockStore = configureStore([thunk]);
+
+interface WrapperProps {
+	children: React.ReactNode;
+	initialSearchParams?: string;
+	initialPath?: string;
+	onUrlUpdate?: (event: { searchParams: URLSearchParams }) => void;
+}
+
+export function TestWrapper({
+	children,
+	initialSearchParams = '',
+	initialPath = '/services',
+	onUrlUpdate,
+}: WrapperProps): JSX.Element {
+	const initialEntry = initialSearchParams
+		? `${initialPath}?${initialSearchParams}`
+		: initialPath;
+
+	const mockedStore = mockStore({
+		...store.getState(),
+		app: {
+			...store.getState().app,
+			role: 'ADMIN',
+			user: {
+				userId: 'test-user-id',
+				email: 'test@signoz.io',
+				name: 'TestUser',
+				profilePictureURL: '',
+				accessJwt: '',
+				refreshJwt: '',
+			},
+			isLoggedIn: true,
+		},
+	});
+
+	return (
+		<MemoryRouter initialEntries={[initialEntry]}>
+			<CompatRouter>
+				<NuqsTestingAdapter
+					searchParams={initialSearchParams}
+					onUrlUpdate={onUrlUpdate}
+				>
+					<QueryClientProvider client={queryClient}>
+						<Provider store={mockedStore}>
+							<AppContext.Provider value={getAppContextMock('ADMIN')}>
+								<TimezoneProvider>
+									<QueryBuilderProvider>
+										<Route path="*">{children}</Route>
+									</QueryBuilderProvider>
+								</TimezoneProvider>
+							</AppContext.Provider>
+						</Provider>
+					</QueryClientProvider>
+				</NuqsTestingAdapter>
+			</CompatRouter>
+		</MemoryRouter>
+	);
+}
+
+export function createMockMoment(timestamp: number): {
+	toDate: () => Date;
+	toISOString: () => string;
+	format: () => string;
+	toString: () => string;
+} {
+	const date = new Date(timestamp);
+	return {
+		toDate: (): Date => date,
+		toISOString: (): string => date.toISOString(),
+		format: (): string => date.toISOString(),
+		toString: (): string => date.toString(),
+	};
+}

frontend/src/container/TopNav/DateTimeSelectionV2/index.tsx

@@ -2,7 +2,7 @@ import { useCallback, useEffect, useState } from 'react';
 // eslint-disable-next-line no-restricted-imports
 import { connect, useDispatch, useSelector } from 'react-redux';
 import { RouteComponentProps, withRouter } from 'react-router-dom';
-import { useNavigationType, useSearchParams } from 'react-router-dom-v5-compat';
+import { useNavigationType } from 'react-router-dom-v5-compat';
 import { RefreshCw, Undo } from '@signozhq/icons';
 import { Button } from 'antd';
 import getLocalStorageKey from 'api/browser/localstorage/get';
@@ -20,7 +20,6 @@ import {
 } from 'store/globalTime';
 import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
 import { useSafeNavigate } from 'hooks/useSafeNavigate';
-import useUrlQuery from 'hooks/useUrlQuery';
 import { isValidShortHandDateTimeFormat } from 'lib/getMinMax';
 import getTimeString from 'lib/getTimeString';
 import { cloneDeep, isObject } from 'lodash-es';
@@ -54,6 +53,7 @@ import {
 	Time,
 	TimeRange,
 } from './types';
+import { getUnstableCurrentSearchParams } from './utils/getUnstableCurrentSearchParams';
 
 import './DateTimeSelectionV2.styles.scss';
 
@@ -90,10 +90,12 @@ function DateTimeSelection({
 	const [hasSelectedTimeError, setHasSelectedTimeError] = useState(false);
 	const [isOpen, setIsOpen] = useState<boolean>(false);
 
-	const urlQuery = useUrlQuery();
-	const searchStartTime = urlQuery.get('startTime');
-	const searchEndTime = urlQuery.get('endTime');
-	const relativeTimeFromUrl = urlQuery.get(QueryParams.relativeTime);
+	const currentSearchParams = getUnstableCurrentSearchParams();
+	const searchStartTime = currentSearchParams.get(QueryParams.startTime);
+	const searchEndTime = currentSearchParams.get(QueryParams.endTime);
+	const relativeTimeFromUrl = currentSearchParams.get(QueryParams.relativeTime);
+	const hasTimeParamsInUrl =
+		(searchStartTime && searchEndTime) || relativeTimeFromUrl;
 
 	// Prioritize props for initial modal time, fallback to URL params
 	let initialModalStartTime = 0;
@@ -115,8 +117,6 @@ function DateTimeSelection({
 	);
 	const [modalEndTime, setModalEndTime] = useState<number>(initialModalEndTime);
 
-	const [searchParams] = useSearchParams();
-
 	// Effect to update modal time state when props change
 	useEffect(() => {
 		if (modalInitialStartTime !== undefined) {
@@ -323,14 +323,15 @@ function DateTimeSelection({
 				return;
 			}
 
-			urlQuery.delete('startTime');
-			urlQuery.delete('endTime');
+			const urlQuery = getUnstableCurrentSearchParams();
+			urlQuery.delete(QueryParams.startTime);
+			urlQuery.delete(QueryParams.endTime);
 
 			urlQuery.set(QueryParams.relativeTime, value);
 			// Remove Hidden Filters from URL query parameters on time change
 			urlQuery.delete(QueryParams.activeLogId);
 
-			if (searchParams.has(QueryParams.compositeQuery)) {
+			if (urlQuery.has(QueryParams.compositeQuery)) {
 				const updatedCompositeQuery = getUpdatedCompositeQuery();
 				urlQuery.set(QueryParams.compositeQuery, updatedCompositeQuery);
 			}
@@ -349,8 +350,6 @@ function DateTimeSelection({
 			getUpdatedCompositeQuery,
 			updateLocalStorageForRoutes,
 			updateTimeInterval,
-			urlQuery,
-			searchParams,
 		],
 	);
 
@@ -414,6 +413,7 @@ function DateTimeSelection({
 
 				updateLocalStorageForRoutes(JSON.stringify({ startTime, endTime }));
 
+				const urlQuery = getUnstableCurrentSearchParams();
 				urlQuery.set(
 					QueryParams.startTime,
 					startTime?.toDate().getTime().toString(),
@@ -421,7 +421,7 @@ function DateTimeSelection({
 				urlQuery.set(QueryParams.endTime, endTime?.toDate().getTime().toString());
 				urlQuery.delete(QueryParams.relativeTime);
 
-				if (searchParams.has(QueryParams.compositeQuery)) {
+				if (urlQuery.has(QueryParams.compositeQuery)) {
 					const updatedCompositeQuery = getUpdatedCompositeQuery();
 					urlQuery.set(QueryParams.compositeQuery, updatedCompositeQuery);
 				}
@@ -441,8 +441,9 @@ function DateTimeSelection({
 		updateTimeInterval(dateTimeStr);
 		updateLocalStorageForRoutes(dateTimeStr);
 
-		urlQuery.delete('startTime');
-		urlQuery.delete('endTime');
+		const urlQuery = getUnstableCurrentSearchParams();
+		urlQuery.delete(QueryParams.startTime);
+		urlQuery.delete(QueryParams.endTime);
 
 		urlQuery.set(QueryParams.relativeTime, dateTimeStr);
 
@@ -595,13 +596,12 @@ function DateTimeSelection({
 
 		// set the default relative time for alert history and overview pages if relative time is not specified
 		if (
-			(!urlQuery.has(QueryParams.startTime) ||
-				!urlQuery.has(QueryParams.endTime)) &&
-			!urlQuery.has(QueryParams.relativeTime) &&
+			!hasTimeParamsInUrl &&
 			(currentRoute === ROUTES.ALERT_OVERVIEW ||
 				currentRoute === ROUTES.ALERT_HISTORY)
 		) {
 			updateTimeInterval(defaultRelativeTime);
+			const urlQuery = getUnstableCurrentSearchParams();
 			urlQuery.set(QueryParams.relativeTime, defaultRelativeTime);
 			const generatedUrl = `${location.pathname}?${urlQuery.toString()}`;
 			safeNavigate(generatedUrl);
@@ -625,9 +625,10 @@ function DateTimeSelection({
 			updateTimeInterval(updatedTime, [preStartTime, preEndTime]);
 		}
 
+		const urlQuery = getUnstableCurrentSearchParams();
 		if (updatedTime !== 'custom') {
-			urlQuery.delete('startTime');
-			urlQuery.delete('endTime');
+			urlQuery.delete(QueryParams.startTime);
+			urlQuery.delete(QueryParams.endTime);
 			urlQuery.set(QueryParams.relativeTime, updatedTime);
 		} else {
 			const startTime = preStartTime.toString();

frontend/src/container/TopNav/DateTimeSelectionV2/utils/getUnstableCurrentSearchParams.ts

@@ -0,0 +1,34 @@
+/**
+ * This was introduced to fix a sync bug between Nuqs and react-router-dom
+ *
+ * We are using the wrong adapter for nuqs because the correct one only supports v6/v7,
+ * and we are at version v5. This causes the nuqs/react-router-dom to be out of sync.
+ *
+ * We can revert this commit once we migrate react-router-dom to v6, or once we migrate
+ * to DateTimeSelectionV3
+ */
+
+/**
+ * This was created to help testing the regression introduced between nuqs/react-router-dom
+ */
+type SearchParamsGetter = () => URLSearchParams;
+let getter: SearchParamsGetter = (): URLSearchParams =>
+	new URLSearchParams(window.location.search);
+
+/**
+ * This function will return a fresh instance of URLSearchParams every time it's called.
+ *
+ * DO NOT USE IT FOR useEffect/useCallback dependencies, use Nuqs instead.
+ */
+export function getUnstableCurrentSearchParams(): URLSearchParams {
+	return getter();
+}
+
+// Testing helpers
+export function __setSearchParamsGetterForTest(fn: SearchParamsGetter): void {
+	getter = fn;
+}
+
+export function __resetSearchParamsGetter(): void {
+	getter = (): URLSearchParams => new URLSearchParams(window.location.search);
+}

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

@@ -30,10 +30,7 @@ import { useGetQueryRange } from 'hooks/queryBuilder/useGetQueryRange';
 import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
 import { Pagination } from 'hooks/queryPagination';
 import { getDefaultPaginationConfig } from 'hooks/queryPagination/utils';
-import useDragColumns from 'hooks/useDragColumns';
-import { getDraggedColumns } from 'hooks/useDragColumns/utils';
 import useUrlQueryData from 'hooks/useUrlQueryData';
-import { RowData } from 'lib/query/createTableColumnsFromQuery';
 import { ArrowUp10, Minus } from '@signozhq/icons';
 import { useTimezone } from 'providers/Timezone';
 import { AppState } from 'store/reducers';
@@ -85,10 +82,6 @@ function ListView({
 		},
 	});
 
-	const { draggedColumns, onDragColumns } = useDragColumns<RowData>(
-		LOCALSTORAGE.TRACES_LIST_COLUMNS,
-	);
-
 	const { queryData: paginationQueryData } = useUrlQueryData<Pagination>(
 		QueryParams.pagination,
 	);
@@ -100,6 +93,19 @@ function ListView({
 		[stagedQuery, orderBy],
 	);
 
+	// TEMP — remove after traces moves to TanStack table.
+	// - Drag updates selectColumns; raw queryKey would churn on reorder.
+	// - Trace API fetches only listed columns → add/remove must refetch.
+	// - Sorted-name signature: stable on reorder, changes on add/remove.
+	const selectColumnsSignature = useMemo(
+		() =>
+			(options?.selectColumns ?? [])
+				.map((c) => c.name)
+				.sort()
+				.join(','),
+		[options?.selectColumns],
+	);
+
 	const queryKey = useMemo(
 		() => [
 			REACT_QUERY_KEY.GET_QUERY_RANGE,
@@ -109,7 +115,7 @@ function ListView({
 			stagedQuery,
 			panelType,
 			paginationConfig,
-			options?.selectColumns,
+			selectColumnsSignature,
 			orderBy,
 		],
 		[
@@ -117,7 +123,7 @@ function ListView({
 			panelType,
 			globalSelectedTime,
 			paginationConfig,
-			options?.selectColumns,
+			selectColumnsSignature,
 			maxTime,
 			minTime,
 			orderBy,
@@ -182,13 +188,14 @@ function ListView({
 
 	const { formatTimezoneAdjustedTimestamp } = useTimezone();
 
-	const columns = useMemo(() => {
-		const updatedColumns = getListColumns(
-			options?.selectColumns || [],
-			formatTimezoneAdjustedTimestamp,
-		);
-		return getDraggedColumns(updatedColumns, draggedColumns);
-	}, [options?.selectColumns, formatTimezoneAdjustedTimestamp, draggedColumns]);
+	const columns = useMemo(
+		() =>
+			getListColumns(
+				options?.selectColumns || [],
+				formatTimezoneAdjustedTimestamp,
+			),
+		[options?.selectColumns, formatTimezoneAdjustedTimestamp],
+	);
 
 	const transformedQueryTableData = useMemo(
 		() => transformDataWithDate(queryTableData) || [],
@@ -196,9 +203,16 @@ function ListView({
 	);
 
 	const handleDragColumn = useCallback(
-		(fromIndex: number, toIndex: number) =>
-			onDragColumns(columns, fromIndex, toIndex),
-		[columns, onDragColumns],
+		(fromIndex: number, toIndex: number): void => {
+			const reordered = [...columns];
+			const [moved] = reordered.splice(fromIndex, 1);
+			reordered.splice(toIndex, 0, moved);
+			const orderedIds = reordered
+				.map((c) => String(('dataIndex' in c && c.dataIndex) || c.key || ''))
+				.filter(Boolean);
+			config?.addColumn?.onReorder(orderedIds);
+		},
+		[columns, config],
 	);
 
 	const handleOrderChange = useCallback((value: string) => {

frontend/src/lib/history.ts

@@ -1,4 +1,15 @@
 import { createBrowserHistory } from 'history';
 import { getBasePath } from 'utils/basePath';
 
-export default createBrowserHistory({ basename: getBasePath() });
+const history = createBrowserHistory({ basename: getBasePath() });
+
+let inAppPushCount = 0;
+history.listen((_, action) => {
+	if (action === 'PUSH') {
+		inAppPushCount += 1;
+	}
+});
+
+export const hasInAppHistory = (): boolean => inAppPushCount > 0;
+
+export default history;

frontend/src/pages/AlertDetails/AlertHeader/ActionButtons/ActionButtons.tsx

@@ -1,6 +1,7 @@
 import { useCallback, useEffect, useState } from 'react';
 import { Color } from '@signozhq/design-tokens';
-import { Divider, Dropdown, MenuProps, Switch, Tooltip } from 'antd';
+import { Divider, Dropdown, MenuProps, Tooltip } from 'antd';
+import { Switch } from '@signozhq/ui/switch';
 import { useIsDarkMode } from 'hooks/useDarkMode';
 import { Copy, Ellipsis, PenLine, Trash2 } from '@signozhq/icons';
 import {
@@ -132,11 +133,7 @@ function AlertActionButtons({
 			<div className="alert-action-buttons">
 				<Tooltip title={isAlertRuleDisabled ? 'Enable alert' : 'Disable alert'}>
 					{isAlertRuleDisabled !== undefined && (
-						<Switch
-							size="small"
-							onChange={toggleAlertRule}
-							checked={!isAlertRuleDisabled}
-						/>
+						<Switch onChange={toggleAlertRule} value={!isAlertRuleDisabled} />
 					)}
 				</Tooltip>
 				<CopyToClipboard textToCopy={window.location.href} />

frontend/src/pages/DashboardPageV2/index.tsx

@@ -0,0 +1,8 @@
+function DashboardPageV2(): JSX.Element {
+	return (
+		<div>
+			<h1>Dashboard Page V2</h1>
+		</div>
+	);
+}
+export default DashboardPageV2;

frontend/src/pages/DashboardsListPageV2/index.tsx

@@ -0,0 +1,9 @@
+function DashboardsListPageV2(): JSX.Element {
+	return (
+		<div>
+			<h1>Dashboards List Page V2</h1>
+		</div>
+	);
+}
+
+export default DashboardsListPageV2;

frontend/src/pages/LogsExplorer/index.tsx

@@ -3,7 +3,6 @@ import { useQueryClient } from 'react-query';
 import * as Sentry from '@sentry/react';
 import getLocalStorageKey from 'api/browser/localstorage/get';
 import setLocalStorageApi from 'api/browser/localstorage/set';
-import { TelemetryFieldKey } from 'api/v5/v5';
 import cx from 'classnames';
 import ExplorerCard from 'components/ExplorerCard/ExplorerCard';
 import QueryCancelledPlaceholder from 'components/QueryCancelledPlaceholder';
@@ -15,12 +14,6 @@ import { PANEL_TYPES } from 'constants/queryBuilder';
 import { usePageActions } from 'container/AIAssistant/pageActions/usePageActions';
 import LogExplorerQuerySection from 'container/LogExplorerQuerySection';
 import LogsExplorerViewsContainer from 'container/LogsExplorerViews';
-import {
-	defaultLogsSelectedColumns,
-	defaultOptionsQuery,
-	URL_OPTIONS,
-} from 'container/OptionsMenu/constants';
-import { OptionsQuery } from 'container/OptionsMenu/types';
 import LeftToolbarActions from 'container/QueryBuilder/components/ToolbarActions/LeftToolbarActions';
 import RightToolbarActions from 'container/QueryBuilder/components/ToolbarActions/RightToolbarActions';
 import Toolbar from 'container/Toolbar/Toolbar';
@@ -31,11 +24,9 @@ import {
 	useHandleExplorerTabChange,
 } from 'hooks/useHandleExplorerTabChange';
 import { useIsAIAssistantEnabled } from 'hooks/useIsAIAssistantEnabled';
-import useUrlQueryData from 'hooks/useUrlQueryData';
-import { defaultTo, isEmpty, isEqual, isNull } from 'lodash-es';
+import { defaultTo, isEmpty, isNull } from 'lodash-es';
 import ErrorBoundaryFallback from 'pages/ErrorBoundaryFallback/ErrorBoundaryFallback';
 import { EventSourceProvider } from 'providers/EventSource';
-import { usePreferenceContext } from 'providers/preferences/context/PreferenceContextProvider';
 import { Warning } from 'types/api';
 import { DataSource } from 'types/common/queryBuilder';
 import {
@@ -62,8 +53,6 @@ function LogsExplorer(): JSX.Element {
 	const [selectedView, setSelectedView] = useState<ExplorerViews>(
 		() => panelTypeToExplorerView[panelTypesFromUrl],
 	);
-	const { logs } = usePreferenceContext();
-	const { preferences } = logs;
 
 	const [showFilters, setShowFilters] = useState<boolean>(() => {
 		const localStorageValue = getLocalStorageKey(
@@ -182,116 +171,6 @@ function LogsExplorer(): JSX.Element {
 		setShowFilters((prev) => !prev);
 	};
 
-	const { redirectWithQuery: redirectWithOptionsData } =
-		useUrlQueryData<OptionsQuery>(URL_OPTIONS, defaultOptionsQuery);
-
-	// Get and parse stored columns from localStorage
-	const logListOptionsFromLocalStorage = useMemo(() => {
-		const data = getLocalStorageKey(LOCALSTORAGE.LOGS_LIST_OPTIONS);
-
-		if (!data) {
-			return null;
-		}
-
-		try {
-			return JSON.parse(data);
-		} catch {
-			return null;
-		}
-	}, []);
-
-	// Check if the columns have the required columns (timestamp, body)
-	const hasRequiredColumns = useCallback(
-		(columns?: TelemetryFieldKey[] | null): boolean => {
-			if (!columns?.length) {
-				return false;
-			}
-
-			const hasTimestamp = columns.some((col) => col.name === 'timestamp');
-			const hasBody = columns.some((col) => col.name === 'body');
-
-			return hasTimestamp && hasBody;
-		},
-		[],
-	);
-
-	// Merge the columns with the required columns (timestamp, body) if missing
-	const mergeWithRequiredColumns = useCallback(
-		(columns: TelemetryFieldKey[]): TelemetryFieldKey[] => [
-			// Add required columns (timestamp, body) if missing
-			...(!hasRequiredColumns(columns) ? defaultLogsSelectedColumns : []),
-			...columns,
-		],
-		[hasRequiredColumns],
-	);
-
-	// Migrate the options query to the new format
-	const migrateOptionsQuery = useCallback(
-		(query: OptionsQuery): OptionsQuery => {
-			// Skip if already migrated
-			if (query.version) {
-				return query;
-			}
-
-			if (logListOptionsFromLocalStorage?.version) {
-				return logListOptionsFromLocalStorage;
-			}
-
-			// Case 1: we have localStorage columns
-			if (logListOptionsFromLocalStorage?.selectColumns?.length > 0) {
-				return {
-					...query,
-					version: 1,
-					selectColumns: mergeWithRequiredColumns(
-						logListOptionsFromLocalStorage.selectColumns,
-					),
-				};
-			}
-
-			// Case 2: No query columns in localStorage in but query has columns
-			if (query.selectColumns.length > 0) {
-				return {
-					...query,
-					version: 1,
-					selectColumns: mergeWithRequiredColumns(query.selectColumns),
-				};
-			}
-
-			// Case 3: No columns anywhere, use defaults
-			return {
-				...query,
-				version: 1,
-				selectColumns: defaultLogsSelectedColumns,
-			};
-		},
-		[mergeWithRequiredColumns, logListOptionsFromLocalStorage],
-	);
-
-	useEffect(() => {
-		if (!preferences) {
-			return;
-		}
-		const migratedQuery = migrateOptionsQuery({
-			selectColumns: preferences.columns || defaultLogsSelectedColumns,
-			maxLines: preferences.formatting?.maxLines || defaultOptionsQuery.maxLines,
-			format: preferences.formatting?.format || defaultOptionsQuery.format,
-			fontSize: preferences.formatting?.fontSize || defaultOptionsQuery.fontSize,
-			version: preferences.formatting?.version,
-		});
-		// Only redirect if the query was actually modified
-		if (
-			!isEqual(migratedQuery, {
-				selectColumns: preferences?.columns,
-				maxLines: preferences?.formatting?.maxLines,
-				format: preferences?.formatting?.format,
-				fontSize: preferences?.formatting?.fontSize,
-				version: preferences?.formatting?.version,
-			})
-		) {
-			redirectWithOptionsData(migratedQuery);
-		}
-	}, [migrateOptionsQuery, preferences, redirectWithOptionsData]);
-
 	const toolbarViews = useMemo(
 		() => ({
 			list: {

frontend/src/pages/TraceDetailsV3/TraceDetailsHeader/TraceDetailsHeader.tsx

@@ -16,7 +16,7 @@ import { LOCALSTORAGE } from 'constants/localStorage';
 import ROUTES from 'constants/routes';
 import { convertTimeToRelevantUnit } from 'container/TraceDetail/utils';
 import dayjs from 'dayjs';
-import history from 'lib/history';
+import history, { hasInAppHistory } from 'lib/history';
 import {
 	ArrowLeft,
 	CalendarClock,
@@ -96,13 +96,7 @@ function TraceDetailsHeader({
 	}, [traceID]);
 
 	const handlePreviousBtnClick = useCallback((): void => {
-		const isSpaNavigate =
-			document.referrer &&
-			// oxlint-disable-next-line signoz/no-raw-absolute-path
-			new URL(document.referrer).origin === window.location.origin;
-		const hasBackHistory = window.history.length > 1;
-
-		if (isSpaNavigate && hasBackHistory) {
+		if (hasInAppHistory()) {
 			history.goBack();
 		} else {
 			history.push(ROUTES.TRACES_EXPLORER);
@@ -130,6 +124,7 @@ function TraceDetailsHeader({
 							size="md"
 							className={styles.backBtn}
 							onClick={handlePreviousBtnClick}
+							aria-label="Back"
 						>
 							<ArrowLeft size={14} />
 						</Button>

frontend/src/pages/TraceDetailsV3/TraceDetailsHeader/__tests__/TraceDetailsHeader.test.tsx

@@ -0,0 +1,60 @@
+import { fireEvent, screen } from '@testing-library/react';
+import ROUTES from 'constants/routes';
+import { render } from 'tests/test-utils';
+
+import TraceDetailsHeader from '../TraceDetailsHeader';
+
+const mockGoBack = jest.fn();
+const mockPush = jest.fn();
+const mockHasInAppHistory = jest.fn();
+
+jest.mock('lib/history', () => ({
+	__esModule: true,
+	default: {
+		goBack: (): void => mockGoBack(),
+		push: (path: string): void => mockPush(path),
+		replace: jest.fn(),
+		location: { pathname: '/', search: '' },
+		listen: (): (() => void) => (): void => undefined,
+	},
+	hasInAppHistory: (): boolean => mockHasInAppHistory(),
+}));
+
+const baseProps = {
+	filterMetadata: {
+		startTime: 0,
+		endTime: 1,
+		traceId: 'trace-123',
+	},
+	onFilteredSpansChange: jest.fn(),
+	isDataLoaded: false,
+};
+
+describe('TraceDetailsHeader – back button', () => {
+	beforeEach(() => {
+		mockGoBack.mockClear();
+		mockPush.mockClear();
+		mockHasInAppHistory.mockReset();
+	});
+
+	it('calls history.goBack() when there is in-app SPA history', () => {
+		mockHasInAppHistory.mockReturnValue(true);
+		render(<TraceDetailsHeader {...baseProps} />);
+
+		fireEvent.click(screen.getByRole('button', { name: /back/i }));
+
+		expect(mockGoBack).toHaveBeenCalledTimes(1);
+		expect(mockPush).not.toHaveBeenCalled();
+	});
+
+	it('pushes to the traces explorer route when there is no in-app SPA history', () => {
+		mockHasInAppHistory.mockReturnValue(false);
+		render(<TraceDetailsHeader {...baseProps} />);
+
+		fireEvent.click(screen.getByRole('button', { name: /back/i }));
+
+		expect(mockPush).toHaveBeenCalledTimes(1);
+		expect(mockPush).toHaveBeenCalledWith(ROUTES.TRACES_EXPLORER);
+		expect(mockGoBack).not.toHaveBeenCalled();
+	});
+});

frontend/src/pages/TracesFunnelDetails/components/FunnelConfiguration/FunnelStep.tsx

@@ -6,9 +6,9 @@ import {
 	Form,
 	MenuProps,
 	Space,
-	Switch,
 	Tooltip,
 } from 'antd';
+import { Switch } from '@signozhq/ui/switch';
 import cx from 'classnames';
 import { FilterSelect } from 'components/CeleryOverview/CeleryOverviewConfigOptions/CeleryOverviewConfigOptions';
 import { QueryParams } from 'constants/query';
@@ -201,8 +201,7 @@ function FunnelStep({
 					<div className="error">
 						<Switch
 							className="error__switch"
-							size="small"
-							checked={stepData.has_errors}
+							value={stepData.has_errors}
 							disabled={!hasEditPermission}
 							onChange={(): void =>
 								onStepChange(index, { has_errors: !stepData.has_errors })

frontend/src/periscope/components/JsonView/JsonView.tsx

@@ -1,7 +1,7 @@
 import { useState } from 'react';
 import MEditor, { EditorProps, Monaco } from '@monaco-editor/react';
 import { Color } from '@signozhq/design-tokens';
-import { Switch } from 'antd';
+import { Switch } from '@signozhq/ui/switch';
 import { Typography } from '@signozhq/ui/typography';
 import { useIsDarkMode } from 'hooks/useDarkMode';
 
@@ -72,9 +72,8 @@ function JsonView({ data, height = '575px' }: JsonViewProps): JSX.Element {
 				<div className="json-view__wrap-toggle">
 					<Typography.Text>Wrap text</Typography.Text>
 					<Switch
-						checked={isWrapWord}
+						value={isWrapWord}
 						onChange={(checked): void => setIsWrapWord(checked)}
-						size="small"
 					/>
 				</div>
 			</div>

frontend/src/providers/preferences/__tests__/PreferencesProvider.integration.test.tsx

@@ -108,7 +108,9 @@ describe('PreferencesProvider integration', () => {
 				},
 			);
 
-			expect(Number(screen.getByTestId('logs-columns-len').textContent)).toBe(1);
+			// Loader's ensureLogsRequiredColumns prepends timestamp + body, so the
+			// 1 column in localStorage becomes 3 in preferences.
+			expect(Number(screen.getByTestId('logs-columns-len').textContent)).toBe(3);
 		});
 
 		it('direct mode updateColumns persists to localStorage', async () => {
@@ -126,8 +128,11 @@ describe('PreferencesProvider integration', () => {
 			const stored = getLocalStorageJSON<LogsLocalOptions>(
 				LOCALSTORAGE.LOGS_LIST_OPTIONS,
 			);
+			// Writer's ensureLogsRequiredColumns prepends `body` when only
+			// `timestamp` was passed in (defaults.slice(0,1) is just timestamp).
 			expect(stored?.selectColumns).toStrictEqual([
-				defaultLogsSelectedColumns[0] as TelemetryFieldKey,
+				defaultLogsSelectedColumns[1] as TelemetryFieldKey, // body
+				defaultLogsSelectedColumns[0] as TelemetryFieldKey, // timestamp
 			]);
 		});
 
@@ -183,7 +188,9 @@ describe('PreferencesProvider integration', () => {
 				value: originalLocation,
 			});
 
-			expect(Number(screen.getByTestId('logs-columns-len').textContent)).toBe(1);
+			// Loader's ensureLogsRequiredColumns prepends timestamp + body, so the
+			// URL's 1 column becomes 3 in preferences.
+			expect(Number(screen.getByTestId('logs-columns-len').textContent)).toBe(3);
 		});
 
 		it('updateFormatting persists to localStorage in direct mode', async () => {

frontend/src/providers/preferences/__tests__/logsUpdaterConfig.test.ts

@@ -1,7 +1,10 @@
 import { TelemetryFieldKey } from 'api/v5/v5';
 import { LOCALSTORAGE } from 'constants/localStorage';
 import { LogViewMode } from 'container/LogsTable';
-import { defaultOptionsQuery } from 'container/OptionsMenu/constants';
+import {
+	defaultLogsSelectedColumns,
+	defaultOptionsQuery,
+} from 'container/OptionsMenu/constants';
 import { FontSize } from 'container/OptionsMenu/types';
 import {
 	FormattingOptions,
@@ -85,18 +88,21 @@ describe('logsUpdaterConfig', () => {
 
 		logsUpdater.updateColumns(newColumns, PreferenceMode.DIRECT);
 
+		// Writer guards body+timestamp via ensureLogsRequiredColumns invariant
+		const guardedColumns = [...defaultLogsSelectedColumns, ...newColumns];
+
 		// Should update URL
 		expect(redirectWithOptionsData).toHaveBeenCalledWith({
 			...defaultOptionsQuery,
 			...mockPreferences.formatting,
-			selectColumns: newColumns,
+			selectColumns: guardedColumns,
 		});
 
-		// Should update localStorage
+		// Should update localStorage with the guarded shape
 		const storedData = JSON.parse(
 			mockLocalStorage[LOCALSTORAGE.LOGS_LIST_OPTIONS],
 		);
-		expect(storedData.selectColumns).toStrictEqual(newColumns);
+		expect(storedData.selectColumns).toStrictEqual(guardedColumns);
 		expect(storedData.maxLines).toBe(1); // Should preserve other fields
 
 		// Should not update saved view preferences

frontend/src/providers/preferences/__tests__/usePreferenceLoader.test.tsx

@@ -1,4 +1,5 @@
 import { renderHook, waitFor } from '@testing-library/react';
+import { defaultLogsSelectedColumns } from 'container/OptionsMenu/constants';
 import { DataSource } from 'types/common/queryBuilder';
 
 import logsLoaderConfig from '../configs/logsLoaderConfig';
@@ -60,9 +61,9 @@ describe('usePreferenceLoader', () => {
 			expect(result.current.loading).toBe(false);
 		});
 
-		// Should have loaded from local storage (highest priority)
+		// Loader wraps with ensureLogsRequiredColumns — body+timestamp always prepended
 		expect(result.current.preferences).toStrictEqual({
-			columns: [{ name: 'local-column' }],
+			columns: [...defaultLogsSelectedColumns, { name: 'local-column' }],
 			formatting: { maxLines: 5, format: 'table', fontSize: 'medium', version: 1 },
 		});
 		expect(result.current.error).toBeNull();

frontend/src/providers/preferences/configs/logsUpdaterConfig.ts

@@ -3,7 +3,10 @@ import getLocalStorageKey from 'api/browser/localstorage/get';
 import setLocalStorageKey from 'api/browser/localstorage/set';
 import { TelemetryFieldKey } from 'api/v5/v5';
 import { LOCALSTORAGE } from 'constants/localStorage';
-import { defaultOptionsQuery } from 'container/OptionsMenu/constants';
+import {
+	defaultOptionsQuery,
+	ensureLogsRequiredColumns,
+} from 'container/OptionsMenu/constants';
 import { FontSize, OptionsQuery } from 'container/OptionsMenu/types';
 
 import { FormattingOptions, PreferenceMode, Preferences } from '../types';
@@ -18,11 +21,12 @@ const getLogsUpdaterConfig = (
 	updateFormatting: (newFormatting: FormattingOptions, mode: string) => void;
 } => ({
 	updateColumns: (newColumns: TelemetryFieldKey[], mode: string): void => {
+		const guardedColumns = ensureLogsRequiredColumns(newColumns);
 		if (mode === PreferenceMode.SAVED_VIEW) {
 			setSavedViewPreferences((prev) => {
 				if (!prev) {
 					return {
-						columns: newColumns,
+						columns: guardedColumns,
 						formatting: {
 							maxLines: 1,
 							format: 'table',
@@ -34,7 +38,7 @@ const getLogsUpdaterConfig = (
 
 				return {
 					...prev,
-					columns: newColumns,
+					columns: guardedColumns,
 				};
 			});
 		}
@@ -44,14 +48,14 @@ const getLogsUpdaterConfig = (
 			redirectWithOptionsData({
 				...defaultOptionsQuery,
 				...preferences?.formatting,
-				selectColumns: newColumns,
+				selectColumns: guardedColumns,
 			});
 
 			// Also update local storage
 			const local = JSON.parse(
 				getLocalStorageKey(LOCALSTORAGE.LOGS_LIST_OPTIONS) || '{}',
 			);
-			local.selectColumns = newColumns;
+			local.selectColumns = guardedColumns;
 			setLocalStorageKey(LOCALSTORAGE.LOGS_LIST_OPTIONS, JSON.stringify(local));
 		}
 	},

frontend/src/providers/preferences/loader/usePreferenceLoader.ts

@@ -1,5 +1,6 @@
 import { useEffect, useState } from 'react';
 import { TelemetryFieldKey } from 'api/v5/v5';
+import { ensureLogsRequiredColumns } from 'container/OptionsMenu/constants';
 import { has } from 'lodash-es';
 import { DataSource } from 'types/common/queryBuilder';
 
@@ -51,7 +52,11 @@ function logsPreferencesLoader(): {
 	columns: TelemetryFieldKey[];
 	formatting: FormattingOptions;
 } {
-	return preferencesLoader(logsLoaderConfig);
+	const result = preferencesLoader<{
+		columns: TelemetryFieldKey[];
+		formatting: FormattingOptions;
+	}>(logsLoaderConfig);
+	return { ...result, columns: ensureLogsRequiredColumns(result.columns) };
 }
 
 function tracesPreferencesLoader(): {

frontend/src/providers/preferences/sync/usePreferenceSync.ts

@@ -1,7 +1,10 @@
 /* eslint-disable sonarjs/cognitive-complexity */
 import { useEffect, useState } from 'react';
 import { TelemetryFieldKey } from 'api/v5/v5';
-import { defaultLogsSelectedColumns } from 'container/OptionsMenu/constants';
+import {
+	defaultLogsSelectedColumns,
+	ensureLogsRequiredColumns,
+} from 'container/OptionsMenu/constants';
 import { defaultSelectedColumns as defaultTracesSelectedColumns } from 'container/TracesExplorer/ListView/configs';
 import { useGetAllViews } from 'hooks/saveViews/useGetAllViews';
 import { DataSource } from 'types/common/queryBuilder';
@@ -54,9 +57,10 @@ export function usePreferenceSync({
 		let columns: TelemetryFieldKey[] = [];
 		let formatting: FormattingOptions | undefined;
 		if (dataSource === DataSource.LOGS) {
-			columns =
+			columns = ensureLogsRequiredColumns(
 				updateExtraDataSelectColumns(parsedExtraData?.selectColumns) ||
-				defaultLogsSelectedColumns;
+					defaultLogsSelectedColumns,
+			);
 			formatting = {
 				maxLines: parsedExtraData?.maxLines ?? 1,
 				format: parsedExtraData?.format ?? 'table',

pkg/modules/logspipeline/impllogspipeline/module.go

@@ -0,0 +1,50 @@
+package impllogspipeline
+
+import (
+	"context"
+
+	"github.com/SigNoz/signoz/pkg/modules/logspipeline"
+	"github.com/SigNoz/signoz/pkg/sqlstore"
+	"github.com/SigNoz/signoz/pkg/valuer"
+)
+
+const elementType = "log_pipelines"
+
+type module struct {
+	sqlStore sqlstore.SQLStore
+}
+
+func NewModule(sqlStore sqlstore.SQLStore) logspipeline.Module {
+	return &module{sqlStore: sqlStore}
+}
+
+func (m *module) Collect(ctx context.Context, orgID valuer.UUID) (map[string]any, error) {
+	subq := m.sqlStore.BunDB().NewSelect().
+		TableExpr("agent_config_version").
+		ColumnExpr("MAX(version)").
+		Where("org_id = ?", orgID).
+		Where("element_type = ?", elementType)
+
+	var result struct {
+		Total   int `bun:"total"`
+		Enabled int `bun:"enabled_count"`
+	}
+	err := m.sqlStore.BunDB().NewSelect().
+		TableExpr("agent_config_element AS e").
+		Join("JOIN agent_config_version AS v ON v.id = e.version_id").
+		Join("JOIN pipelines AS p ON p.id = e.element_id").
+		Where("v.org_id = ?", orgID).
+		Where("v.element_type = ?", elementType).
+		Where("v.version = (?)", subq).
+		ColumnExpr("COUNT(*) AS total").
+		ColumnExpr("SUM(CASE WHEN p.enabled THEN 1 ELSE 0 END) AS enabled_count").
+		Scan(ctx, &result)
+	if err != nil {
+		return nil, err
+	}
+
+	return map[string]any{
+		"logs_pipeline.total.count":   result.Total,
+		"logs_pipeline.enabled.count": result.Enabled,
+	}, nil
+}

pkg/modules/logspipeline/logspipeline.go

@@ -0,0 +1,7 @@
+package logspipeline
+
+import "github.com/SigNoz/signoz/pkg/statsreporter"
+
+type Module interface {
+	statsreporter.StatsCollector
+}

pkg/query-service/app/integrations/builtin.go

@@ -7,8 +7,6 @@ import (
 	"strings"
 	"unicode"
 
-	"github.com/SigNoz/signoz/pkg/query-service/constants"
-
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
@@ -178,27 +176,6 @@ func HydrateFileUris(spec interface{}, fs embed.FS, basedir string) (interface{}
 	if specMap, ok := spec.(map[string]interface{}); ok {
 		result := map[string]interface{}{}
 		for k, v := range specMap {
-			// Check if this is a dashboards slice and if dot metrics are enabled
-			if k == "dashboards" && constants.IsDotMetricsEnabled {
-				if dashboards, ok := v.([]interface{}); ok {
-					for i, dashboard := range dashboards {
-						if dashboardUri, ok := dashboard.(string); ok {
-							if strings.HasPrefix(dashboardUri, "file://") {
-								dashboards[i] = strings.Replace(dashboardUri, ".json", "_dot.json", 1)
-							}
-						} else if dashBoardMap, ok := dashboard.(map[string]interface{}); ok {
-							if dashboardUri, ok := dashBoardMap["definition"].(string); ok {
-								if strings.HasPrefix(dashboardUri, "file://") {
-									dashboardUri = strings.Replace(dashboardUri, ".json", "_dot.json", 1)
-								}
-								dashBoardMap["definition"] = dashboardUri
-							}
-							dashboards[i] = dashBoardMap
-						}
-					}
-					v = dashboards
-				}
-			}
 			hydrated, err := HydrateFileUris(v, fs, basedir)
 			if err != nil {
 				return nil, err

pkg/query-service/app/integrations/builtin_integrations/aws_rds_mysql/assets/dashboards/db_metrics.json

@@ -367,9 +367,9 @@
             "id": "31d3f13b-27d5-4291-9fb3-d5d5708a72f3",
             "modificationUUID": "e4a9edf1-acd0-48b7-8a35-1b4bb668408d",
             "multiSelect": false,
-            "name": "mysql_instance_endpoint",
+            "name": "mysql.instance.endpoint",
             "order": 0,
-            "queryValue": "SELECT JSONExtractString(labels, 'mysql_instance_endpoint') as mysql_instance_endpoint\nFROM signoz_metrics.distributed_time_series_v4_1day\nWHERE metric_name = 'mysql_uptime'\nGROUP BY mysql_instance_endpoint",
+            "queryValue": "SELECT JSONExtractString(labels, 'mysql.instance.endpoint') as `mysql.instance.endpoint`\nFROM signoz_metrics.distributed_time_series_v4_1day\nWHERE metric_name = 'mysql.uptime'\nGROUP BY `mysql.instance.endpoint`",
             "selectedValue": "",
             "showALLOption": false,
             "sort": "ASC",
@@ -393,7 +393,7 @@
                         {
                             "aggregations": [
                                 {
-                                    "metricName": "mysql_buffer_pool_usage",
+                                    "metricName": "mysql.buffer_pool.pages",
                                     "reduceTo": "avg",
                                     "spaceAggregation": "avg",
                                     "temporality": null,
@@ -404,7 +404,7 @@
                             "disabled": false,
                             "expression": "A",
                             "filter": {
-                                "expression": "mysql_instance_endpoint = $mysql_instance_endpoint"
+                                "expression": "mysql.instance.endpoint = $mysql.instance.endpoint"
                             },
                             "functions": [],
                             "groupBy": [
@@ -529,7 +529,7 @@
                         {
                             "aggregations": [
                                 {
-                                    "metricName": "mysql_buffer_pool_pages",
+                                    "metricName": "mysql.buffer_pool.pages",
                                     "reduceTo": "avg",
                                     "spaceAggregation": "sum",
                                     "temporality": null,
@@ -540,7 +540,7 @@
                             "disabled": false,
                             "expression": "A",
                             "filter": {
-                                "expression": "mysql_instance_endpoint = $mysql_instance_endpoint"
+                                "expression": "mysql.instance.endpoint = $mysql.instance.endpoint"
                             },
                             "functions": [],
                             "groupBy": [
@@ -658,7 +658,7 @@
                         {
                             "aggregations": [
                                 {
-                                    "metricName": "mysql_buffer_pool_data_pages",
+                                    "metricName": "mysql.buffer_pool.data_pages",
                                     "reduceTo": "avg",
                                     "spaceAggregation": "sum",
                                     "temporality": null,
@@ -669,7 +669,7 @@
                             "disabled": false,
                             "expression": "A",
                             "filter": {
-                                "expression": "mysql_instance_endpoint = $mysql_instance_endpoint"
+                                "expression": "mysql.instance.endpoint = $mysql.instance.endpoint"
                             },
                             "functions": [],
                             "groupBy": [
@@ -788,7 +788,7 @@
                         {
                             "aggregations": [
                                 {
-                                    "metricName": "mysql_buffer_pool_page_flushes",
+                                    "metricName": "mysql.buffer_pool.page_flushes",
                                     "reduceTo": "avg",
                                     "spaceAggregation": "sum",
                                     "temporality": null,
@@ -799,7 +799,7 @@
                             "disabled": false,
                             "expression": "A",
                             "filter": {
-                                "expression": "mysql_instance_endpoint = $mysql_instance_endpoint"
+                                "expression": "mysql.instance.endpoint = $mysql.instance.endpoint"
                             },
                             "functions": [],
                             "groupBy": [],
@@ -915,7 +915,7 @@
                         {
                             "aggregations": [
                                 {
-                                    "metricName": "mysql_table_io_wait_count",
+                                    "metricName": "mysql.table.io.wait.count",
                                     "reduceTo": "sum",
                                     "spaceAggregation": "sum",
                                     "temporality": null,
@@ -926,7 +926,7 @@
                             "disabled": false,
                             "expression": "A",
                             "filter": {
-                                "expression": "mysql_instance_endpoint = $mysql_instance_endpoint"
+                                "expression": "mysql.instance.endpoint = $mysql.instance.endpoint"
                             },
                             "functions": [],
                             "groupBy": [
@@ -1045,7 +1045,7 @@
                         {
                             "aggregations": [
                                 {
-                                    "metricName": "mysql_table_io_wait_count",
+                                    "metricName": "mysql.table.io.wait.count",
                                     "reduceTo": "sum",
                                     "spaceAggregation": "sum",
                                     "temporality": null,
@@ -1056,7 +1056,7 @@
                             "disabled": false,
                             "expression": "A",
                             "filter": {
-                                "expression": "mysql_instance_endpoint = $mysql_instance_endpoint"
+                                "expression": "mysql.instance.endpoint = $mysql.instance.endpoint"
                             },
                             "functions": [],
                             "groupBy": [
@@ -1175,7 +1175,7 @@
                         {
                             "aggregations": [
                                 {
-                                    "metricName": "mysql_table_io_wait_count",
+                                    "metricName": "mysql.table.io.wait.count",
                                     "reduceTo": "sum",
                                     "spaceAggregation": "sum",
                                     "temporality": null,
@@ -1186,7 +1186,7 @@
                             "disabled": false,
                             "expression": "A",
                             "filter": {
-                                "expression": "mysql_instance_endpoint = $mysql_instance_endpoint"
+                                "expression": "mysql.instance.endpoint = $mysql.instance.endpoint"
                             },
                             "functions": [],
                             "groupBy": [
@@ -1305,7 +1305,7 @@
                         {
                             "aggregations": [
                                 {
-                                    "metricName": "mysql_handlers",
+                                    "metricName": "mysql.handlers",
                                     "reduceTo": "avg",
                                     "spaceAggregation": "sum",
                                     "temporality": null,
@@ -1316,7 +1316,7 @@
                             "disabled": false,
                             "expression": "A",
                             "filter": {
-                                "expression": "mysql_instance_endpoint = $mysql_instance_endpoint"
+                                "expression": "mysql.instance.endpoint = $mysql.instance.endpoint"
                             },
                             "functions": [],
                             "groupBy": [
@@ -1329,7 +1329,7 @@
                                 }
                             ],
                             "having": {
-                                "expression": "sum(mysql_handlers) \u003e 0"
+                                "expression": "sum(mysql.handlers) \u003e 0"
                             },
                             "legend": "{{kind}}",
                             "limit": null,
@@ -1434,7 +1434,7 @@
                         {
                             "aggregations": [
                                 {
-                                    "metricName": "mysql_locks",
+                                    "metricName": "mysql.locks",
                                     "reduceTo": "avg",
                                     "spaceAggregation": "sum",
                                     "temporality": null,
@@ -1445,7 +1445,7 @@
                             "disabled": false,
                             "expression": "A",
                             "filter": {
-                                "expression": "mysql_instance_endpoint = $mysql_instance_endpoint"
+                                "expression": "mysql.instance.endpoint = $mysql.instance.endpoint"
                             },
                             "functions": [],
                             "groupBy": [
@@ -1563,7 +1563,7 @@
                         {
                             "aggregations": [
                                 {
-                                    "metricName": "mysql_log_operations",
+                                    "metricName": "mysql.log_operations",
                                     "reduceTo": "sum",
                                     "spaceAggregation": "sum",
                                     "temporality": null,
@@ -1574,7 +1574,7 @@
                             "disabled": false,
                             "expression": "A",
                             "filter": {
-                                "expression": "mysql_instance_endpoint = $mysql_instance_endpoint"
+                                "expression": "mysql.instance.endpoint = $mysql.instance.endpoint"
                             },
                             "functions": [],
                             "groupBy": [
@@ -1693,7 +1693,7 @@
                         {
                             "aggregations": [
                                 {
-                                    "metricName": "mysql_connection_count",
+                                    "metricName": "mysql.connection.count",
                                     "reduceTo": "avg",
                                     "spaceAggregation": "sum",
                                     "temporality": null,
@@ -1704,7 +1704,7 @@
                             "disabled": false,
                             "expression": "A",
                             "filter": {
-                                "expression": "mysql_instance_endpoint = $mysql_instance_endpoint"
+                                "expression": "mysql.instance.endpoint = $mysql.instance.endpoint"
                             },
                             "functions": [],
                             "groupBy": [],
@@ -1720,7 +1720,7 @@
                         {
                             "aggregations": [
                                 {
-                                    "metricName": "mysql_connection_errors",
+                                    "metricName": "mysql.connection.errors",
                                     "reduceTo": "avg",
                                     "spaceAggregation": "sum",
                                     "temporality": null,
@@ -1731,7 +1731,7 @@
                             "disabled": false,
                             "expression": "B",
                             "filter": {
-                                "expression": "mysql_instance_endpoint = $mysql_instance_endpoint"
+                                "expression": "mysql.instance.endpoint = $mysql.instance.endpoint"
                             },
                             "functions": [],
                             "groupBy": [
@@ -1745,7 +1745,7 @@
                                 }
                             ],
                             "having": {
-                                "expression": "sum(mysql_connection_errors) \u003e 0"
+                                "expression": "sum(mysql.connection.errors) \u003e 0"
                             },
                             "legend": "Error count: {{error}}",
                             "limit": null,
@@ -1850,7 +1850,7 @@
                         {
                             "aggregations": [
                                 {
-                                    "metricName": "mysql_opened_resources",
+                                    "metricName": "mysql.opened_resources",
                                     "reduceTo": "avg",
                                     "spaceAggregation": "sum",
                                     "temporality": null,
@@ -1861,7 +1861,7 @@
                             "disabled": false,
                             "expression": "A",
                             "filter": {
-                                "expression": "mysql_instance_endpoint = $mysql_instance_endpoint"
+                                "expression": "mysql.instance.endpoint = $mysql.instance.endpoint"
                             },
                             "functions": [],
                             "groupBy": [
@@ -1874,7 +1874,7 @@
                                 }
                             ],
                             "having": {
-                                "expression": "sum(mysql_opened_resources) \u003e 0"
+                                "expression": "sum(mysql.opened_resources) \u003e 0"
                             },
                             "legend": "{{kind}}",
                             "limit": null,
@@ -1979,7 +1979,7 @@
                         {
                             "aggregations": [
                                 {
-                                    "metricName": "mysql_operations",
+                                    "metricName": "mysql.operations",
                                     "reduceTo": "sum",
                                     "spaceAggregation": "sum",
                                     "temporality": null,
@@ -1990,7 +1990,7 @@
                             "disabled": false,
                             "expression": "A",
                             "filter": {
-                                "expression": "mysql_instance_endpoint = $mysql_instance_endpoint"
+                                "expression": "mysql.instance.endpoint = $mysql.instance.endpoint"
                             },
                             "functions": [],
                             "groupBy": [
@@ -2109,7 +2109,7 @@
                         {
                             "aggregations": [
                                 {
-                                    "metricName": "mysql_row_locks",
+                                    "metricName": "mysql.row_locks",
                                     "reduceTo": "avg",
                                     "spaceAggregation": "sum",
                                     "temporality": null,
@@ -2120,7 +2120,7 @@
                             "disabled": false,
                             "expression": "A",
                             "filter": {
-                                "expression": "mysql_instance_endpoint = $mysql_instance_endpoint"
+                                "expression": "mysql.instance.endpoint = $mysql.instance.endpoint"
                             },
                             "functions": [],
                             "groupBy": [
@@ -2238,7 +2238,7 @@
                         {
                             "aggregations": [
                                 {
-                                    "metricName": "mysql_threads",
+                                    "metricName": "mysql.threads",
                                     "reduceTo": "avg",
                                     "spaceAggregation": "sum",
                                     "temporality": null,
@@ -2249,7 +2249,7 @@
                             "disabled": false,
                             "expression": "A",
                             "filter": {
-                                "expression": "mysql_instance_endpoint = $mysql_instance_endpoint"
+                                "expression": "mysql.instance.endpoint = $mysql.instance.endpoint"
                             },
                             "functions": [],
                             "groupBy": [
@@ -2367,7 +2367,7 @@
                         {
                             "aggregations": [
                                 {
-                                    "metricName": "mysql_row_operations",
+                                    "metricName": "mysql.row_operations",
                                     "reduceTo": "avg",
                                     "spaceAggregation": "sum",
                                     "temporality": null,
@@ -2378,7 +2378,7 @@
                             "disabled": false,
                             "expression": "A",
                             "filter": {
-                                "expression": "mysql_instance_endpoint = $mysql_instance_endpoint"
+                                "expression": "mysql.instance.endpoint = $mysql.instance.endpoint"
                             },
                             "functions": [],
                             "groupBy": [
@@ -2497,7 +2497,7 @@
                         {
                             "aggregations": [
                                 {
-                                    "metricName": "mysql_prepared_statements",
+                                    "metricName": "mysql.prepared_statements",
                                     "reduceTo": "sum",
                                     "spaceAggregation": "sum",
                                     "temporality": null,
@@ -2508,7 +2508,7 @@
                             "disabled": false,
                             "expression": "A",
                             "filter": {
-                                "expression": "mysql_instance_endpoint = $mysql_instance_endpoint"
+                                "expression": "mysql.instance.endpoint = $mysql.instance.endpoint"
                             },
                             "functions": [],
                             "groupBy": [

pkg/query-service/app/integrations/builtin_integrations/aws_rds_postgres/assets/dashboards/db_metrics_overview.json

@@ -287,7 +287,7 @@
             "multiSelect": true,
             "name": "table_name",
             "order": 0,
-            "queryValue": "SELECT JSONExtractString(labels, 'postgresql_table_name') AS table_name\nFROM signoz_metrics.distributed_time_series_v4_1day\nWHERE metric_name = 'postgresql_operations' AND JSONExtractString(labels, 'postgresql_database_name') IN {{.db_name}}\nGROUP BY table_name",
+            "queryValue": "SELECT JSONExtractString(labels, 'postgresql.table.name') AS table_name\nFROM signoz_metrics.distributed_time_series_v4_1day\nWHERE metric_name = 'postgresql.operations' AND JSONExtractString(labels, 'postgresql.database.name') IN {{.db_name}}\nGROUP BY table_name",
             "selectedValue": [
                 "public.pgbench_accounts",
                 "public.pgbench_branches",
@@ -309,7 +309,7 @@
             "multiSelect": true,
             "name": "db_name",
             "order": 0,
-            "queryValue": "SELECT JSONExtractString(labels, 'postgresql_database_name') AS db_name\nFROM signoz_metrics.distributed_time_series_v4_1day\nWHERE metric_name = 'postgresql_operations'\nGROUP BY db_name",
+            "queryValue": "SELECT JSONExtractString(labels, 'postgresql.database.name') AS db_name\nFROM signoz_metrics.distributed_time_series_v4_1day\nWHERE metric_name = 'postgresql.operations'\nGROUP BY db_name",
             "selectedValue": [
                 "pgtestdb"
             ],
@@ -335,7 +335,7 @@
                         {
                             "aggregations": [
                                 {
-                                    "metricName": "postgresql_operations",
+                                    "metricName": "postgresql.operations",
                                     "reduceTo": "sum",
                                     "spaceAggregation": "avg",
                                     "temporality": null,
@@ -346,22 +346,22 @@
                             "disabled": false,
                             "expression": "A",
                             "filter": {
-                                "expression": "(operation = 'ins' AND postgresql_database_name IN $db_name)"
+                                "expression": "(operation = 'ins' AND postgresql.database.name IN $db_name)"
                             },
                             "groupBy": [
                                 {
                                     "dataType": "string",
-                                    "id": "postgresql_database_name--string--tag--false",
+                                    "id": "postgresql.database.name--string--tag--false",
                                     "isColumn": false,
                                     "isJSON": false,
-                                    "key": "postgresql_database_name",
+                                    "key": "postgresql.database.name",
                                     "type": "tag"
                                 }
                             ],
                             "having": {
                                 "expression": ""
                             },
-                            "legend": "{{postgresql_database_name}}",
+                            "legend": "{{postgresql.database.name}}",
                             "limit": null,
                             "orderBy": [],
                             "queryName": "A",
@@ -410,7 +410,7 @@
                         {
                             "aggregations": [
                                 {
-                                    "metricName": "postgresql_operations",
+                                    "metricName": "postgresql.operations",
                                     "reduceTo": "sum",
                                     "spaceAggregation": "avg",
                                     "temporality": null,
@@ -421,22 +421,22 @@
                             "disabled": false,
                             "expression": "A",
                             "filter": {
-                                "expression": "(operation = 'upd' AND postgresql_database_name IN $db_name)"
+                                "expression": "(operation = 'upd' AND postgresql.database.name IN $db_name)"
                             },
                             "groupBy": [
                                 {
                                     "dataType": "string",
-                                    "id": "postgresql_database_name--string--tag--false",
+                                    "id": "postgresql.database.name--string--tag--false",
                                     "isColumn": false,
                                     "isJSON": false,
-                                    "key": "postgresql_database_name",
+                                    "key": "postgresql.database.name",
                                     "type": "tag"
                                 }
                             ],
                             "having": {
                                 "expression": ""
                             },
-                            "legend": "{{postgresql_database_name}}",
+                            "legend": "{{postgresql.database.name}}",
                             "limit": null,
                             "orderBy": [],
                             "queryName": "A",
@@ -485,7 +485,7 @@
                         {
                             "aggregations": [
                                 {
-                                    "metricName": "postgresql_operations",
+                                    "metricName": "postgresql.operations",
                                     "reduceTo": "sum",
                                     "spaceAggregation": "avg",
                                     "temporality": null,
@@ -496,22 +496,22 @@
                             "disabled": false,
                             "expression": "A",
                             "filter": {
-                                "expression": "(operation = 'del' AND postgresql_database_name IN $db_name)"
+                                "expression": "(operation = 'del' AND postgresql.database.name IN $db_name)"
                             },
                             "groupBy": [
                                 {
                                     "dataType": "string",
-                                    "id": "postgresql_database_name--string--tag--false",
+                                    "id": "postgresql.database.name--string--tag--false",
                                     "isColumn": false,
                                     "isJSON": false,
-                                    "key": "postgresql_database_name",
+                                    "key": "postgresql.database.name",
                                     "type": "tag"
                                 }
                             ],
                             "having": {
                                 "expression": ""
                             },
-                            "legend": "{{postgresql_database_name}}",
+                            "legend": "{{postgresql.database.name}}",
                             "limit": null,
                             "orderBy": [],
                             "queryName": "A",
@@ -560,7 +560,7 @@
                         {
                             "aggregations": [
                                 {
-                                    "metricName": "postgresql_operations",
+                                    "metricName": "postgresql.operations",
                                     "reduceTo": "sum",
                                     "spaceAggregation": "avg",
                                     "temporality": null,
@@ -571,22 +571,22 @@
                             "disabled": false,
                             "expression": "A",
                             "filter": {
-                                "expression": "(operation = 'hot_upd' AND postgresql_database_name IN $db_name)"
+                                "expression": "(operation = 'hot_upd' AND postgresql.database.name IN $db_name)"
                             },
                             "groupBy": [
                                 {
                                     "dataType": "string",
-                                    "id": "postgresql_database_name--string--tag--false",
+                                    "id": "postgresql.database.name--string--tag--false",
                                     "isColumn": false,
                                     "isJSON": false,
-                                    "key": "postgresql_database_name",
+                                    "key": "postgresql.database.name",
                                     "type": "tag"
                                 }
                             ],
                             "having": {
                                 "expression": ""
                             },
-                            "legend": "{{postgresql_database_name}}",
+                            "legend": "{{postgresql.database.name}}",
                             "limit": null,
                             "orderBy": [],
                             "queryName": "A",
@@ -635,7 +635,7 @@
                         {
                             "aggregations": [
                                 {
-                                    "metricName": "postgresql_operations",
+                                    "metricName": "postgresql.operations",
                                     "reduceTo": "avg",
                                     "spaceAggregation": "avg",
                                     "temporality": null,
@@ -646,15 +646,15 @@
                             "disabled": false,
                             "expression": "A",
                             "filter": {
-                                "expression": "(operation = 'ins' AND postgresql_database_name IN $db_name)"
+                                "expression": "(operation = 'ins' AND postgresql.database.name IN $db_name)"
                             },
                             "groupBy": [
                                 {
                                     "dataType": "string",
-                                    "id": "postgresql_database_name--string--tag--false",
+                                    "id": "postgresql.database.name--string--tag--false",
                                     "isColumn": false,
                                     "isJSON": false,
-                                    "key": "postgresql_database_name",
+                                    "key": "postgresql.database.name",
                                     "type": "tag"
                                 }
                             ],
@@ -670,7 +670,7 @@
                         {
                             "aggregations": [
                                 {
-                                    "metricName": "postgresql_operations",
+                                    "metricName": "postgresql.operations",
                                     "reduceTo": "avg",
                                     "spaceAggregation": "avg",
                                     "temporality": null,
@@ -681,15 +681,15 @@
                             "disabled": false,
                             "expression": "B",
                             "filter": {
-                                "expression": "(operation = 'upd' AND postgresql_database_name IN $db_name)"
+                                "expression": "(operation = 'upd' AND postgresql.database.name IN $db_name)"
                             },
                             "groupBy": [
                                 {
                                     "dataType": "string",
-                                    "id": "postgresql_database_name--string--tag--false",
+                                    "id": "postgresql.database.name--string--tag--false",
                                     "isColumn": false,
                                     "isJSON": false,
-                                    "key": "postgresql_database_name",
+                                    "key": "postgresql.database.name",
                                     "type": "tag"
                                 }
                             ],
@@ -705,7 +705,7 @@
                         {
                             "aggregations": [
                                 {
-                                    "metricName": "postgresql_operations",
+                                    "metricName": "postgresql.operations",
                                     "reduceTo": "avg",
                                     "spaceAggregation": "avg",
                                     "temporality": null,
@@ -716,15 +716,15 @@
                             "disabled": false,
                             "expression": "C",
                             "filter": {
-                                "expression": "(operation = 'del' AND postgresql_database_name IN $db_name)"
+                                "expression": "(operation = 'del' AND postgresql.database.name IN $db_name)"
                             },
                             "groupBy": [
                                 {
                                     "dataType": "string",
-                                    "id": "postgresql_database_name--string--tag--false",
+                                    "id": "postgresql.database.name--string--tag--false",
                                     "isColumn": false,
                                     "isJSON": false,
-                                    "key": "postgresql_database_name",
+                                    "key": "postgresql.database.name",
                                     "type": "tag"
                                 }
                             ],
@@ -780,7 +780,7 @@
                         {
                             "aggregations": [
                                 {
-                                    "metricName": "postgresql_database_locks",
+                                    "metricName": "postgresql.database.locks",
                                     "reduceTo": "sum",
                                     "spaceAggregation": "sum",
                                     "temporality": null,
@@ -852,7 +852,7 @@
                         {
                             "aggregations": [
                                 {
-                                    "metricName": "postgresql_deadlocks",
+                                    "metricName": "postgresql.deadlocks",
                                     "reduceTo": "sum",
                                     "spaceAggregation": "sum",
                                     "temporality": null,
@@ -863,22 +863,22 @@
                             "disabled": false,
                             "expression": "A",
                             "filter": {
-                                "expression": "postgresql_database_name IN $db_name"
+                                "expression": "postgresql.database.name IN $db_name"
                             },
                             "groupBy": [
                                 {
                                     "dataType": "string",
-                                    "id": "postgresql_database_name--string--tag--false",
+                                    "id": "postgresql.database.name--string--tag--false",
                                     "isColumn": false,
                                     "isJSON": false,
-                                    "key": "postgresql_database_name",
+                                    "key": "postgresql.database.name",
                                     "type": "tag"
                                 }
                             ],
                             "having": {
                                 "expression": ""
                             },
-                            "legend": "{{postgresql_database_name}}",
+                            "legend": "{{postgresql.database.name}}",
                             "limit": null,
                             "orderBy": [],
                             "queryName": "A",
@@ -927,7 +927,7 @@
                         {
                             "aggregations": [
                                 {
-                                    "metricName": "postgresql_backends",
+                                    "metricName": "postgresql.backends",
                                     "reduceTo": "sum",
                                     "spaceAggregation": "avg",
                                     "temporality": null,
@@ -938,22 +938,22 @@
                             "disabled": false,
                             "expression": "A",
                             "filter": {
-                                "expression": "postgresql_database_name IN $db_name"
+                                "expression": "postgresql.database.name IN $db_name"
                             },
                             "groupBy": [
                                 {
                                     "dataType": "string",
-                                    "id": "postgresql_database_name--string--tag--false",
+                                    "id": "postgresql.database.name--string--tag--false",
                                     "isColumn": false,
                                     "isJSON": false,
-                                    "key": "postgresql_database_name",
+                                    "key": "postgresql.database.name",
                                     "type": "tag"
                                 }
                             ],
                             "having": {
                                 "expression": ""
                             },
-                            "legend": "{{postgresql_database_name}}",
+                            "legend": "{{postgresql.database.name}}",
                             "limit": null,
                             "orderBy": [],
                             "queryName": "A",
@@ -1002,7 +1002,7 @@
                         {
                             "aggregations": [
                                 {
-                                    "metricName": "postgresql_rows",
+                                    "metricName": "postgresql.rows",
                                     "reduceTo": "sum",
                                     "spaceAggregation": "sum",
                                     "temporality": null,
@@ -1013,7 +1013,7 @@
                             "disabled": false,
                             "expression": "A",
                             "filter": {
-                                "expression": "(state = 'dead' AND postgresql_database_name IN $db_name AND postgresql_table_name IN $table_name)"
+                                "expression": "(state = 'dead' AND postgresql.database.name IN $db_name AND postgresql.table.name IN $table_name)"
                             },
                             "groupBy": [],
                             "having": {
@@ -1068,7 +1068,7 @@
                         {
                             "aggregations": [
                                 {
-                                    "metricName": "postgresql_index_scans",
+                                    "metricName": "postgresql.index.scans",
                                     "reduceTo": "sum",
                                     "spaceAggregation": "sum",
                                     "temporality": null,
@@ -1079,22 +1079,22 @@
                             "disabled": false,
                             "expression": "A",
                             "filter": {
-                                "expression": "(postgresql_database_name IN $db_name AND postgresql_table_name IN $table_name)"
+                                "expression": "(postgresql.database.name IN $db_name AND postgresql.table.name IN $table_name)"
                             },
                             "groupBy": [
                                 {
                                     "dataType": "string",
-                                    "id": "postgresql_index_name--string--tag--false",
+                                    "id": "postgresql.index.name--string--tag--false",
                                     "isColumn": false,
                                     "isJSON": false,
-                                    "key": "postgresql_index_name",
+                                    "key": "postgresql.index.name",
                                     "type": "tag"
                                 }
                             ],
                             "having": {
                                 "expression": ""
                             },
-                            "legend": "{{postgresql_index_name}}",
+                            "legend": "{{postgresql.index.name}}",
                             "limit": null,
                             "orderBy": [],
                             "queryName": "A",
@@ -1143,7 +1143,7 @@
                         {
                             "aggregations": [
                                 {
-                                    "metricName": "postgresql_rows",
+                                    "metricName": "postgresql.rows",
                                     "reduceTo": "avg",
                                     "spaceAggregation": "avg",
                                     "temporality": null,
@@ -1154,16 +1154,16 @@
                             "disabled": false,
                             "expression": "A",
                             "filter": {
-                                "expression": "(state = 'dead' AND postgresql_database_name IN $db_name AND postgresql_table_name IN $table_name)"
+                                "expression": "(state = 'dead' AND postgresql.database.name IN $db_name AND postgresql.table.name IN $table_name)"
                             },
                             "functions": [],
                             "groupBy": [
                                 {
                                     "dataType": "string",
-                                    "id": "postgresql_table_name--string--tag--false",
+                                    "id": "postgresql.table.name--string--tag--false",
                                     "isColumn": false,
                                     "isJSON": false,
-                                    "key": "postgresql_table_name",
+                                    "key": "postgresql.table.name",
                                     "type": "tag"
                                 }
                             ],
@@ -1179,7 +1179,7 @@
                         {
                             "aggregations": [
                                 {
-                                    "metricName": "postgresql_rows",
+                                    "metricName": "postgresql.rows",
                                     "reduceTo": "avg",
                                     "spaceAggregation": "avg",
                                     "temporality": null,
@@ -1190,16 +1190,16 @@
                             "disabled": false,
                             "expression": "B",
                             "filter": {
-                                "expression": "(state = 'live' AND postgresql_database_name IN $db_name AND postgresql_table_name IN $table_name)"
+                                "expression": "(state = 'live' AND postgresql.database.name IN $db_name AND postgresql.table.name IN $table_name)"
                             },
                             "functions": [],
                             "groupBy": [
                                 {
                                     "dataType": "string",
-                                    "id": "postgresql_table_name--string--tag--false",
+                                    "id": "postgresql.table.name--string--tag--false",
                                     "isColumn": false,
                                     "isJSON": false,
-                                    "key": "postgresql_table_name",
+                                    "key": "postgresql.table.name",
                                     "type": "tag"
                                 }
                             ],
@@ -1215,7 +1215,7 @@
                         {
                             "aggregations": [
                                 {
-                                    "metricName": "postgresql_index_scans",
+                                    "metricName": "postgresql.index.scans",
                                     "reduceTo": "sum",
                                     "spaceAggregation": "sum",
                                     "temporality": null,
@@ -1226,16 +1226,16 @@
                             "disabled": false,
                             "expression": "C",
                             "filter": {
-                                "expression": "(postgresql_database_name IN $db_name AND postgresql_table_name IN $table_name)"
+                                "expression": "(postgresql.database.name IN $db_name AND postgresql.table.name IN $table_name)"
                             },
                             "functions": [],
                             "groupBy": [
                                 {
                                     "dataType": "string",
-                                    "id": "postgresql_table_name--string--tag--false",
+                                    "id": "postgresql.table.name--string--tag--false",
                                     "isColumn": false,
                                     "isJSON": false,
-                                    "key": "postgresql_table_name",
+                                    "key": "postgresql.table.name",
                                     "type": "tag"
                                 }
                             ],
@@ -1251,7 +1251,7 @@
                         {
                             "aggregations": [
                                 {
-                                    "metricName": "postgresql_table_size",
+                                    "metricName": "postgresql.table.size",
                                     "reduceTo": "avg",
                                     "spaceAggregation": "avg",
                                     "temporality": null,
@@ -1262,16 +1262,16 @@
                             "disabled": true,
                             "expression": "D",
                             "filter": {
-                                "expression": "(postgresql_database_name IN $db_name AND postgresql_table_name IN $table_name)"
+                                "expression": "(postgresql.database.name IN $db_name AND postgresql.table.name IN $table_name)"
                             },
                             "functions": [],
                             "groupBy": [
                                 {
                                     "dataType": "string",
-                                    "id": "postgresql_table_name--string--tag--false",
+                                    "id": "postgresql.table.name--string--tag--false",
                                     "isColumn": false,
                                     "isJSON": false,
-                                    "key": "postgresql_table_name",
+                                    "key": "postgresql.table.name",
                                     "type": "tag"
                                 }
                             ],

pkg/query-service/app/integrations/builtin_integrations/mongo/assets/dashboards/overview.json

@@ -80,9 +80,9 @@
             "id": "a2c21714-a814-4d31-9b56-7367c3208801",
             "modificationUUID": "448e675a-4531-45b1-b434-a9ee809470d6",
             "multiSelect": true,
-            "name": "host_name",
+            "name": "host.name",
             "order": 0,
-            "queryValue": "SELECT JSONExtractString(labels, 'host_name') AS host_name\nFROM signoz_metrics.distributed_time_series_v4_1day\nWHERE metric_name = 'mongodb_memory_usage'\nGROUP BY host_name",
+            "queryValue": "SELECT JSONExtractString(labels, 'host.name') AS `host.name`\nFROM signoz_metrics.distributed_time_series_v4_1day\nWHERE metric_name = 'mongodb_memory_usage'\nGROUP BY `host.name`",
             "selectedValue": [
                 "Srikanths-MacBook-Pro.local"
             ],
@@ -108,7 +108,7 @@
                         {
                             "aggregations": [
                                 {
-                                    "metricName": "mongodb_operation_count",
+                                    "metricName": "mongodb.operation.count",
                                     "reduceTo": "sum",
                                     "spaceAggregation": "sum",
                                     "temporality": null,
@@ -119,7 +119,7 @@
                             "disabled": false,
                             "expression": "A",
                             "filter": {
-                                "expression": "host_name IN $host_name"
+                                "expression": "host.name IN $host.name"
                             },
                             "groupBy": [
                                 {
@@ -183,7 +183,7 @@
                         {
                             "aggregations": [
                                 {
-                                    "metricName": "mongodb_operation_time",
+                                    "metricName": "mongodb.operation.time",
                                     "reduceTo": "sum",
                                     "spaceAggregation": "sum",
                                     "temporality": null,
@@ -194,7 +194,7 @@
                             "disabled": false,
                             "expression": "A",
                             "filter": {
-                                "expression": "host_name IN $host_name"
+                                "expression": "host.name IN $host.name"
                             },
                             "groupBy": [
                                 {
@@ -258,7 +258,7 @@
                         {
                             "aggregations": [
                                 {
-                                    "metricName": "mongodb_cache_operations",
+                                    "metricName": "mongodb.cache.operations",
                                     "reduceTo": "sum",
                                     "spaceAggregation": "sum",
                                     "temporality": null,
@@ -269,7 +269,7 @@
                             "disabled": false,
                             "expression": "A",
                             "filter": {
-                                "expression": "host_name IN $host_name"
+                                "expression": "host.name IN $host.name"
                             },
                             "groupBy": [
                                 {
@@ -333,7 +333,7 @@
                         {
                             "aggregations": [
                                 {
-                                    "metricName": "mongodb_operation_latency_time",
+                                    "metricName": "mongodb.operation.latency.time",
                                     "reduceTo": "sum",
                                     "spaceAggregation": "max",
                                     "temporality": null,
@@ -344,7 +344,7 @@
                             "disabled": false,
                             "expression": "A",
                             "filter": {
-                                "expression": "(operation = 'read' AND host_name IN $host_name)"
+                                "expression": "(operation = 'read' AND host.name IN $host.name)"
                             },
                             "groupBy": [],
                             "having": {
@@ -399,7 +399,7 @@
                         {
                             "aggregations": [
                                 {
-                                    "metricName": "mongodb_operation_latency_time",
+                                    "metricName": "mongodb.operation.latency.time",
                                     "reduceTo": "sum",
                                     "spaceAggregation": "max",
                                     "temporality": null,
@@ -410,7 +410,7 @@
                             "disabled": false,
                             "expression": "A",
                             "filter": {
-                                "expression": "(host_name IN $host_name AND operation = 'write')"
+                                "expression": "(host.name IN $host.name AND operation = 'write')"
                             },
                             "groupBy": [],
                             "having": {
@@ -465,7 +465,7 @@
                         {
                             "aggregations": [
                                 {
-                                    "metricName": "mongodb_operation_latency_time",
+                                    "metricName": "mongodb.operation.latency.time",
                                     "reduceTo": "sum",
                                     "spaceAggregation": "max",
                                     "temporality": null,
@@ -476,7 +476,7 @@
                             "disabled": false,
                             "expression": "A",
                             "filter": {
-                                "expression": "(host_name IN $host_name AND operation = 'command')"
+                                "expression": "(host.name IN $host.name AND operation = 'command')"
                             },
                             "groupBy": [],
                             "having": {
@@ -531,7 +531,7 @@
                         {
                             "aggregations": [
                                 {
-                                    "metricName": "mongodb_network_io_receive",
+                                    "metricName": "mongodb.network.io.receive",
                                     "reduceTo": "sum",
                                     "spaceAggregation": "avg",
                                     "temporality": null,
@@ -542,22 +542,22 @@
                             "disabled": false,
                             "expression": "A",
                             "filter": {
-                                "expression": "host_name IN $host_name"
+                                "expression": "host.name IN $host.name"
                             },
                             "groupBy": [
                                 {
                                     "dataType": "string",
-                                    "id": "host_name--string--tag--false",
+                                    "id": "host.name--string--tag--false",
                                     "isColumn": false,
                                     "isJSON": false,
-                                    "key": "host_name",
+                                    "key": "host.name",
                                     "type": "tag"
                                 }
                             ],
                             "having": {
                                 "expression": ""
                             },
-                            "legend": "Bytes received :: {{host_name}}",
+                            "legend": "Bytes received :: {{host.name}}",
                             "limit": null,
                             "orderBy": [],
                             "queryName": "A",
@@ -566,7 +566,7 @@
                         {
                             "aggregations": [
                                 {
-                                    "metricName": "mongodb_network_io_transmit",
+                                    "metricName": "mongodb.network.io.transmit",
                                     "reduceTo": "sum",
                                     "spaceAggregation": "avg",
                                     "temporality": null,
@@ -577,22 +577,22 @@
                             "disabled": false,
                             "expression": "B",
                             "filter": {
-                                "expression": "host_name IN $host_name"
+                                "expression": "host.name IN $host.name"
                             },
                             "groupBy": [
                                 {
                                     "dataType": "string",
-                                    "id": "host_name--string--tag--false",
+                                    "id": "host.name--string--tag--false",
                                     "isColumn": false,
                                     "isJSON": false,
-                                    "key": "host_name",
+                                    "key": "host.name",
                                     "type": "tag"
                                 }
                             ],
                             "having": {
                                 "expression": ""
                             },
-                            "legend": "Bytes transmitted :: {{host_name}}",
+                            "legend": "Bytes transmitted :: {{host.name}}",
                             "limit": null,
                             "orderBy": [],
                             "queryName": "B",

pkg/query-service/app/integrations/builtin_integrations/mongo/assets/dashboards/overview_dot.json

@@ -1,631 +0,0 @@
-{
-    "description": "This dashboard provides a high-level overview of your MongoDB. It includes read/write performance, most-used replicas, collection metrics etc...",
-    "id": "mongo-overview",
-    "layout": [
-        {
-            "h": 3,
-            "i": "0c3d2b15-89be-4d62-a821-b26d93332ed3",
-            "moved": false,
-            "static": false,
-            "w": 6,
-            "x": 6,
-            "y": 3
-        },
-        {
-            "h": 3,
-            "i": "14504a3c-4a05-4d22-bab3-e22e94f51380",
-            "moved": false,
-            "static": false,
-            "w": 6,
-            "x": 0,
-            "y": 6
-        },
-        {
-            "h": 3,
-            "i": "dcfb3829-c3f2-44bb-907d-8dc8a6dc4aab",
-            "moved": false,
-            "static": false,
-            "w": 6,
-            "x": 0,
-            "y": 3
-        },
-        {
-            "h": 3,
-            "i": "bfc9e80b-02bf-4122-b3da-3dd943d35012",
-            "moved": false,
-            "static": false,
-            "w": 6,
-            "x": 6,
-            "y": 0
-        },
-        {
-            "h": 3,
-            "i": "4c07a7d2-893a-46c2-bcdb-a19b6efeac3a",
-            "moved": false,
-            "static": false,
-            "w": 6,
-            "x": 0,
-            "y": 0
-        },
-        {
-            "h": 3,
-            "i": "a5a64eec-1034-4aa6-8cb1-05673c4426c6",
-            "moved": false,
-            "static": false,
-            "w": 6,
-            "x": 6,
-            "y": 6
-        },
-        {
-            "h": 3,
-            "i": "503af589-ef4d-4fe3-8934-c8f7eb480d9a",
-            "moved": false,
-            "static": false,
-            "w": 6,
-            "x": 0,
-            "y": 9
-        }
-    ],
-    "name": "",
-    "tags": [
-        "mongo",
-        "database"
-    ],
-    "title": "Mongo overview",
-    "variables": {
-        "a2c21714-a814-4d31-9b56-7367c3208801": {
-            "allSelected": true,
-            "customValue": "",
-            "description": "List of hosts sending mongo metrics",
-            "id": "a2c21714-a814-4d31-9b56-7367c3208801",
-            "modificationUUID": "448e675a-4531-45b1-b434-a9ee809470d6",
-            "multiSelect": true,
-            "name": "host.name",
-            "order": 0,
-            "queryValue": "SELECT JSONExtractString(labels, 'host.name') AS `host.name`\nFROM signoz_metrics.distributed_time_series_v4_1day\nWHERE metric_name = 'mongodb_memory_usage'\nGROUP BY `host.name`",
-            "selectedValue": [
-                "Srikanths-MacBook-Pro.local"
-            ],
-            "showALLOption": true,
-            "sort": "ASC",
-            "textboxValue": "",
-            "type": "QUERY"
-        }
-    },
-    "version": "v5",
-    "widgets": [
-        {
-            "description": "Total number of operations",
-            "fillSpans": false,
-            "id": "4c07a7d2-893a-46c2-bcdb-a19b6efeac3a",
-            "isStacked": false,
-            "nullZeroValues": "zero",
-            "opacity": "1",
-            "panelTypes": "graph",
-            "query": {
-                "builder": {
-                    "queryData": [
-                        {
-                            "aggregations": [
-                                {
-                                    "metricName": "mongodb.operation.count",
-                                    "reduceTo": "sum",
-                                    "spaceAggregation": "sum",
-                                    "temporality": null,
-                                    "timeAggregation": "rate"
-                                }
-                            ],
-                            "dataSource": "metrics",
-                            "disabled": false,
-                            "expression": "A",
-                            "filter": {
-                                "expression": "host.name IN $host.name"
-                            },
-                            "groupBy": [
-                                {
-                                    "dataType": "string",
-                                    "id": "operation--string--tag--false",
-                                    "isColumn": false,
-                                    "isJSON": false,
-                                    "key": "operation",
-                                    "type": "tag"
-                                }
-                            ],
-                            "having": {
-                                "expression": ""
-                            },
-                            "legend": "{{operation}}",
-                            "limit": null,
-                            "orderBy": [],
-                            "queryName": "A",
-                            "stepInterval": 60
-                        }
-                    ],
-                    "queryFormulas": []
-                },
-                "clickhouse_sql": [
-                    {
-                        "disabled": false,
-                        "legend": "",
-                        "name": "A",
-                        "query": ""
-                    }
-                ],
-                "id": "7da5d899-8b06-4139-9a89-47baf9551ff8",
-                "promql": [
-                    {
-                        "disabled": false,
-                        "legend": "",
-                        "name": "A",
-                        "query": ""
-                    }
-                ],
-                "queryType": "builder"
-            },
-            "softMax": null,
-            "softMin": null,
-            "thresholds": [],
-            "timePreferance": "GLOBAL_TIME",
-            "title": "Operations count",
-            "yAxisUnit": "none"
-        },
-        {
-            "description": "The total time spent performing operations.",
-            "fillSpans": false,
-            "id": "bfc9e80b-02bf-4122-b3da-3dd943d35012",
-            "isStacked": false,
-            "nullZeroValues": "zero",
-            "opacity": "1",
-            "panelTypes": "graph",
-            "query": {
-                "builder": {
-                    "queryData": [
-                        {
-                            "aggregations": [
-                                {
-                                    "metricName": "mongodb.operation.time",
-                                    "reduceTo": "sum",
-                                    "spaceAggregation": "sum",
-                                    "temporality": null,
-                                    "timeAggregation": "rate"
-                                }
-                            ],
-                            "dataSource": "metrics",
-                            "disabled": false,
-                            "expression": "A",
-                            "filter": {
-                                "expression": "host.name IN $host.name"
-                            },
-                            "groupBy": [
-                                {
-                                    "dataType": "string",
-                                    "id": "operation--string--tag--false",
-                                    "isColumn": false,
-                                    "isJSON": false,
-                                    "key": "operation",
-                                    "type": "tag"
-                                }
-                            ],
-                            "having": {
-                                "expression": ""
-                            },
-                            "legend": "{{operation}}",
-                            "limit": null,
-                            "orderBy": [],
-                            "queryName": "A",
-                            "stepInterval": 60
-                        }
-                    ],
-                    "queryFormulas": []
-                },
-                "clickhouse_sql": [
-                    {
-                        "disabled": false,
-                        "legend": "",
-                        "name": "A",
-                        "query": ""
-                    }
-                ],
-                "id": "2ca35957-894a-46ae-a2a6-95d7e400d8e1",
-                "promql": [
-                    {
-                        "disabled": false,
-                        "legend": "",
-                        "name": "A",
-                        "query": ""
-                    }
-                ],
-                "queryType": "builder"
-            },
-            "softMax": null,
-            "softMin": null,
-            "thresholds": [],
-            "timePreferance": "GLOBAL_TIME",
-            "title": "Total operations time",
-            "yAxisUnit": "ms"
-        },
-        {
-            "description": "The number of cache operations",
-            "fillSpans": false,
-            "id": "dcfb3829-c3f2-44bb-907d-8dc8a6dc4aab",
-            "isStacked": false,
-            "nullZeroValues": "zero",
-            "opacity": "1",
-            "panelTypes": "graph",
-            "query": {
-                "builder": {
-                    "queryData": [
-                        {
-                            "aggregations": [
-                                {
-                                    "metricName": "mongodb.cache.operations",
-                                    "reduceTo": "sum",
-                                    "spaceAggregation": "sum",
-                                    "temporality": null,
-                                    "timeAggregation": "rate"
-                                }
-                            ],
-                            "dataSource": "metrics",
-                            "disabled": false,
-                            "expression": "A",
-                            "filter": {
-                                "expression": "host.name IN $host.name"
-                            },
-                            "groupBy": [
-                                {
-                                    "dataType": "string",
-                                    "id": "type--string--tag--false",
-                                    "isColumn": false,
-                                    "isJSON": false,
-                                    "key": "type",
-                                    "type": "tag"
-                                }
-                            ],
-                            "having": {
-                                "expression": ""
-                            },
-                            "legend": "{{type}}",
-                            "limit": null,
-                            "orderBy": [],
-                            "queryName": "A",
-                            "stepInterval": 60
-                        }
-                    ],
-                    "queryFormulas": []
-                },
-                "clickhouse_sql": [
-                    {
-                        "disabled": false,
-                        "legend": "",
-                        "name": "A",
-                        "query": ""
-                    }
-                ],
-                "id": "bb439198-dcf5-4767-b0d0-ab5785159b8d",
-                "promql": [
-                    {
-                        "disabled": false,
-                        "legend": "",
-                        "name": "A",
-                        "query": ""
-                    }
-                ],
-                "queryType": "builder"
-            },
-            "softMax": null,
-            "softMin": null,
-            "thresholds": [],
-            "timePreferance": "GLOBAL_TIME",
-            "title": "Cache operations",
-            "yAxisUnit": "none"
-        },
-        {
-            "description": "",
-            "fillSpans": false,
-            "id": "14504a3c-4a05-4d22-bab3-e22e94f51380",
-            "isStacked": false,
-            "nullZeroValues": "zero",
-            "opacity": "1",
-            "panelTypes": "graph",
-            "query": {
-                "builder": {
-                    "queryData": [
-                        {
-                            "aggregations": [
-                                {
-                                    "metricName": "mongodb.operation.latency.time",
-                                    "reduceTo": "sum",
-                                    "spaceAggregation": "max",
-                                    "temporality": null,
-                                    "timeAggregation": "max"
-                                }
-                            ],
-                            "dataSource": "metrics",
-                            "disabled": false,
-                            "expression": "A",
-                            "filter": {
-                                "expression": "(operation = 'read' AND host.name IN $host.name)"
-                            },
-                            "groupBy": [],
-                            "having": {
-                                "expression": ""
-                            },
-                            "legend": "Latency",
-                            "limit": null,
-                            "orderBy": [],
-                            "queryName": "A",
-                            "stepInterval": 60
-                        }
-                    ],
-                    "queryFormulas": []
-                },
-                "clickhouse_sql": [
-                    {
-                        "disabled": false,
-                        "legend": "",
-                        "name": "A",
-                        "query": ""
-                    }
-                ],
-                "id": "4a9cafe8-778b-476c-b825-c04e165bf285",
-                "promql": [
-                    {
-                        "disabled": false,
-                        "legend": "",
-                        "name": "A",
-                        "query": ""
-                    }
-                ],
-                "queryType": "builder"
-            },
-            "softMax": null,
-            "softMin": null,
-            "thresholds": [],
-            "timePreferance": "GLOBAL_TIME",
-            "title": "Read latency",
-            "yAxisUnit": "µs"
-        },
-        {
-            "description": "",
-            "fillSpans": false,
-            "id": "a5a64eec-1034-4aa6-8cb1-05673c4426c6",
-            "isStacked": false,
-            "nullZeroValues": "zero",
-            "opacity": "1",
-            "panelTypes": "graph",
-            "query": {
-                "builder": {
-                    "queryData": [
-                        {
-                            "aggregations": [
-                                {
-                                    "metricName": "mongodb.operation.latency.time",
-                                    "reduceTo": "sum",
-                                    "spaceAggregation": "max",
-                                    "temporality": null,
-                                    "timeAggregation": "max"
-                                }
-                            ],
-                            "dataSource": "metrics",
-                            "disabled": false,
-                            "expression": "A",
-                            "filter": {
-                                "expression": "(host.name IN $host.name AND operation = 'write')"
-                            },
-                            "groupBy": [],
-                            "having": {
-                                "expression": ""
-                            },
-                            "legend": "Latency",
-                            "limit": null,
-                            "orderBy": [],
-                            "queryName": "A",
-                            "stepInterval": 60
-                        }
-                    ],
-                    "queryFormulas": []
-                },
-                "clickhouse_sql": [
-                    {
-                        "disabled": false,
-                        "legend": "",
-                        "name": "A",
-                        "query": ""
-                    }
-                ],
-                "id": "446827eb-a4f2-4ff3-966b-fb65288c983b",
-                "promql": [
-                    {
-                        "disabled": false,
-                        "legend": "",
-                        "name": "A",
-                        "query": ""
-                    }
-                ],
-                "queryType": "builder"
-            },
-            "softMax": null,
-            "softMin": null,
-            "thresholds": [],
-            "timePreferance": "GLOBAL_TIME",
-            "title": "Write latency",
-            "yAxisUnit": "µs"
-        },
-        {
-            "description": "",
-            "fillSpans": false,
-            "id": "503af589-ef4d-4fe3-8934-c8f7eb480d9a",
-            "isStacked": false,
-            "nullZeroValues": "zero",
-            "opacity": "1",
-            "panelTypes": "graph",
-            "query": {
-                "builder": {
-                    "queryData": [
-                        {
-                            "aggregations": [
-                                {
-                                    "metricName": "mongodb.operation.latency.time",
-                                    "reduceTo": "sum",
-                                    "spaceAggregation": "max",
-                                    "temporality": null,
-                                    "timeAggregation": "max"
-                                }
-                            ],
-                            "dataSource": "metrics",
-                            "disabled": false,
-                            "expression": "A",
-                            "filter": {
-                                "expression": "(host.name IN $host.name AND operation = 'command')"
-                            },
-                            "groupBy": [],
-                            "having": {
-                                "expression": ""
-                            },
-                            "legend": "Latency",
-                            "limit": null,
-                            "orderBy": [],
-                            "queryName": "A",
-                            "stepInterval": 60
-                        }
-                    ],
-                    "queryFormulas": []
-                },
-                "clickhouse_sql": [
-                    {
-                        "disabled": false,
-                        "legend": "",
-                        "name": "A",
-                        "query": ""
-                    }
-                ],
-                "id": "7b7b977d-0921-4552-8cfe-d82dfde63ef4",
-                "promql": [
-                    {
-                        "disabled": false,
-                        "legend": "",
-                        "name": "A",
-                        "query": ""
-                    }
-                ],
-                "queryType": "builder"
-            },
-            "softMax": null,
-            "softMin": null,
-            "thresholds": [],
-            "timePreferance": "GLOBAL_TIME",
-            "title": "Command latency",
-            "yAxisUnit": "µs"
-        },
-        {
-            "description": "",
-            "fillSpans": false,
-            "id": "0c3d2b15-89be-4d62-a821-b26d93332ed3",
-            "isStacked": false,
-            "nullZeroValues": "zero",
-            "opacity": "1",
-            "panelTypes": "graph",
-            "query": {
-                "builder": {
-                    "queryData": [
-                        {
-                            "aggregations": [
-                                {
-                                    "metricName": "mongodb.network.io.receive",
-                                    "reduceTo": "sum",
-                                    "spaceAggregation": "avg",
-                                    "temporality": null,
-                                    "timeAggregation": "avg"
-                                }
-                            ],
-                            "dataSource": "metrics",
-                            "disabled": false,
-                            "expression": "A",
-                            "filter": {
-                                "expression": "host.name IN $host.name"
-                            },
-                            "groupBy": [
-                                {
-                                    "dataType": "string",
-                                    "id": "host.name--string--tag--false",
-                                    "isColumn": false,
-                                    "isJSON": false,
-                                    "key": "host.name",
-                                    "type": "tag"
-                                }
-                            ],
-                            "having": {
-                                "expression": ""
-                            },
-                            "legend": "Bytes received :: {{host.name}}",
-                            "limit": null,
-                            "orderBy": [],
-                            "queryName": "A",
-                            "stepInterval": 60
-                        },
-                        {
-                            "aggregations": [
-                                {
-                                    "metricName": "mongodb.network.io.transmit",
-                                    "reduceTo": "sum",
-                                    "spaceAggregation": "avg",
-                                    "temporality": null,
-                                    "timeAggregation": "avg"
-                                }
-                            ],
-                            "dataSource": "metrics",
-                            "disabled": false,
-                            "expression": "B",
-                            "filter": {
-                                "expression": "host.name IN $host.name"
-                            },
-                            "groupBy": [
-                                {
-                                    "dataType": "string",
-                                    "id": "host.name--string--tag--false",
-                                    "isColumn": false,
-                                    "isJSON": false,
-                                    "key": "host.name",
-                                    "type": "tag"
-                                }
-                            ],
-                            "having": {
-                                "expression": ""
-                            },
-                            "legend": "Bytes transmitted :: {{host.name}}",
-                            "limit": null,
-                            "orderBy": [],
-                            "queryName": "B",
-                            "stepInterval": 60
-                        }
-                    ],
-                    "queryFormulas": []
-                },
-                "clickhouse_sql": [
-                    {
-                        "disabled": false,
-                        "legend": "",
-                        "name": "A",
-                        "query": ""
-                    }
-                ],
-                "id": "41eea5bc-f9cf-45c2-92fb-ef226d6b540b",
-                "promql": [
-                    {
-                        "disabled": false,
-                        "legend": "",
-                        "name": "A",
-                        "query": ""
-                    }
-                ],
-                "queryType": "builder"
-            },
-            "softMax": null,
-            "softMin": null,
-            "thresholds": [],
-            "timePreferance": "GLOBAL_TIME",
-            "title": "Network IO",
-            "yAxisUnit": "bytes"
-        }
-    ]
-}

pkg/query-service/app/integrations/builtin_integrations/postgres/assets/dashboards/overview.json

@@ -117,9 +117,9 @@
             "key": "4250ef7b-8f42-4a24-902a-a764d070b92d",
             "modificationUUID": "4427b655-c8d2-40ce-84ed-7cb058bd3041",
             "multiSelect": true,
-            "name": "host_name",
+            "name": "host.name",
             "order": 0,
-            "queryValue": "SELECT JSONExtractString(labels, 'host_name') AS host_name\nFROM signoz_metrics.distributed_time_series_v4_1day\nWHERE metric_name = 'postgresql_operations'\nGROUP BY host_name",
+            "queryValue": "SELECT JSONExtractString(labels, 'host.name') AS `host.name`\nFROM signoz_metrics.distributed_time_series_v4_1day\nWHERE metric_name = 'postgresql.operations'\nGROUP BY `host.name`",
             "selectedValue": [
                 "Srikanths-MacBook-Pro.local"
             ],
@@ -135,9 +135,9 @@
             "id": "8ecaee70-640f-46fd-83d9-a4fd18bc66e6",
             "modificationUUID": "a51321cd-47a2-470a-8df4-372e5bb36f2c",
             "multiSelect": true,
-            "name": "table_name",
+            "name": "table.name",
             "order": 0,
-            "queryValue": "SELECT JSONExtractString(labels, 'postgresql_table_name') AS table_name\nFROM signoz_metrics.distributed_time_series_v4_1day\nWHERE metric_name = 'postgresql_operations' AND JSONExtractString(labels, 'postgresql_database_name') IN {{.db_name}}\nGROUP BY table_name",
+            "queryValue": "SELECT JSONExtractString(labels, 'postgresql.table.name') AS `table.name`\nFROM signoz_metrics.distributed_time_series_v4_1day\nWHERE metric_name = 'postgresql.operations' AND JSONExtractString(labels, 'postgresql.database.name') IN {{.db.name}}\nGROUP BY `table.name`",
             "selectedValue": [
                 "public.activations",
                 "public.licenses",
@@ -160,9 +160,9 @@
             "key": "c66d1581-e5e1-440d-8ff6-ebcf078ab6dd",
             "modificationUUID": "564a3f43-98f8-4189-b5e4-dcb518d73852",
             "multiSelect": true,
-            "name": "db_name",
+            "name": "db.name",
             "order": 0,
-            "queryValue": "SELECT JSONExtractString(labels, 'postgresql_database_name') AS db_name\nFROM signoz_metrics.distributed_time_series_v4_1day\nWHERE metric_name = 'postgresql_operations'\nGROUP BY db_name",
+            "queryValue": "SELECT JSONExtractString(labels, 'postgresql.database.name') AS `db.name`\nFROM signoz_metrics.distributed_time_series_v4_1day\nWHERE metric_name = 'postgresql.operations'\nGROUP BY `db.name`",
             "selectedValue": [
                 "postgres"
             ],
@@ -188,7 +188,7 @@
                         {
                             "aggregations": [
                                 {
-                                    "metricName": "postgresql_operations",
+                                    "metricName": "postgresql.operations",
                                     "reduceTo": "sum",
                                     "spaceAggregation": "avg",
                                     "temporality": null,
@@ -199,22 +199,22 @@
                             "disabled": false,
                             "expression": "A",
                             "filter": {
-                                "expression": "(operation = 'ins' AND host_name IN $host_name AND postgresql_database_name IN $db_name)"
+                                "expression": "(operation = 'ins' AND host.name IN $host.name AND postgresql.database.name IN $db.name)"
                             },
                             "groupBy": [
                                 {
                                     "dataType": "string",
-                                    "id": "postgresql_database_name--string--tag--false",
+                                    "id": "postgresql.database.name--string--tag--false",
                                     "isColumn": false,
                                     "isJSON": false,
-                                    "key": "postgresql_database_name",
+                                    "key": "postgresql.database.name",
                                     "type": "tag"
                                 }
                             ],
                             "having": {
                                 "expression": ""
                             },
-                            "legend": "{{postgresql_database_name}}",
+                            "legend": "{{postgresql.database.name}}",
                             "limit": null,
                             "orderBy": [],
                             "queryName": "A",
@@ -263,7 +263,7 @@
                         {
                             "aggregations": [
                                 {
-                                    "metricName": "postgresql_operations",
+                                    "metricName": "postgresql.operations",
                                     "reduceTo": "sum",
                                     "spaceAggregation": "avg",
                                     "temporality": null,
@@ -274,22 +274,22 @@
                             "disabled": false,
                             "expression": "A",
                             "filter": {
-                                "expression": "(operation = 'upd' AND host_name IN $host_name AND postgresql_database_name IN $db_name)"
+                                "expression": "(operation = 'upd' AND host.name IN $host.name AND postgresql.database.name IN $db.name)"
                             },
                             "groupBy": [
                                 {
                                     "dataType": "string",
-                                    "id": "postgresql_database_name--string--tag--false",
+                                    "id": "postgresql.database.name--string--tag--false",
                                     "isColumn": false,
                                     "isJSON": false,
-                                    "key": "postgresql_database_name",
+                                    "key": "postgresql.database.name",
                                     "type": "tag"
                                 }
                             ],
                             "having": {
                                 "expression": ""
                             },
-                            "legend": "{{postgresql_database_name}}",
+                            "legend": "{{postgresql.database.name}}",
                             "limit": null,
                             "orderBy": [],
                             "queryName": "A",
@@ -338,7 +338,7 @@
                         {
                             "aggregations": [
                                 {
-                                    "metricName": "postgresql_operations",
+                                    "metricName": "postgresql.operations",
                                     "reduceTo": "sum",
                                     "spaceAggregation": "avg",
                                     "temporality": null,
@@ -349,22 +349,22 @@
                             "disabled": false,
                             "expression": "A",
                             "filter": {
-                                "expression": "(operation = 'del' AND host_name IN $host_name AND postgresql_database_name IN $db_name)"
+                                "expression": "(operation = 'del' AND host.name IN $host.name AND postgresql.database.name IN $db.name)"
                             },
                             "groupBy": [
                                 {
                                     "dataType": "string",
-                                    "id": "postgresql_database_name--string--tag--false",
+                                    "id": "postgresql.database.name--string--tag--false",
                                     "isColumn": false,
                                     "isJSON": false,
-                                    "key": "postgresql_database_name",
+                                    "key": "postgresql.database.name",
                                     "type": "tag"
                                 }
                             ],
                             "having": {
                                 "expression": ""
                             },
-                            "legend": "{{postgresql_database_name}}",
+                            "legend": "{{postgresql.database.name}}",
                             "limit": null,
                             "orderBy": [],
                             "queryName": "A",
@@ -413,7 +413,7 @@
                         {
                             "aggregations": [
                                 {
-                                    "metricName": "postgresql_operations",
+                                    "metricName": "postgresql.operations",
                                     "reduceTo": "sum",
                                     "spaceAggregation": "avg",
                                     "temporality": null,
@@ -424,22 +424,22 @@
                             "disabled": false,
                             "expression": "A",
                             "filter": {
-                                "expression": "(operation = 'hot_upd' AND host_name IN $host_name AND postgresql_database_name IN $db_name)"
+                                "expression": "(operation = 'hot_upd' AND host.name IN $host.name AND postgresql.database.name IN $db.name)"
                             },
                             "groupBy": [
                                 {
                                     "dataType": "string",
-                                    "id": "postgresql_database_name--string--tag--false",
+                                    "id": "postgresql.database.name--string--tag--false",
                                     "isColumn": false,
                                     "isJSON": false,
-                                    "key": "postgresql_database_name",
+                                    "key": "postgresql.database.name",
                                     "type": "tag"
                                 }
                             ],
                             "having": {
                                 "expression": ""
                             },
-                            "legend": "{{postgresql_database_name}}",
+                            "legend": "{{postgresql.database.name}}",
                             "limit": null,
                             "orderBy": [],
                             "queryName": "A",
@@ -488,7 +488,7 @@
                         {
                             "aggregations": [
                                 {
-                                    "metricName": "postgresql_operations",
+                                    "metricName": "postgresql.operations",
                                     "reduceTo": "avg",
                                     "spaceAggregation": "avg",
                                     "temporality": null,
@@ -499,15 +499,15 @@
                             "disabled": false,
                             "expression": "A",
                             "filter": {
-                                "expression": "(operation = 'ins' AND host_name IN $host_name AND postgresql_database_name IN $db_name)"
+                                "expression": "(operation = 'ins' AND host.name IN $host.name AND postgresql.database.name IN $db.name)"
                             },
                             "groupBy": [
                                 {
                                     "dataType": "string",
-                                    "id": "postgresql_database_name--string--tag--false",
+                                    "id": "postgresql.database.name--string--tag--false",
                                     "isColumn": false,
                                     "isJSON": false,
-                                    "key": "postgresql_database_name",
+                                    "key": "postgresql.database.name",
                                     "type": "tag"
                                 }
                             ],
@@ -523,7 +523,7 @@
                         {
                             "aggregations": [
                                 {
-                                    "metricName": "postgresql_operations",
+                                    "metricName": "postgresql.operations",
                                     "reduceTo": "avg",
                                     "spaceAggregation": "avg",
                                     "temporality": null,
@@ -534,15 +534,15 @@
                             "disabled": false,
                             "expression": "B",
                             "filter": {
-                                "expression": "(operation = 'upd' AND host_name IN $host_name AND postgresql_database_name IN $db_name)"
+                                "expression": "(operation = 'upd' AND host.name IN $host.name AND postgresql.database.name IN $db.name)"
                             },
                             "groupBy": [
                                 {
                                     "dataType": "string",
-                                    "id": "postgresql_database_name--string--tag--false",
+                                    "id": "postgresql.database.name--string--tag--false",
                                     "isColumn": false,
                                     "isJSON": false,
-                                    "key": "postgresql_database_name",
+                                    "key": "postgresql.database.name",
                                     "type": "tag"
                                 }
                             ],
@@ -558,7 +558,7 @@
                         {
                             "aggregations": [
                                 {
-                                    "metricName": "postgresql_operations",
+                                    "metricName": "postgresql.operations",
                                     "reduceTo": "avg",
                                     "spaceAggregation": "avg",
                                     "temporality": null,
@@ -569,15 +569,15 @@
                             "disabled": false,
                             "expression": "C",
                             "filter": {
-                                "expression": "(operation = 'del' AND host_name IN $host_name AND postgresql_database_name IN $db_name)"
+                                "expression": "(operation = 'del' AND host.name IN $host.name AND postgresql.database.name IN $db.name)"
                             },
                             "groupBy": [
                                 {
                                     "dataType": "string",
-                                    "id": "postgresql_database_name--string--tag--false",
+                                    "id": "postgresql.database.name--string--tag--false",
                                     "isColumn": false,
                                     "isJSON": false,
-                                    "key": "postgresql_database_name",
+                                    "key": "postgresql.database.name",
                                     "type": "tag"
                                 }
                             ],
@@ -633,7 +633,7 @@
                         {
                             "aggregations": [
                                 {
-                                    "metricName": "postgresql_database_locks",
+                                    "metricName": "postgresql.database.locks",
                                     "reduceTo": "sum",
                                     "spaceAggregation": "sum",
                                     "temporality": null,
@@ -644,7 +644,7 @@
                             "disabled": false,
                             "expression": "A",
                             "filter": {
-                                "expression": "host_name IN $host_name"
+                                "expression": "host.name IN $host.name"
                             },
                             "groupBy": [
                                 {
@@ -708,7 +708,7 @@
                         {
                             "aggregations": [
                                 {
-                                    "metricName": "postgresql_deadlocks",
+                                    "metricName": "postgresql.deadlocks",
                                     "reduceTo": "sum",
                                     "spaceAggregation": "sum",
                                     "temporality": null,
@@ -719,22 +719,22 @@
                             "disabled": false,
                             "expression": "A",
                             "filter": {
-                                "expression": "(host_name IN $host_name AND postgresql_database_name IN $db_name)"
+                                "expression": "(host.name IN $host.name AND postgresql.database.name IN $db.name)"
                             },
                             "groupBy": [
                                 {
                                     "dataType": "string",
-                                    "id": "postgresql_database_name--string--tag--false",
+                                    "id": "postgresql.database.name--string--tag--false",
                                     "isColumn": false,
                                     "isJSON": false,
-                                    "key": "postgresql_database_name",
+                                    "key": "postgresql.database.name",
                                     "type": "tag"
                                 }
                             ],
                             "having": {
                                 "expression": ""
                             },
-                            "legend": "{{postgresql_database_name}}",
+                            "legend": "{{postgresql.database.name}}",
                             "limit": null,
                             "orderBy": [],
                             "queryName": "A",
@@ -783,7 +783,7 @@
                         {
                             "aggregations": [
                                 {
-                                    "metricName": "postgresql_backends",
+                                    "metricName": "postgresql.backends",
                                     "reduceTo": "sum",
                                     "spaceAggregation": "avg",
                                     "temporality": null,
@@ -794,22 +794,22 @@
                             "disabled": false,
                             "expression": "A",
                             "filter": {
-                                "expression": "(host_name IN $host_name AND postgresql_database_name IN $db_name)"
+                                "expression": "(host.name IN $host.name AND postgresql.database.name IN $db.name)"
                             },
                             "groupBy": [
                                 {
                                     "dataType": "string",
-                                    "id": "postgresql_database_name--string--tag--false",
+                                    "id": "postgresql.database.name--string--tag--false",
                                     "isColumn": false,
                                     "isJSON": false,
-                                    "key": "postgresql_database_name",
+                                    "key": "postgresql.database.name",
                                     "type": "tag"
                                 }
                             ],
                             "having": {
                                 "expression": ""
                             },
-                            "legend": "{{postgresql_database_name}}",
+                            "legend": "{{postgresql.database.name}}",
                             "limit": null,
                             "orderBy": [],
                             "queryName": "A",
@@ -858,7 +858,7 @@
                         {
                             "aggregations": [
                                 {
-                                    "metricName": "postgresql_rows",
+                                    "metricName": "postgresql.rows",
                                     "reduceTo": "sum",
                                     "spaceAggregation": "sum",
                                     "temporality": null,
@@ -869,7 +869,7 @@
                             "disabled": false,
                             "expression": "A",
                             "filter": {
-                                "expression": "(state = 'dead' AND host_name IN $host_name AND postgresql_database_name IN $db_name AND postgresql_table_name IN $table_name)"
+                                "expression": "(state = 'dead' AND host.name IN $host.name AND postgresql.database.name IN $db.name AND postgresql.table.name IN $table.name)"
                             },
                             "groupBy": [],
                             "having": {
@@ -924,7 +924,7 @@
                         {
                             "aggregations": [
                                 {
-                                    "metricName": "postgresql_index_scans",
+                                    "metricName": "postgresql.index.scans",
                                     "reduceTo": "sum",
                                     "spaceAggregation": "sum",
                                     "temporality": null,
@@ -935,22 +935,22 @@
                             "disabled": false,
                             "expression": "A",
                             "filter": {
-                                "expression": "(host_name IN $host_name AND postgresql_database_name IN $db_name AND postgresql_table_name IN $table_name)"
+                                "expression": "(host.name IN $host.name AND postgresql.database.name IN $db.name AND postgresql.table.name IN $table.name)"
                             },
                             "groupBy": [
                                 {
                                     "dataType": "string",
-                                    "id": "postgresql_index_name--string--tag--false",
+                                    "id": "postgresql.index.name--string--tag--false",
                                     "isColumn": false,
                                     "isJSON": false,
-                                    "key": "postgresql_index_name",
+                                    "key": "postgresql.index.name",
                                     "type": "tag"
                                 }
                             ],
                             "having": {
                                 "expression": ""
                             },
-                            "legend": "{{postgresql_index_name}}",
+                            "legend": "{{postgresql.index.name}}",
                             "limit": null,
                             "orderBy": [],
                             "queryName": "A",
@@ -999,7 +999,7 @@
                         {
                             "aggregations": [
                                 {
-                                    "metricName": "postgresql_rows",
+                                    "metricName": "postgresql.rows",
                                     "reduceTo": "avg",
                                     "spaceAggregation": "avg",
                                     "temporality": null,
@@ -1010,15 +1010,15 @@
                             "disabled": false,
                             "expression": "A",
                             "filter": {
-                                "expression": "(state = 'dead' AND host_name IN $host_name AND postgresql_database_name IN $db_name AND postgresql_table_name IN $table_name)"
+                                "expression": "(state = 'dead' AND host.name IN $host.name AND postgresql.database.name IN $db.name AND postgresql.table.name IN $table.name)"
                             },
                             "groupBy": [
                                 {
                                     "dataType": "string",
-                                    "id": "postgresql_table_name--string--tag--false",
+                                    "id": "postgresql.table.name--string--tag--false",
                                     "isColumn": false,
                                     "isJSON": false,
-                                    "key": "postgresql_table_name",
+                                    "key": "postgresql.table.name",
                                     "type": "tag"
                                 }
                             ],
@@ -1034,7 +1034,7 @@
                         {
                             "aggregations": [
                                 {
-                                    "metricName": "postgresql_rows",
+                                    "metricName": "postgresql.rows",
                                     "reduceTo": "avg",
                                     "spaceAggregation": "avg",
                                     "temporality": null,
@@ -1045,15 +1045,15 @@
                             "disabled": false,
                             "expression": "B",
                             "filter": {
-                                "expression": "(state = 'live' AND host_name IN $host_name AND postgresql_database_name IN $db_name AND postgresql_table_name IN $table_name)"
+                                "expression": "(state = 'live' AND host.name IN $host.name AND postgresql.database.name IN $db.name AND postgresql.table.name IN $table.name)"
                             },
                             "groupBy": [
                                 {
                                     "dataType": "string",
-                                    "id": "postgresql_table_name--string--tag--false",
+                                    "id": "postgresql.table.name--string--tag--false",
                                     "isColumn": false,
                                     "isJSON": false,
-                                    "key": "postgresql_table_name",
+                                    "key": "postgresql.table.name",
                                     "type": "tag"
                                 }
                             ],
@@ -1069,7 +1069,7 @@
                         {
                             "aggregations": [
                                 {
-                                    "metricName": "postgresql_index_scans",
+                                    "metricName": "postgresql.index.scans",
                                     "reduceTo": "sum",
                                     "spaceAggregation": "sum",
                                     "temporality": null,
@@ -1080,15 +1080,15 @@
                             "disabled": false,
                             "expression": "C",
                             "filter": {
-                                "expression": "(host_name IN $host_name AND postgresql_database_name IN $db_name AND postgresql_table_name IN $table_name)"
+                                "expression": "(host.name IN $host.name AND postgresql.database.name IN $db.name AND postgresql.table.name IN $table.name)"
                             },
                             "groupBy": [
                                 {
                                     "dataType": "string",
-                                    "id": "postgresql_table_name--string--tag--false",
+                                    "id": "postgresql.table.name--string--tag--false",
                                     "isColumn": false,
                                     "isJSON": false,
-                                    "key": "postgresql_table_name",
+                                    "key": "postgresql.table.name",
                                     "type": "tag"
                                 }
                             ],
@@ -1104,7 +1104,7 @@
                         {
                             "aggregations": [
                                 {
-                                    "metricName": "postgresql_table_size",
+                                    "metricName": "postgresql.table.size",
                                     "reduceTo": "avg",
                                     "spaceAggregation": "avg",
                                     "temporality": null,
@@ -1115,15 +1115,15 @@
                             "disabled": false,
                             "expression": "D",
                             "filter": {
-                                "expression": "(host_name IN $host_name AND postgresql_database_name IN $db_name AND postgresql_table_name IN $table_name)"
+                                "expression": "(host.name IN $host.name AND postgresql.database.name IN $db.name AND postgresql.table.name IN $table.name)"
                             },
                             "groupBy": [
                                 {
                                     "dataType": "string",
-                                    "id": "postgresql_table_name--string--tag--false",
+                                    "id": "postgresql.table.name--string--tag--false",
                                     "isColumn": false,
                                     "isJSON": false,
-                                    "key": "postgresql_table_name",
+                                    "key": "postgresql.table.name",
                                     "type": "tag"
                                 }
                             ],

pkg/query-service/app/integrations/builtin_integrations/redis/assets/dashboards/overview.json

@@ -99,9 +99,9 @@
             "key": "94f19b3c-ad9f-4b47-a9b2-f312c09fa965",
             "modificationUUID": "4c5b0c03-9cbc-425b-8d8e-7152e5c39ba8",
             "multiSelect": true,
-            "name": "host_name",
+            "name": "host.name",
             "order": 0,
-            "queryValue": "SELECT JSONExtractString(labels, 'host_name') AS host_name\nFROM signoz_metrics.distributed_time_series_v4_1day\nWHERE metric_name = 'redis_cpu_time'\nGROUP BY host_name",
+            "queryValue": "SELECT JSONExtractString(labels, 'host.name') AS  `host.name`\nFROM signoz_metrics.distributed_time_series_v4_1day\nWHERE metric_name = 'redis.cpu.time'\nGROUP BY `host.name`",
             "selectedValue": [
                 "Srikanths-MacBook-Pro.local"
             ],
@@ -127,7 +127,7 @@
                         {
                             "aggregations": [
                                 {
-                                    "metricName": "redis_keyspace_hits",
+                                    "metricName": "redis.keyspace.hits",
                                     "reduceTo": "sum",
                                     "spaceAggregation": "sum",
                                     "temporality": null,
@@ -138,7 +138,7 @@
                             "disabled": false,
                             "expression": "A",
                             "filter": {
-                                "expression": "host_name IN $host_name"
+                                "expression": "host.name IN $host.name"
                             },
                             "groupBy": [],
                             "having": {
@@ -193,7 +193,7 @@
                         {
                             "aggregations": [
                                 {
-                                    "metricName": "redis_clients_blocked",
+                                    "metricName": "redis.clients.blocked",
                                     "reduceTo": "sum",
                                     "spaceAggregation": "sum",
                                     "temporality": null,
@@ -204,7 +204,7 @@
                             "disabled": false,
                             "expression": "A",
                             "filter": {
-                                "expression": "host_name IN $host_name"
+                                "expression": "host.name IN $host.name"
                             },
                             "groupBy": [],
                             "having": {
@@ -259,7 +259,7 @@
                         {
                             "aggregations": [
                                 {
-                                    "metricName": "redis_db_keys",
+                                    "metricName": "redis.db.keys",
                                     "reduceTo": "sum",
                                     "spaceAggregation": "sum",
                                     "temporality": null,
@@ -322,7 +322,7 @@
                         {
                             "aggregations": [
                                 {
-                                    "metricName": "redis_rdb_changes_since_last_save",
+                                    "metricName": "redis.rdb.changes_since_last_save",
                                     "reduceTo": "sum",
                                     "spaceAggregation": "sum",
                                     "temporality": null,
@@ -333,7 +333,7 @@
                             "disabled": false,
                             "expression": "A",
                             "filter": {
-                                "expression": "host_name IN $host_name"
+                                "expression": "host.name IN $host.name"
                             },
                             "groupBy": [],
                             "having": {
@@ -388,7 +388,7 @@
                         {
                             "aggregations": [
                                 {
-                                    "metricName": "redis_commands",
+                                    "metricName": "redis.commands",
                                     "reduceTo": "sum",
                                     "spaceAggregation": "sum",
                                     "temporality": null,
@@ -399,7 +399,7 @@
                             "disabled": false,
                             "expression": "A",
                             "filter": {
-                                "expression": "host_name IN $host_name"
+                                "expression": "host.name IN $host.name"
                             },
                             "groupBy": [],
                             "having": {
@@ -454,7 +454,7 @@
                         {
                             "aggregations": [
                                 {
-                                    "metricName": "redis_memory_used",
+                                    "metricName": "redis.memory.used",
                                     "reduceTo": "sum",
                                     "spaceAggregation": "sum",
                                     "temporality": null,
@@ -465,22 +465,22 @@
                             "disabled": false,
                             "expression": "A",
                             "filter": {
-                                "expression": "host_name IN $host_name"
+                                "expression": "host.name IN $host.name"
                             },
                             "groupBy": [
                                 {
                                     "dataType": "string",
-                                    "id": "host_name--string--tag--false",
+                                    "id": "host.name--string--tag--false",
                                     "isColumn": false,
                                     "isJSON": false,
-                                    "key": "host_name",
+                                    "key": "host.name",
                                     "type": "tag"
                                 }
                             ],
                             "having": {
                                 "expression": ""
                             },
-                            "legend": "Used::{{host_name}}",
+                            "legend": "Used::{{host.name}}",
                             "limit": null,
                             "orderBy": [],
                             "queryName": "A",
@@ -489,7 +489,7 @@
                         {
                             "aggregations": [
                                 {
-                                    "metricName": "redis_maxmemory",
+                                    "metricName": "redis.maxmemory",
                                     "reduceTo": "sum",
                                     "spaceAggregation": "max",
                                     "temporality": null,
@@ -500,22 +500,22 @@
                             "disabled": false,
                             "expression": "B",
                             "filter": {
-                                "expression": "host_name IN $host_name"
+                                "expression": "host.name IN $host.name"
                             },
                             "groupBy": [
                                 {
                                     "dataType": "string",
-                                    "id": "host_name--string--tag--false",
+                                    "id": "host.name--string--tag--false",
                                     "isColumn": false,
                                     "isJSON": false,
-                                    "key": "host_name",
+                                    "key": "host.name",
                                     "type": "tag"
                                 }
                             ],
                             "having": {
                                 "expression": ""
                             },
-                            "legend": "Max::{{host_name}}",
+                            "legend": "Max::{{host.name}}",
                             "limit": null,
                             "orderBy": [],
                             "queryName": "B",
@@ -564,7 +564,7 @@
                         {
                             "aggregations": [
                                 {
-                                    "metricName": "redis_memory_rss",
+                                    "metricName": "redis.memory.rss",
                                     "reduceTo": "sum",
                                     "spaceAggregation": "sum",
                                     "temporality": null,
@@ -575,22 +575,22 @@
                             "disabled": false,
                             "expression": "A",
                             "filter": {
-                                "expression": "host_name IN $host_name"
+                                "expression": "host.name IN $host.name"
                             },
                             "groupBy": [
                                 {
                                     "dataType": "string",
-                                    "id": "host_name--string--tag--false",
+                                    "id": "host.name--string--tag--false",
                                     "isColumn": false,
                                     "isJSON": false,
-                                    "key": "host_name",
+                                    "key": "host.name",
                                     "type": "tag"
                                 }
                             ],
                             "having": {
                                 "expression": ""
                             },
-                            "legend": "Rss::{{host_name}}",
+                            "legend": "Rss::{{host.name}}",
                             "limit": null,
                             "orderBy": [],
                             "queryName": "A",
@@ -639,7 +639,7 @@
                         {
                             "aggregations": [
                                 {
-                                    "metricName": "redis_memory_fragmentation_ratio",
+                                    "metricName": "redis.memory.fragmentation_ratio",
                                     "reduceTo": "sum",
                                     "spaceAggregation": "avg",
                                     "temporality": null,
@@ -650,22 +650,22 @@
                             "disabled": false,
                             "expression": "A",
                             "filter": {
-                                "expression": "host_name IN $host_name"
+                                "expression": "host.name IN $host.name"
                             },
                             "groupBy": [
                                 {
                                     "dataType": "string",
-                                    "id": "host_name--string--tag--false",
+                                    "id": "host.name--string--tag--false",
                                     "isColumn": false,
                                     "isJSON": false,
-                                    "key": "host_name",
+                                    "key": "host.name",
                                     "type": "tag"
                                 }
                             ],
                             "having": {
                                 "expression": ""
                             },
-                            "legend": "Rss::{{host_name}}",
+                            "legend": "Rss::{{host.name}}",
                             "limit": null,
                             "orderBy": [],
                             "queryName": "A",
@@ -714,7 +714,7 @@
                         {
                             "aggregations": [
                                 {
-                                    "metricName": "redis_keys_evicted",
+                                    "metricName": "redis.keys.evicted",
                                     "reduceTo": "sum",
                                     "spaceAggregation": "sum",
                                     "temporality": null,
@@ -725,22 +725,22 @@
                             "disabled": false,
                             "expression": "A",
                             "filter": {
-                                "expression": "host_name IN $host_name"
+                                "expression": "host.name IN $host.name"
                             },
                             "groupBy": [
                                 {
                                     "dataType": "string",
-                                    "id": "host_name--string--tag--false",
+                                    "id": "host.name--string--tag--false",
                                     "isColumn": false,
                                     "isJSON": false,
-                                    "key": "host_name",
+                                    "key": "host.name",
                                     "type": "tag"
                                 }
                             ],
                             "having": {
                                 "expression": ""
                             },
-                            "legend": "Rss::{{host_name}}",
+                            "legend": "Rss::{{host.name}}",
                             "limit": null,
                             "orderBy": [],
                             "queryName": "A",