Merge branch 'main' into issue-5004

chore: run generate
chore: consolidate checks to module
2026-05-20 08:50:29 +01:00 · 2026-05-20 10:18:14 +05:30 · 2026-05-20 10:16:43 +05:30 · 2026-05-20 10:12:20 +05:30 · 2026-05-20 09:53:48 +05:30 · 2026-05-20 04:20:16 +00:00
76 changed files with 2207 additions and 1450 deletions
--- a/docs/api/openapi.yml
+++ b/docs/api/openapi.yml
@@ -125,8 +125,6 @@ components:
          type: string
        kind:
          $ref: '#/components/schemas/AlertmanagertypesMaintenanceKind'
-        labelExpression:
-          type: string
        name:
          type: string
        schedule:
@@ -270,8 +268,6 @@ components:
          type: array
        description:
          type: string
-        labelExpression:
-          type: string
        name:
          type: string
        schedule:
@@ -2346,6 +2342,8 @@ components:
          type: boolean
        org_id:
          type: string
+        source:
+          $ref: '#/components/schemas/DashboardtypesSource'
        updatedAt:
          format: date-time
          type: string
@@ -2375,6 +2373,12 @@ components:
        timeRangeEnabled:
          type: boolean
      type: object
+    DashboardtypesSource:
+      enum:
+      - user
+      - system
+      - integration
+      type: string
    DashboardtypesStorableDashboardData:
      additionalProperties: {}
      type: object
--- a/ee/modules/dashboard/impldashboard/module.go
+++ b/ee/modules/dashboard/impldashboard/module.go
@@ -49,6 +49,14 @@ func (module *module) CreatePublic(ctx context.Context, orgID valuer.UUID, publi
 		return errors.New(errors.TypeLicenseUnavailable, errors.CodeLicenseUnavailable, "a valid license is not available").WithAdditional("this feature requires a valid license").WithAdditional(err.Error())
 	}

+	dashboard, err := module.Get(ctx, orgID, publicDashboard.DashboardID)
+	if err != nil {
+		return err
+	}
+	if err := dashboard.ErrIfNotPublishable(); err != nil {
+		return err
+	}
+
 	storablePublicDashboard, err := module.store.GetPublic(ctx, publicDashboard.DashboardID.StringValue())
 	if err != nil && !errors.Ast(err, errors.TypeNotFound) {
 		return err
@@ -129,6 +137,14 @@ func (module *module) UpdatePublic(ctx context.Context, orgID valuer.UUID, publi
 		return errors.New(errors.TypeLicenseUnavailable, errors.CodeLicenseUnavailable, "a valid license is not available").WithAdditional("this feature requires a valid license").WithAdditional(err.Error())
 	}

+	dashboard, err := module.Get(ctx, orgID, publicDashboard.DashboardID)
+	if err != nil {
+		return err
+	}
+	if err := dashboard.ErrIfNotPublishable(); err != nil {
+		return err
+	}
+
 	return module.store.UpdatePublic(ctx, dashboardtypes.NewStorablePublicDashboardFromPublicDashboard(publicDashboard))
 }

@@ -138,6 +154,10 @@ func (module *module) Delete(ctx context.Context, orgID valuer.UUID, id valuer.U
 		return err
 	}

+	if err := dashboard.ErrIfNotDeletable(); err != nil {
+		return err
+	}
+
 	if dashboard.Locked {
 		return errors.New(errors.TypeInvalidInput, errors.CodeInvalidInput, "dashboard is locked, please unlock the dashboard to be delete it")
 	}
@@ -168,6 +188,14 @@ func (module *module) DeletePublic(ctx context.Context, orgID valuer.UUID, dashb
 		return errors.New(errors.TypeLicenseUnavailable, errors.CodeLicenseUnavailable, "a valid license is not available").WithAdditional("this feature requires a valid license").WithAdditional(err.Error())
 	}

