feat: apply templates on Clickhouse query before parsing

.gitignore

@@ -49,7 +49,6 @@ ee/query-service/tests/test-deploy/data/
 # local data
 *.backup
 *.db
-**/db
 /deploy/docker/clickhouse-setup/data/
 /deploy/docker-swarm/clickhouse-setup/data/
 bin/

Makefile

@@ -72,12 +72,6 @@ devenv-up: devenv-clickhouse devenv-signoz-otel-collector ## Start both clickhou
 	@echo "   - ClickHouse: http://localhost:8123"
 	@echo "   - Signoz OTel Collector: grpc://localhost:4317, http://localhost:4318"
 
-.PHONY: devenv-clickhouse-clean
-devenv-clickhouse-clean: ## Clean all ClickHouse data from filesystem
-	@echo "Removing ClickHouse data..."
-	@rm -rf .devenv/docker/clickhouse/fs/tmp/*
-	@echo "ClickHouse data cleaned!"
-
 ##############################################################
 # go commands
 ##############################################################

docs/api/openapi.yml

@@ -849,71 +849,6 @@ paths:
       summary: Deprecated create session by email password
       tags:
       - sessions
-  /api/v1/logs/promote_paths:
-    get:
-      deprecated: false
-      description: This endpoints promotes and indexes paths
-      operationId: ListPromotedAndIndexedPaths
-      responses:
-        "200":
-          content:
-            application/json:
-              schema:
-                properties:
-                  data:
-                    items:
-                      $ref: '#/components/schemas/PromotetypesPromotePath'
-                    nullable: true
-                    type: array
-                  status:
-                    type: string
-                type: object
-          description: OK
-        "400":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/RenderErrorResponse'
-          description: Bad Request
-        "500":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/RenderErrorResponse'
-          description: Internal Server Error
-      summary: Promote and index paths
-      tags:
-      - logs
-    post:
-      deprecated: false
-      description: This endpoints promotes and indexes paths
-      operationId: HandlePromoteAndIndexPaths
-      requestBody:
-        content:
-          application/json:
-            schema:
-              items:
-                $ref: '#/components/schemas/PromotetypesPromotePath'
-              nullable: true
-              type: array
-      responses:
-        "201":
-          description: Created
-        "400":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/RenderErrorResponse'
-          description: Bad Request
-        "500":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/RenderErrorResponse'
-          description: Internal Server Error
-      summary: Promote and index paths
-      tags:
-      - logs
   /api/v1/org/preferences:
     get:
       deprecated: false
@@ -2202,26 +2137,6 @@ components:
       type: object
     PreferencetypesValue:
       type: object
-    PromotetypesPromotePath:
-      properties:
-        indexes:
-          items:
-            $ref: '#/components/schemas/PromotetypesWrappedIndex'
-          type: array
-        path:
-          type: string
-        promote:
-          type: boolean
-      type: object
-    PromotetypesWrappedIndex:
-      properties:
-        column_type:
-          type: string
-        granularity:
-          type: integer
-        type:
-          type: string
-      type: object
     RenderErrorResponse:
       properties:
         error:

ee/query-service/app/server.go

@@ -376,6 +376,7 @@ func makeRulesManager(ch baseint.Reader, cache cache.Cache, alertmanager alertma
 		RuleStore:           ruleStore,
 		MaintenanceStore:    maintenanceStore,
 		SqlStore:            sqlstore,
+		QueryParser:         queryParser,
 	}
 
 	// create Manager

ee/query-service/rules/anomaly.go

@@ -207,6 +207,42 @@ func (r *AnomalyRule) GetSelectedQuery() string {
 	return r.Condition().GetSelectedQueryName()
 }
 
+// filterNewSeries filters out new series based on the first_seen timestamp.
+func (r *AnomalyRule) filterNewSeries(ctx context.Context, ts time.Time, series []*v3.Series) ([]*v3.Series, error) {
+	// Convert []*v3.Series to []v3.Series for filtering
+	v3Series := make([]v3.Series, 0, len(series))
+	for _, s := range series {
+		v3Series = append(v3Series, *s)
+	}
+
+	// Get indexes to skip
+	skipIndexes, filterErr := r.BaseRule.FilterNewSeries(ctx, ts, v3Series)
+	if filterErr != nil {
+		r.logger.ErrorContext(ctx, "Error filtering new series, ", "error", filterErr, "rule_name", r.Name())
+		return nil, filterErr
+	}
+
+	// if no series are skipped, return the original series
+	if len(skipIndexes) == 0 {
+		return series, nil
+	}
+
+	// Create a map of skip indexes for efficient lookup
+	skippedIdxMap := make(map[int]struct{}, len(skipIndexes))
+	for _, idx := range skipIndexes {
+		skippedIdxMap[idx] = struct{}{}
+	}
+
+	// Filter out skipped series
+	oldSeries := make([]*v3.Series, 0, len(series)-len(skipIndexes))
+	for i, s := range series {
+		if _, shouldSkip := skippedIdxMap[i]; !shouldSkip {
+			oldSeries = append(oldSeries, s)
+		}
+	}
+	return oldSeries, nil
+}
+
 func (r *AnomalyRule) buildAndRunQuery(ctx context.Context, orgID valuer.UUID, ts time.Time) (ruletypes.Vector, error) {
 
 	params, err := r.prepareQueryRange(ctx, ts)
@@ -239,7 +275,18 @@ func (r *AnomalyRule) buildAndRunQuery(ctx context.Context, orgID valuer.UUID, t
 	scoresJSON, _ := json.Marshal(queryResult.AnomalyScores)
 	r.logger.InfoContext(ctx, "anomaly scores", "scores", string(scoresJSON))
 
-	for _, series := range queryResult.AnomalyScores {
+	// Filter out new series if newGroupEvalDelay is configured
+	seriesToProcess := queryResult.AnomalyScores
+	if r.ShouldSkipNewGroups() {
+		filteredSeries, filterErr := r.filterNewSeries(ctx, ts, seriesToProcess)
+		if filterErr != nil {
+			r.logger.ErrorContext(ctx, "Error filtering new series, ", "error", filterErr, "rule_name", r.Name())
+			return nil, filterErr
+		}
+		seriesToProcess = filteredSeries
+	}
+
+	for _, series := range seriesToProcess {
 		if r.Condition() != nil && r.Condition().RequireMinPoints {
 			if len(series.Points) < r.Condition().RequiredNumPoints {
 				r.logger.InfoContext(ctx, "not enough data points to evaluate series, skipping", "ruleid", r.ID(), "numPoints", len(series.Points), "requiredPoints", r.Condition().RequiredNumPoints)
@@ -291,7 +338,18 @@ func (r *AnomalyRule) buildAndRunQueryV5(ctx context.Context, orgID valuer.UUID,
 	scoresJSON, _ := json.Marshal(queryResult.AnomalyScores)
 	r.logger.InfoContext(ctx, "anomaly scores", "scores", string(scoresJSON))
 
-	for _, series := range queryResult.AnomalyScores {
+	// Filter out new series if newGroupEvalDelay is configured
+	seriesToProcess := queryResult.AnomalyScores
+	if r.ShouldSkipNewGroups() {
+		filteredSeries, filterErr := r.filterNewSeries(ctx, ts, seriesToProcess)
+		if filterErr != nil {
+			r.logger.ErrorContext(ctx, "Error filtering new series, ", "error", filterErr, "rule_name", r.Name())
+			return nil, filterErr
+		}
+		seriesToProcess = filteredSeries
+	}
+
+	for _, series := range seriesToProcess {
 		if r.Condition().RequireMinPoints {
 			if len(series.Points) < r.Condition().RequiredNumPoints {
 				r.logger.InfoContext(ctx, "not enough data points to evaluate series, skipping", "ruleid", r.ID(), "numPoints", len(series.Points), "requiredPoints", r.Condition().RequiredNumPoints)

ee/query-service/rules/manager.go

@@ -37,6 +37,7 @@ func PrepareTaskFunc(opts baserules.PrepareTaskOptions) (baserules.Task, error)
 			opts.SLogger,
 			baserules.WithEvalDelay(opts.ManagerOpts.EvalDelay),
 			baserules.WithSQLStore(opts.SQLStore),
+			baserules.WithQueryParser(opts.ManagerOpts.QueryParser),
 		)
 
 		if err != nil {
@@ -59,6 +60,7 @@ func PrepareTaskFunc(opts baserules.PrepareTaskOptions) (baserules.Task, error)
 			opts.Reader,
 			opts.ManagerOpts.Prometheus,
 			baserules.WithSQLStore(opts.SQLStore),
+			baserules.WithQueryParser(opts.ManagerOpts.QueryParser),
 		)
 
 		if err != nil {
@@ -82,6 +84,7 @@ func PrepareTaskFunc(opts baserules.PrepareTaskOptions) (baserules.Task, error)
 			opts.Cache,
 			baserules.WithEvalDelay(opts.ManagerOpts.EvalDelay),
 			baserules.WithSQLStore(opts.SQLStore),
+			baserules.WithQueryParser(opts.ManagerOpts.QueryParser),
 		)
 		if err != nil {
 			return task, err
@@ -140,6 +143,7 @@ func TestNotification(opts baserules.PrepareTestRuleOptions) (int, *basemodel.Ap
 			baserules.WithSendAlways(),
 			baserules.WithSendUnmatched(),
 			baserules.WithSQLStore(opts.SQLStore),
+			baserules.WithQueryParser(opts.ManagerOpts.QueryParser),
 		)
 
 		if err != nil {
@@ -160,6 +164,7 @@ func TestNotification(opts baserules.PrepareTestRuleOptions) (int, *basemodel.Ap
 			baserules.WithSendAlways(),
 			baserules.WithSendUnmatched(),
 			baserules.WithSQLStore(opts.SQLStore),
+			baserules.WithQueryParser(opts.ManagerOpts.QueryParser),
 		)
 
 		if err != nil {
@@ -179,6 +184,7 @@ func TestNotification(opts baserules.PrepareTestRuleOptions) (int, *basemodel.Ap
 			baserules.WithSendAlways(),
 			baserules.WithSendUnmatched(),
 			baserules.WithSQLStore(opts.SQLStore),
+			baserules.WithQueryParser(opts.ManagerOpts.QueryParser),
 		)
 		if err != nil {
 			zap.L().Error("failed to prepare a new anomaly rule for test", zap.String("name", alertname), zap.Error(err))

frontend/bundlesize.config.json

@@ -1,52 +1,8 @@
 {
 	"files": [
 		{
-			"path": "./build/runtime~*.js",
-			"maxSize": "50KB"
-		},
-		{
-			"path": "./build/vendors-react.*.js",
-			"maxSize": "300KB"
-		},
-		{
-			"path": "./build/vendors-antd.*.js",
-			"maxSize": "1MB"
-		},
-		{
-			"path": "./build/vendors-antd-icons.*.js",
-			"maxSize": "2.5MB"
-		},
-		{
-			"path": "./build/vendors-charts.*.js",
-			"maxSize": "400KB"
-		},
-		{
-			"path": "./build/vendors-react-query.*.js",
-			"maxSize": "100KB"
-		},
-		{
-			"path": "./build/vendors-utilities.*.js",
-			"maxSize": "600KB"
-		},
-		{
-			"path": "./build/vendors-monaco.*.js",
-			"maxSize": "3MB"
-		},
-		{
-			"path": "./build/vendors-common.*.js",
-			"maxSize": "800KB"
-		},
-		{
-			"path": "./build/main.*.js",
-			"maxSize": "500KB"
-		},
-		{
-			"path": "./build/Home.*.js",
-			"maxSize": "300KB"
-		},
-		{
-			"path": "./build/*.js",
-			"maxSize": "1MB"
+			"path": "./build/**.js",
+			"maxSize": "1.2MB"
 		}
 	]
 }

frontend/src/AppRoutes/index.tsx

@@ -6,7 +6,6 @@ import logEvent from 'api/common/logEvent';
 import AppLoading from 'components/AppLoading/AppLoading';
 import { CmdKPalette } from 'components/cmdKPalette/cmdKPalette';
 import NotFound from 'components/NotFound';
-import { ShiftHoldOverlayController } from 'components/ShiftOverlay/ShiftHoldOverlayController';
 import Spinner from 'components/Spinner';
 import { FeatureKeys } from 'constants/features';
 import { LOCALSTORAGE } from 'constants/localStorage';
@@ -369,9 +368,6 @@ function App(): JSX.Element {
 							<NotificationProvider>
 								<ErrorModalProvider>
 									{isLoggedInState && <CmdKPalette userRole={user.role} />}
-									{isLoggedInState && (
-										<ShiftHoldOverlayController userRole={user.role} />
-									)}
 									<PrivateRoute>
 										<ResourceProvider>
 											<QueryBuilderProvider>

frontend/src/api/metricsExplorer/v2/getMetricMetadata.ts

@@ -1,29 +0,0 @@
-import { ApiV2Instance as axios } from 'api';
-import { ErrorResponseHandlerV2 } from 'api/ErrorResponseHandlerV2';
-import { AxiosError } from 'axios';
-import { ErrorResponseV2, ErrorV2Resp, SuccessResponseV2 } from 'types/api';
-import { MetricMetadataResponse } from 'types/api/metricsExplorer/v2/getMetricMetadata';
-
-export const getMetricMetadata = async (
-	metricName: string,
-	signal?: AbortSignal,
-	headers?: Record<string, string>,
-): Promise<SuccessResponseV2<MetricMetadataResponse> | ErrorResponseV2> => {
-	try {
-		const encodedMetricName = encodeURIComponent(metricName);
-		const response = await axios.get(
-			`/metrics/metadata?metricName=${encodedMetricName}`,
-			{
-				signal,
-				headers,
-			},
-		);
-
-		return {
-			httpStatusCode: response.status,
-			data: response.data,
-		};
-	} catch (error) {
-		return ErrorResponseHandlerV2(error as AxiosError<ErrorV2Resp>);
-	}
-};

frontend/src/components/Logs/ListLogView/ListLogView.styles.scss

@@ -1,15 +1,11 @@
-.log-field-container {
-	display: flex;
-	overflow: hidden;
-	width: 100%;
-	align-items: baseline;
-}
-.log-field-key,
-.log-field-key-colon {
+.log-field-key {
+	padding-right: 5px;
 	color: var(--text-vanilla-400, #c0c1c3);
 	font-size: 14px;
 	font-style: normal;
 	font-weight: 400;
+	line-height: 18px; /* 128.571% */
+	letter-spacing: -0.07px;
 
 	&.small {
 		font-size: 11px;
@@ -26,20 +22,6 @@
 		line-height: 24px;
 	}
 }
-.log-field-key {
-	line-height: 18px; /* 128.571% */
-	letter-spacing: -0.07px;
-	white-space: nowrap;
-	display: inline-block;
-	max-width: 20vw;
-	text-overflow: ellipsis;
-	overflow: hidden;
-	margin: 0;
-}
-.log-field-key-colon {
-	min-width: 0.8rem;
-	flex-shrink: 0;
-}
 .log-value {
 	color: var(--text-vanilla-400, #c0c1c3);
 	font-size: 14px;
@@ -176,8 +158,7 @@
 }
 
 .lightMode {
-	.log-field-key,
-	.log-field-key-colon {
+	.log-field-key {
 		color: var(--text-slate-400);
 	}
 	.log-value {
@@ -189,10 +170,3 @@
 		}
 	}
 }
-
-.dark {
-	.log-field-key,
-	.log-field-key-colon {
-		color: rgba(255, 255, 255, 0.45);
-	}
-}

frontend/src/components/Logs/ListLogView/index.tsx

@@ -25,7 +25,13 @@ import LogLinesActionButtons from '../LogLinesActionButtons/LogLinesActionButton
 import LogStateIndicator from '../LogStateIndicator/LogStateIndicator';
 import { getLogIndicatorType } from '../LogStateIndicator/utils';
 // styles
-import { Container, LogContainer, LogText } from './styles';
+import {
+	Container,
+	LogContainer,
+	LogText,
+	Text,
+	TextContainer,
+} from './styles';
 import { isValidLogField } from './util';
 
 interface LogFieldProps {
@@ -52,18 +58,16 @@ function LogGeneralField({
 	);
 
 	return (
-		<div className="log-field-container">
-			<p className={cx('log-field-key', fontSize)} title={fieldKey}>
-				{fieldKey}
-			</p>
-			<span className={cx('log-field-key-colon', fontSize)}>&nbsp;:&nbsp;</span>
+		<TextContainer>
+			<Text ellipsis type="secondary" className={cx('log-field-key', fontSize)}>
+				{`${fieldKey} : `}
+			</Text>
 			<LogText
 				dangerouslySetInnerHTML={html}
 				className={cx('log-value', fontSize)}
-				title={fieldValue}
 				linesPerRow={linesPerRow > 1 ? linesPerRow : undefined}
 			/>
-		</div>
+		</TextContainer>
 	);
 }
 

frontend/src/components/Logs/ListLogView/styles.ts

@@ -1,5 +1,5 @@
 /* eslint-disable no-nested-ternary */
-import { Card } from 'antd';
+import { Card, Typography } from 'antd';
 import { FontSize } from 'container/OptionsMenu/types';
 import styled from 'styled-components';
 import { getActiveLogBackground } from 'utils/logs';
@@ -46,6 +46,19 @@ export const Container = styled(Card)<{
 			getActiveLogBackground($isActiveLog, $isDarkMode, $logType)}
 `;
 
+export const Text = styled(Typography.Text)`
+	&&& {
+		min-width: 2.5rem;
+		white-space: nowrap;
+	}
+`;
+
+export const TextContainer = styled.div`
+	display: flex;
+	overflow: hidden;
+	width: 100%;
+`;
+
 export const LogContainer = styled.div<LogContainerProps>`
 	margin-left: 0.5rem;
 	display: flex;

frontend/src/components/QueryBuilderV2/QueryBuilderV2.styles.scss

@@ -560,10 +560,6 @@
 					border: 1px solid var(--bg-vanilla-300) !important;
 					background: var(--bg-vanilla-100) !important;
 					box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.1) !important;
-
-					.ant-select-selection-item {
-						color: var(--text-ink-400);
-					}
 				}
 			}
 		}
@@ -573,10 +569,6 @@
 				border: 1px solid var(--bg-vanilla-300) !important;
 				background: var(--bg-vanilla-100) !important;
 				box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.1) !important;
-
-				.ant-select-selection-item {
-					color: var(--text-ink-400);
-				}
 			}
 
 			.ant-select-arrow {

frontend/src/components/QueryBuilderV2/QueryV2/MerticsAggregateSection/MetricsAggregateSection.styles.scss

@@ -169,10 +169,6 @@
 					.ant-select-selector {
 						border: 1px solid var(--bg-vanilla-300) !important;
 						background: var(--bg-vanilla-100) !important;
-
-						.ant-select-selection-item {
-							color: var(--text-ink-400);
-						}
 					}
 				}
 			}

frontend/src/components/QueryBuilderV2/QueryV2/QueryAddOns/QueryAddOns.tsx

