feat(dashboards): add an axis to scatter plot thresholds

chore: add more validations for scatter plot
Merge branch 'main' into feat/scatter-plot-panel-spec
2026-10-13 05:30:41 +01:00 · 2026-10-12 19:27:35 +05:30 · 2026-10-12 17:11:20 +05:30 · 2026-10-12 13:12:15 +05:30 · 2026-10-08 17:52:05 +05:30 · 2026-10-08 17:52:05 +05:30
36 changed files with 1146 additions and 959 deletions
--- a/docs/api/openapi.yml
+++ b/docs/api/openapi.yml
@@ -3425,6 +3425,13 @@ components:
          nullable: true
          type: number
      type: object
+    DashboardtypesAxisScale:
+      enum:
+      - auto
+      - linear
+      - log
+      - symlog
+      type: string
    DashboardtypesBarChartPanelSpec:
      properties:
        axes:
@@ -4167,6 +4174,7 @@ components:
          signoz/ListPanel: '#/components/schemas/DashboardtypesPanelPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesListPanelSpec'
          signoz/NumberPanel: '#/components/schemas/DashboardtypesPanelPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesNumberPanelSpec'
          signoz/PieChartPanel: '#/components/schemas/DashboardtypesPanelPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesPieChartPanelSpec'
+          signoz/ScatterPlotPanel: '#/components/schemas/DashboardtypesPanelPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesScatterPlotPanelSpec'
          signoz/TablePanel: '#/components/schemas/DashboardtypesPanelPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesTablePanelSpec'
          signoz/TextPanel: '#/components/schemas/DashboardtypesPanelPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesTextPanelSpec'
          signoz/TimeSeriesPanel: '#/components/schemas/DashboardtypesPanelPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesTimeSeriesPanelSpec'
@@ -4182,6 +4190,7 @@ components:
      - $ref: '#/components/schemas/DashboardtypesPanelPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesListPanelSpec'
      - $ref: '#/components/schemas/DashboardtypesPanelPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesTextPanelSpec'
      - $ref: '#/components/schemas/DashboardtypesPanelPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesHeatmapPanelSpec'
+      - $ref: '#/components/schemas/DashboardtypesPanelPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesScatterPlotPanelSpec'
      type: object
    DashboardtypesPanelPluginKind:
      enum:
@@ -4195,6 +4204,7 @@ components:
      - signoz/ListPanel
      - signoz/TextPanel
      - signoz/HeatmapPanel
+      - signoz/ScatterPlotPanel
      type: string
    DashboardtypesPanelPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesAreaChartPanelSpec:
      properties:
@@ -4280,6 +4290,18 @@ components:
      - kind
      - spec
      type: object
+    DashboardtypesPanelPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesScatterPlotPanelSpec:
+      properties:
+        kind:
+          enum:
+          - signoz/ScatterPlotPanel
+          type: string
+        spec:
+          $ref: '#/components/schemas/DashboardtypesScatterPlotPanelSpec'
+      required:
+      - kind
+      - spec
+      type: object
    DashboardtypesPanelPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesTablePanelSpec:
      properties:
        kind:
@@ -4359,6 +4381,16 @@ components:
        visualization:
          $ref: '#/components/schemas/DashboardtypesBasicVisualization'
      type: object
+    DashboardtypesPointDiameter:
+      maximum: 40
+      minimum: 2
+      nullable: true
+      type: integer
+    DashboardtypesPointOpacity:
+      maximum: 1
+      minimum: 0.1
+      nullable: true
+      type: number
    DashboardtypesPostableDashboardV2:
      properties:
        generateName:
@@ -4532,6 +4564,104 @@ components:
      required:
      - queryValue
      type: object
+    DashboardtypesScatterPlotAxes:
+      properties:
+        x:
+          $ref: '#/components/schemas/DashboardtypesScatterPlotAxis'
+        "y":
+          $ref: '#/components/schemas/DashboardtypesScatterPlotAxis'
+      type: object
+    DashboardtypesScatterPlotAxis:
+      properties:
+        label:
+          description: Axis title. Empty draws none.
+          type: string
+        scale:
+          $ref: '#/components/schemas/DashboardtypesAxisScale'
+        softMax:
+          nullable: true
+          type: number
+        softMin:
+          nullable: true
+          type: number
+      type: object
+    DashboardtypesScatterPlotChartAppearance:
+      properties:
+        points:
+          $ref: '#/components/schemas/DashboardtypesScatterPlotPoints'
+      type: object
+    DashboardtypesScatterPlotDimensions:
+      properties:
+        colorBy:
+          description: Group-by label names (e.g. k8s.namespace.name) whose combined
+            values colour dots and drive the legend. Empty colours by every group-by
+            label.
+          items:
+            type: string
+          nullable: true
+          type: array
+        sizeBy:
+          description: Value column key that scales dot size. Empty draws every dot
+            at the default size.
+          type: string
+        x:
+          description: Value column key (queryName, or queryName.expression for a
+            multi-aggregation query) plotted on the x axis. Empty uses the first value
+            column.
+          type: string
+        "y":
+          description: Value column key plotted on the y axis. Empty uses the second
+            value column.
+          type: string
+      type: object
+    DashboardtypesScatterPlotPanelSpec:
+      properties:
+        axes:
+          $ref: '#/components/schemas/DashboardtypesScatterPlotAxes'
+        chartAppearance:
+          $ref: '#/components/schemas/DashboardtypesScatterPlotChartAppearance'
+        dimensions:
+          $ref: '#/components/schemas/DashboardtypesScatterPlotDimensions'
+        formatting:
+          $ref: '#/components/schemas/DashboardtypesTableFormatting'
+        legend:
+          $ref: '#/components/schemas/DashboardtypesLegend'
+        thresholds:
+          items:
+            $ref: '#/components/schemas/DashboardtypesScatterPlotThreshold'
+          nullable: true
+          type: array
+        visualization:
+          $ref: '#/components/schemas/DashboardtypesBasicVisualization'
+      type: object
+    DashboardtypesScatterPlotPoints:
+      properties:
+        maxSize:
+          $ref: '#/components/schemas/DashboardtypesPointDiameter'
+        minSize:
+          $ref: '#/components/schemas/DashboardtypesPointDiameter'
+        opacity:
+          $ref: '#/components/schemas/DashboardtypesPointOpacity'
+        size:
+          $ref: '#/components/schemas/DashboardtypesPointDiameter'
+      type: object
+    DashboardtypesScatterPlotThreshold:
+      properties:
+        axis:
+          $ref: '#/components/schemas/DashboardtypesThresholdAxis'
+        color:
+          type: string
+        label:
+          type: string
+        unit:
+          type: string
+        value:
+          format: double
+          type: number
+      required:
+      - value
+      - color
+      type: object
    DashboardtypesSource:
      enum:
      - user
@@ -4645,6 +4775,11 @@ components:
      - value
      - name
      type: object
+    DashboardtypesThresholdAxis:
+      enum:
+      - x
+      - "y"
+      type: string
    DashboardtypesThresholdFormat:
      enum:
      - text
--- a/frontend/src/assets/Logos/android-java-monitoring.svg
+++ b/frontend/src/assets/Logos/android-java-monitoring.svg
--- a/frontend/src/assets/Logos/android-kotlin-monitoring.svg
+++ b/frontend/src/assets/Logos/android-kotlin-monitoring.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 0 60 60"><linearGradient id="a" x1="15.959" x2="44.307" y1="-13.014" y2="15.333" gradientTransform="matrix(1 0 0 -1 0 61)" gradientUnits="userSpaceOnUse"><stop offset=".097" style="stop-color:#0095d5"/><stop offset=".301" style="stop-color:#238ad9"/><stop offset=".621" style="stop-color:#557bde"/><stop offset=".864" style="stop-color:#7472e2"/><stop offset="1" style="stop-color:#806ee3"/></linearGradient><path d="m0 60 30.1-30.1L60 60z" style="fill:url(#a)"/><linearGradient id="b" x1="4.209" x2="20.673" y1="48.941" y2="65.405" gradientTransform="matrix(1 0 0 -1 0 61)" gradientUnits="userSpaceOnUse"><stop offset=".118" style="stop-color:#0095d5"/><stop offset=".418" style="stop-color:#3c83dc"/><stop offset=".696" style="stop-color:#6d74e1"/><stop offset=".833" style="stop-color:#806ee3"/></linearGradient><path d="M0 0h30.1L0 32.5z" style="fill:url(#b)"/><linearGradient id="c" x1="-10.102" x2="45.731" y1="5.836" y2="61.669" gradientTransform="matrix(1 0 0 -1 0 61)" gradientUnits="userSpaceOnUse"><stop offset=".107" style="stop-color:#c757bc"/><stop offset=".214" style="stop-color:#d0609a"/><stop offset=".425" style="stop-color:#e1725c"/><stop offset=".605" style="stop-color:#ee7e2f"/><stop offset=".743" style="stop-color:#f58613"/><stop offset=".823" style="stop-color:#f88909"/></linearGradient><path d="M30.1 0 0 31.7V60l30.1-30.1L60 0z" style="fill:url(#c)"/></svg>
--- a/frontend/src/assets/Logos/bun.svg
+++ b/frontend/src/assets/Logos/bun.svg
@@ -1 +0,0 @@
-<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path fill="#9CA3AF" d="M12 22.596c6.628 0 12-4.338 12-9.688 0-3.318-2.057-6.248-5.219-7.986-1.286-.715-2.297-1.357-3.139-1.89C14.058 2.025 13.08 1.404 12 1.404c-1.097 0-2.334.785-3.966 1.821a49.92 49.92 0 0 1-2.816 1.697C2.057 6.66 0 9.59 0 12.908c0 5.35 5.372 9.687 12 9.687v.001ZM10.599 4.715c.334-.759.503-1.58.498-2.409 0-.145.202-.187.23-.029.658 2.783-.902 4.162-2.057 4.624-.124.048-.199-.121-.103-.209a5.763 5.763 0 0 0 1.432-1.977Zm2.058-.102a5.82 5.82 0 0 0-.782-2.306v-.016c-.069-.123.086-.263.185-.172 1.962 2.111 1.307 4.067.556 5.051-.082.103-.23-.003-.189-.126a5.85 5.85 0 0 0 .23-2.431Zm1.776-.561a5.727 5.727 0 0 0-1.612-1.806v-.014c-.112-.085-.024-.274.114-.218 2.595 1.087 2.774 3.18 2.459 4.407a.116.116 0 0 1-.049.071.11.11 0 0 1-.153-.026.122.122 0 0 1-.022-.083 5.891 5.891 0 0 0-.737-2.331Zm-5.087.561c-.617.546-1.282.76-2.063 1-.117 0-.195-.078-.156-.181 1.752-.909 2.376-1.649 2.999-2.778 0 0 .155-.118.188.085 0 .304-.349 1.329-.968 1.874Zm4.945 11.237a2.957 2.957 0 0 1-.937 1.553c-.346.346-.8.565-1.286.62a2.178 2.178 0 0 1-1.327-.62 2.955 2.955 0 0 1-.925-1.553.244.244 0 0 1 .064-.198.234.234 0 0 1 .193-.069h3.965a.226.226 0 0 1 .19.07c.05.053.073.125.063.197Zm-5.458-2.176a1.862 1.862 0 0 1-2.384-.245 1.98 1.98 0 0 1-.233-2.447c.207-.319.503-.566.848-.713a1.84 1.84 0 0 1 1.092-.11c.366.075.703.261.967.531a1.98 1.98 0 0 1 .408 2.114 1.931 1.931 0 0 1-.698.869v.001Zm8.495.005a1.86 1.86 0 0 1-2.381-.253 1.964 1.964 0 0 1-.547-1.366c0-.384.11-.76.32-1.079.207-.319.503-.567.849-.713a1.844 1.844 0 0 1 1.093-.108c.367.076.704.262.968.534a1.98 1.98 0 0 1 .4 2.117 1.932 1.932 0 0 1-.702.868Z"/></svg>
--- a/frontend/src/assets/Logos/microsoft.svg
+++ b/frontend/src/assets/Logos/microsoft.svg
@@ -1 +0,0 @@
-<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path fill="#F25022" d="M1 1h10.5v10.5H1z"/><path fill="#7FBA00" d="M12.5 1H23v10.5H12.5z"/><path fill="#00A4EF" d="M1 12.5h10.5V23H1z"/><path fill="#FFB900" d="M12.5 12.5H23V23H12.5z"/></svg>
--- a/frontend/src/container/LLMObservability/Explorer/ListView/ListView.tsx
+++ b/frontend/src/container/LLMObservability/Explorer/ListView/ListView.tsx
@@ -6,6 +6,7 @@ import {
 	useCallback,
 	useEffect,
 	useMemo,
+	useState,
 } from 'react';
 import { QueryKey } from 'react-query';
 // eslint-disable-next-line no-restricted-imports
@@ -33,8 +34,6 @@ import { Warning } from 'types/api';
 import { DataSource } from 'types/common/queryBuilder';
 import { GlobalReducer } from 'types/reducer/globalTime';