+	dashboard, err := module.Get(ctx, orgID, dashboardID)
+	if err != nil {
+		return err
+	}
+	if err := dashboard.ErrIfNotPublishable(); err != nil {
+		return err
+	}
+
 	err = module.store.DeletePublic(ctx, dashboardID.StringValue())
 	if err != nil {
 		return err
--- a/frontend/orval.config.ts
+++ b/frontend/orval.config.ts
@@ -34,7 +34,7 @@ export default defineConfig({
 					signal: true,
 					useOperationIdAsQueryKey: false,
 				},
-				useDates: true,
+				useDates: false,
 				useNamedParameters: true,
 				enumGenerationType: 'enum',
 				mutator: {
--- a/frontend/src/api/generated/services/sigNoz.schemas.ts
+++ b/frontend/src/api/generated/services/sigNoz.schemas.ts
@@ -9,7 +9,7 @@ export interface AlertmanagertypesChannelDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	createdAt?: Date;
+	createdAt?: string;
 	/**
 	 * @type string
 	 */
@@ -34,7 +34,7 @@ export interface AlertmanagertypesChannelDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	updatedAt?: Date;
+	updatedAt?: string;
 }

 export interface ModelLabelSetDTO {
@@ -62,7 +62,7 @@ export interface AlertmanagertypesDeprecatedGettableAlertDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	endsAt?: Date;
+	endsAt?: string;
 	/**
 	 * @type string
 	 */
@@ -80,7 +80,7 @@ export interface AlertmanagertypesDeprecatedGettableAlertDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	startsAt?: Date;
+	startsAt?: string;
 	status?: TypesAlertStatusDTO;
 }

@@ -97,7 +97,7 @@ export interface AlertmanagertypesGettableRoutePolicyDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	createdAt: Date;
+	createdAt: string;
 	/**
 	 * @type string,null
 	 */
@@ -127,7 +127,7 @@ export interface AlertmanagertypesGettableRoutePolicyDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	updatedAt: Date;
+	updatedAt: string;
 	/**
 	 * @type string,null
 	 */
@@ -166,7 +166,7 @@ export interface AlertmanagertypesRecurrenceDTO {
 	 * @type string,null
 	 * @format date-time
 	 */
-	endTime?: Date | null;
+	endTime?: string | null;
 	/**
 	 * @type array,null
 	 */
@@ -176,7 +176,7 @@ export interface AlertmanagertypesRecurrenceDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	startTime: Date;
+	startTime: string;
 }

 export interface AlertmanagertypesScheduleDTO {
@@ -184,13 +184,13 @@ export interface AlertmanagertypesScheduleDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	endTime?: Date;
+	endTime?: string;
 	recurrence?: AlertmanagertypesRecurrenceDTO;
 	/**
 	 * @type string
 	 * @format date-time
 	 */
-	startTime?: Date;
+	startTime?: string;
 	/**
 	 * @type string
 	 */
@@ -206,7 +206,7 @@ export interface AlertmanagertypesPlannedMaintenanceDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	createdAt?: Date;
+	createdAt?: string;
 	/**
 	 * @type string
 	 */
@@ -220,10 +220,6 @@ export interface AlertmanagertypesPlannedMaintenanceDTO {
 	 */
 	id: string;
 	kind: AlertmanagertypesMaintenanceKindDTO;
-	/**
-	 * @type string
-	 */
-	labelExpression?: string;
 	/**
 	 * @type string
 	 */
@@ -234,7 +230,7 @@ export interface AlertmanagertypesPlannedMaintenanceDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	updatedAt?: Date;
+	updatedAt?: string;
 	/**
 	 * @type string
 	 */
@@ -1713,10 +1709,6 @@ export interface AlertmanagertypesPostablePlannedMaintenanceDTO {
 	 * @type string
 	 */
 	description?: string;
-	/**
-	 * @type string
-	 */
-	labelExpression?: string;
 	/**
 	 * @type string
 	 */
@@ -1961,7 +1953,7 @@ export interface AuthtypesGettableAuthDomainDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	createdAt?: Date;
+	createdAt?: string;
 	/**
 	 * @type string
 	 */
@@ -1978,7 +1970,7 @@ export interface AuthtypesGettableAuthDomainDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	updatedAt?: Date;
+	updatedAt?: string;
 }

 export interface AuthtypesGettableTokenDTO {
@@ -2136,7 +2128,7 @@ export interface AuthtypesRoleDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	createdAt?: Date;
+	createdAt?: string;
 	/**
 	 * @type string
 	 */
@@ -2161,7 +2153,7 @@ export interface AuthtypesRoleDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	updatedAt?: Date;
+	updatedAt?: string;
 }

 export interface AuthtypesSessionContextDTO {
@@ -2189,7 +2181,7 @@ export interface AuthtypesUserRoleDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	createdAt: Date;
+	createdAt: string;
 	/**
 	 * @type string
 	 */
@@ -2203,7 +2195,7 @@ export interface AuthtypesUserRoleDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	updatedAt: Date;
+	updatedAt: string;
 	/**
 	 * @type string
 	 */
@@ -2215,7 +2207,7 @@ export interface AuthtypesUserWithRolesDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	createdAt?: Date;
+	createdAt?: string;
 	/**
 	 * @type string
 	 */
@@ -2244,7 +2236,7 @@ export interface AuthtypesUserWithRolesDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	updatedAt?: Date;
+	updatedAt?: string;
 	/**
 	 * @type array,null
 	 */
@@ -2411,7 +2403,7 @@ export interface CloudintegrationtypesAccountDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	createdAt?: Date;
+	createdAt?: string;
 	/**
 	 * @type string
 	 */
@@ -2432,12 +2424,12 @@ export interface CloudintegrationtypesAccountDTO {
 	 * @type string,null
 	 * @format date-time
 	 */
-	removedAt: Date | null;
+	removedAt: string | null;
 	/**
 	 * @type string
 	 * @format date-time
 	 */
-	updatedAt?: Date;
+	updatedAt?: string;
 }

 export interface DashboardtypesStorableDashboardDataDTO {
@@ -2568,7 +2560,7 @@ export type CloudintegrationtypesCloudIntegrationServiceDTOAnyOf = {
 	 * @type string
 	 * @format date-time
 	 */
-	createdAt?: Date;
+	createdAt?: string;
 	/**
 	 * @type string
 	 */
@@ -2578,7 +2570,7 @@ export type CloudintegrationtypesCloudIntegrationServiceDTOAnyOf = {
 	 * @type string
 	 * @format date-time
 	 */
-	updatedAt?: Date;
+	updatedAt?: string;
 };

 /**
@@ -2772,12 +2764,12 @@ export interface CloudintegrationtypesGettableAgentCheckInDTO {
 	 * @type string,null
 	 * @format date-time
 	 */
-	removed_at: Date | null;
+	removed_at: string | null;
 	/**
 	 * @type string,null
 	 * @format date-time
 	 */
-	removedAt: Date | null;
+	removedAt: string | null;
 }

 export interface CloudintegrationtypesServiceMetadataDTO {
@@ -3007,12 +2999,17 @@ export interface CoretypesPatchableObjectsDTO {
 	deletions: CoretypesObjectGroupDTO[] | null;
 }

+export enum DashboardtypesSourceDTO {
+	user = 'user',
+	system = 'system',
+	integration = 'integration',
+}
 export interface DashboardtypesDashboardDTO {
 	/**
 	 * @type string
 	 * @format date-time
 	 */
-	createdAt?: Date;
+	createdAt?: string;
 	/**
 	 * @type string
 	 */
@@ -3030,11 +3027,12 @@ export interface DashboardtypesDashboardDTO {
 	 * @type string
 	 */
 	org_id?: string;
+	source?: DashboardtypesSourceDTO;
 	/**
 	 * @type string
 	 * @format date-time
 	 */
-	updatedAt?: Date;
+	updatedAt?: string;
 	/**
 	 * @type string
 	 */
@@ -3216,7 +3214,7 @@ export interface GatewaytypesLimitDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	created_at?: Date;
+	created_at?: string;
 	/**
 	 * @type string
 	 */
@@ -3238,7 +3236,7 @@ export interface GatewaytypesLimitDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	updated_at?: Date;
+	updated_at?: string;
 }

 export interface GatewaytypesIngestionKeyDTO {
@@ -3246,12 +3244,12 @@ export interface GatewaytypesIngestionKeyDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	created_at?: Date;
+	created_at?: string;
 	/**
 	 * @type string
 	 * @format date-time
 	 */
-	expires_at?: Date;
+	expires_at?: string;
 	/**
 	 * @type string
 	 */
@@ -3272,7 +3270,7 @@ export interface GatewaytypesIngestionKeyDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	updated_at?: Date;
+	updated_at?: string;
 	/**
 	 * @type string
 	 */
@@ -3296,7 +3294,7 @@ export interface GatewaytypesPostableIngestionKeyDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	expires_at?: Date;
+	expires_at?: string;
 	/**
 	 * @type string
 	 */
@@ -4566,7 +4564,7 @@ export interface LlmpricingruletypesLLMPricingRuleDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	createdAt?: Date;
+	createdAt?: string;
 	/**
 	 * @type string
 	 */
@@ -4605,13 +4603,13 @@ export interface LlmpricingruletypesLLMPricingRuleDTO {
 	 * @type string,null
 	 * @format date-time
 	 */
-	syncedAt?: Date | null;
+	syncedAt?: string | null;
 	unit: LlmpricingruletypesLLMPricingRuleUnitDTO;
 	/**
 	 * @type string
 	 * @format date-time
 	 */
-	updatedAt?: Date;
+	updatedAt?: string;
 	/**
 	 * @type string
 	 */
@@ -5837,7 +5835,7 @@ export interface Querybuildertypesv5RawRowDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	timestamp?: Date;
+	timestamp?: string;
 }

 export interface Querybuildertypesv5RawDataDTO {
@@ -6414,7 +6412,7 @@ export interface RuletypesRuleDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	createdAt?: Date;
+	createdAt?: string;
 	/**
 	 * @type string
 	 */
@@ -6463,7 +6461,7 @@ export interface RuletypesRuleDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	updatedAt?: Date;
+	updatedAt?: string;
 	/**
 	 * @type string
 	 */
@@ -6482,7 +6480,7 @@ export interface ServiceaccounttypesGettableFactorAPIKeyDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	createdAt?: Date;
+	createdAt?: string;
 	/**
 	 * @type integer
 	 * @minimum 0
@@ -6496,7 +6494,7 @@ export interface ServiceaccounttypesGettableFactorAPIKeyDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	lastObservedAt: Date;
+	lastObservedAt: string;
 	/**
 	 * @type string
 	 */
@@ -6509,7 +6507,7 @@ export interface ServiceaccounttypesGettableFactorAPIKeyDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	updatedAt?: Date;
+	updatedAt?: string;
 }

 export interface ServiceaccounttypesGettableFactorAPIKeyWithKeyDTO {
@@ -6554,7 +6552,7 @@ export interface ServiceaccounttypesServiceAccountDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	createdAt?: Date;
+	createdAt?: string;
 	/**
 	 * @type string
 	 */
@@ -6579,7 +6577,7 @@ export interface ServiceaccounttypesServiceAccountDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	updatedAt?: Date;
+	updatedAt?: string;
 }

 export interface ServiceaccounttypesServiceAccountRoleDTO {
@@ -6587,7 +6585,7 @@ export interface ServiceaccounttypesServiceAccountRoleDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	createdAt?: Date;
+	createdAt?: string;
 	/**
 	 * @type string
 	 */
@@ -6605,7 +6603,7 @@ export interface ServiceaccounttypesServiceAccountRoleDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	updatedAt?: Date;
+	updatedAt?: string;
 }

 export interface ServiceaccounttypesServiceAccountWithRolesDTO {
@@ -6613,7 +6611,7 @@ export interface ServiceaccounttypesServiceAccountWithRolesDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	createdAt?: Date;
+	createdAt?: string;
 	/**
 	 * @type string
 	 */
@@ -6642,7 +6640,7 @@ export interface ServiceaccounttypesServiceAccountWithRolesDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	updatedAt?: Date;
+	updatedAt?: string;
 }

 export interface ServiceaccounttypesUpdatableFactorAPIKeyDTO {
@@ -6684,7 +6682,7 @@ export interface SpantypesSpanMapperGroupDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	createdAt?: Date;
+	createdAt?: string;
 	/**
 	 * @type string
 	 */
@@ -6709,7 +6707,7 @@ export interface SpantypesSpanMapperGroupDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	updatedAt?: Date;
+	updatedAt?: string;
 	/**
 	 * @type string
 	 */
@@ -6778,7 +6776,7 @@ export interface SpantypesSpanMapperDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	createdAt?: Date;
+	createdAt?: string;
 	/**
 	 * @type string
 	 */
@@ -6804,7 +6802,7 @@ export interface SpantypesSpanMapperDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	updatedAt?: Date;
+	updatedAt?: string;
 	/**
 	 * @type string
 	 */
@@ -7171,7 +7169,7 @@ export interface TypesDeprecatedUserDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	createdAt?: Date;
+	createdAt?: string;
 	/**
 	 * @type string
 	 */
@@ -7204,7 +7202,7 @@ export interface TypesDeprecatedUserDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	updatedAt?: Date;
+	updatedAt?: string;
 }

 export interface TypesIdentifiableDTO {
@@ -7219,7 +7217,7 @@ export interface TypesInviteDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	createdAt?: Date;
+	createdAt?: string;
 	/**
 	 * @type string
 	 */
@@ -7252,7 +7250,7 @@ export interface TypesInviteDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	updatedAt?: Date;
+	updatedAt?: string;
 }

 export interface TypesOrganizationDTO {
@@ -7264,7 +7262,7 @@ export interface TypesOrganizationDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	createdAt?: Date;
+	createdAt?: string;
 	/**
 	 * @type string
 	 */
@@ -7286,7 +7284,7 @@ export interface TypesOrganizationDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	updatedAt?: Date;
+	updatedAt?: string;
 }

 export interface TypesPostableInviteDTO {
@@ -7353,7 +7351,7 @@ export interface TypesResetPasswordTokenDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	expiresAt?: Date;
+	expiresAt?: string;
 	/**
 	 * @type string
 	 */
@@ -7380,7 +7378,7 @@ export interface TypesUserDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	createdAt?: Date;
+	createdAt?: string;
 	/**
 	 * @type string
 	 */
@@ -7409,7 +7407,7 @@ export interface TypesUserDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	updatedAt?: Date;
+	updatedAt?: string;
 }

 export interface ZeustypesHostDTO {
--- a/frontend/src/components/EditMemberDrawer/EditMemberDrawer.tsx
+++ b/frontend/src/components/EditMemberDrawer/EditMemberDrawer.tsx
@@ -59,7 +59,7 @@ function getDeleteTooltip(

 function getInviteButtonLabel(
 	isLoading: boolean,
-	existingToken: { expiresAt?: Date } | undefined,
+	existingToken: { expiresAt?: string } | undefined,
 	isExpired: boolean,
 	notFound: boolean,
 ): string {
--- a/frontend/src/pages/TraceDetailsV3/components/FieldsSettings/AddedFields.tsx
+++ b/frontend/src/pages/TraceDetailsV3/components/FieldsSettings/AddedFields.tsx
@@ -18,21 +18,22 @@ import { Button } from '@signozhq/ui/button';
 import cx from 'classnames';
 import OverlayScrollbar from 'components/OverlayScrollbar/OverlayScrollbar';
 import { GripVertical } from '@signozhq/icons';
-import { BaseAutocompleteData } from 'types/api/queryBuilder/queryAutocompleteResponse';
+import { TelemetryFieldKey } from 'types/api/v5/queryRange';
+import { Typography } from '@signozhq/ui/typography';

-import styles from './FieldsSettings.module.scss';
+import styles from './FieldsSelector.module.scss';

 function SortableField({
 	field,
 	onRemove,
 	allowDrag,
 }: {
-	field: BaseAutocompleteData;
-	onRemove: (field: BaseAutocompleteData) => void;
+	field: TelemetryFieldKey;
+	onRemove: (field: TelemetryFieldKey) => void;
 	allowDrag: boolean;
 }): JSX.Element {
 	const { attributes, listeners, setNodeRef, transform, transition } =
-		useSortable({ id: field.key });
+		useSortable({ id: field.name });

 	const style = {
 		transform: CSS.Transform.toString(transform),
@@ -50,7 +51,7 @@ function SortableField({
 		>
 			<div {...attributes} {...listeners} className={styles.dragHandle}>
 				{allowDrag && <GripVertical size={14} />}
-				<span className={styles.fieldKey}>{field.key}</span>
+				<span className={styles.fieldKey}>{field.name}</span>
 			</div>
 			<Button
 				className={cx(styles.removeBtn, 'periscope-btn')}
@@ -67,41 +68,52 @@ function SortableField({

 interface AddedFieldsProps {
 	inputValue: string;
-	fields: BaseAutocompleteData[];
-	onFieldsChange: (fields: BaseAutocompleteData[]) => void;
+	fields: TelemetryFieldKey[];
+	onFieldsChange: (fields: TelemetryFieldKey[]) => void;
+	maxFields?: number;
 }

 function AddedFields({
 	inputValue,
 	fields,
 	onFieldsChange,
+	maxFields,
 }: AddedFieldsProps): JSX.Element {
 	const sensors = useSensors(useSensor(PointerSensor));

 	const handleDragEnd = (event: DragEndEvent): void => {
 		const { active, over } = event;
 		if (over && active.id !== over.id) {
-			const oldIndex = fields.findIndex((f) => f.key === active.id);
-			const newIndex = fields.findIndex((f) => f.key === over.id);
+			const oldIndex = fields.findIndex((f) => f.name === active.id);
+			const newIndex = fields.findIndex((f) => f.name === over.id);
 			onFieldsChange(arrayMove(fields, oldIndex, newIndex));
 		}
 	};

 	const filteredFields = useMemo(
 		() =>
-			fields.filter((f) => f.key.toLowerCase().includes(inputValue.toLowerCase())),
+			fields.filter((f) =>
+				f.name.toLowerCase().includes(inputValue.toLowerCase()),
+			),
 		[fields, inputValue],
 	);

-	const handleRemove = (field: BaseAutocompleteData): void => {
-		onFieldsChange(fields.filter((f) => f.key !== field.key));
+	const handleRemove = (field: TelemetryFieldKey): void => {
+		onFieldsChange(fields.filter((f) => f.name !== field.name));
 	};

 	const allowDrag = inputValue.length === 0;

 	return (
 		<div className={cx(styles.section, styles.sectionAdded)}>
-			<div className={styles.sectionHeader}>ADDED FIELDS</div>
+			<div className={styles.sectionHeader}>
+				<span>ADDED FIELDS</span>
+				{maxFields !== undefined && (
+					<Typography.Text size="sm" weight="medium" color="muted">
+						Max Allowed: {maxFields}
+					</Typography.Text>
+				)}
+			</div>
 			<div className={styles.addedList}>
 				<OverlayScrollbar>
 					<DndContext
@@ -113,13 +125,13 @@ function AddedFields({
 							<div className={styles.noValues}>No values found</div>
 						) : (
 							<SortableContext
-								items={fields.map((f) => f.key)}
+								items={fields.map((f) => f.name)}
 								strategy={verticalListSortingStrategy}
 								disabled={!allowDrag}
 							>
 								{filteredFields.map((field) => (
 									<SortableField
-										key={field.key}
+										key={field.name}
 										field={field}
 										onRemove={handleRemove}
 										allowDrag={allowDrag}
--- a/frontend/src/pages/TraceDetailsV3/components/FieldsSettings/FieldsSettings.module.scss
+++ b/frontend/src/pages/TraceDetailsV3/components/FieldsSettings/FieldsSettings.module.scss
@@ -56,12 +56,14 @@
 }

 .sectionHeader {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	gap: 8px;
 	color: var(--muted-foreground);
 	font-size: 11px;
 	font-weight: 500;
 	line-height: 18px;
-	letter-spacing: 0.88px;
-	text-transform: uppercase;
 	padding: 8px 12px;
 }

@@ -89,13 +91,6 @@
 	font-size: 12px;
 }

-.limitHint {
-	padding: 8px 12px;
-	text-align: center;
-	color: var(--muted-foreground);
-	font-size: 11px;
-}
-
 .fieldItem {
 	display: flex;
 	align-items: center;
--- a/frontend/src/components/FieldsSelector/FieldsSelector.tsx
+++ b/frontend/src/components/FieldsSelector/FieldsSelector.tsx
@@ -0,0 +1,176 @@
+import { useCallback, useMemo, useState } from 'react';
+import { toast } from '@signozhq/ui/sonner';
+import { Button } from '@signozhq/ui/button';
+import { Input } from '@signozhq/ui/input';
+import useDebouncedFn from 'hooks/useDebouncedFunction';
+import { Check, TableColumnsSplit, X } from '@signozhq/icons';
+import { FloatingPanel } from 'periscope/components/FloatingPanel';
+import { TelemetryFieldKey } from 'types/api/v5/queryRange';
+import { DataSource } from 'types/common/queryBuilder';
+
+import AddedFields from './AddedFields';
+import OtherFields from './OtherFields';
+
+import styles from './FieldsSelector.module.scss';
+
+const DEFAULT_PANEL_WIDTH = 350;
+const DEFAULT_PANEL_HEIGHT_OFFSET = 100;
+const DEFAULT_PANEL_RIGHT_INSET = 100;
+const DEFAULT_PANEL_TOP_INSET = 50;
+
+interface FieldsSelectorProps {
+	isOpen: boolean;
+	title: string;
+	fields: TelemetryFieldKey[];
+	onFieldsChange: (fields: TelemetryFieldKey[]) => void;
+	onClose: () => void;
+	signal: DataSource;
+	maxFields?: number;
+	width?: number;
+	height?: number;
+	defaultPosition?: { x: number; y: number };
+}
+
+function FieldsSelector({
+	isOpen,
+	title,
+	fields,
+	onFieldsChange,
+	onClose,
+	signal,
+	maxFields,
+	width = DEFAULT_PANEL_WIDTH,
+	height,
+	defaultPosition,
+}: FieldsSelectorProps): JSX.Element | null {
+	if (!isOpen) {
+		return null;
+	}
+
+	const resolvedHeight =
+		height ?? window.innerHeight - DEFAULT_PANEL_HEIGHT_OFFSET;
+	const resolvedPosition = defaultPosition ?? {
+		x: window.innerWidth - width - DEFAULT_PANEL_RIGHT_INSET,
+		y: DEFAULT_PANEL_TOP_INSET,
+	};
+	const [draftFields, setDraftFields] = useState<TelemetryFieldKey[]>(fields);
+	const [inputValue, setInputValue] = useState('');
+	const [debouncedInputValue, setDebouncedInputValue] = useState('');
+
+	const debouncedUpdate = useDebouncedFn((value) => {
+		setDebouncedInputValue(value as string);
+	}, 400);
+
+	const handleInputChange = useCallback(
+		(e: React.ChangeEvent<HTMLInputElement>): void => {
+			const value = e.target.value.trim().toLowerCase();
+			setInputValue(value);
+			debouncedUpdate(value);
+		},
+		[debouncedUpdate],
+	);
+
+	const handleAdd = useCallback(
+		(field: TelemetryFieldKey): void => {
+			if (maxFields !== undefined && draftFields.length >= maxFields) {
+				return;
+			}
+			if (draftFields.some((f) => f.name === field.name)) {
+				return;
+			}
+			setDraftFields((prev) => [...prev, field]);
+		},
+		[draftFields, maxFields],
+	);
+
+	const handleSave = useCallback((): void => {
+		onFieldsChange(draftFields);
+		toast.success('Saved successfully', {
+			position: 'top-right',
+		});
+		onClose();
+	}, [draftFields, onFieldsChange, onClose]);
+
+	const handleDiscard = useCallback((): void => {
+		setDraftFields(fields);
+	}, [fields]);
+
+	const hasUnsavedChanges = useMemo(
+		() =>
+			!(
+				draftFields.length === fields.length &&
+				draftFields.every((f, i) => f.name === fields[i]?.name)
+			),
+		[draftFields, fields],
+	);
+
+	const isAtLimit = maxFields !== undefined && draftFields.length >= maxFields;
+
+	return (
+		<FloatingPanel
+			isOpen
+			width={width}
+			height={resolvedHeight}
+			defaultPosition={resolvedPosition}
+			enableResizing={false}
+		>
+			<div className={styles.root}>
+				<div className={styles.header}>
+					<div className={styles.title}>
+						<TableColumnsSplit size={16} />
+						{title}
+					</div>
+					<X className={styles.closeIcon} size={16} onClick={onClose} />
+				</div>
+
+				<section>
+					<Input
+						className={styles.searchInput}
+						type="text"
+						value={inputValue}
+						placeholder="Search for a field..."
+						onChange={handleInputChange}
+					/>
+				</section>
+
+				<AddedFields
+					inputValue={inputValue}
+					fields={draftFields}
+					onFieldsChange={setDraftFields}
+					maxFields={maxFields}
+				/>
+
+				<OtherFields
+					signal={signal}
+					debouncedInputValue={debouncedInputValue}
+					addedFields={draftFields}
+					onAdd={handleAdd}
+					isAtLimit={isAtLimit}
+				/>
+
+				{hasUnsavedChanges && (
+					<div className={styles.footer}>
+						<Button
+							variant="outlined"
+							color="secondary"
+							onClick={handleDiscard}
+							prefix={<X width={14} height={14} />}
+						>
+							Discard
+						</Button>
+						<Button
+							variant="solid"
+							color="primary"
+							onClick={handleSave}
+							prefix={<Check width={14} height={14} />}
+						>
+							Save changes
+						</Button>
+					</div>
+				)}
+			</div>
+		</FloatingPanel>
+	);
+}
+
+export default FieldsSelector;
--- a/frontend/src/pages/TraceDetailsV3/components/FieldsSettings/OtherFields.tsx
+++ b/frontend/src/pages/TraceDetailsV3/components/FieldsSettings/OtherFields.tsx
@@ -4,51 +4,58 @@ import { Skeleton } from 'antd';
 import cx from 'classnames';
 import OverlayScrollbar from 'components/OverlayScrollbar/OverlayScrollbar';
 import { REACT_QUERY_KEY } from 'constants/reactQueryKeys';
-import { useGetAggregateKeys } from 'hooks/queryBuilder/useGetAggregateKeys';
-import { BaseAutocompleteData } from 'types/api/queryBuilder/queryAutocompleteResponse';
+import { useGetQueryKeySuggestions } from 'hooks/querySuggestions/useGetQueryKeySuggestions';
+import {
+	FieldContext,
+	FieldDataType,
+	SignalType,
+	TelemetryFieldKey,
+} from 'types/api/v5/queryRange';
 import { DataSource } from 'types/common/queryBuilder';

-import styles from './FieldsSettings.module.scss';
+import styles from './FieldsSelector.module.scss';

 interface OtherFieldsProps {
-	dataSource: DataSource;
+	signal: DataSource;
 	debouncedInputValue: string;
-	addedFields: BaseAutocompleteData[];
-	onAdd: (field: BaseAutocompleteData) => void;
+	addedFields: TelemetryFieldKey[];
+	onAdd: (field: TelemetryFieldKey) => void;
 	isAtLimit: boolean;
 }

 function OtherFields({
-	dataSource,
+	signal,
 	debouncedInputValue,
 	addedFields,
 	onAdd,
 	isAtLimit,
 }: OtherFieldsProps): JSX.Element {
-	// API call to get available attribute keys
-	const { data, isFetching } = useGetAggregateKeys(
+	const { data, isFetching } = useGetQueryKeySuggestions(
 		{
+			signal,
 			searchText: debouncedInputValue,
-			dataSource,
-			aggregateOperator: 'noop',
-			aggregateAttribute: '',
-			tagType: '',
 		},
 		{
 			queryKey: [
-				REACT_QUERY_KEY.GET_OTHER_FILTERS,
-				'preview-fields',
+				REACT_QUERY_KEY.GET_FIELDS_SELECTOR_SUGGESTIONS,
+				signal,
 				debouncedInputValue,
 			],
 			enabled: true,
 		},
 	);

-	// Filter out already-added fields, match on .key from API response objects
-	const otherFields = useMemo(() => {
-		const attributes = data?.payload?.attributeKeys || [];
-		const addedKeys = new Set(addedFields.map((f) => f.key));
-		return attributes.filter((attr) => !addedKeys.has(attr.key));
+	const otherFields: TelemetryFieldKey[] = useMemo(() => {
+		const suggestions = Object.values(data?.data.data.keys || {}).flat();
+		const addedNames = new Set(addedFields.map((f) => f.name));
+		return suggestions
+			.filter((attr) => !addedNames.has(attr.name))
+			.map((attr) => ({
+				...attr,
+				signal: attr.signal as SignalType,
+				fieldContext: attr.fieldContext as FieldContext,
+				fieldDataType: attr.fieldDataType as FieldDataType,
+			}));
 	}, [data, addedFields]);

 	if (isFetching) {
@@ -76,10 +83,10 @@ function OtherFields({
 						) : (
 							otherFields.map((attr) => (
 								<div
-									key={attr.key}
+									key={attr.name}
 									className={cx(styles.fieldItem, styles.otherFieldItem)}
 								>
-									<span className={styles.fieldKey}>{attr.key}</span>
+									<span className={styles.fieldKey}>{attr.name}</span>
 									{!isAtLimit && (
 										<Button
 											className={cx(styles.addBtn, 'periscope-btn')}
@@ -94,7 +101,6 @@ function OtherFields({
 								</div>
 							))
 						)}
-						{isAtLimit && <div className={styles.limitHint}>Maximum 10 fields</div>}
 					</>
 				</OverlayScrollbar>
 			</div>
--- a/frontend/src/components/FieldsSelector/index.ts
+++ b/frontend/src/components/FieldsSelector/index.ts
@@ -0,0 +1 @@
+export { default } from './FieldsSelector';
--- a/frontend/src/components/HeaderRightSection/HeaderRightSection.tsx
+++ b/frontend/src/components/HeaderRightSection/HeaderRightSection.tsx
@@ -5,6 +5,8 @@ import { Button } from '@signozhq/ui/button';
 import { TooltipSimple } from '@signozhq/ui/tooltip';
 import { Popover } from 'antd';
 import logEvent from 'api/common/logEvent';
+import { AIAssistantEvents } from 'container/AIAssistant/events';
+import { normalizePage } from 'container/AIAssistant/hooks/useAIAssistantAnalyticsContext';
 import {
 	openAIAssistant,
 	useAIAssistantStore,
@@ -50,6 +52,14 @@ function HeaderRightSection({
 		setOpenAnnouncementsModal(false);
 	}, [location.pathname]);

+	const handleOpenAIAssistant = useCallback((): void => {
+		void logEvent(AIAssistantEvents.Opened, {
+			source: 'header',
+			currentPage: normalizePage(location.pathname),
+		});
+		openAIAssistant();
+	}, [location.pathname]);
+
 	const handleOpenShareURLModal = useCallback((): void => {
 		logEvent('Share: Clicked', {
 			page: location.pathname,
@@ -101,7 +111,7 @@ function HeaderRightSection({
 						<Button
 							variant="solid"
 							color="secondary"
-							onClick={openAIAssistant}
+							onClick={handleOpenAIAssistant}
 							aria-label={
 								showHeaderPendingBadge
 									? pendingUserInputCount === 1
--- a/frontend/src/components/ServiceAccountDrawer/tests/EditKeyModal.test.tsx
+++ b/frontend/src/components/ServiceAccountDrawer/tests/EditKeyModal.test.tsx
@@ -28,7 +28,7 @@ const mockKey: ServiceaccounttypesGettableFactorAPIKeyDTO = {
 	id: 'key-1',
 	name: 'Original Key Name',
 	expiresAt: 0,
-	lastObservedAt: null as unknown as Date,
+	lastObservedAt: null as unknown as string,
 	serviceAccountId: 'sa-1',
 };

--- a/frontend/src/components/ServiceAccountDrawer/tests/KeysTab.test.tsx
+++ b/frontend/src/components/ServiceAccountDrawer/tests/KeysTab.test.tsx
@@ -29,14 +29,14 @@ const keys: ServiceaccounttypesGettableFactorAPIKeyDTO[] = [
 		id: 'key-1',
 		name: 'Production Key',
 		expiresAt: 0,
-		lastObservedAt: null as unknown as Date,
+		lastObservedAt: null as unknown as string,
 		serviceAccountId: 'sa-1',
 	},
 	{
 		id: 'key-2',
 		name: 'Staging Key',
 		expiresAt: 1924905600, // 2030-12-31
-		lastObservedAt: new Date('2026-03-10T10:00:00Z'),
+		lastObservedAt: '2026-03-10T10:00:00Z',
 		serviceAccountId: 'sa-1',
 	},
 ];
--- a/frontend/src/constants/reactQueryKeys.ts
+++ b/frontend/src/constants/reactQueryKeys.ts
@@ -108,4 +108,7 @@ export const REACT_QUERY_KEY = {

 	// Dashboard Grid Card Query Keys
 	DASHBOARD_GRID_CARD_QUERY_RANGE: 'DASHBOARD_GRID_CARD_QUERY_RANGE',
+
+	// Fields Selector Query Keys
+	GET_FIELDS_SELECTOR_SUGGESTIONS: 'GET_FIELDS_SELECTOR_SUGGESTIONS',
 } as const;
--- a/frontend/src/container/AIAssistant/AIAssistantModal/AIAssistantModal.tsx
+++ b/frontend/src/container/AIAssistant/AIAssistantModal/AIAssistantModal.tsx
@@ -1,13 +1,20 @@
 import { useCallback, useEffect, useState } from 'react';
 import { createPortal } from 'react-dom';
-import { useHistory } from 'react-router-dom';
+import { useHistory, useLocation } from 'react-router-dom';
 import { Button } from '@signozhq/ui/button';
 import { TooltipSimple } from '@signozhq/ui/tooltip';
 import ROUTES from 'constants/routes';
 import { History, Maximize2, Minus, Plus, Sparkles, X } from '@signozhq/icons';

+import logEvent from 'api/common/logEvent';
+
 import HistorySidebar from '../components/ConversationsList';
 import ConversationView from '../ConversationView';
+import { AIAssistantEvents } from '../events';
+import {
+	normalizePage,
+	useAIAssistantAnalyticsContext,
+} from '../hooks/useAIAssistantAnalyticsContext';
 import { useAIAssistantStore } from '../store/useAIAssistantStore';
 import { VariantContext } from '../VariantContext';

@@ -24,6 +31,7 @@ import styles from './AIAssistantModal.module.scss';
 // eslint-disable-next-line sonarjs/cognitive-complexity
 export default function AIAssistantModal(): JSX.Element | null {
 	const history = useHistory();
+	const { pathname } = useLocation();
 	const [showHistory, setShowHistory] = useState(false);

 	const isOpen = useAIAssistantStore((s) => s.isModalOpen);
@@ -36,6 +44,7 @@ export default function AIAssistantModal(): JSX.Element | null {
 	const startNewConversation = useAIAssistantStore(
 		(s) => s.startNewConversation,
 	);
+	const analyticsCtx = useAIAssistantAnalyticsContext();

 	useEffect(() => {
 		const handleKeyDown = (e: KeyboardEvent): void => {
@@ -55,6 +64,10 @@ export default function AIAssistantModal(): JSX.Element | null {
 				} else {
 					startNewConversation();
 					setShowHistory(false);
+					void logEvent(AIAssistantEvents.Opened, {
+						source: 'shortcut',
+						currentPage: normalizePage(pathname),
+					});
 					openModal();
 				}
 				return;
@@ -68,7 +81,7 @@ export default function AIAssistantModal(): JSX.Element | null {

 		window.addEventListener('keydown', handleKeyDown);
 		return (): void => window.removeEventListener('keydown', handleKeyDown);
-	}, [isOpen, openModal, closeModal, startNewConversation]);
+	}, [isOpen, openModal, closeModal, startNewConversation, pathname]);

 	// ── Handlers ────────────────────────────────────────────────────────────────

@@ -77,15 +90,28 @@ export default function AIAssistantModal(): JSX.Element | null {
 			return;
 		}
 		closeModal();
+		// Router state tells AIAssistantPage to skip its mount-time Opened fire:
+		// the assistant was already open in the modal, so this is a surface
+		// switch, not a new open.
 		history.push(
 			ROUTES.AI_ASSISTANT.replace(':conversationId', activeConversationId),
+			{ fromInApp: true },
 		);
 	}, [activeConversationId, closeModal, history]);

 	const handleNew = useCallback(() => {
+		void logEvent(AIAssistantEvents.NewChatClicked, {
+			...analyticsCtx,
+			// useAIAssistantAnalyticsContext() runs above this component's
+			// VariantContext.Provider, so the hook reports the default 'page'
+			// mode. Override here: the modal collapses to 'sidepane' in our
+			// taxonomy alongside the drawer.
+			mode: 'sidepane',
+			source: 'header',
+		});
 		startNewConversation();
 		setShowHistory(false);
-	}, [startNewConversation]);
+	}, [startNewConversation, analyticsCtx]);

 	const handleHistorySelect = useCallback(() => {
 		setShowHistory(false);
--- a/frontend/src/container/AIAssistant/AIAssistantPanel/AIAssistantPanel.tsx
+++ b/frontend/src/container/AIAssistant/AIAssistantPanel/AIAssistantPanel.tsx
@@ -5,8 +5,12 @@ import { TooltipSimple } from '@signozhq/ui/tooltip';
 import ROUTES from 'constants/routes';
 import { History, Maximize2, Plus, Sparkles, X } from '@signozhq/icons';

+import logEvent from 'api/common/logEvent';
+
 import ConversationsList from '../components/ConversationsList';
 import ConversationView from '../ConversationView';
+import { AIAssistantEvents } from '../events';
+import { useAIAssistantAnalyticsContext } from '../hooks/useAIAssistantAnalyticsContext';
 import { useAIAssistantStore } from '../store/useAIAssistantStore';
 import { VariantContext } from '../VariantContext';

@@ -32,21 +36,35 @@ export default function AIAssistantPanel(): JSX.Element | null {
 	const startNewConversation = useAIAssistantStore(
 		(s) => s.startNewConversation,
 	);
+	const analyticsCtx = useAIAssistantAnalyticsContext();

 	const handleExpand = useCallback(() => {
 		if (!activeConversationId) {
 			return;
 		}
 		closeDrawer();
+		// Router state tells AIAssistantPage to skip its mount-time Opened fire:
+		// the assistant was already open in the drawer, so this is a surface
+		// switch, not a new open.
 		history.push(
 			ROUTES.AI_ASSISTANT.replace(':conversationId', activeConversationId),
+			{ fromInApp: true },
 		);
 	}, [activeConversationId, closeDrawer, history]);

 	const handleNew = useCallback(() => {
+		void logEvent(AIAssistantEvents.NewChatClicked, {
+			...analyticsCtx,
+			// useAIAssistantAnalyticsContext() runs above this component's
+			// VariantContext.Provider, so the hook reports the default 'page'
+			// mode. Override here: this handler only runs when the drawer
+			// itself is mounted, which is unambiguously the sidepane surface.
+			mode: 'sidepane',
+			source: 'header',
+		});
 		startNewConversation();
 		setShowHistory(false);
-	}, [startNewConversation]);
+	}, [startNewConversation, analyticsCtx]);

 	// When user picks a conversation from the list, close the sidebar
 	const handleHistorySelect = useCallback(() => {
--- a/frontend/src/container/AIAssistant/AIAssistantTrigger/AIAssistantTrigger.tsx
+++ b/frontend/src/container/AIAssistant/AIAssistantTrigger/AIAssistantTrigger.tsx
@@ -1,9 +1,13 @@
+import { useCallback } from 'react';
 import { matchPath, useLocation } from 'react-router-dom';
 import { Button } from '@signozhq/ui/button';
 import { TooltipSimple } from '@signozhq/ui/tooltip';
+import logEvent from 'api/common/logEvent';
 import ROUTES from 'constants/routes';
 import { Bot } from '@signozhq/icons';

+import { AIAssistantEvents } from '../events';
+import { normalizePage } from '../hooks/useAIAssistantAnalyticsContext';
 import {
 	openAIAssistant,
 	useAIAssistantStore,
@@ -25,6 +29,14 @@ export default function AIAssistantTrigger(): JSX.Element | null {
 		exact: true,
 	});

+	const handleOpen = useCallback((): void => {
+		void logEvent(AIAssistantEvents.Opened, {
+			source: 'icon',
+			currentPage: normalizePage(pathname),
+		});
+		openAIAssistant();
+	}, [pathname]);
+
 	if (isDrawerOpen || isModalOpen || isFullScreenPage) {
 		return null;
 	}
@@ -35,7 +47,7 @@ export default function AIAssistantTrigger(): JSX.Element | null {
 				variant="solid"
 				color="primary"
 				className={styles.trigger}
-				onClick={openAIAssistant}
+				onClick={handleOpen}
 				aria-label="Open AI Assistant"
 			>
 				<Bot size={20} />
--- a/frontend/src/container/AIAssistant/ConversationView/ConversationView.tsx
+++ b/frontend/src/container/AIAssistant/ConversationView/ConversationView.tsx
@@ -1,11 +1,15 @@
-import { useCallback, useEffect, useMemo, useState } from 'react';
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { useLocation } from 'react-router-dom';
 import cx from 'classnames';

+import logEvent from 'api/common/logEvent';
+
 import ChatInput, { autoContextKey } from '../components/ChatInput';
 import ConversationSkeleton from '../components/ConversationSkeleton';
 import VirtualizedMessages from '../components/VirtualizedMessages';
+import { AIAssistantEvents } from '../events';
 import { getAutoContexts } from '../getAutoContexts';
+import { useAIAssistantAnalyticsContext } from '../hooks/useAIAssistantAnalyticsContext';
 import { useAIAssistantStore } from '../store/useAIAssistantStore';
 import { MessageAttachment } from '../types';
 import { MessageContext } from '../../../api/ai-assistant/chat';
@@ -39,6 +43,7 @@ export default function ConversationView({
 	);
 	const sendMessage = useAIAssistantStore((s) => s.sendMessage);
 	const cancelStream = useAIAssistantStore((s) => s.cancelStream);
+	const analyticsCtx = useAIAssistantAnalyticsContext(conversationId);

 	// Auto-derived contexts come from the route the user is currently looking
 	// at (dashboard detail, service metrics, an explorer, …). Skip when the
@@ -82,14 +87,50 @@ export default function ConversationView({
 			attachments?: MessageAttachment[],
 			contexts?: MessageContext[],
 		) => {
+			const hasAuto = contexts?.some((c) => c.source === 'auto') ?? false;
+			const hasManual = contexts?.some((c) => c.source === 'mention') ?? false;
+			let contextType: 'manual' | 'auto' | 'both' | undefined;
+			if (hasAuto && hasManual) {
+				contextType = 'both';
+			} else if (hasAuto) {
+				contextType = 'auto';
+			} else if (hasManual) {
+				contextType = 'manual';
+			}
+			void logEvent(AIAssistantEvents.MessageSent, {
+				...analyticsCtx,
+				queryLength: text.length,
+				hasContext: hasAuto || hasManual,
+				contextType,
+				respondingToClarification: Boolean(pendingClarificationHere),
+			});
 			void sendMessage(text, attachments, contexts);
 		},
-		[sendMessage],
+		[sendMessage, analyticsCtx, pendingClarificationHere],
 	);

+	// Wall-clock timestamp of the current streaming start, used to compute
+	// `secondsSinceStart` on Cancel clicked. Cleared whenever streaming ends.
+	const streamStartedAtRef = useRef<number | null>(null);
+	useEffect(() => {
+		if (!isStreamingHere) {
+			streamStartedAtRef.current = null;
+			return;
+		}
+		if (streamStartedAtRef.current === null) {
+			streamStartedAtRef.current = Date.now();
+		}
+	}, [isStreamingHere]);
+
 	const handleCancel = useCallback(() => {
+		const startedAt = streamStartedAtRef.current;
+		void logEvent(AIAssistantEvents.CancelClicked, {
+			threadId: analyticsCtx.threadId,
+			secondsSinceStart:
+				startedAt !== null ? Math.round((Date.now() - startedAt) / 1000) : null,
+		});
 		cancelStream(conversationId);
-	}, [cancelStream, conversationId]);
+	}, [cancelStream, conversationId, analyticsCtx.threadId]);

 	const messages = conversation?.messages ?? [];
 	const showDisclaimer = messages.length > 0;
@@ -134,6 +175,7 @@ export default function ConversationView({
 				conversationId={conversationId}
 				messages={messages}
 				isStreaming={isStreamingHere}
+				onSendSuggestedPrompt={(text): void => handleSend(text)}
 			/>
 			{showDisclaimer && (
 				<div className={disclaimerClass} role="note" aria-live="polite">
--- a/frontend/src/container/AIAssistant/components/ActionsSection/ActionsSection.tsx
+++ b/frontend/src/container/AIAssistant/components/ActionsSection/ActionsSection.tsx
@@ -41,12 +41,68 @@ import {
 	Undo,
 } from '@signozhq/icons';

+import logEvent from 'api/common/logEvent';
+
+import { AIAssistantEvents, SuggestedPromptCategory } from '../../events';
+import { useAIAssistantAnalyticsContext } from '../../hooks/useAIAssistantAnalyticsContext';
 import { useAIAssistantStore } from '../../store/useAIAssistantStore';

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

 interface ActionsSectionProps {
 	actions: MessageActionDTO[];
+	/** ID of the assistant message these actions belong to — used in analytics. */
+	messageId: string;
+}
+
+/**
+ * Resource-type strings the backend uses for `open_resource` and rollback
+ * actions. Centralized here so the route/module lookups below stay in sync.
+ */
+const ResourceType = {
+	dashboard: 'dashboard',
+	alert: 'alert',
+	service: 'service',
+	saved_view: 'saved_view',
+	logs_explorer: 'logs_explorer',
+	traces_explorer: 'traces_explorer',
+	metrics_explorer: 'metrics_explorer',
+} as const;
+
+/** Maps an open_resource action's resourceType to its product module name. */
+function targetModuleForResource(resourceType: string): string | null {
+	switch (resourceType) {
+		case ResourceType.dashboard:
+			return 'dashboards';
+		case ResourceType.alert:
+			return 'alerts';
+		case ResourceType.service:
+			return 'apm';
+		case ResourceType.saved_view:
+			return 'savedViews';
+		case ResourceType.logs_explorer:
+			return 'logs';
+		case ResourceType.traces_explorer:
+			return 'traces';
+		case ResourceType.metrics_explorer:
+			return 'metrics';
+		default:
+			return null;
+	}
+}
+
+/** Maps an apply_filter signal to its product module name. */
+function targetModuleForSignal(signal: ApplyFilterSignalDTO): string | null {
+	switch (signal) {
+		case ApplyFilterSignalDTO.logs:
+			return 'logs';
+		case ApplyFilterSignalDTO.traces:
+			return 'traces';
+		case ApplyFilterSignalDTO.metrics:
+			return 'metrics';
+		default:
+			return null;
+	}
 }

 type ChipState = 'idle' | 'loading' | 'success' | 'error';
@@ -94,23 +150,23 @@ function resourceRoute(
 	resourceId: string,
 ): string | null {
 	switch (resourceType) {
-		case 'dashboard':
+		case ResourceType.dashboard:
 			return ROUTES.DASHBOARD.replace(':dashboardId', resourceId);
-		case 'alert': {
+		case ResourceType.alert: {
 			const params = new URLSearchParams({ [QueryParams.ruleId]: resourceId });
 			return `${ROUTES.EDIT_ALERTS}?${params.toString()}`;
 		}
-		case 'service':
+		case ResourceType.service:
 			return ROUTES.SERVICE_METRICS.replace(':servicename', resourceId);
-		case 'saved_view':
+		case ResourceType.saved_view:
 			// No detail route — saved views land on the list page.
 			// Caller may provide signal-aware metadata in future; default to logs.
 			return ROUTES.LOGS_SAVE_VIEWS;
-		case 'logs_explorer':
+		case ResourceType.logs_explorer:
 			return ROUTES.LOGS_EXPLORER;
-		case 'traces_explorer':
+		case ResourceType.traces_explorer:
 			return ROUTES.TRACES_EXPLORER;
-		case 'metrics_explorer':
+		case ResourceType.metrics_explorer:
 			return ROUTES.METRICS_EXPLORER_EXPLORER;
 		default:
 			return null;
@@ -224,6 +280,24 @@ function actionKey(action: MessageActionDTO, index: number): string {
 		: `${action.kind}:${action.label}:${index}`;
 }

+/**
+ * Resolves the prompt to send for a follow_up action. The chip's `label` is
+ * the short display text (e.g. "Python setup"); the real prompt lives in
+ * `input.intent` per the schema doc. Falls back to label defensively so a
+ * malformed server payload doesn't drop the click silently. Both branches
+ * are trimmed so whitespace-only payloads don't become whitespace messages.
+ */
+function followUpIntent(action: MessageActionDTO): string {
+	const intent = action.input?.intent;
+	if (typeof intent === 'string') {
+		const trimmed = intent.trim();
+		if (trimmed.length > 0) {
+			return trimmed;
+		}
+	}
+	return action.label.trim();
+}
+
 /** Maps a signal to its target explorer route. */
 function explorerRouteForSignal(signal: ApplyFilterSignalDTO): string | null {
 	switch (signal) {
@@ -353,10 +427,12 @@ function rollbackCall(
 */
 export default function ActionsSection({
 	actions,
+	messageId,
 }: ActionsSectionProps): JSX.Element | null {
 	const history = useHistory();
 	const { pathname } = useLocation();
 	const sendMessage = useAIAssistantStore((s) => s.sendMessage);
+	const { threadId, page, mode } = useAIAssistantAnalyticsContext();
 	const { redirectWithQueryBuilderData, handleSetQueryData } = useQueryBuilder();

 	// Per-chip click state, keyed by chip key (see `key` below). Persists
@@ -430,13 +506,39 @@ export default function ActionsSection({
 		switch (action.kind) {
 			case MessageActionKindDTO.open_docs: {
 				if (action.url) {
+					void logEvent(AIAssistantEvents.DocOpened, {
+						threadId,
+						messageId,
+						docPath: action.url,
+					});
 					openInNewTab(action.url);
 				}
 				break;
 			}
 			case MessageActionKindDTO.follow_up: {
-				if (action.label) {
-					void sendMessage(action.label);
+				const intent = followUpIntent(action);
+				if (intent) {
+					// Fire SuggestedPromptClicked + MessageSent so analytics can compute
+					// both the click-through rate against follow-ups offered *and* keep
+					// the unified send funnel intact. `category` distinguishes server-
+					// emitted follow-ups from the empty-state grid. `promptId` stays the
+					// label so dashboards group identical chip texts together regardless
+					// of the dynamic intent payload.
+					void logEvent(AIAssistantEvents.SuggestedPromptClicked, {
+						threadId,
+						messageId,
+						promptId: action.label,
+						category: SuggestedPromptCategory.FollowUp,
+					});
+					void logEvent(AIAssistantEvents.MessageSent, {
+						threadId,
+						page,
+						mode,
+						queryLength: intent.length,
+						hasContext: false,
+						respondingToClarification: false,
+					});
+					void sendMessage(intent);
 				}
 				break;
 			}
@@ -444,6 +546,12 @@ export default function ActionsSection({
 				if (action.resourceType && action.resourceId) {
 					const path = resourceRoute(action.resourceType, action.resourceId);
 					if (path) {
+						void logEvent(AIAssistantEvents.ResourceOpened, {
+							threadId,
+							messageId,
+							targetModule: targetModuleForResource(action.resourceType),
+							resourceId: action.resourceId,
+						});
 						history.push(path);
 					}
 				}
@@ -456,6 +564,13 @@ export default function ActionsSection({
 				break;
 			}
 			case MessageActionKindDTO.apply_filter: {
+				if (action.signal) {
+					void logEvent(AIAssistantEvents.ApplyFilterClicked, {
+						threadId,
+						messageId,
+						targetModule: targetModuleForSignal(action.signal),
+					});
+				}
 				applyFilter(action, {
 					history,
 					pathname,
--- a/frontend/src/container/AIAssistant/components/ChatInput/ChatInput.tsx
+++ b/frontend/src/container/AIAssistant/components/ChatInput/ChatInput.tsx
@@ -5,13 +5,17 @@ import { Badge } from '@signozhq/ui/badge';
 import { Button } from '@signozhq/ui/button';
 import { Input } from '@signozhq/ui/input';
 import { Popover, PopoverContent, PopoverTrigger } from '@signozhq/ui/popover';
+import { toast } from '@signozhq/ui/sonner';
 import { TooltipSimple } from '@signozhq/ui/tooltip';
 import type { UploadFile } from 'antd';
+import getSessionStorage from 'api/browser/sessionstorage/get';
+import setSessionStorage from 'api/browser/sessionstorage/set';
 import {
 	getListRulesQueryKey,
 	useListRules,
 } from 'api/generated/services/rules';
 import type { ListRules200 } from 'api/generated/services/sigNoz.schemas';
+import logEvent from 'api/common/logEvent';
 import { REACT_QUERY_KEY } from 'constants/reactQueryKeys';
 import { useGetAllDashboard } from 'hooks/dashboard/useGetAllDashboard';
 import { useQueryService } from 'hooks/useQueryService';
@@ -22,6 +26,8 @@ import { useSelector } from 'react-redux';
 import { AppState } from 'store/reducers';
 import { GlobalReducer } from 'types/reducer/globalTime';

+import { AIAssistantEvents, getBrowserInfo } from '../../events';
+import { useAIAssistantAnalyticsContext } from '../../hooks/useAIAssistantAnalyticsContext';
 import { useSpeechRecognition } from '../../hooks/useSpeechRecognition';
 import { MessageAttachment } from '../../types';
 import { MessageContext } from '../../../../api/ai-assistant/chat';
@@ -137,6 +143,8 @@ function autoContextCategory(ctx: MessageContext): string {
 const MAX_INPUT_LENGTH = 20000;
 const WARNING_THRESHOLD = 15000;
 const HOME_SERVICES_INTERVAL = 30 * 60 * 1000;
+/** sessionStorage key for the "voice input failed this tab" flag. */
+const VOICE_UNAVAILABLE_KEY = 'ai-assistant-voice-unavailable';

 const CONTEXT_CATEGORIES = ['Dashboards', 'Alerts', 'Services'] as const;

@@ -368,6 +376,28 @@ export default function ChatInput({

 	// ── Voice input ────────────────────────────────────────────────────────────

+	const analyticsCtx = useAIAssistantAnalyticsContext();
+	// Captured at the start of a voice session, consumed when it ends.
+	// Tracks both the trigger (button vs. PTT shortcut) and the wall-clock
+	// start time so we can attribute `durationMs` on the Voice input used
+	// event regardless of which control ended the session.
+	const voiceStartedAtRef = useRef<number | null>(null);
+	const voiceSourceRef = useRef<'button' | 'shortcut' | null>(null);
+	// Set to true after a `network`, `not-allowed`, or `not-supported` failure
+	// so we hide the mic button for the rest of the tab session — silent
+	// retries don't help, and Chromium derivatives without the Google Speech
+	// API key always fail with `network` no matter how many times the user
+	// clicks. Persisted to sessionStorage so a page reload doesn't surface the
+	// button again (closing the tab still resets, in case the user fixed
+	// permissions or switched browsers).
+	const [voiceUnavailable, setVoiceUnavailable] = useState(
+		() => getSessionStorage(VOICE_UNAVAILABLE_KEY) === 'true',
+	);
+	const markVoiceUnavailable = useCallback((): void => {
+		setVoiceUnavailable(true);
+		setSessionStorage(VOICE_UNAVAILABLE_KEY, 'true');
+	}, []);
+
 	const {
 		isListening,
 		isSupported,
@@ -388,9 +418,81 @@ export default function ChatInput({
 				setText(capText(committedTextRef.current + separator + transcriptText));
 			}
 		},
+		onError: (error) => {
+			// Guard against double-fire: Chrome can fire `onerror` more than
+			// once per session when `continuous = true` (it retries internally
+			// before giving up). Only fire the analytics event for the first
+			// error in a given session — voiceSourceRef being null means we've
+			// already handled it.
+			const source = voiceSourceRef.current;
+			if (source === null) {
+				return;
+			}
+			voiceStartedAtRef.current = null;
+			voiceSourceRef.current = null;
+			void logEvent(AIAssistantEvents.VoiceInputFailed, {
+				...analyticsCtx,
+				...getBrowserInfo(),
+				source,
+				errorType: error,
+			});
+			if (error === 'network') {
+				markVoiceUnavailable();
+				toast.error('Voice input unavailable in this browser', {
+					description:
+						'This browser cannot reach the speech recognition service. Try Google Chrome or Microsoft Edge.',
+				});
+			} else if (error === 'not-allowed') {
+				markVoiceUnavailable();
+				toast.error('Microphone access denied', {
+					description:
+						'Grant microphone permission in your browser settings to use voice input.',
+				});
+			} else if (error === 'not-supported') {
+				markVoiceUnavailable();
+				toast.error('Voice input is not supported in this browser.');
+			}
+			// `no-speech` is benign (just silence) — don't toast or hide.
+		},
 	});

-	const showMic = isSupported && micPermission !== 'denied';
+	const showMic = isSupported && micPermission !== 'denied' && !voiceUnavailable;
+
+	const startVoiceInput = useCallback(
+		(source: 'button' | 'shortcut') => {
+			// Defense in depth: the button is hidden when `voiceUnavailable` is
+			// true, but the PTT shortcut listener can still call us. Bailing here
+			// keeps a single source of truth and prevents repeat `Voice input
+			// failed` events in the same session.
+			if (voiceUnavailable) {
+				return;
+			}
+			voiceStartedAtRef.current = Date.now();
+			voiceSourceRef.current = source;
+			start();
+		},
+		[start, voiceUnavailable],
+	);
+
+	const fireVoiceInputEvent = useCallback(
+		(outcome: 'sent' | 'discarded') => {
+			const startedAt = voiceStartedAtRef.current;
+			const source = voiceSourceRef.current;
+			voiceStartedAtRef.current = null;
+			voiceSourceRef.current = null;
+			if (startedAt === null || source === null) {
+				return;
+			}
+			void logEvent(AIAssistantEvents.VoiceInputUsed, {
+				...analyticsCtx,
+				...getBrowserInfo(),
+				source,
+				outcome,
+				durationMs: Date.now() - startedAt,
+			});
+		},
+		[analyticsCtx],
+	);

 	// Stop recording and immediately send whatever is in the textarea.
 	const handleStopAndSend = useCallback(async () => {
@@ -398,15 +500,17 @@ export default function ChatInput({
 		committedTextRef.current = capText(text);
 		// Stop recognition without triggering onTranscript again (would double-append).
 		discard();
+		fireVoiceInputEvent('sent');
 		await handleSend();
-	}, [text, discard, handleSend, capText]);
+	}, [text, discard, handleSend, capText, fireVoiceInputEvent]);

 	// Stop recording and revert the textarea to what it was before voice started.
 	const handleDiscard = useCallback(() => {
 		discard();
+		fireVoiceInputEvent('discarded');
 		setText(committedTextRef.current);
 		textareaRef.current?.focus();
-	}, [discard]);
+	}, [discard, fireVoiceInputEvent]);

 	// ── Push-to-talk (Cmd/Ctrl + Shift + Space) ────────────────────────────────
 	// Hold the combo to record; release Space to submit. We track which key
@@ -415,7 +519,7 @@ export default function ChatInput({
 	// "session active" ref so a held key only calls `start()` once.
 	const pttActiveRef = useRef(false);
 	useEffect(() => {
-		if (!isSupported || micPermission === 'denied') {
+		if (!isSupported || micPermission === 'denied' || voiceUnavailable) {
 			return undefined;
 		}

@@ -432,7 +536,7 @@ export default function ChatInput({
 				return; // ignore auto-repeat
 			}
 			pttActiveRef.current = true;
-			start();
+			startVoiceInput('shortcut');
 		};

 		const handleKeyUp = (e: KeyboardEvent): void => {
@@ -466,9 +570,10 @@ export default function ChatInput({
 	}, [
 		isSupported,
 		micPermission,
+		voiceUnavailable,
 		disabled,
 		isStreaming,
-		start,
+		startVoiceInput,
 		handleStopAndSend,
 	]);

@@ -903,7 +1008,7 @@ export default function ChatInput({
 								<Button
 									variant="ghost"
 									size="icon"
-									onClick={start}
+									onClick={(): void => startVoiceInput('button')}
 									disabled={disabled}
 									aria-label="Start voice input"
 									className={styles.micBtn}
--- a/frontend/src/container/AIAssistant/components/ClarificationForm/ClarificationForm.tsx
+++ b/frontend/src/container/AIAssistant/components/ClarificationForm/ClarificationForm.tsx
@@ -9,6 +9,7 @@ import {
 	SelectItem,
 	SelectTrigger,
 } from '@signozhq/ui/select';
+import logEvent from 'api/common/logEvent';
 import { ClarificationFieldTypeDTO } from 'api/ai-assistant/sigNozAIAssistantAPI.schemas';
 import type {
 	ClarificationEventDTO,
@@ -16,6 +17,8 @@ import type {
 } from 'api/ai-assistant/sigNozAIAssistantAPI.schemas';
 import { CircleHelp, Send, X } from '@signozhq/icons';

+import { AIAssistantEvents } from '../../events';
+import { useAIAssistantAnalyticsContext } from '../../hooks/useAIAssistantAnalyticsContext';
 import { useAIAssistantStore } from '../../store/useAIAssistantStore';

 import styles from './ClarificationForm.module.scss';
@@ -44,6 +47,8 @@ export default function ClarificationForm({
 	const isStreaming = useAIAssistantStore(
 		(s) => s.streams[conversationId]?.isStreaming ?? false,
 	);
+	const { threadId, page, mode } =
+		useAIAssistantAnalyticsContext(conversationId);

 	const fields = clarification.fields ?? [];
 	const initialAnswers = Object.fromEntries(
@@ -60,6 +65,18 @@ export default function ClarificationForm({

 	const handleSubmit = async (): Promise<void> => {
 		setSubmitted(true);
+		// Approximate queryLength as the JSON encoding of the form answers — the
+		// clarification API doesn't render a single user-visible string, but the
+		// JSON size is a reasonable stand-in for "how much did the user provide".
+		const queryLength = JSON.stringify(answers).length;
+		void logEvent(AIAssistantEvents.MessageSent, {
+			threadId,
+			page,
+			mode,
+			queryLength,
+			hasContext: false,
+			respondingToClarification: true,
+		});
 		await submitClarification(
 			conversationId,
 			clarification.clarificationId,
@@ -69,6 +86,10 @@ export default function ClarificationForm({

 	const handleCancel = (): void => {
 		setCancelled(true);
+		void logEvent(AIAssistantEvents.CancelClicked, {
+			threadId,
+			secondsSinceStart: null,
+		});
 		cancelStream(conversationId);
 	};

--- a/frontend/src/container/AIAssistant/components/ConversationsList/ConversationsList.tsx
+++ b/frontend/src/container/AIAssistant/components/ConversationsList/ConversationsList.tsx
@@ -5,6 +5,9 @@ import { Input } from '@signozhq/ui/input';
 import { TooltipSimple } from '@signozhq/ui/tooltip';
 import { Plus, Search } from '@signozhq/icons';

+import logEvent from 'api/common/logEvent';
+
+import { AIAssistantEvents } from '../../events';
 import { useAIAssistantStore } from '../../store/useAIAssistantStore';
 import { Conversation } from '../../types';
 import { useVariant } from '../../VariantContext';
@@ -136,6 +139,17 @@ export default function ConversationsList({

 	const handleSelect = (id: string): void => {
 		const conv = conversations[id];
+		// Skip re-selecting the currently active thread — Notion-style click on
+		// the highlighted row in the history list shouldn't inflate the funnel.
+		const isReselectingActive = id === activeConversationId;
+		if (conv?.threadId && !isReselectingActive) {
+			void logEvent(AIAssistantEvents.ThreadOpenedFromHistory, {
+				threadId: conv.threadId,
+				threadAgeDays: Math.floor(
+					(Date.now() - conv.createdAt) / (24 * 60 * 60 * 1000),
+				),
+			});
+		}
 		if (conv?.threadId) {
 			// Always load from backend — refreshes messages and reconnects
 			// to active execution if the thread is still busy.
--- a/frontend/src/container/AIAssistant/components/MessageBubble/MessageBubble.tsx
+++ b/frontend/src/container/AIAssistant/components/MessageBubble/MessageBubble.tsx
@@ -144,7 +144,7 @@ export default function MessageBubble({
 						)}

 						{!isUser && message.actions && message.actions.length > 0 && (
-							<ActionsSection actions={message.actions} />
+							<ActionsSection actions={message.actions} messageId={message.id} />
 						)}
 					</div>
 				</div>
--- a/frontend/src/container/AIAssistant/components/MessageFeedback/MessageFeedback.tsx
+++ b/frontend/src/container/AIAssistant/components/MessageFeedback/MessageFeedback.tsx
@@ -8,6 +8,10 @@ import { DATE_TIME_FORMATS } from 'constants/dateTimeFormats';
 import { Check, Copy, RefreshCw, ThumbsDown, ThumbsUp } from '@signozhq/icons';
 import { useTimezone } from 'providers/Timezone';

+import logEvent from 'api/common/logEvent';
+
+import { AIAssistantEvents } from '../../events';
+import { useAIAssistantAnalyticsContext } from '../../hooks/useAIAssistantAnalyticsContext';
 import { useAIAssistantStore } from '../../store/useAIAssistantStore';
 import { FeedbackRating, Message } from '../../types';

@@ -54,6 +58,7 @@ export default function MessageFeedback({
 	const submitMessageFeedback = useAIAssistantStore(
 		(s) => s.submitMessageFeedback,
 	);
+	const { threadId } = useAIAssistantAnalyticsContext();

 	const { formatTimezoneAdjustedTimestamp } = useTimezone();

@@ -91,10 +96,21 @@ export default function MessageFeedback({
 	}, [message.createdAt]);

 	const handleCopy = useCallback((): void => {
+		void logEvent(AIAssistantEvents.MessageCopied, {
+			role: message.role,
+			messageId: message.id,
+			hadToolCalls: Boolean(message.blocks?.some((b) => b.type === 'tool_call')),
+		});
 		copyToClipboard(message.content);
 		setCopied(true);
 		setTimeout(() => setCopied(false), 1500);
-	}, [copyToClipboard, message.content]);
+	}, [
+		copyToClipboard,
+		message.content,
+		message.id,
+		message.role,
+		message.blocks,
+	]);

 	const handleVote = useCallback(
 		(rating: FeedbackRating): void => {
@@ -107,20 +123,31 @@ export default function MessageFeedback({
 				return;
 			}
 			setVote(rating);
+			void logEvent(AIAssistantEvents.FeedbackSubmitted, {
+				messageId: message.id,
+				threadId,
+				rating: 'up',
+				hasComment: false,
+				commentLength: 0,
+			});
 			submitMessageFeedback(message.id, rating);
 		},
-		[vote, message.id, submitMessageFeedback],
+		[vote, message.id, submitMessageFeedback, threadId],
 	);

 	const handleSubmitNegative = useCallback((): void => {
 		setVote('negative');
 		setIsNegativeDialogOpen(false);
-		submitMessageFeedback(
-			message.id,
-			'negative',
-			negativeComment.trim() || undefined,
-		);
-	}, [message.id, negativeComment, submitMessageFeedback]);
+		const trimmed = negativeComment.trim();
+		void logEvent(AIAssistantEvents.FeedbackSubmitted, {
+			messageId: message.id,
+			threadId,
+			rating: 'down',
+			hasComment: trimmed.length > 0,
+			commentLength: trimmed.length,
+		});
+		submitMessageFeedback(message.id, 'negative', trimmed || undefined);
+	}, [message.id, negativeComment, submitMessageFeedback, threadId]);

 	return (
 		<>
--- a/frontend/src/container/AIAssistant/components/UserMessageActions/UserMessageActions.tsx
+++ b/frontend/src/container/AIAssistant/components/UserMessageActions/UserMessageActions.tsx
@@ -4,6 +4,9 @@ import { Button } from '@signozhq/ui/button';
 import { TooltipSimple } from '@signozhq/ui/tooltip';
 import { Check, Copy } from '@signozhq/icons';

+import logEvent from 'api/common/logEvent';
+
+import { AIAssistantEvents } from '../../events';
 import { Message } from '../../types';

 import styles from './UserMessageActions.module.scss';
@@ -25,10 +28,15 @@ export default function UserMessageActions({
 	const [, copyToClipboard] = useCopyToClipboard();

 	const handleCopy = useCallback((): void => {
+		void logEvent(AIAssistantEvents.MessageCopied, {
+			role: message.role,
+			messageId: message.id,
+			hadToolCalls: false,
+		});
 		copyToClipboard(message.content);
 		setCopied(true);
 		setTimeout(() => setCopied(false), 1500);
-	}, [copyToClipboard, message.content]);
+	}, [copyToClipboard, message.content, message.id, message.role]);

 	return (
 		<div className={styles.actions}>
--- a/frontend/src/container/AIAssistant/components/VirtualizedMessages/VirtualizedMessages.tsx
+++ b/frontend/src/container/AIAssistant/components/VirtualizedMessages/VirtualizedMessages.tsx
@@ -10,6 +10,10 @@ import {
 	Sparkles,
 } from '@signozhq/icons';

+import logEvent from 'api/common/logEvent';
+
+import { AIAssistantEvents, SuggestedPromptCategory } from '../../events';
+import { useAIAssistantAnalyticsContext } from '../../hooks/useAIAssistantAnalyticsContext';
 import { useAIAssistantStore } from '../../store/useAIAssistantStore';
 import { Message, StreamingEventItem } from '../../types';
 import MessageBubble from '../MessageBubble';
@@ -46,17 +50,24 @@ interface VirtualizedMessagesProps {
 	conversationId: string;
 	messages: Message[];
 	isStreaming: boolean;
+	/**
+	 * Called when a user clicks an empty-state suggested prompt. Routed
+	 * through the parent so analytics (Message sent) fire with the same
+	 * page/mode/context attribution as a normal send.
+	 */
+	onSendSuggestedPrompt: (text: string) => void;
 }

 export default function VirtualizedMessages({
 	conversationId,
 	messages,
 	isStreaming,
+	onSendSuggestedPrompt,
 }: VirtualizedMessagesProps): JSX.Element {
-	const sendMessage = useAIAssistantStore((s) => s.sendMessage);
 	const regenerateAssistantMessage = useAIAssistantStore(
 		(s) => s.regenerateAssistantMessage,
 	);
+	const { threadId } = useAIAssistantAnalyticsContext(conversationId);
 	const streamingStatus = useAIAssistantStore(
 		(s) => s.streams[conversationId]?.streamingStatus ?? '',
 	);
@@ -85,9 +96,13 @@ export default function VirtualizedMessages({
 			if (isStreaming) {
 				return;
 			}
+			void logEvent(AIAssistantEvents.RegenerateClicked, {
+				messageId,
+				threadId,
+			});
 			void regenerateAssistantMessage(conversationId, messageId);
 		},
-		[conversationId, isStreaming, regenerateAssistantMessage],
+		[conversationId, isStreaming, regenerateAssistantMessage, threadId],
 	);

 	// Scroll all the way to the actual bottom — including the 64px of bottom
@@ -146,7 +161,11 @@ export default function VirtualizedMessages({
 							color="secondary"
 							className={styles.emptyChip}
 							onClick={(): void => {
-								sendMessage(s.text);
+								void logEvent(AIAssistantEvents.SuggestedPromptClicked, {
+									promptId: s.text,
+									category: SuggestedPromptCategory.EmptyState,
+								});
+								onSendSuggestedPrompt(s.text);
 							}}
 							prefix={<s.icon size={14} />}
 						>
--- a/frontend/src/container/AIAssistant/components/blocks/ConfirmBlock/ConfirmBlock.tsx
+++ b/frontend/src/container/AIAssistant/components/blocks/ConfirmBlock/ConfirmBlock.tsx
@@ -1,7 +1,10 @@
 import cx from 'classnames';
 import { Button } from '@signozhq/ui/button';
+import logEvent from 'api/common/logEvent';
 import { Check, X } from '@signozhq/icons';

+import { AIAssistantEvents } from '../../../events';
+import { useAIAssistantAnalyticsContext } from '../../../hooks/useAIAssistantAnalyticsContext';
 import { useAIAssistantStore } from '../../../store/useAIAssistantStore';
 import { useMessageContext } from '../../MessageContext';

@@ -37,6 +40,7 @@ export default function ConfirmBlock({
 	const answeredBlocks = useAIAssistantStore((s) => s.answeredBlocks);
 	const markBlockAnswered = useAIAssistantStore((s) => s.markBlockAnswered);
 	const sendMessage = useAIAssistantStore((s) => s.sendMessage);
+	const { threadId, page, mode } = useAIAssistantAnalyticsContext();

 	// Durable answered state — survives re-renders/remounts
 	const answeredChoice = messageId ? answeredBlocks[messageId] : undefined;
@@ -47,6 +51,14 @@ export default function ConfirmBlock({
 		if (messageId) {
 			markBlockAnswered(messageId, choice);
 		}
+		void logEvent(AIAssistantEvents.MessageSent, {
+			threadId,
+			page,
+			mode,
+			queryLength: responseText.length,
+			hasContext: false,
+			respondingToClarification: false,
+		});
 		sendMessage(responseText);
 	};

--- a/frontend/src/container/AIAssistant/components/blocks/InteractiveQuestion/InteractiveQuestion.tsx
+++ b/frontend/src/container/AIAssistant/components/blocks/InteractiveQuestion/InteractiveQuestion.tsx
@@ -1,8 +1,11 @@
 import { useState } from 'react';
 import cx from 'classnames';
 import { Button } from '@signozhq/ui/button';
+import logEvent from 'api/common/logEvent';
 import { Checkbox, Radio } from 'antd';

+import { AIAssistantEvents } from '../../../events';
+import { useAIAssistantAnalyticsContext } from '../../../hooks/useAIAssistantAnalyticsContext';
 import { useAIAssistantStore } from '../../../store/useAIAssistantStore';
 import { useMessageContext } from '../../MessageContext';

@@ -36,6 +39,7 @@ export default function InteractiveQuestion({
 	const answeredBlocks = useAIAssistantStore((s) => s.answeredBlocks);
 	const markBlockAnswered = useAIAssistantStore((s) => s.markBlockAnswered);
 	const sendMessage = useAIAssistantStore((s) => s.sendMessage);
+	const { threadId, page, mode } = useAIAssistantAnalyticsContext();

 	// Persist selected state locally only for the pending (not-yet-submitted) case
 	const [selected, setSelected] = useState<string[]>([]);
@@ -52,6 +56,14 @@ export default function InteractiveQuestion({
 		if (messageId) {
 			markBlockAnswered(messageId, answer);
 		}
+		void logEvent(AIAssistantEvents.MessageSent, {
+			threadId,
+			page,
+			mode,
+			queryLength: answer.length,
+			hasContext: false,
+			respondingToClarification: false,
+		});
 		sendMessage(answer);
 	};

--- a/frontend/src/container/AIAssistant/events.ts
+++ b/frontend/src/container/AIAssistant/events.ts
@@ -0,0 +1,81 @@
+/**
+ * Analytics event names for the AI Assistant feature. Backend-emitted events
+ * (Execution finished, Approval resolved, Resource mutated, Clarification
+ * requested, Limit hit) are not declared here — they fire from the AI service.
+ */
+
+export interface BrowserInfo {
+	browserName: string;
+	browserVersion: string;
+}
+
+type NavigatorWithBrandHints = Navigator & {
+	userAgentData?: { brands: { brand: string; version: string }[] };
+	brave?: { isBrave: () => Promise<boolean> };
+};
+
+/**
+ * We mainly need to distinguish Chrome / Edge (Speech API works) from Chromium
+ * derivatives (no Google API key → voice fails with `network`). UA sniffing is
+ * the source of truth for derivative identification; `userAgentData` is used
+ * only as a fast happy path for Chrome / Edge. Brave needs its own probe — it
+ * advertises Chrome in both UA and brand hints.
+ */
+export function getBrowserInfo(): BrowserInfo {
+	if (typeof navigator === 'undefined') {
+		return { browserName: 'unknown', browserVersion: 'unknown' };
+	}
+	const nav = navigator as NavigatorWithBrandHints;
+	const ua = nav.userAgent;
+
+	// Order matters: derivatives put "Chrome" in their UA; Chrome puts "Safari".
+	const matchers: { name: string; re: RegExp }[] = [
+		{ name: 'Edge', re: /Edg(?:e|A|iOS)?\/([\d.]+)/ },
+		{ name: 'Opera', re: /OPR\/([\d.]+)/ },
+		{ name: 'Vivaldi', re: /Vivaldi\/([\d.]+)/ },
+		{ name: 'Chrome', re: /Chrome\/([\d.]+)/ },
+		{ name: 'Firefox', re: /Firefox\/([\d.]+)/ },
+		{ name: 'Safari', re: /Version\/([\d.]+).*Safari/ },
+	];
+	let browserName = 'unknown';
+	let browserVersion = 'unknown';
+	for (const { name, re } of matchers) {
+		const m = ua.match(re);
+		if (m) {
+			browserName = name;
+			browserVersion = m[1];
+			break;
+		}
+	}
+
+	// Brave hides as Chrome in UA + brand hints; its probe is the only tell.
+	if (nav.brave?.isBrave) {
+		browserName = 'Brave';
+	}
+
+	return { browserName, browserVersion };
+}
+
+export const SuggestedPromptCategory = {
+	FollowUp: 'follow_up',
+	EmptyState: 'empty_state',
+} as const;
+export type SuggestedPromptCategory =
+	(typeof SuggestedPromptCategory)[keyof typeof SuggestedPromptCategory];
+
+export enum AIAssistantEvents {
+	Opened = 'AI Assistant: Opened',
+	MessageSent = 'AI Assistant: Message sent',
+	SuggestedPromptClicked = 'AI Assistant: Suggested prompt clicked',
+	CancelClicked = 'AI Assistant: Cancel clicked',
+	RegenerateClicked = 'AI Assistant: Regenerate clicked',
+	MessageCopied = 'AI Assistant: Message copied',
+	FeedbackSubmitted = 'AI Assistant: Feedback submitted',
+	ResourceOpened = 'AI Assistant: Resource opened',
+	DocOpened = 'AI Assistant: Doc opened',
+	ApplyFilterClicked = 'AI Assistant: Apply filter clicked',
+	ThreadOpenedFromHistory = 'AI Assistant: Thread opened from history',
+	VoiceInputUsed = 'AI Assistant: Voice input used',
+	VoiceInputFailed = 'AI Assistant: Voice input failed',
+	NewChatClicked = 'AI Assistant: New chat clicked',
+}
--- a/frontend/src/container/AIAssistant/hooks/useAIAssistantAnalyticsContext.ts
+++ b/frontend/src/container/AIAssistant/hooks/useAIAssistantAnalyticsContext.ts
@@ -0,0 +1,60 @@
+import { matchPath, useLocation } from 'react-router-dom';
+
+import ROUTES from 'constants/routes';
+
+import { useAIAssistantStore } from '../store/useAIAssistantStore';
+import { useVariant } from '../VariantContext';
+
+export interface AIAssistantAnalyticsContext {
+	/** Backend thread ID for the resolved conversation; undefined before the first send. */
+	threadId: string | undefined;
+	/**
+	 * Normalised route template for the current page (e.g. `/dashboard/:dashboardId`).
+	 * Falls back to the raw pathname for routes not in ROUTES. We normalise to keep
+	 * analytics cardinality bounded and avoid leaking customer identifiers
+	 * (dashboard IDs, service names, trace IDs, conversation IDs) into the event.
+	 */
+	page: string;
+	/** Surface the assistant is rendered on. `panel` / `modal` collapse to `sidepane`. */
+	mode: 'sidepane' | 'full_screen';
+}
+
+// Pre-sorted longest-first so more specific templates match before their
+// less specific siblings (e.g. `/services/:s/top-level-operations` wins
+// over `/services/:s`). Module-level — ROUTES is static.
+const ROUTE_TEMPLATES = Object.values(ROUTES).sort(
+	(a, b) => b.length - a.length,
+);
+
+export function normalizePage(pathname: string): string {
+	for (const template of ROUTE_TEMPLATES) {
+		if (matchPath(pathname, { path: template, exact: true })) {
+			return template;
+		}
+	}
+	return pathname;
+}
+
+/**
+ * Shared base attributes for AI Assistant analytics events (Message sent,
+ * Cancel clicked, Feedback submitted, Resource/Doc/Apply filter, …).
+ *
+ * Pass `conversationId` when the caller is scoped to a specific
+ * conversation (e.g. `ClarificationForm`, `VirtualizedMessages`); omit
+ * to fall back to the store's active conversation.
+ */
+export function useAIAssistantAnalyticsContext(
+	conversationId?: string,
+): AIAssistantAnalyticsContext {
+	const { pathname } = useLocation();
+	const variant = useVariant();
+	const threadId = useAIAssistantStore((s) => {
+		const id = conversationId ?? s.activeConversationId;
+		return id ? s.conversations[id]?.threadId : undefined;
+	});
+	return {
+		threadId,
+		page: normalizePage(pathname),
+		mode: variant === 'page' ? 'full_screen' : 'sidepane',
+	};
+}
--- a/frontend/src/container/DashboardContainer/DashboardDescription/Description.styles.scss
+++ b/frontend/src/container/DashboardContainer/DashboardDescription/Description.styles.scss
@@ -186,77 +186,40 @@
 		display: flex;
 		flex-direction: column;

-		.section-1 {
+		section {
 			display: flex;
 			flex-direction: column;
 			align-items: start;
-			border-bottom: 1px solid var(--l1-border);

 			.ant-btn {
 				display: flex;
 				width: 100%;
-				height: 20px;
-				padding: 16px 18px 18px 14px;
+				height: unset;
+				padding: 8px;
 				align-items: center;
-				gap: 6px;
+				gap: 12px;
 				color: var(--l2-foreground);
 				font-family: Inter;
-				font-size: 14px;
+				font-size: 13px;
 				font-style: normal;
 				font-weight: 400;
 				line-height: normal;
 				letter-spacing: 0.14px;
+				border-top: none;
+
 				.ant-btn-icon {
 					margin-inline-end: 0px;
 				}
 			}
 		}
+
+		.section-1,
 		.section-2 {
-			display: flex;
-			flex-direction: column;
-			align-items: start;
 			border-bottom: 1px solid var(--l1-border);
-
-			.ant-btn {
-				display: flex;
-				width: 100%;
-				height: 20px;
-				padding: 16px 18px 18px 14px;
-				align-items: center;
-				gap: 6px;
-				color: var(--l2-foreground);
-				font-family: Inter;
-				font-size: 14px;
-				font-style: normal;
-				font-weight: 400;
-				line-height: normal;
-				letter-spacing: 0.14px;
-
-				.ant-btn-icon {
-					margin-inline-end: 0px;
-				}
-			}
 		}
-		.delete-dashboard {
-			display: flex;
-			flex-direction: column;
-			align-items: start;

-			.ant-typography {
-				display: flex;
-				width: 100%;
-				height: 20px;
-				padding: 16px 18px 18px 14px;
-				align-items: center;
-				gap: 6px;
-				color: var(--bg-cherry-400) !important;
-				font-family: Inter;
-				font-size: 14px;
-				font-style: normal;
-				font-weight: 400;
-				line-height: normal;
-				letter-spacing: 0.14px;
-			}
+		.delete-dashboard .ant-btn {
+			color: var(--bg-cherry-400) !important;
 		}
 	}
 }
--- a/frontend/src/container/DashboardContainer/DashboardSettings/DashboardVariableSettings/VariableItem/VariableItem.styles.scss
+++ b/frontend/src/container/DashboardContainer/DashboardSettings/DashboardVariableSettings/VariableItem/VariableItem.styles.scss
@@ -211,7 +211,12 @@
 			display: grid;
 			grid-template-columns: max-content 1fr;

+			.typography-variables {
+				display: block;
+			}
+
 			.default-value-description {
+				display: block;
 				color: var(--l2-foreground);
 				font-family: Inter;
 				font-size: 11px;
--- a/frontend/src/container/DashboardContainer/DashboardSettings/General/index.tsx
+++ b/frontend/src/container/DashboardContainer/DashboardSettings/General/index.tsx
@@ -11,7 +11,7 @@ import {
 	SyncTooltipFilterMode,
 } from 'lib/uPlotV2/plugins/TooltipPlugin/types';
 import { isEqual } from 'lodash-es';
-import { Check, ExternalLink, Info, X } from '@signozhq/icons';
+import { Check, ExternalLink, SolidInfoCircle, X } from '@signozhq/icons';
 import { useDashboardStore } from 'providers/Dashboard/store/useDashboardStore';

 import styles from './GeneralSettings.module.scss';
@@ -201,7 +201,7 @@ function GeneralDashboardSettings(): JSX.Element {
 						placement="top"
 						mouseEnterDelay={0.5}
 					>
-						<Info size={14} className={styles.crossPanelSyncInfoIcon} />
+						<SolidInfoCircle size="md" className={styles.crossPanelSyncInfoIcon} />
 					</Tooltip>
 				</div>
 				<div className={styles.crossPanelSyncRow}>
--- a/frontend/src/container/GridCardLayout/WidgetHeader/WidgetHeader.styles.scss
+++ b/frontend/src/container/GridCardLayout/WidgetHeader/WidgetHeader.styles.scss
@@ -26,10 +26,13 @@
 	gap: 8px;
 	overflow: hidden;
 	text-overflow: ellipsis;
+	flex: 1;
+	min-width: 0;
 }

 .widget-header-title {
 	max-width: 80%;
+	min-width: 0;
 }

 .widget-header-actions {
--- a/frontend/src/container/IngestionSettings/MultiIngestionSettings.tsx
+++ b/frontend/src/container/IngestionSettings/MultiIngestionSettings.tsx
@@ -438,9 +438,7 @@ function MultiIngestionSettings(): JSX.Element {
 							data: {
 								name: values.name,
 								tags: updatedTags,
-								expires_at: new Date(
-									dayjs(values.expires_at).endOf('day').toISOString(),
-								),
+								expires_at: dayjs(values.expires_at).endOf('day').toISOString(),
 							},
 						},
 						{
@@ -471,13 +469,11 @@ function MultiIngestionSettings(): JSX.Element {
 					const requestPayload = {
 						name: values.name,
 						tags: updatedTags,
-						expires_at: new Date(dayjs(values.expires_at).endOf('day').toISOString()),
+						expires_at: dayjs(values.expires_at).endOf('day').toISOString(),
 					};

 					createIngestionKey(
-						{
-							data: requestPayload,
-						},
+						{ data: requestPayload },
 						{
 							onSuccess: (_data) => {
 								notifications.success({
--- a/frontend/src/container/IngestionSettings/tests/MultiIngestionSettings.test.tsx
+++ b/frontend/src/container/IngestionSettings/tests/MultiIngestionSettings.test.tsx
@@ -79,12 +79,12 @@ describe('MultiIngestionSettings Page', () => {
 				keys: [
 					{
 						name: 'Key One',
-						expires_at: new Date(TEST_EXPIRES_AT),
+						expires_at: TEST_EXPIRES_AT,
 						value: 'secret',
 						workspace_id: TEST_WORKSPACE_ID,
 						id: 'k1',
-						created_at: new Date(TEST_CREATED_UPDATED),
-						updated_at: new Date(TEST_CREATED_UPDATED),
+						created_at: TEST_CREATED_UPDATED,
+						updated_at: TEST_CREATED_UPDATED,
 						tags: [],
 						limits: [
 							{
@@ -160,12 +160,12 @@ describe('MultiIngestionSettings Page', () => {
 				keys: [
 					{
 						name: 'Key Logs',
-						expires_at: new Date(TEST_EXPIRES_AT),
+						expires_at: TEST_EXPIRES_AT,
 						value: 'secret',
 						workspace_id: TEST_WORKSPACE_ID,
 						id: 'k2',
-						created_at: new Date(TEST_CREATED_UPDATED),
-						updated_at: new Date(TEST_CREATED_UPDATED),
+						created_at: TEST_CREATED_UPDATED,
+						updated_at: TEST_CREATED_UPDATED,
 						tags: [],
 						limits: [
 							{
@@ -238,12 +238,12 @@ describe('MultiIngestionSettings Page', () => {
 				keys: [
 					{
 						name: KEY_NAME,
-						expires_at: new Date(TEST_EXPIRES_AT),
+						expires_at: TEST_EXPIRES_AT,
 						value: 'secret',
 						workspace_id: TEST_WORKSPACE_ID,
 						id: 'k1',
-						created_at: new Date(TEST_CREATED_UPDATED),
-						updated_at: new Date(TEST_CREATED_UPDATED),
+						created_at: TEST_CREATED_UPDATED,
+						updated_at: TEST_CREATED_UPDATED,
 						tags: [],
 						limits: [
 							{
@@ -299,12 +299,12 @@ describe('MultiIngestionSettings Page', () => {
 				keys: [
 					{
 						name: 'Key Regular',
-						expires_at: new Date(TEST_EXPIRES_AT),
+						expires_at: TEST_EXPIRES_AT,
 						value: 'secret1',
 						workspace_id: TEST_WORKSPACE_ID,
 						id: 'k1',
-						created_at: new Date(TEST_CREATED_UPDATED),
-						updated_at: new Date(TEST_CREATED_UPDATED),
+						created_at: TEST_CREATED_UPDATED,
+						updated_at: TEST_CREATED_UPDATED,
 						tags: [],
 						limits: [],
 					},
@@ -319,12 +319,12 @@ describe('MultiIngestionSettings Page', () => {
 				keys: [
 					{
 						name: 'Key Search Result',
-						expires_at: new Date(TEST_EXPIRES_AT),
+						expires_at: TEST_EXPIRES_AT,
 						value: 'secret2',
 						workspace_id: TEST_WORKSPACE_ID,
 						id: 'k2',
-						created_at: new Date(TEST_CREATED_UPDATED),
-						updated_at: new Date(TEST_CREATED_UPDATED),
+						created_at: TEST_CREATED_UPDATED,
+						updated_at: TEST_CREATED_UPDATED,
 						tags: [],
 						limits: [],
 					},
--- a/frontend/src/container/ListAlertRules/test/utils.test.ts
+++ b/frontend/src/container/ListAlertRules/test/utils.test.ts
@@ -13,9 +13,9 @@ describe('filterAlerts', () => {
 	const mockAlertBase: Partial<RuletypesRuleDTO> = {
 		state: 'active' as RuletypesAlertStateDTO,
 		disabled: false,
-		createdAt: new Date('2024-01-01T00:00:00Z'),
+		createdAt: '2024-01-01T00:00:00Z',
 		createdBy: 'test-user',
-		updatedAt: new Date('2024-01-01T00:00:00Z'),
+		updatedAt: '2024-01-01T00:00:00Z',
 		updatedBy: 'test-user',
 		version: '1',
 		condition: {
--- a/frontend/src/container/MembersSettings/tests/MembersSettings.integration.test.tsx
+++ b/frontend/src/container/MembersSettings/tests/MembersSettings.integration.test.tsx
@@ -20,7 +20,7 @@ const mockUsers: TypesUserDTO[] = [
 		displayName: 'Alice Smith',
 		email: 'alice@signoz.io',
 		status: 'active',
-		createdAt: new Date('2024-01-01T00:00:00.000Z'),
+		createdAt: '2024-01-01T00:00:00.000Z',
 		orgId: 'org-1',
 	},
 	{
@@ -28,7 +28,7 @@ const mockUsers: TypesUserDTO[] = [
 		displayName: 'Bob Jones',
 		email: 'bob@signoz.io',
 		status: 'active',
-		createdAt: new Date('2024-01-02T00:00:00.000Z'),
+		createdAt: '2024-01-02T00:00:00.000Z',
 		orgId: 'org-1',
 	},
 	{
@@ -36,7 +36,7 @@ const mockUsers: TypesUserDTO[] = [
 		displayName: '',
 		email: 'charlie@signoz.io',
 		status: 'pending_invite',
-		createdAt: new Date('2024-01-03T00:00:00.000Z'),
+		createdAt: '2024-01-03T00:00:00.000Z',
 		orgId: 'org-1',
 	},
 	{
@@ -44,7 +44,7 @@ const mockUsers: TypesUserDTO[] = [
 		displayName: 'Dave Deleted',
 		email: 'dave@signoz.io',
 		status: 'deleted',
-		createdAt: new Date('2024-01-04T00:00:00.000Z'),
+		createdAt: '2024-01-04T00:00:00.000Z',
 		orgId: 'org-1',
 	},
 ];
--- a/frontend/src/container/NewWidget/WidgetModals/DiscardChangesModal.tsx
+++ b/frontend/src/container/NewWidget/WidgetModals/DiscardChangesModal.tsx
@@ -0,0 +1,53 @@
+import { SolidAlertTriangle } from '@signozhq/icons';
+import { ConfirmDialog } from '@signozhq/ui/dialog';
+import { Typography } from '@signozhq/ui/typography';
+
+export interface DiscardChangesModalProps {
+	open: boolean;
+	isNewPanel: boolean;
+	panelTitle?: string;
+	dashboardTitle?: string;
+	onDiscard: () => void;
+	onClose: () => void;
+}
+
+export default function DiscardChangesModal({
+	open,
+	isNewPanel,
+	panelTitle,
+	dashboardTitle,
+	onDiscard,
+	onClose,
+}: DiscardChangesModalProps): JSX.Element {
+	const dashboardName = dashboardTitle ? (
+		<>
+			{' '}
+			to <strong>{dashboardTitle}</strong>
+		</>
+	) : null;
+	const panelLabel = panelTitle ? <strong>{panelTitle}</strong> : 'this panel';
+
+	return (
+		<ConfirmDialog
+			open={open}
+			onOpenChange={(next): void => {
+				if (!next) {
+					onClose();
+				}
+			}}
+			title="Discard changes?"
+			titleIcon={<SolidAlertTriangle size={14} color="#fdd600" />}
+			confirmText="Discard"
+			confirmColor="destructive"
+			cancelText="Keep editing"
+			onConfirm={onDiscard}
+			onCancel={onClose}
+		>
+			{isNewPanel ? (
+				<Typography>This new panel won&apos;t be added{dashboardName}.</Typography>
+			) : (
+				<Typography>Your unsaved edits to {panelLabel} will be lost.</Typography>
+			)}
+		</ConfirmDialog>
+	);
+}
--- a/frontend/src/container/NewWidget/test/utils.test.ts
+++ b/frontend/src/container/NewWidget/test/utils.test.ts
@@ -1,13 +1,17 @@
 import {
+	initialAutocompleteData,
 	initialQueryBuilderFormValuesMap,
 	PANEL_TYPES,
 } from 'constants/queryBuilder';
+import { cloneDeep } from 'lodash-es';
+import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse';
 import { Query } from 'types/api/queryBuilder/queryBuilderData';
+import { MetricAggregation } from 'types/api/v5/queryRange';
 import { EQueryType } from 'types/common/dashboard';
 import { DataSource } from 'types/common/queryBuilder';

 import type { PartialPanelTypes } from '../utils';
-import { handleQueryChange } from '../utils';
+import { getIsQueryModified, handleQueryChange } from '../utils';

 const buildSupersetQuery = (extras?: Record<string, unknown>): Query => ({
 	queryType: EQueryType.QUERY_BUILDER,
@@ -37,6 +41,128 @@ const buildSupersetQuery = (extras?: Record<string, unknown>): Query => ({
 	},
 });

+const buildMetricsQuery = (
+	overrides?: Partial<{
+		metricName: string;
+		aggregateAttributeKey: string;
+		legend: string;
+		groupByKey: string;
+	}>,
+): Query => ({
+	queryType: EQueryType.QUERY_BUILDER,
+	promql: [],
+	clickhouse_sql: [],
+	id: 'query-id',
+	unit: '',
+	builder: {
+		queryFormulas: [],
+		queryData: [
+			{
+				...initialQueryBuilderFormValuesMap[DataSource.METRICS],
+				queryName: 'A',
+				aggregateAttribute: overrides?.aggregateAttributeKey
+					? {
+							...initialAutocompleteData,
+							key: overrides.aggregateAttributeKey,
+							type: 'tag',
+							dataType: DataTypes.Float64,
+						}
+					: cloneDeep(initialAutocompleteData),
+				aggregations: [
+					{
+						metricName: overrides?.metricName ?? 'system.cpu.load',
+						temporality: '',
+						timeAggregation: 'rate',
+						spaceAggregation: 'sum',
+						reduceTo: 'avg',
+					} as MetricAggregation,
+				],
+				legend: overrides?.legend ?? '',
+				groupBy: overrides?.groupByKey
+					? [
+							{
+								...initialAutocompleteData,
+								key: overrides.groupByKey,
+								type: 'tag',
+								dataType: DataTypes.String,
+							},
+						]
+					: [],
+			},
+		],
+		queryTraceOperator: [],
+	},
+});
+
+describe('getIsQueryModified', () => {
+	it('returns false when baseline is null (new unsaved panel with no edits anchor)', () => {
+		const current = buildMetricsQuery();
+		expect(getIsQueryModified(current, null)).toBe(false);
+	});
+
+	it('returns false when baseline is undefined', () => {
+		const current = buildMetricsQuery();
+		expect(getIsQueryModified(current, undefined)).toBe(false);
+	});
+
+	it('returns false when current only differs by auto-backfilled aggregateAttribute', () => {
+		// saved widget query: aggregateAttribute is the v5-style empty initial value
+		// (stripped from persisted spec; spread back in as initialAutocompleteData on load)
+		const savedQuery = buildMetricsQuery({ metricName: 'system.cpu.load' });
+		// after MetricNameSelector edit-mode backfill, currentQuery has the populated
+		// aggregateAttribute while the rest of the query is identical
+		const currentQuery = buildMetricsQuery({
+			metricName: 'system.cpu.load',
+			aggregateAttributeKey: 'system.cpu.load',
+		});
+		expect(getIsQueryModified(currentQuery, savedQuery)).toBe(false);
+	});
+
+	it('returns true when the user edits the legend', () => {
+		const baseline = buildMetricsQuery({ metricName: 'system.cpu.load' });
+		const edited = buildMetricsQuery({
+			metricName: 'system.cpu.load',
+			legend: 'cpu-load',
+		});
+		expect(getIsQueryModified(edited, baseline)).toBe(true);
+	});
+
+	it('returns true when the user picks a different metric (aggregations diverges)', () => {
+		const baseline = buildMetricsQuery({ metricName: 'system.cpu.load' });
+		const edited = buildMetricsQuery({ metricName: 'system.memory.usage' });
+		expect(getIsQueryModified(edited, baseline)).toBe(true);
+	});
+
+	it('returns true when the user adds a groupBy', () => {
+		const baseline = buildMetricsQuery({ metricName: 'system.cpu.load' });
+		const edited = buildMetricsQuery({
+			metricName: 'system.cpu.load',
+			groupByKey: 'host.name',
+		});
+		expect(getIsQueryModified(edited, baseline)).toBe(true);
+	});
+
+	it('returns true on existing widget when current diverges from saved (Stage-and-Run silent-loss flow)', () => {
+		// After Edit → Stage and Run, stagedQuery is reset to match currentQuery.
+		// The dirty check must compare against the SAVED widget query, not stagedQuery.
+		const savedQuery = buildMetricsQuery({ metricName: 'system.cpu.load' });
+		const currentQuery = buildMetricsQuery({ metricName: 'system.memory.usage' });
+		expect(getIsQueryModified(currentQuery, savedQuery)).toBe(true);
+	});
+
+	it('returns false for a new panel where currentQuery still matches stagedQuery baseline', () => {
+		const stagedQuery = buildMetricsQuery();
+		const currentQuery = buildMetricsQuery();
+		expect(getIsQueryModified(currentQuery, stagedQuery)).toBe(false);
+	});
+
+	it('returns true for a new panel where currentQuery has been edited away from stagedQuery', () => {
+		const stagedQuery = buildMetricsQuery();
+		const currentQuery = buildMetricsQuery({ legend: 'custom' });
+		expect(getIsQueryModified(currentQuery, stagedQuery)).toBe(true);
+	});
+});
+
 describe('handleQueryChange', () => {
 	it('sets list-specific fields when switching to LIST', () => {
 		const superset = buildSupersetQuery();
--- a/frontend/src/container/NewWidget/index.tsx
+++ b/frontend/src/container/NewWidget/index.tsx
@@ -1,18 +1,17 @@
 /* eslint-disable sonarjs/cognitive-complexity */
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import { useTranslation } from 'react-i18next';
 import { UseQueryResult } from 'react-query';
 // eslint-disable-next-line no-restricted-imports
 import { useSelector } from 'react-redux';
 import { generatePath } from 'react-router-dom';
-import { Check, SolidAlertTriangle, X } from '@signozhq/icons';
+import { Check, X } from '@signozhq/icons';
 import { Button } from '@signozhq/ui/button';
 import {
 	ResizableHandle,
 	ResizablePanel,
 	ResizablePanelGroup,
 } from '@signozhq/ui/resizable';
-import { Flex, Modal, Space } from 'antd';
+import { Flex } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
 import logEvent from 'api/common/logEvent';
 import { PrecisionOption, PrecisionOptionsEnum } from 'components/Graph/types';
@@ -69,7 +68,6 @@ import { GlobalReducer } from 'types/reducer/globalTime';
 import { getGraphType, getGraphTypeForFormat } from 'utils/getGraphType';

 import LeftContainer from './LeftContainer';
-import QueryTypeTag from './LeftContainer/QueryTypeTag';
 import RightContainer from './RightContainer';
 import { ThresholdProps } from './RightContainer/Threshold/types';
 import TimeItems, { timePreferance } from './RightContainer/timeItems';
@@ -82,6 +80,7 @@ import {
 	placeWidgetAtBottom,
 	placeWidgetBetweenRows,
 } from './utils';
+import DiscardChangesModal from './WidgetModals/DiscardChangesModal';

 import './NewWidget.styles.scss';

@@ -98,8 +97,6 @@ function NewWidget({

 	const { dashboardVariables } = useDashboardVariables();

-	const { t } = useTranslation(['dashboard']);
-
 	const { registerShortcut, deregisterShortcut } = useKeyboardHotkeys();

 	const {
@@ -110,11 +107,6 @@ function NewWidget({
 		setSupersetQuery,
 	} = useQueryBuilder();

-	const isQueryModified = useMemo(
-		() => getIsQueryModified(currentQuery, stagedQuery),
-		[currentQuery, stagedQuery],
-	);
-
 	const { selectedTime: globalSelectedInterval } = useSelector<
 		AppState,
 		GlobalReducer
@@ -139,6 +131,23 @@ function NewWidget({

 	const query = useUrlQuery();

+	// For existing widgets, compare currentQuery against the saved widget query
+	// (stable across Stage-and-Run cycles). For new panels with no saved baseline,
+	// fall back to stagedQuery so initial edits still trigger the warning.
+	const savedWidgetQuery = useMemo(() => {
+		const widgetId = query.get('widgetId');
+		const match = widgets?.find((w) => w.id === widgetId);
+		if (!match || match.panelTypes === PANEL_GROUP_TYPES.ROW) {
+			return null;
+		}
+		return (match as Widgets).query ?? null;
+	}, [widgets, query]);
+
+	const isQueryModified = useMemo(
+		() => getIsQueryModified(currentQuery, savedWidgetQuery ?? stagedQuery),
+		[currentQuery, savedWidgetQuery, stagedQuery],
+	);
+
 	const [isNewDashboard, setIsNewDashboard] = useState<boolean>(false);

 	const logEventCalledRef = useRef(false);
@@ -228,7 +237,6 @@ function NewWidget({
 		Record<string, string>
 	>(selectedWidget?.customLegendColors || {});

-	const [saveModal, setSaveModal] = useState(false);
 	const [discardModal, setDiscardModal] = useState(false);

 	const [bucketWidth, setBucketWidth] = useState<number>(
@@ -340,7 +348,6 @@ function NewWidget({
 	]);

 	const closeModal = (): void => {
-		setSaveModal(false);
 		setDiscardModal(false);
 	};

@@ -593,7 +600,7 @@ function NewWidget({
 			},
 		};

-		updateDashboardMutation.mutateAsync(dashboard, {
+		return updateDashboardMutation.mutateAsync(dashboard, {
 			onSuccess: () => {
 				setToScrollWidgetId(selectedWidget?.id || '');
 				navigateToDashboardPage();
@@ -688,9 +695,9 @@ function NewWidget({
 				})),
 			}),
 		});
-		setSaveModal(true);
+		onClickSaveHandler();
 		// eslint-disable-next-line react-hooks/exhaustive-deps
-	}, [isNewPanel]);
+	}, [onClickSaveHandler]);

 	const isNewTraceLogsAvailable =
 		currentQuery.queryType === EQueryType.QUERY_BUILDER &&
@@ -951,57 +958,14 @@ function NewWidget({
 					</ResizablePanel>
 				</ResizablePanelGroup>
 			</PanelContainer>
-			<Modal
-				title={
-					isQueryModified ? (
-						<Space>
-							<SolidAlertTriangle size={16} color="#fdd600" />
-							Unsaved Changes
-						</Space>
-					) : (
-						'Save Widget'
-					)
-				}
-				focusTriggerAfterClose
-				forceRender
-				destroyOnClose
-				closable
-				onCancel={closeModal}
-				onOk={onClickSaveHandler}
-				confirmLoading={updateDashboardMutation.isLoading}
-				centered
-				open={saveModal}
-				width={600}
-			>
-				{!isQueryModified ? (
-					<Typography>
-						{t('your_graph_build_with')}{' '}
-						<QueryTypeTag queryType={currentQuery.queryType} />{' '}
-						{t('dashboard_ok_confirm')}
-					</Typography>
-				) : (
-					<Typography>{t('dashboard_unsave_changes')} </Typography>
-				)}
-			</Modal>
-			<Modal
-				title={
-					<Space>
-						<SolidAlertTriangle size={16} color="#fdd600" />
-						Unsaved Changes
-					</Space>
-				}
-				focusTriggerAfterClose
-				forceRender
-				destroyOnClose
-				closable
-				onCancel={closeModal}
-				onOk={discardChanges}
-				centered
+			<DiscardChangesModal
 				open={discardModal}
-				width={600}
-			>
-				<Typography>{t('dashboard_unsave_changes')}</Typography>
-			</Modal>
+				isNewPanel={isNewPanel}
+				panelTitle={title}
+				dashboardTitle={dashboardData?.data?.title}
+				onDiscard={discardChanges}
+				onClose={closeModal}
+			/>
 		</Container>
 	);
 }
--- a/frontend/src/container/NewWidget/utils.ts
+++ b/frontend/src/container/NewWidget/utils.ts
@@ -1,5 +1,4 @@
 import { Layout } from 'react-grid-layout';
-import { omitIdFromQuery } from 'components/ExplorerCard/utils';
 import { PrecisionOptionsEnum } from 'components/Graph/types';
 import { YAxisCategoryNames } from 'components/YAxisUnitSelector/constants';
 import {
@@ -26,16 +25,84 @@ import { DataSource } from 'types/common/queryBuilder';

 import { getCategoryName } from './RightContainer/dataFormatCategories';

+// Asks "would saving the current panel change the persisted widget spec?".
+//
+// `adjustQueryForV5` is deliberately not reused here: in addition to stripping
+// the legacy v4 fields, it also resurrects them onto each metric
+// `aggregations[i]`. That migration step is correct on save but bleeds
+// asymmetrically across a comparator — the live query still carries the
+// legacy defaults from `initialQueryBuilderFormValuesMap` while a previously
+// saved widget had them stripped.
+const stripQueryDataForCompare = (
+	queryData: IBuilderQuery,
+): Record<string, unknown> => {
+	const {
+		aggregateAttribute: _aggregateAttribute,
+		aggregateOperator: _aggregateOperator,
+		timeAggregation: _timeAggregation,
+		spaceAggregation: _spaceAggregation,
+		reduceTo: _reduceTo,
+		filters: _filters,
+		...retained
+	} = queryData ?? ({} as IBuilderQuery);
+
+	const groupBy = (retained.groupBy ?? []).map((entry) => {
+		const { id: _id, ...rest } = entry;
+		return rest;
+	});
+
+	return {
+		...retained,
+		groupBy,
+		source: retained.source || '',
+	};
+};
+
+const normalizeForDirtyCheck = (query: Query): Record<string, unknown> => {
+	const { id: _id, unit, builder, ...rest } = query;
+	return {
+		...rest,
+		// `id` is regenerated on every Stage and Run; `unit` flips between ''
+		// and undefined depending on whether the user has touched the selector.
+		unit: unit || '',
+		builder: {
+			...builder,
+			queryData: (builder?.queryData ?? []).map(stripQueryDataForCompare),
+		},
+	};
+};
+
+// `lodash.isEqual` distinguishes `{a: undefined}` from `{}`; for the dirty
+// check those are the same. Initial-values spreads on the live query
+// frequently leave such explicit-undefined keys.
+const stripUndefined = (value: unknown): unknown => {
+	if (Array.isArray(value)) {
+		return value.map(stripUndefined);
+	}
+	if (value && typeof value === 'object') {
+		const out: Record<string, unknown> = {};
+		Object.entries(value as Record<string, unknown>).forEach(([k, v]) => {
+			if (v === undefined) {
+				return;
+			}
+			out[k] = stripUndefined(v);
+		});
+		return out;
+	}
+	return value;
+};
+
 export const getIsQueryModified = (
 	currentQuery: Query,
-	stagedQuery: Query | null,
+	baselineQuery: Query | null | undefined,
 ): boolean => {
-	if (!stagedQuery) {
+	if (!baselineQuery) {
 		return false;
 	}
-	const omitIdFromStageQuery = omitIdFromQuery(stagedQuery);
-	const omitIdFromCurrentQuery = omitIdFromQuery(currentQuery);
-	return !isEqual(omitIdFromStageQuery, omitIdFromCurrentQuery);
+	return !isEqual(
+		stripUndefined(normalizeForDirtyCheck(baselineQuery)),
+		stripUndefined(normalizeForDirtyCheck(currentQuery)),
+	);
 };

 export type PartialPanelTypes = {
--- a/frontend/src/container/PlannedDowntime/PlannedDowntime.styles.scss
+++ b/frontend/src/container/PlannedDowntime/PlannedDowntime.styles.scss
@@ -81,20 +81,6 @@
 		}
 	}

-	.alert-rule-scope {
-		margin-bottom: 12px;
-
-		.ant-radio-wrapper {
-			color: var(--l1-foreground);
-		}
-	}
-
-	.alert-rule-all-warning {
-		font-size: 12px;
-		font-weight: 400;
-		color: var(--l2-foreground);
-	}
-
 	.formItemWithBullet {
 		margin-bottom: 0;
 	}
--- a/frontend/src/container/PlannedDowntime/PlannedDowntime.tsx
+++ b/frontend/src/container/PlannedDowntime/PlannedDowntime.tsx
@@ -24,7 +24,7 @@ import { PlannedDowntimeDeleteModal } from './PlannedDowntimeDeleteModal';
 import { PlannedDowntimeForm } from './PlannedDowntimeForm';
 import { PlannedDowntimeList } from './PlannedDowntimeList';
 import {
-	defautlInitialValues,
+	defaultInitialValues,
 	deleteDowntimeHandler,
 } from './PlannedDowntimeutils';

@@ -48,9 +48,9 @@ export function PlannedDowntime(): JSX.Element {
 	const urlQuery = useUrlQuery();

 	const [initialValues, setInitialValues] =
-		useState<
-			Partial<AlertmanagertypesPlannedMaintenanceDTO & { editMode: boolean }>
-		>(defautlInitialValues);
+		useState<Partial<AlertmanagertypesPlannedMaintenanceDTO>>(
+			defaultInitialValues,
+		);

 	const downtimeSchedules = useListDowntimeSchedules();
 	const alertOptions = React.useMemo(
@@ -148,7 +148,7 @@ export function PlannedDowntime(): JSX.Element {
 						<Button
 							type="primary"
 							onClick={(): void => {
-								setInitialValues({ ...defautlInitialValues, editMode: false });
+								setInitialValues(defaultInitialValues);
 								setIsOpen(true);
 								setEditMode(false);
 								form.resetFields();
--- a/frontend/src/container/PlannedDowntime/PlannedDowntimeForm.tsx
+++ b/frontend/src/container/PlannedDowntime/PlannedDowntimeForm.tsx
@@ -1,5 +1,5 @@
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
-import { Check, Info } from '@signozhq/icons';
+import { Check } from '@signozhq/icons';
 import {
 	Button,
 	DatePicker,
@@ -8,11 +8,9 @@ import {
 	FormInstance,
 	Input,
 	Modal,
-	Radio,
 	Select,
 	SelectProps,
 	Spin,
-	Tooltip,
 } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
 import type { DefaultOptionType } from 'antd/es/select';
@@ -48,8 +46,6 @@ import { AlertRuleTags } from './PlannedDowntimeList';
 import {
 	getAlertOptionsFromIds,
 	getDurationInfo,
-	getEndTime,
-	handleTimeConversion,
 	isScheduleRecurring,
 	recurrenceOptions,
 	recurrenceOptionWithSubmenu,
@@ -66,28 +62,28 @@ const TIME_FORMAT = DATE_TIME_FORMATS.TIME;
 const DATE_FORMAT = DATE_TIME_FORMATS.ORDINAL_DATE;
 const ORDINAL_FORMAT = DATE_TIME_FORMATS.ORDINAL_ONLY;

-type AlertRuleScope = 'all' | 'specific';
+const TZ_OPTIONS: DefaultOptionType[] = ALL_TIME_ZONES.map(
+	(timezone: string) => ({
+		label: timezone,
+		value: timezone,
+		key: timezone,
+	}),
+);

 interface PlannedDowntimeFormData {
 	name: string;
-	startTime: dayjs.Dayjs | string;
-	endTime: dayjs.Dayjs | string;
-	recurrence?: AlertmanagertypesRecurrenceDTO | null;
-	alertRuleScope: AlertRuleScope;
+	startTime: dayjs.Dayjs | null;
+	endTime: dayjs.Dayjs | null;
+	recurrence?: AlertmanagertypesRecurrenceDTO;
 	alertRules: DefaultOptionType[];
 	recurrenceSelect?: AlertmanagertypesRecurrenceDTO;
 	timezone?: string;
-	labelExpression?: string;
 }

 const customFormat = DATE_TIME_FORMATS.ORDINAL_DATETIME;

 interface PlannedDowntimeFormProps {
-	initialValues: Partial<
-		AlertmanagertypesPlannedMaintenanceDTO & {
-			editMode: boolean;
-		}
-	>;
+	initialValues: Partial<AlertmanagertypesPlannedMaintenanceDTO>;
 	alertOptions: DefaultOptionType[];
 	isError: boolean;
 	isLoading: boolean;
@@ -95,7 +91,7 @@ interface PlannedDowntimeFormProps {
 	setIsOpen: React.Dispatch<React.SetStateAction<boolean>>;
 	refetchAllSchedules: () => void;
 	isEditMode: boolean;
-	form: FormInstance<any>;
+	form: FormInstance;
 }

 export function PlannedDowntimeForm(
@@ -113,76 +109,46 @@ export function PlannedDowntimeForm(
 		form,
 	} = props;

-	const [selectedTags, setSelectedTags] = React.useState<
-		DefaultOptionType | DefaultOptionType[]
-	>([]);
+	const [selectedTags, setSelectedTags] = React.useState<DefaultOptionType[]>(
+		[],
+	);
 	const alertRuleFormName = 'alertRules';
 	const [saveLoading, setSaveLoading] = useState(false);
 	const [durationUnit, setDurationUnit] = useState<string>(
-		getDurationInfo(initialValues.schedule?.recurrence?.duration as string)
-			?.unit || 'm',
+		getDurationInfo(initialValues.schedule?.recurrence?.duration)?.unit || 'm',
 	);

 	const [formData, setFormData] = useState<Partial<PlannedDowntimeFormData>>({
 		timezone: initialValues.schedule?.timezone,
 	});

-	const [recurrenceType, setRecurrenceType] = useState<string | null>(
-		(initialValues.schedule?.recurrence?.repeatType as string) ||
+	const [recurrenceType, setRecurrenceType] = useState<string>(
+		initialValues.schedule?.recurrence?.repeatType ||
 			recurrenceOptions.doesNotRepeat.value,
 	);

-	const [alertRuleScope, setAlertRuleScope] = useState<AlertRuleScope>(
-		initialValues.id && (initialValues.alertIds || []).length === 0
-			? 'all'
-			: 'specific',
-	);
-
-	const timezoneInitialValue = !isEmpty(initialValues.schedule?.timezone)
-		? (initialValues.schedule?.timezone as string)
-		: undefined;
-
 	const { notifications } = useNotifications();
 	const { showErrorModal } = useErrorModal();

+	const requiredFieldRule = [{ required: true }];
+
 	const datePickerFooter = (mode: any): any =>
 		mode === 'time' ? (
 			<span style={{ color: 'gray' }}>Please select the time</span>
 		) : null;

-	const saveHanlder = useCallback(
+	const saveHandler = useCallback(
 		async (values: PlannedDowntimeFormData) => {
-			const shouldKeepLocalTime = !isEditMode;
 			const data: AlertmanagertypesPostablePlannedMaintenanceDTO = {
-				alertIds:
-					values.alertRuleScope === 'all'
-						? []
-						: (values.alertRules
-								.map((alert) => alert.value)
-								.filter((alert) => alert !== undefined) as string[]),
+				alertIds: values.alertRules
+					.map((alert) => alert.value)
+					.filter((alert) => alert !== undefined) as string[],
 				name: values.name,
-				labelExpression: values.labelExpression,
 				schedule: {
-					startTime: new Date(
-						handleTimeConversion(
-							values.startTime,
-							timezoneInitialValue,
-							values.timezone,
-							shouldKeepLocalTime,
-						),
-					),
-					timezone: values.timezone as string,
-					endTime: values.endTime
-						? new Date(
-								handleTimeConversion(
-									values.endTime,
-									timezoneInitialValue,
-									values.timezone,
-									shouldKeepLocalTime,
-								),
-							)
-						: undefined,
-					recurrence: values.recurrence as AlertmanagertypesRecurrenceDTO,
+					startTime: values.startTime?.format(),
+					endTime: values.endTime?.format(),
+					timezone: values.timezone!,
+					recurrence: values.recurrence,
 				},
 			};

@@ -214,50 +180,58 @@ export function PlannedDowntimeForm(
 			notifications,
 			refetchAllSchedules,
 			setIsOpen,
-			timezoneInitialValue,
 			showErrorModal,
 		],
 	);
 	const onFinish = async (values: PlannedDowntimeFormData): Promise<void> => {
+		const { recurrence } = values;
 		const recurrenceData =
-			values?.recurrence?.repeatType === recurrenceOptions.doesNotRepeat.value
+			!recurrence ||
+			recurrence.repeatType === recurrenceOptions.doesNotRepeat.value
 				? undefined
 				: {
-						duration: values.recurrence?.duration
-							? `${values.recurrence?.duration}${durationUnit}`
-							: undefined,
-						endTime: !isEmpty(values.endTime)
-							? handleTimeConversion(
-									values.endTime,
-									timezoneInitialValue,
-									values.timezone,
-									!isEditMode,
-								)
-							: undefined,
-						startTime: handleTimeConversion(
-							values.startTime,
-							timezoneInitialValue,
-							values.timezone,
-							!isEditMode,
-						),
-						repeatOn: !values.recurrence?.repeatOn?.length
-							? undefined
-							: values.recurrence?.repeatOn,
-						repeatType: values.recurrence?.repeatType,
+						duration: recurrence.duration
+							? `${recurrence.duration}${durationUnit}`
+							: '',
+						startTime: values.startTime!.format(),
+						endTime: values.endTime?.format(),
+						repeatOn: recurrence.repeatOn,
+						repeatType: recurrence.repeatType,
 					};

-		const payloadValues = {
+		await saveHandler({
 			...values,
-			recurrence: recurrenceData as AlertmanagertypesRecurrenceDTO | undefined,
-		};
-		await saveHanlder(payloadValues);
+			recurrence: recurrenceData,
+		});
 	};

-	const formValidationRules = [
-		{
-			required: true,
-		},
-	];
+	const handleFormData = (data: Partial<PlannedDowntimeFormData>): void => {
+		const { startTime, endTime, timezone } = data;
+		const update: Partial<PlannedDowntimeFormData> = {};
+
+		// If the set timezone doesn't match, update it.
+		if (
+			startTime &&
+			timezone &&
+			startTime.format() !== startTime.tz(timezone, true).format()
+		) {
+			update.startTime = startTime.tz(timezone, true);
+		}
+		if (
+			endTime &&
+			timezone &&
+			endTime.format() !== endTime.tz(timezone, true).format()
+		) {
+			update.endTime = endTime.tz(timezone, true);
+		}
+
+		if (!isEmpty(update)) {
+			data = { ...data, ...update };
+			form.setFieldsValue({ ...update });
+		}
+
+		setFormData(data);
+	};

 	const handleOk = async (): Promise<void> => {
 		await form.validateFields().catch(() => {
@@ -265,16 +239,11 @@ export function PlannedDowntimeForm(
 		});
 	};

-	const handleCancel = (): void => {
-		setIsOpen(false);
-	};
+	const handleCancel = (): void => setIsOpen(false);

-	const handleChange = (
-		_value: string,
-		options: DefaultOptionType | DefaultOptionType[],
-	): void => {
+	const handleAlertRulesChange: SelectProps['onChange'] = (_value, options) => {
 		form.setFieldValue(alertRuleFormName, options);
-		setSelectedTags(options);
+		setSelectedTags(Array.isArray(options) ? options : [options]);
 	};

 	const noTagRenderer: SelectProps['tagRender'] = () => <></>;
@@ -283,116 +252,51 @@ export function PlannedDowntimeForm(
 		if (!removedTag) {
 			return;
 		}
-		const newTags = selectedTags.filter(
-			(tag: DefaultOptionType) => tag.value !== removedTag,
-		);
+		const newTags = selectedTags.filter((tag) => tag.value !== removedTag);
 		form.setFieldValue(alertRuleFormName, newTags);
 		setSelectedTags(newTags);
 	};

-	const formatedInitialValues = useMemo(() => {
-		const initialAlertIds = initialValues.alertIds || [];
-		const isExistingSchedule = Boolean(initialValues.id);
-		const formData: PlannedDowntimeFormData = {
+	const formattedInitialValues = useMemo((): PlannedDowntimeFormData => {
+		const { schedule } = initialValues;
+		const startTime = schedule?.recurrence?.startTime || schedule?.startTime;
+		const endTime = schedule?.recurrence?.endTime || schedule?.endTime;
+
+		return {
 			name: defaultTo(initialValues.name, ''),
-			alertRuleScope:
-				isExistingSchedule && initialAlertIds.length === 0 ? 'all' : 'specific',
-			alertRules: getAlertOptionsFromIds(initialAlertIds, alertOptions),
-			endTime: getEndTime(initialValues) ? dayjs(getEndTime(initialValues)) : '',
-			startTime: initialValues.schedule?.startTime
-				? dayjs(initialValues.schedule?.startTime)
-				: '',
+			alertRules: getAlertOptionsFromIds(
+				initialValues.alertIds || [],
+				alertOptions,
+			),
+			startTime: startTime ? dayjs(startTime).tz(schedule.timezone) : null,
+			endTime: endTime ? dayjs(endTime).tz(schedule.timezone) : null,
 			recurrence: {
-				...initialValues.schedule?.recurrence,
-				repeatType: (!isScheduleRecurring(initialValues?.schedule)
+				...schedule?.recurrence,
+				repeatType: !isScheduleRecurring(schedule)
 					? recurrenceOptions.doesNotRepeat.value
-					: initialValues.schedule?.recurrence
-							?.repeatType) as AlertmanagertypesRecurrenceDTO['repeatType'],
-				duration: String(
-					getDurationInfo(initialValues.schedule?.recurrence?.duration as string)
-						?.value ?? '',
-				),
+					: schedule?.recurrence?.repeatType,
+				duration: getDurationInfo(schedule?.recurrence?.duration)?.value ?? '',
 			} as AlertmanagertypesRecurrenceDTO,
-			timezone: initialValues.schedule?.timezone as string,
-			labelExpression: initialValues.labelExpression || '',
+			timezone: schedule?.timezone as string,
 		};
-		return formData;
 	}, [initialValues, alertOptions]);

 	useEffect(() => {
-		setSelectedTags(formatedInitialValues.alertRules);
-		setAlertRuleScope(formatedInitialValues.alertRuleScope);
-		form.setFieldsValue({ ...formatedInitialValues });
-	}, [form, formatedInitialValues, initialValues]);
-
-	const timeZoneItems: DefaultOptionType[] = ALL_TIME_ZONES.map(
-		(timezone: string) => ({
-			label: timezone,
-			value: timezone,
-			key: timezone,
-		}),
-	);
-
-	const getTimezoneFormattedTime = (
-		time: string | dayjs.Dayjs,
-		timeZone?: string,
-		isEditMode?: boolean,
-		format?: string,
-	): string => {
-		if (!time) {
-			return '';
-		}
-		if (!timeZone) {
-			return dayjs(time).format(format);
-		}
-		return dayjs(time).tz(timeZone, isEditMode).format(format);
-	};
+		setSelectedTags(formattedInitialValues.alertRules);
+		form.setFieldsValue({ ...formattedInitialValues });
+	}, [form, formattedInitialValues, initialValues]);

 	const startTimeText = useMemo((): string => {
-		let startTime = formData?.startTime;
-		if (recurrenceType !== recurrenceOptions.doesNotRepeat.value) {
-			startTime =
-				(formData?.recurrence?.startTime
-					? dayjs(formData.recurrence.startTime).toISOString()
-					: '') ||
-				formData?.startTime ||
-				'';
-		}
-
+		const startTime = formData.startTime;
 		if (!startTime) {
 			return '';
 		}

-		if (formData.timezone) {
-			startTime = handleTimeConversion(
-				startTime,
-				timezoneInitialValue,
-				formData?.timezone,
-				!isEditMode,
-			);
-		}
-		const daysOfWeek = formData?.recurrence?.repeatOn;
+		const daysOfWeek = formData.recurrence?.repeatOn;

-		const formattedStartTime = getTimezoneFormattedTime(
-			startTime,
-			formData.timezone,
-			!isEditMode,
-			TIME_FORMAT,
-		);
-
-		const formattedStartDate = getTimezoneFormattedTime(
-			startTime,
-			formData.timezone,
-			!isEditMode,
-			DATE_FORMAT,
-		);
-
-		const ordinalFormat = getTimezoneFormattedTime(
-			startTime,
-			formData.timezone,
-			!isEditMode,
-			ORDINAL_FORMAT,
-		);
+		const formattedStartTime = startTime.format(TIME_FORMAT);
+		const formattedStartDate = startTime.format(DATE_FORMAT);
+		const ordinalFormat = startTime.format(ORDINAL_FORMAT);

 		const formattedDaysOfWeek = daysOfWeek?.join(', ');
 		switch (recurrenceType) {
@@ -407,49 +311,18 @@ export function PlannedDowntimeForm(
 			default:
 				return `Scheduled for ${formattedStartDate} starting at ${formattedStartTime}.`;
 		}
-	}, [formData, recurrenceType, isEditMode, timezoneInitialValue]);
+	}, [formData, recurrenceType, timezone]);

 	const endTimeText = useMemo((): string => {
-		let endTime = formData?.endTime;
-		if (recurrenceType !== recurrenceOptions.doesNotRepeat.value) {
-			endTime =
-				(formData?.recurrence?.endTime
-					? dayjs(formData.recurrence.endTime).toISOString()
-					: '') || '';
-
-			if (!isEditMode && !endTime) {
-				endTime = formData?.endTime || '';
-			}
-		}
-
+		const endTime = formData.endTime;
 		if (!endTime) {
 			return '';
 		}

-		if (formData.timezone) {
-			endTime = handleTimeConversion(
-				endTime,
-				timezoneInitialValue,
-				formData?.timezone,
-				!isEditMode,
-			);
-		}
-
-		const formattedEndTime = getTimezoneFormattedTime(
-			endTime,
-			formData.timezone,
-			!isEditMode,
-			TIME_FORMAT,
-		);
-
-		const formattedEndDate = getTimezoneFormattedTime(
-			endTime,
-			formData.timezone,
-			!isEditMode,
-			DATE_FORMAT,
-		);
+		const formattedEndTime = endTime.format(TIME_FORMAT);
+		const formattedEndDate = endTime.format(DATE_FORMAT);
 		return `Scheduled to end maintenance on ${formattedEndDate} at ${formattedEndTime}.`;
-	}, [formData, recurrenceType, isEditMode, timezoneInitialValue]);
+	}, [formData, recurrenceType, timezone]);

 	return (
 		<Modal
@@ -465,34 +338,28 @@ export function PlannedDowntimeForm(
 			footer={null}
 		>
 			<Form<PlannedDowntimeFormData>
-				name={initialValues.editMode ? 'edit-form' : 'create-form'}
+				name={isEditMode ? 'edit-form' : 'create-form'}
 				form={form}
 				layout="vertical"
 				className="createForm"
 				onFinish={onFinish}
 				onValuesChange={(): void => {
 					setRecurrenceType(form.getFieldValue('recurrence')?.repeatType as string);
-					setAlertRuleScope(form.getFieldValue('alertRuleScope') as AlertRuleScope);
-					setFormData(form.getFieldsValue());
+					handleFormData(form.getFieldsValue());
 				}}
 				autoComplete="off"
 			>
-				<Form.Item label="Name" name="name" rules={formValidationRules}>
+				<Form.Item label="Name" name="name" rules={requiredFieldRule}>
 					<Input placeholder="e.g. Upgrade downtime" />
 				</Form.Item>
 				<Form.Item
 					label="Starts from"
 					name="startTime"
-					rules={formValidationRules}
+					rules={requiredFieldRule}
 					className={!isEmpty(startTimeText) ? 'formItemWithBullet' : ''}
-					getValueProps={(value): any => ({
-						value: value ? dayjs(value).tz(timezoneInitialValue) : undefined,
-					})}
 				>
 					<DatePicker
-						format={(date): string =>
-							dayjs(date).tz(timezoneInitialValue).format(customFormat)
-						}
+						format={(date) => date.format(customFormat)}
 						showTime
 						renderExtraFooter={datePickerFooter}
 						showNow={false}
@@ -505,7 +372,7 @@ export function PlannedDowntimeForm(
 				<Form.Item
 					label="Repeats every"
 					name={['recurrence', 'repeatType']}
-					rules={formValidationRules}
+					rules={requiredFieldRule}
 				>
 					<Select
 						placeholder="Select option..."
@@ -516,7 +383,7 @@ export function PlannedDowntimeForm(
 					<Form.Item
 						label="Weekly occurernce"
 						name={['recurrence', 'repeatOn']}
-						rules={formValidationRules}
+						rules={requiredFieldRule}
 					>
 						<Select
 							placeholder="Select option..."
@@ -530,16 +397,14 @@ export function PlannedDowntimeForm(
 						<Form.Item
 							label="Duration"
 							name={['recurrence', 'duration']}
-							rules={formValidationRules}
+							rules={requiredFieldRule}
 						>
 							<Input
 								addonAfter={
 									<Select
 										defaultValue="m"
 										value={durationUnit}
-										onChange={(value): void => {
-											setDurationUnit(value);
-										}}
+										onChange={(value): void => setDurationUnit(value)}
 									>
 										<Select.Option value="m">Mins</Select.Option>
 										<Select.Option value="h">Hours</Select.Option>
@@ -553,8 +418,8 @@ export function PlannedDowntimeForm(
 							/>
 						</Form.Item>
 					)}
-				<Form.Item label="Timezone" name="timezone" rules={formValidationRules}>
-					<Select options={timeZoneItems} placeholder="Select timezone" showSearch />
+				<Form.Item label="Timezone" name="timezone" rules={requiredFieldRule}>
+					<Select options={TZ_OPTIONS} placeholder="Select timezone" showSearch />
 				</Form.Item>
 				<Form.Item
 					label="Ends on"
@@ -566,14 +431,9 @@ export function PlannedDowntimeForm(
 						},
 					]}
 					className={!isEmpty(endTimeText) ? 'formItemWithBullet' : ''}
-					getValueProps={(value): any => ({
-						value: value ? dayjs(value).tz(timezoneInitialValue) : undefined,
-					})}
 				>
 					<DatePicker
-						format={(date): string =>
-							dayjs(date).tz(timezoneInitialValue).format(customFormat)
-						}
+						format={(date) => date.format(customFormat)}
 						showTime
 						showNow={false}
 						renderExtraFooter={datePickerFooter}
@@ -584,101 +444,50 @@ export function PlannedDowntimeForm(
 					<div className="scheduleTimeInfoText">{endTimeText}</div>
 				)}
 				<div>
-					<Typography style={{ marginBottom: 8 }}>Silence Alerts</Typography>
-					<Form.Item
-						name="alertRuleScope"
-						initialValue="specific"
-						className="alert-rule-scope"
-					>
-						<Radio.Group>
-							<Radio value="all">All alert rules</Radio>
-							<Radio value="specific">Specific alert rules</Radio>
-						</Radio.Group>
-					</Form.Item>
-					{alertRuleScope === 'specific' && (
-						<>
-							<Form.Item noStyle shouldUpdate>
-								<AlertRuleTags
-									closable
-									selectedTags={selectedTags}
-									handleClose={handleClose}
-								/>
-							</Form.Item>
-							<Form.Item
-								name={alertRuleFormName}
-								rules={[
-									{
-										validator: async (
-											_rule,
-											value: DefaultOptionType[] | undefined,
-										): Promise<void> => {
-											if (!value || value.length === 0) {
-												throw new Error(
-													'Select at least one alert rule, or choose "All alert rules" to silence everything.',
-												);
-											}
-										},
-									},
-								]}
-							>
-								<Select
-									placeholder="Search for alerts rules or groups..."
-									mode="multiple"
-									status={isError ? 'error' : undefined}
-									loading={isLoading}
-									tagRender={noTagRenderer}
-									onChange={handleChange}
-									showSearch
-									options={alertOptions}
-									filterOption={(input, option): boolean =>
-										(option?.label as string)
-											?.toLowerCase()
-											?.includes(input.toLowerCase())
-									}
-									notFoundContent={
-										isLoading ? (
-											<span>
-												<Spin size="small" /> Loading...
-											</span>
-										) : (
-											<span>No alert available.</span>
-										)
-									}
-								>
-									{alertOptions?.map((option) => (
-										<Select.Option key={option.value} value={option.value}>
-											{option.label}
-										</Select.Option>
-									))}
-								</Select>
-							</Form.Item>
-						</>
-					)}
-					{alertRuleScope === 'all' && (
-						<Typography
-							className="alert-rule-info alert-rule-all-warning"
-							style={{ marginBottom: 16 }}
-						>
-							All alerts will be silenced for the duration of this maintenance window.
+					<div className="alert-rule-form">
+						<Typography style={{ marginBottom: 8 }}>Silence Alerts</Typography>
+						<Typography style={{ marginBottom: 8 }} className="alert-rule-info">
+							(Leave empty to silence all alerts)
 						</Typography>
-					)}
+					</div>
+					<Form.Item noStyle shouldUpdate>
+						<AlertRuleTags
+							closable
+							selectedTags={selectedTags}
+							handleClose={handleClose}
+						/>
+					</Form.Item>
+					<Form.Item name={alertRuleFormName}>
+						<Select
+							placeholder="Search for alerts rules or groups..."
+							mode="multiple"
+							status={isError ? 'error' : undefined}
+							loading={isLoading}
+							tagRender={noTagRenderer}
+							onChange={handleAlertRulesChange}
+							showSearch
+							options={alertOptions}
+							filterOption={(input, option): boolean =>
+								(option?.label as string)?.toLowerCase()?.includes(input.toLowerCase())
+							}
+							notFoundContent={
+								isLoading ? (
+									<span>
+										<Spin size="small" /> Loading...
+									</span>
+								) : (
+									<span>No alert available.</span>
+								)
+							}
+						>
+							{alertOptions?.map((option) => (
+								<Select.Option key={option.value} value={option.value}>
+									{option.label}
+								</Select.Option>
+							))}
+						</Select>
+					</Form.Item>
 				</div>
-				<Form.Item
-					label={
-						<span>
-							Label Expression&nbsp;
-							<Tooltip title='Filter by alert labels. Examples: env == "prod", region == "us-east-1" && severity == "critical"'>
-								<Info size={13} />
-							</Tooltip>
-						</span>
-					}
-					name="labelExpression"
-				>
-					<Input.TextArea
-						placeholder='e.g. env == "prod" && region == "us-east-1"'
-						autoSize={{ minRows: 2, maxRows: 4 }}
-					/>
-				</Form.Item>
 				<Form.Item style={{ marginBottom: 0 }}>
 					<ModalButtonWrapper>
 						<Button
--- a/frontend/src/container/PlannedDowntime/PlannedDowntimeList.tsx
+++ b/frontend/src/container/PlannedDowntime/PlannedDowntimeList.tsx
@@ -1,4 +1,4 @@
-import { ReactNode, useEffect } from 'react';
+import React, { ReactNode, useEffect } from 'react';
 import { UseQueryResult } from 'react-query';
 import { Color } from '@signozhq/design-tokens';
 import { Collapse, Flex, Space, Table, TableProps, Tag, Tooltip } from 'antd';
@@ -8,7 +8,7 @@ import type {
 	ListDowntimeSchedules200,
 	RenderErrorResponseDTO,
 	AlertmanagertypesPlannedMaintenanceDTO,
-	AlertmanagertypesRecurrenceDTO,
+	AlertmanagertypesScheduleDTO,
 } from 'api/generated/services/sigNoz.schemas';
 import type { ErrorType } from 'api/generatedAPIInstance';
 import cx from 'classnames';
@@ -19,12 +19,11 @@ import { CalendarClock, PenLine, Trash2 } from '@signozhq/icons';
 import { useAppContext } from 'providers/App/App';
 import { USER_ROLES } from 'types/roles';

-import { showErrorNotification } from '../../utils/error';
+import { showErrorNotification } from 'utils/error';
 import {
 	formatDateTime,
 	getAlertOptionsFromIds,
 	getDuration,
-	getEndTime,
 	recurrenceInfo,
 } from './PlannedDowntimeutils';

@@ -126,29 +125,28 @@ export function CollapseListContent({
 	created_at,
 	created_by_name,
 	created_by_email,
-	timeframe,
-	repeats,
+	schedule,
 	updated_at,
 	updated_by_name,
 	alertOptions,
-	timezone,
 }: {
 	created_at?: string;
 	created_by_name?: string;
 	created_by_email?: string;
-	timeframe: [string | undefined | null, string | undefined | null];
-	repeats?: AlertmanagertypesRecurrenceDTO | null;
+	schedule?: AlertmanagertypesScheduleDTO;
 	updated_at?: string;
 	updated_by_name?: string;
 	alertOptions?: DefaultOptionType[];
-	timezone?: string;
 }): JSX.Element {
+	const repeats = schedule?.recurrence;
 	const renderItems = (title: string, value: ReactNode): JSX.Element => (
 		<div className="render-item-collapse-list">
 			<Typography>{title}</Typography>
 			<div className="render-item-value">{value}</div>
 		</div>
 	);
+	const startTime = formatDateTime(schedule?.startTime, schedule?.timezone);
+	const endTime = formatDateTime(schedule?.endTime, schedule?.timezone);

 	return (
 		<Flex vertical>
@@ -183,16 +181,20 @@ export function CollapseListContent({

 			{renderItems(
 				'Timeframe',
-				timeframe[0] || timeframe[1] ? (
-					<Typography>{`${formatDateTime(timeframe[0])} ⎯ ${formatDateTime(
-						timeframe[1],
-					)}`}</Typography>
+				schedule?.startTime ? (
+					<Typography>{`${startTime} ⎯ ${endTime}`}</Typography>
 				) : (
 					'-'
 				),
 			)}
-			{renderItems('Timezone', <Typography>{timezone || '-'}</Typography>)}
-			{renderItems('Repeats', <Typography>{recurrenceInfo(repeats)}</Typography>)}
+			{renderItems(
+				'Timezone',
+				<Typography>{schedule?.timezone || '-'}</Typography>,
+			)}
+			{renderItems(
+				'Repeats',
+				<Typography>{recurrenceInfo(repeats, schedule?.timezone)}</Typography>,
+			)}
 			{renderItems(
 				'Alerts silenced',
 				alertOptions?.length ? (
@@ -202,7 +204,7 @@ export function CollapseListContent({
 						selectedTags={alertOptions}
 					/>
 				) : (
-					<Tag className="all-alerts-tag">All alert rules</Tag>
+					'-'
 				),
 			)}
 		</Flex>
@@ -232,22 +234,12 @@ export function CustomCollapseList(
 		setModalOpen,
 		handleDeleteDowntime,
 		setEditMode,
-		kind,
 	} = props;

 	const scheduleTime = schedule?.startTime
-		? dayjs(schedule.startTime).toISOString()
-		: createdAt
-			? dayjs(createdAt).toISOString()
-			: '';
-	// Combine time and date
-	const formattedDateAndTime = `Start time ⎯ ${formatDateTime(
-		defaultTo(scheduleTime, ''),
-	)} ${schedule?.timezone}`;
-	const endTime = getEndTime({
-		kind,
-		schedule,
-	} as Partial<AlertmanagertypesPlannedMaintenanceDTO>);
+		? dayjs(schedule.startTime).tz(schedule.timezone)
+		: createdAt || '';
+	const formattedDateAndTime = `Start time ⎯ ${formatDateTime(scheduleTime)} ${schedule?.timezone}`;

 	return (
 		<>
@@ -257,21 +249,16 @@ export function CustomCollapseList(
 						<HeaderComponent
 							duration={
 								schedule?.recurrence?.duration
-									? (schedule?.recurrence?.duration as string)
-									: getDuration(
-											schedule?.startTime ? dayjs(schedule.startTime).toISOString() : '',
-											schedule?.endTime ? dayjs(schedule.endTime).toISOString() : '',
-										)
+									? schedule.recurrence.duration
+									: getDuration(schedule?.startTime || '', schedule?.endTime || '')
 							}
 							name={defaultTo(name, '')}
-							handleEdit={(): void => {
+							handleEdit={() => {
 								setInitialValues({ ...props });
 								setModalOpen(true);
 								setEditMode(true);
 							}}
-							handleDelete={(): void => {
-								handleDeleteDowntime(id ?? '', name || '');
-							}}
+							handleDelete={() => handleDeleteDowntime(id ?? '', name || '')}
 						/>
 					}
 					key={id ?? ''}
@@ -279,17 +266,10 @@ export function CustomCollapseList(
 					<CollapseListContent
 						created_at={createdAt ? dayjs(createdAt).toISOString() : ''}
 						created_by_name={defaultTo(createdBy, '')}
-						timeframe={[
-							schedule?.startTime?.toString(),
-							typeof endTime === 'string' ? endTime : endTime?.toString(),
-						]}
-						repeats={
-							schedule?.recurrence as AlertmanagertypesRecurrenceDTO | null | undefined
-						}
+						schedule={schedule}
 						updated_at={updatedAt ? dayjs(updatedAt).toISOString() : ''}
 						updated_by_name={defaultTo(updatedBy, '')}
 						alertOptions={alertOptions}
-						timezone={defaultTo(schedule?.timezone, '')}
 					/>
 				</Panel>
 			</Collapse>
--- a/frontend/src/container/PlannedDowntime/PlannedDowntimeutils.ts
+++ b/frontend/src/container/PlannedDowntime/PlannedDowntimeutils.ts
@@ -11,8 +11,8 @@ import type {
 import type { ErrorType } from 'api/generatedAPIInstance';
 import { AxiosError } from 'axios';
 import { DATE_TIME_FORMATS } from 'constants/dateTimeFormats';
-import dayjs from 'dayjs';
-import { isEmpty, isEqual } from 'lodash-es';
+import dayjs, { Dayjs } from 'dayjs';
+import { isEmpty } from 'lodash-es';
 import APIError from 'types/api/error';

 type DateTimeString = string | null | undefined;
@@ -38,14 +38,20 @@ export const getDuration = (
 	return `${hours} hours`;
 };

-export const formatDateTime = (dateTimeString?: string | null): string => {
+export const formatDateTime = (
+	dateTimeString?: string | Dayjs | null,
+	timezone?: string,
+): string => {
 	if (!dateTimeString) {
 		return 'N/A';
 	}

-	return dayjs(dateTimeString.slice(0, 19)).format(
-		DATE_TIME_FORMATS.MONTH_DATETIME,
-	);
+	let dt = dayjs(dateTimeString);
+	if (timezone) {
+		dt = dt.tz(timezone);
+	}
+
+	return dt.format(DATE_TIME_FORMATS.MONTH_DATETIME);
 };

 export const getAlertOptionsFromIds = (
@@ -61,6 +67,7 @@ export const getAlertOptionsFromIds = (

 export const recurrenceInfo = (
 	recurrence?: AlertmanagertypesRecurrenceDTO | null,
+	timezone?: string,
 ): string => {
 	if (!recurrence) {
 		return 'No';
@@ -69,10 +76,10 @@ export const recurrenceInfo = (
 	const { startTime, duration, repeatOn, repeatType, endTime } = recurrence;

 	const formattedStartTime = startTime
-		? formatDateTime(dayjs(startTime).toISOString())
+		? formatDateTime(startTime, timezone)
 		: '';
 	const formattedEndTime = endTime
-		? `to ${formatDateTime(dayjs(endTime).toISOString())}`
+		? `to ${formatDateTime(endTime, timezone)}`
 		: '';
 	const weeklyRepeatString = repeatOn ? `on ${repeatOn.join(', ')}` : '';
 	const durationString = duration ? `- Duration: ${duration}` : '';
@@ -80,22 +87,20 @@ export const recurrenceInfo = (
 	return `Repeats - ${repeatType} ${weeklyRepeatString} from ${formattedStartTime} ${formattedEndTime} ${durationString}`;
 };

-export const defautlInitialValues: Partial<
-	AlertmanagertypesPlannedMaintenanceDTO & { editMode: boolean }
-> = {
-	name: '',
-	description: '',
-	schedule: {
-		timezone: '',
-		endTime: undefined,
-		recurrence: undefined,
-		startTime: undefined,
-	},
-	alertIds: [],
-	createdAt: undefined,
-	createdBy: undefined,
-	editMode: false,
-};
+export const defaultInitialValues: Partial<AlertmanagertypesPlannedMaintenanceDTO> =
+	{
+		name: '',
+		description: '',
+		schedule: {
+			timezone: '',
+			endTime: undefined,
+			recurrence: undefined,
+			startTime: undefined,
+		},
+		alertIds: [],
+		createdAt: undefined,
+		createdBy: undefined,
+	};

 type DeleteDowntimeScheduleProps = {
 	deleteDowntimeScheduleAsync: UseMutateAsyncFunction<
@@ -210,75 +215,6 @@ export const recurrenceOptionWithSubmenu: Option[] = [
 	recurrenceOptions.monthly,
 ];

-export const getRecurrenceOptionFromValue = (
-	value?: string | Option | null,
-): Option | null | undefined => {
-	if (!value) {
-		return null;
-	}
-	if (typeof value === 'string') {
-		return Object.values(recurrenceOptions).find(
-			(option) => option.value === value,
-		);
-	}
-	return value;
-};
-
-export const getEndTime = ({
-	kind,
-	schedule,
-}: Partial<
-	AlertmanagertypesPlannedMaintenanceDTO & {
-		editMode: boolean;
-	}
->): string | dayjs.Dayjs => {
-	if (kind === 'fixed') {
-		return schedule?.endTime ? dayjs(schedule.endTime).toISOString() : '';
-	}
-
-	return schedule?.recurrence?.endTime
-		? dayjs(schedule.recurrence.endTime).toISOString()
-		: '';
-};
-
 export const isScheduleRecurring = (
 	schedule?: AlertmanagertypesPlannedMaintenanceDTO['schedule'] | null,
 ): boolean => (schedule ? !isEmpty(schedule?.recurrence) : false);
-
-function convertUtcOffsetToTimezoneOffset(offsetMinutes: number): string {
-	const sign = offsetMinutes >= 0 ? '+' : '-';
-	const absOffset = Math.abs(offsetMinutes);
-	const hours = String(Math.floor(absOffset / 60)).padStart(2, '0');
-	const minutes = String(absOffset % 60).padStart(2, '0');
-	return `${sign}${hours}:${minutes}`;
-}
-
-export function formatWithTimezone(
-	dateValue?: string | dayjs.Dayjs,
-	timezone?: string,
-): string {
-	const parsedDate =
-		typeof dateValue === 'string' ? dateValue : dateValue?.format();
-
-	// Get the target timezone offset
-	const targetOffset = convertUtcOffsetToTimezoneOffset(
-		dayjs(dateValue).tz(timezone).utcOffset(),
-	);
-
-	return `${parsedDate?.substring(0, 19)}${targetOffset}`;
-}
-
-export function handleTimeConversion(
-	dateValue: string | dayjs.Dayjs,
-	timezoneInit?: string,
-	timezone?: string,
-	shouldKeepLocalTime?: boolean,
-): string {
-	const timezoneChanged = !isEqual(timezoneInit, timezone);
-	const initialTime = dayjs(dateValue).tz(timezoneInit);
-
-	const formattedTime = formatWithTimezone(initialTime, timezone);
-	return timezoneChanged
-		? formattedTime
-		: dayjs(dateValue).tz(timezone, shouldKeepLocalTime).format();
-}
--- a/frontend/src/container/PlannedDowntime/test/PlannedDowntime.test.tsx
+++ b/frontend/src/container/PlannedDowntime/test/PlannedDowntime.test.tsx
@@ -27,10 +27,10 @@ const MOCK_DATE_3 = '2024-01-03';
 const MOCK_DOWNTIME_1 = createMockDowntime({
 	id: '1',
 	name: MOCK_DOWNTIME_1_NAME,
-	createdAt: new Date(MOCK_DATE_1),
-	updatedAt: new Date(MOCK_DATE_1),
+	createdAt: MOCK_DATE_1,
+	updatedAt: MOCK_DATE_1,
 	schedule: buildSchedule({
-		startTime: new Date(MOCK_DATE_1),
+		startTime: MOCK_DATE_1,
 		timezone: 'UTC',
 	}),
 	alertIds: [],
@@ -39,10 +39,10 @@ const MOCK_DOWNTIME_1 = createMockDowntime({
 const MOCK_DOWNTIME_2 = createMockDowntime({
 	id: '2',
 	name: MOCK_DOWNTIME_2_NAME,
-	createdAt: new Date(MOCK_DATE_2),
-	updatedAt: new Date(MOCK_DATE_2),
+	createdAt: MOCK_DATE_2,
+	updatedAt: MOCK_DATE_2,
 	schedule: buildSchedule({
-		startTime: new Date(MOCK_DATE_2),
+		startTime: MOCK_DATE_2,
 		timezone: 'UTC',
 	}),
 	alertIds: [],
@@ -51,10 +51,10 @@ const MOCK_DOWNTIME_2 = createMockDowntime({
 const MOCK_DOWNTIME_3 = createMockDowntime({
 	id: '3',
 	name: MOCK_DOWNTIME_3_NAME,
-	createdAt: new Date(MOCK_DATE_3),
-	updatedAt: new Date(MOCK_DATE_3),
+	createdAt: MOCK_DATE_3,
+	updatedAt: MOCK_DATE_3,
 	schedule: buildSchedule({
-		startTime: new Date(MOCK_DATE_3),
+		startTime: MOCK_DATE_3,
 		timezone: 'UTC',
 	}),
 	alertIds: [],
--- a/frontend/src/container/PlannedDowntime/test/testUtils.ts
+++ b/frontend/src/container/PlannedDowntime/test/testUtils.ts
@@ -24,7 +24,7 @@ export const createMockDowntime = (
 	description: overrides.description ?? '',
 	schedule: buildSchedule({
 		timezone: 'UTC',
-		startTime: new Date('2024-01-01'),
+		startTime: '2024-01-01',
 		...overrides.schedule,
 	}),
 	alertIds: overrides.alertIds ?? [],
--- a/frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/SpanScopeSelector.tsx
+++ b/frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/SpanScopeSelector.tsx
@@ -16,35 +16,31 @@ enum SpanScope {
 	ENTRYPOINT_SPANS = 'entrypoint_spans',
 }

-interface SpanFilterConfig {
-	key: string;
-	type: string;
-}
-
 interface SpanScopeSelectorProps {
 	onChange?: (value: TagFilter) => void;
 	query?: IBuilderQuery;
 	skipQueryBuilderRedirect?: boolean;
 }

-const SPAN_FILTER_CONFIG: Record<SpanScope, SpanFilterConfig | null> = {
+const SPAN_FILTER_KEY: Record<SpanScope, string | null> = {
 	[SpanScope.ALL_SPANS]: null,
-	[SpanScope.ROOT_SPANS]: {
-		key: 'isRoot',
-		type: 'spanSearchScope',
-	},
-	[SpanScope.ENTRYPOINT_SPANS]: {
-		key: 'isEntryPoint',
-		type: 'spanSearchScope',
-	},
+	[SpanScope.ROOT_SPANS]: 'isRoot',
+	[SpanScope.ENTRYPOINT_SPANS]: 'isEntryPoint',
 };

-const createFilterItem = (config: SpanFilterConfig): TagFilterItem => ({
+const SCOPE_FILTER_KEYS = Object.values(SPAN_FILTER_KEY).filter(
+	(key): key is string => key !== null,
+);
+
+const isScopeFilter = (filter: TagFilterItem, key: string): boolean =>
+	filter.key?.key === key && String(filter.value) === 'true';
+
+const createFilterItem = (key: string): TagFilterItem => ({
 	id: uuid().slice(0, 8),
 	key: {
-		key: config.key,
+		key,
 		dataType: undefined,
-		type: config?.type,
+		type: '',
 	},
 	op: '=',
 	value: 'true',
@@ -70,12 +66,7 @@ function SpanScopeSelector({
 		filters: TagFilterItem[] = [],
 	): SpanScope => {
 		const hasFilter = (key: string): boolean =>
-			filters?.some(
-				(filter) =>
-					filter.key?.type === 'spanSearchScope' &&
-					filter.key.key === key &&
-					filter.value === 'true',
-			);
+			filters?.some((filter) => isScopeFilter(filter, key));

 		if (hasFilter('isRoot')) {
 			return SpanScope.ROOT_SPANS;
@@ -113,28 +104,21 @@ function SpanScopeSelector({

 			const nonScopeFilters = currentFilters.filter(
 				(filter) =>
-					!(
-						filter.key?.type === 'spanSearchScope' &&
-						(filter.key.key === 'isRoot' || filter.key.key === 'isEntryPoint')
-					),
+					!SCOPE_FILTER_KEYS.some((scopeKey) => isScopeFilter(filter, scopeKey)),
 			);

-			const config = SPAN_FILTER_CONFIG[newScope];
-			const newScopeFilter = config !== null ? [createFilterItem(config)] : [];
+			const scopeKey = SPAN_FILTER_KEY[newScope];
+			const newScopeFilter = scopeKey !== null ? [createFilterItem(scopeKey)] : [];

 			return [...nonScopeFilters, ...newScopeFilter];
 		};

-		const keysToRemove = Object.values(SPAN_FILTER_CONFIG)
-			.map((config) => config?.key)
-			.filter((key): key is string => typeof key === 'string');
-
 		newQuery.builder.queryData = newQuery.builder.queryData.map((item) => ({
 			...item,
 			filter: {
 				expression: removeKeysFromExpression(
 					item.filter?.expression ?? '',
-					keysToRemove,
+					SCOPE_FILTER_KEYS,
 				),
 			},
 			filters: {
--- a/frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/test/SpanScopeSelector.test.tsx
+++ b/frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/test/SpanScopeSelector.test.tsx
@@ -20,12 +20,16 @@ import SpanScopeSelector from '../SpanScopeSelector';

 const mockRedirectWithQueryBuilderData = jest.fn();

+const SCOPE_KEYS = ['isRoot', 'isEntryPoint'];
+const isScopeFilter = (filter: TagFilterItem): boolean =>
+	SCOPE_KEYS.includes(filter.key?.key ?? '') && String(filter.value) === 'true';
+
 // Helper to create filter items
 const createSpanScopeFilter = (key: string): TagFilterItem => ({
 	id: 'span-filter',
 	key: {
 		key,
-		type: 'spanSearchScope',
+		type: '',
 	},
 	op: '=',
 	value: 'true',
@@ -143,7 +147,6 @@ describe('SpanScopeSelector', () => {
 				expect.objectContaining({
 					key: expect.objectContaining({
 						key: expectedKey,
-						type: 'spanSearchScope',
 					}),
 					op: '=',
 					value: 'true',
@@ -162,11 +165,7 @@ describe('SpanScopeSelector', () => {
 			expect(mockRedirectWithQueryBuilderData).toHaveBeenCalled();
 			const updatedQuery = mockRedirectWithQueryBuilderData.mock.calls[0][0];
 			const filters = updatedQuery.builder.queryData[0].filters.items;
-			expect(filters).not.toContainEqual(
-				expect.objectContaining({
-					key: expect.objectContaining({ type: 'spanSearchScope' }),
-				}),
-			);
+			expect(filters.some(isScopeFilter)).toBe(false);
 		});

 		it('should add isRoot filter when selecting ROOT_SPANS', async () => {
@@ -206,6 +205,27 @@ describe('SpanScopeSelector', () => {
 				await expect(screen.findByText(expectedText)).resolves.toBeInTheDocument();
 			},
 		);
+
+		// Round-trip from filter.expression can deserialize the value as a boolean
+		// `true` (unquoted in the expression) instead of the string `'true'` produced
+		// by the dropdown. The dropdown must still recognize that as the scope filter.
+		it.each([
+			['Root Spans', 'isRoot'],
+			['Entrypoint Spans', 'isEntryPoint'],
+		])(
+			'should initialize with %s selected when %s = true (boolean value)',
+			async (expectedText, filterKey) => {
+				const booleanScopeFilter: TagFilterItem = {
+					id: 'span-filter',
+					key: { key: filterKey, type: '' },
+					op: '=',
+					value: true as unknown as string,
+				};
+				const queryWithFilter = createQueryWithFilters([booleanScopeFilter]);
+				renderWithContext(queryWithFilter, undefined, defaultQueryBuilderQuery);
+				await expect(screen.findByText(expectedText)).resolves.toBeInTheDocument();
+			},
+		);
 	});

 	describe('when onChange and query props are provided', () => {
@@ -233,9 +253,7 @@ describe('SpanScopeSelector', () => {
 				expect(items).toContainEqual(nonScopeItem);
 			});

-			const scopeFiltersInPayload = items.filter(
-				(filter) => filter.key?.type === 'spanSearchScope',
-			);
+			const scopeFiltersInPayload = items.filter(isScopeFilter);

 			if (expectedScopeKey) {
 				expect(scopeFiltersInPayload).toHaveLength(1);
@@ -434,9 +452,7 @@ describe('SpanScopeSelector', () => {
 				items: [],
 			};
 			// Count non-scope filters
-			const nonScopeFilters = items.filter(
-				(filter) => filter.key?.type !== 'spanSearchScope',
-			);
+			const nonScopeFilters = items.filter((filter) => !isScopeFilter(filter));
 			expect(nonScopeFilters).toHaveLength(1);

 			expect(nonScopeFilters).toContainEqual(
--- a/frontend/src/mocks-server/mockdata/roles.ts
+++ b/frontend/src/mocks-server/mockdata/roles.ts
@@ -5,8 +5,8 @@ const orgId = '019ba2bb-2fa1-7b24-8159-cfca08617ef9';
 export const managedRoles: AuthtypesRoleDTO[] = [
 	{
 		id: '019c24aa-2248-756f-9833-984f1ab63819',
-		createdAt: new Date('2026-02-03T18:00:55.624356Z'),
-		updatedAt: new Date('2026-02-03T18:00:55.624356Z'),
+		createdAt: '2026-02-03T18:00:55.624356Z',
+		updatedAt: '2026-02-03T18:00:55.624356Z',
 		name: 'signoz-admin',
 		description:
 			'Role assigned to users who have full administrative access to SigNoz resources.',
@@ -15,8 +15,8 @@ export const managedRoles: AuthtypesRoleDTO[] = [
 	},
 	{
 		id: '019c24aa-2248-757c-9faf-7b1e899751e0',
-		createdAt: new Date('2026-02-03T18:00:55.624359Z'),
-		updatedAt: new Date('2026-02-03T18:00:55.624359Z'),
+		createdAt: '2026-02-03T18:00:55.624359Z',
+		updatedAt: '2026-02-03T18:00:55.624359Z',
 		name: 'signoz-editor',
 		description:
 			'Role assigned to users who can create, edit, and manage SigNoz resources but do not have full administrative privileges.',
@@ -25,8 +25,8 @@ export const managedRoles: AuthtypesRoleDTO[] = [
 	},
 	{
 		id: '019c24aa-2248-7585-a129-4188b3473c27',
-		createdAt: new Date('2026-02-03T18:00:55.624362Z'),
-		updatedAt: new Date('2026-02-03T18:00:55.624362Z'),
+		createdAt: '2026-02-03T18:00:55.624362Z',
+		updatedAt: '2026-02-03T18:00:55.624362Z',
 		name: 'signoz-viewer',
 		description:
 			'Role assigned to users who have read-only access to SigNoz resources.',
@@ -38,8 +38,8 @@ export const managedRoles: AuthtypesRoleDTO[] = [
 export const customRoles: AuthtypesRoleDTO[] = [
 	{
 		id: '019c24aa-3333-0001-aaaa-111111111111',
-		createdAt: new Date('2026-02-10T10:30:00.000Z'),
-		updatedAt: new Date('2026-02-12T14:20:00.000Z'),
+		createdAt: '2026-02-10T10:30:00.000Z',
+		updatedAt: '2026-02-12T14:20:00.000Z',
 		name: 'billing-manager',
 		description: 'Custom role for managing billing and invoices.',
 		type: 'custom',
@@ -47,8 +47,8 @@ export const customRoles: AuthtypesRoleDTO[] = [
 	},
 	{
 		id: '019c24aa-3333-0002-bbbb-222222222222',
-		createdAt: new Date('2026-02-11T09:00:00.000Z'),
-		updatedAt: new Date('2026-02-13T11:45:00.000Z'),
+		createdAt: '2026-02-11T09:00:00.000Z',
+		updatedAt: '2026-02-13T11:45:00.000Z',
 		name: 'dashboard-creator',
 		description: 'Custom role allowing users to create and manage dashboards.',
 		type: 'custom',
--- a/frontend/src/pages/AIAssistantPage/AIAssistantPage.tsx
+++ b/frontend/src/pages/AIAssistantPage/AIAssistantPage.tsx
@@ -1,9 +1,12 @@
 import { useCallback, useEffect, useRef } from 'react';
-import { useHistory, useParams } from 'react-router-dom';
+import { useHistory, useLocation, useParams } from 'react-router-dom';

+import logEvent from 'api/common/logEvent';
 import ROUTES from 'constants/routes';

 import ConversationView from 'container/AIAssistant/ConversationView';
+import { AIAssistantEvents } from 'container/AIAssistant/events';
+import { normalizePage } from 'container/AIAssistant/hooks/useAIAssistantAnalyticsContext';
 import { useAIAssistantStore } from 'container/AIAssistant/store/useAIAssistantStore';
 import { VariantContext } from 'container/AIAssistant/VariantContext';
 import { Sparkles } from '@signozhq/icons';
@@ -17,8 +20,27 @@ interface RouteParams {

 export default function AIAssistantPage(): JSX.Element {
 	const history = useHistory();
+	const location = useLocation<{ fromInApp?: boolean } | undefined>();
+	const { pathname } = location;
 	const { conversationId } = useParams<RouteParams>();

+	// Skip the mount-time Opened fire when the user expanded an already-open
+	// drawer/modal — that surface already emitted Opened with the right source.
+	// Router state (vs a module flag) survives StrictMode double-mount and
+	// aborted navigations.
+	const fromInApp = location.state?.fromInApp === true;
+	useEffect(() => {
+		if (fromInApp) {
+			return;
+		}
+		void logEvent(AIAssistantEvents.Opened, {
+			source: 'deeplink',
+			currentPage: normalizePage(pathname),
+		});
+		// Only on mount; route param changes inside the same page aren't a re-open.
+		// eslint-disable-next-line react-hooks/exhaustive-deps
+	}, []);
+
 	const conversations = useAIAssistantStore((s) => s.conversations);
 	const activeConversationId = useAIAssistantStore(
 		(s) => s.activeConversationId,
@@ -71,9 +93,14 @@ export default function AIAssistantPage(): JSX.Element {
 	);

 	const handleNewConversation = useCallback(() => {
+		void logEvent(AIAssistantEvents.NewChatClicked, {
+			page: normalizePage(pathname),
+			mode: 'full_screen',
+			source: 'history_list',
+		});
 		const newId = startNewConversation();
 		history.push(ROUTES.AI_ASSISTANT.replace(':conversationId', newId));
-	}, [startNewConversation, history]);
+	}, [startNewConversation, history, pathname]);

 	// Prefer the URL param, but fall back to the store's `activeConversationId`
 	// for the brief render after a re-key (client UUID → backend threadId), so
--- a/frontend/src/pages/TraceDetailsV3/SpanHoverCard/SpanHoverCard.tsx
+++ b/frontend/src/pages/TraceDetailsV3/SpanHoverCard/SpanHoverCard.tsx
@@ -112,11 +112,11 @@ export function SpanHoverCard({
 		}
 		const span = spans[idx];
 		const previewRows: SpanPreviewRow[] = previewFields
-			.filter((f) => !RESERVED_PREVIEW_KEYS.has(f.key))
+			.filter((f) => !RESERVED_PREVIEW_KEYS.has(f.name))
 			.map((f) => {
-				const value = getSpanAttribute(span, f.key);
+				const value = getSpanAttribute(span, f.name);
 				return value !== undefined && value !== ''
-					? { key: f.key, value: String(value) }
+					? { key: f.name, value: String(value) }
 					: null;
 			})
 			.filter((r): r is SpanPreviewRow => r !== null);
--- a/frontend/src/pages/TraceDetailsV3/TraceDetailsHeader/TraceDetailsHeader.tsx
+++ b/frontend/src/pages/TraceDetailsV3/TraceDetailsHeader/TraceDetailsHeader.tsx
@@ -10,6 +10,7 @@ import {
 import { Skeleton } from 'antd';
 import setLocalStorageKey from 'api/browser/localstorage/set';
 import cx from 'classnames';
+import FieldsSelector from 'components/FieldsSelector';
 import HttpStatusBadge from 'components/HttpStatusBadge/HttpStatusBadge';
 import { LOCALSTORAGE } from 'constants/localStorage';
 import ROUTES from 'constants/routes';
@@ -23,12 +24,10 @@ import {
 	Server,
 	Timer,
 } from '@signozhq/icons';
-import { FloatingPanel } from 'periscope/components/FloatingPanel';
 import KeyValueLabel from 'periscope/components/KeyValueLabel';
 import { TraceDetailV2URLProps } from 'types/api/trace/getTraceV2';
 import { DataSource } from 'types/common/queryBuilder';

-import FieldsSettings from '../components/FieldsSettings/FieldsSettings';
 import { useTraceStore } from '../stores/traceStore';
 import AnalyticsPanel from '../SpanDetailsPanel/AnalyticsPanel/AnalyticsPanel';
 import Filters from '../TraceWaterfall/TraceWaterfallStates/Success/Filters/Filters';
@@ -226,26 +225,15 @@ function TraceDetailsHeader({
 				</div>
 			)}

-			{isPreviewFieldsOpen && (
-				<FloatingPanel
-					isOpen
-					width={350}
-					height={window.innerHeight - 100}
-					defaultPosition={{
-						x: window.innerWidth - 350 - 100,
-						y: 50,
-					}}
-					enableResizing={false}
-				>
-					<FieldsSettings
-						title="Preview fields"
-						fields={previewFields}
-						onFieldsChange={setPreviewFields}
-						onClose={(): void => setIsPreviewFieldsOpen(false)}
-						dataSource={DataSource.TRACES}
-					/>
-				</FloatingPanel>
-			)}
+			<FieldsSelector
+				isOpen={isPreviewFieldsOpen}
+				title="Preview fields"
+				fields={previewFields}
+				onFieldsChange={setPreviewFields}
+				onClose={(): void => setIsPreviewFieldsOpen(false)}
+				signal={DataSource.TRACES}
+				maxFields={10}
+			/>

 			<AnalyticsPanel
 				isOpen={isAnalyticsOpen}
--- a/frontend/src/pages/TraceDetailsV3/TraceFlamegraph/TraceFlamegraph.tsx
+++ b/frontend/src/pages/TraceDetailsV3/TraceFlamegraph/TraceFlamegraph.tsx
@@ -9,10 +9,7 @@ import { SpanV3 } from 'types/api/trace/getTraceV3';
 import { COLOR_BY_FIELDS } from '../constants';
 import { useTraceStore } from '../stores/traceStore';
 import Error from '../TraceWaterfall/TraceWaterfallStates/Error/Error';
-import {
-	mergeTelemetryFieldKeys,
-	toTelemetryFieldKey,
-} from '../utils/previewFields';
+import { mergeTelemetryFieldKeys } from '../utils/previewFields';
 import { FLAMEGRAPH_SPAN_LIMIT } from './constants';
 import FlamegraphCanvas from './FlamegraphCanvas';
 import { useVisualLayoutWorker } from './hooks/useVisualLayoutWorker';
@@ -60,11 +57,7 @@ function TraceFlamegraph({
 	// Color-by fields baseline + user-picked preview fields. De-duped by `name`,
 	// color-by entries first so their canonical metadata wins on collision.
 	const flamegraphSelectFields = useMemo(
-		() =>
-			mergeTelemetryFieldKeys(
-				COLOR_BY_FIELDS,
-				previewFields.map(toTelemetryFieldKey),
-			),
+		() => mergeTelemetryFieldKeys(COLOR_BY_FIELDS, previewFields),
 		[previewFields],
 	);

--- a/frontend/src/pages/TraceDetailsV3/TraceFlamegraph/hooks/useFlamegraphHover.ts
+++ b/frontend/src/pages/TraceDetailsV3/TraceFlamegraph/hooks/useFlamegraphHover.ts
@@ -144,14 +144,14 @@ export function useFlamegraphHover(
 	const buildPreviewRows = useCallback(
 		(span: FlamegraphSpan): SpanPreviewRowData[] =>
 			previewFields
-				.filter((field) => !RESERVED_PREVIEW_KEYS.has(field.key))
+				.filter((field) => !RESERVED_PREVIEW_KEYS.has(field.name))
 				.map((field) => {
 					const value = getSpanAttribute(
 						{ resource: span.resource, attributes: span.attributes },
-						field.key,
+						field.name,
 					);
 					return value !== undefined && value !== ''
-						? { key: field.key, value: String(value) }
+						? { key: field.name, value: String(value) }
 						: null;
 				})
 				.filter((r): r is SpanPreviewRowData => r !== null),
--- a/frontend/src/pages/TraceDetailsV3/components/FieldsSettings/FieldsSettings.tsx
+++ b/frontend/src/pages/TraceDetailsV3/components/FieldsSettings/FieldsSettings.tsx
@@ -1,149 +0,0 @@
-import { useCallback, useMemo, useState } from 'react';
-import { toast } from '@signozhq/ui/sonner';
-import { Button } from '@signozhq/ui/button';
-import { Input } from '@signozhq/ui/input';
-import useDebouncedFn from 'hooks/useDebouncedFunction';
-import { Check, TableColumnsSplit, X } from '@signozhq/icons';
-import { BaseAutocompleteData } from 'types/api/queryBuilder/queryAutocompleteResponse';
-import { DataSource } from 'types/common/queryBuilder';
-
-import AddedFields from './AddedFields';
-import OtherFields from './OtherFields';
-
-import styles from './FieldsSettings.module.scss';
-
-const MAX_FIELDS_DEFAULT = 10;
-
-interface FieldsSettingsProps {
-	title: string;
-	// Picker's native shape (`BaseAutocompleteData`) is preserved end-to-end so
-	// downstream consumers (flamegraph `selectFields`, hover popovers) get full
-	// field metadata without a lossy conversion at add-time.
-	fields: BaseAutocompleteData[];
-	onFieldsChange: (fields: BaseAutocompleteData[]) => void;
-	onClose: () => void;
-	dataSource: DataSource;
-	maxFields?: number;
-}
-
-function FieldsSettings({
-	title,
-	fields,
-	onFieldsChange,
-	onClose,
-	dataSource,
-	maxFields = MAX_FIELDS_DEFAULT,
-}: FieldsSettingsProps): JSX.Element {
-	// Local draft state — changes here don't persist until Save
-	const [draftFields, setDraftFields] = useState<BaseAutocompleteData[]>(fields);
-	const [inputValue, setInputValue] = useState('');
-	const [debouncedInputValue, setDebouncedInputValue] = useState('');
-
-	const debouncedUpdate = useDebouncedFn((value) => {
-		setDebouncedInputValue(value as string);
-	}, 400);
-
-	const handleInputChange = useCallback(
-		(e: React.ChangeEvent<HTMLInputElement>): void => {
-			const value = e.target.value.trim().toLowerCase();
-			setInputValue(value);
-			debouncedUpdate(value);
-		},
-		[debouncedUpdate],
-	);
-
-	const handleAdd = useCallback(
-		(field: BaseAutocompleteData): void => {
-			if (draftFields.length >= maxFields) {
-				return;
-			}
-			if (draftFields.some((f) => f.key === field.key)) {
-				return;
-			}
-			setDraftFields((prev) => [...prev, field]);
-		},
-		[draftFields, maxFields],
-	);
-
-	const handleSave = useCallback((): void => {
-		onFieldsChange(draftFields);
-		toast.success('Saved successfully', {
-			position: 'top-right',
-		});
-		onClose();
-	}, [draftFields, onFieldsChange, onClose]);
-
-	const handleDiscard = useCallback((): void => {
-		setDraftFields(fields);
-	}, [fields]);
-
-	const hasUnsavedChanges = useMemo(
-		() =>
-			!(
-				draftFields.length === fields.length &&
-				draftFields.every((f, i) => f.key === fields[i]?.key)
-			),
-		[draftFields, fields],
-	);
-
-	const isAtLimit = draftFields.length >= maxFields;
-
-	return (
-		<div className={styles.root}>
-			<div className={styles.header}>
-				<div className={styles.title}>
-					<TableColumnsSplit size={16} />
-					{title}
-				</div>
-				<X className={styles.closeIcon} size={16} onClick={onClose} />
-			</div>
-
-			<section>
-				<Input
-					className={styles.searchInput}
-					type="text"
-					value={inputValue}
-					placeholder="Search for a field..."
-					onChange={handleInputChange}
-				/>
-			</section>
-
-			<AddedFields
-				inputValue={inputValue}
-				fields={draftFields}
-				onFieldsChange={setDraftFields}
-			/>
-
-			<OtherFields
-				dataSource={dataSource}
-				debouncedInputValue={debouncedInputValue}
-				addedFields={draftFields}
-				onAdd={handleAdd}
-				isAtLimit={isAtLimit}
-			/>
-
-			{hasUnsavedChanges && (
-				<div className={styles.footer}>
-					<Button
-						variant="outlined"
-						color="secondary"
-						onClick={handleDiscard}
-						prefix={<X width={14} height={14} />}
-					>
-						Discard
-					</Button>
-					<Button
-						variant="solid"
-						color="primary"
-						onClick={handleSave}
-						prefix={<Check width={14} height={14} />}
-					>
-						Save changes
-					</Button>
-				</div>
-			)}
-		</div>
-	);
-}
-
-export default FieldsSettings;
--- a/frontend/src/pages/TraceDetailsV3/stores/traceStore.ts
+++ b/frontend/src/pages/TraceDetailsV3/stores/traceStore.ts
@@ -15,6 +15,7 @@ import {
 	AGGREGATIONS,
 	getAggregationMap as findAggregationMap,
 } from '../utils/aggregations';
+import { toTelemetryFieldKey } from '../utils/previewFields';

 interface MutateOptions {
 	onSuccess?: () => void;
@@ -37,7 +38,7 @@ interface TraceStoreState {
 	// --- Derived state (cached for reference stability) ---
 	colorByField: TelemetryFieldKey;
 	availableColorByOptions: ColorByOption[];
-	previewFields: BaseAutocompleteData[];
+	previewFields: TelemetryFieldKey[];

 	// --- Setters used only by TraceStoreSync ---
 	setAggregations: (
@@ -51,7 +52,7 @@ interface TraceStoreState {

 	// --- Public actions (called from components) ---
 	setColorByField: (field: TelemetryFieldKey) => void;
-	setPreviewFields: (next: BaseAutocompleteData[]) => void;
+	setPreviewFields: (next: TelemetryFieldKey[]) => void;
 }

 /**
@@ -105,21 +106,31 @@ function deriveColorState(
 }

 /**
- * Reads preview fields from user preferences and filters out malformed entries.
+ * Reads preview fields from user preferences and normalizes them to
+ * `TelemetryFieldKey`. Legacy entries persisted as `BaseAutocompleteData` (with
+ * a `.key` instead of `.name`) are upgraded in-place so existing users don't
+ * lose their saved preview-field selection.
 */
 function derivePreviewFields(
 	userPreferences: UserPreference[] | null,
-): BaseAutocompleteData[] {
+): TelemetryFieldKey[] {
 	const pref = userPreferences?.find(
 		(p) => p.name === USER_PREFERENCES.SPAN_DETAILS_PREVIEW_ATTRIBUTES,
 	);
-	const raw = (pref?.value as BaseAutocompleteData[] | undefined) ?? [];
-	return raw.filter(
-		(f): f is BaseAutocompleteData =>
-			typeof f === 'object' &&
-			f !== null &&
-			typeof (f as { key?: unknown }).key === 'string',
-	);
+	const raw = (pref?.value as unknown[] | undefined) ?? [];
+	const result: TelemetryFieldKey[] = [];
+	for (const entry of raw) {
+		if (typeof entry !== 'object' || entry === null) {
+			continue;
+		}
+		const candidate = entry as { name?: unknown; key?: unknown };
+		if (typeof candidate.name === 'string') {
+			result.push(entry as TelemetryFieldKey);
+		} else if (typeof candidate.key === 'string') {
+			result.push(toTelemetryFieldKey(entry as BaseAutocompleteData));
+		}
+	}
+	return result;
 }

 export const useTraceStore = create<TraceStoreState>()((set, get) => ({
--- a/frontend/src/pages/TraceDetailsV3/utils/previewFields.ts
+++ b/frontend/src/pages/TraceDetailsV3/utils/previewFields.ts
@@ -41,8 +41,9 @@ function mapFieldDataType(
 }

 /**
- * Convert a picker-shaped field to the API's `TelemetryFieldKey` shape used
- * for `selectFields` on the flamegraph request.
+ * Upgrades a legacy `BaseAutocompleteData`-shaped preview field (persisted by
+ * pre-migration clients) to the current `TelemetryFieldKey` shape. Kept around
+ * for the read-side compatibility shim in `traceStore.derivePreviewFields`.
 */
 export function toTelemetryFieldKey(
 	field: BaseAutocompleteData,
@@ -51,6 +52,7 @@ export function toTelemetryFieldKey(
 		name: field.key,
 		fieldContext: mapFieldContext(field.type),
 		fieldDataType: mapFieldDataType(field.dataType),
+		isIndexed: field.isIndexed,
 	};
 }

--- a/pkg/alertmanager/alertmanagerserver/maintenance_muter.go
+++ b/pkg/alertmanager/alertmanagerserver/maintenance_muter.go
@@ -42,7 +42,7 @@ func (m *MaintenanceMuter) Mutes(ctx context.Context, lset model.LabelSet) bool
 	}
 	now := time.Now()
 	for _, mw := range m.getMaintenances(ctx) {
-		if mw.ShouldSkip(ruleID, now, lset) {
+		if mw.ShouldSkip(ruleID, now) {
 			return true
 		}
 	}
@@ -61,7 +61,7 @@ func (m *MaintenanceMuter) MutedBy(ctx context.Context, lset model.LabelSet) []s
 	var ids []string
 	now := time.Now()
 	for _, mw := range m.getMaintenances(ctx) {
-		if mw.ShouldSkip(ruleID, now, lset) {
+		if mw.ShouldSkip(ruleID, now) {
 			ids = append(ids, mw.ID.String())
 		}
 	}
--- a/pkg/alertmanager/alertmanagerstore/sqlalertmanagerstore/maintenance.go
+++ b/pkg/alertmanager/alertmanagerstore/sqlalertmanagerstore/maintenance.go
@@ -85,11 +85,10 @@ func (r *maintenance) CreatePlannedMaintenance(ctx context.Context, maintenance
 			CreatedBy: claims.Email,
 			UpdatedBy: claims.Email,
 		},
-		Name:            maintenance.Name,
-		Description:     maintenance.Description,
-		Schedule:        maintenance.Schedule,
-		OrgID:           claims.OrgID,
-		LabelExpression: maintenance.LabelExpression,
+		Name:        maintenance.Name,
+		Description: maintenance.Description,
+		Schedule:    maintenance.Schedule,
+		OrgID:       claims.OrgID,
 	}

 	maintenanceRules := make([]*alertmanagertypes.StorablePlannedMaintenanceRule, 0)
@@ -124,6 +123,7 @@ func (r *maintenance) CreatePlannedMaintenance(ctx context.Context, maintenance
 				NewInsert().
 				Model(&maintenanceRules).
 				Exec(ctx)
+
 			if err != nil {
 				return err
 			}
@@ -136,16 +136,15 @@ func (r *maintenance) CreatePlannedMaintenance(ctx context.Context, maintenance
 	}

 	return &alertmanagertypes.PlannedMaintenance{
-		ID:              storablePlannedMaintenance.ID,
-		Name:            storablePlannedMaintenance.Name,
-		Description:     storablePlannedMaintenance.Description,
-		Schedule:        storablePlannedMaintenance.Schedule,
-		RuleIDs:         maintenance.AlertIds,
-		LabelExpression: maintenance.LabelExpression,
-		CreatedAt:       storablePlannedMaintenance.CreatedAt,
-		CreatedBy:       storablePlannedMaintenance.CreatedBy,
-		UpdatedAt:       storablePlannedMaintenance.UpdatedAt,
-		UpdatedBy:       storablePlannedMaintenance.UpdatedBy,
+		ID:          storablePlannedMaintenance.ID,
+		Name:        storablePlannedMaintenance.Name,
+		Description: storablePlannedMaintenance.Description,
+		Schedule:    storablePlannedMaintenance.Schedule,
+		RuleIDs:     maintenance.AlertIds,
+		CreatedAt:   storablePlannedMaintenance.CreatedAt,
+		CreatedBy:   storablePlannedMaintenance.CreatedBy,
+		UpdatedAt:   storablePlannedMaintenance.UpdatedAt,
+		UpdatedBy:   storablePlannedMaintenance.UpdatedBy,
 	}, nil
 }

@@ -186,11 +185,10 @@ func (r *maintenance) UpdatePlannedMaintenance(ctx context.Context, maintenance
 			CreatedBy: existing.CreatedBy,
 			UpdatedBy: claims.Email,
 		},
-		Name:            maintenance.Name,
-		Description:     maintenance.Description,
-		Schedule:        maintenance.Schedule,
-		OrgID:           claims.OrgID,
-		LabelExpression: maintenance.LabelExpression,
+		Name:        maintenance.Name,
+		Description: maintenance.Description,
+		Schedule:    maintenance.Schedule,
+		OrgID:       claims.OrgID,
 	}

 	storablePlannedMaintenanceRules := make([]*alertmanagertypes.StorablePlannedMaintenanceRule, 0)
@@ -226,6 +224,7 @@ func (r *maintenance) UpdatePlannedMaintenance(ctx context.Context, maintenance
 			Model(new(alertmanagertypes.StorablePlannedMaintenanceRule)).
 			Where("planned_maintenance_id = ?", storablePlannedMaintenance.ID.StringValue()).
 			Exec(ctx)
+
 		if err != nil {
 			return err
 		}
@@ -242,6 +241,7 @@ func (r *maintenance) UpdatePlannedMaintenance(ctx context.Context, maintenance
 		}

 		return nil
+
 	})
 	if err != nil {
 		return err
--- a/pkg/config/envprovider/provider_test.go
+++ b/pkg/config/envprovider/provider_test.go
@@ -2,8 +2,6 @@ package envprovider

 import (
 	"context"
-	"os"
-	"strings"
 	"testing"

 	"github.com/SigNoz/signoz/pkg/config"
@@ -11,21 +9,7 @@ import (
 	"github.com/stretchr/testify/require"
 )

-// clearSignozEnv unsets all existing SIGNOZ_* env vars for the duration of the test.
-func clearSignozEnv(t *testing.T) {
-	t.Helper()
-	for _, kv := range os.Environ() {
-		if strings.HasPrefix(kv, prefix) {
-			key := strings.SplitN(kv, "=", 2)[0]
-			orig, _ := os.LookupEnv(key)
-			os.Unsetenv(key)
-			t.Cleanup(func() { os.Setenv(key, orig) })
-		}
-	}
-}
-
 func TestGetWithStrings(t *testing.T) {
-	clearSignozEnv(t)
 	t.Setenv("SIGNOZ_K1_K2", "string")
 	t.Setenv("SIGNOZ_K3__K4", "string")
 	t.Setenv("SIGNOZ_K5__K6_K7__K8", "string")
@@ -47,7 +31,6 @@ func TestGetWithStrings(t *testing.T) {
 }

 func TestGetWithNoPrefix(t *testing.T) {
-	clearSignozEnv(t)
 	t.Setenv("K1_K2", "string")
 	t.Setenv("K3_K4", "string")
 	expected := map[string]any{}
@@ -60,7 +43,6 @@ func TestGetWithNoPrefix(t *testing.T) {
 }

 func TestGetWithGoTypes(t *testing.T) {
-	clearSignozEnv(t)
 	t.Setenv("SIGNOZ_BOOL", "true")
 	t.Setenv("SIGNOZ_STRING", "string")
 	t.Setenv("SIGNOZ_INT", "1")
--- a/pkg/modules/dashboard/impldashboard/module.go
+++ b/pkg/modules/dashboard/impldashboard/module.go
@@ -38,7 +38,7 @@ func NewModule(store dashboardtypes.Store, settings factory.ProviderSettings, an
 }

 func (module *module) Create(ctx context.Context, orgID valuer.UUID, createdBy string, creator valuer.UUID, postableDashboard dashboardtypes.PostableDashboard) (*dashboardtypes.Dashboard, error) {
-	dashboard, err := dashboardtypes.NewDashboard(orgID, createdBy, postableDashboard)
+	dashboard, err := dashboardtypes.NewDashboard(orgID, createdBy, dashboardtypes.SourceUser, postableDashboard)
 	if err != nil {
 		return nil, err
 	}
@@ -72,7 +72,16 @@ func (module *module) List(ctx context.Context, orgID valuer.UUID) ([]*dashboard
 		return nil, err
 	}

-	return dashboardtypes.NewDashboardsFromStorableDashboards(storableDashboards), nil
+	// system dashboards are hidden from the listing endpoint but still gettable by id.
+	filtered := make([]*dashboardtypes.StorableDashboard, 0, len(storableDashboards))
+	for _, storable := range storableDashboards {
+		if storable.Source == dashboardtypes.SourceSystem {
+			continue
+		}
+		filtered = append(filtered, storable)
+	}
+
+	return dashboardtypes.NewDashboardsFromStorableDashboards(filtered), nil
 }

 func (module *module) Update(ctx context.Context, orgID valuer.UUID, id valuer.UUID, updatedBy string, updatableDashboard dashboardtypes.UpdatableDashboard, diff int) (*dashboardtypes.Dashboard, error) {
@@ -81,6 +90,10 @@ func (module *module) Update(ctx context.Context, orgID valuer.UUID, id valuer.U
 		return nil, err
 	}

+	if err := dashboard.ErrIfNotMutable(); err != nil {
+		return nil, err
+	}
+
 	err = dashboard.Update(ctx, updatableDashboard, updatedBy, diff)
 	if err != nil {
 		return nil, err
@@ -105,6 +118,10 @@ func (module *module) LockUnlock(ctx context.Context, orgID valuer.UUID, id valu
 		return err
 	}

+	if err := dashboard.ErrIfNotLockable(); err != nil {
+		return err
+	}
+
 	err = dashboard.LockUnlock(lock, isAdmin, updatedBy)
 	if err != nil {
 		return err
@@ -128,6 +145,10 @@ func (module *module) Delete(ctx context.Context, orgID valuer.UUID, id valuer.U
 		return err
 	}

+	if err := dashboard.ErrIfNotDeletable(); err != nil {
+		return err
+	}
+
 	if dashboard.Locked {
 		return errors.New(errors.TypeInvalidInput, errors.CodeInvalidInput, "dashboard is locked, please unlock the dashboard to be delete it")
 	}
--- a/pkg/query-service/app/integrations/manager.go
+++ b/pkg/query-service/app/integrations/manager.go
@@ -348,7 +348,8 @@ func (m *Manager) GetInstalledIntegrationDashboardById(
 						CreatedBy: author,
 						UpdatedBy: author,
 					},
-					OrgID: orgId,
+					OrgID:  orgId,
+					Source: dashboardtypes.SourceIntegration,
 				}, nil
 			}
 		}
@@ -387,7 +388,8 @@ func (m *Manager) GetDashboardsForInstalledIntegrations(
 							CreatedBy: author,
 							UpdatedBy: author,
 						},
-						OrgID: orgId,
+						OrgID:  orgId,
+						Source: dashboardtypes.SourceIntegration,
 					})
 				}
 			}
--- a/pkg/signoz/provider.go
+++ b/pkg/signoz/provider.go
@@ -203,7 +203,8 @@ func NewSQLMigrationProviderFactories(
 		sqlmigration.NewMigrateMetaresourcesTuplesFactory(sqlstore),
 		sqlmigration.NewAddTagsFactory(sqlstore, sqlschema),
 		sqlmigration.NewAddRoleCRUDTuplesFactory(sqlstore),
-		sqlmigration.NewAddLabelExpressionToPlannedMaintenanceFactory(sqlstore, sqlschema),
+		sqlmigration.NewAddIntegrationDashboardFactory(sqlstore, sqlschema),
+		sqlmigration.NewAddSourceToDashboardFactory(sqlstore, sqlschema),
 	)
 }

--- a/pkg/sqlmigration/078_add_label_expression_to_planned_maintenance.go
+++ b/pkg/sqlmigration/078_add_label_expression_to_planned_maintenance.go
@@ -1,97 +0,0 @@
-package sqlmigration
-
-import (
-	"context"
-
-	"github.com/SigNoz/signoz/pkg/factory"
-	"github.com/SigNoz/signoz/pkg/sqlschema"
-	"github.com/SigNoz/signoz/pkg/sqlstore"
-	"github.com/uptrace/bun"
-	"github.com/uptrace/bun/migrate"
-)
-
-type addLabelExpressionToPlannedMaintenance struct {
-	sqlstore  sqlstore.SQLStore
-	sqlschema sqlschema.SQLSchema
-}
-
-func NewAddLabelExpressionToPlannedMaintenanceFactory(sqlstore sqlstore.SQLStore, sqlschema sqlschema.SQLSchema) factory.ProviderFactory[SQLMigration, Config] {
-	return factory.NewProviderFactory(
-		factory.MustNewName("add_label_expr_to_planned"),
-		func(ctx context.Context, ps factory.ProviderSettings, c Config) (SQLMigration, error) {
-			return &addLabelExpressionToPlannedMaintenance{
-				sqlstore:  sqlstore,
-				sqlschema: sqlschema,
-			}, nil
-		},
-	)
-}
-
-func (migration *addLabelExpressionToPlannedMaintenance) Register(migrations *migrate.Migrations) error {
-	if err := migrations.Register(migration.Up, migration.Down); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (migration *addLabelExpressionToPlannedMaintenance) Up(ctx context.Context, db *bun.DB) error {
-	tx, err := db.BeginTx(ctx, nil)
-	if err != nil {
-		return err
-	}
-
-	defer func() {
-		_ = tx.Rollback()
-	}()
-
-	table, _, err := migration.sqlschema.GetTable(ctx, sqlschema.TableName("planned_maintenance"))
-	if err != nil {
-		return err
-	}
-
-	column := &sqlschema.Column{
-		Name:     sqlschema.ColumnName("label_expression"),
-		DataType: sqlschema.DataTypeText,
-		Nullable: true,
-	}
-
-	sqls := migration.sqlschema.Operator().AddColumn(table, nil, column, nil)
-	for _, sql := range sqls {
-		if _, err := tx.ExecContext(ctx, string(sql)); err != nil {
-			return err
-		}
-	}
-
-	return tx.Commit()
-}
-
-func (migration *addLabelExpressionToPlannedMaintenance) Down(ctx context.Context, db *bun.DB) error {
-	tx, err := db.BeginTx(ctx, nil)
-	if err != nil {
-		return err
-	}
-
-	defer func() {
-		_ = tx.Rollback()
-	}()
-
-	table, _, err := migration.sqlschema.GetTable(ctx, sqlschema.TableName("planned_maintenance"))
-	if err != nil {
-		return err
-	}
-
-	column := &sqlschema.Column{
-		Name:     sqlschema.ColumnName("label_expression"),
-		DataType: sqlschema.DataTypeText,
-		Nullable: true,
-	}
-
-	sqls := migration.sqlschema.Operator().DropColumn(table, column)
-	for _, sql := range sqls {
-		if _, err := tx.ExecContext(ctx, string(sql)); err != nil {
-			return err
-		}
-	}
-
-	return tx.Commit()
-}
--- a/pkg/sqlmigration/084_add_integration_dashboard.go
+++ b/pkg/sqlmigration/084_add_integration_dashboard.go
@@ -0,0 +1,81 @@
+package sqlmigration
+
+import (
+	"context"
+
+	"github.com/SigNoz/signoz/pkg/factory"
+	"github.com/SigNoz/signoz/pkg/sqlschema"
+	"github.com/SigNoz/signoz/pkg/sqlstore"
+	"github.com/uptrace/bun"
+	"github.com/uptrace/bun/migrate"
+)
+
+type addIntegrationDashboard struct {
+	sqlstore  sqlstore.SQLStore
+	sqlschema sqlschema.SQLSchema
+}
+
+func NewAddIntegrationDashboardFactory(sqlstore sqlstore.SQLStore, sqlschema sqlschema.SQLSchema) factory.ProviderFactory[SQLMigration, Config] {
+	return factory.NewProviderFactory(
+		factory.MustNewName("add_integration_dashboard"),
+		func(ctx context.Context, ps factory.ProviderSettings, c Config) (SQLMigration, error) {
+			return &addIntegrationDashboard{sqlstore: sqlstore, sqlschema: sqlschema}, nil
+		},
+	)
+}
+
+func (m *addIntegrationDashboard) Register(migrations *migrate.Migrations) error {
+	return migrations.Register(m.Up, m.Down)
+}
+
+func (m *addIntegrationDashboard) Up(ctx context.Context, db *bun.DB) error {
+	tx, err := db.BeginTx(ctx, nil)
+	if err != nil {
+		return err
+	}
+	defer func() { _ = tx.Rollback() }()
+
+	sqls := m.sqlschema.Operator().CreateTable(&sqlschema.Table{
+		Name: "integration_dashboard",
+		Columns: []*sqlschema.Column{
+			{Name: "id", DataType: sqlschema.DataTypeText, Nullable: false},
+			{Name: "dashboard_id", DataType: sqlschema.DataTypeText, Nullable: false},
+			{Name: "provider", DataType: sqlschema.DataTypeText, Nullable: false},
+			{Name: "slug", DataType: sqlschema.DataTypeText, Nullable: false},
+			{Name: "created_at", DataType: sqlschema.DataTypeTimestamp, Nullable: false},
+			{Name: "updated_at", DataType: sqlschema.DataTypeTimestamp, Nullable: false},
+		},
+		PrimaryKeyConstraint: &sqlschema.PrimaryKeyConstraint{
+			ColumnNames: []sqlschema.ColumnName{"id"},
+		},
+		ForeignKeyConstraints: []*sqlschema.ForeignKeyConstraint{
+			{
+				ReferencingColumnName: sqlschema.ColumnName("dashboard_id"),
+				ReferencedTableName:   sqlschema.TableName("dashboard"),
+				ReferencedColumnName:  sqlschema.ColumnName("id"),
+			},
+		},
+	})
+	sqls = append(sqls, m.sqlschema.Operator().CreateIndex(
+		&sqlschema.UniqueIndex{
+			TableName:   "integration_dashboard",
+			ColumnNames: []sqlschema.ColumnName{"dashboard_id"},
+		},
+	)...)
+
+	for _, sql := range sqls {
+		if _, err := tx.ExecContext(ctx, string(sql)); err != nil {
+			return err
+		}
+	}
+
+	if err := tx.Commit(); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (m *addIntegrationDashboard) Down(context.Context, *bun.DB) error {
+	return nil
+}
--- a/pkg/sqlmigration/085_add_source_to_dashboard.go
+++ b/pkg/sqlmigration/085_add_source_to_dashboard.go
@@ -0,0 +1,79 @@
+package sqlmigration
+
+import (
+	"context"
+
+	"github.com/SigNoz/signoz/pkg/factory"
+	"github.com/SigNoz/signoz/pkg/sqlschema"
+	"github.com/SigNoz/signoz/pkg/sqlstore"
+	"github.com/uptrace/bun"
+	"github.com/uptrace/bun/migrate"
+)
+
+type addSourceToDashboard struct {
+	sqlstore  sqlstore.SQLStore
+	sqlschema sqlschema.SQLSchema
+}
+
+func NewAddSourceToDashboardFactory(sqlstore sqlstore.SQLStore, sqlschema sqlschema.SQLSchema) factory.ProviderFactory[SQLMigration, Config] {
+	return factory.NewProviderFactory(
+		factory.MustNewName("add_source_to_dashboard"),
+		func(ctx context.Context, ps factory.ProviderSettings, c Config) (SQLMigration, error) {
+			return &addSourceToDashboard{sqlstore: sqlstore, sqlschema: sqlschema}, nil
+		},
+	)
+}
+
+func (migration *addSourceToDashboard) Register(migrations *migrate.Migrations) error {
+	return migrations.Register(migration.Up, migration.Down)
+}
+
+func (migration *addSourceToDashboard) Up(ctx context.Context, db *bun.DB) error {
+	// dashboard is referenced by public_dashboard and integration_dashboard;
+	// FK enforcement must be off for the SQLite recreate-table fallback.
+	if err := migration.sqlschema.ToggleFKEnforcement(ctx, db, false); err != nil {
+		return err
+	}
+
+	tx, err := db.BeginTx(ctx, nil)
+	if err != nil {
+		return err
+	}
+	defer func() {
+		_ = tx.Rollback()
+	}()
+
+	table, uniqueConstraints, err := migration.sqlschema.GetTable(ctx, sqlschema.TableName("dashboard"))
+	if err != nil {
+		return err
+	}
+
+	sourceColumn := &sqlschema.Column{
+		Name:     sqlschema.ColumnName("source"),
+		DataType: sqlschema.DataTypeText,
+		Nullable: false,
+	}
+
+	// backfill existing rows with 'user' before the NOT NULL flip.
+	sqls := migration.sqlschema.Operator().AddColumn(table, uniqueConstraints, sourceColumn, "user")
+
+	for _, sql := range sqls {
+		if _, err := tx.ExecContext(ctx, string(sql)); err != nil {
+			return err
+		}
+	}
+
+	if err := tx.Commit(); err != nil {
+		return err
+	}
+
+	if err := migration.sqlschema.ToggleFKEnforcement(ctx, db, true); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (migration *addSourceToDashboard) Down(context.Context, *bun.DB) error {
+	return nil
+}
--- a/pkg/types/alertmanagertypes/maintenance.go
+++ b/pkg/types/alertmanagertypes/maintenance.go
@@ -5,13 +5,10 @@ import (
 	"encoding/json"
 	"time"

-	"github.com/expr-lang/expr"
-	"github.com/prometheus/common/model"
-	"github.com/uptrace/bun"
-
 	"github.com/SigNoz/signoz/pkg/errors"
 	"github.com/SigNoz/signoz/pkg/types"
 	"github.com/SigNoz/signoz/pkg/valuer"
+	"github.com/uptrace/bun"
 )

 var ErrCodeInvalidPlannedMaintenancePayload = errors.MustNewCode("invalid_planned_maintenance_payload")
@@ -57,37 +54,34 @@ type StorablePlannedMaintenance struct {
 	types.Identifiable
 	types.TimeAuditable
 	types.UserAuditable
-	Name            string    `bun:"name,type:text,notnull"`
-	Description     string    `bun:"description,type:text"`
-	Schedule        *Schedule `bun:"schedule,type:text,notnull"`
-	OrgID           string    `bun:"org_id,type:text"`
-	LabelExpression string    `bun:"label_expression,type:text"`
+	Name        string    `bun:"name,type:text,notnull"`
+	Description string    `bun:"description,type:text"`
+	Schedule    *Schedule `bun:"schedule,type:text,notnull"`
+	OrgID       string    `bun:"org_id,type:text"`
 }

 type PlannedMaintenance struct {
-	ID              valuer.UUID       `json:"id" required:"true"`
-	Name            string            `json:"name" required:"true"`
-	Description     string            `json:"description"`
-	Schedule        *Schedule         `json:"schedule" required:"true"`
-	RuleIDs         []string          `json:"alertIds"`
-	LabelExpression string            `json:"labelExpression,omitempty"`
-	CreatedAt       time.Time         `json:"createdAt"`
-	CreatedBy       string            `json:"createdBy"`
-	UpdatedAt       time.Time         `json:"updatedAt"`
-	UpdatedBy       string            `json:"updatedBy"`
-	Status          MaintenanceStatus `json:"status" required:"true"`
-	Kind            MaintenanceKind   `json:"kind" required:"true"`
+	ID          valuer.UUID       `json:"id" required:"true"`
+	Name        string            `json:"name" required:"true"`
+	Description string            `json:"description"`
+	Schedule    *Schedule         `json:"schedule" required:"true"`
+	RuleIDs     []string          `json:"alertIds"`
+	CreatedAt   time.Time         `json:"createdAt"`
+	CreatedBy   string            `json:"createdBy"`
+	UpdatedAt   time.Time         `json:"updatedAt"`
+	UpdatedBy   string            `json:"updatedBy"`
+	Status      MaintenanceStatus `json:"status" required:"true"`
+	Kind        MaintenanceKind   `json:"kind" required:"true"`
 }

 // PostablePlannedMaintenance is the input payload for creating or updating a
 // planned maintenance. Server-owned fields (id, timestamps, audit users,
 // derived status / kind) are deliberately not accepted from the client.
 type PostablePlannedMaintenance struct {
-	Name            string    `json:"name" required:"true"`
-	Description     string    `json:"description"`
-	Schedule        *Schedule `json:"schedule" required:"true"`
-	AlertIds        []string  `json:"alertIds"`
-	LabelExpression string    `json:"labelExpression"`
+	Name        string    `json:"name" required:"true"`
+	Description string    `json:"description"`
+	Schedule    *Schedule `json:"schedule" required:"true"`
+	AlertIds    []string  `json:"alertIds"`
 }

 func (p *PostablePlannedMaintenance) Validate() error {
@@ -122,11 +116,6 @@ func (p *PostablePlannedMaintenance) Validate() error {
 			return errors.Newf(errors.TypeInvalidInput, ErrCodeInvalidPlannedMaintenancePayload, "end time cannot be before start time")
 		}
 	}
-	if p.LabelExpression != "" {
-		if _, err := expr.Compile(p.LabelExpression, expr.AllowUndefinedVariables(), expr.AsBool()); err != nil {
-			return errors.Newf(errors.TypeInvalidInput, ErrCodeInvalidPlannedMaintenancePayload, "invalid label expression: %v", err)
-		}
-	}
 	return nil
 }

@@ -162,7 +151,7 @@ func (m *PlannedMaintenance) HasScheduleRecurrenceBoundsMismatch() bool {
 		(recurrence.EndTime != nil && !recurrence.EndTime.Equal(m.Schedule.EndTime))
 }

-func (m *PlannedMaintenance) ShouldSkip(ruleID string, now time.Time, lset model.LabelSet) bool {
+func (m *PlannedMaintenance) ShouldSkip(ruleID string, now time.Time) bool {
 	// Check if the alert ID is in the maintenance window
 	found := false
 	if len(m.RuleIDs) > 0 {
@@ -182,23 +171,6 @@ func (m *PlannedMaintenance) ShouldSkip(ruleID string, now time.Time, lset model
 		return false
 	}

-	if !m.isScheduleActive(now) {
-		return false
-	}
-
-	// lset is empty when called from IsActive (no instance labels available);
-	// skip expression filtering in that case.
-	if m.LabelExpression != "" && len(lset) != 0 {
-		if !evalLabelExpression(m.LabelExpression, lset) {
-			return false
-		}
-	}
-
-	return true
-}
-
-// isScheduleActive reports whether now falls inside the maintenance window's schedule.
-func (m *PlannedMaintenance) isScheduleActive(now time.Time) bool {
 	// If alert is found, we check if it should be skipped based on the schedule
 	loc, err := time.LoadLocation(m.Schedule.Timezone)
 	if err != nil {
@@ -248,25 +220,6 @@ func (m *PlannedMaintenance) isScheduleActive(now time.Time) bool {
 	return false
 }

-// evalLabelExpression compiles and runs the expression against the provided labels.
-// Returns false on any error (safety-first: don't suppress on a bad expression).
-func evalLabelExpression(expression string, lset model.LabelSet) bool {
-	env := make(map[string]interface{}, len(lset))
-	for k, v := range lset {
-		env[string(k)] = string(v)
-	}
-	program, err := expr.Compile(expression, expr.Env(env), expr.AllowUndefinedVariables())
-	if err != nil {
-		return false
-	}
-	output, err := expr.Run(program, env)
-	if err != nil {
-		return false
-	}
-	result, ok := output.(bool)
-	return ok && result
-}
-
 // checkDaily rebases the recurrence start to today (or yesterday if needed)
 // and returns true if currentTime is within [candidate, candidate+Duration].
 func (m *PlannedMaintenance) checkDaily(currentTime time.Time, rec *Recurrence, loc *time.Location) bool {
@@ -353,7 +306,7 @@ func (m *PlannedMaintenance) IsActive(now time.Time) bool {
 	if len(m.RuleIDs) > 0 {
 		ruleID = (m.RuleIDs)[0]
 	}
-	return m.ShouldSkip(ruleID, now, nil)
+	return m.ShouldSkip(ruleID, now)
 }

 func (m *PlannedMaintenance) IsUpcoming() bool {
@@ -431,31 +384,29 @@ func (m PlannedMaintenance) MarshalJSON() ([]byte, error) {
 	}

 	return json.Marshal(struct {
-		ID              valuer.UUID       `json:"id" db:"id"`
-		Name            string            `json:"name" db:"name"`
-		Description     string            `json:"description" db:"description"`
-		Schedule        *Schedule         `json:"schedule" db:"schedule"`
-		AlertIds        []string          `json:"alertIds" db:"alert_ids"`
-		LabelExpression string            `json:"labelExpression,omitempty" db:"label_expression"`
-		CreatedAt       time.Time         `json:"createdAt" db:"created_at"`
-		CreatedBy       string            `json:"createdBy" db:"created_by"`
-		UpdatedAt       time.Time         `json:"updatedAt" db:"updated_at"`
-		UpdatedBy       string            `json:"updatedBy" db:"updated_by"`
-		Status          MaintenanceStatus `json:"status"`
-		Kind            MaintenanceKind   `json:"kind"`
+		ID          valuer.UUID       `json:"id" db:"id"`
+		Name        string            `json:"name" db:"name"`
+		Description string            `json:"description" db:"description"`
+		Schedule    *Schedule         `json:"schedule" db:"schedule"`
+		AlertIds    []string          `json:"alertIds" db:"alert_ids"`
+		CreatedAt   time.Time         `json:"createdAt" db:"created_at"`
+		CreatedBy   string            `json:"createdBy" db:"created_by"`
+		UpdatedAt   time.Time         `json:"updatedAt" db:"updated_at"`
+		UpdatedBy   string            `json:"updatedBy" db:"updated_by"`
+		Status      MaintenanceStatus `json:"status"`
+		Kind        MaintenanceKind   `json:"kind"`
 	}{
-		ID:              m.ID,
-		Name:            m.Name,
-		Description:     m.Description,
-		Schedule:        m.Schedule,
-		AlertIds:        m.RuleIDs,
-		LabelExpression: m.LabelExpression,
-		CreatedAt:       m.CreatedAt,
-		CreatedBy:       m.CreatedBy,
-		UpdatedAt:       m.UpdatedAt,
-		UpdatedBy:       m.UpdatedBy,
-		Status:          status,
-		Kind:            kind,
+		ID:          m.ID,
+		Name:        m.Name,
+		Description: m.Description,
+		Schedule:    m.Schedule,
+		AlertIds:    m.RuleIDs,
+		CreatedAt:   m.CreatedAt,
+		CreatedBy:   m.CreatedBy,
+		UpdatedAt:   m.UpdatedAt,
+		UpdatedBy:   m.UpdatedBy,
+		Status:      status,
+		Kind:        kind,
 	})
 }

@@ -468,16 +419,15 @@ func (m *PlannedMaintenanceWithRules) ToPlannedMaintenance() *PlannedMaintenance
 	}

 	return &PlannedMaintenance{
-		ID:              m.ID,
-		Name:            m.Name,
-		Description:     m.Description,
-		Schedule:        m.Schedule,
-		RuleIDs:         ruleIDs,
-		LabelExpression: m.LabelExpression,
-		CreatedAt:       m.CreatedAt,
-		UpdatedAt:       m.UpdatedAt,
-		CreatedBy:       m.CreatedBy,
-		UpdatedBy:       m.UpdatedBy,
+		ID:          m.ID,
+		Name:        m.Name,
+		Description: m.Description,
+		Schedule:    m.Schedule,
+		RuleIDs:     ruleIDs,
+		CreatedAt:   m.CreatedAt,
+		UpdatedAt:   m.UpdatedAt,
+		CreatedBy:   m.CreatedBy,
+		UpdatedBy:   m.UpdatedBy,
 	}
 }

--- a/pkg/types/alertmanagertypes/maintenance_test.go
+++ b/pkg/types/alertmanagertypes/maintenance_test.go
@@ -5,7 +5,6 @@ import (
 	"time"

 	"github.com/SigNoz/signoz/pkg/valuer"
-	"github.com/prometheus/common/model"
 )

 // Helper function to create a time pointer.
@@ -669,7 +668,7 @@ func TestShouldSkipMaintenance(t *testing.T) {
 	}

 	for idx, c := range cases {
-		result := c.maintenance.ShouldSkip(c.name, c.ts, model.LabelSet{})
+		result := c.maintenance.ShouldSkip(c.name, c.ts)
 		if result != c.skip {
 			t.Errorf("skip %v, got %v, case:%d - %s", c.skip, result, idx, c.name)
 		}
--- a/pkg/types/alertmanagertypes/recurrence.go
+++ b/pkg/types/alertmanagertypes/recurrence.go
@@ -90,111 +90,3 @@ func (r *Recurrence) Scan(src interface{}) error {
 func (r *Recurrence) Value() (driver.Value, error) {
 	return json.Marshal(r)
 }
-
-func (s Schedule) MarshalJSON() ([]byte, error) {
-	loc, err := time.LoadLocation(s.Timezone)
-	if err != nil {
-		return nil, err
-	}
-
-	var startTime, endTime time.Time
-	if !s.StartTime.IsZero() {
-		startTime = time.Date(s.StartTime.Year(), s.StartTime.Month(), s.StartTime.Day(), s.StartTime.Hour(), s.StartTime.Minute(), s.StartTime.Second(), s.StartTime.Nanosecond(), loc)
-	}
-	if !s.EndTime.IsZero() {
-		endTime = time.Date(s.EndTime.Year(), s.EndTime.Month(), s.EndTime.Day(), s.EndTime.Hour(), s.EndTime.Minute(), s.EndTime.Second(), s.EndTime.Nanosecond(), loc)
-	}
-
-	var recurrence *Recurrence
-	if s.Recurrence != nil {
-		recStartTime := time.Date(s.Recurrence.StartTime.Year(), s.Recurrence.StartTime.Month(), s.Recurrence.StartTime.Day(), s.Recurrence.StartTime.Hour(), s.Recurrence.StartTime.Minute(), s.Recurrence.StartTime.Second(), s.Recurrence.StartTime.Nanosecond(), loc)
-		var recEndTime *time.Time
-		if s.Recurrence.EndTime != nil {
-			end := time.Date(s.Recurrence.EndTime.Year(), s.Recurrence.EndTime.Month(), s.Recurrence.EndTime.Day(), s.Recurrence.EndTime.Hour(), s.Recurrence.EndTime.Minute(), s.Recurrence.EndTime.Second(), s.Recurrence.EndTime.Nanosecond(), loc)
-			recEndTime = &end
-		}
-		recurrence = &Recurrence{
-			StartTime:  recStartTime,
-			EndTime:    recEndTime,
-			Duration:   s.Recurrence.Duration,
-			RepeatType: s.Recurrence.RepeatType,
-			RepeatOn:   s.Recurrence.RepeatOn,
-		}
-	}
-
-	return json.Marshal(&struct {
-		Timezone   string      `json:"timezone"`
-		StartTime  string      `json:"startTime"`
-		EndTime    string      `json:"endTime"`
-		Recurrence *Recurrence `json:"recurrence,omitempty"`
-	}{
-		Timezone:   s.Timezone,
-		StartTime:  startTime.Format(time.RFC3339),
-		EndTime:    endTime.Format(time.RFC3339),
-		Recurrence: recurrence,
-	})
-}
-
-func (s *Schedule) UnmarshalJSON(data []byte) error {
-	aux := &struct {
-		Timezone   string      `json:"timezone"`
-		StartTime  string      `json:"startTime"`
-		EndTime    string      `json:"endTime"`
-		Recurrence *Recurrence `json:"recurrence,omitempty"`
-	}{}
-	if err := json.Unmarshal(data, aux); err != nil {
-		return err
-	}
-
-	loc, err := time.LoadLocation(aux.Timezone)
-	if err != nil {
-		return err
-	}
-
-	var startTime time.Time
-	if aux.StartTime != "" {
-		startTime, err = time.Parse(time.RFC3339, aux.StartTime)
-		if err != nil {
-			return err
-		}
-		s.StartTime = time.Date(startTime.Year(), startTime.Month(), startTime.Day(), startTime.Hour(), startTime.Minute(), startTime.Second(), startTime.Nanosecond(), loc)
-	}
-
-	var endTime time.Time
-	if aux.EndTime != "" {
-		endTime, err = time.Parse(time.RFC3339, aux.EndTime)
-		if err != nil {
-			return err
-		}
-		// TODO(jatinderjit): if endTime.IsZero() then we should not set the endTime
-		s.EndTime = time.Date(endTime.Year(), endTime.Month(), endTime.Day(), endTime.Hour(), endTime.Minute(), endTime.Second(), endTime.Nanosecond(), loc)
-	}
-
-	s.Timezone = aux.Timezone
-
-	if aux.Recurrence != nil {
-		recStartTime, err := time.Parse(time.RFC3339, aux.Recurrence.StartTime.Format(time.RFC3339))
-		if err != nil {
-			return err
-		}
-
-		var recEndTime *time.Time
-		if aux.Recurrence.EndTime != nil {
-			end, err := time.Parse(time.RFC3339, aux.Recurrence.EndTime.Format(time.RFC3339))
-			if err != nil {
-				return err
-			}
-			endConverted := time.Date(end.Year(), end.Month(), end.Day(), end.Hour(), end.Minute(), end.Second(), end.Nanosecond(), loc)
-			recEndTime = &endConverted
-		}
-
-		s.Recurrence = &Recurrence{
-			StartTime:  time.Date(recStartTime.Year(), recStartTime.Month(), recStartTime.Day(), recStartTime.Hour(), recStartTime.Minute(), recStartTime.Second(), recStartTime.Nanosecond(), loc),
-			EndTime:    recEndTime,
-			Duration:   aux.Recurrence.Duration,
-			RepeatType: aux.Recurrence.RepeatType,
-			RepeatOn:   aux.Recurrence.RepeatOn,
-		}
-	}
-	return nil
-}
--- a/pkg/types/alertmanagertypes/schedule.go
+++ b/pkg/types/alertmanagertypes/schedule.go
@@ -12,7 +12,7 @@ import (
 type Schedule struct {
 	Timezone   string      `json:"timezone" required:"true"`
 	StartTime  time.Time   `json:"startTime,omitempty"`
-	EndTime    time.Time   `json:"endTime,omitempty"`
+	EndTime    time.Time   `json:"endTime,omitzero"`
 	Recurrence *Recurrence `json:"recurrence"`
 }

@@ -32,3 +32,110 @@ func (s *Schedule) Scan(src interface{}) error {
 func (s *Schedule) Value() (driver.Value, error) {
 	return json.Marshal(s)
 }
+
+func (s Schedule) MarshalJSON() ([]byte, error) {
+	loc, err := time.LoadLocation(s.Timezone)
+	if err != nil {
+		return nil, err
+	}
+
+	var startTime, endTime time.Time
+	if !s.StartTime.IsZero() {
+		startTime = time.Date(s.StartTime.Year(), s.StartTime.Month(), s.StartTime.Day(), s.StartTime.Hour(), s.StartTime.Minute(), s.StartTime.Second(), s.StartTime.Nanosecond(), loc)
+	}
+	if !s.EndTime.IsZero() {
+		endTime = time.Date(s.EndTime.Year(), s.EndTime.Month(), s.EndTime.Day(), s.EndTime.Hour(), s.EndTime.Minute(), s.EndTime.Second(), s.EndTime.Nanosecond(), loc)
+	}
+
+	var recurrence *Recurrence
+	if s.Recurrence != nil {
+		recStartTime := time.Date(s.Recurrence.StartTime.Year(), s.Recurrence.StartTime.Month(), s.Recurrence.StartTime.Day(), s.Recurrence.StartTime.Hour(), s.Recurrence.StartTime.Minute(), s.Recurrence.StartTime.Second(), s.Recurrence.StartTime.Nanosecond(), loc)
+		var recEndTime *time.Time
+		if s.Recurrence.EndTime != nil {
+			end := time.Date(s.Recurrence.EndTime.Year(), s.Recurrence.EndTime.Month(), s.Recurrence.EndTime.Day(), s.Recurrence.EndTime.Hour(), s.Recurrence.EndTime.Minute(), s.Recurrence.EndTime.Second(), s.Recurrence.EndTime.Nanosecond(), loc)
+			recEndTime = &end
+		}
+		recurrence = &Recurrence{
+			StartTime:  recStartTime,
+			EndTime:    recEndTime,
+			Duration:   s.Recurrence.Duration,
+			RepeatType: s.Recurrence.RepeatType,
+			RepeatOn:   s.Recurrence.RepeatOn,
+		}
+	}
+
+	return json.Marshal(&struct {
+		Timezone   string      `json:"timezone"`
+		StartTime  time.Time   `json:"startTime"`
+		EndTime    time.Time   `json:"endTime,omitzero"`
+		Recurrence *Recurrence `json:"recurrence,omitempty"`
+	}{
+		Timezone:   s.Timezone,
+		StartTime:  startTime,
+		EndTime:    endTime,
+		Recurrence: recurrence,
+	})
+}
+
+func (s *Schedule) UnmarshalJSON(data []byte) error {
+	aux := &struct {
+		Timezone   string      `json:"timezone"`
+		StartTime  string      `json:"startTime"`
+		EndTime    string      `json:"endTime"`
+		Recurrence *Recurrence `json:"recurrence,omitempty"`
+	}{}
+	if err := json.Unmarshal(data, aux); err != nil {
+		return err
+	}
+
+	loc, err := time.LoadLocation(aux.Timezone)
+	if err != nil {
+		return err
+	}
+
+	var startTime time.Time
+	if aux.StartTime != "" {
+		startTime, err = time.Parse(time.RFC3339, aux.StartTime)
+		if err != nil {
+			return err
+		}
+		s.StartTime = time.Date(startTime.Year(), startTime.Month(), startTime.Day(), startTime.Hour(), startTime.Minute(), startTime.Second(), startTime.Nanosecond(), loc)
+	}
+
+	var endTime time.Time
+	if aux.EndTime != "" {
+		endTime, err = time.Parse(time.RFC3339, aux.EndTime)
+		if err != nil {
+			return err
+		}
+		s.EndTime = time.Date(endTime.Year(), endTime.Month(), endTime.Day(), endTime.Hour(), endTime.Minute(), endTime.Second(), endTime.Nanosecond(), loc)
+	}
+
+	s.Timezone = aux.Timezone
+
+	if aux.Recurrence != nil {
+		recStartTime, err := time.Parse(time.RFC3339, aux.Recurrence.StartTime.Format(time.RFC3339))
+		if err != nil {
+			return err
+		}
+
+		var recEndTime *time.Time
+		if aux.Recurrence.EndTime != nil {
+			end, err := time.Parse(time.RFC3339, aux.Recurrence.EndTime.Format(time.RFC3339))
+			if err != nil {
+				return err
+			}
+			endConverted := time.Date(end.Year(), end.Month(), end.Day(), end.Hour(), end.Minute(), end.Second(), end.Nanosecond(), loc)
+			recEndTime = &endConverted
+		}
+
+		s.Recurrence = &Recurrence{
+			StartTime:  time.Date(recStartTime.Year(), recStartTime.Month(), recStartTime.Day(), recStartTime.Hour(), recStartTime.Minute(), recStartTime.Second(), recStartTime.Nanosecond(), loc),
+			EndTime:    recEndTime,
+			Duration:   aux.Recurrence.Duration,
+			RepeatType: aux.Recurrence.RepeatType,
+			RepeatOn:   aux.Recurrence.RepeatOn,
+		}
+	}
+	return nil
+}
--- a/pkg/types/cloudintegrationtypes/service.go
+++ b/pkg/types/cloudintegrationtypes/service.go
@@ -366,6 +366,7 @@ func GetDashboardsFromAssets(
 				CreatedBy: author,
 				UpdatedBy: author,
 			},
+			Source: dashboardtypes.SourceIntegration,
 		})
 	}

--- a/pkg/types/dashboardtypes/dashboard.go
+++ b/pkg/types/dashboardtypes/dashboard.go
@@ -2,8 +2,10 @@ package dashboardtypes

 import (
 	"context"
+	"database/sql/driver"
 	"encoding/json"
 	"log/slog"
+	"slices"
 	"time"

 	"github.com/SigNoz/signoz/pkg/errors"
@@ -19,8 +21,66 @@ var (
 	ErrCodeDashboardNotFound           = errors.MustNewCode("dashboard_not_found")
 	ErrCodeDashboardInvalidData        = errors.MustNewCode("dashboard_invalid_data")
 	ErrCodeDashboardInvalidWidgetQuery = errors.MustNewCode("dashboard_invalid_widget_query")
+	ErrCodeDashboardInvalidSource      = errors.MustNewCode("dashboard_invalid_source")
+	ErrCodeDashboardImmutable          = errors.MustNewCode("dashboard_immutable")
 )

+type Source struct {
+	valuer.String
+}
+
+var (
+	SourceUser        = Source{valuer.NewString("user")}
+	SourceSystem      = Source{valuer.NewString("system")}
+	SourceIntegration = Source{valuer.NewString("integration")}
+)
+
+func (Source) Enum() []any {
+	return []any{SourceUser, SourceSystem, SourceIntegration}
+}
+
+func (s Source) IsValid() bool {
+	return slices.ContainsFunc(s.Enum(), func(v any) bool { return v == s })
+}
+
+// Value rejects anything outside the enum so unknown values can't be written.
+func (s Source) Value() (driver.Value, error) {
+	if !s.IsValid() {
+		return nil, errors.Newf(errors.TypeInvalidInput, ErrCodeDashboardInvalidSource, "invalid dashboard source %q, must be one of user, system, integration", s.StringValue())
+	}
+	return s.StringValue(), nil
+}
+
+// Scan is lenient on read; deliberate choice to not break
+// reads. Strictness lives in Value.
+func (s *Source) Scan(src any) error {
+	if src == nil {
+		return errors.Newf(errors.TypeInternal, errors.CodeInternal, "dashboard source: cannot scan nil")
+	}
+
+	var val string
+	switch v := src.(type) {
+	case string:
+		val = v
+	case []byte:
+		val = string(v)
+	default:
+		return errors.Newf(errors.TypeInternal, errors.CodeInternal, "dashboard source: cannot scan %T", src)
+	}
+
+	*s = Source{valuer.NewString(val)}
+	return nil
+}
+
+// NewSource validates a caller-supplied source string.
+func NewSource(source string) (Source, error) {
+	candidate := Source{valuer.NewString(source)}
+	if !candidate.IsValid() {
+		return Source{}, errors.Newf(errors.TypeInvalidInput, ErrCodeDashboardInvalidSource, "invalid dashboard source %q, must be one of user, system, integration", source)
+	}
+	return candidate, nil
+}
+
 type StorableDashboard struct {
 	bun.BaseModel `bun:"table:dashboard,alias:dashboard"`

@@ -30,6 +90,7 @@ type StorableDashboard struct {
 	Data   StorableDashboardData `bun:"data,type:text,notnull"`
 	Locked bool                  `bun:"locked,notnull,default:false"`
 	OrgID  valuer.UUID           `bun:"org_id,notnull"`
+	Source Source                `bun:"source,type:text,notnull"`
 }

 type Dashboard struct {
@@ -40,6 +101,7 @@ type Dashboard struct {
 	Data   StorableDashboardData `json:"data"`
 	Locked bool                  `json:"locked"`
 	OrgID  valuer.UUID           `json:"org_id"`
+	Source Source                `json:"source"`
 }

 type LockUnlockDashboard struct {
@@ -64,6 +126,10 @@ func NewStorableDashboardFromDashboard(dashboard *Dashboard) (*StorableDashboard
 		return nil, errors.Wrapf(err, errors.TypeInvalidInput, errors.CodeInvalidInput, "id is not a valid uuid")
 	}

+	if !dashboard.Source.IsValid() {
+		return nil, errors.Newf(errors.TypeInvalidInput, ErrCodeDashboardInvalidSource, "invalid dashboard source %q", dashboard.Source.StringValue())
+	}
+
 	return &StorableDashboard{
 		Identifiable: types.Identifiable{
 			ID: dashboardID,
@@ -79,10 +145,15 @@ func NewStorableDashboardFromDashboard(dashboard *Dashboard) (*StorableDashboard
 		OrgID:  dashboard.OrgID,
 		Data:   dashboard.Data,
 		Locked: dashboard.Locked,
+		Source: dashboard.Source,
 	}, nil
 }

-func NewDashboard(orgID valuer.UUID, createdBy string, storableDashboardData StorableDashboardData) (*Dashboard, error) {
+func NewDashboard(orgID valuer.UUID, createdBy string, source Source, storableDashboardData StorableDashboardData) (*Dashboard, error) {
+	if !source.IsValid() {
+		return nil, errors.Newf(errors.TypeInvalidInput, ErrCodeDashboardInvalidSource, "invalid dashboard source %q", source.StringValue())
+	}
+
 	currentTime := time.Now()

 	return &Dashboard{
@@ -98,6 +169,7 @@ func NewDashboard(orgID valuer.UUID, createdBy string, storableDashboardData Sto
 		OrgID:  orgID,
 		Data:   storableDashboardData,
 		Locked: false,
+		Source: source,
 	}, nil
 }

@@ -115,6 +187,7 @@ func NewDashboardFromStorableDashboard(storableDashboard *StorableDashboard) *Da
 		OrgID:  storableDashboard.OrgID,
 		Data:   storableDashboard.Data,
 		Locked: storableDashboard.Locked,
+		Source: storableDashboard.Source,
 	}
 }

@@ -147,6 +220,7 @@ func NewGettableDashboardFromDashboard(dashboard *Dashboard) (*GettableDashboard
 		OrgID:         dashboard.OrgID,
 		Data:          dashboard.Data,
 		Locked:        dashboard.Locked,
+		Source:        dashboard.Source,
 	}, nil
 }

@@ -238,6 +312,43 @@ func (storableDashboardData *StorableDashboardData) GetWidgetIds() []string {
 	return widgetIds
 }

+func (dashboard *Dashboard) ErrIfNotMutable() error {
+	if dashboard.Source == SourceIntegration {
+		return errors.Newf(errors.TypeForbidden, ErrCodeDashboardImmutable, "integration dashboards cannot be modified")
+	}
+	return nil
+}
+
+func (dashboard *Dashboard) ErrIfNotDeletable() error {
+	if err := dashboard.ErrIfNotMutable(); err != nil {
+		return err
+	}
+	if dashboard.Source == SourceSystem {
+		return errors.Newf(errors.TypeForbidden, ErrCodeDashboardImmutable, "system dashboards cannot be deleted")
+	}
+	return nil
+}
+
+func (dashboard *Dashboard) ErrIfNotLockable() error {
+	if err := dashboard.ErrIfNotMutable(); err != nil {
+		return err
+	}
+	if dashboard.Source == SourceSystem {
+		return errors.Newf(errors.TypeForbidden, ErrCodeDashboardImmutable, "system dashboards cannot be locked or unlocked")
+	}
+	return nil
+}
+
+func (dashboard *Dashboard) ErrIfNotPublishable() error {
+	if err := dashboard.ErrIfNotMutable(); err != nil {
+		return err
+	}
+	if dashboard.Source == SourceSystem {
+		return errors.Newf(errors.TypeForbidden, ErrCodeDashboardImmutable, "system dashboards cannot be made public")
+	}
+	return nil
+}
+
 func (dashboard *Dashboard) CanUpdate(ctx context.Context, data StorableDashboardData, diff int) error {
 	if dashboard.Locked {
 		return errors.Newf(errors.TypeInvalidInput, errors.CodeInvalidInput, "cannot update a locked dashboard, please unlock the dashboard to update")
--- a/pkg/types/dashboardtypes/dashboard_test.go
+++ b/pkg/types/dashboardtypes/dashboard_test.go
@@ -6,6 +6,7 @@ import (

 	"github.com/SigNoz/signoz/pkg/valuer"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )

 func makeTestWidgets(ids ...string) []interface{} {
@@ -19,6 +20,68 @@ func makeTestWidgets(ids ...string) []interface{} {
 	return widgets
 }

+func TestSourceEnum(t *testing.T) {
+	t.Run("valid sources round-trip through Value/Scan", func(t *testing.T) {
+		for _, src := range []Source{SourceUser, SourceSystem, SourceIntegration} {
+			val, err := src.Value()
+			require.NoError(t, err)
+
+			var got Source
+			require.NoError(t, got.Scan(val))
+			assert.Equal(t, src, got)
+		}
+	})
+
+	t.Run("invalid source is rejected by Value", func(t *testing.T) {
+		bogus := Source{valuer.NewString("hacker")}
+		_, err := bogus.Value()
+		assert.Error(t, err)
+	})
+
+	t.Run("Scan tolerates unknown strings, Value still rejects them", func(t *testing.T) {
+		var got Source
+		require.NoError(t, got.Scan("future_source"))
+		assert.Equal(t, "future_source", got.StringValue())
+		assert.False(t, got.IsValid())
+
+		_, err := got.Value()
+		assert.Error(t, err)
+	})
+
+	t.Run("NewSource validates input", func(t *testing.T) {
+		s, err := NewSource("USER")
+		require.NoError(t, err)
+		assert.Equal(t, SourceUser, s)
+
+		_, err = NewSource("nope")
+		assert.Error(t, err)
+	})
+}
+
+func TestErrIfNotMutable_BySource(t *testing.T) {
+	cases := []struct {
+		source       Source
+		mutable      bool
+		deletable    bool
+		lockable     bool
+		publishable  bool
+	}{
+		{SourceUser, true, true, true, true},
+		{SourceSystem, true, false, false, false},
+		{SourceIntegration, false, false, false, false},
+	}
+
+	for _, tc := range cases {
+		t.Run(tc.source.StringValue(), func(t *testing.T) {
+			d := &Dashboard{Source: tc.source}
+			assert.Equal(t, tc.mutable, d.ErrIfNotMutable() == nil)
+			assert.Equal(t, tc.deletable, d.ErrIfNotDeletable() == nil)
+			assert.Equal(t, tc.lockable, d.ErrIfNotLockable() == nil)
+			assert.Equal(t, tc.publishable, d.ErrIfNotPublishable() == nil)
+		})
+	}
+}
+
 func TestCanUpdate_MultipleDeletions_ByDiff(t *testing.T) {
 	testCases := []struct {
 		name    string
@@ -66,7 +129,7 @@ func TestCanUpdate_MultipleDeletions_ByDiff(t *testing.T) {
 			initial := StorableDashboardData{
 				"widgets": makeTestWidgets("a", "b", "c"),
 			}
-			d, err := NewDashboard(orgID, "tester", initial)
+			d, err := NewDashboard(orgID, "tester", SourceUser, initial)
 			assert.NoError(t, err)

 			updated := StorableDashboardData{
Author	SHA1	Message	Date
Srikanth Chekuri	800d769ea2	Merge branch 'main' into issue-5004	2026-05-20 10:18:14 +05:30
srikanthccv	9b4efd599f	chore: run generate	2026-05-20 10:16:43 +05:30
srikanthccv	06c32c7966	chore: consolidate checks to module	2026-05-20 10:12:20 +05:30
srikanthccv	abc749c964	chore: create source field in dashboards	2026-05-20 09:53:48 +05:30
Jatinderjit Singh	a27b7d3d8e	move planned maintenance to alertmanager pipeline (#11130 ) * add maintenanceMuteStage to move planned maintenance to alertmanager Rules previously skipped rule.Eval() entirely during maintenance windows. This change moves suppression to MaintenanceMuter, injected as a Stage in the alertmanager notification pipeline. Now rules always evaluate and everys suppression is handled by alertmanager. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * refactor: wrap routing pipeline once instead of per-route injection Replace the per-route-entry loop with a single MultiStage wrap so maintenance suppression runs once per dispatch group before routing. * refactor: move maintenance mute stage into custom pipelineBuilder Copy notify.PipelineBuilder locally so we can inject mms between the silence stage and the receiver stage (GossipSettle → Inhibit → TimeActive → TimeMute → Silence → mms → Receiver), matching the correct suppression order the team requires. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * chore: add license header to pipeline_builder.go Copied code originates from Apache-2.0 licensed Prometheus Alertmanager; add dual copyright + SPDX identifier following the repo's convention. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * chore: replace SPDX tag with full Apache 2.0 license boilerplate The full license text is unambiguously compliant with Apache 2.0 Section 4(a), which requires giving recipients "a copy of this License". Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * refactor: pass MaintenanceMuter directly to pipelineBuilder Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * refactor: remove dead orgID param from task constructors Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * rename buildReceiverStage -> createReceiverStage * refactor: replace maintenanceMuteStage with notify.NewMuteStage MaintenanceMuter already satisfies types.Muter, and pipelineBuilder has its own pb.metrics, so the hand-rolled maintenanceMuteStage wrapper is redundant. Use notify.NewMuteStage(pb.muter, pb.metrics) directly. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * refactor: hoist MuteStage construction out of the receiver loop MuteStage holds no per-receiver state, so one instance shared across all receivers is sufficient — matching how is/ss are handled upstream. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * refactor: always initialize maintenanceStore; remove nil guards Tests now use a real sqlrulestore-backed MaintenanceMuter instead of passing nil. With nil no longer a valid input, remove the nil guards in server.go and pipeline_builder.go. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * refactor: move MaintenanceMuter to Server and pass it to pipelineBuilder.New - Remove muter from pipelineBuilder struct and newPipelineBuilder(); pass it as a parameter to New() instead, consistent with inhibitor/silencer - Store muter on Server so GetAlerts can call Mutes() alongside the inhibitor and silencer, ensuring maintenance-suppressed alerts show the correct muted status in API responses Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com> * remove redundant MemMarker wrapper * feat: surface maintenance-suppressed alerts via mutedBy in GetAlerts Alerts suppressed by an active maintenance window were being correctly muted in the notification pipeline but appeared as state=active in the v2 GetAlerts response, since MaintenanceMuter.Mutes had no marker side-effect (unlike inhibitor/silencer). Add MaintenanceMuter.MutedBy returning the matching window IDs, and plumb a mutedByFunc callback through NewGettableAlertsFromAlertProvider into AlertToOpenAPIAlert. The upstream v2 API forces state=suppressed when mutedBy is non-empty, so the frontend's existing state-based rendering picks it up without further changes. Use the dedicated mutedBy field rather than SilencedBy to avoid violating the "complete set of silence IDs" contract that anything querying silences by ID would rely on. Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com> * code cleanup * refactor: move maintenance (planned downtime) to alertmanager packages Types move from pkg/types/ruletypes/ to pkg/types/alertmanagertypes/: - maintenance.go, recurrence.go, schedule.go (+ tests) Store impl moves from pkg/ruler/rulestore/sqlrulestore/ to pkg/alertmanager/alertmanagerstore/sqlalertmanagerstore/. Maintenance windows mute alerts, so they belong with alertmanager rather than the rule types. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * test: add unit tests for MaintenanceMuter Covers Mutes/MutedBy semantics (empty label, rule match, empty-RuleIDs matches-all, future windows, multi-window) and the result cache (single-fetch within TTL, stale-cache fallback on store error, re-fetch after expiry, concurrency safety). Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * Update schema changes * Re-add marker * fix NewMaintenanceStore in tests * Go lint fixes * test: use mockery-generated mock for MaintenanceStore in muter tests Replace hand-written fakeMaintenanceStore with a mockery-generated MockMaintenanceStore, consistent with the alertmanagertest pattern. Also adds MaintenanceStore to .mockery.yml so the mock stays in sync. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * chore: regenerate mocks via make gen-mocks Picks up new MockHandler for the Handler interface in pkg/alertmanager and regenerates MockMaintenanceStore with canonical mockery formatting. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * cleanup test * test: add e2e muting tests for maintenance window behaviour * fix updates: omit empty endTime from serialization --------- Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-05-20 04:20:16 +00:00
Vishal Sharma	eab8d45611	chore(ai-assistant): add product analytics events (#11331 ) Some checks failed build-staging / prepare (push) Has been cancelled Details build-staging / staging (push) Has been cancelled Details Release Drafter / update_release_draft (push) Has been cancelled Details build-staging / js-build (push) Has been cancelled Details build-staging / go-build (push) Has been cancelled Details * chore(ai-assistant): add product analytics events Wire 14 frontend product-analytics events for the AI Assistant feature so we can measure the open→send funnel, action conversion, voice usage, and feature adoption. All events go through the existing `logEvent` helper, with a shared `useAIAssistantAnalyticsContext` hook providing `{ threadId, page, mode }`. Events shipped: - AI Assistant: Opened (source: icon \| shortcut \| deeplink) - AI Assistant: New chat clicked - AI Assistant: Message sent - AI Assistant: Suggested prompt clicked - AI Assistant: Cancel clicked - AI Assistant: Regenerate clicked - AI Assistant: Message copied - AI Assistant: Feedback submitted - AI Assistant: Resource opened - AI Assistant: Doc opened - AI Assistant: Apply filter clicked - AI Assistant: Thread opened from history - AI Assistant: Voice input used - AI Assistant: Voice input failed Additional changes: - Suppress duplicate `Opened` fires when expanding drawer/modal to the full-screen page (markExpandFromInApp / consumeExpandFromInApp flag). - Toast + analytics + sessionStorage-persisted hide for voice failures on Chromium derivatives that lack the Google Speech API key. - Browser info (name, version, platform, userAgent) attached to voice events to triage browser-specific failures. Skipped per scope: executionId on Cancel clicked, toolName on action events, turnCategory on Feedback submitted, promptCategory on suggested prompts — would require store/DTO changes beyond instrumentation. * fix(ai-assistant): address review feedback on analytics events - Replace markExpand module flag with router state so the Opened event stays correct across StrictMode double-mounts and aborted navigations. - Guard the voice push-to-talk shortcut on voiceUnavailable so it can't bypass the persisted hide-after-failure flag. - Fire SuggestedPromptClicked (category: follow_up) alongside MessageSent on server-emitted follow_up chips so click-through can be measured. - Normalize the page/currentPage attribute to its ROUTES template via matchPath, bounding cardinality and avoiding customer IDs in analytics. - Pick browsers from userAgentData via a derivative-first priority list, fall through to UA sniffing for generic Chromium hits, and probe navigator.brave to distinguish Brave from plain Chrome. * refactor(ai-assistant): simplify analytics scaffolding - Trim getBrowserInfo to UA-sniffing + Brave probe; drop the brand priority list, isGenericBrand gate, and userAgent/platform fields the backend can derive from request headers anyway. - Inline the router-state shape at its three call sites instead of exporting a named interface for { fromInApp?: boolean }. - Tighten comments across the module — keep the non-obvious "why" bits, drop the restated ones. * fix(ai-assistant): apply PR review feedback on analytics events - HeaderRightSection: rename Opened source 'icon' -> 'header' to reflect where the icon lives, not how it looks. - AIAssistantPage: normalize pathname on NewChatClicked so the conversation id doesn't leak into the page attribute. - ConversationView: invert the streaming useEffect to an early bailout when not streaming for readability. - ActionsSection: extract resource-type case strings into a ResourceType constants object shared by targetModuleForResource and resourceRoute. - VirtualizedMessages + ActionsSection: replace 'follow_up' / 'empty_state' magic strings with a SuggestedPromptCategory constants in events.ts.	2026-05-19 16:33:30 +00:00
Jatinderjit Singh	c73fdd1f81	fix(planned-downtime): timezone handling (#11318 ) * fix(planned-downtime): timezone handling Don't convert the start/end times to UTC for the request. Serialize as per the input timezone instead. * Fix date/string conversion issues --------- Co-authored-by: Srikanth Chekuri <srikanth.chekuri92@gmail.com>	2026-05-19 15:55:11 +00:00
Aditya Singh	6094a5eee2	fix: remove spanScopeSelector key to sync scope filters (#11355 )	2026-05-19 15:39:23 +00:00
swapnil-signoz	93407d3bcc	feat(sqlmigration): add integration_dashboard table (#11343 ) * feat(sqlmigration): add integration_dashboards table (migration 079) Adds the `integration_dashboards` relations table that stores the integration-specific identity for dashboards provisioned from cloud or builtin integrations. Columns: id, org_id, dashboard_id, provider, slug, created_at, updated_at. Includes a unique index on dashboard_id. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * chore: adding comment for fk * refactor: renaming table name * chore: file rename * refactor: removing org_id column and adding fk relation * refactor: rename integration dashboards factory to singular --------- Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>	2026-05-19 15:24:27 +00:00
Abhi kumar	5bd4cabbca	fix: added fix for widget warning/save modal states (#11356 ) Some checks failed build-staging / prepare (push) Has been cancelled Details Release Drafter / update_release_draft (push) Has been cancelled Details build-staging / js-build (push) Has been cancelled Details build-staging / go-build (push) Has been cancelled Details build-staging / staging (push) Has been cancelled Details	2026-05-19 13:31:14 +00:00
Aditya Singh	f9e21cecd8	feat: field selector migrated to telemetry field key (#11360 ) * feat: field selector migrated to telemetry field key * feat: move floating panel to field selector	2026-05-19 13:14:44 +00:00
Ashwin Bhatkal	4b98b0bb27	fix(dashboard): component UX updates in widget header and settings panel (#11357 ) Bundles four small UX fixes — three regressions from the typography (#11199) and icons (#11222) migrations, plus the DashboardDescription fallout from #11352: - Widget panel title truncates to "Title..." even when the panel has plenty of horizontal space. The title container had no `flex: 1` / `min-width: 0`, so it collapsed to content width and the 80% cap triggered early truncation. Make the title row a real flex item. - Variable editor "Default Value" label and helper text run together on one line. `Typography` from `@signozhq/ui` defaults to `display: inline`, so the helper text sat next to the label. Force block layout in the default-value-section. - Cross-Panel Sync info icon was the outline `Info`, inconsistent with the `SolidInfoCircle` used everywhere else (widget header, threshold, status message). Swap to the standard icon at size "md". - After #11352, DeleteButton renders as an antd `<Button>`, but the DashboardDescription action menu still targeted `.ant-typography` for the delete entry, so it picked up the list-page module's 8px / 12px styling and went out of sync with its peers. Consolidate the three near-duplicate `section-1` / `section-2` / `delete-dashboard` blocks into a single `section .ant-btn` rule, with section dividers and the danger color as the only per-section overrides.	2026-05-19 10:49:46 +00:00
				`@@ -0,0 +1 @@`
				`export { default } from './FieldsSelector';`