@@ -32,7 +32,6 @@ const ADD_ONS_KEYS = {
 	ORDER_BY: 'order_by',
 	LIMIT: 'limit',
 	LEGEND_FORMAT: 'legend_format',
-	REDUCE_TO: 'reduce_to',
 };
 
 const ADD_ONS_KEYS_TO_QUERY_PATH = {
@@ -41,14 +40,13 @@ const ADD_ONS_KEYS_TO_QUERY_PATH = {
 	[ADD_ONS_KEYS.ORDER_BY]: 'orderBy',
 	[ADD_ONS_KEYS.LIMIT]: 'limit',
 	[ADD_ONS_KEYS.LEGEND_FORMAT]: 'legend',
-	[ADD_ONS_KEYS.REDUCE_TO]: 'reduceTo',
 };
 
 const ADD_ONS = [
 	{
 		icon: <BarChart2 size={14} />,
 		label: 'Group By',
-		key: ADD_ONS_KEYS.GROUP_BY,
+		key: 'group_by',
 		description:
 			'Break down data by attributes like service name, endpoint, status code, or region. Essential for spotting patterns and comparing performance across different segments.',
 		docLink: 'https://signoz.io/docs/userguide/query-builder-v5/#grouping',
@@ -56,7 +54,7 @@ const ADD_ONS = [
 	{
 		icon: <ScrollText size={14} />,
 		label: 'Having',
-		key: ADD_ONS_KEYS.HAVING,
+		key: 'having',
 		description:
 			'Filter grouped results based on aggregate conditions. Show only groups meeting specific criteria, like error rates > 5% or p99 latency > 500',
 		docLink:
@@ -65,7 +63,7 @@ const ADD_ONS = [
 	{
 		icon: <ScrollText size={14} />,
 		label: 'Order By',
-		key: ADD_ONS_KEYS.ORDER_BY,
+		key: 'order_by',
 		description:
 			'Sort results to surface what matters most. Quickly identify slowest operations, most frequent errors, or highest resource consumers.',
 		docLink:
@@ -74,7 +72,7 @@ const ADD_ONS = [
 	{
 		icon: <ScrollText size={14} />,
 		label: 'Limit',
-		key: ADD_ONS_KEYS.LIMIT,
+		key: 'limit',
 		description:
 			'Show only the top/bottom N results. Perfect for focusing on outliers, reducing noise, and improving dashboard performance.',
 		docLink:
@@ -83,7 +81,7 @@ const ADD_ONS = [
 	{
 		icon: <ScrollText size={14} />,
 		label: 'Legend format',
-		key: ADD_ONS_KEYS.LEGEND_FORMAT,
+		key: 'legend_format',
 		description:
 			'Customize series labels using variables like {{service.name}}-{{endpoint}}. Makes charts readable at a glance during incident investigation.',
 		docLink:
@@ -94,7 +92,7 @@ const ADD_ONS = [
 const REDUCE_TO = {
 	icon: <ScrollText size={14} />,
 	label: 'Reduce to',
-	key: ADD_ONS_KEYS.REDUCE_TO,
+	key: 'reduce_to',
 	description:
 		'Apply mathematical operations like sum, average, min, max, or percentiles to reduce multiple time series into a single value.',
 	docLink:
@@ -220,9 +218,10 @@ function QueryAddOns({
 		);
 
 		const availableAddOnKeys = new Set(filteredAddOns.map((addOn) => addOn.key));
+
 		// Filter and set selected views: add-ons that are both active and available
 		setSelectedViews(
-			filteredAddOns.filter(
+			ADD_ONS.filter(
 				(addOn) =>
 					activeAddOnKeys.has(addOn.key) && availableAddOnKeys.has(addOn.key),
 			),

frontend/src/components/QueryBuilderV2/__tests__/QueryAddOns.test.tsx

@@ -1,12 +1,6 @@
 /* eslint-disable */
-import {
-	fireEvent,
-	render,
-	screen,
-	userEvent,
-	waitFor,
-	within,
-} from 'tests/test-utils';
+import { fireEvent, render, screen } from '@testing-library/react';
+import React from 'react';
 
 import QueryAddOns from '../QueryV2/QueryAddOns/QueryAddOns';
 import { PANEL_TYPES } from 'constants/queryBuilder';
@@ -61,7 +55,16 @@ jest.mock('../QueryV2/QueryAddOns/HavingFilter/HavingFilter', () => ({
 	),
 }));
 
-// ReduceToFilter is not mocked - we test the actual Ant Design Select component
+jest.mock(
+	'container/QueryBuilder/filters/ReduceToFilter/ReduceToFilter',
+	() => ({
+		ReduceToFilter: ({ onChange }: any) => (
+			<button data-testid="reduce-to" onClick={() => onChange('sum')}>
+				ReduceToFilter
+			</button>
+		),
+	}),
+);
 
 function baseQuery(overrides: Partial<any> = {}): any {
 	return {
@@ -137,7 +140,7 @@ describe('QueryAddOns', () => {
 		expect(screen.getByTestId('order-by-content')).toBeInTheDocument();
 	});
 
-	it('limit input auto-opens when limit is set and changing it calls handler', async () => {
+	it('limit input auto-opens when limit is set and changing it calls handler', () => {
 		render(
 			<QueryAddOns
 				query={baseQuery({ limit: 5 })}
@@ -180,88 +183,4 @@ describe('QueryAddOns', () => {
 		expect(screen.getByTestId('limit-content')).toBeInTheDocument();
 		expect(limitInput.value).toBe('7');
 	});
-
-	it('shows reduce-to add-on when showReduceTo is true', () => {
-		render(
-			<QueryAddOns
-				query={baseQuery()}
-				version="v5"
-				isListViewPanel={false}
-				showReduceTo
-				panelType={PANEL_TYPES.TIME_SERIES}
-				index={0}
-				isForTraceOperator={false}
-			/>,
-		);
-
-		expect(screen.getByTestId('query-add-on-reduce_to')).toBeInTheDocument();
-	});
-
-	it('auto-opens reduce-to content when reduceTo is set', () => {
-		render(
-			<QueryAddOns
-				query={baseQuery({ reduceTo: 'sum' })}
-				version="v5"
-				isListViewPanel={false}
-				showReduceTo
-				panelType={PANEL_TYPES.TIME_SERIES}
-				index={0}
-				isForTraceOperator={false}
-			/>,
-		);
-
-		expect(screen.getByTestId('reduce-to-content')).toBeInTheDocument();
-	});
-
-	it('calls handleSetQueryData when reduce-to value changes', async () => {
-		const user = userEvent.setup({ pointerEventsCheck: 0 });
-		const query = baseQuery({
-			reduceTo: 'avg',
-			aggregations: [{ id: 'a', operator: 'count', reduceTo: 'avg' }],
-		});
-		render(
-			<QueryAddOns
-				query={query}
-				version="v5"
-				isListViewPanel={false}
-				showReduceTo
-				panelType={PANEL_TYPES.TIME_SERIES}
-				index={0}
-				isForTraceOperator={false}
-			/>,
-		);
-
-		// Wait for the reduce-to content section to be visible (it auto-opens when reduceTo is set)
-		await waitFor(() => {
-			expect(screen.getByTestId('reduce-to-content')).toBeInTheDocument();
-		});
-
-		// Get the Select component by its role (combobox)
-		// The Select is within the reduce-to-content section
-		const reduceToContent = screen.getByTestId('reduce-to-content');
-		const selectCombobox = within(reduceToContent).getByRole('combobox');
-
-		// Open the dropdown by clicking on the combobox
-		await user.click(selectCombobox);
-
-		// Wait for the dropdown listbox to appear
-		await screen.findByRole('listbox');
-
-		// Find and click the "Sum" option
-		const sumOption = await screen.findByText('Sum of values in timeframe');
-		await user.click(sumOption);
-
-		// Verify the handler was called with the correct value
-		await waitFor(() => {
-			expect(mockHandleSetQueryData).toHaveBeenCalledWith(0, {
-				...query,
-				aggregations: [
-					{
-						...(query.aggregations?.[0] as any),
-						reduceTo: 'sum',
-					},
-				],
-			});
-		});
-	});
 });

frontend/src/components/ShiftOverlay/ShiftHoldOverlayController.tsx

@@ -1,27 +0,0 @@
-import { createShortcutActions } from '../../constants/shortcutActions';
-import { useCmdK } from '../../providers/cmdKProvider';
-import { ShiftOverlay } from './ShiftOverlay';
-import { useShiftHoldOverlay } from './useShiftHoldOverlay';
-
-type UserRole = 'ADMIN' | 'EDITOR' | 'AUTHOR' | 'VIEWER';
-export function ShiftHoldOverlayController({
-	userRole,
-}: {
-	userRole: UserRole;
-}): JSX.Element | null {
-	const { open: isCmdKOpen } = useCmdK();
-	const noop = (): void => undefined;
-
-	const actions = createShortcutActions({
-		navigate: noop,
-		handleThemeChange: noop,
-	});
-
-	const visible = useShiftHoldOverlay({
-		isModalOpen: isCmdKOpen,
-	});
-
-	return (
-		<ShiftOverlay visible={visible} actions={actions} userRole={userRole} />
-	);
-}

frontend/src/components/ShiftOverlay/ShiftOverlay.tsx

@@ -1,77 +0,0 @@
-import './shiftOverlay.scss';
-
-import { useMemo } from 'react';
-import ReactDOM from 'react-dom';
-
-import { formatShortcut } from './formatShortcut';
-
-export type UserRole = 'ADMIN' | 'EDITOR' | 'AUTHOR' | 'VIEWER';
-export type CmdAction = {
-	id: string;
-	name: string;
-	shortcut?: string[];
-	keywords?: string;
-	section?: string;
-	roles?: UserRole[];
-	perform: () => void;
-};
-
-interface ShortcutProps {
-	label: string;
-	keyHint: React.ReactNode;
-}
-
-function Shortcut({ label, keyHint }: ShortcutProps): JSX.Element {
-	return (
-		<div className="shift-overlay__item">
-			<span className="shift-overlay__label">{label}</span>
-			<kbd className="shift-overlay__kbd">{keyHint}</kbd>
-		</div>
-	);
-}
-
-interface ShiftOverlayProps {
-	visible: boolean;
-	actions: CmdAction[];
-	userRole: UserRole;
-}
-
-export function ShiftOverlay({
-	visible,
-	actions,
-	userRole,
-}: ShiftOverlayProps): JSX.Element | null {
-	const navigationActions = useMemo(() => {
-		// RBAC filter: show action if no roles set OR current user role is included
-		const permitted = actions.filter(
-			(a) => !a.roles || a.roles.includes(userRole),
-		);
-
-		// Navigation only + must have shortcut
-		return permitted.filter(
-			(a) =>
-				a.section?.toLowerCase() === 'navigation' &&
-				a.shortcut &&
-				a.shortcut.length > 0,
-		);
-	}, [actions, userRole]);
-
-	if (!visible || navigationActions.length === 0) {
-		return null;
-	}
-
-	return ReactDOM.createPortal(
-		<div className="shift-overlay">
-			<div className="shift-overlay__panel">
-				{navigationActions.map((action) => (
-					<Shortcut
-						key={action.id}
-						label={action.name.replace(/^Go to\s+/i, '')}
-						keyHint={formatShortcut(action.shortcut)}
-					/>
-				))}
-			</div>
-		</div>,
-		document.body,
-	);
-}

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

@@ -1,102 +0,0 @@
-import '@testing-library/jest-dom';
-
-import { render, screen } from '@testing-library/react';
-
-import type { CmdAction } from '../ShiftOverlay';
-import { ShiftOverlay } from '../ShiftOverlay';
-
-jest.mock('../formatShortcut', () => ({
-	formatShortcut: (shortcut: string[]): string => shortcut.join('+'),
-}));
-
-const baseActions: CmdAction[] = [
-	{
-		id: '1',
-		name: 'Go to Traces',
-		section: 'navigation',
-		shortcut: ['Shift', 'T'],
-		perform: jest.fn(),
-	},
-	{
-		id: '2',
-		name: 'Go to Metrics',
-		section: 'navigation',
-		shortcut: ['Shift', 'M'],
-		roles: ['ADMIN'], // ✅ now UserRole[]
-		perform: jest.fn(),
-	},
-	{
-		id: '3',
-		name: 'Create Alert',
-		section: 'actions',
-		shortcut: ['A'],
-		perform: jest.fn(),
-	},
-	{
-		id: '4',
-		name: 'Go to Logs',
-		section: 'navigation',
-		perform: jest.fn(),
-	},
-];
-
-describe('ShiftOverlay', () => {
-	it('renders nothing when not visible', () => {
-		const { container } = render(
-			<ShiftOverlay visible={false} actions={baseActions} userRole="ADMIN" />,
-		);
-
-		expect(container.firstChild).toBeNull();
-	});
-
-	it('renders nothing when no navigation shortcuts exist', () => {
-		const { container } = render(
-			<ShiftOverlay
-				visible
-				actions={[
-					{
-						id: 'x',
-						name: 'Create Alert',
-						section: 'actions',
-						perform: jest.fn(),
-					},
-				]}
-				userRole="ADMIN"
-			/>,
-		);
-
-		expect(container.firstChild).toBeNull();
-	});
-
-	it('renders navigation shortcuts in a portal', () => {
-		render(<ShiftOverlay visible actions={baseActions} userRole="ADMIN" />);
-
-		expect(document.body.querySelector('.shift-overlay')).toBeInTheDocument();
-
-		expect(screen.getByText('Traces')).toBeInTheDocument();
-		expect(screen.getByText('Metrics')).toBeInTheDocument();
-
-		expect(screen.getByText('Shift+T')).toBeInTheDocument();
-		expect(screen.getByText('Shift+M')).toBeInTheDocument();
-	});
-
-	it('applies RBAC filtering correctly', () => {
-		render(<ShiftOverlay visible actions={baseActions} userRole="VIEWER" />);
-
-		expect(screen.getByText('Traces')).toBeInTheDocument();
-		expect(screen.queryByText('Metrics')).not.toBeInTheDocument();
-	});
-
-	it('strips "Go to" prefix from labels', () => {
-		render(<ShiftOverlay visible actions={baseActions} userRole="ADMIN" />);
-
-		expect(screen.getByText('Traces')).toBeInTheDocument();
-		expect(screen.queryByText('Go to Traces')).not.toBeInTheDocument();
-	});
-
-	it('does not render actions without shortcuts', () => {
-		render(<ShiftOverlay visible actions={baseActions} userRole="ADMIN" />);
-
-		expect(screen.queryByText('Logs')).not.toBeInTheDocument();
-	});
-});

frontend/src/components/ShiftOverlay/__tests__/useShiftHoldOverlay.test.tsx

@@ -1,144 +0,0 @@
-import { act, renderHook } from '@testing-library/react';
-
-import { useShiftHoldOverlay } from '../useShiftHoldOverlay';
-
-jest.useFakeTimers();
-
-function pressShift(target: EventTarget = window): void {
-	const event = new KeyboardEvent('keydown', {
-		key: 'Shift',
-		bubbles: true,
-	});
-	Object.defineProperty(event, 'target', { value: target });
-	window.dispatchEvent(event);
-}
-
-function releaseShift(): void {
-	window.dispatchEvent(
-		new KeyboardEvent('keyup', {
-			key: 'Shift',
-			bubbles: true,
-		}),
-	);
-}
-
-describe('useShiftHoldOverlay', () => {
-	afterEach(() => {
-		jest.clearAllTimers();
-	});
-
-	it('shows overlay after holding Shift for 600ms', () => {
-		const { result } = renderHook(() => useShiftHoldOverlay({}));
-
-		act(() => {
-			pressShift();
-			jest.advanceTimersByTime(600);
-		});
-
-		expect(result.current).toBe(true);
-	});
-
-	it('does not show overlay if Shift is released early', () => {
-		const { result } = renderHook(() => useShiftHoldOverlay({}));
-
-		act(() => {
-			pressShift();
-			jest.advanceTimersByTime(300);
-			releaseShift();
-			jest.advanceTimersByTime(600);
-		});
-
-		expect(result.current).toBe(false);
-	});
-
-	it('hides overlay on Shift key release', () => {
-		const { result } = renderHook(() => useShiftHoldOverlay({}));
-
-		act(() => {
-			pressShift();
-			jest.advanceTimersByTime(600);
-		});
-
-		expect(result.current).toBe(true);
-
-		act(() => {
-			releaseShift();
-		});
-
-		expect(result.current).toBe(false);
-	});
-
-	it('does not activate when modal is open', () => {
-		const { result } = renderHook(() =>
-			useShiftHoldOverlay({ isModalOpen: true }),
-		);
-
-		act(() => {
-			pressShift();
-			jest.advanceTimersByTime(600);
-		});
-
-		expect(result.current).toBe(false);
-	});
-
-	it('does not activate in typing context (input)', () => {
-		const input = document.createElement('input');
-		document.body.appendChild(input);
-
-		const { result } = renderHook(() => useShiftHoldOverlay({}));
-
-		act(() => {
-			pressShift(input);
-			jest.advanceTimersByTime(600);
-		});
-
-		expect(result.current).toBe(false);
-
-		document.body.removeChild(input);
-	});
-
-	it('cleans up on window blur', () => {
-		const { result } = renderHook(() => useShiftHoldOverlay({}));
-
-		act(() => {
-			pressShift();
-			jest.advanceTimersByTime(600);
-		});
-
-		expect(result.current).toBe(true);
-
-		act(() => {
-			window.dispatchEvent(new Event('blur'));
-		});
-
-		expect(result.current).toBe(false);
-	});
-
-	it('cleans up on document visibility change', () => {
-		const { result } = renderHook(() => useShiftHoldOverlay({}));
-
-		act(() => {
-			pressShift();
-			jest.advanceTimersByTime(600);
-		});
-
-		expect(result.current).toBe(true);
-
-		act(() => {
-			document.dispatchEvent(new Event('visibilitychange'));
-		});
-
-		expect(result.current).toBe(false);
-	});
-
-	it('does nothing when disabled', () => {
-		const { result } = renderHook(() => useShiftHoldOverlay({ disabled: true }));
-
-		act(() => {
-			pressShift();
-			jest.advanceTimersByTime(600);
-		});
-
-		expect(result.current).toBe(false);
-	});
-});

frontend/src/components/ShiftOverlay/formatShortcut.tsx

@@ -1,44 +0,0 @@
-import './shiftOverlay.scss';
-
-import { ArrowUp, ChevronUp, Command, Option } from 'lucide-react';
-import { ReactNode } from 'react';
-
-export function formatShortcut(shortcut?: string[]): ReactNode {
-	if (!shortcut || shortcut.length === 0) return null;
-
-	const combo = shortcut.find((s) => typeof s === 'string' && s.trim());
-	if (!combo) return null;
-
-	return combo.split('+').map((key) => {
-		const k = key.trim().toLowerCase();
-
-		let node: ReactNode;
-		switch (k) {
-			case 'shift':
-				node = <ArrowUp size={14} />;
-				break;
-			case 'cmd':
-			case 'meta':
-				node = <Command size={14} />;
-				break;
-			case 'alt':
-				node = <Option size={14} />;
-				break;
-			case 'ctrl':
-			case 'control':
-				node = <ChevronUp size={14} />;
-				break;
-			case 'arrowup':
-				node = <ArrowUp size={14} />;
-				break;
-			default:
-				node = k.toUpperCase();
-		}
-
-		return (
-			<span key={`shortcut-${k}`} className="shift-overlay__key">
-				{node}
-			</span>
-		);
-	});
-}

frontend/src/components/ShiftOverlay/shiftOverlay.scss

@@ -1,75 +0,0 @@
-.shift-overlay {
-	position: fixed;
-	bottom: 20px;
-	left: 50%;
-	transform: translateX(-50%);
-	z-index: 9999;
-	pointer-events: none;
-
-	&__panel {
-		display: flex;
-		gap: 20px;
-		padding: 8px 12px;
-
-		background: var(--bg-ink-500);
-		color: var(--bg-vanilla-300);
-
-		border-radius: 8px;
-		font-size: 13px;
-		line-height: 1.2;
-
-		box-shadow: 0 6px 20px var(--bg-ink-500);
-		animation: shift-overlay-fade-in 120ms ease-out;
-	}
-
-	&__item {
-		display: flex;
-		align-items: center;
-		gap: 6px;
-		white-space: nowrap;
-	}
-
-	&__label {
-		opacity: 0.9;
-	}
-
-	&__kbd {
-		font-family: monospace;
-		font-size: 12px;
-		padding: 2px 6px;
-		display: flex;
-
-		border-radius: 4px;
-		background: var(--bg-slate-100);
-	}
-
-	&__key {
-		display: inline-flex;
-		align-items: center;
-		justify-content: center;
-
-		min-width: 15px;
-		height: 20px;
-
-		border-radius: 4px;
-
-		background-color: var(--bg-slate-100);
-
-		font-size: 12px;
-		font-weight: 500;
-		line-height: 1;
-		color: var(--bg-vanilla-300);
-		flex-shrink: 0;
-	}
-}
-
-@keyframes shift-overlay-fade-in {
-	from {
-		opacity: 0;
-		transform: translateY(-4px);
-	}
-	to {
-		opacity: 1;
-		transform: translateY(0);
-	}
-}

frontend/src/components/ShiftOverlay/useShiftHoldOverlay.ts

@@ -1,87 +0,0 @@
-import { useEffect, useRef, useState } from 'react';
-
-const HOLD_DELAY_MS = 500;
-
-function isTypingContext(target: EventTarget | null): boolean {
-	if (!(target instanceof HTMLElement)) return false;
-
-	const tag = target.tagName;
-	return tag === 'INPUT' || tag === 'TEXTAREA' || target.isContentEditable;
-}
-
-interface UseShiftHoldOverlayOptions {
-	disabled?: boolean;
-	isModalOpen?: boolean;
-}
-
-export function useShiftHoldOverlay({
-	disabled = false,
-	isModalOpen = false,
-}: UseShiftHoldOverlayOptions): boolean {
-	const [visible, setVisible] = useState<boolean>(false);
-
-	const timerRef = useRef<number | null>(null);
-	const isHoldingRef = useRef<boolean>(false);
-
-	useEffect((): (() => void) | void => {
-		if (disabled) return;
-
-		function cleanup(): void {
-			isHoldingRef.current = false;
-
-			if (timerRef.current !== null) {
-				window.clearTimeout(timerRef.current);
-				timerRef.current = null;
-			}
-
-			setVisible(false);
-		}
-
-		function onKeyDown(e: KeyboardEvent): void {
-			if (e.key !== 'Shift') return;
-			if (e.repeat) return;
-
-			// Suppress in bad contexts
-			if (
-				isModalOpen ||
-				e.metaKey ||
-				e.ctrlKey ||
-				e.altKey ||
-				isTypingContext(e.target)
-			) {
-				return;
-			}
-
-			isHoldingRef.current = true;
-
-			timerRef.current = window.setTimeout(() => {
-				if (isHoldingRef.current) {
-					setVisible(true);
-				}
-			}, HOLD_DELAY_MS);
-		}
-
-		function onKeyUp(e: KeyboardEvent): void {
-			if (e.key !== 'Shift') return;
-			cleanup();
-		}
-
-		function onBlur(): void {
-			cleanup();
-		}
-
-		window.addEventListener('keydown', onKeyDown);
-		window.addEventListener('keyup', onKeyUp);
-		window.addEventListener('blur', onBlur);
-		document.addEventListener('visibilitychange', cleanup);
-
-		return (): void => {
-			window.removeEventListener('keydown', onKeyDown);
-			window.removeEventListener('keyup', onKeyUp);
-			window.removeEventListener('blur', onBlur);
-			document.removeEventListener('visibilitychange', cleanup);
-		};
-	}, [disabled, isModalOpen]);
-
-	return visible;
-}

frontend/src/components/YAxisUnitSelector/YAxisUnitSelector.tsx

@@ -1,18 +1,11 @@
 import './styles.scss';
 
-import { WarningFilled } from '@ant-design/icons';
-import { Select, Tooltip } from 'antd';
+import { Select } from 'antd';
 import { DefaultOptionType } from 'antd/es/select';
-import classNames from 'classnames';
-import { useMemo } from 'react';
 
 import { UniversalYAxisUnitMappings } from './constants';
 import { UniversalYAxisUnit, YAxisUnitSelectorProps } from './types';
-import {
-	getUniversalNameFromMetricUnit,
-	getYAxisCategories,
-	mapMetricUnitToUniversalUnit,
-} from './utils';
+import { getYAxisCategories, mapMetricUnitToUniversalUnit } from './utils';
 
 function YAxisUnitSelector({
 	value,
@@ -21,24 +14,9 @@ function YAxisUnitSelector({
 	loading = false,
 	'data-testid': dataTestId,
 	source,
-	initialValue,
 }: YAxisUnitSelectorProps): JSX.Element {
 	const universalUnit = mapMetricUnitToUniversalUnit(value);
 
-	const incompatibleUnitMessage = useMemo(() => {
-		if (!initialValue || !value || loading) return '';
-		const initialUniversalUnit = mapMetricUnitToUniversalUnit(initialValue);
-		const currentUniversalUnit = mapMetricUnitToUniversalUnit(value);
-		if (initialUniversalUnit !== currentUniversalUnit) {
-			const initialUniversalUnitName = getUniversalNameFromMetricUnit(
-				initialValue,
-			);
-			const currentUniversalUnitName = getUniversalNameFromMetricUnit(value);
-			return `Unit mismatch. Saved unit is ${initialUniversalUnitName}, but ${currentUniversalUnitName} is selected.`;
-		}
-		return '';
-	}, [initialValue, value, loading]);
-
 	const handleSearch = (
 		searchTerm: string,
 		currentOption: DefaultOptionType | undefined,
@@ -71,16 +49,6 @@ function YAxisUnitSelector({
 				placeholder={placeholder}
 				filterOption={(input, option): boolean => handleSearch(input, option)}
 				loading={loading}
-				suffixIcon={
-					incompatibleUnitMessage ? (
-						<Tooltip title={incompatibleUnitMessage}>
-							<WarningFilled />
-						</Tooltip>
-					) : undefined
-				}
-				className={classNames({
-					'warning-state': incompatibleUnitMessage,
-				})}
 				data-testid={dataTestId}
 			>
 				{categories.map((category) => (

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

@@ -91,36 +91,4 @@ describe('YAxisUnitSelector', () => {
 		expect(screen.getByText('Bytes (B)')).toBeInTheDocument();
 		expect(screen.getByText('Seconds (s)')).toBeInTheDocument();
 	});
-
-	it('shows warning message when incompatible unit is selected', () => {
-		render(
-			<YAxisUnitSelector
-				source={YAxisSource.ALERTS}
-				value="By"
-				onChange={mockOnChange}
-				initialValue="s"
-			/>,
-		);
-		const warningIcon = screen.getByLabelText('warning');
-		expect(warningIcon).toBeInTheDocument();
-		fireEvent.mouseOver(warningIcon);
-		return screen
-			.findByText(
-				'Unit mismatch. Saved unit is Seconds (s), but Bytes (B) is selected.',
-			)
-			.then((el) => expect(el).toBeInTheDocument());
-	});
-
-	it('does not show warning message when compatible unit is selected', () => {
-		render(
-			<YAxisUnitSelector
-				source={YAxisSource.ALERTS}
-				value="s"
-				onChange={mockOnChange}
-				initialValue="s"
-			/>,
-		);
-		const warningIcon = screen.queryByLabelText('warning');
-		expect(warningIcon).not.toBeInTheDocument();
-	});
 });

frontend/src/components/YAxisUnitSelector/styles.scss

@@ -3,13 +3,3 @@
 		width: 220px;
 	}
 }
-
-.warning-state {
-	.ant-select-selector {
-		border-color: var(--bg-amber-400) !important;
-	}
-
-	.anticon {
-		color: var(--bg-amber-400) !important;
-	}
-}

frontend/src/components/YAxisUnitSelector/types.ts

@@ -6,7 +6,6 @@ export interface YAxisUnitSelectorProps {
 	disabled?: boolean;
 	'data-testid'?: string;
 	source: YAxisSource;
-	initialValue?: string;
 }
 
 export enum UniversalYAxisUnit {

frontend/src/components/cmdKPalette/__test__/cmdkPalette.test.tsx

@@ -159,6 +159,7 @@ describe('CmdKPalette', () => {
 
 		expect(screen.getByText(HOME_LABEL)).toBeInTheDocument();
 		expect(screen.getByText('Go to Dashboards')).toBeInTheDocument();
+		expect(screen.getByText('Open Sidebar')).toBeInTheDocument();
 		expect(screen.getByText('Switch to Dark Mode')).toBeInTheDocument();
 	});
 

frontend/src/components/cmdKPalette/cmdKPalette.tsx

@@ -9,12 +9,34 @@ import {
 	CommandList,
 	CommandShortcut,
 } from '@signozhq/command';
+import setLocalStorageApi from 'api/browser/localstorage/set';
 import logEvent from 'api/common/logEvent';
+import updateUserPreference from 'api/v1/user/preferences/name/update';
+import { AxiosError } from 'axios';
+import ROUTES from 'constants/routes';
+import { USER_PREFERENCES } from 'constants/userPreferences';
 import { useThemeMode } from 'hooks/useDarkMode';
+import { THEME_MODE } from 'hooks/useDarkMode/constant';
+import { useNotifications } from 'hooks/useNotifications';
 import history from 'lib/history';
+import {
+	BellDot,
+	BugIcon,
+	DraftingCompass,
+	Expand,
+	HardDrive,
+	Home,
+	LayoutGrid,
+	ListMinus,
+	ScrollText,
+	Settings,
+} from 'lucide-react';
 import React, { useEffect } from 'react';
+import { useMutation } from 'react-query';
+import { UserPreference } from 'types/api/preferences/preference';
+import { showErrorNotification } from 'utils/error';
 
-import { createShortcutActions } from '../../constants/shortcutActions';
+import { useAppContext } from '../../providers/App/App';
 import { useCmdK } from '../../providers/cmdKProvider';
 
 type CmdAction = {
@@ -36,8 +58,19 @@ export function CmdKPalette({
 }): JSX.Element | null {
 	const { open, setOpen } = useCmdK();
 
+	const { updateUserPreferenceInContext } = useAppContext();
+	const { notifications } = useNotifications();
 	const { setAutoSwitch, setTheme, theme } = useThemeMode();
 
+	const { mutate: updateUserPreferenceMutation } = useMutation(
+		updateUserPreference,
+		{
+			onError: (error) => {
+				showErrorNotification(notifications, error as AxiosError);
+			},
+		},
+	);
+
 	// toggle palette with ⌘/Ctrl+K
 	function handleGlobalCmdK(
 		e: KeyboardEvent,
@@ -78,10 +111,164 @@ export function CmdKPalette({
 		history.push(key);
 	}
 
-	const actions = createShortcutActions({
-		navigate: onClickHandler,
-		handleThemeChange,
-	});
+	function handleOpenSidebar(): void {
+		setLocalStorageApi(USER_PREFERENCES.SIDENAV_PINNED, 'true');
+		const save = { name: USER_PREFERENCES.SIDENAV_PINNED, value: true };
+		updateUserPreferenceInContext(save as UserPreference);
+		updateUserPreferenceMutation({
+			name: USER_PREFERENCES.SIDENAV_PINNED,
+			value: true,
+		});
+	}
+
+	function handleCloseSidebar(): void {
+		setLocalStorageApi(USER_PREFERENCES.SIDENAV_PINNED, 'false');
+		const save = { name: USER_PREFERENCES.SIDENAV_PINNED, value: false };
+		updateUserPreferenceInContext(save as UserPreference);
+		updateUserPreferenceMutation({
+			name: USER_PREFERENCES.SIDENAV_PINNED,
+			value: false,
+		});
+	}
+
+	const actions: CmdAction[] = [
+		{
+			id: 'home',
+			name: 'Go to Home',
+			shortcut: ['shift + h'],
+			keywords: 'home',
+			section: 'Navigation',
+			icon: <Home size={14} />,
+			roles: ['ADMIN', 'EDITOR', 'AUTHOR', 'VIEWER'],
+			perform: (): void => onClickHandler(ROUTES.HOME),
+		},
+		{
+			id: 'dashboards',
+			name: 'Go to Dashboards',
+			shortcut: ['shift + d'],
+			keywords: 'dashboards',
+			section: 'Navigation',
+			icon: <LayoutGrid size={14} />,
+			roles: ['ADMIN', 'EDITOR', 'AUTHOR', 'VIEWER'],
+			perform: (): void => onClickHandler(ROUTES.ALL_DASHBOARD),
+		},
+		{
+			id: 'services',
+			name: 'Go to Services',
+			shortcut: ['shift + s'],
+			keywords: 'services monitoring',
+			section: 'Navigation',
+			icon: <HardDrive size={14} />,
+			roles: ['ADMIN', 'EDITOR', 'AUTHOR', 'VIEWER'],
+			perform: (): void => onClickHandler(ROUTES.APPLICATION),
+		},
+		{
+			id: 'traces',
+			name: 'Go to Traces',
+			shortcut: ['shift + t'],
+			keywords: 'traces',
+			section: 'Navigation',
+			icon: <DraftingCompass size={14} />,
+			roles: ['ADMIN', 'EDITOR', 'AUTHOR', 'VIEWER'],
+			perform: (): void => onClickHandler(ROUTES.TRACES_EXPLORER),
+		},
+		{
+			id: 'logs',
+			name: 'Go to Logs',
+			shortcut: ['shift + l'],
+			keywords: 'logs',
+			section: 'Navigation',
+			icon: <ScrollText size={14} />,
+			roles: ['ADMIN', 'EDITOR', 'AUTHOR', 'VIEWER'],
+			perform: (): void => onClickHandler(ROUTES.LOGS),
+		},
+		{
+			id: 'alerts',
+			name: 'Go to Alerts',
+			shortcut: ['shift + a'],
+			keywords: 'alerts',
+			section: 'Navigation',
+			icon: <BellDot size={14} />,
+			roles: ['ADMIN', 'EDITOR', 'AUTHOR', 'VIEWER'],
+			perform: (): void => onClickHandler(ROUTES.LIST_ALL_ALERT),
+		},
+		{
+			id: 'exceptions',
+			name: 'Go to Exceptions',
+			shortcut: ['shift + e'],
+			keywords: 'exceptions errors',
+			section: 'Navigation',
+			icon: <BugIcon size={14} />,
+			roles: ['ADMIN', 'EDITOR', 'AUTHOR', 'VIEWER'],
+			perform: (): void => onClickHandler(ROUTES.ALL_ERROR),
+		},
+		{
+			id: 'messaging-queues',
+			name: 'Go to Messaging Queues',
+			shortcut: ['shift + m'],
+			keywords: 'messaging queues mq',
+			section: 'Navigation',
+			icon: <ListMinus size={14} />,
+			roles: ['ADMIN', 'EDITOR', 'AUTHOR', 'VIEWER'],
+			perform: (): void => onClickHandler(ROUTES.MESSAGING_QUEUES_OVERVIEW),
+		},
+		{
+			id: 'my-settings',
+			name: 'Go to Account Settings',
+			keywords: 'account settings',
+			section: 'Navigation',
+			icon: <Settings size={14} />,
+			roles: ['ADMIN', 'EDITOR', 'AUTHOR', 'VIEWER'],
+			perform: (): void => onClickHandler(ROUTES.MY_SETTINGS),
+		},
+
+		// Settings
+		{
+			id: 'open-sidebar',
+			name: 'Open Sidebar',
+			keywords: 'sidebar navigation menu expand',
+			section: 'Settings',
+			icon: <Expand size={14} />,
+			roles: ['ADMIN', 'EDITOR', 'AUTHOR', 'VIEWER'],
+			perform: (): void => handleOpenSidebar(),
+		},
+		{
+			id: 'collapse-sidebar',
+			name: 'Collapse Sidebar',
+			keywords: 'sidebar navigation menu collapse',
+			section: 'Settings',
+			icon: <Expand size={14} />,
+			roles: ['ADMIN', 'EDITOR', 'AUTHOR', 'VIEWER'],
+			perform: (): void => handleCloseSidebar(),
+		},
+		{
+			id: 'dark-mode',
+			name: 'Switch to Dark Mode',
+			keywords: 'theme dark mode appearance',
+			section: 'Settings',
+			icon: <Expand size={14} />,
+			roles: ['ADMIN', 'EDITOR', 'AUTHOR', 'VIEWER'],
+			perform: (): void => handleThemeChange(THEME_MODE.DARK),
+		},
+		{
+			id: 'light-mode',
+			name: 'Switch to Light Mode [Beta]',
+			keywords: 'theme light mode appearance',
+			section: 'Settings',
+			icon: <Expand size={14} />,
+			roles: ['ADMIN', 'EDITOR', 'AUTHOR', 'VIEWER'],
+			perform: (): void => handleThemeChange(THEME_MODE.LIGHT),
+		},
+		{
+			id: 'system-theme',
+			name: 'Switch to System Theme',
+			keywords: 'system theme appearance',
+			section: 'Settings',
+			icon: <Expand size={14} />,
+			roles: ['ADMIN', 'EDITOR', 'AUTHOR', 'VIEWER'],
+			perform: (): void => handleThemeChange(THEME_MODE.SYSTEM),
+		},
+	];
 
 	// RBAC filter: show action if no roles set OR current user role is included
 	const permitted = actions.filter(

frontend/src/constants/reactQueryKeys.ts

@@ -55,7 +55,6 @@ export const REACT_QUERY_KEY = {
 	GET_METRIC_DETAILS: 'GET_METRIC_DETAILS',
 	GET_RELATED_METRICS: 'GET_RELATED_METRICS',
 	GET_INSPECT_METRICS_DETAILS: 'GET_INSPECT_METRICS_DETAILS',
-	GET_METRIC_METADATA: 'GET_METRIC_METADATA',
 
 	// Traces Funnels Query Keys
 	GET_DOMAINS_LIST: 'GET_DOMAINS_LIST',

frontend/src/constants/shortcutActions.tsx

@@ -1,263 +0,0 @@
-import ROUTES from 'constants/routes';
-import { GlobalShortcutsName } from 'constants/shortcuts/globalShortcuts';
-import { THEME_MODE } from 'hooks/useDarkMode/constant';
-import {
-	BarChart2,
-	BellDot,
-	BugIcon,
-	Compass,
-	DraftingCompass,
-	Expand,
-	HardDrive,
-	Home,
-	LayoutGrid,
-	ListMinus,
-	ScrollText,
-	Settings,
-	TowerControl,
-	Workflow,
-} from 'lucide-react';
-import React from 'react';
-
-export type UserRole = 'ADMIN' | 'EDITOR' | 'AUTHOR' | 'VIEWER';
-
-export type CmdAction = {
-	id: string;
-	name: string;
-	shortcut?: string[];
-	keywords?: string;
-	section?: string;
-	icon?: React.ReactNode;
-	roles?: UserRole[];
-	perform: () => void;
-};
-
-type ActionDeps = {
-	navigate: (path: string) => void;
-	handleThemeChange: (mode: string) => void;
-};
-
-export function createShortcutActions(deps: ActionDeps): CmdAction[] {
-	const { navigate, handleThemeChange } = deps;
-
-	return [
-		{
-			id: 'home',
-			name: 'Go to Home',
-			shortcut: [GlobalShortcutsName.NavigateToHome],
-			keywords: 'home',
-			section: 'Navigation',
-			icon: <Home size={14} />,
-			roles: ['ADMIN', 'EDITOR', 'VIEWER'],
-			perform: (): void => navigate(ROUTES.HOME),
-		},
-		{
-			id: 'dashboards',
-			name: 'Go to Dashboards',
-			shortcut: [GlobalShortcutsName.NavigateToDashboards],
-			keywords: 'dashboards',
-			section: 'Navigation',
-			icon: <LayoutGrid size={14} />,
-			roles: ['ADMIN', 'EDITOR', 'VIEWER'],
-			perform: (): void => navigate(ROUTES.ALL_DASHBOARD),
-		},
-		{
-			id: 'services',
-			name: 'Go to Services',
-			shortcut: [GlobalShortcutsName.NavigateToServices],
-			keywords: 'services monitoring',
-			section: 'Navigation',
-			icon: <HardDrive size={14} />,
-			roles: ['ADMIN', 'EDITOR', 'VIEWER'],
-			perform: (): void => navigate(ROUTES.APPLICATION),
-		},
-		{
-			id: 'alerts',
-			name: 'Go to Alerts',
-			shortcut: [GlobalShortcutsName.NavigateToAlerts],
-			keywords: 'alerts',
-			section: 'Navigation',
-			icon: <BellDot size={14} />,
-			roles: ['ADMIN', 'EDITOR', 'VIEWER'],
-			perform: (): void => navigate(ROUTES.LIST_ALL_ALERT),
-		},
-		{
-			id: 'exceptions',
-			name: 'Go to Exceptions',
-			shortcut: [GlobalShortcutsName.NavigateToExceptions],
-			keywords: 'exceptions errors',
-			section: 'Navigation',
-			icon: <BugIcon size={14} />,
-			roles: ['ADMIN', 'EDITOR', 'VIEWER'],
-			perform: (): void => navigate(ROUTES.ALL_ERROR),
-		},
-		{
-			id: 'messaging-queues',
-			name: 'Go to Messaging Queues',
-			shortcut: [GlobalShortcutsName.NavigateToMessagingQueues],
-			keywords: 'messaging queues mq',
-			section: 'Navigation',
-			icon: <ListMinus size={14} />,
-			roles: ['ADMIN', 'EDITOR', 'VIEWER'],
-			perform: (): void => navigate(ROUTES.MESSAGING_QUEUES_OVERVIEW),
-		},
-
-		// logs
-		{
-			id: 'logs',
-			name: 'Go to Logs',
-			shortcut: [GlobalShortcutsName.NavigateToLogs],
-			keywords: 'logs',
-			section: 'Logs',
-			icon: <ScrollText size={14} />,
-			roles: ['ADMIN', 'EDITOR', 'VIEWER'],
-			perform: (): void => navigate(ROUTES.LOGS),
-		},
-		{
-			id: 'logs',
-			name: 'Go to Logs Pipelines',
-			shortcut: [GlobalShortcutsName.NavigateToLogsPipelines],
-			keywords: 'logs pipelines',
-			section: 'Logs',
-			icon: <Workflow size={14} />,
-			roles: ['ADMIN', 'EDITOR', 'VIEWER'],
-			perform: (): void => navigate(ROUTES.LOGS_PIPELINES),
-		},
-		{
-			id: 'logs',
-			name: 'Go to Logs Views',
-			shortcut: [GlobalShortcutsName.NavigateToLogsViews],
-			keywords: 'logs views',
-			section: 'Logs',
-			icon: <TowerControl size={14} />,
-			roles: ['ADMIN', 'EDITOR', 'VIEWER'],
-			perform: (): void => navigate(ROUTES.LOGS_SAVE_VIEWS),
-		},
-
-		// metrics
-		{
-			id: 'metrics-summary',
-			name: 'Go to Metrics Summary',
-			shortcut: [GlobalShortcutsName.NavigateToMetricsSummary],
-			keywords: 'metrics summary',
-			section: 'Metrics',
-			icon: <BarChart2 size={14} />,
-			roles: ['ADMIN', 'EDITOR', 'VIEWER'],
-			perform: (): void => navigate(ROUTES.METRICS_EXPLORER),
-		},
-		{
-			id: 'metrics-explorer',
-			name: 'Go to Metrics Explorer',
-			shortcut: [GlobalShortcutsName.NavigateToMetricsExplorer],
-			keywords: 'metrics explorer',
-			section: 'Metrics',
-			icon: <Compass size={14} />,
-			roles: ['ADMIN', 'EDITOR', 'VIEWER'],
-			perform: (): void => navigate(ROUTES.METRICS_EXPLORER_EXPLORER),
-		},
-		{
-			id: 'metrics-views',
-			name: 'Go to Metrics Views',
-			shortcut: [GlobalShortcutsName.NavigateToMetricsViews],
-			keywords: 'metrics views',
-			section: 'Metrics',
-			icon: <TowerControl size={14} />,
-			roles: ['ADMIN', 'EDITOR', 'VIEWER'],
-			perform: (): void => navigate(ROUTES.METRICS_EXPLORER_VIEWS),
-		},
-
-		// Traces
-		{
-			id: 'traces',
-			name: 'Go to Traces',
-			shortcut: [GlobalShortcutsName.NavigateToTraces],
-			keywords: 'traces',
-			section: 'Traces',
-			icon: <DraftingCompass size={14} />,
-			roles: ['ADMIN', 'EDITOR', 'VIEWER'],
-			perform: (): void => navigate(ROUTES.TRACES_EXPLORER),
-		},
-		{
-			id: 'traces-funnel',
-			name: 'Go to Traces Funnels',
-			shortcut: [GlobalShortcutsName.NavigateToTracesFunnel],
-			keywords: 'traces funnel',
-			section: 'Traces',
-			icon: <DraftingCompass size={14} />,
-			roles: ['ADMIN', 'EDITOR', 'VIEWER'],
-			perform: (): void => navigate(ROUTES.TRACES_FUNNELS),
-		},
-
-		// Common actions
-		{
-			id: 'dark-mode',
-			name: 'Switch to Dark Mode',
-			keywords: 'theme dark mode appearance',
-			section: 'Common',
-			icon: <Expand size={14} />,
-			roles: ['ADMIN', 'EDITOR', 'VIEWER'],
-			perform: (): void => handleThemeChange(THEME_MODE.DARK),
-		},
-		{
-			id: 'light-mode',
-			name: 'Switch to Light Mode [Beta]',
-			keywords: 'theme light mode appearance',
-			section: 'Common',
-			icon: <Expand size={14} />,
-			roles: ['ADMIN', 'EDITOR', 'VIEWER'],
-			perform: (): void => handleThemeChange(THEME_MODE.LIGHT),
-		},
-		{
-			id: 'system-theme',
-			name: 'Switch to System Theme',
-			keywords: 'system theme appearance',
-			section: 'Common',
-			icon: <Expand size={14} />,
-			roles: ['ADMIN', 'EDITOR', 'VIEWER'],
-			perform: (): void => handleThemeChange(THEME_MODE.SYSTEM),
-		},
-
-		// settings sub-pages
-		{
-			id: 'my-settings',
-			name: 'Go to Account Settings',
-			shortcut: [GlobalShortcutsName.NavigateToSettings],
-			keywords: 'account settings',
-			section: 'Settings',
-			icon: <Settings size={14} />,
-			roles: ['ADMIN', 'EDITOR', 'VIEWER'],
-			perform: (): void => navigate(ROUTES.MY_SETTINGS),
-		},
-		{
-			id: 'my-settings-ingestion',
-			name: 'Go to Account Settings Ingestion',
-			shortcut: [GlobalShortcutsName.NavigateToSettingsIngestion],
-			keywords: 'account settings',
-			section: 'Settings',
-			icon: <Settings size={14} />,
-			roles: ['ADMIN', 'EDITOR'],
-			perform: (): void => navigate(ROUTES.INGESTION_SETTINGS),
-		},
-
-		{
-			id: 'my-settings-billing',
-			name: 'Go to Account Settings Billing',
-			shortcut: [GlobalShortcutsName.NavigateToSettingsBilling],
-			keywords: 'account settings billing',
-			section: 'Settings',
-			icon: <Settings size={14} />,
-			roles: ['ADMIN', 'EDITOR'],
-			perform: (): void => navigate(ROUTES.BILLING),
-		},
-		{
-			id: 'my-settings-api-keys',
-			name: 'Go to Account Settings API Keys',
-			shortcut: [GlobalShortcutsName.NavigateToSettingsAPIKeys],
-			keywords: 'account settings api keys',
-			section: 'Settings',
-			icon: <Settings size={14} />,
-			roles: ['ADMIN', 'EDITOR'],
-			perform: (): void => navigate(ROUTES.API_KEYS),
-		},
-	];
-}

frontend/src/constants/shortcuts/globalShortcuts.ts

@@ -1,57 +1,25 @@
 export const GlobalShortcuts = {
-	NavigateToServices: 'shift+s',
-	NavigateToDashboards: 'shift+d',
-	NavigateToAlerts: 'shift+a',
-	NavigateToExceptions: 'shift+e',
-	NavigateToMessagingQueues: 'shift+q',
-	ToggleSidebar: 'shift+b',
-	NavigateToHome: 'shift+h',
-
-	// logs
-	NavigateToLogs: 'shift+l',
-	NavigateToLogsPipelines: 'shift+l+p',
-	NavigateToLogsViews: 'shift+l+v',
-
-	// traces
-	NavigateToTraces: 'shift+t',
-	NavigateToTracesFunnel: 'shift+t+f',
-	NavigateToTracesViews: 'shift+t+v',
-
-	// metrics
-	NavigateToMetricsSummary: 'shift+m',
-	NavigateToMetricsExplorer: 'shift+m+e',
-	NavigateToMetricsViews: 'shift+m+v',
-
-	// settings
-	NavigateToSettings: 'shift+g',
-	NavigateToSettingsIngestion: 'shift+g+i',
-	NavigateToSettingsBilling: 'shift+g+b',
-	NavigateToSettingsAPIKeys: 'shift+g+k',
-	NavigateToSettingsNotificationChannels: 'shift+g+n',
+	NavigateToServices: 's+shift',
+	NavigateToTraces: 't+shift',
+	NavigateToLogs: 'l+shift',
+	NavigateToDashboards: 'd+shift',
+	NavigateToAlerts: 'a+shift',
+	NavigateToExceptions: 'e+shift',
+	NavigateToMessagingQueues: 'm+shift',
+	ToggleSidebar: 'b+shift',
+	NavigateToHome: 'h+shift',
 };
 
 export const GlobalShortcutsName = {
 	NavigateToServices: 'shift+s',
 	NavigateToTraces: 'shift+t',
+	NavigateToLogs: 'shift+l',
 	NavigateToDashboards: 'shift+d',
 	NavigateToAlerts: 'shift+a',
 	NavigateToExceptions: 'shift+e',
-	NavigateToMessagingQueues: 'shift+q',
+	NavigateToMessagingQueues: 'shift+m',
 	ToggleSidebar: 'shift+b',
 	NavigateToHome: 'shift+h',
-	NavigateToTracesFunnel: 'shift+t+f',
-	NavigateToTracesViews: 'shift+t+v',
-	NavigateToMetricsSummary: 'shift+m',
-	NavigateToMetricsExplorer: 'shift+m+e',
-	NavigateToMetricsViews: 'shift+m+v',
-	NavigateToSettings: 'shift+g',
-	NavigateToSettingsIngestion: 'shift+g+i',
-	NavigateToSettingsBilling: 'shift+g+b',
-	NavigateToSettingsAPIKeys: 'shift+g+k',
-	NavigateToSettingsNotificationChannels: 'shift+g+n',
-	NavigateToLogs: 'shift+l',
-	NavigateToLogsPipelines: 'shift+l+p',
-	NavigateToLogsViews: 'shift+l+v',
 };
 
 export const GlobalShortcutsDescription = {
@@ -64,17 +32,4 @@ export const GlobalShortcutsDescription = {
 	NavigateToExceptions: 'Navigate to Exceptions List',
 	NavigateToMessagingQueues: 'Navigate to Messaging Queues',
 	ToggleSidebar: 'Toggle sidebar visibility',
-	NavigateToTracesFunnel: 'Navigate to Traces Funnel',
-	NavigateToTracesViews: 'Navigate to Traces Views',
-	NavigateToMetricsSummary: 'Navigate to Metrics Summary',
-	NavigateToMetricsExplorer: 'Navigate to Metrics Explorer',
-	NavigateToMetricsViews: 'Navigate to Metrics Views',
-	NavigateToSettings: 'Navigate to Settings',
-	NavigateToSettingsIngestion: 'Navigate to Ingestion Settings',
-	NavigateToSettingsBilling: 'Navigate to Billing Settings',
-	NavigateToSettingsAPIKeys: 'Navigate to API Keys Settings',
-	NavigateToSettingsNotificationChannels:
-		'Navigate to Notification Channels Settings',
-	NavigateToLogsPipelines: 'Navigate to Logs Pipelines',
-	NavigateToLogsViews: 'Navigate to Logs Views',
 };

frontend/src/container/AppLayout/__tests__/sidebar-toggle-shortcut.test.tsx

@@ -10,20 +10,6 @@ import {
 import { QueryClient, QueryClientProvider } from 'react-query';
 
 // Mock dependencies
-jest.mock('providers/cmdKProvider', () => ({
-	useCmdK: (): {
-		open: boolean;
-		setOpen: React.Dispatch<React.SetStateAction<boolean>>;
-		openCmdK: () => void;
-		closeCmdK: () => void;
-	} => ({
-		open: false,
-		setOpen: jest.fn(),
-		openCmdK: jest.fn(),
-		closeCmdK: jest.fn(),
-	}),
-}));
-
 jest.mock('api/common/logEvent', () => jest.fn());
 
 // Mock the AppContext
@@ -77,7 +63,7 @@ describe('Sidebar Toggle Shortcut', () => {
 
 	describe('Global Shortcuts Constants', () => {
 		it('should have the correct shortcut key combination', () => {
-			expect(GlobalShortcuts.ToggleSidebar).toBe('shift+b');
+			expect(GlobalShortcuts.ToggleSidebar).toBe('b+shift');
 		});
 	});
 

frontend/src/container/CreateAlertV2/QuerySection/ChartPreview/ChartPreview.tsx

@@ -5,11 +5,9 @@ import { useCreateAlertState } from 'container/CreateAlertV2/context';
 import ChartPreviewComponent from 'container/FormAlertRules/ChartPreview';
 import PlotTag from 'container/NewWidget/LeftContainer/WidgetGraph/PlotTag';
 import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
-import useGetYAxisUnit from 'hooks/useGetYAxisUnit';
-import { useEffect, useState } from 'react';
+import { useState } from 'react';
 import { useSelector } from 'react-redux';
 import { AppState } from 'store/reducers';
-import { AlertTypes } from 'types/api/alerts/alertTypes';
 import { AlertDef } from 'types/api/alerts/def';
 import { EQueryType } from 'types/common/dashboard';
 import { GlobalReducer } from 'types/reducer/globalTime';
@@ -20,13 +18,7 @@ export interface ChartPreviewProps {
 
 function ChartPreview({ alertDef }: ChartPreviewProps): JSX.Element {
 	const { currentQuery, panelType, stagedQuery } = useQueryBuilder();
-	const {
-		alertType,
-		thresholdState,
-		alertState,
-		setAlertState,
-		isEditMode,
-	} = useCreateAlertState();
+	const { thresholdState, alertState, setAlertState } = useCreateAlertState();
 	const { selectedTime: globalSelectedInterval } = useSelector<
 		AppState,
 		GlobalReducer
@@ -35,25 +27,6 @@ function ChartPreview({ alertDef }: ChartPreviewProps): JSX.Element {
 
 	const yAxisUnit = alertState.yAxisUnit || '';
 
-	const fetchYAxisUnit =
-		!isEditMode && alertType === AlertTypes.METRICS_BASED_ALERT;
-
-	const selectedQueryName = thresholdState.selectedQuery;
-	const { yAxisUnit: initialYAxisUnit, isLoading } = useGetYAxisUnit(
-		selectedQueryName,
-		{
-			enabled: fetchYAxisUnit,
-		},
-	);
-
-	// Every time a new metric is selected, set the y-axis unit to its unit value if present
-	// Only for metrics-based alerts
-	useEffect(() => {
-		if (fetchYAxisUnit) {
-			setAlertState({ type: 'SET_Y_AXIS_UNIT', payload: initialYAxisUnit });
-		}
-	}, [initialYAxisUnit, setAlertState, fetchYAxisUnit]);
-
 	const headline = (
 		<div className="chart-preview-headline">
 			<PlotTag
@@ -61,13 +34,11 @@ function ChartPreview({ alertDef }: ChartPreviewProps): JSX.Element {
 				panelType={panelType || PANEL_TYPES.TIME_SERIES}
 			/>
 			<YAxisUnitSelector
-				value={yAxisUnit}
-				initialValue={initialYAxisUnit}
+				value={alertState.yAxisUnit}
 				onChange={(value): void => {
 					setAlertState({ type: 'SET_Y_AXIS_UNIT', payload: value });
 				}}
 				source={YAxisSource.ALERTS}
-				loading={isLoading}
 			/>
 		</div>
 	);

frontend/src/container/GridCardLayout/GridCard/FullView/index.tsx

@@ -120,6 +120,7 @@ function FullView({
 				originalGraphType: selectedPanelType,
 			};
 		}
+		updatedQuery.builder.queryData[0].pageSize = 10;
 		return {
 			query: updatedQuery,
 			graphType: PANEL_TYPES.LIST,

frontend/src/container/GridCardLayout/GridCard/WidgetGraphComponent.tsx

@@ -67,6 +67,7 @@ function WidgetGraphComponent({
 }: WidgetGraphComponentProps): JSX.Element {
 	const { safeNavigate } = useSafeNavigate();
 	const [deleteModal, setDeleteModal] = useState(false);
+	const [hovered, setHovered] = useState(false);
 	const { notifications } = useNotifications();
 	const { pathname, search } = useLocation();
 
@@ -315,6 +316,18 @@ function WidgetGraphComponent({
 			style={{
 				height: '100%',
 			}}
+			onMouseOver={(): void => {
+				setHovered(true);
+			}}
+			onFocus={(): void => {
+				setHovered(true);
+			}}
+			onMouseOut={(): void => {
+				setHovered(false);
+			}}
+			onBlur={(): void => {
+				setHovered(false);
+			}}
 			id={widget.id}
 			className="widget-graph-component-container"
 		>
@@ -364,6 +377,7 @@ function WidgetGraphComponent({
 
 			<div className="drag-handle">
 				<WidgetHeader
+					parentHover={hovered}
 					title={widget?.title}
 					widget={widget}
 					onView={handleOnView}

frontend/src/container/GridCardLayout/GridCard/index.tsx

@@ -137,6 +137,7 @@ function GridCardGraph({
 				originalGraphType: widget.panelTypes,
 			};
 		}
+		updatedQuery.builder.queryData[0].pageSize = 10;
 		const initialDataSource = updatedQuery.builder.queryData[0].dataSource;
 		return {
 			query: updatedQuery,

frontend/src/container/GridCardLayout/GridCardLayout.styles.scss

@@ -99,12 +99,6 @@
 			height: calc(100% - 30px);
 		}
 	}
-
-	&:hover {
-		.widget-header-more-options {
-			visibility: visible;
-		}
-	}
 }
 
 .widget-full-view {

frontend/src/container/GridCardLayout/WidgetHeader/WidgetHeader.styles.scss

@@ -51,6 +51,10 @@
 	visibility: visible;
 }
 
+.widget-header-hover {
+	visibility: visible;
+}
+
 .widget-api-actions {
 	padding-right: 0.25rem;
 }

frontend/src/container/GridCardLayout/WidgetHeader/__tests__/WidgetHeader.test.tsx

@@ -181,6 +181,7 @@ describe('WidgetHeader', () => {
 				title={TEST_WIDGET_TITLE}
 				widget={mockWidget}
 				onView={mockOnView}
+				parentHover={false}
 				queryResponse={mockQueryResponse}
 				isWarning={false}
 				isFetchingResponse={false}
@@ -203,6 +204,7 @@ describe('WidgetHeader', () => {
 				title="Empty Widget"
 				widget={emptyWidget}
 				onView={mockOnView}
+				parentHover={false}
 				queryResponse={mockQueryResponse}
 				isWarning={false}
 				isFetchingResponse={false}
@@ -225,6 +227,7 @@ describe('WidgetHeader', () => {
 				title={TABLE_WIDGET_TITLE}
 				widget={tableWidget}
 				onView={mockOnView}
+				parentHover={false}
 				queryResponse={mockQueryResponse}
 				isWarning={false}
 				isFetchingResponse={false}
@@ -252,6 +255,7 @@ describe('WidgetHeader', () => {
 				title={TABLE_WIDGET_TITLE}
 				widget={tableWidget}
 				onView={mockOnView}
+				parentHover={false}
 				queryResponse={mockQueryResponse}
 				isWarning={false}
 				isFetchingResponse={false}
@@ -294,6 +298,7 @@ describe('WidgetHeader', () => {
 				title={TEST_WIDGET_TITLE}
 				widget={mockWidget}
 				onView={mockOnView}
+				parentHover={false}
 				queryResponse={errorResponse}
 				isWarning={false}
 				isFetchingResponse={false}
@@ -335,6 +340,7 @@ describe('WidgetHeader', () => {
 				title={TEST_WIDGET_TITLE}
 				widget={mockWidget}
 				onView={mockOnView}
+				parentHover={false}
 				queryResponse={warningResponse}
 				isWarning
 				isFetchingResponse={false}
@@ -364,6 +370,7 @@ describe('WidgetHeader', () => {
 				title={TEST_WIDGET_TITLE}
 				widget={mockWidget}
 				onView={mockOnView}
+				parentHover={false}
 				queryResponse={fetchingResponse}
 				isWarning={false}
 				isFetchingResponse
@@ -382,6 +389,7 @@ describe('WidgetHeader', () => {
 				title={TEST_WIDGET_TITLE}
 				widget={mockWidget}
 				onView={mockOnView}
+				parentHover={false}
 				queryResponse={mockQueryResponse}
 				isWarning={false}
 				isFetchingResponse={false}
@@ -406,6 +414,7 @@ describe('WidgetHeader', () => {
 				title={TABLE_WIDGET_TITLE}
 				widget={tableWidget}
 				onView={mockOnView}
+				parentHover={false}
 				queryResponse={mockQueryResponse}
 				isWarning={false}
 				isFetchingResponse={false}
@@ -424,6 +433,7 @@ describe('WidgetHeader', () => {
 				title={TEST_WIDGET_TITLE}
 				widget={mockWidget}
 				onView={mockOnView}
+				parentHover={false}
 				queryResponse={mockQueryResponse}
 				isWarning={false}
 				isFetchingResponse={false}
@@ -444,6 +454,7 @@ describe('WidgetHeader', () => {
 				title={TEST_WIDGET_TITLE}
 				widget={mockWidget}
 				onView={mockOnView}
+				parentHover={false}
 				queryResponse={mockQueryResponse}
 				isWarning={false}
 				isFetchingResponse={false}

frontend/src/container/GridCardLayout/WidgetHeader/index.tsx

@@ -48,6 +48,7 @@ interface IWidgetHeaderProps {
 	onView: VoidFunction;
 	onDelete?: VoidFunction;
 	onClone?: VoidFunction;
+	parentHover: boolean;
 	queryResponse: UseQueryResult<
 		SuccessResponse<MetricRangePayloadProps, unknown> & {
 			warning?: Warning;
@@ -68,6 +69,7 @@ function WidgetHeader({
 	onView,
 	onDelete,
 	onClone,
+	parentHover,
 	queryResponse,
 	threshold,
 	headerMenuList,
@@ -313,6 +315,8 @@ function WidgetHeader({
 								<MoreOutlined
 									data-testid="widget-header-options"
 									className={`widget-header-more-options ${
+										parentHover ? 'widget-header-hover' : ''
+									} ${
 										globalSearchAvailable ? 'widget-header-more-options-visible' : ''
 									}`}
 								/>

frontend/src/container/LogDetailedView/BodyTitleRenderer.tsx

@@ -92,14 +92,14 @@ function BodyTitleRenderer({
 
 			if (isObject) {
 				// For objects/arrays, stringify the entire structure
-				copyText = JSON.stringify(value, null, 2);
+				copyText = `"${cleanedKey}": ${JSON.stringify(value, null, 2)}`;
 			} else if (parentIsArray) {
-				// array elements
-				copyText = `${value}`;
+				// For array elements, copy just the value
+				copyText = `"${cleanedKey}": ${value}`;
 			} else {
-				// primitive values
-				const valueStr = typeof value === 'string' ? value : String(value);
-				copyText = valueStr;
+				// For primitive values, format as JSON key-value pair
+				const valueStr = typeof value === 'string' ? `"${value}"` : String(value);
+				copyText = `"${cleanedKey}": ${valueStr}`;
 			}
 
 			setCopy(copyText);

frontend/src/container/LogDetailedView/TableView/TableViewActions.tsx

@@ -60,8 +60,7 @@ const BodyContent: React.FC<{
 	fieldData: Record<string, string>;
 	record: DataType;
 	bodyHtml: { __html: string };
-	textToCopy: string;
-}> = React.memo(({ fieldData, record, bodyHtml, textToCopy }) => {
+}> = React.memo(({ fieldData, record, bodyHtml }) => {
 	const { isLoading, treeData, error } = useAsyncJSONProcessing(
 		fieldData.value,
 		record.field === 'body',
@@ -93,13 +92,11 @@ const BodyContent: React.FC<{
 
 	if (record.field === 'body') {
 		return (
-			<CopyClipboardHOC entityKey="body" textToCopy={textToCopy}>
-				<span
-					style={{ color: Color.BG_SIENNA_400, whiteSpace: 'pre-wrap', tabSize: 4 }}
-				>
-					<span dangerouslySetInnerHTML={bodyHtml} />
-				</span>
-			</CopyClipboardHOC>
+			<span
+				style={{ color: Color.BG_SIENNA_400, whiteSpace: 'pre-wrap', tabSize: 4 }}
+			>
+				<span dangerouslySetInnerHTML={bodyHtml} />
+			</span>
 		);
 	}
 
@@ -175,12 +172,7 @@ export default function TableViewActions(
 		switch (record.field) {
 			case 'body':
 				return (
-					<BodyContent
-						fieldData={fieldData}
-						record={record}
-						bodyHtml={bodyHtml}
-						textToCopy={textToCopy}
-					/>
+					<BodyContent fieldData={fieldData} record={record} bodyHtml={bodyHtml} />
 				);
 
 			case 'timestamp':
@@ -202,7 +194,6 @@ export default function TableViewActions(
 		record,
 		fieldData,
 		bodyHtml,
-		textToCopy,
 		formatTimezoneAdjustedTimestamp,
 		cleanTimestamp,
 	]);
@@ -211,12 +202,7 @@ export default function TableViewActions(
 	if (record.field === 'body') {
 		return (
 			<div className={cx('value-field', isOpen ? 'open-popover' : '')}>
-				<BodyContent
-					fieldData={fieldData}
-					record={record}
-					bodyHtml={bodyHtml}
-					textToCopy={textToCopy}
-				/>
+				<BodyContent fieldData={fieldData} record={record} bodyHtml={bodyHtml} />
 				{!isListViewPanel && !RESTRICTED_SELECTED_FIELDS.includes(fieldFilterKey) && (
 					<span className="action-btn">
 						<Tooltip title="Filter for value">

frontend/src/container/LogDetailedView/TableView/__test__/TableViewActions.test.tsx

@@ -1,54 +1,16 @@
-import { fireEvent, render, screen } from '@testing-library/react';
+import { render, screen } from '@testing-library/react';
 import { RESTRICTED_SELECTED_FIELDS } from 'container/LogsFilters/config';
 
 import TableViewActions from '../TableViewActions';
-import useAsyncJSONProcessing from '../useAsyncJSONProcessing';
-
-// Mock data for tests
-let mockCopyToClipboard: jest.Mock;
-let mockNotificationsSuccess: jest.Mock;
 
 // Mock the components and hooks
 jest.mock('components/Logs/CopyClipboardHOC', () => ({
 	__esModule: true,
-	default: ({
-		children,
-		textToCopy,
-		entityKey,
-	}: {
-		children: React.ReactNode;
-		textToCopy: string;
-		entityKey: string;
-	}): JSX.Element => (
-		// eslint-disable-next-line jsx-a11y/click-events-have-key-events
-		<div
-			className="CopyClipboardHOC"
-			data-testid={`copy-clipboard-${entityKey}`}
-			data-text-to-copy={textToCopy}
-			onClick={(): void => {
-				if (mockCopyToClipboard) {
-					mockCopyToClipboard(textToCopy);
-				}
-				if (mockNotificationsSuccess) {
-					mockNotificationsSuccess({
-						message: `${entityKey} copied to clipboard`,
-						key: `${entityKey} copied to clipboard`,
-					});
-				}
-			}}
-			role="button"
-			tabIndex={0}
-		>
-			{children}
-		</div>
+	default: ({ children }: { children: React.ReactNode }): JSX.Element => (
+		<div className="CopyClipboardHOC">{children}</div>
 	),
 }));
 
-jest.mock('../useAsyncJSONProcessing', () => ({
-	__esModule: true,
-	default: jest.fn(),
-}));
-
 jest.mock('providers/Timezone', () => ({
 	useTimezone: (): {
 		formatTimezoneAdjustedTimestamp: (timestamp: string) => string;
@@ -91,19 +53,6 @@ describe('TableViewActions', () => {
 		onGroupByAttribute: jest.fn(),
 	};
 
-	beforeEach(() => {
-		mockCopyToClipboard = jest.fn();
-		mockNotificationsSuccess = jest.fn();
-
-		// Default mock for useAsyncJSONProcessing
-		const mockUseAsyncJSONProcessing = jest.mocked(useAsyncJSONProcessing);
-		mockUseAsyncJSONProcessing.mockReturnValue({
-			isLoading: false,
-			treeData: null,
-			error: null,
-		});
-	});
-
 	it('should render without crashing', () => {
 		render(
 			<TableViewActions
@@ -178,60 +127,4 @@ describe('TableViewActions', () => {
 			container.querySelector(ACTION_BUTTON_TEST_ID),
 		).not.toBeInTheDocument();
 	});
-
-	it('should copy non-JSON body text without quotes when user clicks on body', () => {
-		// Setup: body field with surrounding quotes
-		const bodyValueWithQuotes =
-			'"FeatureFlag \'kafkaQueueProblems\' is enabled, sleeping 1 second"';
-		const expectedCopiedText =
-			"FeatureFlag 'kafkaQueueProblems' is enabled, sleeping 1 second";
-
-		const bodyProps = {
-			fieldData: {
-				field: 'body',
-				value: bodyValueWithQuotes,
-			},
-			record: {
-				key: 'body-key',
-				field: 'body',
-				value: bodyValueWithQuotes,
-			},
-			isListViewPanel: false,
-			isfilterInLoading: false,
-			isfilterOutLoading: false,
-			onClickHandler: jest.fn(),
-			onGroupByAttribute: jest.fn(),
-		};
-
-		// Render component with body field
-		render(
-			<TableViewActions
-				fieldData={bodyProps.fieldData}
-				record={bodyProps.record}
-				isListViewPanel={bodyProps.isListViewPanel}
-				isfilterInLoading={bodyProps.isfilterInLoading}
-				isfilterOutLoading={bodyProps.isfilterOutLoading}
-				onClickHandler={bodyProps.onClickHandler}
-				onGroupByAttribute={bodyProps.onGroupByAttribute}
-			/>,
-		);
-
-		// Find the clickable copy area for body
-		const copyArea = screen.getByTestId('copy-clipboard-body');
-
-		// Verify it has the correct text to copy (without quotes)
-		expect(copyArea).toHaveAttribute('data-text-to-copy', expectedCopiedText);
-
-		// Action: User clicks on body content
-		fireEvent.click(copyArea);
-
-		// Assert: Text was copied without surrounding quotes
-		expect(mockCopyToClipboard).toHaveBeenCalledWith(expectedCopiedText);
-
-		// Assert: Success notification shown
-		expect(mockNotificationsSuccess).toHaveBeenCalledWith({
-			message: 'body copied to clipboard',
-			key: 'body copied to clipboard',
-		});
-	});
 });

frontend/src/container/LogDetailedView/__tests__/BodyTitleRenderer.test.tsx

@@ -51,7 +51,7 @@ describe('BodyTitleRenderer', () => {
 		await user.click(screen.getByText('name'));
 
 		await waitFor(() => {
-			expect(mockSetCopy).toHaveBeenCalledWith('John');
+			expect(mockSetCopy).toHaveBeenCalledWith('"user.name": "John"');
 			expect(mockNotification).toHaveBeenCalledWith(
 				expect.objectContaining({
 					message: expect.stringContaining('user.name'),
@@ -75,7 +75,7 @@ describe('BodyTitleRenderer', () => {
 		await user.click(screen.getByText('0'));
 
 		await waitFor(() => {
-			expect(mockSetCopy).toHaveBeenCalledWith('arrayElement');
+			expect(mockSetCopy).toHaveBeenCalledWith('"items[*].0": arrayElement');
 		});
 	});
 
@@ -96,8 +96,9 @@ describe('BodyTitleRenderer', () => {
 
 		await waitFor(() => {
 			const callArg = mockSetCopy.mock.calls[0][0];
-			const expectedJson = JSON.stringify(testObject, null, 2);
-			expect(callArg).toBe(expectedJson);
+			expect(callArg).toContain('"user.metadata":');
+			expect(callArg).toContain('"id": 123');
+			expect(callArg).toContain('"active": true');
 			expect(mockNotification).toHaveBeenCalledWith(
 				expect.objectContaining({
 					message: expect.stringContaining('object copied'),

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

@@ -58,27 +58,6 @@
 	.explore-content {
 		padding: 0 8px;
 
-		.y-axis-unit-selector-container {
-			display: flex;
-			align-items: center;
-			gap: 10px;
-			padding-top: 10px;
-			margin-bottom: 10px;
-
-			.save-unit-container {
-				display: flex;
-				align-items: center;
-				gap: 10px;
-
-				.ant-btn {
-					border-radius: 2px;
-					.ant-typography {
-						font-size: 12px;
-					}
-				}
-			}
-		}
-
 		.ant-space {
 			margin-top: 10px;
 			margin-bottom: 20px;
@@ -96,14 +75,6 @@
 		.time-series-view {
 			min-width: 100%;
 			width: 100%;
-			position: relative;
-
-			.no-unit-warning {
-				position: absolute;
-				top: 30px;
-				right: 40px;
-				z-index: 1000;
-			}
 		}
 
 		.time-series-container {

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

@@ -1,7 +1,7 @@
 import './Explorer.styles.scss';
 
 import * as Sentry from '@sentry/react';
-import { Switch, Tooltip } from 'antd';
+import { Switch } from 'antd';
 import logEvent from 'api/common/logEvent';
 import { QueryBuilderV2 } from 'components/QueryBuilderV2/QueryBuilderV2';
 import WarningPopover from 'components/WarningPopover/WarningPopover';
@@ -25,14 +25,10 @@ import { generateExportToDashboardLink } from 'utils/dashboard/generateExportToD
 import { v4 as uuid } from 'uuid';
 
 import { MetricsExplorerEventKeys, MetricsExplorerEvents } from '../events';
-import MetricDetails from '../MetricDetails/MetricDetails';
+// import QuerySection from './QuerySection';
 import TimeSeries from './TimeSeries';
 import { ExplorerTabs } from './types';
-import {
-	getMetricUnits,
-	splitQueryIntoOneChartPerQuery,
-	useGetMetrics,
-} from './utils';
+import { splitQueryIntoOneChartPerQuery } from './utils';
 
 const ONE_CHART_PER_QUERY_ENABLED_KEY = 'isOneChartPerQueryEnabled';
 
@@ -44,34 +40,6 @@ function Explorer(): JSX.Element {
 		currentQuery,
 	} = useQueryBuilder();
 	const { safeNavigate } = useSafeNavigate();
-	const [isMetricDetailsOpen, setIsMetricDetailsOpen] = useState(false);
-
-	const metricNames = useMemo(() => {
-		const currentMetricNames: string[] = [];
-		stagedQuery?.builder.queryData.forEach((query) => {
-			if (query.aggregateAttribute?.key) {
-				currentMetricNames.push(query.aggregateAttribute?.key);
-			}
-		});
-		return currentMetricNames;
-	}, [stagedQuery]);
-
-	const {
-		metrics,
-		isLoading: isMetricUnitsLoading,
-		isError: isMetricUnitsError,
-	} = useGetMetrics(metricNames);
-
-	const units = useMemo(() => getMetricUnits(metrics), [metrics]);
-
-	const areAllMetricUnitsSame = useMemo(
-		() =>
-			!isMetricUnitsLoading &&
-			!isMetricUnitsError &&
-			units.length > 0 &&
-			units.every((unit) => unit && unit === units[0]),
-		[units, isMetricUnitsLoading, isMetricUnitsError],
-	);
 
 	const [searchParams, setSearchParams] = useSearchParams();
 	const isOneChartPerQueryEnabled =
@@ -80,66 +48,7 @@ function Explorer(): JSX.Element {
 	const [showOneChartPerQuery, toggleShowOneChartPerQuery] = useState(
 		isOneChartPerQueryEnabled,
 	);
-	const [disableOneChartPerQuery, toggleDisableOneChartPerQuery] = useState(
-		false,
-	);
 	const [selectedTab] = useState<ExplorerTabs>(ExplorerTabs.TIME_SERIES);
-	const [yAxisUnit, setYAxisUnit] = useState<string | undefined>();
-
-	const unitsLength = useMemo(() => units.length, [units]);
-	const firstUnit = useMemo(() => units?.[0], [units]);
-
-	useEffect(() => {
-		// Set the y axis unit to the first metric unit if
-		// 1. There is one metric unit and it is not empty
-		// 2. All metric units are the same and not empty
-		// Else, set the y axis unit to empty if
-		// 1. There are more than one metric units and they are not the same
-		// 2. There are no metric units
-		// 3. There is exactly one metric unit but it is empty/undefined
-		if (unitsLength === 0) {
-			setYAxisUnit(undefined);
-		} else if (unitsLength === 1 && firstUnit) {
-			setYAxisUnit(firstUnit);
-		} else if (unitsLength === 1 && !firstUnit) {
-			setYAxisUnit(undefined);
-		} else if (areAllMetricUnitsSame) {
-			if (firstUnit) {
-				setYAxisUnit(firstUnit);
-			} else {
-				setYAxisUnit(undefined);
-			}
-		} else if (unitsLength > 1 && !areAllMetricUnitsSame) {
-			setYAxisUnit(undefined);
-		}
-	}, [unitsLength, firstUnit, areAllMetricUnitsSame]);
-
-	useEffect(() => {
-		// Don't apply logic during loading to avoid overwriting user preferences
-		if (isMetricUnitsLoading) {
-			return;
-		}
-
-		// Disable one chart per query if -
-		// 1. There are more than one metric
-		// 2. The metric units are not the same
-		if (units.length > 1 && !areAllMetricUnitsSame) {
-			toggleShowOneChartPerQuery(true);
-			toggleDisableOneChartPerQuery(true);
-		} else if (units.length <= 1) {
-			toggleShowOneChartPerQuery(false);
-			toggleDisableOneChartPerQuery(true);
-		} else {
-			// When units are the same and loading is complete, restore URL-based preference
-			toggleShowOneChartPerQuery(isOneChartPerQueryEnabled);
-			toggleDisableOneChartPerQuery(false);
-		}
-	}, [
-		units,
-		areAllMetricUnitsSame,
-		isMetricUnitsLoading,
-		isOneChartPerQueryEnabled,
-	]);
 
 	const handleToggleShowOneChartPerQuery = (): void => {
 		toggleShowOneChartPerQuery(!showOneChartPerQuery);
@@ -159,20 +68,15 @@ function Explorer(): JSX.Element {
 		[updateAllQueriesOperators],
 	);
 
-	const exportDefaultQuery = useMemo(() => {
-		const query = updateAllQueriesOperators(
-			currentQuery || initialQueriesMap[DataSource.METRICS],
-			PANEL_TYPES.TIME_SERIES,
-			DataSource.METRICS,
-		);
-		if (yAxisUnit && !query.unit) {
-			return {
-				...query,
-				unit: yAxisUnit,
-			};
-		}
-		return query;
-	}, [currentQuery, updateAllQueriesOperators, yAxisUnit]);
+	const exportDefaultQuery = useMemo(
+		() =>
+			updateAllQueriesOperators(
+				currentQuery || initialQueriesMap[DataSource.METRICS],
+				PANEL_TYPES.TIME_SERIES,
+				DataSource.METRICS,
+			),
+		[currentQuery, updateAllQueriesOperators],
+	);
 
 	useShareBuilderUrl({ defaultValue: defaultQuery });
 
@@ -186,16 +90,8 @@ function Explorer(): JSX.Element {
 
 			const widgetId = uuid();
 
-			let query = queryToExport || exportDefaultQuery;
-			if (yAxisUnit && !query.unit) {
-				query = {
-					...query,
-					unit: yAxisUnit,
-				};
-			}
-
 			const dashboardEditView = generateExportToDashboardLink({
-				query,
+				query: queryToExport || exportDefaultQuery,
 				panelType: PANEL_TYPES.TIME_SERIES,
 				dashboardId: dashboard.id,
 				widgetId,
@@ -203,33 +99,17 @@ function Explorer(): JSX.Element {
 
 			safeNavigate(dashboardEditView);
 		},
-		[exportDefaultQuery, safeNavigate, yAxisUnit],
+		[exportDefaultQuery, safeNavigate],
 	);
 
 	const splitedQueries = useMemo(
 		() =>
 			splitQueryIntoOneChartPerQuery(
 				stagedQuery || initialQueriesMap[DataSource.METRICS],
-				metricNames,
-				units,
 			),
-		[stagedQuery, metricNames, units],
+		[stagedQuery],
 	);
 
-	const [selectedMetricName, setSelectedMetricName] = useState<string | null>(
-		null,
-	);
-
-	const handleOpenMetricDetails = (metricName: string): void => {
-		setIsMetricDetailsOpen(true);
-		setSelectedMetricName(metricName);
-	};
-
-	const handleCloseMetricDetails = (): void => {
-		setIsMetricDetailsOpen(false);
-		setSelectedMetricName(null);
-	};
-
 	useEffect(() => {
 		logEvent(MetricsExplorerEvents.TabChanged, {
 			[MetricsExplorerEventKeys.Tab]: 'explorer',
@@ -243,44 +123,17 @@ function Explorer(): JSX.Element {
 
 	const [warning, setWarning] = useState<Warning | undefined>(undefined);
 
-	const oneChartPerQueryDisabledTooltip = useMemo(() => {
-		if (splitedQueries.length <= 1) {
-			return 'One chart per query cannot be toggled for a single query.';
-		}
-		if (units.length <= 1) {
-			return 'One chart per query cannot be toggled when there is only one metric.';
-		}
-		if (disableOneChartPerQuery) {
-			return 'One chart per query cannot be disabled for multiple queries with different units.';
-		}
-		return undefined;
-	}, [disableOneChartPerQuery, splitedQueries.length, units.length]);
-
-	// Show the y axis unit selector if -
-	// 1. There is only one metric
-	// 2. The metric has no saved unit
-	const showYAxisUnitSelector = useMemo(
-		() => !isMetricUnitsLoading && units.length === 1 && !units[0],
-		[units, isMetricUnitsLoading],
-	);
-
 	return (
 		<Sentry.ErrorBoundary fallback={<ErrorBoundaryFallback />}>
 			<div className="metrics-explorer-explore-container">
 				<div className="explore-header">
 					<div className="explore-header-left-actions">
 						<span>1 chart/query</span>
-						<Tooltip
-							open={disableOneChartPerQuery ? undefined : false}
-							title={oneChartPerQueryDisabledTooltip}
-						>
-							<Switch
-								checked={showOneChartPerQuery}
-								onChange={handleToggleShowOneChartPerQuery}
-								disabled={disableOneChartPerQuery || splitedQueries.length <= 1}
-								size="small"
-							/>
-						</Tooltip>
+						<Switch
+							checked={showOneChartPerQuery}
+							onChange={handleToggleShowOneChartPerQuery}
+							size="small"
+						/>
 					</div>
 					<div className="explore-header-right-actions">
 						{!isEmpty(warning) && <WarningPopover warningData={warning} />}
@@ -321,16 +174,6 @@ function Explorer(): JSX.Element {
 						<TimeSeries
 							showOneChartPerQuery={showOneChartPerQuery}
 							setWarning={setWarning}
-							areAllMetricUnitsSame={areAllMetricUnitsSame}
-							isMetricUnitsLoading={isMetricUnitsLoading}
-							isMetricUnitsError={isMetricUnitsError}
-							metricUnits={units}
-							metricNames={metricNames}
-							metrics={metrics}
-							handleOpenMetricDetails={handleOpenMetricDetails}
-							yAxisUnit={yAxisUnit}
-							setYAxisUnit={setYAxisUnit}
-							showYAxisUnitSelector={showYAxisUnitSelector}
 						/>
 					)}
 					{/* TODO: Enable once we have resolved all related metrics issues */}
@@ -344,17 +187,9 @@ function Explorer(): JSX.Element {
 				query={exportDefaultQuery}
 				sourcepage={DataSource.METRICS}
 				onExport={handleExport}
-				isOneChartPerQuery={showOneChartPerQuery}
+				isOneChartPerQuery={false}
 				splitedQueries={splitedQueries}
 			/>
-			{isMetricDetailsOpen && (
-				<MetricDetails
-					metricName={selectedMetricName}
-					isOpen={isMetricDetailsOpen}
-					onClose={handleCloseMetricDetails}
-					isModalTimeSelection={false}
-				/>
-			)}
 		</Sentry.ErrorBoundary>
 	);
 }

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

@@ -1,18 +1,14 @@
-import { Color } from '@signozhq/design-tokens';
-import { Tooltip, Typography } from 'antd';
 import { isAxiosError } from 'axios';
 import classNames from 'classnames';
-import YAxisUnitSelector from 'components/YAxisUnitSelector';
-import { YAxisSource } from 'components/YAxisUnitSelector/types';
 import { ENTITY_VERSION_V5 } from 'constants/app';
 import { initialQueriesMap, PANEL_TYPES } from 'constants/queryBuilder';
 import { REACT_QUERY_KEY } from 'constants/reactQueryKeys';
+import { BuilderUnitsFilter } from 'container/QueryBuilder/filters/BuilderUnitsFilter/BuilderUnits';
 import TimeSeriesView from 'container/TimeSeriesView/TimeSeriesView';
 import { convertDataValueToMs } from 'container/TimeSeriesView/utils';
 import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
 import { GetMetricQueryRange } from 'lib/dashboard/getQueryResults';
-import { AlertTriangle } from 'lucide-react';
-import { useMemo } from 'react';
+import { useMemo, useState } from 'react';
 import { useQueries } from 'react-query';
 import { useSelector } from 'react-redux';
 import { AppState } from 'store/reducers';
@@ -28,13 +24,6 @@ import { splitQueryIntoOneChartPerQuery } from './utils';
 function TimeSeries({
 	showOneChartPerQuery,
 	setWarning,
-	isMetricUnitsLoading,
-	metricUnits,
-	metricNames,
-	handleOpenMetricDetails,
-	yAxisUnit,
-	setYAxisUnit,
-	showYAxisUnitSelector,
 }: TimeSeriesProps): JSX.Element {
 	const { stagedQuery, currentQuery } = useQueryBuilder();
 
@@ -67,14 +56,13 @@ function TimeSeries({
 			showOneChartPerQuery
 				? splitQueryIntoOneChartPerQuery(
 						stagedQuery || initialQueriesMap[DataSource.METRICS],
-						metricNames,
-						metricUnits,
 				  )
 				: [stagedQuery || initialQueriesMap[DataSource.METRICS]],
-		// eslint-disable-next-line react-hooks/exhaustive-deps
-		[showOneChartPerQuery, stagedQuery, JSON.stringify(metricUnits)],
+		[showOneChartPerQuery, stagedQuery],
 	);
 
+	const [yAxisUnit, setYAxisUnit] = useState<string>('');
+
 	const queries = useQueries(
 		queryPayloads.map((payload, index) => ({
 			queryKey: [
@@ -138,148 +126,32 @@ function TimeSeries({
 		setYAxisUnit(value);
 	};
 
-	// TODO: Enable once we have resolved all related metrics v2 api issues
-	// Show the save unit button if
-	// 1. There is only one metric
-	// 2. The metric has no saved unit
-	// 3. The user has selected a unit
-	// const showSaveUnitButton = useMemo(
-	// 	() =>
-	// 		metricUnits.length === 1 &&
-	// 		Boolean(metrics?.[0]) &&
-	// 		!metricUnits[0] &&
-	// 		yAxisUnit,
-	// 	[metricUnits, metrics, yAxisUnit],
-	// );
-
-	// const {
-	// 	mutate: updateMetricMetadata,
-	// 	isLoading: isUpdatingMetricMetadata,
-	// } = useUpdateMetricMetadata();
-
-	// const handleSaveUnit = (): void => {
-	// 	updateMetricMetadata(
-	// 		{
-	// 			metricName: metricNames[0],
-	// 			payload: {
-	// 				unit: yAxisUnit,
-	// 				description: metrics[0]?.description ?? '',
-	// 				metricType: metrics[0]?.type as MetricType,
-	// 				temporality: metrics[0]?.temporality,
-	// 			},
-	// 		},
-	// 		{
-	// 			onSuccess: () => {
-	// 				notifications.success({
-	// 					message: 'Unit saved successfully',
-	// 				});
-	// 				queryClient.invalidateQueries([
-	// 					REACT_QUERY_KEY.GET_METRIC_DETAILS,
-	// 					metricNames[0],
-	// 				]);
-	// 			},
-	// 			onError: () => {
-	// 				notifications.error({
-	// 					message: 'Failed to save unit',
-	// 				});
-	// 			},
-	// 		},
-	// 	);
-	// };
-
 	return (
 		<>
-			<div className="y-axis-unit-selector-container">
-				{showYAxisUnitSelector && (
-					<>
-						<YAxisUnitSelector
-							onChange={onUnitChangeHandler}
-							value={yAxisUnit}
-							source={YAxisSource.EXPLORER}
-							data-testid="y-axis-unit-selector"
-						/>
-						{/* TODO: Enable once we have resolved all related metrics v2 api issues */}
-						{/* {showSaveUnitButton && (
-							<div className="save-unit-container">
-								<Typography.Text>
-									Save the selected unit for this metric?
-								</Typography.Text>
-								<Button
-									type="primary"
-									size="small"
-									disabled={isUpdatingMetricMetadata}
-									onClick={handleSaveUnit}
-								>
-									<Typography.Paragraph>Yes</Typography.Paragraph>
-								</Button>
-							</div>
-						)} */}
-					</>
-				)}
-			</div>
+			<BuilderUnitsFilter onChange={onUnitChangeHandler} yAxisUnit={yAxisUnit} />
 			<div
 				className={classNames({
 					'time-series-container': changeLayoutForOneChartPerQuery,
 				})}
 			>
-				{responseData.map((datapoint, index) => {
-					const isQueryDataItem = index < metricNames.length;
-					const metricName = isQueryDataItem ? metricNames[index] : undefined;
-					const metricUnit = isQueryDataItem ? metricUnits[index] : undefined;
-
-					// Show the no unit warning if -
-					// 1. The metric query is not loading
-					// 2. The metric units are not loading
-					// 3. There are more than one metric
-					// 4. The current metric unit is empty
-					// 5. Is a queryData item
-					const isMetricUnitEmpty =
-						isQueryDataItem &&
-						!queries[index].isLoading &&
-						!isMetricUnitsLoading &&
-						metricUnits.length > 1 &&
-						!metricUnit &&
-						metricName;
-
-					const currentYAxisUnit = yAxisUnit || metricUnit;
-
-					return (
-						<div
-							className="time-series-view"
-							// eslint-disable-next-line react/no-array-index-key
-							key={index}
-						>
-							{isMetricUnitEmpty && metricName && (
-								<Tooltip
-									className="no-unit-warning"
-									title={
-										<Typography.Text>
-											This metric does not have a unit. Please set one for it in the{' '}
-											<Typography.Link
-												onClick={(): void => handleOpenMetricDetails(metricName)}
-											>
-												metric details
-											</Typography.Link>{' '}
-											page.
-										</Typography.Text>
-									}
-								>
-									<AlertTriangle size={16} color={Color.BG_AMBER_400} />
-								</Tooltip>
-							)}
-							<TimeSeriesView
-								isFilterApplied={false}
-								isError={queries[index].isError}
-								isLoading={queries[index].isLoading || isMetricUnitsLoading}
-								data={datapoint}
-								yAxisUnit={currentYAxisUnit}
-								dataSource={DataSource.METRICS}
-								error={queries[index].error as APIError}
-								setWarning={setWarning}
-							/>
-						</div>
-					);
-				})}
+				{responseData.map((datapoint, index) => (
+					<div
+						className="time-series-view"
+						// eslint-disable-next-line react/no-array-index-key
+						key={index}
+					>
+						<TimeSeriesView
+							isFilterApplied={false}
+							isError={queries[index].isError}
+							isLoading={queries[index].isLoading}
+							data={datapoint}
+							yAxisUnit={yAxisUnit}
+							dataSource={DataSource.METRICS}
+							error={queries[index].error as APIError}
+							setWarning={setWarning}
+						/>
+					</div>
+				))}
 			</div>
 		</>
 	);

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

@@ -1,6 +1,4 @@
 import { render, screen } from '@testing-library/react';
-import { Temporality } from 'api/metricsExplorer/getMetricDetails';
-import { MetricType } from 'api/metricsExplorer/getMetricsList';
 import { initialQueriesMap, PANEL_TYPES } from 'constants/queryBuilder';
 import * as useOptionsMenuHooks from 'container/OptionsMenu';
 import * as useUpdateDashboardHooks from 'hooks/dashboard/useUpdateDashboard';
@@ -14,18 +12,13 @@ import { MemoryRouter } from 'react-router-dom';
 import { useSearchParams } from 'react-router-dom-v5-compat';
 import store from 'store';
 import { LicenseEvent } from 'types/api/licensesV3/getActive';
-import { MetricMetadata } from 'types/api/metricsExplorer/v2/getMetricMetadata';
-import { BaseAutocompleteData } from 'types/api/queryBuilder/queryAutocompleteResponse';
-import { DataSource, QueryBuilderContextType } from 'types/common/queryBuilder';
+import { DataSource } from 'types/common/queryBuilder';
 
 import Explorer from '../Explorer';
-import * as useGetMetricsHooks from '../utils';
 
 const mockSetSearchParams = jest.fn();
 const queryClient = new QueryClient();
-const mockUpdateAllQueriesOperators = jest
-	.fn()
-	.mockReturnValue(initialQueriesMap[DataSource.METRICS]);
+const mockUpdateAllQueriesOperators = jest.fn();
 const mockUseQueryBuilderData = {
 	handleRunQuery: jest.fn(),
 	stagedQuery: initialQueriesMap[DataSource.METRICS],
@@ -133,30 +126,6 @@ jest.spyOn(useQueryBuilderHooks, 'useQueryBuilder').mockReturnValue({
 	...mockUseQueryBuilderData,
 } as any);
 
-const Y_AXIS_UNIT_SELECTOR_TEST_ID = 'y-axis-unit-selector';
-
-const mockMetric: MetricMetadata = {
-	type: MetricType.SUM,
-	description: 'metric1 description',
-	unit: 'metric1 unit',
-	temporality: Temporality.CUMULATIVE,
-	isMonotonic: true,
-};
-
-function renderExplorer(): void {
-	render(
-		<QueryClientProvider client={queryClient}>
-			<MemoryRouter>
-				<Provider store={store}>
-					<ErrorModalProvider>
-						<Explorer />
-					</ErrorModalProvider>
-				</Provider>
-			</MemoryRouter>
-		</QueryClientProvider>,
-	);
-}
-
 describe('Explorer', () => {
 	beforeEach(() => {
 		jest.clearAllMocks();
@@ -173,7 +142,17 @@ describe('Explorer', () => {
 			mockSetSearchParams,
 		]);
 
-		renderExplorer();
+		render(
+			<QueryClientProvider client={queryClient}>
+				<MemoryRouter>
+					<Provider store={store}>
+						<ErrorModalProvider>
+							<Explorer />
+						</ErrorModalProvider>
+					</Provider>
+				</MemoryRouter>
+			</QueryClientProvider>,
+		);
 
 		expect(mockUpdateAllQueriesOperators).toHaveBeenCalledWith(
 			initialQueriesMap[DataSource.METRICS],
@@ -187,13 +166,18 @@ describe('Explorer', () => {
 			new URLSearchParams({ isOneChartPerQueryEnabled: 'true' }),
 			mockSetSearchParams,
 		]);
-		jest.spyOn(useGetMetricsHooks, 'useGetMetrics').mockReturnValue({
-			isLoading: false,
-			isError: false,
-			metrics: [mockMetric, mockMetric],
-		});
 
-		renderExplorer();
+		render(
+			<QueryClientProvider client={queryClient}>
+				<MemoryRouter>
+					<Provider store={store}>
+						<ErrorModalProvider>
+							<Explorer />
+						</ErrorModalProvider>
+					</Provider>
+				</MemoryRouter>
+			</QueryClientProvider>,
+		);
 
 		const toggle = screen.getByRole('switch');
 		expect(toggle).toBeChecked();
@@ -204,132 +188,20 @@ describe('Explorer', () => {
 			new URLSearchParams({ isOneChartPerQueryEnabled: 'false' }),
 			mockSetSearchParams,
 		]);
-		jest.spyOn(useGetMetricsHooks, 'useGetMetrics').mockReturnValue({
-			isLoading: false,
-			isError: false,
-			metrics: [mockMetric, mockMetric],
-		});
 
-		renderExplorer();
+		render(
+			<QueryClientProvider client={queryClient}>
+				<MemoryRouter>
+					<Provider store={store}>
+						<ErrorModalProvider>
+							<Explorer />
+						</ErrorModalProvider>
+					</Provider>
+				</MemoryRouter>
+			</QueryClientProvider>,
+		);
 
 		const toggle = screen.getByRole('switch');
 		expect(toggle).not.toBeChecked();
 	});
-
-	it('should not render y axis unit selector for single metric which has a unit', () => {
-		jest.spyOn(useGetMetricsHooks, 'useGetMetrics').mockReturnValue({
-			isLoading: false,
-			isError: false,
-			metrics: [mockMetric],
-		});
-
-		renderExplorer();
-
-		const yAxisUnitSelector = screen.queryByTestId(Y_AXIS_UNIT_SELECTOR_TEST_ID);
-		expect(yAxisUnitSelector).not.toBeInTheDocument();
-	});
-
-	it('should not render y axis unit selector for mutliple metrics with same unit', () => {
-		(useSearchParams as jest.Mock).mockReturnValueOnce([
-			new URLSearchParams({ isOneChartPerQueryEnabled: 'true' }),
-			mockSetSearchParams,
-		]);
-		jest.spyOn(useGetMetricsHooks, 'useGetMetrics').mockReturnValue({
-			isLoading: false,
-			isError: false,
-			metrics: [mockMetric, mockMetric],
-		});
-
-		renderExplorer();
-
-		const yAxisUnitSelector = screen.queryByTestId(Y_AXIS_UNIT_SELECTOR_TEST_ID);
-		expect(yAxisUnitSelector).not.toBeInTheDocument();
-	});
-
-	it('should hide y axis unit selector for multiple metrics with different units', () => {
-		jest.spyOn(useGetMetricsHooks, 'useGetMetrics').mockReturnValue({
-			isLoading: false,
-			isError: false,
-			metrics: [mockMetric, mockMetric],
-		});
-
-		renderExplorer();
-
-		const yAxisUnitSelector = screen.queryByTestId(Y_AXIS_UNIT_SELECTOR_TEST_ID);
-		expect(yAxisUnitSelector).not.toBeInTheDocument();
-
-		// One chart per query toggle should be disabled
-		const oneChartPerQueryToggle = screen.getByRole('switch');
-		expect(oneChartPerQueryToggle).toBeDisabled();
-	});
-
-	it('should render empty y axis unit selector for a single metric with no unit', () => {
-		jest.spyOn(useGetMetricsHooks, 'useGetMetrics').mockReturnValue({
-			isLoading: false,
-			isError: false,
-			metrics: [
-				{
-					type: MetricType.SUM,
-					description: 'metric1 description',
-					unit: '',
-					temporality: Temporality.CUMULATIVE,
-					isMonotonic: true,
-				},
-			],
-		});
-
-		renderExplorer();
-
-		const yAxisUnitSelector = screen.queryByTestId(Y_AXIS_UNIT_SELECTOR_TEST_ID);
-		expect(yAxisUnitSelector).toBeInTheDocument();
-		expect(yAxisUnitSelector).toHaveTextContent('Please select a unit');
-	});
-
-	it('one chart per query should be off and disabled when there is only one query', () => {
-		jest.spyOn(useGetMetricsHooks, 'useGetMetrics').mockReturnValue({
-			isLoading: false,
-			isError: false,
-			metrics: [mockMetric],
-		});
-
-		renderExplorer();
-
-		const oneChartPerQueryToggle = screen.getByRole('switch');
-		expect(oneChartPerQueryToggle).not.toBeChecked();
-		expect(oneChartPerQueryToggle).toBeDisabled();
-	});
-
-	it('one chart per query should enabled by default when there are multiple metrics with the same unit', () => {
-		const mockQueryData = {
-			...initialQueriesMap[DataSource.METRICS].builder.queryData[0],
-			aggregateAttribute: {
-				...(initialQueriesMap[DataSource.METRICS].builder.queryData[0]
-					.aggregateAttribute as BaseAutocompleteData),
-				key: 'metric1',
-			},
-		};
-		const mockStagedQueryWithMultipleQueries = {
-			...initialQueriesMap[DataSource.METRICS],
-			builder: {
-				...initialQueriesMap[DataSource.METRICS].builder,
-				queryData: [mockQueryData, mockQueryData],
-			},
-		};
-
-		jest.spyOn(useQueryBuilderHooks, 'useQueryBuilder').mockReturnValue(({
-			...mockUseQueryBuilderData,
-			stagedQuery: mockStagedQueryWithMultipleQueries,
-		} as Partial<QueryBuilderContextType>) as QueryBuilderContextType);
-
-		jest.spyOn(useGetMetricsHooks, 'useGetMetrics').mockReturnValue({
-			isLoading: false,
-			isError: false,
-			metrics: [mockMetric, mockMetric],
-		});
-
-		renderExplorer();
-
-		const oneChartPerQueryToggle = screen.getByRole('switch');
-		expect(oneChartPerQueryToggle).toBeEnabled();
-	});
 });

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

@@ -1,180 +0,0 @@
-import { render, RenderResult, screen, waitFor } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import { Temporality } from 'api/metricsExplorer/getMetricDetails';
-import { MetricType } from 'api/metricsExplorer/getMetricsList';
-import { UpdateMetricMetadataResponse } from 'api/metricsExplorer/updateMetricMetadata';
-import * as useUpdateMetricMetadataHooks from 'hooks/metricsExplorer/useUpdateMetricMetadata';
-import { UseUpdateMetricMetadataProps } from 'hooks/metricsExplorer/useUpdateMetricMetadata';
-import { UseMutationResult } from 'react-query';
-import { ErrorResponse, SuccessResponse } from 'types/api';
-import { MetricMetadata } from 'types/api/metricsExplorer/v2/getMetricMetadata';
-
-import TimeSeries from '../TimeSeries';
-import { TimeSeriesProps } from '../types';
-
-type MockUpdateMetricMetadata = UseMutationResult<
-	SuccessResponse<UpdateMetricMetadataResponse> | ErrorResponse,
-	Error,
-	UseUpdateMetricMetadataProps
->;
-const mockUpdateMetricMetadata = jest.fn();
-jest
-	.spyOn(useUpdateMetricMetadataHooks, 'useUpdateMetricMetadata')
-	.mockReturnValue(({
-		mutate: mockUpdateMetricMetadata,
-		isLoading: false,
-	} as Partial<MockUpdateMetricMetadata>) as MockUpdateMetricMetadata);
-
-jest.mock('container/TimeSeriesView/TimeSeriesView', () => ({
-	__esModule: true,
-	default: jest.fn().mockReturnValue(
-		<div role="img" aria-label="warning">
-			TimeSeriesView
-		</div>,
-	),
-}));
-
-jest.mock('react-query', () => ({
-	...jest.requireActual('react-query'),
-	useQueryClient: jest.fn().mockReturnValue({
-		invalidateQueries: jest.fn(),
-	}),
-	useQueries: jest.fn().mockImplementation((queries: any[]) =>
-		queries.map(() => ({
-			data: undefined,
-			isLoading: false,
-			isError: false,
-			error: undefined,
-		})),
-	),
-}));
-
-jest.mock('react-redux', () => ({
-	...jest.requireActual('react-redux'),
-	useSelector: jest.fn().mockReturnValue({
-		globalTime: {
-			selectedTime: '5min',
-			maxTime: 1713738000000,
-			minTime: 1713734400000,
-		},
-	}),
-}));
-
-const mockMetric: MetricMetadata = {
-	type: MetricType.SUM,
-	description: 'metric1 description',
-	unit: 'metric1 unit',
-	temporality: Temporality.CUMULATIVE,
-	isMonotonic: true,
-};
-
-const mockSetWarning = jest.fn();
-const mockSetIsMetricDetailsOpen = jest.fn();
-const mockSetYAxisUnit = jest.fn();
-
-function renderTimeSeries(
-	overrides: Partial<TimeSeriesProps> = {},
-): RenderResult {
-	return render(
-		<TimeSeries
-			showOneChartPerQuery={false}
-			setWarning={mockSetWarning}
-			areAllMetricUnitsSame={false}
-			isMetricUnitsLoading={false}
-			metricUnits={[]}
-			metricNames={[]}
-			metrics={[]}
-			isMetricUnitsError={false}
-			handleOpenMetricDetails={mockSetIsMetricDetailsOpen}
-			yAxisUnit="count"
-			setYAxisUnit={mockSetYAxisUnit}
-			showYAxisUnitSelector={false}
-			// eslint-disable-next-line react/jsx-props-no-spreading
-			{...overrides}
-		/>,
-	);
-}
-
-describe('TimeSeries', () => {
-	it('should render a warning icon when a metric has no unit among multiple metrics', () => {
-		const user = userEvent.setup();
-		const { container } = renderTimeSeries({
-			metricUnits: ['', 'count'],
-			metricNames: ['metric1', 'metric2'],
-			metrics: [undefined, undefined],
-		});
-
-		const alertIcon = container.querySelector('.no-unit-warning') as HTMLElement;
-		user.hover(alertIcon);
-		waitFor(() =>
-			expect(
-				screen.findByText('This metric does not have a unit'),
-			).toBeInTheDocument(),
-		);
-	});
-
-	it('clicking on warning icon tooltip should open metric details modal', async () => {
-		const user = userEvent.setup();
-		const { container } = renderTimeSeries({
-			metricUnits: ['', 'count'],
-			metricNames: ['metric1', 'metric2'],
-			metrics: [mockMetric, mockMetric],
-			yAxisUnit: 'seconds',
-		});
-
-		const alertIcon = container.querySelector('.no-unit-warning') as HTMLElement;
-		user.hover(alertIcon);
-
-		const metricDetailsLink = await screen.findByText('metric details');
-		user.click(metricDetailsLink);
-
-		waitFor(() =>
-			expect(mockSetIsMetricDetailsOpen).toHaveBeenCalledWith('metric1'),
-		);
-	});
-
-	// TODO: Unskip this test once the save unit button is implemented
-	// Tracking at - https://github.com/SigNoz/engineering-pod/issues/3495
-	it.skip('shows Save unit button when metric had no unit but one is selected', () => {
-		const { findByText, getByRole } = renderTimeSeries({
-			metricUnits: [undefined],
-			metricNames: ['metric1'],
-			metrics: [mockMetric],
-			yAxisUnit: 'seconds',
-		});
-
-		expect(
-			findByText('Save the selected unit for this metric?'),
-		).toBeInTheDocument();
-
-		const yesButton = getByRole('button', { name: 'Yes' });
-		expect(yesButton).toBeInTheDocument();
-		expect(yesButton).toBeEnabled();
-	});
-
-	// TODO: Unskip this test once the save unit button is implemented
-	// Tracking at - https://github.com/SigNoz/engineering-pod/issues/3495
-	it.skip('clicking on save unit button shoould upated metric metadata', () => {
-		const user = userEvent.setup();
-		const { getByRole } = renderTimeSeries({
-			metricUnits: [''],
-			metricNames: ['metric1'],
-			metrics: [mockMetric],
-			yAxisUnit: 'seconds',
-		});
-
-		const yesButton = getByRole('button', { name: /Yes/i });
-		user.click(yesButton);
-
-		expect(mockUpdateMetricMetadata).toHaveBeenCalledWith(
-			{
-				metricName: 'metric1',
-				payload: expect.objectContaining({ unit: 'seconds' }),
-			},
-			expect.objectContaining({
-				onSuccess: expect.any(Function),
-				onError: expect.any(Function),
-			}),
-		);
-	});
-});

frontend/src/container/MetricsExplorer/Explorer/__tests__/utils.test.tsx

@@ -1,161 +0,0 @@
-import { renderHook } from '@testing-library/react';
-import { Temporality } from 'api/metricsExplorer/getMetricDetails';
-import { MetricType } from 'api/metricsExplorer/getMetricsList';
-import { initialQueriesMap } from 'constants/queryBuilder';
-import * as useGetMultipleMetricsHook from 'hooks/metricsExplorer/useGetMultipleMetrics';
-import { UseQueryResult } from 'react-query';
-import { SuccessResponseV2 } from 'types/api';
-import {
-	MetricMetadata,
-	MetricMetadataResponse,
-} from 'types/api/metricsExplorer/v2/getMetricMetadata';
-import { BaseAutocompleteData } from 'types/api/queryBuilder/queryAutocompleteResponse';
-import {
-	IBuilderFormula,
-	IBuilderQuery,
-	Query,
-} from 'types/api/queryBuilder/queryBuilderData';
-import { DataSource } from 'types/common/queryBuilder';
-
-import {
-	getMetricUnits,
-	splitQueryIntoOneChartPerQuery,
-	useGetMetrics,
-} from '../utils';
-
-const MOCK_QUERY_DATA_1: IBuilderQuery = {
-	...initialQueriesMap[DataSource.METRICS].builder.queryData[0],
-	aggregateAttribute: {
-		...(initialQueriesMap[DataSource.METRICS].builder.queryData[0]
-			.aggregateAttribute as BaseAutocompleteData),
-		key: 'metric1',
-	},
-};
-
-const MOCK_QUERY_DATA_2: IBuilderQuery = {
-	...initialQueriesMap[DataSource.METRICS].builder.queryData[0],
-	aggregateAttribute: {
-		...(initialQueriesMap[DataSource.METRICS].builder.queryData[0]
-			.aggregateAttribute as BaseAutocompleteData),
-		key: 'metric2',
-	},
-};
-const MOCK_FORMULA_DATA: IBuilderFormula = {
-	expression: '1 + 1',
-	disabled: false,
-	queryName: 'Mock Formula',
-	legend: 'Mock Legend',
-};
-
-const MOCK_QUERY_WITH_MULTIPLE_QUERY_DATA: Query = {
-	...initialQueriesMap[DataSource.METRICS],
-	builder: {
-		...initialQueriesMap[DataSource.METRICS].builder,
-		queryData: [MOCK_QUERY_DATA_1, MOCK_QUERY_DATA_2],
-		queryFormulas: [MOCK_FORMULA_DATA, MOCK_FORMULA_DATA],
-	},
-};
-
-describe('splitQueryIntoOneChartPerQuery', () => {
-	it('should split a query with multiple queryData to multiple distinct queries, each with a single queryData', () => {
-		const result = splitQueryIntoOneChartPerQuery(
-			MOCK_QUERY_WITH_MULTIPLE_QUERY_DATA,
-			['metric1', 'metric2'],
-			[undefined, 'unit2'],
-		);
-		expect(result).toHaveLength(4);
-		// Verify query 1 has the correct data
-		expect(result[0].builder.queryData).toHaveLength(1);
-		expect(result[0].builder.queryData[0]).toEqual(MOCK_QUERY_DATA_1);
-		expect(result[0].builder.queryFormulas).toHaveLength(0);
-		expect(result[0].unit).toBeUndefined();
-		// Verify query 2 has the correct data
-		expect(result[1].builder.queryData).toHaveLength(1);
-		expect(result[1].builder.queryData[0]).toEqual(MOCK_QUERY_DATA_2);
-		expect(result[1].builder.queryFormulas).toHaveLength(0);
-		expect(result[1].unit).toBe('unit2');
-		// Verify query 3 has the correct data
-		expect(result[2].builder.queryFormulas).toHaveLength(1);
-		expect(result[2].builder.queryFormulas[0]).toEqual(MOCK_FORMULA_DATA);
-		expect(result[2].builder.queryData).toHaveLength(2); // 2 disabled queries
-		expect(result[2].builder.queryData[0].disabled).toBe(true);
-		expect(result[2].builder.queryData[1].disabled).toBe(true);
-		expect(result[2].unit).toBeUndefined();
-		// Verify query 4 has the correct data
-		expect(result[3].builder.queryFormulas).toHaveLength(1);
-		expect(result[3].builder.queryFormulas[0]).toEqual(MOCK_FORMULA_DATA);
-		expect(result[3].builder.queryData).toHaveLength(2); // 2 disabled queries
-		expect(result[3].builder.queryData[0].disabled).toBe(true);
-		expect(result[3].builder.queryData[1].disabled).toBe(true);
-		expect(result[3].unit).toBeUndefined();
-	});
-});
-
-const MOCK_METRIC_METADATA: MetricMetadata = {
-	description: 'Metric 1 description',
-	unit: 'unit1',
-	type: MetricType.GAUGE,
-	temporality: Temporality.DELTA,
-	isMonotonic: true,
-};
-
-describe('useGetMetrics', () => {
-	beforeEach(() => {
-		jest
-			.spyOn(useGetMultipleMetricsHook, 'useGetMultipleMetrics')
-			.mockReturnValue([
-				({
-					isLoading: false,
-					isError: false,
-					data: {
-						httpStatusCode: 200,
-						data: {
-							status: 'success',
-							data: MOCK_METRIC_METADATA,
-						},
-					},
-				} as Partial<
-					UseQueryResult<SuccessResponseV2<MetricMetadataResponse>, Error>
-				>) as UseQueryResult<SuccessResponseV2<MetricMetadataResponse>, Error>,
-			]);
-	});
-
-	it('should return the correct metrics data', () => {
-		const { result } = renderHook(() => useGetMetrics(['metric1']));
-		expect(result.current.metrics).toHaveLength(1);
-		expect(result.current.metrics[0]).toBeDefined();
-		expect(result.current.metrics[0]).toEqual(MOCK_METRIC_METADATA);
-		expect(result.current.isLoading).toBe(false);
-		expect(result.current.isError).toBe(false);
-	});
-
-	it('should return array of undefined values of correct length when metrics data is not yet loaded', () => {
-		jest
-			.spyOn(useGetMultipleMetricsHook, 'useGetMultipleMetrics')
-			.mockReturnValue([
-				({
-					isLoading: true,
-					isError: false,
-				} as Partial<
-					UseQueryResult<SuccessResponseV2<MetricMetadataResponse>, Error>
-				>) as UseQueryResult<SuccessResponseV2<MetricMetadataResponse>, Error>,
-			]);
-		const { result } = renderHook(() => useGetMetrics(['metric1']));
-		expect(result.current.metrics).toHaveLength(1);
-		expect(result.current.metrics[0]).toBeUndefined();
-	});
-});
-
-describe('getMetricUnits', () => {
-	it('should return the same unit for units that are not known to the universal unit mapper', () => {
-		const result = getMetricUnits([MOCK_METRIC_METADATA]);
-		expect(result).toHaveLength(1);
-		expect(result[0]).toEqual(MOCK_METRIC_METADATA.unit);
-	});
-
-	it('should return universal unit for units that are known to the universal unit mapper', () => {
-		const result = getMetricUnits([{ ...MOCK_METRIC_METADATA, unit: 'seconds' }]);
-		expect(result).toHaveLength(1);
-		expect(result[0]).toBe('s');
-	});
-});

frontend/src/container/MetricsExplorer/Explorer/types.ts

@@ -3,7 +3,6 @@ import { Dispatch, SetStateAction } from 'react';
 import { UseQueryResult } from 'react-query';
 import { SuccessResponse, Warning } from 'types/api';
 import { MetricRangePayloadProps } from 'types/api/metrics/getQueryRange';
-import { MetricMetadata } from 'types/api/metricsExplorer/v2/getMetricMetadata';
 
 export enum ExplorerTabs {
 	TIME_SERIES = 'time-series',
@@ -13,16 +12,6 @@ export enum ExplorerTabs {
 export interface TimeSeriesProps {
 	showOneChartPerQuery: boolean;
 	setWarning: Dispatch<SetStateAction<Warning | undefined>>;
-	areAllMetricUnitsSame: boolean;
-	isMetricUnitsLoading: boolean;
-	isMetricUnitsError: boolean;
-	metricUnits: (string | undefined)[];
-	metricNames: string[];
-	metrics: (MetricMetadata | undefined)[];
-	handleOpenMetricDetails: (metricName: string) => void;
-	yAxisUnit: string | undefined;
-	setYAxisUnit: (unit: string) => void;
-	showYAxisUnitSelector: boolean;
 }
 
 export interface RelatedMetricsProps {

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

@@ -1,40 +1,20 @@
-import { mapMetricUnitToUniversalUnit } from 'components/YAxisUnitSelector/utils';
-import { useGetMultipleMetrics } from 'hooks/metricsExplorer/useGetMultipleMetrics';
-import { MetricMetadata } from 'types/api/metricsExplorer/v2/getMetricMetadata';
 import { Query } from 'types/api/queryBuilder/queryBuilderData';
 import { v4 as uuid } from 'uuid';
 
-/**
- * Split a query with multiple queryData to multiple distinct queries, each with a single queryData.
- * @param query - The query to split
- * @param units - The units of the metrics, can be undefined if the metric has no unit
- * @returns The split queries
- */
-export const splitQueryIntoOneChartPerQuery = (
-	query: Query,
-	metricNames: string[],
-	units: (string | undefined)[],
-): Query[] => {
+export const splitQueryIntoOneChartPerQuery = (query: Query): Query[] => {
 	const queries: Query[] = [];
 
 	query.builder.queryData.forEach((currentQuery) => {
-		if (currentQuery.aggregateAttribute?.key) {
-			const metricIndex = metricNames.indexOf(
-				currentQuery.aggregateAttribute?.key,
-			);
-			const unit = metricIndex >= 0 ? units[metricIndex] : undefined;
-			const newQuery = {
-				...query,
-				id: uuid(),
-				builder: {
-					...query.builder,
-					queryData: [currentQuery],
-					queryFormulas: [],
-				},
-				unit,
-			};
-			queries.push(newQuery);
-		}
+		const newQuery = {
+			...query,
+			id: uuid(),
+			builder: {
+				...query.builder,
+				queryData: [currentQuery],
+				queryFormulas: [],
+			},
+		};
+		queries.push(newQuery);
 	});
 
 	query.builder.queryFormulas.forEach((currentFormula) => {
@@ -55,43 +35,3 @@ export const splitQueryIntoOneChartPerQuery = (
 
 	return queries;
 };
-
-/**
- * Hook to get data for multiple metrics with a synchronous loading and error state
- * @param metricNames - The names of the metrics to get
- * @param isEnabled - Whether the hook is enabled
- * @returns The loading state, the metrics data, and the error state
- */
-export function useGetMetrics(
-	metricNames: string[],
-	isEnabled = true,
-): {
-	isLoading: boolean;
-	isError: boolean;
-	metrics: (MetricMetadata | undefined)[];
-} {
-	const metricsData = useGetMultipleMetrics(metricNames, {
-		enabled: metricNames.length > 0 && isEnabled,
-	});
-	return {
-		isLoading: metricsData.some((metric) => metric.isLoading),
-		metrics: metricsData
-			.map((metric) => metric.data?.data)
-			.map((data) => data?.data),
-		isError: metricsData.some((metric) => metric.isError),
-	};
-}
-
-/**
- * To get the units of the metrics in the universal unit standard.
- * If the unit is not known to the universal unit mapper, it will return the unit as is.
- * @param metrics - The metrics to get the units for
- * @returns The units of the metrics, can be undefined if the metric has no unit
- */
-export function getMetricUnits(
-	metrics: (MetricMetadata | undefined)[],
-): (string | undefined)[] {
-	return metrics
-		.map((metric) => metric?.unit)
-		.map((unit) => mapMetricUnitToUniversalUnit(unit) || undefined);
-}

frontend/src/container/MetricsExplorer/MetricDetails/MetricDetails.tsx

@@ -131,8 +131,8 @@ function MetricDetails({
 						>
 							Open in Explorer
 						</Button>
-						{/* Show the inspect button if the metric type is GAUGE */}
-						{showInspectFeature && openInspectModal && (
+						{/* Show the based on the feature flag. Will remove before releasing the feature */}
+						{showInspectFeature && (
 							<Button
 								className="inspect-metrics-button"
 								aria-label="Inspect Metric"

frontend/src/container/MetricsExplorer/MetricDetails/types.ts

@@ -11,7 +11,7 @@ export interface MetricDetailsProps {
 	isOpen: boolean;
 	metricName: string | null;
 	isModalTimeSelection: boolean;
-	openInspectModal?: (metricName: string) => void;
+	openInspectModal: (metricName: string) => void;
 }
 
 export interface DashboardsAndAlertsPopoverProps {

frontend/src/container/NewWidget/index.tsx

@@ -370,6 +370,10 @@ function NewWidget({
 	// this has been moved here from the left container
 	const [requestData, setRequestData] = useState<GetQueryResultsProps>(() => {
 		const updatedQuery = cloneDeep(stagedQuery || initialQueriesMap.metrics);
+		if (updatedQuery?.builder?.queryData?.[0]) {
+			updatedQuery.builder.queryData[0].pageSize = 10;
+		}
+
 		if (selectedWidget) {
 			if (selectedGraph === PANEL_TYPES.LIST) {
 				return {
@@ -415,12 +419,16 @@ function NewWidget({
 	useEffect(() => {
 		if (stagedQuery) {
 			setIsLoadingPanelData(false);
+			const updatedStagedQuery = cloneDeep(stagedQuery);
+			if (updatedStagedQuery?.builder?.queryData?.[0]) {
+				updatedStagedQuery.builder.queryData[0].pageSize = 10;
+			}
 			setRequestData((prev) => ({
 				...prev,
 				selectedTime: selectedTime.enum || prev.selectedTime,
 				globalSelectedInterval: customGlobalSelectedInterval,
 				graphType: getGraphType(selectedGraph || selectedWidget.panelTypes),
-				query: stagedQuery,
+				query: updatedStagedQuery,
 				fillGaps: selectedWidget.fillSpans || false,
 				isLogScale: selectedWidget.isLogScale || false,
 				formatForWeb:

frontend/src/container/QueryBuilder/QueryBuilder.styles.scss

@@ -206,10 +206,6 @@
 			.ant-select-selector {
 				border-color: var(--bg-vanilla-300);
 				background: var(--bg-vanilla-300);
-
-				.ant-select-selection-item {
-					color: var(--text-ink-400);
-				}
 			}
 
 			.ant-input-number {

frontend/src/container/QueryBuilder/components/SpaceAggregationOptions/SpaceAggregationOptions.tsx

@@ -1,5 +1,7 @@
 import { Select } from 'antd';
 import { ATTRIBUTE_TYPES, PANEL_TYPES } from 'constants/queryBuilder';
+import { useEffect, useState } from 'react';
+import { MetricAggregateOperator } from 'types/common/queryBuilder';
 
 interface SpaceAggregationOptionsProps {
 	panelType: PANEL_TYPES | null;
@@ -20,13 +22,39 @@ export default function SpaceAggregationOptions({
 	operators,
 	qbVersion,
 }: SpaceAggregationOptionsProps): JSX.Element {
+	const placeHolderText =
+		panelType === PANEL_TYPES.VALUE || qbVersion === 'v3' ? 'Sum' : 'Sum By';
+	const [defaultValue, setDefaultValue] = useState(
+		selectedValue || placeHolderText,
+	);
+
+	useEffect(() => {
+		if (!selectedValue) {
+			if (
+				aggregatorAttributeType === ATTRIBUTE_TYPES.HISTOGRAM ||
+				aggregatorAttributeType === ATTRIBUTE_TYPES.EXPONENTIAL_HISTOGRAM
+			) {
+				setDefaultValue(MetricAggregateOperator.P90);
+				onSelect(MetricAggregateOperator.P90);
+			} else if (aggregatorAttributeType === ATTRIBUTE_TYPES.SUM) {
+				setDefaultValue(MetricAggregateOperator.SUM);
+				onSelect(MetricAggregateOperator.SUM);
+			} else if (aggregatorAttributeType === ATTRIBUTE_TYPES.GAUGE) {
+				setDefaultValue(MetricAggregateOperator.AVG);
+				onSelect(MetricAggregateOperator.AVG);
+			}
+		}
+
+		// eslint-disable-next-line react-hooks/exhaustive-deps
+	}, [aggregatorAttributeType]);
+
 	return (
 		<div
 			className="spaceAggregationOptionsContainer"
 			key={aggregatorAttributeType}
 		>
 			<Select
-				defaultValue={selectedValue}
+				defaultValue={defaultValue}
 				style={{ minWidth: '5.625rem' }}
 				disabled={disabled}
 				onChange={onSelect}

frontend/src/container/QueryBuilder/filters/QueryBuilderSearch/OptionRenderer.styles.scss

@@ -1,16 +0,0 @@
-.selectOptionContainer {
-	display: flex;
-	gap: 8px;
-	justify-content: space-between;
-	align-items: center;
-	overflow-x: auto;
-
-	&::-webkit-scrollbar {
-		width: 0.2rem;
-		height: 0.2rem;
-	}
-}
-
-.option-renderer-tooltip {
-	pointer-events: none;
-}

frontend/src/container/QueryBuilder/filters/QueryBuilderSearch/OptionRenderer.tsx

@@ -1,4 +1,4 @@
-import './OptionRenderer.styles.scss';
+import './QueryBuilderSearch.styles.scss';
 
 import { Tooltip } from 'antd';
 
@@ -13,11 +13,7 @@ function OptionRenderer({
 	return (
 		<span className="option">
 			{type ? (
-				<Tooltip
-					title={`${value}`}
-					placement="topLeft"
-					rootClassName="option-renderer-tooltip"
-				>
+				<Tooltip title={`${value}`} placement="topLeft">
 					<div className="selectOptionContainer">
 						<div className="option-value">{value}</div>
 						<div className="option-meta-data-container">
@@ -33,11 +29,7 @@ function OptionRenderer({
 					</div>
 				</Tooltip>
 			) : (
-				<Tooltip
-					title={label}
-					placement="topLeft"
-					rootClassName="option-renderer-tooltip"
-				>
+				<Tooltip title={label} placement="topLeft">
 					<span>{label}</span>
 				</Tooltip>
 			)}

frontend/src/container/QueryBuilder/filters/QueryBuilderSearch/QueryBuilderSearch.styles.scss

@@ -5,6 +5,19 @@
 	gap: 12px;
 }
 
+.selectOptionContainer {
+	display: flex;
+	gap: 8px;
+	justify-content: space-between;
+	align-items: center;
+	overflow-x: auto;
+
+	&::-webkit-scrollbar {
+		width: 0.2rem;
+		height: 0.2rem;
+	}
+}
+
 .logs-popup {
 	&.hide-scroll {
 		.rc-virtual-list-holder {

frontend/src/container/QueryBuilder/filters/ReduceToFilter/ReduceToFilter.test.tsx

@@ -1,88 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import { MetricType } from 'api/metricsExplorer/getMetricsList';
-import { IBuilderQuery } from 'types/api/queryBuilder/queryBuilderData';
-
-import { ReduceToFilter } from './ReduceToFilter';
-
-const mockOnChange = jest.fn();
-
-function baseQuery(overrides: Partial<IBuilderQuery> = {}): IBuilderQuery {
-	return {
-		dataSource: 'traces',
-		aggregations: [],
-		groupBy: [],
-		orderBy: [],
-		legend: '',
-		limit: null,
-		having: { expression: '' },
-		...overrides,
-	} as IBuilderQuery;
-}
-
-describe('ReduceToFilter', () => {
-	beforeEach(() => {
-		jest.clearAllMocks();
-	});
-
-	it('initializes with default avg when no reduceTo is set', () => {
-		render(<ReduceToFilter query={baseQuery()} onChange={mockOnChange} />);
-
-		expect(screen.getByTestId('reduce-to')).toBeInTheDocument();
-		expect(
-			screen.getByText('Average of values in timeframe'),
-		).toBeInTheDocument();
-	});
-
-	it('initializes from query.aggregations[0].reduceTo', () => {
-		render(
-			<ReduceToFilter
-				query={baseQuery({
-					aggregations: [{ reduceTo: 'sum' } as any],
-					aggregateAttribute: { key: 'test', type: MetricType.SUM },
-				})}
-				onChange={mockOnChange}
-			/>,
-		);
-
-		expect(screen.getByText('Sum of values in timeframe')).toBeInTheDocument();
-	});
-
-	it('initializes from query.reduceTo when aggregations[0].reduceTo is not set', () => {
-		render(
-			<ReduceToFilter
-				query={baseQuery({
-					reduceTo: 'max',
-					aggregateAttribute: { key: 'test', type: MetricType.GAUGE },
-				})}
-				onChange={mockOnChange}
-			/>,
-		);
-
-		expect(screen.getByText('Max of values in timeframe')).toBeInTheDocument();
-	});
-
-	it('updates to sum when aggregateAttribute.type is SUM', async () => {
-		const { rerender } = render(
-			<ReduceToFilter
-				query={baseQuery({
-					aggregateAttribute: { key: 'test', type: MetricType.GAUGE },
-				})}
-				onChange={mockOnChange}
-			/>,
-		);
-
-		rerender(
-			<ReduceToFilter
-				query={baseQuery({
-					aggregateAttribute: { key: 'test2', type: MetricType.SUM },
-				})}
-				onChange={mockOnChange}
-			/>,
-		);
-
-		const reduceToFilterText = (await screen.findByText(
-			'Sum of values in timeframe',
-		)) as HTMLElement;
-		expect(reduceToFilterText).toBeInTheDocument();
-	});
-});

frontend/src/container/QueryBuilder/filters/ReduceToFilter/ReduceToFilter.tsx

@@ -1,7 +1,6 @@
 import { Select } from 'antd';
-import { MetricType } from 'api/metricsExplorer/getMetricsList';
 import { REDUCE_TO_VALUES } from 'constants/queryBuilder';
-import { memo, useEffect, useRef, useState } from 'react';
+import { memo } from 'react';
 import { MetricAggregation } from 'types/api/v5/queryRange';
 // ** Types
 import { ReduceOperators } from 'types/common/queryBuilder';
@@ -13,46 +12,19 @@ export const ReduceToFilter = memo(function ReduceToFilter({
 	query,
 	onChange,
 }: ReduceToFilterProps): JSX.Element {
-	const isMounted = useRef<boolean>(false);
-	const [currentValue, setCurrentValue] = useState<
-		SelectOption<ReduceOperators, string>
-	>(REDUCE_TO_VALUES[2]); // default to avg
+	const reduceToValue =
+		(query.aggregations?.[0] as MetricAggregation)?.reduceTo || query.reduceTo;
+
+	const currentValue =
+		REDUCE_TO_VALUES.find((option) => option.value === reduceToValue) ||
+		REDUCE_TO_VALUES[0];
 
 	const handleChange = (
 		newValue: SelectOption<ReduceOperators, string>,
 	): void => {
-		setCurrentValue(newValue);
 		onChange(newValue.value);
 	};
 
-	useEffect(
-		() => {
-			if (!isMounted.current) {
-				const reduceToValue =
-					(query.aggregations?.[0] as MetricAggregation)?.reduceTo || query.reduceTo;
-
-				setCurrentValue(
-					REDUCE_TO_VALUES.find((option) => option.value === reduceToValue) ||
-						REDUCE_TO_VALUES[2],
-				);
-				isMounted.current = true;
-				return;
-			}
-
-			const aggregationAttributeType = query.aggregateAttribute?.type as
-				| MetricType
-				| undefined;
-
-			if (aggregationAttributeType === MetricType.SUM) {
-				handleChange(REDUCE_TO_VALUES[1]);
-			} else {
-				handleChange(REDUCE_TO_VALUES[2]);
-			}
-		},
-		// eslint-disable-next-line react-hooks/exhaustive-deps
-		[query.aggregateAttribute?.key],
-	);
-
 	return (
 		<Select
 			placeholder="Reduce to"

frontend/src/container/QueryTable/__test__/mocks.ts

@@ -363,6 +363,7 @@ export const WidgetHeaderProps: any = {
 		title: 'Table - Panel',
 		yAxisUnit: 'none',
 	},
+	parentHover: false,
 	queryResponse: {
 		status: 'success',
 		isLoading: false,

frontend/src/container/SideNav/SideNav.tsx

@@ -679,42 +679,7 @@ function SideNav({ isPinned }: { isPinned: boolean }): JSX.Element {
 		registerShortcut(GlobalShortcuts.NavigateToExceptions, () =>
 			onClickHandler(ROUTES.ALL_ERROR, null),
 		);
-		registerShortcut(GlobalShortcuts.NavigateToTracesFunnel, () =>
-			onClickHandler(ROUTES.TRACES_FUNNELS, null),
-		);
-		registerShortcut(GlobalShortcuts.NavigateToTracesViews, () =>
-			onClickHandler(ROUTES.TRACES_SAVE_VIEWS, null),
-		);
-		registerShortcut(GlobalShortcuts.NavigateToMetricsSummary, () =>
-			onClickHandler(ROUTES.METRICS_EXPLORER, null),
-		);
-		registerShortcut(GlobalShortcuts.NavigateToMetricsExplorer, () =>
-			onClickHandler(ROUTES.METRICS_EXPLORER_EXPLORER, null),
-		);
-		registerShortcut(GlobalShortcuts.NavigateToMetricsViews, () =>
-			onClickHandler(ROUTES.METRICS_EXPLORER_VIEWS, null),
-		);
-		registerShortcut(GlobalShortcuts.NavigateToSettings, () =>
-			onClickHandler(ROUTES.SETTINGS, null),
-		);
-		registerShortcut(GlobalShortcuts.NavigateToSettingsIngestion, () =>
-			onClickHandler(ROUTES.INGESTION_SETTINGS, null),
-		);
-		registerShortcut(GlobalShortcuts.NavigateToSettingsBilling, () =>
-			onClickHandler(ROUTES.BILLING, null),
-		);
-		registerShortcut(GlobalShortcuts.NavigateToSettingsAPIKeys, () =>
-			onClickHandler(ROUTES.API_KEYS, null),
-		);
-		registerShortcut(GlobalShortcuts.NavigateToSettingsNotificationChannels, () =>
-			onClickHandler(ROUTES.ALL_CHANNELS, null),
-		);
-		registerShortcut(GlobalShortcuts.NavigateToLogsPipelines, () =>
-			onClickHandler(ROUTES.LOGS_PIPELINES, null),
-		);
-		registerShortcut(GlobalShortcuts.NavigateToLogsViews, () =>
-			onClickHandler(ROUTES.LOGS_SAVE_VIEWS, null),
-		);
+
 		return (): void => {
 			deregisterShortcut(GlobalShortcuts.NavigateToHome);
 			deregisterShortcut(GlobalShortcuts.NavigateToServices);
@@ -724,18 +689,6 @@ function SideNav({ isPinned }: { isPinned: boolean }): JSX.Element {
 			deregisterShortcut(GlobalShortcuts.NavigateToAlerts);
 			deregisterShortcut(GlobalShortcuts.NavigateToExceptions);
 			deregisterShortcut(GlobalShortcuts.NavigateToMessagingQueues);
-			deregisterShortcut(GlobalShortcuts.NavigateToTracesFunnel);
-			deregisterShortcut(GlobalShortcuts.NavigateToMetricsSummary);
-			deregisterShortcut(GlobalShortcuts.NavigateToMetricsExplorer);
-			deregisterShortcut(GlobalShortcuts.NavigateToMetricsViews);
-			deregisterShortcut(GlobalShortcuts.NavigateToSettings);
-			deregisterShortcut(GlobalShortcuts.NavigateToSettingsIngestion);
-			deregisterShortcut(GlobalShortcuts.NavigateToSettingsBilling);
-			deregisterShortcut(GlobalShortcuts.NavigateToSettingsAPIKeys);
-			deregisterShortcut(GlobalShortcuts.NavigateToSettingsNotificationChannels);
-			deregisterShortcut(GlobalShortcuts.NavigateToLogsPipelines);
-			deregisterShortcut(GlobalShortcuts.NavigateToLogsViews);
-			deregisterShortcut(GlobalShortcuts.NavigateToTracesViews);
 		};
 	}, [deregisterShortcut, onClickHandler, registerShortcut]);
 

frontend/src/container/SpanDetailsDrawer/SpanLogs/spanLogs.styles.scss

@@ -5,20 +5,16 @@
 	&-virtuoso {
 		background: rgba(171, 189, 255, 0.04);
 	}
-	&-list-container {
+	&-list-container .logs-loading-skeleton {
 		height: 100%;
-
-		.logs-loading-skeleton {
-			height: 100%;
-			border: 1px solid var(--bg-slate-500);
-			border-top: none;
-			color: var(--bg-vanilla-400);
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			justify-content: center;
-			padding: 8px 0;
-		}
+		border: 1px solid var(--bg-slate-500);
+		border-top: none;
+		color: var(--bg-vanilla-400);
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		padding: 8px 0;
 	}
 
 	&-empty-content {

frontend/src/hooks/hotkeys/__tests__/useKeyboardHotkeys.test.tsx

@@ -1,18 +1,11 @@
 import { render } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import { useEffect } from 'react';
 
 import {
 	KeyboardHotkeysProvider,
 	useKeyboardHotkeys,
 } from '../useKeyboardHotkeys';
 
-jest.mock('../../../providers/cmdKProvider', () => ({
-	useCmdK: (): { open: boolean } => ({
-		open: false,
-	}),
-}));
-
 function TestComponentWithRegister({
 	handleShortcut,
 }: {
@@ -20,13 +13,14 @@ function TestComponentWithRegister({
 }): JSX.Element {
 	const { registerShortcut } = useKeyboardHotkeys();
 
-	useEffect(() => {
-		registerShortcut('a', handleShortcut);
-	}, [registerShortcut, handleShortcut]);
+	registerShortcut('a', handleShortcut);
 
-	return <span>Test Component</span>;
+	return (
+		<div>
+			<span>Test Component</span>
+		</div>
+	);
 }
-
 function TestComponentWithDeRegister({
 	handleShortcut,
 }: {
@@ -34,18 +28,21 @@ function TestComponentWithDeRegister({
 }): JSX.Element {
 	const { registerShortcut, deregisterShortcut } = useKeyboardHotkeys();
 
-	useEffect(() => {
-		registerShortcut('b', handleShortcut);
-		deregisterShortcut('b');
-	}, [registerShortcut, deregisterShortcut, handleShortcut]);
+	registerShortcut('b', handleShortcut);
 
-	return <span>Test Component</span>;
+	// Deregister the shortcut before triggering it
+	deregisterShortcut('b');
+
+	return (
+		<div>
+			<span>Test Component</span>
+		</div>
+	);
 }
 
 describe('KeyboardHotkeysProvider', () => {
 	it('registers and triggers shortcuts correctly', async () => {
 		const handleShortcut = jest.fn();
-		const user = userEvent.setup();
 
 		render(
 			<KeyboardHotkeysProvider>
@@ -53,15 +50,15 @@ describe('KeyboardHotkeysProvider', () => {
 			</KeyboardHotkeysProvider>,
 		);
 
-		// fires on keyup
-		await user.keyboard('{a}');
+		// Trigger the registered shortcut
+		await userEvent.keyboard('a');
 
-		expect(handleShortcut).toHaveBeenCalledTimes(1);
+		// Assert that the handleShortcut function has been called
+		expect(handleShortcut).toHaveBeenCalled();
 	});
 
-	it('does not trigger deregistered shortcuts', async () => {
+	it('deregisters shortcuts correctly', () => {
 		const handleShortcut = jest.fn();
-		const user = userEvent.setup();
 
 		render(
 			<KeyboardHotkeysProvider>
@@ -69,8 +66,10 @@ describe('KeyboardHotkeysProvider', () => {
 			</KeyboardHotkeysProvider>,
 		);
 
-		await user.keyboard('{b}');
+		// Try to trigger the deregistered shortcut
+		userEvent.keyboard('b');
 
+		// Assert that the handleShortcut function has NOT been called
 		expect(handleShortcut).not.toHaveBeenCalled();
 	});
 });

frontend/src/hooks/hotkeys/useKeyboardHotkeys.tsx

@@ -8,21 +8,20 @@ import {
 	useRef,
 } from 'react';
 
-import { useCmdK } from '../../providers/cmdKProvider';
-
 interface KeyboardHotkeysContextReturnValue {
 	/**
-	 * @param keyCombo provide the string for which the subsequent callback should be triggered. Example 'ctrl+a'
+	 * @param keyCombination provide the string for which the subsequent callback should be triggered. Example 'ctrl+a'
 	 * @param callback the callback that should be triggered when the above key combination is being pressed
 	 * @returns void
 	 */
-	registerShortcut: (keyCombo: string, callback: () => void) => void;
+	registerShortcut: (keyCombination: string, callback: () => void) => void;
+
 	/**
 	 *
-	 * @param keyCombo provide the string for which we want to deregister the callback
+	 * @param keyCombination provide the string for which we want to deregister the callback
 	 * @returns void
 	 */
-	deregisterShortcut: (keyCombo: string) => void;
+	deregisterShortcut: (keyCombination: string) => void;
 }
 
 const KeyboardHotkeysContext = createContext<KeyboardHotkeysContextReturnValue>(
@@ -34,7 +33,7 @@ const KeyboardHotkeysContext = createContext<KeyboardHotkeysContextReturnValue>(
 
 const IGNORE_INPUTS = ['input', 'textarea', 'cm-editor']; // Inputs in which hotkey events will be ignored
 
-export function useKeyboardHotkeys(): KeyboardHotkeysContextReturnValue {
+const useKeyboardHotkeys = (): KeyboardHotkeysContextReturnValue => {
 	const context = useContext(KeyboardHotkeysContext);
 	if (!context) {
 		throw new Error(
@@ -43,45 +42,21 @@ export function useKeyboardHotkeys(): KeyboardHotkeysContextReturnValue {
 	}
 
 	return context;
-}
+};
 
-/**
- * Normalize a set of keys into a stable combo
- * { shift, m, e } → "e+m+shift"
- */
-function normalizeChord(keys: Set<string>): string {
-	return Array.from(keys).sort().join('+');
-}
-
-/**
- * Normalize registration strings
- * "shift+m+e" → "e+m+shift"
- */
-function normalizeComboString(combo: string): string {
-	return normalizeChord(new Set(combo.split('+')));
-}
-
-export function KeyboardHotkeysProvider({
+function KeyboardHotkeysProvider({
 	children,
 }: {
 	children: JSX.Element;
 }): JSX.Element {
-	const { open: cmdKOpen } = useCmdK();
 	const shortcuts = useRef<Record<string, () => void>>({});
-	const pressedKeys = useRef<Set<string>>(new Set());
 
-	// A detected valid shortcut waiting to fire
-	const pendingCombo = useRef<string | null>(null);
+	const handleKeyPress = (event: KeyboardEvent): void => {
+		const { key, ctrlKey, altKey, shiftKey, metaKey, target } = event;
 
-	// Tracks whether user extended the combo
-	const wasExtended = useRef(false);
-
-	const handleKeyDown = (event: KeyboardEvent): void => {
-		if (event.repeat) return;
-
-		const target = event.target as HTMLElement;
 		const isCodeMirrorEditor =
 			(target as HTMLElement).closest('.cm-editor') !== null;
+
 		if (
 			IGNORE_INPUTS.includes((target as HTMLElement).tagName.toLowerCase()) ||
 			isCodeMirrorEditor
@@ -89,110 +64,61 @@ export function KeyboardHotkeysProvider({
 			return;
 		}
 
-		const key = event.key?.toLowerCase();
-		if (!key) return; // Skip if key is undefined
+		// https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/metaKey
+		const modifiers = { ctrlKey, altKey, shiftKey, metaKey };
 
-		// If a pending combo exists and a new key is pressed → extension
-		if (pendingCombo.current && !pressedKeys.current.has(key)) {
-			wasExtended.current = true;
-		}
+		let shortcutKey = `${key.toLowerCase()}`;
 
-		pressedKeys.current.add(key);
+		const isAltKey = `${modifiers.altKey ? '+alt' : ''}`;
+		const isShiftKey = `${modifiers.shiftKey ? '+shift' : ''}`;
 
-		if (event.shiftKey) pressedKeys.current.add('shift');
-		if (event.metaKey || event.ctrlKey) pressedKeys.current.add('meta');
-		if (event.altKey) pressedKeys.current.add('alt');
+		// ctrl and cmd have the same functionality for mac and windows parity
+		const isMetaKey = `${modifiers.metaKey || modifiers.ctrlKey ? '+meta' : ''}`;
 
-		const combo = normalizeChord(pressedKeys.current);
+		shortcutKey = shortcutKey + isAltKey + isShiftKey + isMetaKey;
 
-		if (shortcuts.current[combo]) {
+		if (shortcuts.current[shortcutKey]) {
 			event.preventDefault();
-			event.stopPropagation();
-			pendingCombo.current = combo;
-			wasExtended.current = false;
+			event.stopImmediatePropagation();
+
+			shortcuts.current[shortcutKey]();
 		}
 	};
 
-	const handleKeyUp = (event: KeyboardEvent): void => {
-		const key = event.key?.toLowerCase();
-		if (!key) return; // Skip if key is undefined
-
-		pressedKeys.current.delete(key);
-
-		if (!event.shiftKey) pressedKeys.current.delete('shift');
-		if (!event.metaKey && !event.ctrlKey) pressedKeys.current.delete('meta');
-		if (!event.altKey) pressedKeys.current.delete('alt');
-
-		if (!pendingCombo.current) return;
-
-		// Fire only if user did NOT extend the combo
-		if (!wasExtended.current) {
-			event.preventDefault();
-			try {
-				shortcuts.current[pendingCombo.current]?.();
-			} catch (error) {
-				console.error('Error executing hotkey callback:', error);
-			}
-		}
-
-		pendingCombo.current = null;
-		wasExtended.current = false;
-	};
-
-	useEffect((): (() => void) => {
-		document.addEventListener('keydown', handleKeyDown);
-		document.addEventListener('keyup', handleKeyUp);
-
-		const reset = (): void => {
-			pressedKeys.current.clear();
-			pendingCombo.current = null;
-			wasExtended.current = false;
-		};
-
-		window.addEventListener('blur', reset);
-
-		return (): void => {
-			document.removeEventListener('keydown', handleKeyDown);
-			document.removeEventListener('keyup', handleKeyUp);
-			window.removeEventListener('blur', reset);
-		};
-	}, []);
-
 	useEffect(() => {
-		if (!cmdKOpen) {
-			// Reset when palette closes
-			pressedKeys.current.clear();
-			pendingCombo.current = null;
-			wasExtended.current = false;
-		}
-	}, [cmdKOpen]);
-
-	const registerShortcut = useCallback(
-		(keyCombo: string, callback: () => void): void => {
-			const normalized = normalizeComboString(keyCombo);
-
-			if (!shortcuts.current[normalized]) {
-				shortcuts.current[normalized] = callback;
-				return;
-			}
-
-			const message = `This shortcut is already present in current scope :- ${keyCombo}`;
-
-			if (process.env.NODE_ENV === 'development') {
-				throw new Error(message);
-			} else {
-				console.error(message);
-			}
-		},
-		[],
-	);
-
-	const deregisterShortcut = useCallback((keyCombo: string) => {
-		const normalized = normalizeComboString(keyCombo);
-		unset(shortcuts.current, normalized);
+		document.addEventListener('keydown', handleKeyPress);
+		return (): void => {
+			document.removeEventListener('keydown', handleKeyPress);
+		};
 	}, []);
 
-	const ctxValue = useMemo(
+	const registerShortcut = useCallback(
+		(keyCombination: string, callback: () => void): void => {
+			if (!shortcuts.current[keyCombination]) {
+				shortcuts.current[keyCombination] = callback;
+			} else if (process.env.NODE_ENV === 'development') {
+				throw new Error(
+					`This shortcut is already present in current scope :- ${keyCombination}`,
+				);
+			} else {
+				console.error(
+					`This shortcut is already present in current scope :- ${keyCombination}`,
+				);
+			}
+		},
+		[shortcuts],
+	);
+
+	const deregisterShortcut = useCallback(
+		(keyCombination: string): void => {
+			if (shortcuts.current[keyCombination]) {
+				unset(shortcuts.current, keyCombination);
+			}
+		},
+		[shortcuts],
+	);
+
+	const contextValue = useMemo(
 		() => ({
 			registerShortcut,
 			deregisterShortcut,
@@ -201,8 +127,10 @@ export function KeyboardHotkeysProvider({
 	);
 
 	return (
-		<KeyboardHotkeysContext.Provider value={ctxValue}>
+		<KeyboardHotkeysContext.Provider value={contextValue}>
 			{children}
 		</KeyboardHotkeysContext.Provider>
 	);
 }
+
+export { KeyboardHotkeysProvider, useKeyboardHotkeys };

frontend/src/hooks/metricsExplorer/useGetMultipleMetrics.ts

@@ -1,32 +0,0 @@
-import { getMetricMetadata } from 'api/metricsExplorer/v2/getMetricMetadata';
-import { REACT_QUERY_KEY } from 'constants/reactQueryKeys';
-import { useQueries, UseQueryOptions, UseQueryResult } from 'react-query';
-import { SuccessResponseV2 } from 'types/api';
-import { MetricMetadataResponse } from 'types/api/metricsExplorer/v2/getMetricMetadata';
-
-type QueryResult = UseQueryResult<
-	SuccessResponseV2<MetricMetadataResponse>,
-	Error
->;
-
-type UseGetMultipleMetrics = (
-	metricNames: string[],
-	options?: UseQueryOptions<SuccessResponseV2<MetricMetadataResponse>, Error>,
-	headers?: Record<string, string>,
-) => QueryResult[];
-
-export const useGetMultipleMetrics: UseGetMultipleMetrics = (
-	metricNames,
-	options,
-	headers,
-) =>
-	useQueries(
-		metricNames.map(
-			(metricName) =>
-				({
-					queryKey: [REACT_QUERY_KEY.GET_METRIC_METADATA, metricName],
-					queryFn: ({ signal }) => getMetricMetadata(metricName, signal, headers),
-					...options,
-				} as UseQueryOptions<SuccessResponseV2<MetricMetadataResponse>, Error>),
-		),
-	);

frontend/src/hooks/metricsExplorer/useUpdateMetricMetadata.ts

@@ -5,7 +5,7 @@ import updateMetricMetadata, {
 import { useMutation, UseMutationResult } from 'react-query';
 import { ErrorResponse, SuccessResponse } from 'types/api';
 
-export interface UseUpdateMetricMetadataProps {
+interface UseUpdateMetricMetadataProps {
 	metricName: string;
 	payload: UpdateMetricMetadataProps;
 }

frontend/src/hooks/queryBuilder/__tests__/useQueryBuilderOperations.test.ts

@@ -188,7 +188,7 @@ describe('useQueryBuilderOperations - Empty Aggregate Attribute Type', () => {
 							timeAggregation: MetricAggregateOperator.RATE,
 							metricName: 'new_sum_metric',
 							temporality: '',
-							spaceAggregation: MetricAggregateOperator.SUM,
+							spaceAggregation: '',
 						},
 					],
 				}),
@@ -239,7 +239,7 @@ describe('useQueryBuilderOperations - Empty Aggregate Attribute Type', () => {
 							timeAggregation: MetricAggregateOperator.RATE,
 							metricName: 'new_sum_metric',
 							temporality: '',
-							spaceAggregation: MetricAggregateOperator.SUM,
+							spaceAggregation: '',
 						},
 					],
 				}),
@@ -315,7 +315,7 @@ describe('useQueryBuilderOperations - Empty Aggregate Attribute Type', () => {
 							timeAggregation: MetricAggregateOperator.AVG,
 							metricName: 'new_gauge',
 							temporality: '',
-							spaceAggregation: MetricAggregateOperator.AVG,
+							spaceAggregation: '',
 						},
 					],
 				}),

frontend/src/hooks/queryBuilder/useQueryBuilderOperations.ts

@@ -317,7 +317,7 @@ export const useQueryOperations: UseQueryOperations = ({
 									timeAggregation: MetricAggregateOperator.RATE,
 									metricName: newQuery.aggregateAttribute?.key || '',
 									temporality: '',
-									spaceAggregation: MetricAggregateOperator.SUM,
+									spaceAggregation: '',
 								},
 							];
 						} else if (newQuery.aggregateAttribute?.type === ATTRIBUTE_TYPES.GAUGE) {
@@ -326,20 +326,7 @@ export const useQueryOperations: UseQueryOperations = ({
 									timeAggregation: MetricAggregateOperator.AVG,
 									metricName: newQuery.aggregateAttribute?.key || '',
 									temporality: '',
-									spaceAggregation: MetricAggregateOperator.AVG,
-								},
-							];
-						} else if (
-							newQuery.aggregateAttribute?.type === ATTRIBUTE_TYPES.HISTOGRAM ||
-							newQuery.aggregateAttribute?.type ===
-								ATTRIBUTE_TYPES.EXPONENTIAL_HISTOGRAM
-						) {
-							newQuery.aggregations = [
-								{
-									timeAggregation: '',
-									metricName: newQuery.aggregateAttribute?.key || '',
-									temporality: '',
-									spaceAggregation: MetricAggregateOperator.P90,
+									spaceAggregation: '',
 								},
 							];
 						} else {

frontend/src/hooks/useGetYAxisUnit.test.ts

@@ -1,238 +0,0 @@
-import { renderHook } from '@testing-library/react';
-import { UniversalYAxisUnit } from 'components/YAxisUnitSelector/types';
-import { useGetMetrics } from 'container/MetricsExplorer/Explorer/utils';
-import { MetricMetadata } from 'types/api/metricsExplorer/v2/getMetricMetadata';
-import { Query } from 'types/api/queryBuilder/queryBuilderData';
-import { EQueryType } from 'types/common/dashboard';
-import { DataSource, QueryBuilderContextType } from 'types/common/queryBuilder';
-
-import { useQueryBuilder } from './queryBuilder/useQueryBuilder';
-import useGetYAxisUnit from './useGetYAxisUnit';
-
-jest.mock('./queryBuilder/useQueryBuilder');
-jest.mock('container/MetricsExplorer/Explorer/utils', () => ({
-	...jest.requireActual('container/MetricsExplorer/Explorer/utils'),
-	useGetMetrics: jest.fn(),
-}));
-
-const mockUseQueryBuilder = useQueryBuilder as jest.MockedFunction<
-	typeof useQueryBuilder
->;
-const mockUseGetMetrics = useGetMetrics as jest.MockedFunction<
-	typeof useGetMetrics
->;
-
-const MOCK_METRIC_1 = {
-	unit: UniversalYAxisUnit.BYTES,
-} as MetricMetadata;
-const MOCK_METRIC_2 = {
-	unit: UniversalYAxisUnit.SECONDS,
-} as MetricMetadata;
-const MOCK_METRIC_3 = {
-	unit: '',
-} as MetricMetadata;
-
-function createMockCurrentQuery(
-	queryType: EQueryType,
-	queryData: Query['builder']['queryData'] = [],
-): Query {
-	return {
-		queryType,
-		promql: [],
-		builder: {
-			queryData,
-			queryFormulas: [],
-			queryTraceOperator: [],
-		},
-		clickhouse_sql: [],
-		id: 'test-id',
-	};
-}
-
-describe('useGetYAxisUnit', () => {
-	beforeEach(() => {
-		jest.clearAllMocks();
-		mockUseGetMetrics.mockReturnValue({
-			isLoading: false,
-			isError: false,
-			metrics: [],
-		});
-		mockUseQueryBuilder.mockReturnValue(({
-			currentQuery: undefined,
-		} as Partial<QueryBuilderContextType>) as QueryBuilderContextType);
-	});
-
-	it('should return undefined yAxisUnit and not call useGetMetrics when currentQuery is null', async () => {
-		const { result } = renderHook(() => useGetYAxisUnit());
-
-		expect(result.current.yAxisUnit).toBeUndefined();
-		expect(result.current.isLoading).toBe(false);
-		expect(result.current.isError).toBe(false);
-		expect(mockUseGetMetrics).toHaveBeenCalledWith([], false);
-	});
-
-	it('should return undefined yAxisUnit when queryType is PROM', async () => {
-		const mockCurrentQuery = createMockCurrentQuery(EQueryType.PROM);
-		mockUseQueryBuilder.mockReturnValueOnce(({
-			currentQuery: mockCurrentQuery,
-		} as Partial<QueryBuilderContextType>) as QueryBuilderContextType);
-
-		const { result } = renderHook(() => useGetYAxisUnit());
-
-		expect(result.current.yAxisUnit).toBeUndefined();
-		expect(mockUseGetMetrics).toHaveBeenCalledWith([], false);
-	});
-
-	it('should return undefined yAxisUnit when queryType is CLICKHOUSE', async () => {
-		const mockCurrentQuery = createMockCurrentQuery(EQueryType.CLICKHOUSE);
-		mockUseQueryBuilder.mockReturnValueOnce(({
-			currentQuery: mockCurrentQuery,
-		} as Partial<QueryBuilderContextType>) as QueryBuilderContextType);
-
-		const { result } = renderHook(() => useGetYAxisUnit());
-
-		expect(result.current.yAxisUnit).toBeUndefined();
-		expect(result.current.isLoading).toBe(false);
-		expect(result.current.isError).toBe(false);
-		expect(mockUseGetMetrics).toHaveBeenCalledWith([], false);
-	});
-
-	it('should return undefined yAxisUnit when dataSource is TRACES', async () => {
-		const mockCurrentQuery = createMockCurrentQuery(EQueryType.QUERY_BUILDER, [
-			{
-				dataSource: DataSource.TRACES,
-				aggregateAttribute: { key: 'trace_metric' },
-			} as Query['builder']['queryData'][0],
-		]);
-		mockUseQueryBuilder.mockReturnValueOnce(({
-			currentQuery: mockCurrentQuery,
-		} as Partial<QueryBuilderContextType>) as QueryBuilderContextType);
-
-		const { result } = renderHook(() => useGetYAxisUnit());
-
-		expect(result.current.yAxisUnit).toBeUndefined();
-		expect(result.current.isLoading).toBe(false);
-		expect(result.current.isError).toBe(false);
-		expect(mockUseGetMetrics).toHaveBeenCalledWith([], false);
-	});
-
-	it('should return undefined yAxisUnit when dataSource is LOGS', async () => {
-		const mockCurrentQuery = createMockCurrentQuery(EQueryType.QUERY_BUILDER, [
-			{
-				dataSource: DataSource.LOGS,
-				aggregateAttribute: { key: 'log_metric' },
-			} as Query['builder']['queryData'][number],
-		]);
-		mockUseQueryBuilder.mockReturnValueOnce(({
-			currentQuery: mockCurrentQuery,
-		} as Partial<QueryBuilderContextType>) as QueryBuilderContextType);
-
-		const { result } = renderHook(() => useGetYAxisUnit());
-
-		expect(result.current.yAxisUnit).toBeUndefined();
-		expect(result.current.isLoading).toBe(false);
-		expect(result.current.isError).toBe(false);
-		expect(mockUseGetMetrics).toHaveBeenCalledWith([], false);
-	});
-
-	it('should extract all metric names from queryData when no selected query name is provided', () => {
-		const mockCurrentQuery = createMockCurrentQuery(EQueryType.QUERY_BUILDER, [
-			{
-				dataSource: DataSource.METRICS,
-				aggregateAttribute: { key: 'metric1' },
-				queryName: 'query1',
-			} as Query['builder']['queryData'][number],
-			{
-				dataSource: DataSource.METRICS,
-				aggregateAttribute: { key: 'metric2' },
-				queryName: 'query2',
-			} as Query['builder']['queryData'][number],
-		]);
-
-		mockUseQueryBuilder.mockReturnValueOnce(({
-			stagedQuery: mockCurrentQuery,
-		} as Partial<QueryBuilderContextType>) as QueryBuilderContextType);
-
-		renderHook(() => useGetYAxisUnit());
-
-		expect(mockUseGetMetrics).toHaveBeenCalledWith(['metric1', 'metric2'], true);
-	});
-
-	it('should extract metric name for the selected query only when one is provided', () => {
-		const mockCurrentQuery = createMockCurrentQuery(EQueryType.QUERY_BUILDER, [
-			{
-				dataSource: DataSource.METRICS,
-				aggregateAttribute: { key: 'metric1' },
-				queryName: 'query1',
-			} as Query['builder']['queryData'][number],
-			{
-				dataSource: DataSource.METRICS,
-				aggregateAttribute: { key: 'metric2' },
-				queryName: 'query2',
-			} as Query['builder']['queryData'][number],
-		]);
-		mockUseQueryBuilder.mockReturnValueOnce(({
-			stagedQuery: mockCurrentQuery,
-		} as Partial<QueryBuilderContextType>) as QueryBuilderContextType);
-
-		renderHook(() => useGetYAxisUnit('query2'));
-
-		expect(mockUseGetMetrics).toHaveBeenCalledWith(['metric2'], true);
-	});
-
-	it('should return the unit when there is a single metric with a non-empty unit', async () => {
-		mockUseGetMetrics.mockReturnValue({
-			isLoading: false,
-			isError: false,
-			metrics: [MOCK_METRIC_1],
-		});
-
-		const { result } = renderHook(() => useGetYAxisUnit());
-
-		expect(result.current.yAxisUnit).toBe(UniversalYAxisUnit.BYTES);
-		expect(result.current.isLoading).toBe(false);
-		expect(result.current.isError).toBe(false);
-	});
-
-	it('should return undefined when there is a single metric with no unit', async () => {
-		mockUseGetMetrics.mockReturnValue({
-			isLoading: false,
-			isError: false,
-			metrics: [MOCK_METRIC_3],
-		});
-
-		const { result } = renderHook(() => useGetYAxisUnit());
-
-		expect(result.current.yAxisUnit).toBeUndefined();
-		expect(result.current.isLoading).toBe(false);
-		expect(result.current.isError).toBe(false);
-	});
-
-	it('should return the unit when all metrics have the same non-empty unit', async () => {
-		mockUseGetMetrics.mockReturnValue({
-			isLoading: false,
-			isError: false,
-			metrics: [MOCK_METRIC_1, MOCK_METRIC_1],
-		});
-
-		const { result } = renderHook(() => useGetYAxisUnit());
-
-		expect(result.current.yAxisUnit).toBe(UniversalYAxisUnit.BYTES);
-		expect(result.current.isLoading).toBe(false);
-		expect(result.current.isError).toBe(false);
-	});
-
-	it('should return undefined when metrics have different units', async () => {
-		mockUseGetMetrics.mockReturnValueOnce({
-			isLoading: false,
-			isError: false,
-			metrics: [MOCK_METRIC_1, MOCK_METRIC_2],
-		});
-
-		const { result } = renderHook(() => useGetYAxisUnit());
-
-		expect(result.current.yAxisUnit).toBeUndefined();
-		expect(result.current.isLoading).toBe(false);
-		expect(result.current.isError).toBe(false);
-	});
-});

frontend/src/hooks/useGetYAxisUnit.ts

@@ -1,108 +0,0 @@
-import {
-	getMetricUnits,
-	useGetMetrics,
-} from 'container/MetricsExplorer/Explorer/utils';
-import { useEffect, useMemo, useState } from 'react';
-import { EQueryType } from 'types/common/dashboard';
-import { DataSource } from 'types/common/queryBuilder';
-
-import { useQueryBuilder } from './queryBuilder/useQueryBuilder';
-
-interface UseGetYAxisUnitResult {
-	yAxisUnit: string | undefined;
-	isLoading: boolean;
-	isError: boolean;
-}
-
-/**
- * Hook to get the y-axis unit for a given metrics-based query.
- * @param selectedQueryName - The name of the query to get the y-axis unit for.
- * @param params.enabled - Active state of the hook.
- * @returns `{ yAxisUnit, isLoading, isError }` The y-axis unit, loading state, and error state
- */
-function useGetYAxisUnit(
-	selectedQueryName?: string,
-	params: {
-		enabled?: boolean;
-	} = {
-		enabled: true,
-	},
-): UseGetYAxisUnitResult {
-	const { stagedQuery } = useQueryBuilder();
-	const [yAxisUnit, setYAxisUnit] = useState<string | undefined>();
-
-	const metricNames: string[] | null = useMemo(() => {
-		// If the query type is not QUERY_BUILDER, return null
-		if (stagedQuery?.queryType !== EQueryType.QUERY_BUILDER) {
-			return null;
-		}
-		// If the data source is not METRICS, return null
-		const dataSource = stagedQuery?.builder?.queryData?.[0]?.dataSource;
-		if (dataSource !== DataSource.METRICS) {
-			return null;
-		}
-		const currentMetricNames: string[] = [];
-		// If a selected query name is provided, return the metric name for that query only
-		if (selectedQueryName) {
-			stagedQuery?.builder?.queryData?.forEach((query) => {
-				if (
-					query.queryName === selectedQueryName &&
-					query.aggregateAttribute?.key
-				) {
-					currentMetricNames.push(query.aggregateAttribute?.key);
-				}
-			});
-			return currentMetricNames.length ? currentMetricNames : null;
-		}
-		// Else, return all metric names
-		stagedQuery?.builder?.queryData?.forEach((query) => {
-			if (query.aggregateAttribute?.key) {
-				currentMetricNames.push(query.aggregateAttribute?.key);
-			}
-		});
-		return currentMetricNames.length ? currentMetricNames : null;
-	}, [
-		selectedQueryName,
-		stagedQuery?.builder?.queryData,
-		stagedQuery?.queryType,
-	]);
-
-	const { metrics, isLoading, isError } = useGetMetrics(
-		metricNames ?? [],
-		!!metricNames && params?.enabled,
-	);
-
-	const units = useMemo(() => getMetricUnits(metrics), [metrics]);
-
-	const areAllMetricUnitsSame = useMemo(
-		() => units.every((unit) => unit === units[0]),
-		[units],
-	);
-
-	useEffect(() => {
-		// If there are no metrics, set the y-axis unit to undefined
-		if (units.length === 0) {
-			setYAxisUnit(undefined);
-			// If there is one metric and it has a non-empty unit, set the y-axis unit to it
-		} else if (units.length === 1 && units[0] !== '') {
-			setYAxisUnit(units[0]);
-			// If all metrics have the same non-empty unit, set the y-axis unit to it
-		} else if (areAllMetricUnitsSame) {
-			if (units[0] !== '') {
-				setYAxisUnit(units[0]);
-			} else {
-				setYAxisUnit(undefined);
-			}
-			// If there is more than one metric and they have different units, set the y-axis unit to undefined
-		} else if (units.length > 1 && !areAllMetricUnitsSame) {
-			setYAxisUnit(undefined);
-			// If there is one metric and it has an empty unit, set the y-axis unit to undefined
-		} else if (units.length === 1 && units[0] === '') {
-			setYAxisUnit(undefined);
-		}
-	}, [units, areAllMetricUnitsSame]);
-
-	return { yAxisUnit, isLoading, isError };
-}
-
-export default useGetYAxisUnit;

frontend/src/pages/TraceDetailV2/NoData/NoData.tsx

@@ -15,7 +15,7 @@ function NoData(): JSX.Element {
 				<Typography.Text className="not-found-text-1">
 					Uh-oh! We cannot show the selected trace.
 					<span className="not-found-text-2">
-						This can happen in either of the two scenarios -
+						This can happen in either of the two scenraios -
 					</span>
 				</Typography.Text>
 			</section>

frontend/src/store/index.ts

@@ -20,7 +20,7 @@ const store = createStore(
 
 export type AppDispatch = typeof store.dispatch;
 
-if (window !== undefined && process.env.NODE_ENV === 'development') {
+if (window !== undefined) {
 	window.store = store;
 }
 

frontend/src/types/api/metricsExplorer/v2/getMetricMetadata.ts

@@ -1,15 +0,0 @@
-import { Temporality } from 'api/metricsExplorer/getMetricDetails';
-import { MetricType } from 'api/metricsExplorer/getMetricsList';
-
-export interface MetricMetadata {
-	description: string;
-	type: MetricType;
-	unit: string;
-	temporality: Temporality;
-	isMonotonic: boolean;
-}
-
-export interface MetricMetadataResponse {
-	status: string;
-	data: MetricMetadata;
-}

frontend/webpack.config.prod.js

@@ -170,7 +170,7 @@ const config = {
 	plugins,
 	optimization: {
 		chunkIds: 'named',
-		concatenateModules: true, // Enable module concatenation for better tree-shaking and smaller bundles
+		concatenateModules: false,
 		emitOnErrors: true,
 		flagIncludedChunks: true,
 		innerGraph: true, // tells webpack whether to conduct inner graph analysis for unused exports.
@@ -181,85 +181,6 @@ const config = {
 		runtimeChunk: {
 			name: (entrypoint) => `runtime~${entrypoint.name}`,
 		},
-		splitChunks: {
-			chunks: 'all',
-			maxInitialRequests: 30,
-			minSize: 20000,
-			cacheGroups: {
-				// Vendor libraries - React, React-DOM, Redux, Router
-				vendor: {
-					test: /[\\/]node_modules[\\/](react|react-dom|react-router|react-router-dom|react-redux|redux|@reduxjs)[\\/]/,
-					name: 'vendors-react',
-					priority: 30,
-					reuseExistingChunk: true,
-					enforce: true,
-				},
-				// Ant Design icons (separate from core - icons are huge)
-				antdIcons: {
-					test: /[\\/]node_modules[\\/](@ant-design\/icons)[\\/]/,
-					name: 'vendors-antd-icons',
-					priority: 25,
-					reuseExistingChunk: true,
-					enforce: true,
-				},
-				// Ant Design core (without icons) - matches antd and @ant-design but not @ant-design/icons
-				antd: {
-					test: /[\\/]node_modules[\\/](antd|@ant-design(?!\/icons))[\\/]/,
-					name: 'vendors-antd',
-					priority: 20,
-					reuseExistingChunk: true,
-					enforce: true,
-				},
-				// SigNoz UI components
-				signozhq: {
-					test: /[\\/]node_modules[\\/](@signozhq)[\\/]/,
-					name: 'vendors-signozhq',
-					priority: 19,
-					reuseExistingChunk: true,
-					enforce: true,
-				},
-				// Chart libraries
-				charts: {
-					test: /[\\/]node_modules[\\/](uplot|chart\.js|@visx|@tanstack\/react-table|@tanstack\/react-virtual)[\\/]/,
-					name: 'vendors-charts',
-					priority: 18,
-					reuseExistingChunk: true,
-					enforce: true,
-				},
-				// React Query
-				reactQuery: {
-					test: /[\\/]node_modules[\\/](react-query|@tanstack\/react-query)[\\/]/,
-					name: 'vendors-react-query',
-					priority: 17,
-					reuseExistingChunk: true,
-					enforce: true,
-				},
-				// Large utility libraries
-				utilities: {
-					test: /[\\/]node_modules[\\/](lodash-es|@dnd-kit|dayjs|axios|i18next)[\\/]/,
-					name: 'vendors-utilities',
-					priority: 15,
-					reuseExistingChunk: true,
-					enforce: true,
-				},
-				// Monaco editor (very large)
-				monaco: {
-					test: /[\\/]node_modules[\\/](@monaco-editor|monaco-editor)[\\/]/,
-					name: 'vendors-monaco',
-					priority: 16,
-					reuseExistingChunk: true,
-					enforce: true,
-				},
-				// Other vendor libraries
-				common: {
-					test: /[\\/]node_modules[\\/]/,
-					name: 'vendors-common',
-					priority: 10,
-					minChunks: 2,
-					reuseExistingChunk: true,
-				},
-			},
-		},
 		minimizer: [
 			new TerserPlugin({
 				parallel: true,

pkg/apiserver/signozapiserver/promote.go

@@ -1,43 +0,0 @@
-package signozapiserver
-
-import (
-	"net/http"
-
-	"github.com/SigNoz/signoz/pkg/http/handler"
-	"github.com/SigNoz/signoz/pkg/types/promotetypes"
-	"github.com/gorilla/mux"
-)
-
-func (provider *provider) addPromoteRoutes(router *mux.Router) error {
-	if err := router.Handle("/api/v1/logs/promote_paths", handler.New(provider.authZ.EditAccess(provider.promoteHandler.HandlePromoteAndIndexPaths), handler.OpenAPIDef{
-		ID:                  "HandlePromoteAndIndexPaths",
-		Tags:                []string{"logs"},
-		Summary:             "Promote and index paths",
-		Description:         "This endpoints promotes and indexes paths",
-		Request:             new([]*promotetypes.PromotePath),
-		RequestContentType:  "application/json",
-		Response:            nil,
-		ResponseContentType: "",
-		SuccessStatusCode:   http.StatusCreated,
-		ErrorStatusCodes:    []int{http.StatusBadRequest},
-	})).Methods(http.MethodPost).GetError(); err != nil {
-		return err
-	}
-
-	if err := router.Handle("/api/v1/logs/promote_paths", handler.New(provider.authZ.ViewAccess(provider.promoteHandler.ListPromotedAndIndexedPaths), handler.OpenAPIDef{
-		ID:                  "ListPromotedAndIndexedPaths",
-		Tags:                []string{"logs"},
-		Summary:             "Promote and index paths",
-		Description:         "This endpoints promotes and indexes paths",
-		Request:             nil,
-		RequestContentType:  "",
-		Response:            new([]*promotetypes.PromotePath),
-		ResponseContentType: "",
-		SuccessStatusCode:   http.StatusOK,
-		ErrorStatusCodes:    []int{http.StatusBadRequest},
-	})).Methods(http.MethodGet).GetError(); err != nil {
-		return err
-	}
-
-	return nil
-}

pkg/apiserver/signozapiserver/provider.go

@@ -12,7 +12,6 @@ import (
 	"github.com/SigNoz/signoz/pkg/modules/authdomain"
 	"github.com/SigNoz/signoz/pkg/modules/organization"
 	"github.com/SigNoz/signoz/pkg/modules/preference"
-	"github.com/SigNoz/signoz/pkg/modules/promote"
 	"github.com/SigNoz/signoz/pkg/modules/session"
 	"github.com/SigNoz/signoz/pkg/modules/user"
 	"github.com/SigNoz/signoz/pkg/types"
@@ -31,7 +30,6 @@ type provider struct {
 	authDomainHandler authdomain.Handler
 	preferenceHandler preference.Handler
 	globalHandler     global.Handler
-	promoteHandler    promote.Handler
 }
 
 func NewFactory(
@@ -43,10 +41,9 @@ func NewFactory(
 	authDomainHandler authdomain.Handler,
 	preferenceHandler preference.Handler,
 	globalHandler global.Handler,
-	promoteHandler promote.Handler,
 ) factory.ProviderFactory[apiserver.APIServer, apiserver.Config] {
 	return factory.NewProviderFactory(factory.MustNewName("signoz"), func(ctx context.Context, providerSettings factory.ProviderSettings, config apiserver.Config) (apiserver.APIServer, error) {
-		return newProvider(ctx, providerSettings, config, orgGetter, authz, orgHandler, userHandler, sessionHandler, authDomainHandler, preferenceHandler, globalHandler, promoteHandler)
+		return newProvider(ctx, providerSettings, config, orgGetter, authz, orgHandler, userHandler, sessionHandler, authDomainHandler, preferenceHandler, globalHandler)
 	})
 }
 
@@ -62,7 +59,6 @@ func newProvider(
 	authDomainHandler authdomain.Handler,
 	preferenceHandler preference.Handler,
 	globalHandler global.Handler,
-	promoteHandler promote.Handler,
 ) (apiserver.APIServer, error) {
 	settings := factory.NewScopedProviderSettings(providerSettings, "github.com/SigNoz/signoz/pkg/apiserver/signozapiserver")
 	router := mux.NewRouter().UseEncodedPath()
@@ -77,7 +73,6 @@ func newProvider(
 		authDomainHandler: authDomainHandler,
 		preferenceHandler: preferenceHandler,
 		globalHandler:     globalHandler,
-		promoteHandler:    promoteHandler,
 	}
 
 	provider.authZ = middleware.NewAuthZ(settings.Logger(), orgGetter, authz)
@@ -118,10 +113,6 @@ func (provider *provider) AddToRouter(router *mux.Router) error {
 		return err
 	}
 
-	if err := provider.addPromoteRoutes(router); err != nil {
-		return err
-	}
-
 	return nil
 }
 

pkg/errors/errors.go

@@ -209,11 +209,6 @@ func NewUnexpectedf(code Code, format string, args ...any) *base {
 	return Newf(TypeInvalidInput, code, format, args...)
 }
 
-// NewMethodNotAllowedf is a wrapper around Newf with TypeMethodNotAllowed.
-func NewMethodNotAllowedf(code Code, format string, args ...any) *base {
-	return Newf(TypeMethodNotAllowed, code, format, args...)
-}
-
 // WrapTimeoutf is a wrapper around Wrapf with TypeTimeout.
 func WrapTimeoutf(cause error, code Code, format string, args ...any) *base {
 	return Wrapf(cause, TypeTimeout, code, format, args...)

pkg/modules/promote/implpromote/handler.go

@@ -1,60 +0,0 @@
-package implpromote
-
-import (
-	"net/http"
-
-	"github.com/SigNoz/signoz/pkg/errors"
-	"github.com/SigNoz/signoz/pkg/http/binding"
-	"github.com/SigNoz/signoz/pkg/http/render"
-	"github.com/SigNoz/signoz/pkg/modules/promote"
-	"github.com/SigNoz/signoz/pkg/types/authtypes"
-	"github.com/SigNoz/signoz/pkg/types/promotetypes"
-)
-
-type handler struct {
-	module promote.Module
-}
-
-func NewHandler(module promote.Module) promote.Handler {
-	return &handler{module: module}
-}
-
-func (h *handler) HandlePromoteAndIndexPaths(w http.ResponseWriter, r *http.Request) {
-	// TODO(Nitya): Use in multi tenant setup
-	_, err := authtypes.ClaimsFromContext(r.Context())
-	if err != nil {
-		render.Error(w, errors.NewInternalf(errors.CodeInternal, "failed to get org id from context"))
-		return
-	}
-
-	var req []*promotetypes.PromotePath
-	if err := binding.JSON.BindBody(r.Body, &req); err != nil {
-		render.Error(w, err)
-		return
-	}
-
-	err = h.module.PromoteAndIndexPaths(r.Context(), req...)
-	if err != nil {
-		render.Error(w, err)
-		return
-	}
-
-	render.Success(w, http.StatusCreated, nil)
-}
-
-func (h *handler) ListPromotedAndIndexedPaths(w http.ResponseWriter, r *http.Request) {
-	// TODO(Nitya): Use in multi tenant setup
-	_, err := authtypes.ClaimsFromContext(r.Context())
-	if err != nil {
-		render.Error(w, errors.NewInternalf(errors.CodeInternal, "failed to get org id from context"))
-		return
-	}
-
-	paths, err := h.module.ListPromotedAndIndexedPaths(r.Context())
-	if err != nil {
-		render.Error(w, err)
-		return
-	}
-
-	render.Success(w, http.StatusOK, paths)
-}

pkg/modules/promote/implpromote/module.go

@@ -1,201 +0,0 @@
-package implpromote
-
-import (
-	"context"
-	"maps"
-	"slices"
-	"strings"
-
-	schemamigrator "github.com/SigNoz/signoz-otel-collector/cmd/signozschemamigrator/schema_migrator"
-	"github.com/SigNoz/signoz/pkg/errors"
-	"github.com/SigNoz/signoz/pkg/modules/promote"
-	"github.com/SigNoz/signoz/pkg/telemetrylogs"
-	"github.com/SigNoz/signoz/pkg/telemetrystore"
-	"github.com/SigNoz/signoz/pkg/types/promotetypes"
-	"github.com/SigNoz/signoz/pkg/types/telemetrytypes"
-)
-
-var (
-	CodeFailedToCreateIndex        = errors.MustNewCode("failed_to_create_index_promoted_paths")
-	CodeFailedToQueryPromotedPaths = errors.MustNewCode("failed_to_query_promoted_paths")
-)
-
-type module struct {
-	metadataStore  telemetrytypes.MetadataStore
-	telemetryStore telemetrystore.TelemetryStore
-}
-
-func NewModule(metadataStore telemetrytypes.MetadataStore, telemetrystore telemetrystore.TelemetryStore) promote.Module {
-	return &module{metadataStore: metadataStore, telemetryStore: telemetrystore}
-}
-
-func (m *module) ListPromotedAndIndexedPaths(ctx context.Context) ([]promotetypes.PromotePath, error) {
-	logsIndexes, err := m.metadataStore.ListLogsJSONIndexes(ctx)
-	if err != nil {
-		return nil, err
-	}
-	// Flatten the map values (which are slices) into a single slice
-	indexes := slices.Concat(slices.Collect(maps.Values(logsIndexes))...)
-
-	aggr := map[string][]promotetypes.WrappedIndex{}
-	for _, index := range indexes {
-		path, columnType, err := schemamigrator.UnfoldJSONSubColumnIndexExpr(index.Expression)
-		if err != nil {
-			return nil, err
-		}
-
-		// clean backticks from the path
-		path = strings.ReplaceAll(path, "`", "")
-
-		aggr[path] = append(aggr[path], promotetypes.WrappedIndex{
-			ColumnType:  columnType,
-			Type:        index.Type,
-			Granularity: index.Granularity,
-		})
-	}
-	promotedPaths, err := m.listPromotedPaths(ctx)
-	if err != nil {
-		return nil, err
-	}
-
-	response := []promotetypes.PromotePath{}
-	for _, path := range promotedPaths {
-		fullPath := telemetrylogs.BodyPromotedColumnPrefix + path
-		path = telemetrylogs.BodyJSONStringSearchPrefix + path
-		item := promotetypes.PromotePath{
-			Path:    path,
-			Promote: true,
-		}
-		indexes, ok := aggr[fullPath]
-		if ok {
-			item.Indexes = indexes
-			delete(aggr, fullPath)
-		}
-		response = append(response, item)
-	}
-
-	// add the paths that are not promoted but have indexes
-	for path, indexes := range aggr {
-		path := strings.TrimPrefix(path, telemetrylogs.BodyJSONColumnPrefix)
-		path = telemetrylogs.BodyJSONStringSearchPrefix + path
-		response = append(response, promotetypes.PromotePath{
-			Path:    path,
-			Indexes: indexes,
-		})
-	}
-	return response, nil
-}
-
-func (m *module) listPromotedPaths(ctx context.Context) ([]string, error) {
-	paths, err := m.metadataStore.ListPromotedPaths(ctx)
-	if err != nil {
-		return nil, err
-	}
-	return slices.Collect(maps.Keys(paths)), nil
-}
-
-// PromotePaths inserts provided JSON paths into the promoted paths table for logs queries.
-func (m *module) PromotePaths(ctx context.Context, paths []string) error {
-	if len(paths) == 0 {
-		return errors.NewInvalidInputf(errors.CodeInvalidInput, "paths cannot be empty")
-	}
-
-	return m.metadataStore.PromotePaths(ctx, paths...)
-}
-
-// createIndexes creates string ngram + token filter indexes on JSON path subcolumns for LIKE queries.
-func (m *module) createIndexes(ctx context.Context, indexes []schemamigrator.Index) error {
-	if len(indexes) == 0 {
-		return nil
-	}
-
-	for _, index := range indexes {
-		alterStmt := schemamigrator.AlterTableAddIndex{
-			Database: telemetrylogs.DBName,
-			Table:    telemetrylogs.LogsV2LocalTableName,
-			Index:    index,
-		}
-		op := alterStmt.OnCluster(m.telemetryStore.Cluster())
-		if err := m.telemetryStore.ClickhouseDB().Exec(ctx, op.ToSQL()); err != nil {
-			return errors.WrapInternalf(err, CodeFailedToCreateIndex, "failed to create index")
-		}
-	}
-
-	return nil
-}
-
-// PromoteAndIndexPaths handles promoting paths and creating indexes in one call.
-func (m *module) PromoteAndIndexPaths(
-	ctx context.Context,
-	paths ...*promotetypes.PromotePath,
-) error {
-	if len(paths) == 0 {
-		return errors.NewInvalidInputf(errors.CodeInvalidInput, "paths cannot be empty")
-	}
-
-	pathsStr := []string{}
-	// validate the paths
-	for _, path := range paths {
-		if err := path.ValidateAndSetDefaults(); err != nil {
-			return err
-		}
-		pathsStr = append(pathsStr, path.Path)
-	}
-
-	existingPromotedPaths, err := m.metadataStore.ListPromotedPaths(ctx, pathsStr...)
-	if err != nil {
-		return err
-	}
-
-	var toInsert []string
-	indexes := []schemamigrator.Index{}
-	for _, it := range paths {
-		if it.Promote {
-			if _, promoted := existingPromotedPaths[it.Path]; !promoted {
-				toInsert = append(toInsert, it.Path)
-			}
-		}
-		if len(it.Indexes) > 0 {
-			parentColumn := telemetrylogs.LogsV2BodyJSONColumn
-			// if the path is already promoted or is being promoted, add it to the promoted column
-			if _, promoted := existingPromotedPaths[it.Path]; promoted || it.Promote {
-				parentColumn = telemetrylogs.LogsV2BodyPromotedColumn
-			}
-
-			for _, index := range it.Indexes {
-				var typeIndex schemamigrator.IndexType
-				switch {
-				case strings.HasPrefix(index.Type, string(schemamigrator.IndexTypeNGramBF)):
-					typeIndex = schemamigrator.IndexTypeNGramBF
-				case strings.HasPrefix(index.Type, string(schemamigrator.IndexTypeTokenBF)):
-					typeIndex = schemamigrator.IndexTypeTokenBF
-				case strings.HasPrefix(index.Type, string(schemamigrator.IndexTypeMinMax)):
-					typeIndex = schemamigrator.IndexTypeMinMax
-				default:
-					return errors.NewInvalidInputf(errors.CodeInvalidInput, "invalid index type: %s", index.Type)
-				}
-				indexes = append(indexes, schemamigrator.Index{
-					Name:        schemamigrator.JSONSubColumnIndexName(parentColumn, it.Path, index.JSONDataType.StringValue(), typeIndex),
-					Expression:  schemamigrator.JSONSubColumnIndexExpr(parentColumn, it.Path, index.JSONDataType.StringValue()),
-					Type:        index.Type,
-					Granularity: index.Granularity,
-				})
-			}
-		}
-	}
-
-	if len(toInsert) > 0 {
-		err := m.PromotePaths(ctx, toInsert)
-		if err != nil {
-			return err
-		}
-	}
-
-	if len(indexes) > 0 {
-		if err := m.createIndexes(ctx, indexes); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}

pkg/modules/promote/promote.go

@@ -1,18 +0,0 @@
-package promote
-
-import (
-	"context"
-	"net/http"
-
-	"github.com/SigNoz/signoz/pkg/types/promotetypes"
-)
-
-type Module interface {
-	ListPromotedAndIndexedPaths(ctx context.Context) ([]promotetypes.PromotePath, error)
-	PromoteAndIndexPaths(ctx context.Context, paths ...*promotetypes.PromotePath) error
-}
-
-type Handler interface {
-	HandlePromoteAndIndexPaths(w http.ResponseWriter, r *http.Request)
-	ListPromotedAndIndexedPaths(w http.ResponseWriter, r *http.Request)
-}

pkg/query-service/app/clickhouseReader/reader.go

@@ -43,7 +43,6 @@ import (
 	"github.com/SigNoz/signoz/pkg/query-service/app/traces/tracedetail"
 	"github.com/SigNoz/signoz/pkg/query-service/common"
 	"github.com/SigNoz/signoz/pkg/query-service/constants"
-
 	chErrors "github.com/SigNoz/signoz/pkg/query-service/errors"
 	"github.com/SigNoz/signoz/pkg/query-service/metrics"
 	"github.com/SigNoz/signoz/pkg/query-service/model"
@@ -96,6 +95,7 @@ const (
 	signozLocalTableAttributesMetadata = "attributes_metadata"
 
 	signozUpdatedMetricsMetadataLocalTable = "updated_metadata"
+	signozMetricsMetadataLocalTable        = "metadata"
 	signozUpdatedMetricsMetadataTable      = "distributed_updated_metadata"
 	minTimespanForProgressiveSearch        = time.Hour
 	minTimespanForProgressiveSearchMargin  = time.Minute
@@ -6440,6 +6440,73 @@ func (r *ClickHouseReader) GetUpdatedMetricsMetadata(ctx context.Context, orgID
 	return cachedMetadata, nil
 }
 
+// GetFirstSeenFromMetricMetadata queries the metadata table to get the first_seen timestamp
+// for each metric-attribute-value combination.
+// Returns a map where key is `model.MetricMetadataLookupKey` and value is first_seen in milliseconds.
+func (r *ClickHouseReader) GetFirstSeenFromMetricMetadata(ctx context.Context, lookupKeys []model.MetricMetadataLookupKey) (map[model.MetricMetadataLookupKey]int64, error) {
+	// Chunk the lookup keys to avoid overly large queries (max 300 tuples per query)
+	const chunkSize = 300
+	result := make(map[model.MetricMetadataLookupKey]int64)
+
+	for i := 0; i < len(lookupKeys); i += chunkSize {
+		end := i + chunkSize
+		if end > len(lookupKeys) {
+			end = len(lookupKeys)
+		}
+		chunk := lookupKeys[i:end]
+
+		// Build the IN clause values - ClickHouse uses tuple syntax with placeholders
+		var valueStrings []string
+		var args []interface{}
+
+		for _, key := range chunk {
+			valueStrings = append(valueStrings, "(?, ?, ?)")
+			args = append(args, key.MetricName, key.AttributeName, key.AttributeValue)
+		}
+
+		query := fmt.Sprintf(`
+			SELECT 
+				m.metric_name,
+				m.attr_name,
+				m.attr_string_value,
+				min(m.last_reported_unix_milli) AS first_seen
+			FROM %s.%s AS m
+			WHERE (m.metric_name, m.attr_name, m.attr_string_value) IN (%s)
+			GROUP BY m.metric_name, m.attr_name, m.attr_string_value
+			ORDER BY first_seen`,
+			signozMetricDBName, signozMetricsMetadataLocalTable, strings.Join(valueStrings, ", "))
+
+		valueCtx := context.WithValue(ctx, "clickhouse_max_threads", constants.MetricsExplorerClickhouseThreads)
+		rows, err := r.db.Query(valueCtx, query, args...)
+		if err != nil {
+			zap.L().Error("Error querying metadata for first_seen", zap.Error(err))
+			return nil, &model.ApiError{Typ: "ClickhouseErr", Err: fmt.Errorf("error querying metadata for first_seen: %v", err)}
+		}
+
+		for rows.Next() {
+			var metricName, attrName, attrValue string
+			var firstSeen uint64
+			if err := rows.Scan(&metricName, &attrName, &attrValue, &firstSeen); err != nil {
+				rows.Close()
+				return nil, &model.ApiError{Typ: "ClickhouseErr", Err: fmt.Errorf("error scanning metadata first_seen result: %v", err)}
+			}
+			result[model.MetricMetadataLookupKey{
+				MetricName:     metricName,
+				AttributeName:  attrName,
+				AttributeValue: attrValue,
+			}] = int64(firstSeen)
+		}
+
+		if err := rows.Err(); err != nil {
+			rows.Close()
+			return nil, &model.ApiError{Typ: "ClickhouseErr", Err: fmt.Errorf("error iterating metadata first_seen results: %v", err)}
+		}
+		rows.Close()
+	}
+
+	return result, nil
+}
+
 func (r *ClickHouseReader) SearchTraces(ctx context.Context, params *model.SearchTracesParams) (*[]model.SearchSpansResult, error) {
 	searchSpansResult := []model.SearchSpansResult{
 		{

pkg/query-service/app/http_handler.go

@@ -555,7 +555,6 @@ func (aH *APIHandler) RegisterRoutes(router *mux.Router, am *middleware.AuthZ) {
 	router.HandleFunc("/api/v1/settings/ttl", am.ViewAccess(aH.getTTL)).Methods(http.MethodGet)
 	router.HandleFunc("/api/v2/settings/ttl", am.AdminAccess(aH.setCustomRetentionTTL)).Methods(http.MethodPost)
 	router.HandleFunc("/api/v2/settings/ttl", am.ViewAccess(aH.getCustomRetentionTTL)).Methods(http.MethodGet)
-
 	router.HandleFunc("/api/v1/settings/apdex", am.AdminAccess(aH.Signoz.Handlers.Apdex.Set)).Methods(http.MethodPost)
 	router.HandleFunc("/api/v1/settings/apdex", am.ViewAccess(aH.Signoz.Handlers.Apdex.Get)).Methods(http.MethodGet)
 

pkg/query-service/app/inframetrics/hosts.go

@@ -520,7 +520,7 @@ func (h *HostsRepo) GetHostList(ctx context.Context, orgID valuer.UUID, req mode
 			if _, ok := hostAttrs[record.HostName]; ok {
 				record.Meta = hostAttrs[record.HostName]
 			}
-			if osType, ok := record.Meta[GetDotMetrics("os_type")]; ok {
+			if osType, ok := record.Meta["os_type"]; ok {
 				record.OS = osType
 			}
 			record.Active = activeHosts[record.HostName]

pkg/query-service/app/logs/v4/query_builder_test.go

@@ -5,7 +5,6 @@ import (
 
 	"github.com/SigNoz/signoz/pkg/query-service/constants"
 	v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3"
-	"github.com/stretchr/testify/assert"
 )
 
 func Test_getClickhouseKey(t *testing.T) {
@@ -1211,8 +1210,9 @@ func TestPrepareLogsQuery(t *testing.T) {
 				t.Errorf("PrepareLogsQuery() error = %v, wantErr %v", err, tt.wantErr)
 				return
 			}
-
-			assert.Equal(t, tt.want, got)
+			if got != tt.want {
+				t.Errorf("PrepareLogsQuery() = %v, want %v", got, tt.want)
+			}
 		})
 	}
 }

pkg/query-service/app/server.go

@@ -361,6 +361,7 @@ func makeRulesManager(
 		RuleStore:        ruleStore,
 		MaintenanceStore: maintenanceStore,
 		SqlStore:         sqlstore,
+		QueryParser:      queryParser,
 	}
 
 	// create Manager

pkg/query-service/converter/converter.go

@@ -1,8 +1,17 @@
 package converter
 
+import "github.com/SigNoz/signoz/pkg/errors"
+
 // Unit represents a unit of measurement
 type Unit string
 
+func (u Unit) Validate() error {
+	if !IsValidUnit(u) {
+		return errors.NewInvalidInputf(errors.CodeInvalidInput, "invalid unit: %s", u)
+	}
+	return nil
+}
+
 // Value represents a value with a unit of measurement
 type Value struct {
 	F float64
@@ -60,6 +69,27 @@ func FromUnit(u Unit) Converter {
 	}
 }
 
+// IsValidUnit returns true if the given unit is valid
+func IsValidUnit(u Unit) bool {
+	switch u {
+	// Duration unit
+	case "ns", "us", "µs", "ms", "s", "m", "h", "d", "min",
+		// Data unit
+		"bytes", "decbytes", "bits", "decbits", "kbytes", "decKbytes", "deckbytes", "mbytes", "decMbytes", "decmbytes", "gbytes", "decGbytes", "decgbytes", "tbytes", "decTbytes", "dectbytes", "pbytes", "decPbytes", "decpbytes", "By", "kBy", "MBy", "GBy", "TBy", "PBy",
+		// Data rate unit
+		"binBps", "Bps", "binbps", "bps", "KiBs", "Kibits", "KBs", "Kbits", "MiBs", "Mibits", "MBs", "Mbits", "GiBs", "Gibits", "GBs", "Gbits", "TiBs", "Tibits", "TBs", "Tbits", "PiBs", "Pibits", "PBs", "Pbits", "By/s", "kBy/s", "MBy/s", "GBy/s", "TBy/s", "PBy/s", "bit/s", "kbit/s", "Mbit/s", "Gbit/s", "Tbit/s", "Pbit/s",
+		// Percent unit
+		"percent", "percentunit", "%",
+		// Bool unit
+		"bool", "bool_yes_no", "bool_true_false", "bool_1_0",
+		// Throughput unit
+		"cps", "ops", "reqps", "rps", "wps", "iops", "cpm", "opm", "rpm", "wpm", "{count}/s", "{ops}/s", "{req}/s", "{read}/s", "{write}/s", "{iops}/s", "{count}/min", "{ops}/min", "{read}/min", "{write}/min":
+		return true
+	default:
+		return false
+	}
+}
+
 func UnitToName(u string) string {
 	switch u {
 	case "ns":

pkg/query-service/interfaces/interface.go

@@ -81,6 +81,7 @@ type Reader interface {
 	CheckClickHouse(ctx context.Context) error
 
 	GetMetricMetadata(context.Context, valuer.UUID, string, string) (*v3.MetricMetadataResponse, error)
+	GetFirstSeenFromMetricMetadata(ctx context.Context, lookupKeys []model.MetricMetadataLookupKey) (map[model.MetricMetadataLookupKey]int64, error)
 
 	AddRuleStateHistory(ctx context.Context, ruleStateHistory []model.RuleStateHistory) error
 	GetOverallStateTransitions(ctx context.Context, ruleID string, params *model.QueryRuleStateHistory) ([]model.ReleStateItem, error)

pkg/query-service/model/queryParams.go

@@ -516,3 +516,9 @@ type LogsAggregateParams struct {
 	Function       string `json:"function"`
 	StepSeconds    int    `json:"step"`
 }
+
+type MetricMetadataLookupKey struct {
+	MetricName     string
+	AttributeName  string
+	AttributeValue string
+}

pkg/query-service/model/v3/v3.go

@@ -9,6 +9,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/SigNoz/signoz/pkg/query-service/converter"
 	"github.com/SigNoz/signoz/pkg/valuer"
 	"github.com/pkg/errors"
 	"go.uber.org/zap"
@@ -640,6 +641,13 @@ func (c *CompositeQuery) Validate() error {
 		return fmt.Errorf("query type is invalid: %w", err)
 	}
 
+	// Validate Unit - if provided (non-empty), it should be a valid unit string
+	if c.Unit != "" {
+		if err := converter.Unit(c.Unit).Validate(); err != nil {
+			return err
+		}
+	}
+
 	return nil
 }
 

pkg/query-service/rules/base_rule.go

@@ -13,7 +13,9 @@ import (
 	"github.com/SigNoz/signoz/pkg/query-service/model"
 	v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3"
 	qslabels "github.com/SigNoz/signoz/pkg/query-service/utils/labels"
+	"github.com/SigNoz/signoz/pkg/queryparser"
 	"github.com/SigNoz/signoz/pkg/sqlstore"
+	qbtypes "github.com/SigNoz/signoz/pkg/types/querybuildertypes/querybuildertypesv5"
 	ruletypes "github.com/SigNoz/signoz/pkg/types/ruletypes"
 	"github.com/SigNoz/signoz/pkg/valuer"
 	"go.uber.org/zap"
@@ -88,6 +90,11 @@ type BaseRule struct {
 	sqlstore sqlstore.SQLStore
 
 	evaluation ruletypes.Evaluation
+
+	// newGroupEvalDelay is the grace period for new alert groups
+	newGroupEvalDelay *time.Duration
+
+	queryParser queryparser.QueryParser
 }
 
 type RuleOption func(*BaseRule)
@@ -122,6 +129,12 @@ func WithSQLStore(sqlstore sqlstore.SQLStore) RuleOption {
 	}
 }
 
+func WithQueryParser(queryParser queryparser.QueryParser) RuleOption {
+	return func(r *BaseRule) {
+		r.queryParser = queryParser
+	}
+}
+
 func NewBaseRule(id string, orgID valuer.UUID, p *ruletypes.PostableRule, reader interfaces.Reader, opts ...RuleOption) (*BaseRule, error) {
 	if p.RuleCondition == nil || !p.RuleCondition.IsValid() {
 		return nil, fmt.Errorf("invalid rule condition")
@@ -154,6 +167,12 @@ func NewBaseRule(id string, orgID valuer.UUID, p *ruletypes.PostableRule, reader
 		evaluation:        evaluation,
 	}
 
+	// Store newGroupEvalDelay and groupBy keys from NotificationSettings
+	if p.NotificationSettings != nil && p.NotificationSettings.NewGroupEvalDelay != nil {
+		newGroupEvalDelay := time.Duration(*p.NotificationSettings.NewGroupEvalDelay)
+		baseRule.newGroupEvalDelay = &newGroupEvalDelay
+	}
+
 	if baseRule.evalWindow == 0 {
 		baseRule.evalWindow = 5 * time.Minute
 	}
@@ -528,3 +547,166 @@ func (r *BaseRule) PopulateTemporality(ctx context.Context, orgID valuer.UUID, q
 	}
 	return nil
 }
+
+// ShouldSkipNewGroups returns true if new group filtering should be applied
+func (r *BaseRule) ShouldSkipNewGroups() bool {
+	return r.newGroupEvalDelay != nil && *r.newGroupEvalDelay > 0
+}
+
+// isFilterNewSeriesSupported checks if the query is supported for new series filtering
+func (r *BaseRule) isFilterNewSeriesSupported() bool {
+	if r.ruleCondition.CompositeQuery.QueryType == v3.QueryTypeBuilder {
+		for _, query := range r.ruleCondition.CompositeQuery.Queries {
+			if query.Type != qbtypes.QueryTypeBuilder {
+				continue
+			}
+			switch query.Spec.(type) {
+			// query spec is for Logs or Traces, return with blank metric names and group by fields
+			case qbtypes.QueryBuilderQuery[qbtypes.LogAggregation], qbtypes.QueryBuilderQuery[qbtypes.TraceAggregation]:
+				return false
+			}
+		}
+	}
+	return true
+}
+
+// extractMetricAndGroupBys extracts metric names and groupBy keys from the rule's query.
+// TODO: implement caching for query parsing results to avoid re-parsing the query + cache invalidation
+func (r *BaseRule) extractMetricAndGroupBys(ctx context.Context) ([]string, []string, error) {
+	var metricNames []string
+	var groupedFields []string
+
+	// check to avoid processing the query for Logs and Traces
+	// as excluding new series is not supported for Logs and Traces for now
+	if !r.isFilterNewSeriesSupported() {
+		return metricNames, groupedFields, nil
+	}
+
+	result, err := r.queryParser.AnalyzeCompositeQuery(ctx, r.ruleCondition.CompositeQuery)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	metricNames = result.MetricNames
+	for _, col := range result.GroupByColumns {
+		groupedFields = append(groupedFields, col.OriginField)
+	}
+
+	return metricNames, groupedFields, nil
+}
+
+// FilterNewSeriesIndexes filters out items that are too new based on metadata first_seen timestamps.
+// Returns the indexes that should be skipped (not included in the result).
+func (r *BaseRule) FilterNewSeries(ctx context.Context, ts time.Time, series []v3.Series) ([]int, error) {
+	// Extract metric names and groupBy keys
+	metricNames, groupedFields, err := r.extractMetricAndGroupBys(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	if len(metricNames) == 0 || len(groupedFields) == 0 {
+		// No metrics or groupBy keys, nothing to filter (non-ideal case, return early)
+		return []int{}, nil
+	}
+
+	// Build lookup keys from series which will be used to query metadata from CH
+	lookupKeys := make([]model.MetricMetadataLookupKey, 0)
+	seriesIdxToLookupKeys := make(map[int][]model.MetricMetadataLookupKey) // series index -> lookup keys
+
+	for i := 0; i < len(series); i++ {
+		metricLabelMap := series[i].Labels
+
+		// Collect groupBy attribute-value pairs for this series
+		seriesKeys := make([]model.MetricMetadataLookupKey, 0)
+
+		for _, metricName := range metricNames {
+			for _, groupByKey := range groupedFields {
+				if attrValue, ok := metricLabelMap[groupByKey]; ok {
+					lookupKey := model.MetricMetadataLookupKey{
+						MetricName:     metricName,
+						AttributeName:  groupByKey,
+						AttributeValue: attrValue,
+					}
+					lookupKeys = append(lookupKeys, lookupKey)
+					seriesKeys = append(seriesKeys, lookupKey)
+				}
+			}
+		}
+
+		if len(seriesKeys) > 0 {
+			seriesIdxToLookupKeys[i] = seriesKeys
+		}
+	}
+
+	if len(lookupKeys) == 0 {
+		// No lookup keys to query, return empty skip list
+		// this can happen when the series has no labels at all
+		// in this case, we include all series as we don't know if it is new or old series
+		return []int{}, nil
+	}
+
+	// unique lookup keys
+	uniqueLookupKeysMap := make(map[model.MetricMetadataLookupKey]struct{})
+	uniqueLookupKeys := make([]model.MetricMetadataLookupKey, 0)
+	for _, key := range lookupKeys {
+		if _, ok := uniqueLookupKeysMap[key]; !ok {
+			uniqueLookupKeysMap[key] = struct{}{}
+			uniqueLookupKeys = append(uniqueLookupKeys, key)
+		}
+	}
+	// Query metadata for first_seen timestamps
+	firstSeenMap, err := r.reader.GetFirstSeenFromMetricMetadata(ctx, uniqueLookupKeys)
+	if err != nil {
+		return nil, err
+	}
+
+	// Filter series based on first_seen + delay
+	skipIndexes := make([]int, 0)
+	evalTimeMs := ts.UnixMilli()
+	newGroupEvalDelayMs := r.newGroupEvalDelay.Milliseconds()
+
+	for i := 0; i < len(series); i++ {
+		seriesKeys, ok := seriesIdxToLookupKeys[i]
+		if !ok {
+			// No matching labels used in groupBy from this series, don't exclude it
+			// as we can't decide if it is new or old series
+			continue
+		}
+
+		// Find the maximum first_seen across all groupBy attributes for this series
+		// if the latest is old enough we're good, if latest is new we need to skip it
+		maxFirstSeen := int64(0)
+		// metadataFound tracks if we have metadata for any of the lookup keys
+		metadataFound := false
+
+		for _, lookupKey := range seriesKeys {
+			if firstSeen, exists := firstSeenMap[lookupKey]; exists {
+				metadataFound = true
+				if firstSeen > maxFirstSeen {
+					maxFirstSeen = firstSeen
+				}
+			}
+		}
+
+		// if we don't have metadata for any of the lookup keys, we can't decide if it is new or old series
+		// in that case, we don't add it to the skip indexes
+		if !metadataFound {
+			continue
+		}
+
+		// Check if first_seen + delay has passed
+		if maxFirstSeen+newGroupEvalDelayMs > evalTimeMs {
+			// Still within grace period, skip this series
+			skipIndexes = append(skipIndexes, i)
+			continue
+		}
+
+		// Old enough, don't skip this series
+	}
+
+	if r.logger != nil && len(skipIndexes) > 0 {
+		r.logger.InfoContext(ctx, "Filtered new series", "rule_name", r.Name(), "skipped_count", len(skipIndexes), "total_count", len(series), "delay_ms", newGroupEvalDelayMs)
+	}
+
+	return skipIndexes, nil
+}

pkg/query-service/rules/base_rule_test.go

@@ -1,12 +1,31 @@
 package rules
 
 import (
+	"context"
+	"fmt"
 	"testing"
+	"time"
 
 	"github.com/stretchr/testify/require"
 
+	"github.com/SigNoz/signoz/pkg/cache"
+	"github.com/SigNoz/signoz/pkg/cache/cachetest"
+	"github.com/SigNoz/signoz/pkg/instrumentation/instrumentationtest"
+	"github.com/SigNoz/signoz/pkg/prometheus"
+	"github.com/SigNoz/signoz/pkg/prometheus/prometheustest"
+	"github.com/SigNoz/signoz/pkg/query-service/app/clickhouseReader"
+	"github.com/SigNoz/signoz/pkg/query-service/model"
 	v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3"
+	"github.com/SigNoz/signoz/pkg/queryparser"
+	"github.com/SigNoz/signoz/pkg/telemetrystore"
+	"github.com/SigNoz/signoz/pkg/telemetrystore/telemetrystoretest"
+	"github.com/SigNoz/signoz/pkg/types/metrictypes"
+	qbtypes "github.com/SigNoz/signoz/pkg/types/querybuildertypes/querybuildertypesv5"
 	ruletypes "github.com/SigNoz/signoz/pkg/types/ruletypes"
+	"github.com/SigNoz/signoz/pkg/types/telemetrytypes"
+	"github.com/SigNoz/signoz/pkg/valuer"
+
+	cmock "github.com/srikanthccv/ClickHouse-go-mock"
 )
 
 func TestBaseRule_RequireMinPoints(t *testing.T) {
@@ -81,3 +100,704 @@ func TestBaseRule_RequireMinPoints(t *testing.T) {
 		})
 	}
 }
+
+// createTestSeries creates a v3.Series with the given labels and optional points
+// so we don't exactly need the points in the series because the labels are used to determine if the series is new or old
+// we use the labels to create a lookup key for the series and then check the first_seen timestamp for the series in the metadata table
+func createTestSeries(labels map[string]string, points []v3.Point) v3.Series {
+	if points == nil {
+		points = []v3.Point{}
+	}
+	return v3.Series{
+		Labels: labels,
+		Points: points,
+	}
+}
+
+// calculateFirstSeen calculates first_seen timestamp based on evalTime, delay, and isOld flag
+func calculateFirstSeen(evalTime time.Time, delay time.Duration, isOld bool) int64 {
+	if isOld {
+		// Old: evalTime - (2 * delay)
+		return evalTime.Add(-2 * delay).UnixMilli()
+	}
+	// New: evalTime - (delay / 2)
+	return evalTime.Add(-delay / 2).UnixMilli()
+}
+
+// createFirstSeenMap creates a first_seen map for a series with given attributes
+// metricName: the metric name
+// groupByFields: list of groupBy field names
+// evalTime: evaluation time
+// delay: newGroupEvalDelay
+// isOld: whether the series is old (true) or new (false)
+// attributeValues: values for each groupBy field in order
+func createFirstSeenMap(metricName string, groupByFields []string, evalTime time.Time, delay time.Duration, isOld bool, attributeValues ...string) map[model.MetricMetadataLookupKey]int64 {
+	result := make(map[model.MetricMetadataLookupKey]int64)
+	firstSeen := calculateFirstSeen(evalTime, delay, isOld)
+
+	for i, field := range groupByFields {
+		if i < len(attributeValues) {
+			key := model.MetricMetadataLookupKey{
+				MetricName:     metricName,
+				AttributeName:  field,
+				AttributeValue: attributeValues[i],
+			}
+			result[key] = firstSeen
+		}
+	}
+
+	return result
+}
+
+// mergeFirstSeenMaps merges multiple first_seen maps into one
+// When the same key exists in multiple maps, it keeps the lowest value
+// which simulatest the behavior of the ClickHouse query
+// finding the minimum first_seen timestamp across all groupBy attributes for a single series
+func mergeFirstSeenMaps(maps ...map[model.MetricMetadataLookupKey]int64) map[model.MetricMetadataLookupKey]int64 {
+	result := make(map[model.MetricMetadataLookupKey]int64)
+	for _, m := range maps {
+		for k, v := range m {
+			if existingValue, exists := result[k]; exists {
+				// Keep the lowest value
+				if v < existingValue {
+					result[k] = v
+				}
+			} else {
+				result[k] = v
+			}
+		}
+	}
+	return result
+}
+
+// createPostableRule creates a PostableRule with the given CompositeQuery
+func createPostableRule(compositeQuery *v3.CompositeQuery) ruletypes.PostableRule {
+	return ruletypes.PostableRule{
+		AlertName: "Test Rule",
+		AlertType: ruletypes.AlertTypeMetric,
+		RuleType:  ruletypes.RuleTypeThreshold,
+		Evaluation: &ruletypes.EvaluationEnvelope{
+			Kind: ruletypes.RollingEvaluation,
+			Spec: ruletypes.RollingWindow{
+				EvalWindow: ruletypes.Duration(5 * time.Minute),
+				Frequency:  ruletypes.Duration(1 * time.Minute),
+			},
+		},
+		RuleCondition: &ruletypes.RuleCondition{
+			CompositeQuery: compositeQuery,
+			Thresholds: &ruletypes.RuleThresholdData{
+				Kind: ruletypes.BasicThresholdKind,
+				Spec: ruletypes.BasicRuleThresholds{
+					{
+						Name:        "test-threshold",
+						TargetValue: func() *float64 { v := 1.0; return &v }(),
+						CompareOp:   ruletypes.ValueIsAbove,
+						MatchType:   ruletypes.AtleastOnce,
+					},
+				},
+			},
+		},
+	}
+}
+
+// setupMetadataQueryMock sets up the ClickHouse mock for GetFirstSeenFromMetricMetadata query
+func setupMetadataQueryMock(telemetryStore *telemetrystoretest.Provider, metricNames []string, groupedFields []string, series []v3.Series, firstSeenMap map[model.MetricMetadataLookupKey]int64) {
+	if len(firstSeenMap) == 0 || len(series) == 0 {
+		return
+	}
+
+	// Build args from series the same way we build lookup keys in FilterNewSeries
+	var args []any
+	uniqueArgsMap := make(map[string]struct{})
+	for _, s := range series {
+		labelMap := s.Labels
+		for _, metricName := range metricNames {
+			for _, groupByKey := range groupedFields {
+				if attrValue, ok := labelMap[groupByKey]; ok {
+					argKey := fmt.Sprintf("%s,%s,%s", metricName, groupByKey, attrValue)
+					if _, ok := uniqueArgsMap[argKey]; ok {
+						continue
+					}
+					uniqueArgsMap[argKey] = struct{}{}
+					args = append(args, metricName, groupByKey, attrValue)
+				}
+			}
+		}
+	}
+
+	// Build the query pattern - it uses IN clause with tuples
+	// We'll match any query that contains the metadata table pattern
+	metadataCols := []cmock.ColumnType{
+		{Name: "metric_name", Type: "String"},
+		{Name: "attr_name", Type: "String"},
+		{Name: "attr_string_value", Type: "String"},
+		{Name: "first_seen", Type: "UInt64"},
+	}
+
+	var values [][]interface{}
+	for key, firstSeen := range firstSeenMap {
+		values = append(values, []interface{}{
+			key.MetricName,
+			key.AttributeName,
+			key.AttributeValue,
+			uint64(firstSeen),
+		})
+	}
+
+	rows := cmock.NewRows(metadataCols, values)
+	telemetryStore.Mock().
+		ExpectQuery("SELECT any").
+		WithArgs(args...).
+		WillReturnRows(rows)
+}
+
+// filterNewSeriesTestCase represents a test case for FilterNewSeries
+type filterNewSeriesTestCase struct {
+	name                string
+	compositeQuery      *v3.CompositeQuery
+	series              []v3.Series
+	firstSeenMap        map[model.MetricMetadataLookupKey]int64
+	newGroupEvalDelay   *time.Duration
+	evalTime            time.Time
+	expectedSkipIndexes []int
+	expectError         bool
+}
+
+func TestBaseRule_FilterNewSeries(t *testing.T) {
+	defaultEvalTime := time.Unix(1700000000, 0)
+	defaultDelay := 2 * time.Minute
+	defaultGroupByFields := []string{"service_name", "env"}
+
+	logger := instrumentationtest.New().Logger()
+	settings := instrumentationtest.New().ToProviderSettings()
+
+	tests := []filterNewSeriesTestCase{
+		{
+			name: "mixed old and new series - Builder query",
+			compositeQuery: &v3.CompositeQuery{
+				QueryType: v3.QueryTypeBuilder,
+				Queries: []qbtypes.QueryEnvelope{
+					{
+						Type: qbtypes.QueryTypeBuilder,
+						Spec: qbtypes.QueryBuilderQuery[qbtypes.MetricAggregation]{
+							Name:         "A",
+							StepInterval: qbtypes.Step{Duration: 60 * time.Second},
+							Signal:       telemetrytypes.SignalMetrics,
+							Aggregations: []qbtypes.MetricAggregation{
+								{
+									MetricName:       "request_total",
+									TimeAggregation:  metrictypes.TimeAggregationCount,
+									SpaceAggregation: metrictypes.SpaceAggregationSum,
+								},
+							},
+							GroupBy: []qbtypes.GroupByKey{
+								{TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: "service_name"}},
+								{TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: "env"}},
+							},
+						},
+					},
+				},
+			},
+			series: []v3.Series{
+				createTestSeries(map[string]string{"service_name": "svc-old", "env": "prod"}, nil),
+				createTestSeries(map[string]string{"service_name": "svc-new", "env": "prod"}, nil),
+				createTestSeries(map[string]string{"service_name": "svc-missing", "env": "stage"}, nil),
+			},
+			firstSeenMap: mergeFirstSeenMaps(
+				createFirstSeenMap("request_total", defaultGroupByFields, defaultEvalTime, defaultDelay, true, "svc-old", "prod"),
+				createFirstSeenMap("request_total", defaultGroupByFields, defaultEvalTime, defaultDelay, false, "svc-new", "prod"),
+				// svc-missing has no metadata, so it will be skipped
+			),
+			newGroupEvalDelay:   &defaultDelay,
+			evalTime:            defaultEvalTime,
+			expectedSkipIndexes: []int{1}, // svc-missing should be skipped as we can't decide if it is new or old series
+		},
+		{
+			name: "all new series - PromQL query",
+			compositeQuery: &v3.CompositeQuery{
+				QueryType: v3.QueryTypePromQL,
+				Queries: []qbtypes.QueryEnvelope{
+					{
+						Type: qbtypes.QueryTypePromQL,
+						Spec: qbtypes.PromQuery{
+							Name:     "P1",
+							Query:    "sum by (service_name,env) (rate(request_total[5m]))",
+							Disabled: false,
+							Step:     qbtypes.Step{Duration: 0},
+							Stats:    false,
+						},
+					},
+				},
+			},
+			series: []v3.Series{
+				createTestSeries(map[string]string{"service_name": "svc-new1", "env": "prod"}, nil),
+				createTestSeries(map[string]string{"service_name": "svc-new2", "env": "stage"}, nil),
+			},
+			firstSeenMap: mergeFirstSeenMaps(
+				createFirstSeenMap("request_total", defaultGroupByFields, defaultEvalTime, defaultDelay, false, "svc-new1", "prod"),
+				createFirstSeenMap("request_total", defaultGroupByFields, defaultEvalTime, defaultDelay, false, "svc-new2", "stage"),
+			),
+			newGroupEvalDelay:   &defaultDelay,
+			evalTime:            defaultEvalTime,
+			expectedSkipIndexes: []int{0, 1}, // all should be skipped
+		},
+		{
+			name: "all old series - ClickHouse query",
+			compositeQuery: &v3.CompositeQuery{
+				QueryType: v3.QueryTypeClickHouseSQL,
+				Queries: []qbtypes.QueryEnvelope{
+					{
+						Type: qbtypes.QueryTypeClickHouseSQL,
+						Spec: qbtypes.ClickHouseQuery{
+							Name:     "CH1",
+							Query:    "SELECT service_name, env FROM metrics WHERE metric_name='request_total' GROUP BY service_name, env",
+							Disabled: false,
+						},
+					},
+				},
+			},
+			series: []v3.Series{
+				createTestSeries(map[string]string{"service_name": "svc-old1", "env": "prod"}, nil),
+				createTestSeries(map[string]string{"service_name": "svc-old2", "env": "stage"}, nil),
+			},
+			firstSeenMap: mergeFirstSeenMaps(
+				createFirstSeenMap("request_total", defaultGroupByFields, defaultEvalTime, defaultDelay, true, "svc-old1", "prod"),
+				createFirstSeenMap("request_total", defaultGroupByFields, defaultEvalTime, defaultDelay, true, "svc-old2", "stage"),
+			),
+			newGroupEvalDelay:   &defaultDelay,
+			evalTime:            defaultEvalTime,
+			expectedSkipIndexes: []int{}, // none should be skipped
+		},
+		{
+			name: "no grouping in query - Builder",
+			compositeQuery: &v3.CompositeQuery{
+				QueryType: v3.QueryTypeBuilder,
+				Queries: []qbtypes.QueryEnvelope{
+					{
+						Type: qbtypes.QueryTypeBuilder,
+						Spec: qbtypes.QueryBuilderQuery[qbtypes.MetricAggregation]{
+							Name:         "A",
+							StepInterval: qbtypes.Step{Duration: 60 * time.Second},
+							Signal:       telemetrytypes.SignalMetrics,
+							Aggregations: []qbtypes.MetricAggregation{
+								{
+									MetricName:       "request_total",
+									TimeAggregation:  metrictypes.TimeAggregationCount,
+									SpaceAggregation: metrictypes.SpaceAggregationSum,
+								},
+							},
+							GroupBy: []qbtypes.GroupByKey{},
+						},
+					},
+				},
+			},
+			series: []v3.Series{
+				createTestSeries(map[string]string{"service_name": "svc1", "env": "prod"}, nil),
+			},
+			firstSeenMap:        make(map[model.MetricMetadataLookupKey]int64),
+			newGroupEvalDelay:   &defaultDelay,
+			evalTime:            defaultEvalTime,
+			expectedSkipIndexes: []int{}, // early return, no filtering
+		},
+		{
+			name: "no metric names - Builder",
+			compositeQuery: &v3.CompositeQuery{
+				QueryType: v3.QueryTypeBuilder,
+				Queries: []qbtypes.QueryEnvelope{
+					{
+						Type: qbtypes.QueryTypeBuilder,
+						Spec: qbtypes.QueryBuilderQuery[qbtypes.MetricAggregation]{
+							Name:         "A",
+							StepInterval: qbtypes.Step{Duration: 60 * time.Second},
+							Signal:       telemetrytypes.SignalMetrics,
+							Aggregations: []qbtypes.MetricAggregation{},
+							GroupBy: []qbtypes.GroupByKey{
+								{TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: "service_name"}},
+								{TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: "env"}},
+							},
+						},
+					},
+				},
+			},
+			series: []v3.Series{
+				createTestSeries(map[string]string{"service_name": "svc1", "env": "prod"}, nil),
+			},
+			firstSeenMap:        make(map[model.MetricMetadataLookupKey]int64),
+			newGroupEvalDelay:   &defaultDelay,
+			evalTime:            defaultEvalTime,
+			expectedSkipIndexes: []int{}, // early return, no filtering
+		},
+		{
+			name: "series with no matching labels - Builder",
+			compositeQuery: &v3.CompositeQuery{
+				QueryType: v3.QueryTypeBuilder,
+				Queries: []qbtypes.QueryEnvelope{
+					{
+						Type: qbtypes.QueryTypeBuilder,
+						Spec: qbtypes.QueryBuilderQuery[qbtypes.MetricAggregation]{
+							Name:         "A",
+							StepInterval: qbtypes.Step{Duration: 60 * time.Second},
+							Signal:       telemetrytypes.SignalMetrics,
+							Aggregations: []qbtypes.MetricAggregation{
+								{
+									MetricName:       "request_total",
+									TimeAggregation:  metrictypes.TimeAggregationCount,
+									SpaceAggregation: metrictypes.SpaceAggregationSum,
+								},
+							},
+							GroupBy: []qbtypes.GroupByKey{
+								{TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: "service_name"}},
+								{TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: "env"}},
+							},
+						},
+					},
+				},
+			},
+			series: []v3.Series{
+				createTestSeries(map[string]string{"status": "200"}, nil), // no service_name or env
+			},
+			firstSeenMap:        make(map[model.MetricMetadataLookupKey]int64),
+			newGroupEvalDelay:   &defaultDelay,
+			evalTime:            defaultEvalTime,
+			expectedSkipIndexes: []int{}, // series included as we can't decide if it's new or old
+		},
+		{
+			name: "series with missing metadata - PromQL",
+			compositeQuery: &v3.CompositeQuery{
+				QueryType: v3.QueryTypePromQL,
+				Queries: []qbtypes.QueryEnvelope{
+					{
+						Type: qbtypes.QueryTypePromQL,
+						Spec: qbtypes.PromQuery{
+							Name:     "P1",
+							Query:    "sum by (service_name,env) (rate(request_total[5m]))",
+							Disabled: false,
+							Step:     qbtypes.Step{Duration: 0},
+							Stats:    false,
+						},
+					},
+				},
+			},
+			series: []v3.Series{
+				createTestSeries(map[string]string{"service_name": "svc-old", "env": "prod"}, nil),
+				createTestSeries(map[string]string{"service_name": "svc-no-metadata", "env": "prod"}, nil),
+			},
+			firstSeenMap: createFirstSeenMap("request_total", defaultGroupByFields, defaultEvalTime, defaultDelay, true, "svc-old", "prod"),
+			// svc-no-metadata has no entry in firstSeenMap
+			newGroupEvalDelay:   &defaultDelay,
+			evalTime:            defaultEvalTime,
+			expectedSkipIndexes: []int{}, // svc-no-metadata should not be skipped as we can't decide if it is new or old series
+		},
+		{
+			name: "series with partial metadata - ClickHouse",
+			compositeQuery: &v3.CompositeQuery{
+				QueryType: v3.QueryTypeClickHouseSQL,
+				Queries: []qbtypes.QueryEnvelope{
+					{
+						Type: qbtypes.QueryTypeClickHouseSQL,
+						Spec: qbtypes.ClickHouseQuery{
+							Name:     "CH1",
+							Query:    "SELECT service_name, env FROM metrics WHERE metric_name='request_total' GROUP BY service_name, env",
+							Disabled: false,
+						},
+					},
+				},
+			},
+			series: []v3.Series{
+				createTestSeries(map[string]string{"service_name": "svc-partial", "env": "prod"}, nil),
+			},
+			// Only provide metadata for service_name, not env
+			firstSeenMap: map[model.MetricMetadataLookupKey]int64{
+				{MetricName: "request_total", AttributeName: "service_name", AttributeValue: "svc-partial"}: calculateFirstSeen(defaultEvalTime, defaultDelay, true),
+				// env metadata is missing
+			},
+			newGroupEvalDelay:   &defaultDelay,
+			evalTime:            defaultEvalTime,
+			expectedSkipIndexes: []int{}, // has some metadata, uses max first_seen which is old
+		},
+		{
+			name: "empty series array - Builder",
+			compositeQuery: &v3.CompositeQuery{
+				QueryType: v3.QueryTypeBuilder,
+				Queries: []qbtypes.QueryEnvelope{
+					{
+						Type: qbtypes.QueryTypeBuilder,
+						Spec: qbtypes.QueryBuilderQuery[qbtypes.MetricAggregation]{
+							Name:         "A",
+							StepInterval: qbtypes.Step{Duration: 60 * time.Second},
+							Signal:       telemetrytypes.SignalMetrics,
+							Aggregations: []qbtypes.MetricAggregation{
+								{
+									MetricName:       "request_total",
+									TimeAggregation:  metrictypes.TimeAggregationCount,
+									SpaceAggregation: metrictypes.SpaceAggregationSum,
+								},
+							},
+							GroupBy: []qbtypes.GroupByKey{
+								{TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: "service_name"}},
+								{TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: "env"}},
+							},
+						},
+					},
+				},
+			},
+			series:              []v3.Series{},
+			firstSeenMap:        make(map[model.MetricMetadataLookupKey]int64),
+			newGroupEvalDelay:   &defaultDelay,
+			evalTime:            defaultEvalTime,
+			expectedSkipIndexes: []int{},
+		},
+		{
+			name: "zero delay - Builder",
+			compositeQuery: &v3.CompositeQuery{
+				QueryType: v3.QueryTypeBuilder,
+				Queries: []qbtypes.QueryEnvelope{
+					{
+						Type: qbtypes.QueryTypeBuilder,
+						Spec: qbtypes.QueryBuilderQuery[qbtypes.MetricAggregation]{
+							Name:         "A",
+							StepInterval: qbtypes.Step{Duration: 60 * time.Second},
+							Signal:       telemetrytypes.SignalMetrics,
+							Aggregations: []qbtypes.MetricAggregation{
+								{
+									MetricName:       "request_total",
+									TimeAggregation:  metrictypes.TimeAggregationCount,
+									SpaceAggregation: metrictypes.SpaceAggregationSum,
+								},
+							},
+							GroupBy: []qbtypes.GroupByKey{
+								{TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: "service_name"}},
+								{TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: "env"}},
+							},
+						},
+					},
+				},
+			},
+			series: []v3.Series{
+				createTestSeries(map[string]string{"service_name": "svc1", "env": "prod"}, nil),
+			},
+			firstSeenMap:        createFirstSeenMap("request_total", defaultGroupByFields, defaultEvalTime, defaultDelay, true, "svc1", "prod"),
+			newGroupEvalDelay:   func() *time.Duration { d := time.Duration(0); return &d }(), // zero delay
+			evalTime:            defaultEvalTime,
+			expectedSkipIndexes: []int{}, // with zero delay, all series pass
+		},
+		{
+			name: "multiple metrics with same groupBy keys - Builder",
+			compositeQuery: &v3.CompositeQuery{
+				QueryType: v3.QueryTypeBuilder,
+				Queries: []qbtypes.QueryEnvelope{
+					{
+						Type: qbtypes.QueryTypeBuilder,
+						Spec: qbtypes.QueryBuilderQuery[qbtypes.MetricAggregation]{
+							Name:         "A",
+							StepInterval: qbtypes.Step{Duration: 60 * time.Second},
+							Signal:       telemetrytypes.SignalMetrics,
+							Aggregations: []qbtypes.MetricAggregation{
+								{
+									MetricName:       "request_total",
+									TimeAggregation:  metrictypes.TimeAggregationCount,
+									SpaceAggregation: metrictypes.SpaceAggregationSum,
+								},
+								{
+									MetricName:       "error_total",
+									TimeAggregation:  metrictypes.TimeAggregationCount,
+									SpaceAggregation: metrictypes.SpaceAggregationSum,
+								},
+							},
+							GroupBy: []qbtypes.GroupByKey{
+								{TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: "service_name"}},
+								{TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: "env"}},
+							},
+						},
+					},
+				},
+			},
+			series: []v3.Series{
+				createTestSeries(map[string]string{"service_name": "svc1", "env": "prod"}, nil),
+			},
+			firstSeenMap: mergeFirstSeenMaps(
+				createFirstSeenMap("request_total", defaultGroupByFields, defaultEvalTime, defaultDelay, true, "svc1", "prod"),
+				createFirstSeenMap("error_total", defaultGroupByFields, defaultEvalTime, defaultDelay, true, "svc1", "prod"),
+			),
+			newGroupEvalDelay:   &defaultDelay,
+			evalTime:            defaultEvalTime,
+			expectedSkipIndexes: []int{},
+		},
+		{
+			name: "series with multiple groupBy attributes where one is new and one is old - Builder",
+			compositeQuery: &v3.CompositeQuery{
+				QueryType: v3.QueryTypeBuilder,
+				Queries: []qbtypes.QueryEnvelope{
+					{
+						Type: qbtypes.QueryTypeBuilder,
+						Spec: qbtypes.QueryBuilderQuery[qbtypes.MetricAggregation]{
+							Name:         "A",
+							StepInterval: qbtypes.Step{Duration: 60 * time.Second},
+							Signal:       telemetrytypes.SignalMetrics,
+							Aggregations: []qbtypes.MetricAggregation{
+								{
+									MetricName:       "request_total",
+									TimeAggregation:  metrictypes.TimeAggregationCount,
+									SpaceAggregation: metrictypes.SpaceAggregationSum,
+								},
+							},
+							GroupBy: []qbtypes.GroupByKey{
+								{TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: "service_name"}},
+								{TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: "env"}},
+							},
+						},
+					},
+				},
+			},
+			series: []v3.Series{
+				createTestSeries(map[string]string{"service_name": "svc1", "env": "prod"}, nil),
+			},
+			// service_name is old, env is new - should use max (new)
+			firstSeenMap: mergeFirstSeenMaps(
+				createFirstSeenMap("request_total", []string{"service_name"}, defaultEvalTime, defaultDelay, true, "svc1"),
+				createFirstSeenMap("request_total", []string{"env"}, defaultEvalTime, defaultDelay, false, "prod"),
+			),
+			newGroupEvalDelay:   &defaultDelay,
+			evalTime:            defaultEvalTime,
+			expectedSkipIndexes: []int{0}, // max first_seen is new, so should skip
+		},
+		{
+			name: "Logs query - should skip filtering and return empty skip indexes",
+			compositeQuery: &v3.CompositeQuery{
+				QueryType: v3.QueryTypeBuilder,
+				Queries: []qbtypes.QueryEnvelope{
+					{
+						Type: qbtypes.QueryTypeBuilder,
+						Spec: qbtypes.QueryBuilderQuery[qbtypes.LogAggregation]{
+							Name:         "A",
+							StepInterval: qbtypes.Step{Duration: 60 * time.Second},
+							Signal:       telemetrytypes.SignalLogs,
+							Aggregations: []qbtypes.LogAggregation{
+								{
+									Expression: "count()",
+								},
+							},
+							GroupBy: []qbtypes.GroupByKey{
+								{TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: "service_name"}},
+							},
+						},
+					},
+				},
+			},
+			series: []v3.Series{
+				createTestSeries(map[string]string{"service_name": "svc1"}, nil),
+				createTestSeries(map[string]string{"service_name": "svc2"}, nil),
+			},
+			firstSeenMap:        make(map[model.MetricMetadataLookupKey]int64),
+			newGroupEvalDelay:   &defaultDelay,
+			evalTime:            defaultEvalTime,
+			expectedSkipIndexes: []int{}, // Logs queries should return early, no filtering
+		},
+		{
+			name: "Traces query - should skip filtering and return empty skip indexes",
+			compositeQuery: &v3.CompositeQuery{
+				QueryType: v3.QueryTypeBuilder,
+				Queries: []qbtypes.QueryEnvelope{
+					{
+						Type: qbtypes.QueryTypeBuilder,
+						Spec: qbtypes.QueryBuilderQuery[qbtypes.TraceAggregation]{
+							Name:         "A",
+							StepInterval: qbtypes.Step{Duration: 60 * time.Second},
+							Signal:       telemetrytypes.SignalTraces,
+							Aggregations: []qbtypes.TraceAggregation{
+								{
+									Expression: "count()",
+								},
+							},
+							GroupBy: []qbtypes.GroupByKey{
+								{TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: "service_name"}},
+							},
+						},
+					},
+				},
+			},
+			series: []v3.Series{
+				createTestSeries(map[string]string{"service_name": "svc1"}, nil),
+				createTestSeries(map[string]string{"service_name": "svc2"}, nil),
+			},
+			firstSeenMap:        make(map[model.MetricMetadataLookupKey]int64),
+			newGroupEvalDelay:   &defaultDelay,
+			evalTime:            defaultEvalTime,
+			expectedSkipIndexes: []int{}, // Traces queries should return early, no filtering
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			// Create postableRule from compositeQuery
+			postableRule := createPostableRule(tt.compositeQuery)
+
+			// Setup telemetry store mock
+			telemetryStore := telemetrystoretest.New(telemetrystore.Config{}, &queryMatcherAny{})
+
+			// Create query parser
+			queryParser := queryparser.New(settings)
+
+			// Use query parser to extract metric names and groupBy fields
+			analyzeResult, err := queryParser.AnalyzeCompositeQuery(context.Background(), tt.compositeQuery)
+			require.NoError(t, err)
+
+			metricNames := analyzeResult.MetricNames
+			groupedFields := []string{}
+			for _, col := range analyzeResult.GroupByColumns {
+				groupedFields = append(groupedFields, col.OriginField)
+			}
+
+			// Setup metadata query mock
+			setupMetadataQueryMock(telemetryStore, metricNames, groupedFields, tt.series, tt.firstSeenMap)
+
+			// Create reader with mocked telemetry store
+			readerCache, err := cachetest.New(
+				cache.Config{
+					Provider: "memory",
+					Memory: cache.Memory{
+						NumCounters: 10 * 1000,
+						MaxCost:     1 << 26,
+					},
+				},
+			)
+			require.NoError(t, err)
+
+			options := clickhouseReader.NewOptions("", "", "archiveNamespace")
+			reader := clickhouseReader.NewReader(
+				nil,
+				telemetryStore,
+				prometheustest.New(context.Background(), settings, prometheus.Config{}, telemetryStore),
+				"",
+				time.Duration(time.Second),
+				nil,
+				readerCache,
+				options,
+			)
+
+			// Set newGroupEvalDelay in NotificationSettings if provided
+			if tt.newGroupEvalDelay != nil {
+				postableRule.NotificationSettings = &ruletypes.NotificationSettings{
+					NewGroupEvalDelay: func() *ruletypes.Duration {
+						d := ruletypes.Duration(*tt.newGroupEvalDelay)
+						return &d
+					}(),
+				}
+			}
+
+			// Create BaseRule using NewBaseRule
+			rule, err := NewBaseRule("test-rule", valuer.GenerateUUID(), &postableRule, reader, WithQueryParser(queryParser), WithLogger(logger))
+			require.NoError(t, err)
+
+			skipIndexes, err := rule.FilterNewSeries(context.Background(), tt.evalTime, tt.series)
+
+			if tt.expectError {
+				require.Error(t, err)
+				return
+			}
+
+			require.NoError(t, err)
+			require.ElementsMatch(t, tt.expectedSkipIndexes, skipIndexes, "skip indexes should match")
+		})
+	}
+}

pkg/query-service/rules/manager.go

@@ -11,6 +11,7 @@ import (
 	"time"
 
 	"github.com/SigNoz/signoz/pkg/query-service/utils/labels"
+	"github.com/SigNoz/signoz/pkg/queryparser"
 
 	"go.uber.org/zap"
 
@@ -103,6 +104,7 @@ type ManagerOptions struct {
 	RuleStore           ruletypes.RuleStore
 	MaintenanceStore    ruletypes.MaintenanceStore
 	SqlStore            sqlstore.SQLStore
+	QueryParser         queryparser.QueryParser
 }
 
 // The Manager manages recording and alerting rules.
@@ -125,6 +127,8 @@ type Manager struct {
 	alertmanager alertmanager.Alertmanager
 	sqlstore     sqlstore.SQLStore
 	orgGetter    organization.Getter
+	// queryParser is used for parsing queries for rules
+	queryParser queryparser.QueryParser
 }
 
 func defaultOptions(o *ManagerOptions) *ManagerOptions {
@@ -166,6 +170,7 @@ func defaultPrepareTaskFunc(opts PrepareTaskOptions) (Task, error) {
 			opts.SLogger,
 			WithEvalDelay(opts.ManagerOpts.EvalDelay),
 			WithSQLStore(opts.SQLStore),
+			WithQueryParser(opts.ManagerOpts.QueryParser),
 		)
 
 		if err != nil {
@@ -188,6 +193,7 @@ func defaultPrepareTaskFunc(opts PrepareTaskOptions) (Task, error) {
 			opts.Reader,
 			opts.ManagerOpts.Prometheus,
 			WithSQLStore(opts.SQLStore),
+			WithQueryParser(opts.ManagerOpts.QueryParser),
 		)
 
 		if err != nil {
@@ -226,6 +232,7 @@ func NewManager(o *ManagerOptions) (*Manager, error) {
 		alertmanager:        o.Alertmanager,
 		orgGetter:           o.OrgGetter,
 		sqlstore:            o.SqlStore,
+		queryParser:         o.QueryParser,
 	}
 
 	zap.L().Debug("Manager created successfully with NotificationGroup")

pkg/query-service/rules/prom_rule.go

@@ -119,6 +119,42 @@ func (r *PromRule) getPqlQuery() (string, error) {
 	return "", fmt.Errorf("invalid promql rule query")
 }
 
+// filterNewSeries filters out new series based on the first_seen timestamp.
+func (r *PromRule) filterNewSeries(ctx context.Context, ts time.Time, res promql.Matrix) (promql.Matrix, error) {
+	// Convert promql.Matrix to []v3.Series
+	v3Series := make([]v3.Series, 0, len(res))
+	for _, series := range res {
+		v3Series = append(v3Series, toCommonSeries(series))
+	}
+
+	// Get indexes to skip
+	skipIndexes, filterErr := r.BaseRule.FilterNewSeries(ctx, ts, v3Series)
+	if filterErr != nil {
+		r.logger.ErrorContext(ctx, "Error filtering new series, ", "error", filterErr, "rule_name", r.Name())
+		return nil, filterErr
+	}
+
+	// if no series are skipped, return the original matrix
+	if len(skipIndexes) == 0 {
+		return res, nil
+	}
+
+	// Create a map of skip indexes for efficient lookup
+	skippedIdxMap := make(map[int]struct{}, len(skipIndexes))
+	for _, idx := range skipIndexes {
+		skippedIdxMap[idx] = struct{}{}
+	}
+
+	// Filter out skipped series from promql.Matrix
+	filteredMatrix := make(promql.Matrix, 0, len(res)-len(skipIndexes))
+	for i, series := range res {
+		if _, shouldSkip := skippedIdxMap[i]; !shouldSkip {
+			filteredMatrix = append(filteredMatrix, series)
+		}
+	}
+	return filteredMatrix, nil
+}
+
 func (r *PromRule) buildAndRunQuery(ctx context.Context, ts time.Time) (ruletypes.Vector, error) {
 	start, end := r.Timestamps(ts)
 	interval := 60 * time.Second // TODO(srikanthccv): this should be configurable
@@ -135,8 +171,19 @@ func (r *PromRule) buildAndRunQuery(ctx context.Context, ts time.Time) (ruletype
 		return nil, err
 	}
 
+	matrixToProcess := res
+	// Filter out new series if newGroupEvalDelay is configured
+	if r.ShouldSkipNewGroups() {
+		filteredSeries, filterErr := r.filterNewSeries(ctx, ts, matrixToProcess)
+		if filterErr != nil {
+			r.logger.ErrorContext(ctx, "Error filtering new series, ", "error", filterErr, "rule_name", r.Name())
+			return nil, filterErr
+		}
+		matrixToProcess = filteredSeries
+	}
+
 	var resultVector ruletypes.Vector
-	for _, series := range res {
+	for _, series := range matrixToProcess {
 		resultSeries, err := r.Threshold.Eval(toCommonSeries(series), r.Unit(), ruletypes.EvalData{
 			ActiveAlerts: r.ActiveAlertsLabelFP(),
 		})

pkg/query-service/rules/test_notification.go

@@ -52,6 +52,7 @@ func defaultTestNotification(opts PrepareTestRuleOptions) (int, *model.ApiError)
 			WithSendAlways(),
 			WithSendUnmatched(),
 			WithSQLStore(opts.SQLStore),
+			WithQueryParser(opts.ManagerOpts.QueryParser),
 		)
 
 		if err != nil {
@@ -72,6 +73,7 @@ func defaultTestNotification(opts PrepareTestRuleOptions) (int, *model.ApiError)
 			WithSendAlways(),
 			WithSendUnmatched(),
 			WithSQLStore(opts.SQLStore),
+			WithQueryParser(opts.ManagerOpts.QueryParser),
 		)
 
 		if err != nil {

pkg/query-service/rules/threshold_rule.go

@@ -378,6 +378,42 @@ func (r *ThresholdRule) GetSelectedQuery() string {
 	return r.ruleCondition.GetSelectedQueryName()
 }
 
+// filterNewSeries filters out new series based on the first_seen timestamp.
+func (r *ThresholdRule) filterNewSeries(ctx context.Context, ts time.Time, series []*v3.Series) ([]*v3.Series, error) {
+	// Convert []*v3.Series to []v3.Series for filtering
+	v3Series := make([]v3.Series, 0, len(series))
+	for _, s := range series {
+		v3Series = append(v3Series, *s)
+	}
+
+	// Get indexes to skip
+	skipIndexes, filterErr := r.BaseRule.FilterNewSeries(ctx, ts, v3Series)
+	if filterErr != nil {
+		r.logger.ErrorContext(ctx, "Error filtering new series, ", "error", filterErr, "rule_name", r.Name())
+		return nil, filterErr
+	}
+
+	// if no series are skipped, return the original series
+	if len(skipIndexes) == 0 {
+		return series, nil
+	}
+
+	// Create a map of skip indexes for efficient lookup
+	skippedIdxMap := make(map[int]struct{}, len(skipIndexes))
+	for _, idx := range skipIndexes {
+		skippedIdxMap[idx] = struct{}{}
+	}
+
+	// Filter out skipped series
+	oldSeries := make([]*v3.Series, 0, len(series)-len(skipIndexes))
+	for i, s := range series {
+		if _, shouldSkip := skippedIdxMap[i]; !shouldSkip {
+			oldSeries = append(oldSeries, s)
+		}
+	}
+	return oldSeries, nil
+}
+
 func (r *ThresholdRule) buildAndRunQuery(ctx context.Context, orgID valuer.UUID, ts time.Time) (ruletypes.Vector, error) {
 
 	params, err := r.prepareQueryRange(ctx, ts)
@@ -481,7 +517,18 @@ func (r *ThresholdRule) buildAndRunQuery(ctx context.Context, orgID valuer.UUID,
 		return resultVector, nil
 	}
 
-	for _, series := range queryResult.Series {
+	// Filter out new series if newGroupEvalDelay is configured
+	seriesToProcess := queryResult.Series
+	if r.ShouldSkipNewGroups() {
+		filteredSeries, filterErr := r.filterNewSeries(ctx, ts, seriesToProcess)
+		if filterErr != nil {
+			r.logger.ErrorContext(ctx, "Error filtering new series, ", "error", filterErr, "rule_name", r.Name())
+			return nil, filterErr
+		}
+		seriesToProcess = filteredSeries
+	}
+
+	for _, series := range seriesToProcess {
 		if r.Condition() != nil && r.Condition().RequireMinPoints {
 			if len(series.Points) < r.ruleCondition.RequiredNumPoints {
 				r.logger.InfoContext(ctx, "not enough data points to evaluate series, skipping", "ruleid", r.ID(), "numPoints", len(series.Points), "requiredPoints", r.Condition().RequiredNumPoints)
@@ -560,7 +607,17 @@ func (r *ThresholdRule) buildAndRunQueryV5(ctx context.Context, orgID valuer.UUI
 		return resultVector, nil
 	}
 
-	for _, series := range queryResult.Series {
+	// Filter out new series if newGroupEvalDelay is configured
+	seriesToProcess := queryResult.Series
+	if r.ShouldSkipNewGroups() {
+		filteredSeries, filterErr := r.filterNewSeries(ctx, ts, seriesToProcess)
+		if filterErr != nil {
+			r.logger.ErrorContext(ctx, "Error filtering new series, ", "error", filterErr, "rule_name", r.Name())
+			return nil, filterErr
+		}
+		seriesToProcess = filteredSeries
+	}
+	for _, series := range seriesToProcess {
 		if r.Condition() != nil && r.Condition().RequireMinPoints {
 			if len(series.Points) < r.Condition().RequiredNumPoints {
 				r.logger.InfoContext(ctx, "not enough data points to evaluate series, skipping", "ruleid", r.ID(), "numPoints", len(series.Points), "requiredPoints", r.Condition().RequiredNumPoints)

pkg/query-service/utils/queryTemplate/vars.go

@@ -9,19 +9,22 @@ import (
 // AssignReservedVars assigns values for go template vars. assumes that
 // model.QueryRangeParamsV3.Start and End are Unix Nano timestamps
 func AssignReservedVarsV3(queryRangeParams *v3.QueryRangeParamsV3) {
-	queryRangeParams.Variables["start_timestamp"] = queryRangeParams.Start / 1000
-	queryRangeParams.Variables["end_timestamp"] = queryRangeParams.End / 1000
-
-	queryRangeParams.Variables["start_timestamp_ms"] = queryRangeParams.Start
-	queryRangeParams.Variables["end_timestamp_ms"] = queryRangeParams.End
-
-	queryRangeParams.Variables["SIGNOZ_START_TIME"] = queryRangeParams.Start
-	queryRangeParams.Variables["SIGNOZ_END_TIME"] = queryRangeParams.End
-
-	queryRangeParams.Variables["start_timestamp_nano"] = queryRangeParams.Start * 1e6
-	queryRangeParams.Variables["end_timestamp_nano"] = queryRangeParams.End * 1e6
-
-	queryRangeParams.Variables["start_datetime"] = fmt.Sprintf("toDateTime(%d)", queryRangeParams.Start/1000)
-	queryRangeParams.Variables["end_datetime"] = fmt.Sprintf("toDateTime(%d)", queryRangeParams.End/1000)
-
+	AssignReservedVars(queryRangeParams.Variables, queryRangeParams.Start, queryRangeParams.End)
+}
+
+func AssignReservedVars(variables map[string]interface{}, start int64, end int64) {
+	variables["start_timestamp"] = start / 1000
+	variables["end_timestamp"] = end / 1000
+
+	variables["start_timestamp_ms"] = start
+	variables["end_timestamp_ms"] = end
+
+	variables["SIGNOZ_START_TIME"] = start
+	variables["SIGNOZ_END_TIME"] = end
+
+	variables["start_timestamp_nano"] = start * 1e6
+	variables["end_timestamp_nano"] = end * 1e6
+
+	variables["start_datetime"] = fmt.Sprintf("toDateTime(%d)", start/1000)
+	variables["end_datetime"] = fmt.Sprintf("toDateTime(%d)", end/1000)
 }