-import { getListOrderBy, setListOrderBy } from 'utils/explorerUtils';
-
 import TraceExplorerControls from '../Controls';
 import { getListViewQuery } from '../explorerUtils';
 import {
@@ -59,16 +58,12 @@ function ListView({
 	setIsLoadingQueries,
 	queryKeyRef,
 }: ListViewProps): JSX.Element {
-	const {
-		stagedQuery,
-		currentQuery,
-		redirectWithQueryBuilderData,
-		panelType: panelTypeFromQueryBuilder,
-	} = useQueryBuilder();
+	const { stagedQuery, panelType: panelTypeFromQueryBuilder } =
+		useQueryBuilder();

 	const panelType = panelTypeFromQueryBuilder || PANEL_TYPES.LIST;

-	const orderBy = useMemo(() => getListOrderBy(stagedQuery), [stagedQuery]);
+	const [orderBy, setOrderBy] = useState<string>('timestamp:desc');

 	const {
 		selectedTime: globalSelectedTime,
@@ -97,6 +92,7 @@ function ListView({
 			stagedQuery,
 			panelType,
 			paginationConfig,
+			orderBy,
 		],
 		[
 			stagedQuery,
@@ -105,6 +101,7 @@ function ListView({
 			paginationConfig,
 			maxTime,
 			minTime,
+			orderBy,
 		],
 	);

@@ -170,12 +167,9 @@ function ListView({
 		[queryTableData],
 	);

-	const handleOrderChange = useCallback(
-		(value: string) => {
-			redirectWithQueryBuilderData(setListOrderBy(currentQuery, value));
-		},
-		[currentQuery, redirectWithQueryBuilderData],
-	);
+	const handleOrderChange = useCallback((value: string) => {
+		setOrderBy(value);
+	}, []);

 	useEffect(() => {
 		if (!isLoading && !isFetching && !isError && rows.length !== 0) {
--- a/frontend/src/container/LLMObservability/Explorer/TracesView/TracesView.tsx
+++ b/frontend/src/container/LLMObservability/Explorer/TracesView/TracesView.tsx
@@ -6,6 +6,7 @@ import {
 	useCallback,
 	useEffect,
 	useMemo,
+	useState,
 } from 'react';
 import { QueryKey } from 'react-query';
 // eslint-disable-next-line no-restricted-imports
@@ -22,7 +23,6 @@ import { TracesTableRow } from '../TracesTable/getFieldColumn';
 import TracesTable from '../TracesTable/TracesTable';
 import { useGetQueryRange } from 'hooks/queryBuilder/useGetQueryRange';
 import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
-import { getListOrderBy, setListOrderBy } from 'utils/explorerUtils';
 import { Pagination } from 'hooks/queryPagination';
 import useUrlQueryData from 'hooks/useUrlQueryData';
 import { ArrowUp10, Minus } from '@signozhq/icons';
@@ -57,13 +57,9 @@ function TracesView({
 	setIsLoadingQueries,
 	queryKeyRef,
 }: TracesViewProps): JSX.Element {
-	const { stagedQuery, currentQuery, redirectWithQueryBuilderData, panelType } =
-		useQueryBuilder();
+	const { stagedQuery, panelType } = useQueryBuilder();

-	const orderBy = useMemo(
-		() => getListOrderBy(stagedQuery, TRACE_VIEW_DEFAULT_ORDER_BY),
-		[stagedQuery],
-	);
+	const [orderBy, setOrderBy] = useState<string>(TRACE_VIEW_DEFAULT_ORDER_BY);

 	const {
 		columns,
@@ -98,6 +94,7 @@ function TracesView({
 			stagedQuery,
 			panelType,
 			paginationQueryData,
+			orderBy,
 		],
 		[
 			globalSelectedTime,
@@ -106,6 +103,7 @@ function TracesView({
 			stagedQuery,
 			panelType,
 			paginationQueryData,
+			orderBy,
 		],
 	);

@@ -167,12 +165,9 @@ function TracesView({
 		}
 	}, [isLoading, isFetching, isError, rows.length]);

-	const handleOrderChange = useCallback(
-		(value: string): void => {
-			redirectWithQueryBuilderData(setListOrderBy(currentQuery, value));
-		},
-		[currentQuery, redirectWithQueryBuilderData],
-	);
+	const handleOrderChange = useCallback((value: string): void => {
+		setOrderBy(value);
+	}, []);

 	// Without the full column set there is no pool to pick from, so the control is dropped.
 	const fieldsSelectorConfig = useMemo(
--- a/frontend/src/container/LLMObservability/Explorer/explorerUtils.ts
+++ b/frontend/src/container/LLMObservability/Explorer/explorerUtils.ts
@@ -1,7 +1,6 @@
 import { initialQueriesMap } from 'constants/queryBuilder';
 import { cloneDeep } from 'lodash-es';
 import { OrderByPayload, Query } from 'types/api/queryBuilder/queryBuilderData';
-import { parseListOrderBy } from 'utils/explorerUtils';

 export const getListViewQuery = (
 	stagedQuery: Query,
@@ -12,7 +11,12 @@ export const getListViewQuery = (
 		: cloneDeep(initialQueriesMap.traces);

 	const orderByPayload: OrderByPayload[] = orderBy
-		? [parseListOrderBy(orderBy)]
+		? [
+				{
+					columnName: orderBy.split(':')[0],
+					order: orderBy.split(':')[1] as 'asc' | 'desc',
+				},
+			]
 		: [];

 	for (let i = 0; i < query.builder.queryData.length; i++) {
--- a/frontend/src/container/LogsExplorerViews/LogsActionsContainer.tsx
+++ b/frontend/src/container/LogsExplorerViews/LogsActionsContainer.tsx
@@ -16,14 +16,14 @@ function LogsActionsContainer({
 	showFrequencyChart,
 	handleToggleFrequencyChart,
 	orderBy,
-	onOrderChange,
+	setOrderBy,
 	explorerActions,
 }: {
 	listQuery: any;
 	showFrequencyChart: boolean;
 	handleToggleFrequencyChart: () => void;
 	orderBy: string;
-	onOrderChange: (value: string) => void;
+	setOrderBy: (value: string) => void;
 	explorerActions: ReactNode;
 }): JSX.Element {
 	const { options, config } = useOptionsMenu({
@@ -78,7 +78,7 @@ function LogsActionsContainer({

 						<ListViewOrderBy
 							value={orderBy}
-							onChange={onOrderChange}
+							onChange={(value): void => setOrderBy(value)}
 							dataSource={DataSource.LOGS}
 						/>
 					</div>
--- a/frontend/src/container/LogsExplorerViews/index.tsx
+++ b/frontend/src/container/LogsExplorerViews/index.tsx
@@ -59,7 +59,6 @@ import { QueryDataV3 } from 'types/api/widgets/getQuery';
 import { DataSource } from 'types/common/queryBuilder';
 import { GlobalReducer } from 'types/reducer/globalTime';
 import { v4 } from 'uuid';
-import { getListOrderBy, setListOrderBy } from 'utils/explorerUtils';

 import LogsActionsContainer from './LogsActionsContainer';

@@ -102,8 +101,7 @@ function LogsExplorerViewsContainer({
 	const currentMinTimeRef = useRef<number>(minTime);

 	// Context
-	const { stagedQuery, currentQuery, redirectWithQueryBuilderData, panelType } =
-		useQueryBuilder();
+	const { stagedQuery, panelType } = useQueryBuilder();

 	const selectedPanelType = panelType || PANEL_TYPES.LIST;

@@ -113,7 +111,7 @@ function LogsExplorerViewsContainer({
 	const [requestData, setRequestData] = useState<Query | null>(null);
 	const [listChartQuery, setListChartQuery] = useState<Query | null>(null);

-	const orderBy = useMemo(() => getListOrderBy(stagedQuery), [stagedQuery]);
+	const [orderBy, setOrderBy] = useState<string>('timestamp:desc');

 	const { yAxisUnit, onUnitChange } = useUrlYAxisUnit('');

@@ -194,13 +192,6 @@ function LogsExplorerViewsContainer({
 			'custom',
 		);

-	const handleOrderChange = useCallback(
-		(value: string): void => {
-			redirectWithQueryBuilderData(setListOrderBy(currentQuery, value));
-		},
-		[currentQuery, redirectWithQueryBuilderData],
-	);
-
 	const getRequestData = useCallback(
 		(
 			query: Query | null,
@@ -332,10 +323,18 @@ function LogsExplorerViewsContainer({
 		// eslint-disable-next-line react-hooks/exhaustive-deps
 	}, [data]);

+	// Store previous orderDirection to detect changes
+	const prevOrderByRef = useRef(orderBy);
+
 	useEffect(() => {
+		const orderByChanged =
+			prevOrderByRef.current !== orderBy && selectedPanelType === PANEL_TYPES.LIST;
+		prevOrderByRef.current = orderBy;
+
 		if (
 			requestData?.id !== stagedQuery?.id ||
-			currentMinTimeRef.current !== minTime
+			currentMinTimeRef.current !== minTime ||
+			orderByChanged
 		) {
 			const newRequestData = getRequestData(stagedQuery, {
 				filters: listQuery?.filters || initialFilters,
@@ -359,6 +358,7 @@ function LogsExplorerViewsContainer({
 		activeLogId,
 		selectedPanelType,
 		maxTime,
+		orderBy,
 	]);

 	const chartData = useMemo(() => {
@@ -430,7 +430,7 @@ function LogsExplorerViewsContainer({
 						showFrequencyChart={showFrequencyChart}
 						handleToggleFrequencyChart={handleToggleFrequencyChart}
 						orderBy={orderBy}
-						onOrderChange={handleOrderChange}
+						setOrderBy={setOrderBy}
 						explorerActions={explorerActions}
 					/>
 				)}
--- a/frontend/src/container/OnboardingV2Container/onboarding-configs/onboarding-config-with-links.ts
+++ b/frontend/src/container/OnboardingV2Container/onboarding-configs/onboarding-config-with-links.ts
@@ -1,7 +1,8 @@
 import agnoUrl from '@/assets/Logos/agno.svg';
 import amazonBedrockUrl from '@/assets/Logos/amazon-bedrock.svg';
 import amazonMskUrl from '@/assets/Logos/amazon-msk.svg';
-import androidUrl from '@/assets/Logos/android.svg';
+import androidJavaMonitoringUrl from '@/assets/Logos/android-java-monitoring.svg';
+import androidKotlinMonitoringUrl from '@/assets/Logos/android-kotlin-monitoring.svg';
 import anthropicApiMonitoringUrl from '@/assets/Logos/anthropic-api-monitoring.svg';
 import antigravityUrl from '@/assets/Logos/antigravity.svg';
 import apacheDruidUrl from '@/assets/Logos/apache-druid.svg';
@@ -24,7 +25,6 @@ import azureSqlDatabaseMetricsUrl from '@/assets/Logos/azure-sql-database-metric
 import azureVmUrl from '@/assets/Logos/azure-vm.svg';
 import azureUrl from '@/assets/Logos/azure.svg';
 import basetenUrl from '@/assets/Logos/baseten.svg';
-import bunUrl from '@/assets/Logos/bun.svg';
 import cassandraUrl from '@/assets/Logos/cassandra.svg';
 import celeryUrl from '@/assets/Logos/celery.svg';
 import certManagerUrl from '@/assets/Logos/cert-manager.svg';
@@ -126,7 +126,6 @@ import logstashUrl from '@/assets/Logos/logstash.svg';
 import mastraUrl from '@/assets/Logos/mastra.svg';
 import metaUrl from '@/assets/Logos/meta.svg';
 import metricsUrl from '@/assets/Logos/metrics.svg';
-import microsoftUrl from '@/assets/Logos/microsoft.svg';
 import microsoftSqlServerUrl from '@/assets/Logos/microsoft-sql-server.svg';
 import mistralUrl from '@/assets/Logos/mistral.svg';
 import modalUrl from '@/assets/Logos/modal.svg';
@@ -4713,40 +4712,70 @@ const onboardingConfigWithLinks = [
 		link: '/docs/messaging-queues/celery-setup/',
 	},
 	{
-		dataSource: 'android',
-		label: 'Android',
-		imgUrl: androidUrl,
+		dataSource: 'android-java',
+		label: 'Android Java',
+		imgUrl: androidJavaMonitoringUrl,
 		tags: ['mobile app monitoring'],
 		module: 'apm',
 		relatedSearchKeywords: [
 			'android',
 			'android app tracing',
 			'android java',
-			'android kotlin',
+			'android java instrumentation',
+			'android java monitoring',
+			'android java to signoz',
 			'android logs',
-			'android metrics',
 			'android observability',
 			'android performance monitoring',
-			'android to signoz',
+			'android-java',
 			'apm',
 			'app',
 			'application performance monitoring',
 			'java',
-			'kotlin',
-			'logs',
-			'metrics',
 			'mobile',
 			'mobile app monitoring',
 			'monitor android apps',
 			'monitoring',
 			'observability',
-			'opentelemetry android',
-			'otel android agent',
+			'opentelemetry android java',
+			'otel android sdk',
 			'traces',
 			'tracing',
 		],
-		id: 'android',
-		link: '/docs/instrumentation/mobile-instrumentation/opentelemetry-android/',
+		link: '/docs/instrumentation/mobile-instrumentation/opentelemetry-java/',
+	},
+	{
+		dataSource: 'android-kotlin',
+		label: 'Android Kotlin',
+		imgUrl: androidKotlinMonitoringUrl,
+		tags: ['mobile app monitoring'],
+		module: 'apm',
+		relatedSearchKeywords: [
+			'android',
+			'android app performance kotlin',
+			'android kotlin',
+			'android kotlin monitoring',
+			'android kotlin to signoz',
+			'android observability kotlin',
+			'android telemetry sdk',
+			'android-kotlin',
+			'apm',
+			'app',
+			'application performance monitoring',
+			'kotlin',
+			'kotlin app logs',
+			'kotlin mobile tracing',
+			'mobile',
+			'mobile app monitoring',
+			'monitor kotlin apps',
+			'monitoring',
+			'observability',
+			'opentelemetry android kotlin',
+			'otel kotlin sdk',
+			'traces',
+			'tracing',
+		],
+		link: '/docs/instrumentation/mobile-instrumentation/opentelemetry-kotlin/',
 	},
 	{
 		dataSource: 'flutter',
@@ -7958,112 +7987,5 @@ const onboardingConfigWithLinks = [
 		id: 'aws-lambda-microvms',
 		link: '/docs/aws-monitoring/lambda-microvms/',
 	},
-	{
-		dataSource: 'bun-elysia',
-		label: 'Bun / Elysia',
-		imgUrl: bunUrl,
-		tags: ['apm/traces', 'metrics'],
-		module: 'apm',
-		relatedSearchKeywords: [
-			'apm',
-			'application performance monitoring',
-			'bun',
-			'bun elysia',
-			'bun metrics',
-			'bun monitoring',
-			'bun observability',
-			'bun traces',
-			'bunjs',
-			'elysia',
-			'elysiajs',
-			'javascript',
-			'metrics',
-			'observability',
-			'opentelemetry bun',
-			'traces',
-			'tracing',
-			'typescript',
-		],
-		id: 'bun-elysia',
-		link: '/docs/instrumentation/opentelemetry-bun/',
-	},
-	{
-		dataSource: 'snmp',
-		label: 'SNMP',
-		imgUrl: metricsUrl,
-		tags: ['metrics'],
-		module: 'metrics',
-		relatedSearchKeywords: [
-			'firewall',
-			'metrics',
-			'monitoring',
-			'network',
-			'network devices',
-			'network monitoring',
-			'observability',
-			'opentelemetry snmp',
-			'router',
-			'snmp',
-			'snmp metrics',
-			'snmp receiver',
-			'switch',
-		],
-		id: 'snmp',
-		link: '/docs/metrics-management/opentelemetry-snmp-metrics/',
-	},
-	{
-		dataSource: 'vercel-eve',
-		label: 'Vercel Eve',
-		imgUrl: vercelUrl,
-		tags: ['LLM Monitoring'],
-		module: 'apm',
-		relatedSearchKeywords: [
-			'agent',
-			'agents',
-			'ai agent',
-			'eve',
-			'eve dev',
-			'eve observability',
-			'llm',
-			'llm monitoring',
-			'monitoring',
-			'observability',
-			'token usage',
-			'traces',
-			'tracing',
-			'vercel',
-			'vercel agents',
-			'vercel eve',
-		],
-		id: 'vercel-eve',
-		link: '/docs/eve-observability/',
-	},
-	{
-		dataSource: 'microsoft-agent-framework',
-		label: 'Microsoft Agent Framework',
-		imgUrl: microsoftUrl,
-		tags: ['LLM Monitoring'],
-		module: 'apm',
-		relatedSearchKeywords: [
-			'agent',
-			'agent framework',
-			'agents',
-			'ai agent',
-			'llm',
-			'llm monitoring',
-			'maf',
-			'microsoft',
-			'microsoft agent framework',
-			'microsoft agent framework observability',
-			'monitoring',
-			'observability',
-			'token usage',
-			'traces',
-			'tracing',
-			'workflows',
-		],
-		id: 'microsoft-agent-framework',
-		link: '/docs/microsoft-agent-framework-observability/',
-	},
 ];
 export default onboardingConfigWithLinks;
--- a/frontend/src/container/TracesExplorer/ListView/index.tsx
+++ b/frontend/src/container/TracesExplorer/ListView/index.tsx
@@ -7,6 +7,7 @@ import {
 	useCallback,
 	useEffect,
 	useMemo,
+	useState,
 } from 'react';
 // eslint-disable-next-line no-restricted-imports
 import { useSelector } from 'react-redux';
@@ -33,7 +34,6 @@ import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
 import { Pagination } from 'hooks/queryPagination';
 import { getDefaultPaginationConfig } from 'hooks/queryPagination/utils';
 import useUrlQueryData from 'hooks/useUrlQueryData';
-import { getListOrderBy, setListOrderBy } from 'utils/explorerUtils';
 import { ArrowUp10, Minus } from '@signozhq/icons';
 import { AppState } from 'store/reducers';
 import { Warning } from 'types/api';
@@ -66,16 +66,12 @@ function ListView({
 	queryKeyRef,
 	headerActions,
 }: ListViewProps): JSX.Element {
-	const {
-		stagedQuery,
-		currentQuery,
-		redirectWithQueryBuilderData,
-		panelType: panelTypeFromQueryBuilder,
-	} = useQueryBuilder();
+	const { stagedQuery, panelType: panelTypeFromQueryBuilder } =
+		useQueryBuilder();

 	const panelType = panelTypeFromQueryBuilder || PANEL_TYPES.LIST;

-	const orderBy = useMemo(() => getListOrderBy(stagedQuery), [stagedQuery]);
+	const [orderBy, setOrderBy] = useState<string>('timestamp:desc');

 	const {
 		selectedTime: globalSelectedTime,
@@ -127,6 +123,7 @@ function ListView({
 			panelType,
 			paginationConfig,
 			selectColumnsSignature,
+			orderBy,
 		],
 		[
 			stagedQuery,
@@ -136,6 +133,7 @@ function ListView({
 			selectColumnsSignature,
 			maxTime,
 			minTime,
+			orderBy,
 		],
 	);

@@ -217,12 +215,9 @@ function ListView({
 		[config],
 	);

-	const handleOrderChange = useCallback(
-		(value: string) => {
-			redirectWithQueryBuilderData(setListOrderBy(currentQuery, value));
-		},
-		[currentQuery, redirectWithQueryBuilderData],
-	);
+	const handleOrderChange = useCallback((value: string) => {
+		setOrderBy(value);
+	}, []);

 	useEffect(() => {
 		if (!isLoading && !isFetching && !isError && rows.length !== 0) {
--- a/frontend/src/container/TracesExplorer/explorerUtils.ts
+++ b/frontend/src/container/TracesExplorer/explorerUtils.ts
@@ -2,7 +2,6 @@ import { initialQueriesMap, PANEL_TYPES } from 'constants/queryBuilder';
 import { OptionsQuery } from 'container/OptionsMenu/types';
 import { cloneDeep, set } from 'lodash-es';
 import { OrderByPayload, Query } from 'types/api/queryBuilder/queryBuilderData';
-import { parseListOrderBy } from 'utils/explorerUtils';

 export const getListViewQuery = (
 	stagedQuery: Query,
@@ -13,7 +12,12 @@ export const getListViewQuery = (
 		: cloneDeep(initialQueriesMap.traces);

 	const orderByPayload: OrderByPayload[] = orderBy
-		? [parseListOrderBy(orderBy)]
+		? [
+				{
+					columnName: orderBy.split(':')[0],
+					order: orderBy.split(':')[1] as 'asc' | 'desc',
+				},
+			]
 		: [];

 	for (let i = 0; i < query.builder.queryData.length; i++) {
--- a/frontend/src/hooks/tests/useHandleExplorerTabChange.test.ts
+++ b/frontend/src/hooks/tests/useHandleExplorerTabChange.test.ts
@@ -1,108 +0,0 @@
-import { renderHook } from '@testing-library/react';
-import { initialQueriesMap, PANEL_TYPES } from 'constants/queryBuilder';
-import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
-import { useHandleExplorerTabChange } from 'hooks/useHandleExplorerTabChange';
-import { IBuilderQuery, Query } from 'types/api/queryBuilder/queryBuilderData';
-
-jest.mock('hooks/queryBuilder/useQueryBuilder');
-jest.mock('hooks/saveViews/useGetSavedViewParams', () => ({
-	useGetSavedViewParams: (): { viewName: string; viewKey: string } => ({
-		viewName: '',
-		viewKey: '',
-	}),
-}));
-
-const mockedUseQueryBuilder = jest.mocked(useQueryBuilder);
-
-const countOrderBy = [{ columnName: 'count()', order: 'desc' }];
-
-const queryWithOrder = (orderBy: typeof countOrderBy): Query => ({
-	...initialQueriesMap.traces,
-	builder: {
-		...initialQueriesMap.traces.builder,
-		queryData: initialQueriesMap.traces.builder.queryData.map((item) => ({
-			...item,
-			orderBy,
-		})),
-	},
-});
-
-const setUpQueryBuilder = (
-	from: PANEL_TYPES,
-	currentQuery: Query,
-): jest.Mock => {
-	const redirectWithQueryBuilderData = jest.fn();
-
-	mockedUseQueryBuilder.mockReturnValue({
-		currentQuery,
-		panelType: from,
-		redirectWithQueryBuilderData,
-		updateAllQueriesOperators: (query: Query): Query => query,
-		updateQueriesData: (
-			query: Query,
-			type: 'queryData',
-			updateCallback: (item: IBuilderQuery, index: number) => IBuilderQuery,
-		): Query => ({
-			...query,
-			builder: {
-				...query.builder,
-				[type]: query.builder[type].map(updateCallback),
-			},
-		}),
-	} as unknown as ReturnType<typeof useQueryBuilder>);
-
-	return redirectWithQueryBuilderData;
-};
-
-const switchTab = (from: PANEL_TYPES, to: PANEL_TYPES, query: Query): Query => {
-	const redirect = setUpQueryBuilder(from, query);
-
-	const { result } = renderHook(() => useHandleExplorerTabChange());
-	result.current.handleExplorerTabChange(to);
-
-	return redirect.mock.calls[0][0] as Query;
-};
-
-describe('explorer tab change clears the order for raw panels', () => {
-	it.each([
-		[PANEL_TYPES.TIME_SERIES, PANEL_TYPES.LIST],
-		[PANEL_TYPES.TABLE, PANEL_TYPES.LIST],
-		[PANEL_TYPES.TRACE, PANEL_TYPES.LIST],
-		[PANEL_TYPES.LIST, PANEL_TYPES.TRACE],
-	])('clears it on %s -> %s', (from, to) => {
-		const query = switchTab(from, to, queryWithOrder(countOrderBy));
-
-		query.builder.queryData.forEach((item) => {
-			expect(item.orderBy).toStrictEqual([]);
-		});
-	});
-
-	it.each([
-		[PANEL_TYPES.LIST, PANEL_TYPES.TIME_SERIES],
-		[PANEL_TYPES.LIST, PANEL_TYPES.TABLE],
-	])('keeps it on %s -> %s, where the sanitizer validates it', (from, to) => {
-		const query = switchTab(from, to, queryWithOrder(countOrderBy));
-
-		query.builder.queryData.forEach((item) => {
-			expect(item.orderBy).toStrictEqual(countOrderBy);
-		});
-	});
-
-	it('leaves the order alone when the caller supplies its own query', () => {
-		const saved = queryWithOrder([{ columnName: 'timestamp', order: 'asc' }]);
-		const redirect = setUpQueryBuilder(
-			PANEL_TYPES.TIME_SERIES,
-			queryWithOrder(countOrderBy),
-		);
-
-		const { result } = renderHook(() => useHandleExplorerTabChange());
-		result.current.handleExplorerTabChange(PANEL_TYPES.LIST, { query: saved });
-
-		const sent = redirect.mock.calls[0][0] as Query;
-		sent.builder.queryData.forEach((item) => {
-			expect(item.orderBy).toStrictEqual([
-				{ columnName: 'timestamp', order: 'asc' },
-			]);
-		});
-	});
-});
--- a/frontend/src/hooks/useHandleExplorerTabChange.ts
+++ b/frontend/src/hooks/useHandleExplorerTabChange.ts
@@ -2,6 +2,7 @@ import { useCallback } from 'react';
 import { QueryParams } from 'constants/query';
 import { initialAutocompleteData, PANEL_TYPES } from 'constants/queryBuilder';
 import ROUTES from 'constants/routes';
+import { SIGNOZ_VALUE } from 'container/QueryBuilder/filters/OrderByFilter/constants';
 import { Query } from 'types/api/queryBuilder/queryBuilderData';
 import { DataSource } from 'types/common/queryBuilder';

@@ -46,7 +47,7 @@ export const useHandleExplorerTabChange = (): {
 			) {
 				query = updateQueriesData(query, 'queryData', (item) => ({
 					...item,
-					orderBy: [],
+					orderBy: item.orderBy.filter((item) => item.columnName !== SIGNOZ_VALUE),
 					aggregateAttribute: initialAutocompleteData,
 				}));
 			}
--- a/frontend/src/providers/QueryBuilder.tsx
+++ b/frontend/src/providers/QueryBuilder.tsx
@@ -66,7 +66,6 @@ import {
 import { sanitizeOrderByForExplorer } from 'utils/sanitizeOrderBy';
 import { v4 as uuid } from 'uuid';
 import { getUnstableCurrentSearchParams } from 'utils/getUnstableCurrentSearchParams';
-import { readPanelTypeFromUrl } from 'utils/readPanelTypeFromUrl';

 export const QueryBuilderContext = createContext<QueryBuilderContextType>({
 	currentQuery: initialQueriesMap.metrics,
@@ -183,11 +182,6 @@ export function QueryBuilderProvider({
 					})) ?? [],
 			};

-			const urlPanelType = readPanelTypeFromUrl(PANEL_TYPES.LIST);
-
-			const isRawPanel =
-				urlPanelType === PANEL_TYPES.LIST || urlPanelType === PANEL_TYPES.TRACE;
-
 			const setupedQueryData = builder.queryData.map((item) => {
 				const currentElement: IBuilderQuery = {
 					...item,
@@ -206,10 +200,8 @@ export function QueryBuilderProvider({

 				// Explorer pages: sanitize stale orderBy before first query
 				const isExplorer =
-					(location.pathname === ROUTES.LOGS_EXPLORER ||
-						location.pathname === ROUTES.TRACES_EXPLORER ||
-						location.pathname === ROUTES.AI_OBSERVABILITY_EXPLORER) &&
-					!isRawPanel;
+					location.pathname === ROUTES.LOGS_EXPLORER ||
+					location.pathname === ROUTES.TRACES_EXPLORER;
 				if (isExplorer) {
 					const sanitizedOrderBy = sanitizeOrderByForExplorer(currentElement);
 					return calledFromHandleRunQuery
@@ -270,8 +262,6 @@ export function QueryBuilderProvider({
 			setStagedQuery(nextQuery);
 			setCurrentQuery(newQueryState);
 			setQueryType(type);
-
-			setCalledFromHandleRunQuery(false);
 		},
 		[prepareQueryBuilderData],
 	);
@@ -1048,8 +1038,7 @@ export function QueryBuilderProvider({
 	const handleRunQuery = useCallback(() => {
 		const isExplorer =
 			location.pathname === ROUTES.LOGS_EXPLORER ||
-			location.pathname === ROUTES.TRACES_EXPLORER ||
-			location.pathname === ROUTES.AI_OBSERVABILITY_EXPLORER;
+			location.pathname === ROUTES.TRACES_EXPLORER;
 		if (isExplorer) {
 			setCalledFromHandleRunQuery(true);
 		}
--- a/frontend/src/providers/tests/QueryBuilder.sanitizeOrderBy.test.tsx
+++ b/frontend/src/providers/tests/QueryBuilder.sanitizeOrderBy.test.tsx
@@ -1,176 +0,0 @@
-import { initialQueriesMap, PANEL_TYPES } from 'constants/queryBuilder';
-import ROUTES from 'constants/routes';
-import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
-import {
-	act,
-	AllTheProviders,
-	renderHook,
-	RenderHookResult,
-} from 'tests/test-utils';
-import { Query } from 'types/api/queryBuilder/queryBuilderData';
-import { QueryBuilderContextType } from 'types/common/queryBuilder';
-import {
-	__resetSearchParamsGetter,
-	__setSearchParamsGetterForTest,
-} from 'utils/getUnstableCurrentSearchParams';
-
-const timestampOrderBy = [{ columnName: 'timestamp', order: 'desc' }];
-
-const queryWithTimestampOrder = (base: Query): Query => ({
-	...base,
-	builder: {
-		...base.builder,
-		queryData: base.builder.queryData.map((item) => ({
-			...item,
-			orderBy: timestampOrderBy,
-		})),
-	},
-});
-
-const renderOn = (
-	route: string,
-	panelType: PANEL_TYPES | null,
-): RenderHookResult<QueryBuilderContextType, unknown> => {
-	const search = new URLSearchParams();
-	if (panelType) {
-		search.set('panelTypes', JSON.stringify(panelType));
-	}
-	__setSearchParamsGetterForTest(() => search);
-
-	return renderHook(() => useQueryBuilder(), {
-		wrapper: ({ children }): JSX.Element => (
-			<AllTheProviders initialRoute={route}>{children}</AllTheProviders>
-		),
-	});
-};
-
-const initOn = (
-	route: string,
-	panelType: PANEL_TYPES | null,
-	query: Query,
-): Query | null => {
-	const { result } = renderOn(route, panelType);
-
-	act(() => {
-		result.current.initQueryBuilderData(query);
-	});
-
-	return result.current.stagedQuery;
-};
-
-describe('explorer orderBy sanitizing by panel type', () => {
-	afterEach(() => {
-		__resetSearchParamsGetter();
-	});
-
-	it('keeps the order on the logs list panel', () => {
-		const staged = initOn(
-			ROUTES.LOGS_EXPLORER,
-			PANEL_TYPES.LIST,
-			queryWithTimestampOrder(initialQueriesMap.logs),
-		);
-
-		expect(staged?.builder.queryData[0].orderBy).toStrictEqual(timestampOrderBy);
-	});
-
-	it('keeps the order when panelTypes is absent, since the explorers default to list', () => {
-		const staged = initOn(
-			ROUTES.LOGS_EXPLORER,
-			null,
-			queryWithTimestampOrder(initialQueriesMap.logs),
-		);
-
-		expect(staged?.builder.queryData[0].orderBy).toStrictEqual(timestampOrderBy);
-	});
-
-	it('keeps the order on the traces trace panel', () => {
-		const staged = initOn(
-			ROUTES.TRACES_EXPLORER,
-			PANEL_TYPES.TRACE,
-			queryWithTimestampOrder(initialQueriesMap.traces),
-		);
-
-		expect(staged?.builder.queryData[0].orderBy).toStrictEqual(timestampOrderBy);
-	});
-
-	// engineering-pod#2813: a timestamp order carried from the list view into the
-	// time series tab is not a group-by key or an aggregation, and errors the query.
-	it('drops the order on the time series panel', () => {
-		const staged = initOn(
-			ROUTES.LOGS_EXPLORER,
-			PANEL_TYPES.TIME_SERIES,
-			queryWithTimestampOrder(initialQueriesMap.logs),
-		);
-
-		expect(staged?.builder.queryData[0].orderBy).toStrictEqual([]);
-	});
-
-	it('keeps the order on the LLM observability list panel', () => {
-		const staged = initOn(
-			ROUTES.AI_OBSERVABILITY_EXPLORER,
-			PANEL_TYPES.LIST,
-			queryWithTimestampOrder(initialQueriesMap.traces),
-		);
-
-		expect(staged?.builder.queryData[0].orderBy).toStrictEqual(timestampOrderBy);
-	});
-
-	it('drops the order on the LLM observability time series panel', () => {
-		const staged = initOn(
-			ROUTES.AI_OBSERVABILITY_EXPLORER,
-			PANEL_TYPES.TIME_SERIES,
-			queryWithTimestampOrder(initialQueriesMap.traces),
-		);
-
-		expect(staged?.builder.queryData[0].orderBy).toStrictEqual([]);
-	});
-
-	it('drops the order on the table panel', () => {
-		const staged = initOn(
-			ROUTES.TRACES_EXPLORER,
-			PANEL_TYPES.TABLE,
-			queryWithTimestampOrder(initialQueriesMap.traces),
-		);
-
-		expect(staged?.builder.queryData[0].orderBy).toStrictEqual([]);
-	});
-});
-
-// handleRunQuery means "respect the query I just built" for the init it causes.
-// It used to stay set for the rest of the visit, so every later init skipped
-// sanitizing as well.
-describe('the run bypass is one-shot', () => {
-	afterEach(() => {
-		__resetSearchParamsGetter();
-	});
-
-	it('skips sanitizing for the init after a run, and sanitizes the next one', () => {
-		const { result } = renderOn(ROUTES.LOGS_EXPLORER, PANEL_TYPES.TIME_SERIES);
-
-		act(() => {
-			result.current.handleRunQuery();
-		});
-
-		const afterRun = {
-			...queryWithTimestampOrder(initialQueriesMap.logs),
-			id: 'run-1',
-		};
-		act(() => {
-			result.current.initQueryBuilderData(afterRun);
-		});
-		expect(
-			result.current.stagedQuery?.builder.queryData[0].orderBy,
-		).toStrictEqual(timestampOrderBy);
-
-		const next = {
-			...queryWithTimestampOrder(initialQueriesMap.logs),
-			id: 'run-2',
-		};
-		act(() => {
-			result.current.initQueryBuilderData(next);
-		});
-		expect(
-			result.current.stagedQuery?.builder.queryData[0].orderBy,
-		).toStrictEqual([]);
-	});
-});
--- a/frontend/src/utils/tests/explorerListOrderBy.test.ts
+++ b/frontend/src/utils/tests/explorerListOrderBy.test.ts
@@ -1,137 +0,0 @@
-import { initialQueriesMap } from 'constants/queryBuilder';
-import { Query } from 'types/api/queryBuilder/queryBuilderData';
-import {
-	DEFAULT_LIST_ORDER_BY,
-	getListOrderBy,
-	getRawPanelOrderBy,
-	parseListOrderBy,
-	setListOrderBy,
-} from 'utils/explorerUtils';
-
-const withOrderBy = (
-	orderBy: { columnName: string; order: string }[],
-): Query => ({
-	...initialQueriesMap.logs,
-	builder: {
-		...initialQueriesMap.logs.builder,
-		queryData: initialQueriesMap.logs.builder.queryData.map((item) => ({
-			...item,
-			orderBy,
-		})),
-	},
-});
-
-describe('getRawPanelOrderBy', () => {
-	it('keeps row fields', () => {
-		expect(
-			getRawPanelOrderBy(
-				withOrderBy([{ columnName: 'duration_nano', order: 'desc' }]),
-			),
-		).toStrictEqual([{ columnName: 'duration_nano', order: 'desc' }]);
-	});
-
-	it('keeps a group-by key, which is a row field too', () => {
-		expect(
-			getRawPanelOrderBy(
-				withOrderBy([{ columnName: 'service.name', order: 'asc' }]),
-			),
-		).toStrictEqual([{ columnName: 'service.name', order: 'asc' }]);
-	});
-
-	it('drops an aggregation carried in from an aggregated panel', () => {
-		expect(
-			getRawPanelOrderBy(withOrderBy([{ columnName: 'count()', order: 'desc' }])),
-		).toStrictEqual([]);
-	});
-
-	it('drops the aggregated value sentinel', () => {
-		expect(
-			getRawPanelOrderBy(
-				withOrderBy([{ columnName: '#SIGNOZ_VALUE', order: 'desc' }]),
-			),
-		).toStrictEqual([]);
-	});
-
-	it('keeps the usable entry and drops the rest', () => {
-		expect(
-			getRawPanelOrderBy(
-				withOrderBy([
-					{ columnName: 'count()', order: 'desc' },
-					{ columnName: 'timestamp', order: 'desc' },
-				]),
-			),
-		).toStrictEqual([{ columnName: 'timestamp', order: 'desc' }]);
-	});
-});
-
-describe('getListOrderBy', () => {
-	it('falls back to the default when the query holds only an aggregation', () => {
-		expect(
-			getListOrderBy(withOrderBy([{ columnName: 'count()', order: 'desc' }])),
-		).toBe(DEFAULT_LIST_ORDER_BY);
-	});
-
-	it('reads the first order entry as a select value', () => {
-		expect(
-			getListOrderBy(withOrderBy([{ columnName: 'timestamp', order: 'asc' }])),
-		).toBe('timestamp:asc');
-	});
-
-	it('lower-cases a hand-written direction from a deep link', () => {
-		expect(
-			getListOrderBy(withOrderBy([{ columnName: 'timestamp', order: 'ASC' }])),
-		).toBe('timestamp:asc');
-	});
-
-	it('shows the primary entry when the query also carries the id tiebreaker', () => {
-		const query = withOrderBy([
-			{ columnName: 'timestamp', order: 'desc' },
-			{ columnName: 'id', order: 'desc' },
-		]);
-
-		expect(getListOrderBy(query)).toBe('timestamp:desc');
-	});
-
-	it('falls back to the default when the query carries no order', () => {
-		expect(getListOrderBy(withOrderBy([]))).toBe(DEFAULT_LIST_ORDER_BY);
-		expect(getListOrderBy(null)).toBe(DEFAULT_LIST_ORDER_BY);
-	});
-
-	it('falls back to the given default', () => {
-		expect(getListOrderBy(withOrderBy([]), 'last_activity_time:desc')).toBe(
-			'last_activity_time:desc',
-		);
-	});
-});
-
-describe('parseListOrderBy', () => {
-	it('splits a select value into an order payload', () => {
-		expect(parseListOrderBy('durationNano:asc')).toStrictEqual({
-			columnName: 'durationNano',
-			order: 'asc',
-		});
-	});
-});
-
-describe('setListOrderBy', () => {
-	it('replaces the order on every queryData entry', () => {
-		const base = withOrderBy([{ columnName: 'timestamp', order: 'desc' }]);
-		const next = setListOrderBy(base, 'severity_text:asc');
-
-		next.builder.queryData.forEach((item) => {
-			expect(item.orderBy).toStrictEqual([
-				{ columnName: 'severity_text', order: 'asc' },
-			]);
-		});
-	});
-
-	it('does not mutate the query it is given', () => {
-		const base = withOrderBy([{ columnName: 'timestamp', order: 'desc' }]);
-
-		setListOrderBy(base, 'timestamp:asc');
-
-		expect(base.builder.queryData[0].orderBy).toStrictEqual([
-			{ columnName: 'timestamp', order: 'desc' },
-		]);
-	});
-});
--- a/frontend/src/utils/tests/readPanelTypeFromUrl.test.ts
+++ b/frontend/src/utils/tests/readPanelTypeFromUrl.test.ts
@@ -1,45 +0,0 @@
-import { PANEL_TYPES } from 'constants/queryBuilder';
-import {
-	__resetSearchParamsGetter,
-	__setSearchParamsGetterForTest,
-} from 'utils/getUnstableCurrentSearchParams';
-import { readPanelTypeFromUrl } from 'utils/readPanelTypeFromUrl';
-
-const withParam = (value?: string): void => {
-	const search = new URLSearchParams();
-	if (value !== undefined) {
-		search.set('panelTypes', value);
-	}
-	__setSearchParamsGetterForTest(() => search);
-};
-
-describe('readPanelTypeFromUrl', () => {
-	afterEach(() => {
-		__resetSearchParamsGetter();
-	});
-
-	it('decodes the JSON-encoded value the app writes', () => {
-		withParam(JSON.stringify(PANEL_TYPES.TIME_SERIES));
-
-		expect(readPanelTypeFromUrl()).toBe(PANEL_TYPES.TIME_SERIES);
-	});
-
-	it('accepts an unencoded value from a hand-written link', () => {
-		withParam('list');
-
-		expect(readPanelTypeFromUrl()).toBe(PANEL_TYPES.LIST);
-	});
-
-	it('returns the raw value instead of throwing on a malformed one', () => {
-		withParam('{list');
-
-		expect(readPanelTypeFromUrl()).toBe('{list');
-	});
-
-	it('returns the fallback when the param is absent', () => {
-		withParam();
-
-		expect(readPanelTypeFromUrl(PANEL_TYPES.LIST)).toBe(PANEL_TYPES.LIST);
-		expect(readPanelTypeFromUrl()).toBeNull();
-	});
-});
--- a/frontend/src/utils/explorerUtils.ts
+++ b/frontend/src/utils/explorerUtils.ts
@@ -1,69 +1,8 @@
 import { QueryParams } from 'constants/query';
 import { PANEL_TYPES } from 'constants/queryBuilder';
 import ROUTES from 'constants/routes';
-import { SIGNOZ_VALUE } from 'container/QueryBuilder/filters/OrderByFilter/constants';
 import { ExplorerViews } from 'pages/LogsExplorer/utils';
-import { OrderByPayload, Query } from 'types/api/queryBuilder/queryBuilderData';
-
-import { getParsedAggregationOptionsForOrderBy } from './aggregationConverter';
-
-export const DEFAULT_LIST_ORDER_BY = 'timestamp:desc';
-
-export const getRawPanelOrderBy = (query: Query | null): OrderByPayload[] => {
-	const queryData = query?.builder?.queryData?.[0];
-
-	if (!queryData) {
-		return [];
-	}
-
-	const disallowed = new Set<string>([SIGNOZ_VALUE]);
-	getParsedAggregationOptionsForOrderBy(queryData).forEach((aggregation) => {
-		if (aggregation?.key) {
-			disallowed.add(aggregation.key);
-		}
-	});
-
-	return (queryData.orderBy ?? []).filter(
-		(item) => !disallowed.has(item.columnName),
-	);
-};
-
-export const getListOrderBy = (
-	query: Query | null,
-	fallback: string = DEFAULT_LIST_ORDER_BY,
-): string => {
-	const [orderBy] = getRawPanelOrderBy(query);
-
-	if (!orderBy?.columnName || !orderBy?.order) {
-		return fallback;
-	}
-
-	return `${orderBy.columnName}:${orderBy.order.toLowerCase()}`;
-};
-
-export const parseListOrderBy = (orderBy: string): OrderByPayload => {
-	const [columnName, order] = orderBy.split(':');
-
-	return {
-		columnName: columnName || 'timestamp',
-		order: order || 'desc',
-	};
-};
-
-export const setListOrderBy = (query: Query, orderBy: string): Query => {
-	const nextOrderBy = [parseListOrderBy(orderBy)];
-
-	return {
-		...query,
-		builder: {
-			...query.builder,
-			queryData: query.builder.queryData.map((item) => ({
-				...item,
-				orderBy: nextOrderBy,
-			})),
-		},
-	};
-};
+import { Query } from 'types/api/queryBuilder/queryBuilderData';

 // Mapping between panel types and explorer views
 export const panelTypeToExplorerView: Record<PANEL_TYPES, ExplorerViews> = {
--- a/frontend/src/utils/readPanelTypeFromUrl.ts
+++ b/frontend/src/utils/readPanelTypeFromUrl.ts
@@ -1,21 +0,0 @@
-import { QueryParams } from 'constants/query';
-import { PANEL_TYPES } from 'constants/queryBuilder';
-
-import { getUnstableCurrentSearchParams } from './getUnstableCurrentSearchParams';
-
-// The param is JSON-encoded, but a hand-written link can carry it unencoded.
-export const readPanelTypeFromUrl = (
-	fallback: PANEL_TYPES | null = null,
-): PANEL_TYPES | null => {
-	const raw = getUnstableCurrentSearchParams().get(QueryParams.panelTypes);
-
-	if (!raw) {
-		return fallback;
-	}
-
-	try {
-		return JSON.parse(raw) as PANEL_TYPES;
-	} catch {
-		return raw as PANEL_TYPES;
-	}
-};
--- a/pkg/query-service/app/logparsingpipeline/collector_config.go
+++ b/pkg/query-service/app/logparsingpipeline/collector_config.go
@@ -2,7 +2,6 @@ package logparsingpipeline

 import (
 	"encoding/json"
-	"slices"
 	"strings"
 	"sync"

@@ -25,13 +24,10 @@ var (
 )

 const (
-	memoryLimiterProcessor        = "memory_limiter"
-	memoryLimiterProcessorPrefix  = "memory_limiter/"
-	batchProcessor                = "batch"
-	batchProcessorPrefix          = "batch/"
-	normalizerProcessor           = "signozlogsnormalizer"
-	normalizerProcessorPrefix     = "signozlogsnormalizer/"
-	userPipelinesBeforeNormalizer = "before"
+	memoryLimiterProcessor       = "memory_limiter"
+	memoryLimiterProcessorPrefix = "memory_limiter/"
+	batchProcessor               = "batch"
+	batchProcessorPrefix         = "batch/"
 )

 // check if the processors already exist
@@ -94,14 +90,9 @@ func getOtelPipelineFromConfig(config map[string]interface{}) (*otelPipeline, er
 //  2. signoz user-pipeline processors (in the order given by signozPipelineProcessorNames)
 //  3. custom processors (non-signoz, non-memory_limiter, non-batch processors from the current config)
 //  4. batch processors (any processor named "batch" or "batch/<id>") and anything after them
-//
-// If a signozlogsnormalizer processor is present, the order above is skipped: user-pipeline
-// processors go right after the first one, or right before it when its config sets
-// `opamp.position: before`, and the other processors keep their places.
 func buildCollectorPipelineProcessorsList(
 	currentCollectorProcessors []string,
 	signozPipelineProcessorNames []string,
-	processorConfigs map[string]interface{},
 ) ([]string, error) {
 	lockLogsPipelineSpec.Lock()
 	defer lockLogsPipelineSpec.Unlock()
@@ -112,23 +103,6 @@ func buildCollectorPipelineProcessorsList(
 		userPipelineSet[p] = struct{}{}
 	}

-	if normalizerIdx := slices.IndexFunc(currentCollectorProcessors, isNormalizerProcessor); normalizerIdx >= 0 {
-		before := normalizerPosition(processorConfigs, currentCollectorProcessors[normalizerIdx]) == userPipelinesBeforeNormalizer
-		result := make([]string, 0, len(currentCollectorProcessors)+len(signozPipelineProcessorNames))
-		for idx, p := range currentCollectorProcessors {
-			if idx == normalizerIdx && before {
-				result = append(result, signozPipelineProcessorNames...)
-			}
-			if _, inUserPipelines := userPipelineSet[p]; !inUserPipelines && !hasSignozPipelineProcessorPrefix(p) {
-				result = append(result, p)
-			}
-			if idx == normalizerIdx && !before {
-				result = append(result, signozPipelineProcessorNames...)
-			}
-		}
-		return result, nil
-	}
-
 	var memoryLimiters []string
 	var customProcessors []string
 	batchIdx := -1
@@ -161,37 +135,6 @@ func buildCollectorPipelineProcessorsList(
 	return result, nil
 }

-func isNormalizerProcessor(name string) bool {
-	return name == normalizerProcessor || strings.HasPrefix(name, normalizerProcessorPrefix)
-}
-
-// normalizesBeforeUserPipelines reports whether the logs pipeline of the collector config runs
-// signozlogsnormalizer ahead of user pipelines, judged by the first one as in buildCollectorPipelineProcessorsList.
-// Malformed configs report false; GenerateCollectorConfigWithPipelines surfaces their errors.
-func normalizesBeforeUserPipelines(config []byte) bool {
-	var collectorConf map[string]interface{}
-	if err := yaml.Unmarshal(config, &collectorConf); err != nil {
-		return false
-	}
-	p, err := getOtelPipelineFromConfig(collectorConf)
-	if err != nil || p.Pipelines.Logs == nil {
-		return false
-	}
-	normalizerIdx := slices.IndexFunc(p.Pipelines.Logs.Processors, isNormalizerProcessor)
-	if normalizerIdx < 0 {
-		return false
-	}
-	processorConfigs, _ := collectorConf["processors"].(map[string]interface{})
-	return normalizerPosition(processorConfigs, p.Pipelines.Logs.Processors[normalizerIdx]) != userPipelinesBeforeNormalizer
-}
-
-func normalizerPosition(processorConfigs map[string]interface{}, name string) string {
-	config, _ := processorConfigs[name].(map[string]interface{})
-	opamp, _ := config["opamp"].(map[string]interface{})
-	position, _ := opamp["position"].(string)
-	return position
-}
-
 func GenerateCollectorConfigWithPipelines(config []byte, pipelines []pipelinetypes.GettablePipeline) ([]byte, error) {
 	var collectorConf map[string]interface{}
 	err := yaml.Unmarshal([]byte(config), &collectorConf)
@@ -237,9 +180,7 @@ func GenerateCollectorConfigWithPipelines(config []byte, pipelines []pipelinetyp
 		return nil, errors.NewInternalf(CodeCollectorConfigLogsPipelineNotFound, "logs pipeline doesn't exist")
 	}

-	updatedProcessorList, _ := buildCollectorPipelineProcessorsList(
-		p.Pipelines.Logs.Processors, signozPipelineProcNames, collectorConf["processors"].(map[string]interface{}),
-	)
+	updatedProcessorList, _ := buildCollectorPipelineProcessorsList(p.Pipelines.Logs.Processors, signozPipelineProcNames)
 	p.Pipelines.Logs.Processors = updatedProcessorList

 	// add the new processor to the data ( no checks required as the keys will exists)
--- a/pkg/query-service/app/logparsingpipeline/collector_config_test.go
+++ b/pkg/query-service/app/logparsingpipeline/collector_config_test.go
@@ -5,14 +5,11 @@ import (
 	"fmt"
 	"testing"

-	"github.com/SigNoz/signoz/pkg/flagger/flaggertest"
 	"github.com/SigNoz/signoz/pkg/query-service/constants"
 	"github.com/SigNoz/signoz/pkg/query-service/model"
 	v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3"
 	"github.com/SigNoz/signoz/pkg/types/pipelinetypes"
-	"github.com/SigNoz/signoz/pkg/valuer"
 	. "github.com/smartystreets/goconvey/convey"
-	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"gopkg.in/yaml.v3"
 )
@@ -209,7 +206,7 @@ var BuildLogsPipelineTestData = []struct {
 func TestBuildLogsPipeline(t *testing.T) {
 	for _, test := range BuildLogsPipelineTestData {
 		Convey(test.Name, t, func() {
-			v, err := buildCollectorPipelineProcessorsList(test.fromCollector, test.userPipelines, nil)
+			v, err := buildCollectorPipelineProcessorsList(test.fromCollector, test.userPipelines)
 			So(err, ShouldBeNil)
 			So(v, ShouldResemble, test.finalOutput)
 		})
@@ -440,61 +437,3 @@ func TestPipeCharInAliasDoesntBreakCollectorConfig(t *testing.T) {
 		}, result[0].Attributes_string,
 	)
 }
-
-func TestRecommendAgentConfigWithNormalizerProcessorAndJSONBody(t *testing.T) {
-	userPipeline := makeTestAddAttributePipeline()
-	controller := &LogParsingPipelineController{
-		fl: flaggertest.WithUseJSONBody(t, true),
-		GetIntegrationPipelines: func(context.Context, string) ([]pipelinetypes.GettablePipeline, error) {
-			return []pipelinetypes.GettablePipeline{userPipeline}, nil
-		},
-	}
-	normalizeOperator := CollectorConfProcessorName(getNormalizePipeline(false))
-	user := CollectorConfProcessorName(userPipeline)
-
-	testCases := []struct {
-		name       string
-		processors string
-		logs       string
-		expected   []any
-	}{
-		{
-			name:     "NoNormalizer_OperatorPrepended",
-			logs:     "[memory_limiter, batch]",
-			expected: []any{"memory_limiter", normalizeOperator, user, "batch"},
-		},
-		{
-			name:     "NormalizerDefault_OperatorDropped",
-			logs:     "[memory_limiter, signozlogsnormalizer, batch]",
-			expected: []any{"memory_limiter", "signozlogsnormalizer", user, "batch"},
-		},
-		{
-			name:       "NormalizerAfter_OperatorDropped",
-			processors: "signozlogsnormalizer:\n    opamp:\n      position: after\n",
-			logs:       "[memory_limiter, signozlogsnormalizer, batch]",
-			expected:   []any{"memory_limiter", "signozlogsnormalizer", user, "batch"},
-		},
-		{
-			name:       "NormalizerBefore_OperatorKept",
-			processors: "signozlogsnormalizer:\n    opamp:\n      position: before\n",
-			logs:       "[memory_limiter, signozlogsnormalizer, batch]",
-			expected:   []any{"memory_limiter", normalizeOperator, user, "signozlogsnormalizer", "batch"},
-		},
-	}
-	for _, testCase := range testCases {
-		t.Run(testCase.name, func(t *testing.T) {
-			conf := fmt.Sprintf(
-				"processors:\n  memory_limiter: {}\n  batch: {}\n  %s\nservice:\n  pipelines:\n    logs:\n      receivers: [otlp]\n      processors: %s\n      exporters: [clickhouselogsexporter]\n",
-				testCase.processors, testCase.logs,
-			)
-
-			recommended, _, err := controller.RecommendAgentConfig(valuer.GenerateUUID(), []byte(conf), nil)
-			require.NoError(t, err)
-
-			var recommendedConf map[string]any
-			require.NoError(t, yaml.Unmarshal(recommended, &recommendedConf))
-			logs := recommendedConf["service"].(map[string]any)["pipelines"].(map[string]any)["logs"].(map[string]any)
-			assert.Equal(t, testCase.expected, logs["processors"])
-		})
-	}
-}
--- a/pkg/query-service/app/logparsingpipeline/controller.go
+++ b/pkg/query-service/app/logparsingpipeline/controller.go
@@ -224,15 +224,11 @@ func (ic *LogParsingPipelineController) ValidatePipelines(ctx context.Context,
 // when queries run on body_v2 (use_json_body), so operators see the body the explorer shows.
 // After them when dual ingestion alone writes body_v2, so operators keep seeing the raw body
 // users still query. Absent when neither flag is on.
-// The leading one is dropped when normalizedUpstream: the collector already normalizes before user pipelines.
-func (ic *LogParsingPipelineController) withNormalizePipeline(ctx context.Context, orgID valuer.UUID, pipelines []pipelinetypes.GettablePipeline, normalizedUpstream bool) []pipelinetypes.GettablePipeline {
+func (ic *LogParsingPipelineController) withNormalizePipeline(ctx context.Context, orgID valuer.UUID, pipelines []pipelinetypes.GettablePipeline) []pipelinetypes.GettablePipeline {
 	evalCtx := featuretypes.NewFlaggerEvaluationContext(orgID)
 	dualIngestion := ic.fl.BooleanOrEmpty(ctx, flagger.FeatureJSONBodyDualIngestion, evalCtx)
 	switch {
 	case ic.fl.BooleanOrEmpty(ctx, flagger.FeatureUseJSONBody, evalCtx):
-		if normalizedUpstream {
-			return pipelines
-		}
 		return append([]pipelinetypes.GettablePipeline{getNormalizePipeline(dualIngestion)}, pipelines...)
 	case dualIngestion:
 		return append(slices.Clone(pipelines), getNormalizePipeline(true))
@@ -436,7 +432,7 @@ func (pc *LogParsingPipelineController) RecommendAgentConfig(
 	}

 	// normalize is only for sending to the collector, never persisted
-	enrichedPipelines = pc.withNormalizePipeline(ctx, orgId, enrichedPipelines, normalizesBeforeUserPipelines(currentConfYaml))
+	enrichedPipelines = pc.withNormalizePipeline(ctx, orgId, enrichedPipelines)

 	updatedConf, err := GenerateCollectorConfigWithPipelines(currentConfYaml, enrichedPipelines)
 	if err != nil {
--- a/pkg/types/dashboardtypes/perses_dashboard_data.go
+++ b/pkg/types/dashboardtypes/perses_dashboard_data.go
@@ -123,10 +123,22 @@ func (d *DashboardSpec) validatePanels() error {
 				return err
 			}
 		}
+		// validatePanelQueryCount left exactly one query for a spec that reads it.
+		if spec, ok := panel.Spec.Plugin.Spec.(queryBoundPanelSpec); ok {
+			if err := spec.validateAgainstQuery(panel.Spec.Queries[0], path+".spec.plugin.spec"); err != nil {
+				return err
+			}
+		}
 	}
 	return nil
 }

+// queryBoundPanelSpec is a panel spec with fields that depend on the panel's
+// query. It is checked after the query itself validates.
+type queryBoundPanelSpec interface {
+	validateAgainstQuery(query Query, path string) error
+}
+
 func validatePanelQueryCount(queries []Query, panelKind PanelPluginKind, path string) error {
 	if queries == nil {
 		return errors.NewInvalidInputf(ErrCodeDashboardInvalidInput, "%s.spec.queries: is required and must not be null; use [] for a panel that renders without a query", path)
--- a/pkg/types/dashboardtypes/perses_dashboard_test.go
+++ b/pkg/types/dashboardtypes/perses_dashboard_test.go
@@ -1869,6 +1869,319 @@ func TestInvalidateAreaChartPanelSpecValues(t *testing.T) {
 	}
 }

+func TestScatterPlotPanelDefaults(t *testing.T) {
+	data := []byte(`{
+		"variables": [],
+		"panels": {
+			"p1": {
+				"kind": "Panel",
+				"spec": {
+					"links": [],
+					"plugin": {
+						"kind": "signoz/ScatterPlotPanel",
+						"spec": {}
+					},
+					"queries": [{"kind": "scalar", "spec": {"plugin": {"kind": "signoz/ClickHouseSQL", "spec": {"name": "A", "query": "SELECT 1"}}}}]
+				}
+			}
+		},
+		"links": [],
+		"layouts": []
+	}`)
+	d, err := unmarshalDashboard(data)
+	require.NoError(t, err, "unmarshal and validate failed")
+
+	require.IsType(t, &ScatterPlotPanelSpec{}, d.Panels["p1"].Spec.Plugin.Spec)
+	spec := d.Panels["p1"].Spec.Plugin.Spec.(*ScatterPlotPanelSpec)
+
+	assert.Empty(t, spec.Dimensions.X, "an omitted x stays empty so the renderer picks the first value column")
+	assert.Empty(t, spec.Dimensions.Y, "an omitted y stays empty so the renderer picks the second value column")
+	assert.Empty(t, spec.Dimensions.ColorBy, "an omitted colorBy stays empty so the renderer colours by every group-by label")
+	assert.Equal(t, "auto", spec.Axes.X.Scale.ValueOrDefault(), "expected x scale default auto")
+	assert.Equal(t, "auto", spec.Axes.Y.Scale.ValueOrDefault(), "expected y scale default auto")
+	assert.Nil(t, spec.Axes.X.SoftMin, "expected x softMin unset")
+	assert.Equal(t, "2", spec.Formatting.DecimalPrecision.ValueOrDefault(), "expected DecimalPrecision default 2")
+	assert.Equal(t, "global_time", spec.Visualization.TimePreference.ValueOrDefault(), "expected TimePreference default global_time")
+	assert.Equal(t, "bottom", spec.Legend.Position.ValueOrDefault(), "expected LegendPosition default bottom")
+
+	output, err := json.Marshal(d)
+	require.NoError(t, err, "marshal dashboard failed")
+	assert.Contains(t, string(output), `"axes":{"x":{"softMin":null,"softMax":null,"scale":"auto","label":""},"y":{"softMin":null,"softMax":null,"scale":"auto","label":""}}`, "expected default axes in stored/response JSON")
+	assert.Contains(t, string(output), `"dimensions":{"x":"","y":"","sizeBy":"","colorBy":null}`, "expected empty dimensions in stored/response JSON")
+	assert.Contains(t, string(output), `"chartAppearance":{"points":{"size":null,"minSize":null,"maxSize":null,"opacity":null}}`, "omitted point settings stay null so the renderer applies its defaults")
+}
+
+func TestValidateScatterPlotDashboard(t *testing.T) {
+	data, err := os.ReadFile("testdata/perses_scatter_plot_panel.json")
+	require.NoError(t, err, "reading example file")
+
+	spec, err := unmarshalDashboard(data)
+	require.NoError(t, err, "unmarshal and validate failed")
+
+	require.IsType(t, &ScatterPlotPanelSpec{}, spec.Panels["p1"].Spec.Plugin.Spec)
+	panelSpec := spec.Panels["p1"].Spec.Plugin.Spec.(*ScatterPlotPanelSpec)
+	softMin, softMax := 0.0, 1000.0
+	size, minSize, maxSize, opacity := PointDiameter(8), PointDiameter(4), PointDiameter(24), PointOpacity(0.1)
+	assert.Equal(t, &ScatterPlotPanelSpec{
+		Visualization: BasicVisualization{TimePreference: TimePreferenceLast1Hr},
+		Dimensions:    ScatterPlotDimensions{X: "A.count()", Y: "A.p99(duration_nano)", SizeBy: "A.countIf(has_error = true)", ColorBy: []string{"k8s.namespace.name", "k8s.pod.name"}},
+		Formatting:    TableFormatting{ColumnUnits: map[string]string{"A.p99(duration_nano)": "ns"}, DecimalPrecision: PrecisionOption1},
+		Axes: ScatterPlotAxes{
+			X: ScatterPlotAxis{SoftMin: &softMin, Scale: AxisScaleLog, Label: "Throughput"},
+			Y: ScatterPlotAxis{SoftMax: &softMax, Scale: AxisScaleSymlog, Label: "p99 latency"},
+		},
+		ChartAppearance: ScatterPlotChartAppearance{Points: ScatterPlotPoints{Size: &size, MinSize: &minSize, MaxSize: &maxSize, Opacity: &opacity}},
+		Legend:          Legend{Position: LegendPositionRight, Mode: LegendModeList, CustomColors: map[string]string{"checkout": "#1f77b4"}},
+		Thresholds: []ScatterPlotThreshold{
+			{ThresholdWithLabel: ThresholdWithLabel{Value: 300, Unit: "ms", Color: "#f00", Label: "p99 SLO"}, Axis: ThresholdAxisY},
+			{ThresholdWithLabel: ThresholdWithLabel{Value: 50, Color: "#0f0"}, Axis: ThresholdAxisX},
+		},
+	}, panelSpec)
+
+	dashboard := &DashboardV2{Spec: *spec}
+	request, err := dashboard.GetPanelQuery(1, 2, "p1")
+	require.NoError(t, err, "building the panel's query failed")
+	assert.Equal(t, qb.RequestTypeScalar, request.RequestType)
+	require.NotNil(t, request.FormatOptions)
+	assert.True(t, request.FormatOptions.FormatTableResultForUI, "scatter rows are joined the way a table's are")
+
+	require.Len(t, request.CompositeQuery.Queries, 1)
+	query, ok := request.CompositeQuery.Queries[0].Spec.(qb.QueryBuilderQuery[qb.TraceAggregation])
+	require.True(t, ok, "expected a traces builder query")
+	assert.Len(t, query.Aggregations, 3)
+	assert.Len(t, query.GroupBy, 2)
+
+	require.NoError(t, request.Validate(), "the request built from the panel is not a valid scalar request")
+
+	// the panel read back out of storage draws the same scatter plot
+	stored, err := json.Marshal(spec)
+	require.NoError(t, err, "marshal dashboard failed")
+	reread, err := unmarshalDashboard(stored)
+	require.NoError(t, err, "the stored dashboard does not validate")
+	assert.Equal(t, panelSpec, reread.Panels["p1"].Spec.Plugin.Spec)
+	rereadRequest, err := (&DashboardV2{Spec: *reread}).GetPanelQuery(1, 2, "p1")
+	require.NoError(t, err, "building the stored panel's query failed")
+	assert.Equal(t, request, rereadRequest)
+}
+
+func TestInvalidateScatterPlotPanelSpecValues(t *testing.T) {
+	tests := []struct {
+		scenario               string
+		panelKind              string
+		panelSpec              string
+		expectedErrorSubstring string
+	}{
+		{
+			scenario:               "unknown axis scale",
+			panelKind:              "signoz/ScatterPlotPanel",
+			panelSpec:              `{"axes": {"x": {"scale": "sqrt"}}}`,
+			expectedErrorSubstring: "invalid axis scale \"sqrt\": must be `auto`, `linear`, `log`, or `symlog`",
+		},
+		{
+			scenario:               "non-string axis scale",
+			panelKind:              "signoz/ScatterPlotPanel",
+			panelSpec:              `{"axes": {"y": {"scale": true}}}`,
+			expectedErrorSubstring: "cannot unmarshal bool",
+		},
+		{
+			scenario:               "isLogScale on a scatter plot axis",
+			panelKind:              "signoz/ScatterPlotPanel",
+			panelSpec:              `{"axes": {"x": {"isLogScale": true}}}`,
+			expectedErrorSubstring: "unknown field",
+		},
+		{
+			scenario:               "single-axis axes shape on a scatter plot panel",
+			panelKind:              "signoz/ScatterPlotPanel",
+			panelSpec:              `{"axes": {"softMin": 0}}`,
+			expectedErrorSubstring: "unknown field",
+		},
+		{
+			scenario:               "unknown threshold axis",
+			panelKind:              "signoz/ScatterPlotPanel",
+			panelSpec:              `{"thresholds": [{"value": 1, "color": "#f00", "axis": "z"}]}`,
+			expectedErrorSubstring: "invalid threshold axis \"z\": must be `x` or `y`",
+		},
+		{
+			scenario:               "unknown dimension",
+			panelKind:              "signoz/ScatterPlotPanel",
+			panelSpec:              `{"dimensions": {"z": "A"}}`,
+			expectedErrorSubstring: "unknown field",
+		},
+		{
+			scenario:               "point size below the minimum",
+			panelKind:              "signoz/ScatterPlotPanel",
+			panelSpec:              `{"chartAppearance": {"points": {"size": 1}}}`,
+			expectedErrorSubstring: "invalid point diameter 1: must be a whole number between 2 and 40",
+		},
+		{
+			scenario:               "max point size above the maximum",
+			panelKind:              "signoz/ScatterPlotPanel",
+			panelSpec:              `{"chartAppearance": {"points": {"maxSize": 41}}}`,
+			expectedErrorSubstring: "invalid point diameter 41",
+		},
+		{
+			scenario:               "fractional point size",
+			panelKind:              "signoz/ScatterPlotPanel",
+			panelSpec:              `{"chartAppearance": {"points": {"minSize": 4.5}}}`,
+			expectedErrorSubstring: "cannot unmarshal number 4.5",
+		},
+		{
+			scenario:               "min point size above max",
+			panelKind:              "signoz/ScatterPlotPanel",
+			panelSpec:              `{"chartAppearance": {"points": {"minSize": 20, "maxSize": 10}}}`,
+			expectedErrorSubstring: "minSize 20 must not exceed maxSize 10",
+		},
+		{
+			scenario:               "point opacity below the floor",
+			panelKind:              "signoz/ScatterPlotPanel",
+			panelSpec:              `{"chartAppearance": {"points": {"opacity": 0.05}}}`,
+			expectedErrorSubstring: "invalid point opacity 0.05: must be between 0.1 and 1",
+		},
+		{
+			scenario:               "point opacity as a percentage",
+			panelKind:              "signoz/ScatterPlotPanel",
+			panelSpec:              `{"chartAppearance": {"points": {"opacity": 70}}}`,
+			expectedErrorSubstring: "invalid point opacity 70",
+		},
+		{
+			scenario:               "area fill fields on a scatter plot",
+			panelKind:              "signoz/ScatterPlotPanel",
+			panelSpec:              `{"chartAppearance": {"fillOpacity": 0.5}}`,
+			expectedErrorSubstring: "unknown field",
+		},
+		{
+			scenario:               "a single colour key as a string",
+			panelKind:              "signoz/ScatterPlotPanel",
+			panelSpec:              `{"dimensions": {"colorBy": "service.name"}}`,
+			expectedErrorSubstring: "cannot unmarshal string",
+		},
+		{
+			scenario:               "panel-wide unit on a scatter plot panel",
+			panelKind:              "signoz/ScatterPlotPanel",
+			panelSpec:              `{"formatting": {"unit": "ms"}}`,
+			expectedErrorSubstring: "unknown field",
+		},
+		{
+			scenario:               "threshold without a color",
+			panelKind:              "signoz/ScatterPlotPanel",
+			panelSpec:              `{"thresholds": [{"value": 300}]}`,
+			expectedErrorSubstring: "Color' Error:Field validation for 'Color' failed on the 'required' tag",
+		},
+		{
+			scenario:               "scale on a time series panel",
+			panelKind:              "signoz/TimeSeriesPanel",
+			panelSpec:              `{"axes": {"scale": "log"}}`,
+			expectedErrorSubstring: "unknown field",
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.scenario, func(t *testing.T) {
+			data := []byte(`{
+				"variables": [],
+				"panels": {
+					"p1": {
+						"kind": "Panel",
+						"spec": {
+							"links": [],
+							"plugin": {"kind": "` + test.panelKind + `", "spec": ` + test.panelSpec + `},
+							"queries": [{"kind": "scalar", "spec": {"plugin": {"kind": "signoz/ClickHouseSQL", "spec": {"name": "A", "query": "SELECT 1"}}}}]
+						}
+					}
+				},
+				"links": [],
+				"layouts": []
+			}`)
+			_, err := unmarshalDashboard(data)
+			require.Error(t, err, "expected the spec to be rejected")
+			assert.Contains(t, err.Error(), test.expectedErrorSubstring, "unexpected error message: %s", err.Error())
+		})
+	}
+}
+
+func TestScatterPlotDimensionsBindToQuery(t *testing.T) {
+	tests := []struct {
+		scenario               string
+		queryPlugin            string
+		dimensions             string
+		expectedErrorSubstring string
+	}{
+		{
+			scenario:    "a single-aggregation query is one value column keyed by its name",
+			queryPlugin: `{"kind": "signoz/BuilderQuery", "spec": {"name": "A", "signal": "traces", "aggregations": [{"expression": "count()"}], "groupBy": [{"name": "service.name"}]}}`,
+			dimensions:  `{"x": "A", "colorBy": ["service.name"]}`,
+		},
+		{
+			scenario:               "a multi-aggregation query keys each value column by name and expression",
+			queryPlugin:            `{"kind": "signoz/BuilderQuery", "spec": {"name": "A", "signal": "traces", "aggregations": [{"expression": "count()"}, {"expression": "p99(duration_nano)"}]}}`,
+			dimensions:             `{"x": "A"}`,
+			expectedErrorSubstring: "dimensions.x: \"A\" is not a value column of the panel's query; value columns: `A.count()`, `A.p99(duration_nano)`",
+		},
+		{
+			scenario:               "a value column of a query the panel does not have",
+			queryPlugin:            `{"kind": "signoz/BuilderQuery", "spec": {"name": "A", "signal": "logs", "aggregations": [{"expression": "count()"}]}}`,
+			dimensions:             `{"y": "B"}`,
+			expectedErrorSubstring: "dimensions.y: \"B\" is not a value column of the panel's query; value columns: `A`",
+		},
+		{
+			scenario:               "a colour key the query does not group by",
+			queryPlugin:            `{"kind": "signoz/BuilderQuery", "spec": {"name": "A", "signal": "traces", "aggregations": [{"expression": "count()"}], "groupBy": [{"name": "service.name"}]}}`,
+			dimensions:             `{"colorBy": ["service.name", "k8s.pod.name"]}`,
+			expectedErrorSubstring: "dimensions.colorBy: \"k8s.pod.name\" is not a group-by key of the panel's query; group-by keys: `service.name`",
+		},
+		{
+			scenario: "a formula is a value column and carries the labels of the disabled queries it reads",
+			queryPlugin: `{"kind": "signoz/CompositeQuery", "spec": {"queries": [
+				{"type": "builder_query", "spec": {"name": "A", "signal": "traces", "disabled": true, "aggregations": [{"expression": "count()"}], "groupBy": [{"name": "service.name"}]}},
+				{"type": "builder_query", "spec": {"name": "B", "signal": "traces", "disabled": true, "aggregations": [{"expression": "countIf(has_error = true)"}], "groupBy": [{"name": "service.name"}]}},
+				{"type": "builder_formula", "spec": {"name": "F1", "expression": "B / A"}}
+			]}}`,
+			dimensions: `{"x": "F1", "colorBy": ["service.name"]}`,
+		},
+		{
+			scenario: "a disabled query yields no value column",
+			queryPlugin: `{"kind": "signoz/CompositeQuery", "spec": {"queries": [
+				{"type": "builder_query", "spec": {"name": "A", "signal": "logs", "disabled": true, "aggregations": [{"expression": "count()"}]}},
+				{"type": "builder_formula", "spec": {"name": "F1", "expression": "A * 2"}}
+			]}}`,
+			dimensions:             `{"sizeBy": "A"}`,
+			expectedErrorSubstring: "dimensions.sizeBy: \"A\" is not a value column of the panel's query; value columns: `F1`",
+		},
+		{
+			scenario:    "clickhouse columns are only known at run time, so the bindings go unchecked",
+			queryPlugin: `{"kind": "signoz/ClickHouseSQL", "spec": {"name": "A", "query": "SELECT 1"}}`,
+			dimensions:  `{"x": "throughput", "colorBy": ["pod"]}`,
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.scenario, func(t *testing.T) {
+			data := []byte(`{
+				"variables": [],
+				"panels": {
+					"p1": {
+						"kind": "Panel",
+						"spec": {
+							"links": [],
+							"plugin": {"kind": "signoz/ScatterPlotPanel", "spec": {"dimensions": ` + test.dimensions + `}},
+							"queries": [{"kind": "scalar", "spec": {"plugin": ` + test.queryPlugin + `}}]
+						}
+					}
+				},
+				"links": [],
+				"layouts": []
+			}`)
+			_, err := unmarshalDashboard(data)
+			if test.expectedErrorSubstring == "" {
+				require.NoError(t, err)
+				return
+			}
+			require.Error(t, err, "expected the binding to be rejected")
+			assert.Contains(t, err.Error(), test.expectedErrorSubstring, "unexpected error message: %s", err.Error())
+		})
+	}
+}
+
 func TestNumberPanelDefaults(t *testing.T) {
 	data := []byte(`{
 		"variables": [],
@@ -2190,7 +2503,7 @@ func TestPanelTypeQueryTypeCompatibility(t *testing.T) {
 		switch panelKind {
 		case "signoz/ListPanel":
 			return "raw"
-		case "signoz/TablePanel", "signoz/NumberPanel", "signoz/PieChartPanel", "signoz/HistogramPanel":
+		case "signoz/TablePanel", "signoz/NumberPanel", "signoz/PieChartPanel", "signoz/HistogramPanel", "signoz/ScatterPlotPanel":
 			return "scalar"
 		default:
 			return "time_series"
@@ -2232,14 +2545,17 @@ func TestPanelTypeQueryTypeCompatibility(t *testing.T) {
 		{"TimeSeries+PromQL", mkQuery("signoz/TimeSeriesPanel", "signoz/PromQLQuery", `{"name":"A","query":"up"}`), false},
 		{"Table+ClickHouse", mkQuery("signoz/TablePanel", "signoz/ClickHouseSQL", `{"name":"A","query":"SELECT 1"}`), false},
 		{"List+Builder", mkQuery("signoz/ListPanel", "signoz/BuilderQuery", `{"name":"A","signal":"logs"}`), false},
+		{"ScatterPlot+ClickHouse", mkQuery("signoz/ScatterPlotPanel", "signoz/ClickHouseSQL", `{"name":"A","query":"SELECT 1"}`), false},
 		// Top-level: rejected
 		{"Table+PromQL", mkQuery("signoz/TablePanel", "signoz/PromQLQuery", `{"name":"A","query":"up"}`), true},
+		{"ScatterPlot+PromQL", mkQuery("signoz/ScatterPlotPanel", "signoz/PromQLQuery", `{"name":"A","query":"up"}`), true},
 		{"List+ClickHouse", mkQuery("signoz/ListPanel", "signoz/ClickHouseSQL", `{"name":"A","query":"SELECT 1"}`), true},
 		{"List+PromQL", mkQuery("signoz/ListPanel", "signoz/PromQLQuery", `{"name":"A","query":"up"}`), true},
 		{"List+Composite", mkQuery("signoz/ListPanel", "signoz/CompositeQuery", `{"queries":[]}`), true},
 		{"List+Formula", mkQuery("signoz/ListPanel", "signoz/Formula", `{"name":"F1","expression":"A+B"}`), true},
 		// Composite sub-queries
 		{"Table+Composite(promql)", mkComposite("signoz/TablePanel", "promql", `{"name":"A","query":"up"}`), true},
+		{"ScatterPlot+Composite(promql)", mkComposite("signoz/ScatterPlotPanel", "promql", `{"name":"A","query":"up"}`), true},
 		{"Table+Composite(clickhouse)", mkComposite("signoz/TablePanel", "clickhouse_sql", `{"name":"A","query":"SELECT 1"}`), false},
 	}

--- a/pkg/types/dashboardtypes/perses_plugin_wrappers.go
+++ b/pkg/types/dashboardtypes/perses_plugin_wrappers.go
@@ -28,16 +28,17 @@ type PanelPlugin struct {
 // (and strips the duplicate parent properties) after reflection.
 func (PanelPlugin) PrepareJSONSchema(s *jsonschema.Schema) error {
 	return markDiscriminator(s, "kind", map[string]string{
-		string(PanelKindTimeSeries): schemaRef("DashboardtypesPanelPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesTimeSeriesPanelSpec"),
-		string(PanelKindBarChart):   schemaRef("DashboardtypesPanelPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesBarChartPanelSpec"),
-		string(PanelKindAreaChart):  schemaRef("DashboardtypesPanelPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesAreaChartPanelSpec"),
-		string(PanelKindNumber):     schemaRef("DashboardtypesPanelPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesNumberPanelSpec"),
-		string(PanelKindPieChart):   schemaRef("DashboardtypesPanelPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesPieChartPanelSpec"),
-		string(PanelKindTable):      schemaRef("DashboardtypesPanelPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesTablePanelSpec"),
-		string(PanelKindHistogram):  schemaRef("DashboardtypesPanelPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesHistogramPanelSpec"),
-		string(PanelKindList):       schemaRef("DashboardtypesPanelPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesListPanelSpec"),
-		string(PanelKindText):       schemaRef("DashboardtypesPanelPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesTextPanelSpec"),
-		string(PanelKindHeatmap):    schemaRef("DashboardtypesPanelPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesHeatmapPanelSpec"),
+		string(PanelKindTimeSeries):  schemaRef("DashboardtypesPanelPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesTimeSeriesPanelSpec"),
+		string(PanelKindBarChart):    schemaRef("DashboardtypesPanelPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesBarChartPanelSpec"),
+		string(PanelKindAreaChart):   schemaRef("DashboardtypesPanelPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesAreaChartPanelSpec"),
+		string(PanelKindNumber):      schemaRef("DashboardtypesPanelPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesNumberPanelSpec"),
+		string(PanelKindPieChart):    schemaRef("DashboardtypesPanelPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesPieChartPanelSpec"),
+		string(PanelKindTable):       schemaRef("DashboardtypesPanelPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesTablePanelSpec"),
+		string(PanelKindHistogram):   schemaRef("DashboardtypesPanelPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesHistogramPanelSpec"),
+		string(PanelKindList):        schemaRef("DashboardtypesPanelPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesListPanelSpec"),
+		string(PanelKindText):        schemaRef("DashboardtypesPanelPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesTextPanelSpec"),
+		string(PanelKindHeatmap):     schemaRef("DashboardtypesPanelPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesHeatmapPanelSpec"),
+		string(PanelKindScatterPlot): schemaRef("DashboardtypesPanelPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesScatterPlotPanelSpec"),
 	})
 }

@@ -71,6 +72,7 @@ func (PanelPlugin) JSONSchemaOneOf() []any {
 		PanelPluginVariant[ListPanelSpec]{Kind: string(PanelKindList)},
 		PanelPluginVariant[TextPanelSpec]{Kind: string(PanelKindText)},
 		PanelPluginVariant[HeatmapPanelSpec]{Kind: string(PanelKindHeatmap)},
+		PanelPluginVariant[ScatterPlotPanelSpec]{Kind: string(PanelKindScatterPlot)},
 	}
 }

@@ -227,16 +229,17 @@ func (v VariablePluginVariant[S]) PrepareJSONSchema(s *jsonschema.Schema) error

 var (
 	panelPluginSpecs = map[PanelPluginKind]func() any{
-		PanelKindTimeSeries: func() any { return new(TimeSeriesPanelSpec) },
-		PanelKindBarChart:   func() any { return new(BarChartPanelSpec) },
-		PanelKindAreaChart:  func() any { return new(AreaChartPanelSpec) },
-		PanelKindNumber:     func() any { return new(NumberPanelSpec) },
-		PanelKindPieChart:   func() any { return new(PieChartPanelSpec) },
-		PanelKindTable:      func() any { return new(TablePanelSpec) },
-		PanelKindHistogram:  func() any { return new(HistogramPanelSpec) },
-		PanelKindList:       func() any { return new(ListPanelSpec) },
-		PanelKindText:       func() any { return new(TextPanelSpec) },
-		PanelKindHeatmap:    func() any { return new(HeatmapPanelSpec) },
+		PanelKindTimeSeries:  func() any { return new(TimeSeriesPanelSpec) },
+		PanelKindBarChart:    func() any { return new(BarChartPanelSpec) },
+		PanelKindAreaChart:   func() any { return new(AreaChartPanelSpec) },
+		PanelKindNumber:      func() any { return new(NumberPanelSpec) },
+		PanelKindPieChart:    func() any { return new(PieChartPanelSpec) },
+		PanelKindTable:       func() any { return new(TablePanelSpec) },
+		PanelKindHistogram:   func() any { return new(HistogramPanelSpec) },
+		PanelKindList:        func() any { return new(ListPanelSpec) },
+		PanelKindText:        func() any { return new(TextPanelSpec) },
+		PanelKindHeatmap:     func() any { return new(HeatmapPanelSpec) },
+		PanelKindScatterPlot: func() any { return new(ScatterPlotPanelSpec) },
 	}
 	queryPluginSpecs = map[QueryPluginKind]func() any{
 		QueryKindBuilder:       func() any { return new(BuilderQuerySpec) },
@@ -252,16 +255,17 @@ var (
 		VariableKindCustom:  func() any { return new(CustomVariableSpec) },
 	}
 	allowedQueryKinds = map[PanelPluginKind][]QueryPluginKind{
-		PanelKindTimeSeries: {QueryKindBuilder, QueryKindComposite, QueryKindFormula, QueryKindTraceOperator, QueryKindPromQL, QueryKindClickHouseSQL},
-		PanelKindBarChart:   {QueryKindBuilder, QueryKindComposite, QueryKindFormula, QueryKindTraceOperator, QueryKindPromQL, QueryKindClickHouseSQL},
-		PanelKindAreaChart:  {QueryKindBuilder, QueryKindComposite, QueryKindFormula, QueryKindTraceOperator, QueryKindPromQL, QueryKindClickHouseSQL},
-		PanelKindNumber:     {QueryKindBuilder, QueryKindComposite, QueryKindFormula, QueryKindTraceOperator, QueryKindPromQL, QueryKindClickHouseSQL},
-		PanelKindHistogram:  {QueryKindBuilder, QueryKindComposite, QueryKindFormula, QueryKindTraceOperator, QueryKindPromQL, QueryKindClickHouseSQL},
-		PanelKindPieChart:   {QueryKindBuilder, QueryKindComposite, QueryKindFormula, QueryKindTraceOperator, QueryKindClickHouseSQL},
-		PanelKindTable:      {QueryKindBuilder, QueryKindComposite, QueryKindFormula, QueryKindTraceOperator, QueryKindClickHouseSQL},
-		PanelKindList:       {QueryKindBuilder},
-		PanelKindText:       {},
-		PanelKindHeatmap:    {QueryKindBuilder, QueryKindComposite, QueryKindFormula, QueryKindPromQL, QueryKindClickHouseSQL},
+		PanelKindTimeSeries:  {QueryKindBuilder, QueryKindComposite, QueryKindFormula, QueryKindTraceOperator, QueryKindPromQL, QueryKindClickHouseSQL},
+		PanelKindBarChart:    {QueryKindBuilder, QueryKindComposite, QueryKindFormula, QueryKindTraceOperator, QueryKindPromQL, QueryKindClickHouseSQL},
+		PanelKindAreaChart:   {QueryKindBuilder, QueryKindComposite, QueryKindFormula, QueryKindTraceOperator, QueryKindPromQL, QueryKindClickHouseSQL},
+		PanelKindNumber:      {QueryKindBuilder, QueryKindComposite, QueryKindFormula, QueryKindTraceOperator, QueryKindPromQL, QueryKindClickHouseSQL},
+		PanelKindHistogram:   {QueryKindBuilder, QueryKindComposite, QueryKindFormula, QueryKindTraceOperator, QueryKindPromQL, QueryKindClickHouseSQL},
+		PanelKindPieChart:    {QueryKindBuilder, QueryKindComposite, QueryKindFormula, QueryKindTraceOperator, QueryKindClickHouseSQL},
+		PanelKindTable:       {QueryKindBuilder, QueryKindComposite, QueryKindFormula, QueryKindTraceOperator, QueryKindClickHouseSQL},
+		PanelKindList:        {QueryKindBuilder},
+		PanelKindText:        {},
+		PanelKindHeatmap:     {QueryKindBuilder, QueryKindComposite, QueryKindFormula, QueryKindPromQL, QueryKindClickHouseSQL},
+		PanelKindScatterPlot: {QueryKindBuilder, QueryKindComposite, QueryKindFormula, QueryKindTraceOperator, QueryKindClickHouseSQL},
 	}
 )

--- a/pkg/types/dashboardtypes/perses_public_dashboard.go
+++ b/pkg/types/dashboardtypes/perses_public_dashboard.go
@@ -214,7 +214,7 @@ func (d *DashboardV2) GetPanelQuery(startTime, endTime uint64, panelKey string)
 		CompositeQuery: composite,
 		FormatOptions: &qb.FormatOptions{
 			FillGaps:               fillGaps,
-			FormatTableResultForUI: panel.Spec.Plugin.Kind == PanelKindTable,
+			FormatTableResultForUI: panel.Spec.Plugin.Kind == PanelKindTable || panel.Spec.Plugin.Kind == PanelKindScatterPlot,
 		},
 	}, nil
 }
--- a/pkg/types/dashboardtypes/perses_public_dashboard_panel_query_test.go
+++ b/pkg/types/dashboardtypes/perses_public_dashboard_panel_query_test.go
@@ -209,34 +209,38 @@ func TestDashboardV2GetPanelQuery(t *testing.T) {
 		}
 	})

-	t.Run("sets FormatTableResultForUI only for table panels", func(t *testing.T) {
-		dashboard := &DashboardV2{
-			Spec: DashboardSpec{
-				Panels: map[string]*Panel{
-					"panel-1": {
-						Spec: PanelSpec{
-							Plugin: PanelPlugin{Kind: PanelKindTable},
-							Queries: []Query{
-								{
-									Kind: qb.RequestTypeScalar,
-									Spec: QuerySpec{
-										Plugin: QueryPlugin{
-											Kind: QueryKindBuilder,
-											Spec: &BuilderQuerySpec{Spec: qb.QueryBuilderQuery[qb.MetricAggregation]{Name: "A"}},
+	t.Run("sets FormatTableResultForUI for panels that join scalar rows", func(t *testing.T) {
+		for _, kind := range []PanelPluginKind{PanelKindTable, PanelKindScatterPlot} {
+			t.Run(string(kind), func(t *testing.T) {
+				dashboard := &DashboardV2{
+					Spec: DashboardSpec{
+						Panels: map[string]*Panel{
+							"panel-1": {
+								Spec: PanelSpec{
+									Plugin: PanelPlugin{Kind: kind},
+									Queries: []Query{
+										{
+											Kind: qb.RequestTypeScalar,
+											Spec: QuerySpec{
+												Plugin: QueryPlugin{
+													Kind: QueryKindBuilder,
+													Spec: &BuilderQuerySpec{Spec: qb.QueryBuilderQuery[qb.MetricAggregation]{Name: "A"}},
+												},
+											},
 										},
 									},
 								},
 							},
 						},
 					},
-				},
-			},
-		}
+				}

-		req, err := dashboard.GetPanelQuery(1, 2, "panel-1")
-		require.NoError(t, err)
-		require.NotNil(t, req.FormatOptions)
-		assert.True(t, req.FormatOptions.FormatTableResultForUI)
+				req, err := dashboard.GetPanelQuery(1, 2, "panel-1")
+				require.NoError(t, err)
+				require.NotNil(t, req.FormatOptions)
+				assert.True(t, req.FormatOptions.FormatTableResultForUI)
+			})
+		}
 	})

 	t.Run("sets FillGaps from the panel visualization", func(t *testing.T) {
--- a/pkg/types/dashboardtypes/perses_signoz_plugins.go
+++ b/pkg/types/dashboardtypes/perses_signoz_plugins.go
@@ -2,6 +2,8 @@ package dashboardtypes

 import (
 	"encoding/json"
+	"maps"
+	"slices"
 	"strconv"

 	"github.com/SigNoz/signoz/pkg/errors"
@@ -166,20 +168,21 @@ func (BuilderQuerySpec) JSONSchemaOneOf() []any {
 type PanelPluginKind string

 const (
-	PanelKindTimeSeries PanelPluginKind = "signoz/TimeSeriesPanel"
-	PanelKindBarChart   PanelPluginKind = "signoz/BarChartPanel"
-	PanelKindAreaChart  PanelPluginKind = "signoz/AreaChartPanel"
-	PanelKindNumber     PanelPluginKind = "signoz/NumberPanel"
-	PanelKindPieChart   PanelPluginKind = "signoz/PieChartPanel"
-	PanelKindTable      PanelPluginKind = "signoz/TablePanel"
-	PanelKindHistogram  PanelPluginKind = "signoz/HistogramPanel"
-	PanelKindList       PanelPluginKind = "signoz/ListPanel"
-	PanelKindText       PanelPluginKind = "signoz/TextPanel"
-	PanelKindHeatmap    PanelPluginKind = "signoz/HeatmapPanel"
+	PanelKindTimeSeries  PanelPluginKind = "signoz/TimeSeriesPanel"
+	PanelKindBarChart    PanelPluginKind = "signoz/BarChartPanel"
+	PanelKindAreaChart   PanelPluginKind = "signoz/AreaChartPanel"
+	PanelKindNumber      PanelPluginKind = "signoz/NumberPanel"
+	PanelKindPieChart    PanelPluginKind = "signoz/PieChartPanel"
+	PanelKindTable       PanelPluginKind = "signoz/TablePanel"
+	PanelKindHistogram   PanelPluginKind = "signoz/HistogramPanel"
+	PanelKindList        PanelPluginKind = "signoz/ListPanel"
+	PanelKindText        PanelPluginKind = "signoz/TextPanel"
+	PanelKindHeatmap     PanelPluginKind = "signoz/HeatmapPanel"
+	PanelKindScatterPlot PanelPluginKind = "signoz/ScatterPlotPanel"
 )

 func (PanelPluginKind) Enum() []any {
-	return []any{PanelKindTimeSeries, PanelKindBarChart, PanelKindAreaChart, PanelKindNumber, PanelKindPieChart, PanelKindTable, PanelKindHistogram, PanelKindList, PanelKindText, PanelKindHeatmap}
+	return []any{PanelKindTimeSeries, PanelKindBarChart, PanelKindAreaChart, PanelKindNumber, PanelKindPieChart, PanelKindTable, PanelKindHistogram, PanelKindList, PanelKindText, PanelKindHeatmap, PanelKindScatterPlot}
 }

 func (k PanelPluginKind) rendersWithoutQuery() bool {
@@ -329,6 +332,95 @@ type TextPanelSpec struct {
 	HeaderOptions HeaderOptions    `json:"headerOptions"`
 }

+type ScatterPlotPanelSpec struct {
+	Visualization   BasicVisualization         `json:"visualization"`
+	Dimensions      ScatterPlotDimensions      `json:"dimensions"`
+	Formatting      TableFormatting            `json:"formatting"`
+	Axes            ScatterPlotAxes            `json:"axes"`
+	ChartAppearance ScatterPlotChartAppearance `json:"chartAppearance"`
+	Legend          Legend                     `json:"legend"`
+	Thresholds      []ScatterPlotThreshold     `json:"thresholds" validate:"dive"`
+}
+
+func (s *ScatterPlotPanelSpec) validateAgainstQuery(query Query, path string) error {
+	composite, err := query.Spec.Plugin.buildV5CompositeQueryFromPlugin()
+	if err != nil {
+		return errors.WrapInvalidInputf(err, ErrCodeDashboardInvalidInput, "%s.dimensions: %s", path, err.Error())
+	}
+	keys, known := composite.CollectResultColumnKeys()
+	if !known {
+		return nil
+	}
+	for _, binding := range []struct{ field, key string }{{"x", s.Dimensions.X}, {"y", s.Dimensions.Y}, {"sizeBy", s.Dimensions.SizeBy}} {
+		// Empty is unset: the renderer picks a column or a fixed size.
+		if binding.key == "" {
+			continue
+		}
+		if _, ok := keys.Aggregations[binding.key]; !ok {
+			return errors.NewInvalidInputf(ErrCodeDashboardInvalidInput, "%s.dimensions.%s: %q is not a value column of the panel's query; value columns: %s", path, binding.field, binding.key, allowedValuesForKind(slices.Sorted(maps.Keys(keys.Aggregations))))
+		}
+	}
+	for _, label := range s.Dimensions.ColorBy {
+		if _, ok := keys.Groups[label]; !ok {
+			return errors.NewInvalidInputf(ErrCodeDashboardInvalidInput, "%s.dimensions.colorBy: %q is not a group-by key of the panel's query; group-by keys: %s", path, label, allowedValuesForKind(slices.Sorted(maps.Keys(keys.Groups))))
+		}
+	}
+	return nil
+}
+
+// ScatterPlotDimensions binds result columns to what a dot encodes. Value columns
+// use the Table column key, so formatting.columnUnits carries over between the
+// two kinds.
+type ScatterPlotDimensions struct {
+	X       string   `json:"x" description:"Value column key (queryName, or queryName.expression for a multi-aggregation query) plotted on the x axis. Empty uses the first value column."`
+	Y       string   `json:"y" description:"Value column key plotted on the y axis. Empty uses the second value column."`
+	SizeBy  string   `json:"sizeBy" description:"Value column key that scales dot size. Empty draws every dot at the default size."`
+	ColorBy []string `json:"colorBy" description:"Group-by label names (e.g. k8s.namespace.name) whose combined values colour dots and drive the legend. Empty colours by every group-by label."`
+}
+
+type ScatterPlotAxes struct {
+	X ScatterPlotAxis `json:"x"`
+	Y ScatterPlotAxis `json:"y"`
+}
+
+type ScatterPlotAxis struct {
+	SoftMin *float64  `json:"softMin"`
+	SoftMax *float64  `json:"softMax"`
+	Scale   AxisScale `json:"scale"`
+	Label   string    `json:"label" description:"Axis title. Empty draws none."`
+}
+
+type ScatterPlotChartAppearance struct {
+	Points ScatterPlotPoints `json:"points"`
+}
+
+// ScatterPlotPoints keeps the fixed size and the size range side by side so
+// binding or unbinding dimensions.sizeBy restores the other's last setting. Nil
+// fields resolve to the renderer default.
+type ScatterPlotPoints struct {
+	Size    *PointDiameter `json:"size" description:"Diameter of every dot when dimensions.sizeBy is unset."`
+	MinSize *PointDiameter `json:"minSize" description:"Diameter of the smallest dot when dimensions.sizeBy is set."`
+	MaxSize *PointDiameter `json:"maxSize" description:"Diameter of the largest dot when dimensions.sizeBy is set."`
+	Opacity *PointOpacity  `json:"opacity"`
+}
+
+func (p *ScatterPlotPoints) UnmarshalJSON(data []byte) error {
+	type alias ScatterPlotPoints
+	var tmp alias
+	if err := json.Unmarshal(data, &tmp); err != nil {
+		return errors.WrapInvalidInputf(err, ErrCodeDashboardInvalidInput, "invalid points")
+	}
+	*p = ScatterPlotPoints(tmp)
+	return p.validate()
+}
+
+func (p ScatterPlotPoints) validate() error {
+	if p.MinSize != nil && p.MaxSize != nil && *p.MinSize > *p.MaxSize {
+		return errors.NewInvalidInputf(ErrCodeDashboardInvalidInput, "invalid points: minSize %d must not exceed maxSize %d", *p.MinSize, *p.MaxSize)
+	}
+	return nil
+}
+
 type TextPresentation struct {
 	TextAlign     TextAlign     `json:"textAlign"`
 	VerticalAlign VerticalAlign `json:"verticalAlign"`
@@ -410,6 +502,11 @@ type ComparisonThreshold struct {
 	Format   ThresholdFormat    `json:"format"`
 }

+type ScatterPlotThreshold struct {
+	ThresholdWithLabel
+	Axis ThresholdAxis `json:"axis"`
+}
+
 type TableThreshold struct {
 	ComparisonThreshold
 	ColumnName string `json:"columnName" validate:"required" required:"true"`
@@ -695,6 +792,86 @@ func (ls *LineStyle) UnmarshalJSON(data []byte) error {
 	}
 }

+// AxisScale `auto` leaves the choice to the renderer; `symlog` is log-like but
+// defined at and below zero.
+type AxisScale struct{ valuer.String }
+
+var (
+	AxisScaleAuto   = AxisScale{valuer.NewString("auto")} // default
+	AxisScaleLinear = AxisScale{valuer.NewString("linear")}
+	AxisScaleLog    = AxisScale{valuer.NewString("log")}
+	AxisScaleSymlog = AxisScale{valuer.NewString("symlog")}
+)
+
+func (AxisScale) Enum() []any {
+	return []any{AxisScaleAuto, AxisScaleLinear, AxisScaleLog, AxisScaleSymlog}
+}
+
+func (as AxisScale) ValueOrDefault() string {
+	if as.IsZero() {
+		return AxisScaleAuto.StringValue()
+	}
+	return as.StringValue()
+}
+
+func (as AxisScale) MarshalJSON() ([]byte, error) {
+	return json.Marshal(as.ValueOrDefault())
+}
+
+func (as *AxisScale) UnmarshalJSON(data []byte) error {
+	var v string
+	if err := json.Unmarshal(data, &v); err != nil {
+		return errors.WrapInvalidInputf(err, ErrCodeDashboardInvalidInput, "invalid axis scale: must be a string, one of `auto`, `linear`, `log`, or `symlog`")
+	}
+	val := AxisScale{valuer.NewString(v)}
+	switch val {
+	case AxisScaleAuto, AxisScaleLinear, AxisScaleLog, AxisScaleSymlog:
+		*as = val
+		return nil
+	default:
+		return errors.NewInvalidInputf(ErrCodeDashboardInvalidInput, "invalid axis scale %q: must be `auto`, `linear`, `log`, or `symlog`", v)
+	}
+}
+
+// ThresholdAxis is the axis a scatter plot threshold line marks: `y` draws it
+// horizontally, `x` vertically.
+type ThresholdAxis struct{ valuer.String }
+
+var (
+	ThresholdAxisX = ThresholdAxis{valuer.NewString("x")}
+	ThresholdAxisY = ThresholdAxis{valuer.NewString("y")} // default
+)
+
+func (ThresholdAxis) Enum() []any {
+	return []any{ThresholdAxisX, ThresholdAxisY}
+}
+
+func (ta ThresholdAxis) ValueOrDefault() string {
+	if ta.IsZero() {
+		return ThresholdAxisY.StringValue()
+	}
+	return ta.StringValue()
+}
+
+func (ta ThresholdAxis) MarshalJSON() ([]byte, error) {
+	return json.Marshal(ta.ValueOrDefault())
+}
+
+func (ta *ThresholdAxis) UnmarshalJSON(data []byte) error {
+	var v string
+	if err := json.Unmarshal(data, &v); err != nil {
+		return errors.WrapInvalidInputf(err, ErrCodeDashboardInvalidInput, "invalid threshold axis: must be a string, one of `x` or `y`")
+	}
+	val := ThresholdAxis{valuer.NewString(v)}
+	switch val {
+	case ThresholdAxisX, ThresholdAxisY:
+		*ta = val
+		return nil
+	default:
+		return errors.NewInvalidInputf(ErrCodeDashboardInvalidInput, "invalid threshold axis %q: must be `x` or `y`", v)
+	}
+}
+
 type FillMode struct{ valuer.String }

 var (
@@ -833,6 +1010,53 @@ func (o *FillOpacity) UnmarshalJSON(data []byte) error {
 	return nil
 }

+const (
+	minPointDiameter = 2
+	maxPointDiameter = 40
+)
+
+// PointDiameter is a scatter dot's diameter in whole CSS pixels.
+type PointDiameter int
+
+func (PointDiameter) PrepareJSONSchema(s *jsonschema.Schema) error {
+	s.WithMinimum(minPointDiameter).WithMaximum(maxPointDiameter)
+	return nil
+}
+
+func (d *PointDiameter) UnmarshalJSON(data []byte) error {
+	var v int
+	if err := json.Unmarshal(data, &v); err != nil {
+		return errors.WrapInvalidInputf(err, ErrCodeDashboardInvalidInput, "invalid point diameter: must be a whole number between %d and %d", minPointDiameter, maxPointDiameter)
+	}
+	if v < minPointDiameter || v > maxPointDiameter {
+		return errors.NewInvalidInputf(ErrCodeDashboardInvalidInput, "invalid point diameter %d: must be a whole number between %d and %d", v, minPointDiameter, maxPointDiameter)
+	}
+	*d = PointDiameter(v)
+	return nil
+}
+
+const minPointOpacity = 0.1
+
+// PointOpacity is a scatter dot's fill alpha. The floor keeps a dot visible.
+type PointOpacity float64
+
+func (PointOpacity) PrepareJSONSchema(s *jsonschema.Schema) error {
+	s.WithMinimum(minPointOpacity).WithMaximum(1)
+	return nil
+}
+
+func (o *PointOpacity) UnmarshalJSON(data []byte) error {
+	var v float64
+	if err := json.Unmarshal(data, &v); err != nil {
+		return errors.WrapInvalidInputf(err, ErrCodeDashboardInvalidInput, "invalid point opacity: must be a number between %v and 1", minPointOpacity)
+	}
+	if v < minPointOpacity || v > 1 {
+		return errors.NewInvalidInputf(ErrCodeDashboardInvalidInput, "invalid point opacity %v: must be between %v and 1", v, minPointOpacity)
+	}
+	*o = PointOpacity(v)
+	return nil
+}
+
 type SpanGaps struct {
 	FillOnlyBelow bool   `json:"fillOnlyBelow" description:"Controls whether lines connect across null values. When false (default), all gaps are connected. When true, only gaps smaller than fillLessThan are connected."`
 	FillLessThan  string `json:"fillLessThan" description:"The maximum gap size to connect when fillOnlyBelow is true. Gaps larger than this duration are left disconnected."`
--- a/pkg/types/dashboardtypes/testdata/perses_scatter_plot_panel.json
+++ b/pkg/types/dashboardtypes/testdata/perses_scatter_plot_panel.json
@@ -0,0 +1,134 @@
+{
+  "display": {
+    "name": "service health",
+    "description": "throughput against tail latency per pod"
+  },
+  "variables": [],
+  "panels": {
+    "p1": {
+      "kind": "Panel",
+      "spec": {
+        "display": {
+          "name": "throughput vs p99",
+          "description": ""
+        },
+        "plugin": {
+          "kind": "signoz/ScatterPlotPanel",
+          "spec": {
+            "visualization": {
+              "timePreference": "last_1_hr"
+            },
+            "dimensions": {
+              "x": "A.count()",
+              "y": "A.p99(duration_nano)",
+              "sizeBy": "A.countIf(has_error = true)",
+              "colorBy": ["k8s.namespace.name", "k8s.pod.name"]
+            },
+            "formatting": {
+              "columnUnits": {
+                "A.p99(duration_nano)": "ns"
+              },
+              "decimalPrecision": "1"
+            },
+            "axes": {
+              "x": {
+                "softMin": 0,
+                "softMax": null,
+                "scale": "log",
+                "label": "Throughput"
+              },
+              "y": {
+                "softMin": null,
+                "softMax": 1000,
+                "scale": "symlog",
+                "label": "p99 latency"
+              }
+            },
+            "chartAppearance": {
+              "points": {
+                "size": 8,
+                "minSize": 4,
+                "maxSize": 24,
+                "opacity": 0.1
+              }
+            },
+            "legend": {
+              "position": "right",
+              "mode": "list",
+              "customColors": {
+                "checkout": "#1f77b4"
+              }
+            },
+            "thresholds": [
+              {
+                "value": 300,
+                "unit": "ms",
+                "color": "#f00",
+                "label": "p99 SLO",
+                "axis": "y"
+              },
+              {
+                "value": 50,
+                "color": "#0f0",
+                "axis": "x"
+              }
+            ]
+          }
+        },
+        "links": [],
+        "queries": [
+          {
+            "kind": "scalar",
+            "spec": {
+              "plugin": {
+                "kind": "signoz/BuilderQuery",
+                "spec": {
+                  "name": "A",
+                  "signal": "traces",
+                  "aggregations": [
+                    {
+                      "expression": "count()"
+                    },
+                    {
+                      "expression": "p99(duration_nano)"
+                    },
+                    {
+                      "expression": "countIf(has_error = true)"
+                    }
+                  ],
+                  "groupBy": [
+                    {
+                      "name": "k8s.namespace.name"
+                    },
+                    {
+                      "name": "k8s.pod.name"
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        ]
+      }
+    }
+  },
+  "links": [],
+  "layouts": [
+    {
+      "kind": "Grid",
+      "spec": {
+        "items": [
+          {
+            "x": 0,
+            "y": 0,
+            "width": 12,
+            "height": 8,
+            "content": {
+              "$ref": "#/spec/panels/p1"
+            }
+          }
+        ]
+      }
+    }
+  ]
+}
--- a/pkg/types/querybuildertypes/querybuildertypesv5/req.go
+++ b/pkg/types/querybuildertypes/querybuildertypesv5/req.go
@@ -266,6 +266,43 @@ type CompositeQuery struct {
 	Queries []QueryEnvelope `json:"queries"`
 }

+// ResultColumnKeys is what a scalar query yields per row, keyed the way the
+// UI keys columns: an aggregation column is the query name, or
+// queryName.expression when the query has several aggregations; a group
+// column is a group-by key name.
+type ResultColumnKeys struct {
+	Aggregations map[string]struct{}
+	Groups       map[string]struct{}
+}
+
+// CollectResultColumnKeys reports false when a query's columns are only known
+// at run time, as for ClickHouse SQL and PromQL. A disabled query yields no
+// aggregation column but keeps its group columns, since a formula over it
+// still carries them.
+func (c *CompositeQuery) CollectResultColumnKeys() (ResultColumnKeys, bool) {
+	keys := ResultColumnKeys{Aggregations: map[string]struct{}{}, Groups: map[string]struct{}{}}
+	for _, envelope := range c.Queries {
+		if envelope.GetType() == QueryTypeClickHouseSQL || envelope.GetType() == QueryTypePromQL {
+			return ResultColumnKeys{}, false
+		}
+		for _, key := range envelope.GetGroupBy() {
+			keys.Groups[key.Name] = struct{}{}
+		}
+		if envelope.IsDisabled() {
+			continue
+		}
+		expressions := envelope.GetAggregationExpressions()
+		if len(expressions) <= 1 {
+			keys.Aggregations[envelope.GetQueryName()] = struct{}{}
+			continue
+		}
+		for _, expression := range expressions {
+			keys.Aggregations[envelope.GetQueryName()+"."+expression] = struct{}{}
+		}
+	}
+	return keys, true
+}
+
 // PrepareJSONSchema adds description to the CompositeQuery schema.
 func (c *CompositeQuery) PrepareJSONSchema(schema *jsonschema.Schema) error {
 	schema.WithDescription("Composite query containing one or more query envelopes. Each query envelope specifies its type and corresponding spec.")
--- a/pkg/types/querybuildertypes/querybuildertypesv5/req_getters.go
+++ b/pkg/types/querybuildertypes/querybuildertypesv5/req_getters.go
@@ -225,6 +225,34 @@ func (q *QueryEnvelope) GetGroupBy() []GroupByKey {
 	return nil
 }

+// GetAggregationExpressions returns one entry per aggregation. A metric
+// aggregation has no expression, so it contributes an empty entry.
+func (q *QueryEnvelope) GetAggregationExpressions() []string {
+	switch spec := q.Spec.(type) {
+	case QueryBuilderTraceOperator:
+		expressions := make([]string, len(spec.Aggregations))
+		for i, aggregation := range spec.Aggregations {
+			expressions[i] = aggregation.Expression
+		}
+		return expressions
+	case QueryBuilderQuery[TraceAggregation]:
+		expressions := make([]string, len(spec.Aggregations))
+		for i, aggregation := range spec.Aggregations {
+			expressions[i] = aggregation.Expression
+		}
+		return expressions
+	case QueryBuilderQuery[LogAggregation]:
+		expressions := make([]string, len(spec.Aggregations))
+		for i, aggregation := range spec.Aggregations {
+			expressions[i] = aggregation.Expression
+		}
+		return expressions
+	case QueryBuilderQuery[MetricAggregation]:
+		return make([]string, len(spec.Aggregations))
+	}
+	return nil
+}
+
 // GetFilter returns the filter.
 func (q *QueryEnvelope) GetFilter() *Filter {
 	switch spec := q.Spec.(type) {
--- a/pkg/types/querybuildertypes/querybuildertypesv5/req_test.go
+++ b/pkg/types/querybuildertypes/querybuildertypesv5/req_test.go
@@ -1903,3 +1903,63 @@ func TestQueryRangeRequest_StepIntervalForQuery(t *testing.T) {
 		})
 	}
 }
+
+func TestCompositeQueryCollectResultColumnKeys(t *testing.T) {
+	testCases := []struct {
+		scenario      string
+		composite     CompositeQuery
+		expectedKeys  ResultColumnKeys
+		expectedKnown bool
+	}{
+		{
+			scenario: "a single aggregation is keyed by the query name",
+			composite: CompositeQuery{Queries: []QueryEnvelope{{Type: QueryTypeBuilder, Spec: QueryBuilderQuery[TraceAggregation]{
+				Name:         "A",
+				Aggregations: []TraceAggregation{{Expression: "count()"}},
+				GroupBy:      []GroupByKey{{TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: "service.name"}}},
+			}}}},
+			expectedKeys:  ResultColumnKeys{Aggregations: map[string]struct{}{"A": {}}, Groups: map[string]struct{}{"service.name": {}}},
+			expectedKnown: true,
+		},
+		{
+			scenario: "several aggregations are keyed by query name and expression",
+			composite: CompositeQuery{Queries: []QueryEnvelope{{Type: QueryTypeBuilder, Spec: QueryBuilderQuery[LogAggregation]{
+				Name:         "A",
+				Aggregations: []LogAggregation{{Expression: "count()"}, {Expression: "p99(duration_nano)"}},
+			}}}},
+			expectedKeys:  ResultColumnKeys{Aggregations: map[string]struct{}{"A.count()": {}, "A.p99(duration_nano)": {}}, Groups: map[string]struct{}{}},
+			expectedKnown: true,
+		},
+		{
+			scenario: "a disabled query yields no aggregation but keeps its groups for the formula over it",
+			composite: CompositeQuery{Queries: []QueryEnvelope{
+				{Type: QueryTypeBuilder, Spec: QueryBuilderQuery[MetricAggregation]{
+					Name:         "A",
+					Disabled:     true,
+					Aggregations: []MetricAggregation{{MetricName: "http.server.request.count"}},
+					GroupBy:      []GroupByKey{{TelemetryFieldKey: telemetrytypes.TelemetryFieldKey{Name: "service.name"}}},
+				}},
+				{Type: QueryTypeFormula, Spec: QueryBuilderFormula{Name: "F1", Expression: "A * 2"}},
+			}},
+			expectedKeys:  ResultColumnKeys{Aggregations: map[string]struct{}{"F1": {}}, Groups: map[string]struct{}{"service.name": {}}},
+			expectedKnown: true,
+		},
+		{
+			scenario: "clickhouse columns are only known at run time",
+			composite: CompositeQuery{Queries: []QueryEnvelope{{Type: QueryTypeClickHouseSQL, Spec: ClickHouseQuery{
+				Name:  "A",
+				Query: "SELECT 1",
+			}}}},
+			expectedKeys:  ResultColumnKeys{},
+			expectedKnown: false,
+		},
+	}
+
+	for _, testCase := range testCases {
+		t.Run(testCase.scenario, func(t *testing.T) {
+			keys, known := testCase.composite.CollectResultColumnKeys()
+			assert.Equal(t, testCase.expectedKnown, known)
+			assert.Equal(t, testCase.expectedKeys, keys)
+		})
+	}
+}
--- a/tests/fixtures/jsontypes.py
+++ b/tests/fixtures/jsontypes.py
@@ -311,15 +311,14 @@ def create_json_index(
 ) -> Generator[Callable[[str, list[dict[str, Any]]], None]]:
    """
    Create ClickHouse data-skipping indexes on body_v2 JSON sub-columns via
-    POST /api/v1/promoted_paths.
+    POST /api/v1/logs/promote_paths.

    **Must be called BEFORE insert_logs** so that newly inserted data parts are
    covered by the index and the QB uses the indexed condition path.

-    Each entry in `paths` follows the PromotePath API shape (signal/context are
-    filled in as logs/body):
+    Each entry in `paths` follows the PromotePath API shape:
        {
-            "path": "user.name",               # bare path, no "body." prefix
+            "path": "body.user.name",          # must start with "body."
            "indexes": [
                {
                    "fieldDataType": "string",   # string | int64 | float64
@@ -338,9 +337,9 @@ def create_json_index(
            token = get_token(...)
            export_json_types(logs_list)
            create_json_body_index(token, [
-                {"path": "user.name",
+                {"path": "body.user.name",
                 "indexes": [{"fieldDataType": "string", "type": "ngrambf_v1(3, 256, 2, 0)", "granularity": 1}]},
-                {"path": "user.age",
+                {"path": "body.user.age",
                 "indexes": [{"fieldDataType": "int64", "type": "minmax", "granularity": 1}]},
            ])
            insert_logs(logs_list)   # data inserted after index exists — index is built automatically
@@ -349,15 +348,18 @@ def create_json_index(

    def _create_json_body_index(token: str, paths: list[dict[str, Any]]) -> None:
        response = requests.post(
-            signoz.self.host_configs["8080"].get("/api/v1/promoted_paths"),
+            signoz.self.host_configs["8080"].get("/api/v1/logs/promote_paths"),
            headers={"authorization": f"Bearer {token}"},
-            json=[{"signal": "logs", "context": "body", **path} for path in paths],
+            json=paths,
            timeout=30,
        )
        assert response.status_code == HTTPStatus.CREATED, f"Failed to create JSON body indexes: {response.status_code} {response.text}"
        for path in paths:
-            if path["path"] not in created_paths:
-                created_paths.append(path["path"])
+            # The API strips the "body." prefix before storing — mirror that here
+            # so our cleanup query uses the bare path (e.g. "user.name").
+            raw = path["path"].removeprefix("body.")
+            if raw not in created_paths:
+                created_paths.append(raw)

    yield _create_json_body_index

--- a/tests/integration/tests/querier_json_body/01_logs_json_body_new_qb.py
+++ b/tests/integration/tests/querier_json_body/01_logs_json_body_new_qb.py
@@ -404,7 +404,7 @@ def test_indexed_paths(
        token,
        [
            {
-                "path": "user.raw-data.name",
+                "path": "body.user.raw-data.name",
                "indexes": [
                    {
                        "fieldDataType": "string",
@@ -414,7 +414,7 @@ def test_indexed_paths(
                ],
            },
            {
-                "path": "user.raw-data.age",
+                "path": "body.user.raw-data.age",
                "indexes": [
                    {
                        "fieldDataType": "int64",
Author	SHA1	Message	Date
Abhi Kumar	b8a7db2ea3	feat(dashboards): add an axis to scatter plot thresholds	2026-10-12 19:27:35 +05:30
Naman Verma	3991224508	chore: add more validations for scatter plot	2026-10-12 17:11:20 +05:30
Naman Verma	a64aadcd81	Merge branch 'main' into feat/scatter-plot-panel-spec	2026-10-12 13:12:15 +05:30
Abhi Kumar	3de4d6eaea	feat(dashboards): rename scatter plot dimensions to colorBy and sizeBy	2026-10-08 17:52:05 +05:30
Abhi Kumar	e18afc0178	chore(openapi): regenerate specs for scatter plot panel Assisted-by: Claude Opus 5.5	2026-10-08 17:52:05 +05:30
Abhi Kumar	2bac73ee5c	feat(dashboards): add point size and opacity to scatter plot spec The fixed size and the min/max range are both stored so binding or unbinding the size dimension restores the other's last setting. Assisted-by: Claude Opus 5.5	2026-10-08 17:52:05 +05:30
Abhi Kumar	552f35e5bb	chore(openapi): regenerate specs for scatter plot panel Assisted-by: Claude Opus 5.5	2026-10-08 17:52:05 +05:30
Abhi Kumar	9eba4a794f	feat(dashboards): add axis labels and multi-key colour to scatter plot spec An empty colour list colours by every group-by label. Assisted-by: Claude Opus 5.5	2026-10-08 17:52:05 +05:30
Abhi Kumar	8a0c6c9911	chore(openapi): regenerate specs for scatter plot panel Assisted-by: Claude Opus 5.5	2026-10-08 17:52:05 +05:30
Abhi Kumar	d3662e66c7	feat(dashboards): add plugin schema for scatter plot panel Assisted-by: Claude Opus 5.5	2026-10-08 17:52:05 +05:30
				`@@ -0,0 +1 @@`
				<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 0 60 60"><linearGradient id="a" x1="15.959" x2="44.307" y1="-13.014" y2="15.333" gradientTransform="matrix(1 0 0 -1 0 61)" gradientUnits="userSpaceOnUse"><stop offset=".097" style="stop-color:#0095d5"/><stop offset=".301" style="stop-color:#238ad9"/><stop offset=".621" style="stop-color:#557bde"/><stop offset=".864" style="stop-color:#7472e2"/><stop offset="1" style="stop-color:#806ee3"/></linearGradient><path d="m0 60 30.1-30.1L60 60z" style="fill:url(#a)"/><linearGradient id="b" x1="4.209" x2="20.673" y1="48.941" y2="65.405" gradientTransform="matrix(1 0 0 -1 0 61)" gradientUnits="userSpaceOnUse"><stop offset=".118" style="stop-color:#0095d5"/><stop offset=".418" style="stop-color:#3c83dc"/><stop offset=".696" style="stop-color:#6d74e1"/><stop offset=".833" style="stop-color:#806ee3"/></linearGradient><path d="M0 0h30.1L0 32.5z" style="fill:url(#b)"/><linearGradient id="c" x1="-10.102" x2="45.731" y1="5.836" y2="61.669" gradientTransform="matrix(1 0 0 -1 0 61)" gradientUnits="userSpaceOnUse"><stop offset=".107" style="stop-color:#c757bc"/><stop offset=".214" style="stop-color:#d0609a"/><stop offset=".425" style="stop-color:#e1725c"/><stop offset=".605" style="stop-color:#ee7e2f"/><stop offset=".743" style="stop-color:#f58613"/><stop offset=".823" style="stop-color:#f88909"/></linearGradient><path d="M30.1 0 0 31.7V60l30.1-30.1L60 0z" style="fill:url(#c)"/></svg>
				`@@ -1 +0,0 @@`
				<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path fill="#9CA3AF" d="M12 22.596c6.628 0 12-4.338 12-9.688 0-3.318-2.057-6.248-5.219-7.986-1.286-.715-2.297-1.357-3.139-1.89C14.058 2.025 13.08 1.404 12 1.404c-1.097 0-2.334.785-3.966 1.821a49.92 49.92 0 0 1-2.816 1.697C2.057 6.66 0 9.59 0 12.908c0 5.35 5.372 9.687 12 9.687v.001ZM10.599 4.715c.334-.759.503-1.58.498-2.409 0-.145.202-.187.23-.029.658 2.783-.902 4.162-2.057 4.624-.124.048-.199-.121-.103-.209a5.763 5.763 0 0 0 1.432-1.977Zm2.058-.102a5.82 5.82 0 0 0-.782-2.306v-.016c-.069-.123.086-.263.185-.172 1.962 2.111 1.307 4.067.556 5.051-.082.103-.23-.003-.189-.126a5.85 5.85 0 0 0 .23-2.431Zm1.776-.561a5.727 5.727 0 0 0-1.612-1.806v-.014c-.112-.085-.024-.274.114-.218 2.595 1.087 2.774 3.18 2.459 4.407a.116.116 0 0 1-.049.071.11.11 0 0 1-.153-.026.122.122 0 0 1-.022-.083 5.891 5.891 0 0 0-.737-2.331Zm-5.087.561c-.617.546-1.282.76-2.063 1-.117 0-.195-.078-.156-.181 1.752-.909 2.376-1.649 2.999-2.778 0 0 .155-.118.188.085 0 .304-.349 1.329-.968 1.874Zm4.945 11.237a2.957 2.957 0 0 1-.937 1.553c-.346.346-.8.565-1.286.62a2.178 2.178 0 0 1-1.327-.62 2.955 2.955 0 0 1-.925-1.553.244.244 0 0 1 .064-.198.234.234 0 0 1 .193-.069h3.965a.226.226 0 0 1 .19.07c.05.053.073.125.063.197Zm-5.458-2.176a1.862 1.862 0 0 1-2.384-.245 1.98 1.98 0 0 1-.233-2.447c.207-.319.503-.566.848-.713a1.84 1.84 0 0 1 1.092-.11c.366.075.703.261.967.531a1.98 1.98 0 0 1 .408 2.114 1.931 1.931 0 0 1-.698.869v.001Zm8.495.005a1.86 1.86 0 0 1-2.381-.253 1.964 1.964 0 0 1-.547-1.366c0-.384.11-.76.32-1.079.207-.319.503-.567.849-.713a1.844 1.844 0 0 1 1.093-.108c.367.076.704.262.968.534a1.98 1.98 0 0 1 .4 2.117 1.932 1.932 0 0 1-.702.868Z"/></svg>
				`@@ -1 +0,0 @@`
				`<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path fill="#F25022" d="M1 1h10.5v10.5H1z"/><path fill="#7FBA00" d="M12.5 1H23v10.5H12.5z"/><path fill="#00A4EF" d="M1 12.5h10.5V23H1z"/><path fill="#FFB900" d="M12.5 12.5H23V23H12.5z"/></svg>`