chore: error on empty title body with non-retryable error and give 429 retryable error due to limit

docs/api/openapi.yml

@@ -1496,7 +1496,6 @@ components:
       - redis
       - cloudsql_postgres
       - memorystore_redis
-      - computeengine
       type: string
     CloudintegrationtypesServiceMetadata:
       properties:

frontend/src/api/ErrorResponseHandlerForGeneratedAPIs.ts

@@ -2,29 +2,6 @@ import { RenderErrorResponseDTO } from 'api/generated/services/sigNoz.schemas';
 import { AxiosError } from 'axios';
 import APIError from 'types/api/error';
 
-// The wire shape these handlers can actually rely on. The generated
-// RenderErrorResponseDTO marks code/message/url/errors as required, but the
-// server omits any of them even on valid errors (e.g. a 400 with just a
-// message), so a present `error` object is all the guard can guarantee.
-type ErrorEnvelope = {
-	error: {
-		code?: string;
-		message?: string;
-		url?: string;
-		errors?: { message?: string }[];
-	};
-};
-
-function isErrorEnvelope(data: unknown): data is ErrorEnvelope {
-	return (
-		typeof data === 'object' &&
-		data !== null &&
-		'error' in data &&
-		typeof (data as ErrorEnvelope).error === 'object' &&
-		(data as ErrorEnvelope).error !== null
-	);
-}
-
 // @deprecated Use convertToApiError instead
 export function ErrorResponseHandlerForGeneratedAPIs(
 	error: AxiosError<RenderErrorResponseDTO>,
@@ -33,29 +10,15 @@ export function ErrorResponseHandlerForGeneratedAPIs(
 	// The request was made and the server responded with a status code
 	// that falls out of the range of 2xx
 	if (response) {
-		// The body isn't guaranteed to be an error envelope — e.g. a gateway 5xx
-		// with an HTML/empty body during a deploy. Verify the shape before reading
-		// it; otherwise synthesize a consistent error from the status.
-		const data: unknown = response.data;
-		if (isErrorEnvelope(data)) {
-			const { code, message, url, errors } = data.error;
-			throw new APIError({
-				httpStatusCode: response.status || 500,
-				error: {
-					code: code ?? '',
-					message: message ?? '',
-					url: url ?? '',
-					errors: (errors ?? []).map((e) => ({ message: e.message ?? '' })),
-				},
-			});
-		}
 		throw new APIError({
 			httpStatusCode: response.status || 500,
 			error: {
-				code: 'UPSTREAM_UNAVAILABLE',
-				message: error.message || 'Something went wrong',
-				url: '',
-				errors: [],
+				code: response.data.error.code,
+				message: response.data.error.message,
+				url: response.data.error.url ?? '',
+				errors: (response.data.error.errors ?? []).map((e) => ({
+					message: e.message ?? '',
+				})),
 			},
 		});
 	}
@@ -99,7 +62,9 @@ export function convertToApiError(
 	return new APIError({
 		httpStatusCode: response?.status || error.status || 500,
 		error: {
-			code: errorData?.code || 'UPSTREAM_UNAVAILABLE',
+			code:
+				errorData?.code ||
+				String(response?.status || error.code || 'unknown_error'),
 			message:
 				errorData?.message ||
 				response?.statusText ||

frontend/src/api/ErrorResponseHandlerV2.ts

@@ -2,38 +2,19 @@ import { AxiosError } from 'axios';
 import { ErrorV2Resp } from 'types/api';
 import APIError from 'types/api/error';
 
-function isErrorV2Resp(data: unknown): data is ErrorV2Resp {
-	return (
-		typeof data === 'object' &&
-		data !== null &&
-		'error' in data &&
-		typeof (data as ErrorV2Resp).error?.code === 'string'
-	);
-}
-
 // reference - https://axios-http.com/docs/handling_errors
 export function ErrorResponseHandlerV2(error: AxiosError<ErrorV2Resp>): never {
 	const { response, request } = error;
 	// The request was made and the server responded with a status code
 	// that falls out of the range of 2xx
 	if (response) {
-		// response.data isn't guaranteed to be a V2 envelope (e.g. a gateway 5xx
-		// with an HTML/empty body during a deploy), so verify the shape first.
-		const data: unknown = response.data;
-		if (isErrorV2Resp(data)) {
-			const { code, message, url, errors } = data.error;
-			throw new APIError({
-				httpStatusCode: response.status || 500,
-				error: { code, message, url, errors },
-			});
-		}
 		throw new APIError({
 			httpStatusCode: response.status || 500,
 			error: {
-				code: 'UPSTREAM_UNAVAILABLE',
-				message: error.message || 'Something went wrong',
-				url: '',
-				errors: [],
+				code: response.data.error.code,
+				message: response.data.error.message,
+				url: response.data.error.url,
+				errors: response.data.error.errors,
 			},
 		});
 	}

frontend/src/api/__tests__/ErrorResponseHandlerV2.test.ts

@@ -1,126 +0,0 @@
-import { ErrorResponseHandlerV2 } from 'api/ErrorResponseHandlerV2';
-import { AxiosError } from 'axios';
-import { ErrorV2Resp } from 'types/api';
-import APIError from 'types/api/error';
-
-function asAxiosError(partial: Partial<AxiosError>): AxiosError<ErrorV2Resp> {
-	return partial as AxiosError<ErrorV2Resp>;
-}
-
-// ErrorResponseHandlerV2 always throws — capture the APIError so assertions stay
-// unconditional.
-function runHandler(error: AxiosError<ErrorV2Resp>): APIError {
-	try {
-		ErrorResponseHandlerV2(error);
-	} catch (thrown) {
-		return thrown as APIError;
-	}
-	throw new Error('expected ErrorResponseHandlerV2 to throw');
-}
-
-type ExpectedError = {
-	httpStatusCode: number;
-	code: string;
-	message: string;
-	errors: { message: string }[];
-};
-
-// One row per response shape the handler must normalize. New shapes (with
-// different bodies) can be added here without a new test block.
-const cases: {
-	name: string;
-	error: AxiosError<ErrorV2Resp>;
-	expected: ExpectedError;
-}[] = [
-	{
-		name: 'well-formed V2 error envelope',
-		error: asAxiosError({
-			message: 'Request failed with status code 400',
-			response: {
-				status: 400,
-				data: {
-					error: {
-						code: 'bad_request',
-						message: 'Invalid dashboard payload',
-						url: 'https://signoz.io/docs',
-						errors: [{ message: 'name is required' }, { message: 'name too long' }],
-					},
-				},
-			} as AxiosError['response'],
-		}),
-		expected: {
-			httpStatusCode: 400,
-			code: 'bad_request',
-			message: 'Invalid dashboard payload',
-			errors: [{ message: 'name is required' }, { message: 'name too long' }],
-		},
-	},
-	{
-		// Regression: during a deployment the gateway returns a 5xx with a
-		// non-envelope body. Reading response.data.error.code used to throw a
-		// TypeError from inside the handler itself. See engineering-pod#5760.
-		name: '5xx with a non-envelope HTML body',
-		error: asAxiosError({
-			message: 'Request failed with status code 503',
-			response: {
-				status: 503,
-				data: '<html><body>503 Service Temporarily Unavailable</body></html>',
-			} as AxiosError['response'],
-		}),
-		expected: {
-			httpStatusCode: 503,
-			code: 'UPSTREAM_UNAVAILABLE',
-			message: 'Request failed with status code 503',
-			errors: [],
-		},
-	},
-	{
-		name: '5xx with an empty body',
-		error: asAxiosError({
-			message: 'Request failed with status code 502',
-			response: {
-				status: 502,
-				data: undefined,
-			} as AxiosError['response'],
-		}),
-		expected: {
-			httpStatusCode: 502,
-			code: 'UPSTREAM_UNAVAILABLE',
-			message: 'Request failed with status code 502',
-			errors: [],
-		},
-	},
-	{
-		name: 'no response received (network error)',
-		error: asAxiosError({
-			message: 'Network Error',
-			code: 'ERR_NETWORK',
-			name: 'AxiosError',
-			request: {},
-		}),
-		expected: {
-			httpStatusCode: 500,
-			code: 'ERR_NETWORK',
-			message: 'Network Error',
-			errors: [],
-		},
-	},
-];
-
-describe('ErrorResponseHandlerV2', () => {
-	it.each(cases)(
-		'normalizes $name into a consistent APIError',
-		({ error, expected }) => {
-			const apiError = runHandler(error);
-
-			expect(apiError).toBeInstanceOf(APIError);
-			expect(apiError.getHttpStatusCode()).toBe(expected.httpStatusCode);
-			expect(apiError.getErrorCode()).toBe(expected.code);
-			expect(apiError.getErrorMessage()).toBe(expected.message);
-			// The sub-error messages feed several parts of the UI, so assert them.
-			expect(apiError.getErrorDetails().error.errors).toStrictEqual(
-				expected.errors,
-			);
-		},
-	);
-});

frontend/src/api/generated/services/sigNoz.schemas.ts

@@ -2815,7 +2815,6 @@ export enum CloudintegrationtypesServiceIDDTO {
 	redis = 'redis',
 	cloudsql_postgres = 'cloudsql_postgres',
 	memorystore_redis = 'memorystore_redis',
-	computeengine = 'computeengine',
 }
 export type CloudintegrationtypesCloudIntegrationServiceDTOAnyOf = {
 	/**

frontend/src/components/FieldsSelector/OtherFields.tsx

@@ -8,6 +8,7 @@ import { buildCompositeKey } from 'container/OptionsMenu/utils';
 import { useGetQueryKeySuggestions } from 'hooks/querySuggestions/useGetQueryKeySuggestions';
 import {
 	FieldContext,
+	FieldDataType,
 	SignalType,
 	TelemetryFieldKey,
 } from 'types/api/v5/queryRange';
@@ -54,7 +55,7 @@ function OtherFields({
 				key: buildCompositeKey(attr.name, attr.fieldContext as string),
 				signal: attr.signal as SignalType,
 				fieldContext: attr.fieldContext as FieldContext,
-				fieldDataType: attr.fieldDataType,
+				fieldDataType: attr.fieldDataType as FieldDataType,
 			}),
 		);
 		const addedIds = new Set(

frontend/src/components/QueryBuilderV2/QueryV2/QueryAggregation/QueryAggregationSelect.tsx

@@ -25,12 +25,12 @@ import CodeMirror, {
 } from '@uiw/react-codemirror';
 import { Button, Popover, Tooltip } from 'antd';
 import { getKeySuggestions } from 'api/querySuggestions/getKeySuggestions';
+import { QUERY_BUILDER_KEY_TYPES } from 'constants/antlrQueryConstants';
 import { QueryBuilderKeys } from 'constants/queryBuilder';
 import { tracesAggregateOperatorOptions } from 'constants/queryBuilderOperators';
 import { useIsDarkMode } from 'hooks/useDarkMode';
 import { Info, TriangleAlert } from '@signozhq/icons';
 import { IBuilderQuery } from 'types/api/queryBuilder/queryBuilderData';
-import { FieldDataType } from 'types/api/v5/queryRange';
 import { TracesAggregatorOperator } from 'types/common/queryBuilder';
 
 import { useQueryBuilderV2Context } from '../../QueryBuilderV2Context';
@@ -323,16 +323,16 @@ function QueryAggregationSelect({
 				TracesAggregatorOperator.RATE,
 			];
 
-			const fieldDataType: FieldDataType | undefined =
+			const fieldDataType =
 				functionContextForFetch &&
 				operatorsWithoutDataType.includes(functionContextForFetch)
 					? undefined
-					: 'number';
+					: QUERY_BUILDER_KEY_TYPES.NUMBER;
 
 			return getKeySuggestions({
 				signal: queryData.dataSource,
 				searchText: '',
-				fieldDataType,
+				fieldDataType: fieldDataType as QUERY_BUILDER_KEY_TYPES,
 			});
 		},
 		{

frontend/src/components/QuickFilters/FilterRenderers/Checkbox/Checkbox.styles.scss

@@ -92,76 +92,52 @@
 						color: var(--l3-foreground);
 					}
 
-					.only-btn,
+					.only-btn {
+						cursor: not-allowed;
+						color: var(--l3-foreground);
+					}
+
 					.toggle-btn {
 						cursor: not-allowed;
 						color: var(--l3-foreground);
 					}
 				}
 
-				// Stack "Only"/"All" and "Toggle" in a single cell so revealing
-				// one swaps in place instead of shifting the row layout.
-				.value-actions {
-					display: grid;
-					align-items: center;
-					justify-items: end;
-
-					> * {
-						grid-area: 1 / 1;
-					}
+				.only-btn {
+					display: none;
 				}
-
-				.only-btn,
 				.toggle-btn {
 					display: none;
+				}
+
+				.toggle-btn:hover {
+					background-color: unset;
+				}
+
+				.only-btn:hover {
+					background-color: unset;
+				}
+			}
+
+			.checkbox-value-section:hover {
+				.toggle-btn {
+					display: none;
+				}
+				.only-btn {
+					display: flex;
 					align-items: center;
 					justify-content: center;
 					height: 21px;
-					opacity: 0;
-					transform: translateX(4px);
-					// `display` is animated as a discrete property so the button
-					// stays mounted through its fade-out on exit.
-					transition:
-						opacity 0.16s ease,
-						transform 0.16s ease,
-						display 0.16s allow-discrete;
-
-					&:hover {
-						background-color: unset;
-					}
-				}
-			}
-
-			// Hovering the label/value area reveals the "Only"/"All" action.
-			.checkbox-value-section:hover .only-btn {
-				display: flex;
-				opacity: 1;
-				transform: translateX(0);
-
-				// Entry animation start state (fires on the display switch).
-				@starting-style {
-					opacity: 0;
-					transform: translateX(4px);
-				}
-			}
-
-			// Hovering the checkbox reveals the "Toggle" action.
-			.check-box:hover ~ .checkbox-value-section .toggle-btn {
-				display: flex;
-				opacity: 1;
-				transform: translateX(0);
-
-				@starting-style {
-					opacity: 0;
-					transform: translateX(4px);
 				}
 			}
 		}
 
-		@media (prefers-reduced-motion: reduce) {
-			.only-btn,
+		.value:hover {
 			.toggle-btn {
-				transition: none;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				height: 21px;
 			}
 		}
 	}

frontend/src/components/QuickFilters/FilterRenderers/Checkbox/CheckboxValueRow.tsx

@@ -53,14 +53,12 @@ function CheckboxValueRow({
 						</Typography.Text>
 					</TooltipSimple>
 				)}
-				<div className="value-actions">
-					<Button type="text" className="only-btn">
-						{onlyButtonLabel}
-					</Button>
-					<Button type="text" className="toggle-btn">
-						Toggle
-					</Button>
-				</div>
+				<Button type="text" className="only-btn">
+					{onlyButtonLabel}
+				</Button>
+				<Button type="text" className="toggle-btn">
+					Toggle
+				</Button>
 			</div>
 		</div>
 	);

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

@@ -6,7 +6,7 @@ import { Skeleton } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
 import {
 	useGetMetricAlerts,
-	useGetMetricDashboardsV2,
+	useGetMetricDashboards,
 } from 'api/generated/services/metrics';
 import { QueryParams } from 'constants/query';
 import ROUTES from 'constants/routes';
@@ -38,7 +38,7 @@ function DashboardsAndAlertsPopover({
 		data: dashboardsData,
 		isLoading: isLoadingDashboards,
 		isError: isErrorDashboards,
-	} = useGetMetricDashboardsV2(
+	} = useGetMetricDashboards(
 		{
 			metricName,
 		},
@@ -55,8 +55,7 @@ function DashboardsAndAlertsPopover({
 
 	const dashboards = useMemo(() => {
 		const currentDashboards = dashboardsData?.data.dashboards ?? [];
-		// The API returns one entry per referencing panel, so a dashboard repeats
-		// once per panel that uses the metric.
+		// Remove duplicate dashboards
 		return currentDashboards.filter(
 			(dashboard, index, self) =>
 				index === self.findIndex((t) => t.dashboardId === dashboard.dashboardId),

frontend/src/container/MetricsExplorer/MetricDetails/__tests__/DashboardsAndAlertsPopover.test.tsx

@@ -23,7 +23,7 @@ const useGetMetricAlertsMock = jest.spyOn(
 );
 const useGetMetricDashboardsMock = jest.spyOn(
 	metricsExplorerHooks,
-	'useGetMetricDashboardsV2',
+	'useGetMetricDashboards',
 );
 
 describe('DashboardsAndAlertsPopover', () => {
@@ -153,15 +153,11 @@ describe('DashboardsAndAlertsPopover', () => {
 		);
 	});
 
-	it('collapses multiple panels of the same dashboard into one entry', async () => {
+	it('renders unique dashboards even when there are duplicates', async () => {
 		useGetMetricDashboardsMock.mockReturnValue(
 			getMockDashboardsData({
 				data: {
-					dashboards: [
-						MOCK_DASHBOARD_1,
-						MOCK_DASHBOARD_2,
-						{ ...MOCK_DASHBOARD_1, panelId: '3', panelName: 'Panel 3' },
-					],
+					dashboards: [MOCK_DASHBOARD_1, MOCK_DASHBOARD_2, MOCK_DASHBOARD_1],
 				},
 			}),
 		);

frontend/src/container/MetricsExplorer/MetricDetails/__tests__/testUtlls.ts

@@ -2,7 +2,7 @@ import * as metricsExplorerHooks from 'api/generated/services/metrics';
 import {
 	GetMetricAlerts200,
 	GetMetricAttributes200,
-	GetMetricDashboardsV2200,
+	GetMetricDashboards200,
 	GetMetricHighlights200,
 	GetMetricMetadata200,
 	MetrictypesTemporalityDTO,
@@ -40,14 +40,14 @@ export function getMockMetricHighlightsData(
 export const MOCK_DASHBOARD_1 = {
 	dashboardName: 'Dashboard 1',
 	dashboardId: '1',
-	panelId: '1',
-	panelName: 'Panel 1',
+	widgetId: '1',
+	widgetName: 'Widget 1',
 };
 export const MOCK_DASHBOARD_2 = {
 	dashboardName: 'Dashboard 2',
 	dashboardId: '2',
-	panelId: '2',
-	panelName: 'Panel 2',
+	widgetId: '2',
+	widgetName: 'Widget 2',
 };
 export const MOCK_ALERT_1 = {
 	alertName: 'Alert 1',
@@ -59,7 +59,7 @@ export const MOCK_ALERT_2 = {
 };
 
 export function getMockDashboardsData(
-	overrides?: Partial<GetMetricDashboardsV2200>,
+	overrides?: Partial<GetMetricDashboards200>,
 	{
 		isLoading = false,
 		isError = false,
@@ -67,7 +67,7 @@ export function getMockDashboardsData(
 		isLoading?: boolean;
 		isError?: boolean;
 	} = {},
-): ReturnType<typeof metricsExplorerHooks.useGetMetricDashboardsV2> {
+): ReturnType<typeof metricsExplorerHooks.useGetMetricDashboards> {
 	return {
 		data: {
 			data: {
@@ -79,7 +79,7 @@ export function getMockDashboardsData(
 
 		isLoading,
 		isError,
-	} as ReturnType<typeof metricsExplorerHooks.useGetMetricDashboardsV2>;
+	} as ReturnType<typeof metricsExplorerHooks.useGetMetricDashboards>;
 }
 
 export function getMockAlertsData(

frontend/src/container/OptionsMenu/useOptionsMenu.ts

@@ -113,7 +113,7 @@ const useOptionsMenu = ({
 					(suggestion) => ({
 						name: suggestion.name,
 						signal: suggestion.signal as SignalType,
-						fieldDataType: suggestion.fieldDataType,
+						fieldDataType: suggestion.fieldDataType as FieldDataType,
 						fieldContext: suggestion.fieldContext as FieldContext,
 					}),
 				);
@@ -192,7 +192,7 @@ const useOptionsMenu = ({
 				name: e.name,
 				signal: e.signal as SignalType,
 				fieldContext: e.fieldContext as FieldContext,
-				fieldDataType: e.fieldDataType,
+				fieldDataType: e.fieldDataType as FieldDataType,
 			}));
 		}
 		if (dataSource === DataSource.TRACES) {

frontend/src/container/QueryTable/Drilldown/BreakoutOptions.tsx

@@ -4,11 +4,11 @@ import { Input } from '@signozhq/ui/input';
 import { Skeleton } from 'antd';
 import { getKeySuggestions } from 'api/querySuggestions/getKeySuggestions';
 import OverlayScrollbar from 'components/OverlayScrollbar/OverlayScrollbar';
+import { QUERY_BUILDER_KEY_TYPES } from 'constants/antlrQueryConstants';
 import useDebounce from 'hooks/useDebounce';
 import { ContextMenu } from 'periscope/components/ContextMenu';
 import { BaseAutocompleteData } from 'types/api/queryBuilder/queryAutocompleteResponse';
 import { MetricAggregation } from 'types/api/v5/queryRange';
-import { fieldDataTypeToDataType } from 'utils/fieldDataType';
 
 import { BreakoutOptionsProps } from './contextConfig';
 import { BreakoutAttributeType } from './types';
@@ -80,7 +80,7 @@ function BreakoutOptions({
 			keyArray.forEach((keyData) => {
 				transformedOptions.push({
 					key: keyData.name,
-					dataType: fieldDataTypeToDataType(keyData.fieldDataType),
+					dataType: keyData.fieldDataType as QUERY_BUILDER_KEY_TYPES,
 					type: '',
 				});
 			});

frontend/src/container/QueryTable/Drilldown/__tests__/Breakout.test.tsx

@@ -238,10 +238,6 @@ describe('TableDrilldown Breakout Functionality', () => {
 		expect(aggregateQueryData.groupBy).toHaveLength(1);
 		expect(aggregateQueryData.groupBy[0].key).toBe('deployment.environment');
 
-		// The picked field's type travels with it — dropping it leaves the breakout query
-		// untyped, so a drilldown on its result can't tell a number from a string.
-		expect(aggregateQueryData.groupBy[0].dataType).toBe('string');
-
 		// Verify that orderBy has been cleared (as per getBreakoutQuery logic)
 		expect(aggregateQueryData.orderBy).toStrictEqual([]);
 

frontend/src/container/QueryTable/Drilldown/tableDrilldownUtils.tsx

@@ -1,5 +1,6 @@
 import { OPERATORS, PANEL_TYPES } from 'constants/queryBuilder';
 import cloneDeep from 'lodash-es/cloneDeep';
+import { BaseAutocompleteData } from 'types/api/queryBuilder/queryAutocompleteResponse';
 import { IBuilderQuery, Query } from 'types/api/queryBuilder/queryBuilderData';
 
 import { addFilterToSelectedQuery, FilterData } from './drilldownUtils';
@@ -88,11 +89,7 @@ export const getBreakoutQuery = (
 		.filter((item: IBuilderQuery) => item.queryName === aggregateData.queryName)
 		.map((item: IBuilderQuery) => ({
 			...item,
-			// The picked field's type travels with it: dropped, the breakout query goes out
-			// untyped and a drilldown on its result can't tell a number from a string.
-			groupBy: [
-				{ key: groupBy.key, dataType: groupBy.dataType, type: groupBy.type },
-			],
+			groupBy: [{ key: groupBy.key, type: groupBy.type } as BaseAutocompleteData],
 			orderBy: [],
 			legend: item.legend && groupBy.key ? `{{${groupBy.key}}}` : '',
 		}));

frontend/src/container/QueryTable/Drilldown/types.ts

@@ -1,8 +1,6 @@
 import { ReactNode } from 'react';
-import {
-	BaseAutocompleteData,
-	DataTypes,
-} from 'types/api/queryBuilder/queryAutocompleteResponse';
+import { QUERY_BUILDER_KEY_TYPES } from 'constants/antlrQueryConstants';
+import { BaseAutocompleteData } from 'types/api/queryBuilder/queryAutocompleteResponse';
 import { IBuilderQuery } from 'types/api/queryBuilder/queryBuilderData';
 
 export type ContextMenuItem = ReactNode;
@@ -33,8 +31,7 @@ export interface AggregateContextMenuConfig {
 
 export interface BreakoutAttributeType {
 	key: string;
-	/** The picked field's type, in the vocabulary the group-by it becomes is read with. */
-	dataType: DataTypes;
+	dataType: QUERY_BUILDER_KEY_TYPES;
 	type: string;
 }
 

frontend/src/pages/DashboardPageV2/DashboardContainer/DashboardPageToolbar/DashboardActions/DashboardActions.module.scss

@@ -11,9 +11,3 @@
 	border: 1px solid var(--l3-border) !important;
 	box-shadow: none !important;
 }
-
-/* Highlights the dashboard name inside the delete-confirm title. */
-.deleteName {
-	color: var(--danger-background);
-	font-weight: var(--font-weight-medium);
-}

frontend/src/pages/DashboardPageV2/DashboardContainer/DashboardPageToolbar/DashboardActions/DashboardActions.tsx

@@ -27,13 +27,16 @@ import logEvent from 'api/common/logEvent';
 import { cloneDashboardV2 } from 'api/generated/services/dashboard';
 import type { DashboardtypesGettableDashboardV2DTO } from 'api/generated/services/sigNoz.schemas';
 import ROUTES from 'constants/routes';
+import { useDeleteDashboard } from 'hooks/dashboard/useDeleteDashboard';
 import { useSafeNavigate } from 'hooks/useSafeNavigate';
+import history from 'lib/history';
 import { DashboardDetailEvents } from 'pages/DashboardPageV2/constants/events';
 import { useAppContext } from 'providers/App/App';
 import { useErrorModal } from 'providers/ErrorModalProvider';
 import APIError from 'types/api/error';
 import { USER_ROLES } from 'types/roles';
 
+import ConfirmDeleteDialog from '../../components/ConfirmDeleteDialog/ConfirmDeleteDialog';
 import DisabledControlTooltip from '../../components/DisabledControlTooltip/DisabledControlTooltip';
 import DisabledMenuItemLabel from '../../components/DisabledMenuItemLabel/DisabledMenuItemLabel';
 import DashboardSettings from '../../DashboardSettings';
@@ -42,7 +45,6 @@ import SectionTitleModal from '../../PanelsAndSectionsLayout/Section/SectionTitl
 import JsonEditorDrawer from '../JsonEditorDrawer/JsonEditorDrawer';
 import SettingsDrawer from '../SettingsDrawer';
 import styles from './DashboardActions.module.scss';
-import { useDeleteDashboardAction } from './useDeleteDashboardAction';
 import { DASHBOARD_LOCKED_REASON } from '../../hooks/useDashboardEditGuard';
 import { useDashboardStore } from '../../store/useDashboardStore';
 
@@ -82,12 +84,8 @@ function DashboardActions({
 	const [isCloning, setIsCloning] = useState<boolean>(false);
 	const [isNewSectionOpen, setIsNewSectionOpen] = useState<boolean>(false);
 
-	const { contextHolder: deleteConfirmHolder, confirmDeleteDashboard } =
-		useDeleteDashboardAction({
-			dashboardId: dashboard.id,
-			dashboardName: title,
-			panelCount: Object.keys(dashboard.spec.panels).length,
-		});
+	const [isDeleteOpen, setIsDeleteOpen] = useState<boolean>(false);
+	const deleteDashboardMutation = useDeleteDashboard(dashboard.id);
 
 	// Open the settings drawer when something in the tree requests it (e.g. the
 	// variables bar's "Add variable" button).
@@ -134,6 +132,19 @@ function DashboardActions({
 		}
 	}, [dashboard.id, title, safeNavigate, showErrorModal]);
 
+	const handleConfirmDelete = useCallback((): void => {
+		deleteDashboardMutation.mutate(undefined, {
+			onSuccess: () => {
+				void logEvent(DashboardDetailEvents.Deleted, {
+					dashboardId: dashboard.id,
+					panelCount: Object.keys(dashboard.spec.panels).length,
+				});
+				setIsDeleteOpen(false);
+				history.replace(ROUTES.ALL_DASHBOARD);
+			},
+		});
+	}, [deleteDashboardMutation, dashboard.id, dashboard.spec.panels]);
+
 	const handleOpenSettings = useCallback((): void => {
 		void logEvent(DashboardDetailEvents.SettingsOpened, {
 			dashboardId: dashboard.id,
@@ -237,7 +248,7 @@ function DashboardActions({
 					icon: <Trash2 size={14} />,
 					danger: true,
 					disabled: isLocked,
-					onClick: confirmDeleteDashboard,
+					onClick: (): void => setIsDeleteOpen(true),
 				},
 			);
 		}
@@ -255,7 +266,6 @@ function DashboardActions({
 		handleClone,
 		onLockToggle,
 		handleEnterFullScreen,
-		confirmDeleteDashboard,
 	]);
 
 	return (
@@ -338,7 +348,14 @@ function DashboardActions({
 				isOpen={isJsonEditorOpen}
 				onClose={(): void => setIsJsonEditorOpen(false)}
 			/>
-			{deleteConfirmHolder}
+			<ConfirmDeleteDialog
+				open={isDeleteOpen}
+				title={`Delete dashboard"?`}
+				description={`Are you sure you want to delete this dashboard - "${title}"? This action cannot be undone.`}
+				isLoading={deleteDashboardMutation.isLoading}
+				onConfirm={handleConfirmDelete}
+				onClose={(): void => setIsDeleteOpen(false)}
+			/>
 			<SectionTitleModal
 				open={isNewSectionOpen}
 				heading="New section"

frontend/src/pages/DashboardPageV2/DashboardContainer/DashboardPageToolbar/DashboardActions/useDeleteDashboardAction.tsx

@@ -1,89 +0,0 @@
-import { type ReactNode, useCallback } from 'react';
-import { useQueryClient } from 'react-query';
-import { toast } from '@signozhq/ui/sonner';
-import { Typography } from '@signozhq/ui/typography';
-import logEvent from 'api/common/logEvent';
-import {
-	invalidateListDashboardsForUserV2,
-	useDeleteDashboardV2,
-} from 'api/generated/services/dashboard';
-import { useDeleteConfirm } from 'components/DeleteConfirmModal/useDeleteConfirm';
-import ROUTES from 'constants/routes';
-import { useDashboardPreferencesStore } from 'hooks/dashboard/useDashboardPreference';
-import history from 'lib/history';
-import { DashboardDetailEvents } from 'pages/DashboardPageV2/constants/events';
-import { useErrorModal } from 'providers/ErrorModalProvider';
-import APIError from 'types/api/error';
-
-import styles from './DashboardActions.module.scss';
-
-interface UseDeleteDashboardActionArgs {
-	dashboardId: string;
-	dashboardName: string;
-	panelCount: number;
-}
-
-interface UseDeleteDashboardAction {
-	/** Must be rendered in the calling component for the modal to appear. */
-	contextHolder: ReactNode;
-	confirmDeleteDashboard: () => void;
-}
-
-/**
- * Deletes the open dashboard through the v2 endpoint behind the shared
- * destructive confirmation, then drops its local preferences, refreshes the
- * dashboard list cache and sends the user back to the list.
- */
-export function useDeleteDashboardAction({
-	dashboardId,
-	dashboardName,
-	panelCount,
-}: UseDeleteDashboardActionArgs): UseDeleteDashboardAction {
-	const queryClient = useQueryClient();
-	const { showErrorModal } = useErrorModal();
-	const { contextHolder, confirmDelete } = useDeleteConfirm();
-	const removePreferences = useDashboardPreferencesStore(
-		(state) => state.removePreferences,
-	);
-
-	const { mutate: deleteDashboard } = useDeleteDashboardV2({
-		mutation: {
-			onSuccess: async (): Promise<void> => {
-				void logEvent(DashboardDetailEvents.Deleted, { dashboardId, panelCount });
-				removePreferences(dashboardId);
-				await invalidateListDashboardsForUserV2(queryClient);
-				toast.success('Dashboard deleted successfully');
-				history.replace(ROUTES.ALL_DASHBOARD);
-			},
-			onError: (error: unknown): void => {
-				showErrorModal(error as APIError);
-			},
-		},
-	});
-
-	const confirmDeleteDashboard = useCallback((): void => {
-		confirmDelete({
-			title: (
-				<Typography.Title level={5}>
-					Are you sure you want to delete the
-					<Typography.Text className={styles.deleteName}>
-						{' '}
-						{dashboardName}{' '}
-					</Typography.Text>
-					dashboard?
-				</Typography.Title>
-			),
-			content: 'This action cannot be undone.',
-			// Keeps the Delete button loading until the mutation settles, then closes.
-			onConfirm: () =>
-				new Promise<void>((resolve) => {
-					deleteDashboard(
-						{ pathParams: { id: dashboardId } },
-						{ onSettled: () => resolve() },
-					);
-				}),
-		});
-	}, [confirmDelete, dashboardName, deleteDashboard, dashboardId]);
-
-	return { contextHolder, confirmDeleteDashboard };
-}

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/Header/Header.tsx

@@ -1,6 +1,5 @@
 import { useCallback } from 'react';
 import { SolidAlertTriangle, X } from '@signozhq/icons';
-import { Badge } from '@signozhq/ui/badge';
 import { Button } from '@signozhq/ui/button';
 import { DialogWrapper } from '@signozhq/ui/dialog';
 import { Divider } from '@signozhq/ui/divider';
@@ -14,7 +13,6 @@ import DisabledControlTooltip from '../../components/DisabledControlTooltip/Disa
 import styles from './Header.module.scss';
 
 interface HeaderProps {
-	/** Unsaved edits exist — shows the "Unsaved Changes" badge and gates the discard confirmation on close (not the Save button). */
 	isDirty: boolean;
 	isSaving: boolean;
 	showSwitchToView?: boolean;
@@ -68,11 +66,6 @@ function Header({
 				/>
 				<Divider type="vertical" />
 				<Typography.Text>Configure panel</Typography.Text>
-				{isDirty && (
-					<Badge color="warning" data-testid="panel-editor-v2-unsaved-badge">
-						Unsaved Changes
-					</Badge>
-				)}
 			</div>
 			<div className={styles.actions}>
 				<HeaderRightSection
@@ -95,7 +88,7 @@ function Header({
 						variant="solid"
 						color="primary"
 						data-testid="panel-editor-v2-save"
-						disabled={readOnly || isSaving}
+						disabled={readOnly || !isDirty || isSaving}
 						loading={!readOnly && isSaving}
 						onClick={readOnly ? undefined : onSave}
 					>

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/Header/__tests__/Header.test.tsx

@@ -1,4 +1,3 @@
-import type { ComponentProps } from 'react';
 import { MemoryRouter } from 'react-router-dom';
 import { render, screen } from '@testing-library/react';
 import { TooltipProvider } from '@signozhq/ui/tooltip';
@@ -24,9 +23,7 @@ jest.mock('api/common/logEvent', () => ({
 
 const mockUseIsAIAssistantEnabled = useIsAIAssistantEnabled as jest.Mock;
 
-function renderHeader(
-	props: Partial<ComponentProps<typeof Header>> = {},
-): void {
+function renderHeader(): void {
 	// AppLayout supplies the TooltipProvider in the app; the header is rendered bare here.
 	render(
 		<MemoryRouter>
@@ -36,7 +33,6 @@ function renderHeader(
 					isSaving={false}
 					onSave={jest.fn()}
 					onClose={jest.fn()}
-					{...props}
 				/>
 			</TooltipProvider>
 		</MemoryRouter>,
@@ -70,34 +66,4 @@ describe('PanelEditor Header', () => {
 		).not.toBeInTheDocument();
 		expect(screen.getByTestId('panel-editor-v2-save')).toBeInTheDocument();
 	});
-
-	it('keeps Save enabled even when there are no unsaved edits', () => {
-		mockUseIsAIAssistantEnabled.mockReturnValue(false);
-
-		renderHeader({ isDirty: false });
-
-		expect(screen.getByTestId('panel-editor-v2-save')).toBeEnabled();
-	});
-
-	it('disables Save only while read-only or saving', () => {
-		mockUseIsAIAssistantEnabled.mockReturnValue(false);
-
-		renderHeader({ isDirty: true, readOnly: true, readOnlyReason: 'Locked' });
-
-		expect(screen.getByTestId('panel-editor-v2-save')).toBeDisabled();
-	});
-
-	it('shows the Unsaved Changes badge only when there are unsaved edits', () => {
-		mockUseIsAIAssistantEnabled.mockReturnValue(false);
-
-		renderHeader({ isDirty: false });
-		expect(
-			screen.queryByTestId('panel-editor-v2-unsaved-badge'),
-		).not.toBeInTheDocument();
-
-		renderHeader({ isDirty: true });
-		expect(
-			screen.getByTestId('panel-editor-v2-unsaved-badge'),
-		).toBeInTheDocument();
-	});
 });

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/__tests__/PanelEditorContainer.test.tsx

@@ -1,6 +1,5 @@
 import { render, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import { toast } from '@signozhq/ui/sonner';
 import type { DashboardtypesPanelDTO } from 'api/generated/services/sigNoz.schemas';
 import { PANEL_TYPES } from 'constants/queryBuilder';
 import { getPanelDefinition } from 'pages/DashboardPageV2/DashboardContainer/Panels/registry';
@@ -101,12 +100,6 @@ jest.mock('@signozhq/ui/resizable', () => ({
 jest.mock('@signozhq/ui/sonner', () => ({
 	toast: { success: jest.fn(), error: jest.fn() },
 }));
-const mockShowErrorModal = jest.fn();
-jest.mock('providers/ErrorModalProvider', () => ({
-	useErrorModal: (): { showErrorModal: jest.Mock } => ({
-		showErrorModal: mockShowErrorModal,
-	}),
-}));
 
 // Children mocked to capture props (and expose a Save trigger / footer slot).
 const mockHeaderProps = jest.fn();
@@ -268,13 +261,13 @@ describe('PanelEditorContainer composition', () => {
 		);
 	});
 
-	it('keeps a query-less new panel clean but still serializes its seed query', () => {
+	it('keeps a query-less new panel unsaveable but still serializes its seed query', () => {
 		setup(makePanel('signoz/TimeSeriesPanel'), { isNew: true });
 
 		expect(mockUseQuerySync).toHaveBeenCalledWith(
 			expect.objectContaining({ alwaysSerializeQuery: true }),
 		);
-		// No query and no edits yet → not dirty, so closing won't prompt to discard.
+		// No query and no edits yet → nothing to save, so Save stays disabled.
 		expect(mockHeaderProps).toHaveBeenCalledWith(
 			expect.objectContaining({ isDirty: false }),
 		);
@@ -297,7 +290,7 @@ describe('PanelEditorContainer composition', () => {
 		);
 	});
 
-	it('marks a new panel that already has a query dirty (e.g. list auto-runs one)', () => {
+	it('marks a new panel that already has a query saveable (e.g. list auto-runs one)', () => {
 		const seededQuery = {
 			spec: { plugin: { kind: 'signoz/BuilderQuery', spec: { signal: 'logs' } } },
 		};
@@ -334,24 +327,6 @@ describe('PanelEditorContainer composition', () => {
 		expect(mockSave).toHaveBeenCalledWith(panel.spec);
 	});
 
-	it('surfaces a save failure through the error modal', async () => {
-		// The raw thrown value flows straight to the modal, which normalizes it to an
-		// APIError itself (that normalization is covered by ErrorModalProvider's tests).
-		const failure = {
-			response: {
-				status: 400,
-				data: { error: { code: 'INVALID', message: 'Panel name already exists' } },
-			},
-		};
-		mockSave.mockRejectedValueOnce(failure);
-		setup(makePanel('signoz/TimeSeriesPanel'));
-
-		await userEvent.click(screen.getByTestId('editor-save'));
-
-		await waitFor(() => expect(mockShowErrorModal).toHaveBeenCalledWith(failure));
-		expect(toast.error).not.toHaveBeenCalled();
-	});
-
 	it('marks the saved panel to be scrolled into view on the dashboard', async () => {
 		setup(makePanel('signoz/TimeSeriesPanel'));
 

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/hooks/__tests__/usePanelEditorQuerySync.integration.test.tsx

@@ -117,49 +117,6 @@ describe('usePanelEditorQuerySync (real query builder)', () => {
 		},
 	);
 
-	it('a NEW panel stays query-dirty after Stage & Run commits the edited query into the draft', async () => {
-		// Repro of the P0: new panel → edit → Run commits the query into the draft; the
-		// dirty baseline must not drift onto it, or Save re-disables.
-		const editedInUrl: Query = {
-			...initialQueriesMap[DataSource.METRICS],
-			id: 'edited-new-panel',
-			builder: {
-				...initialQueriesMap[DataSource.METRICS].builder,
-				queryData: [
-					{
-						...initialQueriesMap[DataSource.METRICS].builder.queryData[0],
-						legend: 'edited-legend',
-					},
-				],
-			},
-		};
-		const committed = toPerses(editedInUrl, panelType);
-
-		const { result, rerender } = renderHook(
-			({ draftQueries }: { draftQueries: DashboardtypesQueryDTO[] }) =>
-				usePanelEditorQuerySync({
-					draft: makePanel(draftQueries),
-					panelType,
-					setSpec: jest.fn(),
-					refetch: jest.fn(),
-					alwaysSerializeQuery: true,
-					signal: DataSource.METRICS as unknown as TelemetrytypesSignalDTO,
-					// savedQueries omitted — new panel.
-				}),
-			{
-				wrapper: makeUrlWrapper(editedInUrl),
-				initialProps: { draftQueries: [] as DashboardtypesQueryDTO[] },
-			},
-		);
-
-		// The edited query (from the URL) diverges from the seeded default → dirty.
-		await waitFor(() => expect(result.current.isQueryDirty).toBe(true));
-
-		// Stage & Run commits the edited query into the draft → must stay dirty.
-		rerender({ draftQueries: committed });
-		expect(result.current.isQueryDirty).toBe(true);
-	});
-
 	it('an untouched panel with a minimal/older stored query is NOT dirty (drift fix)', async () => {
 		// An older saved query carries only a few fields; the builder re-emits many more
 		// (source, stepInterval, filter, spaceAggregation, …). Comparing raw would read

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/hooks/usePanelEditorQuerySync.ts

@@ -79,11 +79,6 @@ export function usePanelEditorQuerySync({
 	// in-editor edit in the URL survives a refresh / browser Back-Forward.
 	useShareBuilderUrl({ defaultValue: seedQuery });
 
-	// Frozen seed for the new-panel dirty baseline: Stage & Run commits the live query
-	// into `draft.spec.queries`, so re-reading `seedQuery` would drift the baseline onto
-	// the run query and Save would re-disable right after a run.
-	const initialSeedRef = useRef(seedQuery);
-
 	// Commit the live query into the draft (what the preview fetches).
 	const commitQuery = useCallback(
 		(query: Query): boolean => {
@@ -157,19 +152,16 @@ export function usePanelEditorQuerySync({
 	// the V5 envelope level. Anchoring to `savedQueries` (not the builder-seed) keeps a
 	// handed-off / URL-restored edit reading as dirty; routing both sides through the same
 	// `fromPerses → toPerses` round-trip stops builder-added defaults (absent from an older
-	// stored query) reading an untouched panel as modified. New panel: fall back to the
-	// frozen initial seed (see `initialSeedRef`).
+	// stored query) reading an untouched panel as modified. New panel: fall back to seed.
 	const baselineEnvelopes = useMemo(
 		() =>
 			toQueryEnvelopes(
 				toPerses(
-					savedQueries
-						? fromPerses(savedQueries, panelType)
-						: initialSeedRef.current,
+					savedQueries ? fromPerses(savedQueries, panelType) : seedQuery,
 					panelType,
 				),
 			),
-		[savedQueries, panelType],
+		[savedQueries, seedQuery, panelType],
 	);
 	const isQueryDirty = useMemo(
 		() =>

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/index.tsx

@@ -19,7 +19,6 @@ import {
 	SectionKind,
 } from 'pages/DashboardPageV2/DashboardContainer/Panels/types/sections';
 import { getBuilderQueries } from 'pages/DashboardPageV2/DashboardContainer/Panels/utils/getBuilderQueries';
-import { useErrorModal } from 'providers/ErrorModalProvider';
 
 import { getExecStats } from '../queryV5/v5ResponseData';
 import { usePanelInteractions } from '../PanelsAndSectionsLayout/Panel/hooks/usePanelInteractions';
@@ -160,10 +159,9 @@ function PanelEditorContainer({
 		return section?.controls;
 	}, [panelDefinition]);
 
-	// Unsaved-edits flag driving the discard confirmation on close (Save is always
-	// enabled). Read the seed `panel`, not the live `draft` — the staged-query sync
-	// commits the seed into the draft on open, which would falsely dirty an untouched
-	// query-less new panel.
+	// New panels are savable once seeded with a query (List auto-seeds one). Read the
+	// seed `panel`, not the live `draft` — the staged-query sync commits the seed into
+	// the draft on open, which would falsely dirty an untouched query-less new panel.
 	const isDirty = useMemo(
 		() => isSpecDirty || isQueryDirty || (isNew && panel.spec.queries.length > 0),
 		[isSpecDirty, isQueryDirty, isNew, panel.spec.queries.length],
@@ -228,7 +226,6 @@ function PanelEditorContainer({
 	});
 
 	const setScrollTargetId = useScrollIntoViewStore((s) => s.setScrollTargetId);
-	const { showErrorModal } = useErrorModal();
 
 	const onSave = useCallback(async (): Promise<void> => {
 		if (!isEditable) {
@@ -239,22 +236,12 @@ function PanelEditorContainer({
 			const savedPanelId = await save(buildSaveSpec(draft.spec));
 			// Reveal the saved panel once the dashboard re-renders.
 			setScrollTargetId(savedPanelId);
-			toast.success('Panel saved', {
-				position: 'top-center',
-			});
+			toast.success('Panel saved');
 			onSaved();
-		} catch (err) {
-			showErrorModal(err);
+		} catch {
+			toast.error('Failed to save panel');
 		}
-	}, [
-		isEditable,
-		save,
-		buildSaveSpec,
-		draft.spec,
-		setScrollTargetId,
-		onSaved,
-		showErrorModal,
-	]);
+	}, [isEditable, save, buildSaveSpec, draft.spec, setScrollTargetId, onSaved]);
 
 	// Leaving an existing panel's editor (without saving) still returns to it, so
 	// the dashboard lands on that panel rather than scrolled to the top. A new,

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelStatus/__tests__/utils.test.ts

@@ -51,7 +51,7 @@ describe('panelStatusFromError', () => {
 
 	it('falls back to the error message when there is no structured body', () => {
 		expect(panelStatusFromError(new Error('boom'))).toStrictEqual({
-			code: 'UPSTREAM_UNAVAILABLE',
+			code: 'unknown_error',
 			message: 'boom',
 			docsUrl: undefined,
 			messages: [],

frontend/src/pages/DashboardsListPageV2/components/ActionsPopover/DeleteActionItem.tsx

@@ -12,13 +12,13 @@ import {
 	deleteDashboardV2,
 	invalidateListDashboardsForUserV2,
 } from 'api/generated/services/dashboard';
-import { useDeleteConfirm } from 'components/DeleteConfirmModal/useDeleteConfirm';
 import { DashboardListEvents } from 'pages/DashboardsListPageV2/constants/events';
 import { useAppContext } from 'providers/App/App';
 import { useErrorModal } from 'providers/ErrorModalProvider';
 import APIError from 'types/api/error';
 import { USER_ROLES } from 'types/roles';
 
+import { useDeleteConfirm } from '../DeleteConfirmModal/useDeleteConfirm';
 import styles from './ActionsPopover.module.scss';
 
 interface Props {

frontend/src/pages/DashboardsListPageV2/components/ViewsRail/ViewsRail.tsx

@@ -6,11 +6,11 @@ import { Typography } from '@signozhq/ui/typography';
 import { Bookmark, PenLine, Plus, Search, Trash2 } from '@signozhq/icons';
 import cx from 'classnames';
 
-import { useDeleteConfirm } from 'components/DeleteConfirmModal/useDeleteConfirm';
 import { DashboardListEvents } from 'pages/DashboardsListPageV2/constants/events';
 
 import type { SavedView } from '../../types';
 import { type BuiltinView } from '../../utils/views';
+import { useDeleteConfirm } from '../DeleteConfirmModal/useDeleteConfirm';
 import ViewNamePopover from './ViewNamePopover';
 
 import styles from './ViewsRail.module.scss';

frontend/src/types/api/querySuggestions/types.ts

@@ -1,4 +1,4 @@
-import { FieldDataType } from 'types/api/v5/queryRange';
+import { QUERY_BUILDER_KEY_TYPES } from 'constants/antlrQueryConstants';
 
 export interface QueryKeyDataSuggestionsProps {
 	label: string;
@@ -7,12 +7,7 @@ export interface QueryKeyDataSuggestionsProps {
 	apply?: string;
 	detail?: string;
 	fieldContext?: 'resource' | 'scope' | 'attribute' | 'span';
-	/**
-	 * The field's type as the API reports it. Was declared as the antlr key-type enum
-	 * (`string | number | boolean`), which the endpoint never returns — every consumer cast it
-	 * back to `FieldDataType`.
-	 */
-	fieldDataType?: FieldDataType;
+	fieldDataType?: QUERY_BUILDER_KEY_TYPES;
 	name: string;
 	signal: 'traces' | 'logs' | 'metrics';
 }
@@ -31,7 +26,7 @@ export interface QueryKeyRequestProps {
 	signal: 'traces' | 'logs' | 'metrics';
 	searchText: string;
 	fieldContext?: 'resource' | 'scope' | 'attribute' | 'span';
-	fieldDataType?: FieldDataType;
+	fieldDataType?: QUERY_BUILDER_KEY_TYPES;
 	metricName?: string;
 	metricNamespace?: string;
 	signalSource?: 'meter' | '';

frontend/src/utils/__tests__/fieldDataType.test.ts

@@ -1,34 +0,0 @@
-import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse';
-import type { FieldDataType } from 'types/api/v5/queryRange';
-
-import { fieldDataTypeToDataType } from '../fieldDataType';
-
-describe('fieldDataTypeToDataType', () => {
-	it('maps the reported numeric spellings onto the query-builder numerics', () => {
-		expect(fieldDataTypeToDataType('number')).toBe(DataTypes.Float64);
-		expect(fieldDataTypeToDataType('int64')).toBe(DataTypes.Int64);
-		expect(fieldDataTypeToDataType('float64')).toBe(DataTypes.Float64);
-	});
-
-	it('maps the list spellings onto the array types', () => {
-		expect(fieldDataTypeToDataType('[]string')).toBe(DataTypes.ArrayString);
-		expect(fieldDataTypeToDataType('[]bool')).toBe(DataTypes.ArrayBool);
-		expect(fieldDataTypeToDataType('[]int64')).toBe(DataTypes.ArrayInt64);
-		expect(fieldDataTypeToDataType('[]float64')).toBe(DataTypes.ArrayFloat64);
-		expect(fieldDataTypeToDataType('[]number')).toBe(DataTypes.ArrayFloat64);
-	});
-
-	it('passes through the spellings the two vocabularies share', () => {
-		expect(fieldDataTypeToDataType('string')).toBe(DataTypes.String);
-		expect(fieldDataTypeToDataType('bool')).toBe(DataTypes.bool);
-	});
-
-	it('returns EMPTY for empty, missing and not-yet-known types', () => {
-		expect(fieldDataTypeToDataType('')).toBe(DataTypes.EMPTY);
-		expect(fieldDataTypeToDataType(undefined)).toBe(DataTypes.EMPTY);
-		// The backend can store `[]json` / `[]dynamic`, which the API union doesn't list.
-		expect(fieldDataTypeToDataType('[]json' as FieldDataType)).toBe(
-			DataTypes.EMPTY,
-		);
-	});
-});

frontend/src/utils/errorUtils.ts

@@ -42,12 +42,7 @@ export function toAPIError(
 	try {
 		ErrorResponseHandlerForGeneratedAPIs(error);
 	} catch (apiError) {
-		// UPSTREAM_UNAVAILABLE means the handler couldn't find a backend error code
-		// (non-envelope body); prefer the caller's context-specific defaultMessage.
-		if (
-			apiError instanceof APIError &&
-			apiError.getErrorCode() !== 'UPSTREAM_UNAVAILABLE'
-		) {
+		if (apiError instanceof APIError) {
 			return apiError;
 		}
 	}

frontend/src/utils/fieldDataType.ts

@@ -1,31 +0,0 @@
-import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse';
-import type { FieldDataType } from 'types/api/v5/queryRange';
-
-/**
- * The field metadata APIs and the query builder spell field types differently: the metadata
- * collapses the numerics to `number` and writes lists as `[]string`, while `DataTypes` — which
- * keys the operator and attribute-value lookups — uses `float64` and `array(string)`. Convert
- * where a reported type becomes a query-builder one, so those lookups can't miss.
- */
-const TO_DATA_TYPE: Record<FieldDataType, DataTypes> = {
-	'': DataTypes.EMPTY,
-	string: DataTypes.String,
-	bool: DataTypes.bool,
-	int64: DataTypes.Int64,
-	float64: DataTypes.Float64,
-	number: DataTypes.Float64,
-	'[]string': DataTypes.ArrayString,
-	'[]bool': DataTypes.ArrayBool,
-	'[]int64': DataTypes.ArrayInt64,
-	'[]float64': DataTypes.ArrayFloat64,
-	'[]number': DataTypes.ArrayFloat64,
-};
-
-/**
- * Exhaustive over `FieldDataType`, so a type added to the API union fails to compile here
- * rather than going missing at runtime. The fallback is for a spelling the union doesn't know
- * yet — the backend can store `[]json` and `[]dynamic` — not for any of the cases above.
- */
-export const fieldDataTypeToDataType = (
-	fieldDataType?: FieldDataType,
-): DataTypes => TO_DATA_TYPE[fieldDataType ?? ''] ?? DataTypes.EMPTY;

pkg/alertmanager/alertmanagernotify/googlechat/googlechat.go

@@ -0,0 +1,167 @@
+package googlechat
+
+import (
+	"bytes"
+	"context"
+	"encoding/json"
+	"fmt"
+	"log/slog"
+	"net/http"
+	"net/url"
+	"strings"
+	"unicode/utf8"
+
+	"github.com/SigNoz/signoz/pkg/alertmanager/alertmanagertemplate"
+	"github.com/SigNoz/signoz/pkg/errors"
+	"github.com/SigNoz/signoz/pkg/templating/markdownrenderer"
+	"github.com/SigNoz/signoz/pkg/types/alertmanagertypes"
+	"github.com/prometheus/alertmanager/notify"
+	"github.com/prometheus/alertmanager/template"
+	"github.com/prometheus/alertmanager/types"
+)
+
+func New(conf *alertmanagertypes.GoogleChatReceiverConfig, t *template.Template, l *slog.Logger, templater alertmanagertypes.Templater) (*Notifier, error) {
+	client, err := notify.NewClientWithTracing(*conf.HTTPConfig, Integration)
+	if err != nil {
+		return nil, err
+	}
+	return &Notifier{
+		conf:      conf,
+		tmpl:      t,
+		logger:    l,
+		client:    client,
+		retrier:   &notify.Retrier{RetryCodes: []int{http.StatusTooManyRequests}},
+		templater: templater,
+	}, nil
+}
+
+func (n *Notifier) Notify(ctx context.Context, alerts ...*types.Alert) (bool, error) {
+	if n.conf.WebhookURL == nil {
+		return false, errors.New(errors.TypeInvalidInput, errors.CodeInvalidInput, "google chat webhook_url is empty")
+	}
+
+	key, err := notify.ExtractGroupKey(ctx)
+	if err != nil {
+		return false, err
+	}
+	n.logger.DebugContext(ctx, "sending google chat notification", slog.Any("group_key", key))
+
+	c, err := n.prepareContent(ctx, alerts)
+	if err != nil {
+		return false, err
+	}
+	text := c.title
+	if c.body != "" {
+		text = fmt.Sprintf("%s\n%s", c.title, c.body)
+	}
+	// Google Chat rejects a message with empty text and no cards. An empty
+	// render means a misconfigured title/text template, so fail loudly and
+	// non-retryably instead of sending a placeholder.
+	if text == "" {
+		return false, errors.New(errors.TypeInvalidInput, errors.CodeInvalidInput, "google chat message rendered empty; check the channel title/text templates")
+	}
+
+	msg := Message{Text: text}
+	var buf bytes.Buffer
+	if err := json.NewEncoder(&buf).Encode(msg); err != nil {
+		return false, err
+	}
+	// Truncate to Google Chat's byte limit. We measure the serialized buffer and
+	// drop that many text bytes; each removed text byte drops >=1 serialized byte,
+	// so a single pass always lands the payload within the limit.
+	if buf.Len() > maxMessageBytes {
+		over := buf.Len() - maxMessageBytes
+		target := max(len(text)-over, 0)
+		msg.Text = truncateToByteLimit(text, target)
+		buf.Reset()
+		if err := json.NewEncoder(&buf).Encode(msg); err != nil {
+			return false, err
+		}
+	}
+
+	// Thread same-rule alerts together: threadKey is a stable hash of the
+	// alert group key. Changing a rule's grouping starts a new thread.
+	u, err := url.Parse(n.conf.WebhookURL.String())
+	if err != nil {
+		return false, errors.WrapInternalf(err, errors.CodeInternal, "parse google chat webhook url")
+	}
+	q := u.Query()
+	q.Set("threadKey", key.Hash())
+	q.Set("messageReplyOption", "REPLY_MESSAGE_FALLBACK_TO_NEW_THREAD")
+	u.RawQuery = q.Encode()
+
+	resp, err := notify.PostJSON(ctx, n.client, u.String(), &buf) //nolint:bodyclose
+	if err != nil {
+		return true, notify.RedactURL(err)
+	}
+	defer notify.Drain(resp)
+
+	shouldRetry, err := n.retrier.Check(resp.StatusCode, resp.Body)
+	if err != nil {
+		return shouldRetry, notify.NewErrorWithReason(notify.GetFailureReasonFromStatusCode(resp.StatusCode), err)
+	}
+	return shouldRetry, err
+}
+
+// prepareContent expands the title and body templates. Custom templates (from
+// alert annotations) override the channel defaults; result.IsDefaultBody tells
+// whether the body came from the default template.
+func (n *Notifier) prepareContent(ctx context.Context, alerts []*types.Alert) (content, error) {
+	customTitle, customBody := alertmanagertemplate.ExtractTemplatesFromAnnotations(alerts)
+	result, err := n.templater.Expand(ctx, alertmanagertypes.ExpandRequest{
+		TitleTemplate:        customTitle,
+		BodyTemplate:         customBody,
+		DefaultTitleTemplate: n.conf.Title,
+		DefaultBodyTemplate:  n.conf.Text,
+	}, alerts)
+	if err != nil {
+		return content{}, err
+	}
+
+	title := result.Title
+	body := strings.Join(result.Body, "\n\n")
+
+	// Default templates are already authored in Google Chat dialect. Custom
+	// templates are standard markdown, so convert them. The templater only
+	// reports IsDefaultBody, so the title is gated on the body's default-ness.
+	if !result.IsDefaultBody {
+		if body != "" {
+			if body, err = markdownrenderer.RenderGoogleChatMarkdown(body); err != nil {
+				return content{}, err
+			}
+		}
+		if title != "" {
+			if title, err = markdownrenderer.RenderGoogleChatMarkdown(title); err != nil {
+				return content{}, err
+			}
+		}
+	}
+
+	return content{
+		title:         title,
+		body:          body,
+		isDefaultBody: result.IsDefaultBody,
+	}, nil
+}
+
+// truncateToByteLimit trims s to at most maxBytes bytes on a rune boundary,
+// appending an ellipsis when it truncates.
+func truncateToByteLimit(s string, maxBytes int) string {
+	if len(s) <= maxBytes {
+		return s
+	}
+	const ellipsis = "..."
+	target := maxBytes - len(ellipsis)
+	if target <= 0 {
+		return ellipsis[:maxBytes]
+	}
+	truncated := s
+	for len(truncated) > target {
+		_, size := utf8.DecodeLastRuneInString(truncated)
+		if size == 0 {
+			break
+		}
+		truncated = truncated[:len(truncated)-size]
+	}
+	return truncated + ellipsis
+}

pkg/alertmanager/alertmanagernotify/googlechat/googlechat_test.go

@@ -0,0 +1,281 @@
+package googlechat
+
+import (
+	"context"
+	"encoding/json"
+	"io"
+	"log/slog"
+	"net/http"
+	"net/http/httptest"
+	"net/url"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/SigNoz/signoz/pkg/alertmanager/alertmanagertemplate"
+	"github.com/SigNoz/signoz/pkg/types/alertmanagertypes"
+	"github.com/SigNoz/signoz/pkg/types/ruletypes"
+	commoncfg "github.com/prometheus/common/config"
+	"github.com/prometheus/common/model"
+	"github.com/stretchr/testify/require"
+
+	"github.com/prometheus/alertmanager/config"
+	"github.com/prometheus/alertmanager/notify"
+	"github.com/prometheus/alertmanager/notify/test"
+	"github.com/prometheus/alertmanager/template"
+	"github.com/prometheus/alertmanager/types"
+)
+
+func newTestTemplater(tmpl *template.Template) alertmanagertypes.Templater {
+	return alertmanagertemplate.New(tmpl, slog.New(slog.DiscardHandler))
+}
+
+func secretURLFromString(t *testing.T, rawURL string) *config.SecretURL {
+	t.Helper()
+	parsed, err := url.Parse(rawURL)
+	require.NoError(t, err)
+	return &config.SecretURL{URL: parsed}
+}
+
+func newTestNotifier(t *testing.T, webhookURL, title, text string) *Notifier {
+	t.Helper()
+	tmpl := test.CreateTmpl(t)
+	n, err := New(&alertmanagertypes.GoogleChatReceiverConfig{
+		HTTPConfig: &commoncfg.HTTPClientConfig{},
+		WebhookURL: secretURLFromString(t, webhookURL),
+		Title:      title,
+		Text:       text,
+	}, tmpl, slog.New(slog.DiscardHandler), newTestTemplater(tmpl))
+	require.NoError(t, err)
+	return n
+}
+
+func newTestAlerts(alertname string) []*types.Alert {
+	return []*types.Alert{{
+		Alert: model.Alert{
+			Labels:      model.LabelSet{"alertname": model.LabelValue(alertname)},
+			Annotations: model.LabelSet{"summary": model.LabelValue("summary for " + alertname)},
+			StartsAt:    time.Now(),
+			EndsAt:      time.Now().Add(time.Minute),
+		},
+	}}
+}
+
+func newTestContext() context.Context {
+	return notify.WithGroupKey(context.Background(), "test-receiver")
+}
+
+// captureServer starts an httptest server that decodes the posted Google Chat
+// Message into got and replies 200.
+func captureServer(t *testing.T, got *Message) *httptest.Server {
+	t.Helper()
+	return httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if got != nil {
+			_ = json.NewDecoder(r.Body).Decode(got)
+		}
+		w.WriteHeader(http.StatusOK)
+	}))
+}
+
+func TestGoogleChatSend(t *testing.T) {
+	var got Message
+	server := captureServer(t, &got)
+	defer server.Close()
+
+	n := newTestNotifier(t, server.URL, `[{{ .Status | toUpper }}] {{ .CommonLabels.alertname }}`, "")
+	retry, err := n.Notify(newTestContext(), newTestAlerts("TestAlert")...)
+
+	require.NoError(t, err)
+	require.False(t, retry)
+	require.Contains(t, got.Text, "FIRING")
+	require.Contains(t, got.Text, "TestAlert")
+}
+
+func TestGoogleChatTitleAndBody(t *testing.T) {
+	var got Message
+	server := captureServer(t, &got)
+	defer server.Close()
+
+	// static templates → assert the exact title\nbody join.
+	n := newTestNotifier(t, server.URL, "TITLE", "BODY")
+	retry, err := n.Notify(newTestContext(), newTestAlerts("TestAlert")...)
+
+	require.NoError(t, err)
+	require.False(t, retry)
+	require.Equal(t, "TITLE\nBODY", got.Text)
+}
+
+func TestGoogleChatRetryCodes(t *testing.T) {
+	tmpl := test.CreateTmpl(t)
+	n, err := New(&alertmanagertypes.GoogleChatReceiverConfig{
+		HTTPConfig: &commoncfg.HTTPClientConfig{},
+		WebhookURL: secretURLFromString(t, "https://chat.googleapis.com/v1/spaces/test/messages"),
+	}, tmpl, slog.New(slog.DiscardHandler), newTestTemplater(tmpl))
+	require.NoError(t, err)
+
+	cases := []struct {
+		code  int
+		retry bool
+	}{
+		{http.StatusOK, false},
+		{http.StatusBadRequest, false},         // 400: malformed payload, permanent
+		{http.StatusTooManyRequests, true},     // 429: rate limited, retry (our RetryCodes)
+		{http.StatusInternalServerError, true}, // 5xx: retry
+		{http.StatusServiceUnavailable, true},
+	}
+	for _, c := range cases {
+		t.Run(http.StatusText(c.code), func(t *testing.T) {
+			actual, _ := n.retrier.Check(c.code, nil)
+			require.Equal(t, c.retry, actual, "retry mismatch on status %d", c.code)
+		})
+	}
+}
+
+func TestGoogleChatRedactedURL(t *testing.T) {
+	ctx, u, fn := test.GetContextWithCancelingURL()
+	defer fn()
+	ctx = notify.WithGroupKey(ctx, "test-receiver")
+
+	tmpl := test.CreateTmpl(t)
+	n, err := New(&alertmanagertypes.GoogleChatReceiverConfig{
+		HTTPConfig: &commoncfg.HTTPClientConfig{},
+		WebhookURL: &config.SecretURL{URL: u},
+		Title:      "alert", // non-empty so it reaches the POST (not the empty-text guard)
+	}, tmpl, slog.New(slog.DiscardHandler), newTestTemplater(tmpl))
+	require.NoError(t, err)
+
+	test.AssertNotifyLeaksNoSecret(ctx, t, n, u.String())
+}
+
+func TestTruncateToByteLimit(t *testing.T) {
+	cases := []struct {
+		name    string
+		in      string
+		max     int
+		wantLen int    // upper bound on byte length of result
+		wantHas string // substring the result must contain (or "")
+	}{
+		{"under limit passthrough", "hello", 100, 5, "hello"},
+		{"over limit trims with ellipsis", strings.Repeat("a", 50), 10, 10, "..."},
+		{"exact limit passthrough", "hello", 5, 5, "hello"},
+		{"tiny limit", "hello", 2, 2, ""},
+	}
+	for _, c := range cases {
+		t.Run(c.name, func(t *testing.T) {
+			got := truncateToByteLimit(c.in, c.max)
+			require.LessOrEqual(t, len(got), c.wantLen)
+			if c.wantHas != "" {
+				require.Contains(t, got, c.wantHas)
+			}
+		})
+	}
+}
+
+func TestGoogleChatMessageSizeLimit(t *testing.T) {
+	var bodyLen int
+	var valid bool
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		raw, _ := io.ReadAll(r.Body)
+		bodyLen = len(raw)
+		valid = json.Valid(raw)
+		w.WriteHeader(http.StatusOK)
+	}))
+	defer server.Close()
+
+	// Huge plain-ASCII title so one-time truncation lands deterministically under the limit.
+	n := newTestNotifier(t, server.URL, strings.Repeat("A", 40000), "")
+	retry, err := n.Notify(newTestContext(), newTestAlerts("Big")...)
+
+	require.NoError(t, err)
+	require.False(t, retry)
+	require.True(t, valid, "posted body must be valid JSON")
+	require.LessOrEqual(t, bodyLen, maxMessageBytes, "posted body must be within the size limit")
+}
+
+func TestGoogleChatThreading(t *testing.T) {
+	var query url.Values
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		query = r.URL.Query()
+		w.WriteHeader(http.StatusOK)
+	}))
+	defer server.Close()
+
+	cases := []struct{ name, groupKey string }{
+		{"rule a", "{ruleId=\"aaa\"}"},
+		{"rule b", "{ruleId=\"bbb\"}"},
+	}
+	seen := map[string]string{}
+	for _, c := range cases {
+		t.Run(c.name, func(t *testing.T) {
+			n := newTestNotifier(t, server.URL, "T", "")
+			ctx := notify.WithGroupKey(context.Background(), c.groupKey)
+			_, err := n.Notify(ctx, newTestAlerts("X")...)
+			require.NoError(t, err)
+
+			require.Equal(t, "REPLY_MESSAGE_FALLBACK_TO_NEW_THREAD", query.Get("messageReplyOption"))
+			threadKey := query.Get("threadKey")
+			require.Equal(t, notify.Key(c.groupKey).Hash(), threadKey, "threadKey must be the group key hash")
+			seen[c.name] = threadKey
+		})
+	}
+	require.NotEqual(t, seen["rule a"], seen["rule b"], "distinct group keys must yield distinct threadKeys")
+}
+
+func TestGoogleChatCustomTemplateMarkdown(t *testing.T) {
+	var got Message
+	server := captureServer(t, &got)
+	defer server.Close()
+
+	// Custom body template (standard markdown) supplied via annotation → the
+	// !IsDefaultBody path must convert it to Google Chat dialect.
+	alerts := []*types.Alert{{
+		Alert: model.Alert{
+			Labels:      model.LabelSet{"alertname": "X"},
+			Annotations: model.LabelSet{ruletypes.AnnotationBodyTemplate: "**bold** and [link](https://x)"},
+			StartsAt:    time.Now(),
+			EndsAt:      time.Now().Add(time.Minute),
+		},
+	}}
+	n := newTestNotifier(t, server.URL, "Alert", "default body")
+	_, err := n.Notify(newTestContext(), alerts...)
+	require.NoError(t, err)
+
+	require.Contains(t, got.Text, "*bold*", "** should convert to *")
+	require.Contains(t, got.Text, "<https://x|link>", "[t](u) should convert to <u|t>")
+	require.NotContains(t, got.Text, "**bold**", "conversion must have happened")
+}
+
+func TestGoogleChatSerializedSizeUnderLimit(t *testing.T) {
+	var bodyLen int
+	var valid bool
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		raw, _ := io.ReadAll(r.Body)
+		bodyLen = len(raw)
+		valid = json.Valid(raw)
+		w.WriteHeader(http.StatusOK)
+	}))
+	defer server.Close()
+
+	// Escaping-dense payload: <, >, & and newlines each expand under JSON
+	// encoding, so this is the shape that would push the serialized body over
+	// the limit if we measured the text bytes instead of the marshaled buffer.
+	dense := strings.Repeat("<https://example.com/a?x=1&y=2|link>\n", 2000)
+	n := newTestNotifier(t, server.URL, dense, "")
+	_, err := n.Notify(newTestContext(), newTestAlerts("Dense")...)
+
+	require.NoError(t, err)
+	require.True(t, valid, "posted body must be valid JSON")
+	require.LessOrEqual(t, bodyLen, maxMessageBytes, "serialized body must be within the limit")
+}
+
+func TestGoogleChatEmptyText(t *testing.T) {
+	server := captureServer(t, nil)
+	defer server.Close()
+
+	// Empty title and body templates → must not POST; fail non-retryably.
+	n := newTestNotifier(t, server.URL, "", "")
+	retry, err := n.Notify(newTestContext(), newTestAlerts("X")...)
+
+	require.Error(t, err)
+	require.False(t, retry)
+}

pkg/alertmanager/alertmanagernotify/googlechat/types.go

@@ -0,0 +1,38 @@
+package googlechat
+
+import (
+	"log/slog"
+	"net/http"
+
+	"github.com/SigNoz/signoz/pkg/types/alertmanagertypes"
+	"github.com/prometheus/alertmanager/notify"
+	"github.com/prometheus/alertmanager/template"
+)
+
+const (
+	Integration = "googlechat"
+	// maxMessageBytes is the Google Chat message payload limit.
+	// https://developers.google.com/chat/api/guides/message-formats/basic#maximum_size
+	maxMessageBytes = 32000
+)
+
+// Notifier implements notify.Notifier for Google Chat.
+type Notifier struct {
+	conf      *alertmanagertypes.GoogleChatReceiverConfig
+	tmpl      *template.Template
+	logger    *slog.Logger
+	client    *http.Client
+	retrier   *notify.Retrier
+	templater alertmanagertypes.Templater
+}
+
+// Message is the Google Chat webhook payload.
+type Message struct {
+	Text string `json:"text"`
+}
+
+// content holds the rendered title and body for a Google Chat message.
+type content struct {
+	title, body   string
+	isDefaultBody bool
+}

pkg/alertmanager/alertmanagernotify/receiver.go

@@ -5,6 +5,7 @@ import (
 	"slices"
 
 	"github.com/SigNoz/signoz/pkg/alertmanager/alertmanagernotify/email"
+	"github.com/SigNoz/signoz/pkg/alertmanager/alertmanagernotify/googlechat"
 	"github.com/SigNoz/signoz/pkg/alertmanager/alertmanagernotify/msteamsv2"
 	"github.com/SigNoz/signoz/pkg/alertmanager/alertmanagernotify/opsgenie"
 	"github.com/SigNoz/signoz/pkg/alertmanager/alertmanagernotify/pagerduty"
@@ -24,6 +25,7 @@ var customNotifierIntegrations = []string{
 	opsgenie.Integration,
 	slack.Integration,
 	msteamsv2.Integration,
+	googlechat.Integration,
 }
 
 func NewReceiverIntegrations(nc *alertmanagertypes.Receiver, tmpl *template.Template, logger *slog.Logger, templater alertmanagertypes.Templater) ([]notify.Integration, error) {
@@ -74,6 +76,11 @@ func NewReceiverIntegrations(nc *alertmanagertypes.Receiver, tmpl *template.Temp
 			return msteamsv2.New(c, tmpl, `{{ template "msteamsv2.default.titleLink" . }}`, l, templater)
 		})
 	}
+	for i, c := range nc.GoogleChatConfigs {
+		add(googlechat.Integration, i, c, func(l *slog.Logger) (notify.Notifier, error) {
+			return googlechat.New(c, tmpl, l, templater)
+		})
+	}
 
 	if errs.Len() > 0 {
 		return nil, &errs

pkg/modules/cloudintegration/implcloudintegration/fs/definitions/gcp/computeengine/icon.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24px" height="24px" viewBox="0 0 24 24"><defs><style>.cls-1{fill:#aecbfa;}.cls-2{fill:#669df6;}.cls-3{fill:#4285f4;}</style></defs><title>Icon_24px_ComputeEngine_Color</title><g data-name="Product Icons"><rect class="cls-1" x="9" y="9" width="6" height="6"/><rect class="cls-2" x="11" y="2" width="2" height="4"/><rect class="cls-2" x="7" y="2" width="2" height="4"/><rect class="cls-2" x="15" y="2" width="2" height="4"/><rect class="cls-3" x="11" y="18" width="2" height="4"/><rect class="cls-3" x="7" y="18" width="2" height="4"/><rect class="cls-3" x="15" y="18" width="2" height="4"/><rect class="cls-3" x="19" y="10" width="2" height="4" transform="translate(8 32) rotate(-90)"/><rect class="cls-3" x="19" y="14" width="2" height="4" transform="translate(4 36) rotate(-90)"/><rect class="cls-3" x="19" y="6" width="2" height="4" transform="translate(12 28) rotate(-90)"/><rect class="cls-2" x="3" y="10" width="2" height="4" transform="translate(-8 16) rotate(-90)"/><rect class="cls-2" x="3" y="14" width="2" height="4" transform="translate(-12 20) rotate(-90)"/><rect class="cls-2" x="3" y="6" width="2" height="4" transform="translate(-4 12) rotate(-90)"/><path class="cls-1" d="M5,5V19H19V5ZM17,17H7V7H17Z"/><polygon class="cls-2" points="9 15 15 15 12 12 9 15"/><polygon class="cls-3" points="12 12 15 15 15 9 12 12"/></g></svg>

pkg/modules/cloudintegration/implcloudintegration/fs/definitions/gcp/computeengine/integration.json

@@ -1,124 +0,0 @@
-{
-  "id": "computeengine",
-  "title": "GCP Compute Engine",
-  "icon": "file://icon.svg",
-  "overview": "file://overview.md",
-  "supportedSignals": {
-    "metrics": true,
-    "logs": true
-  },
-  "dataCollected": {
-    "metrics": [
-      {
-        "name": "compute.googleapis.com/instance/uptime_total",
-        "unit": "Seconds",
-        "type": "Gauge",
-        "description": ""
-      },
-      {
-        "name": "compute.googleapis.com/instance/cpu/utilization",
-        "unit": "Percent",
-        "type": "Gauge",
-        "description": ""
-      },
-      {
-        "name": "compute.googleapis.com/guest/memory/bytes_used",
-        "unit": "Bytes",
-        "type": "Gauge",
-        "description": ""
-      },
-      {
-        "name": "compute.googleapis.com/guest/memory/percent_used",
-        "unit": "Percent",
-        "type": "Gauge",
-        "description": ""
-      },
-      {
-        "name": "agent.googleapis.com/memory/percent_used",
-        "unit": "Percent",
-        "type": "Gauge",
-        "description": ""
-      },
-      {
-        "name": "compute.googleapis.com/instance/disk/average_io_latency",
-        "unit": "Microseconds",
-        "type": "Gauge",
-        "description": ""
-      },
-      {
-        "name": "compute.googleapis.com/instance/disk/read_bytes_count",
-        "unit": "Bytes",
-        "type": "Sum",
-        "description": ""
-      },
-      {
-        "name": "compute.googleapis.com/instance/disk/write_bytes_count",
-        "unit": "Bytes",
-        "type": "Sum",
-        "description": ""
-      },
-      {
-        "name": "compute.googleapis.com/instance/disk/read_ops_count",
-        "unit": "Count",
-        "type": "Sum",
-        "description": ""
-      },
-      {
-        "name": "compute.googleapis.com/instance/disk/write_ops_count",
-        "unit": "Count",
-        "type": "Sum",
-        "description": ""
-      },
-      {
-        "name": "compute.googleapis.com/instance/disk/performance_status",
-        "unit": "None",
-        "type": "Gauge",
-        "description": ""
-      },
-      {
-        "name": "compute.googleapis.com/instance/network/received_bytes_count",
-        "unit": "Bytes",
-        "type": "Sum",
-        "description": ""
-      },
-      {
-        "name": "compute.googleapis.com/instance/network/sent_bytes_count",
-        "unit": "Bytes",
-        "type": "Sum",
-        "description": ""
-      },
-      {
-        "name": "compute.googleapis.com/instance/network/received_packets_count",
-        "unit": "Count",
-        "type": "Sum",
-        "description": ""
-      },
-      {
-        "name": "compute.googleapis.com/instance/network/sent_packets_count",
-        "unit": "Count",
-        "type": "Sum",
-        "description": ""
-      },
-      {
-        "name": "compute.googleapis.com/firewall/dropped_packets_count",
-        "unit": "Count",
-        "type": "Sum",
-        "description": ""
-      }
-    ],
-    "logs": []
-  },
-  "telemetryCollectionStrategy": {
-    "gcp": {}
-  },
-  "assets": {
-    "dashboards": [
-      {
-        "id": "overview",
-        "title": "GCP Compute Engine Overview",
-        "description": "Overview of GCP Compute Engine metrics",
-        "definition": "file://assets/dashboards/overview.json"
-      }
-    ]
-  }
-}

pkg/modules/cloudintegration/implcloudintegration/fs/definitions/gcp/computeengine/overview.md

@@ -1,3 +0,0 @@
-### Monitor GCP Compute Engine with SigNoz
-
-Collect key GCP Compute Engine metrics and view them with an out of the box dashboard.

pkg/querier/clickhouse_query.go

@@ -100,20 +100,9 @@ func (q *chSQLQuery) renderVars(query string, vars map[string]qbtypes.VariableIt
 	return newQuery.String(), nil
 }
 
-func (q *chSQLQuery) render(ctx context.Context) (string, error) {
-	rendered, err := q.renderVars(q.query.Query, q.vars, q.fromMS, q.toMS)
-	if err != nil {
-		return "", err
-	}
-
-	querybuilder.LogIfStatementIsNotValid(ctx, q.logger, rendered)
-
-	return rendered, nil
-}
-
 // Statement renders the SQL without executing it, for the preview path.
-func (q *chSQLQuery) Statement(ctx context.Context) (*qbtypes.Statement, error) {
-	rendered, err := q.render(ctx)
+func (q *chSQLQuery) Statement(_ context.Context) (*qbtypes.Statement, error) {
+	rendered, err := q.renderVars(q.query.Query, q.vars, q.fromMS, q.toMS)
 	if err != nil {
 		return nil, err
 	}
@@ -135,7 +124,7 @@ func (q *chSQLQuery) Execute(ctx context.Context) (*qbtypes.Result, error) {
 		elapsed += p.Elapsed
 	}))
 
-	query, err := q.render(ctx)
+	query, err := q.renderVars(q.query.Query, q.vars, q.fromMS, q.toMS)
 	if err != nil {
 		return nil, err
 	}
@@ -146,11 +135,11 @@ func (q *chSQLQuery) Execute(ctx context.Context) (*qbtypes.Result, error) {
 	}
 	defer rows.Close()
 
+	// TODO: map the errors from ClickHouse to our error types
 	payload, err := consume(rows, q.kind, nil, qbtypes.Step{}, q.query.Name)
 	if err != nil {
 		return nil, err
 	}
-
 	return &qbtypes.Result{
 		Type:  q.kind,
 		Value: payload,

pkg/query-service/app/http_handler.go

@@ -11,7 +11,6 @@ import (
 	"github.com/SigNoz/signoz/pkg/errors"
 	"github.com/SigNoz/signoz/pkg/flagger"
 	"github.com/SigNoz/signoz/pkg/modules/thirdpartyapi"
-	"github.com/SigNoz/signoz/pkg/querybuilder"
 	"github.com/SigNoz/signoz/pkg/queryparser"
 
 	"log/slog"
@@ -1093,8 +1092,6 @@ func (aH *APIHandler) queryDashboardVarsV2(w http.ResponseWriter, r *http.Reques
 		return
 	}
 
-	querybuilder.LogIfStatementIsNotValid(r.Context(), aH.logger, query)
-
 	dashboardVars, err := aH.reader.QueryDashboardVars(r.Context(), query)
 	if err != nil {
 		RespondError(w, &model.ApiError{Typ: model.ErrorBadData, Err: err}, nil)

pkg/querybuilder/clickhouse_sql.go

@@ -1,76 +0,0 @@
-package querybuilder
-
-import (
-	"context"
-	"log/slog"
-	"strings"
-
-	chparser "github.com/AfterShip/clickhouse-sql-parser/parser"
-	"github.com/SigNoz/signoz/pkg/errors"
-)
-
-// internalDatabases hold server metadata, credentials and grants rather than telemetry.
-var internalDatabases = map[string]struct{}{
-	"system":             {},
-	"information_schema": {},
-}
-
-// The parser's grammar has gaps against SQL that ClickHouse itself accepts. See TestErrIfStatementIsNotValid_ShouldPassButFails.
-func ErrIfStatementIsNotValid(query string) (err error) {
-	defer func() {
-		// The parser has a history of panicking on malformed input rather than returning an error.
-		if recovered := recover(); recovered != nil {
-			err = errors.NewInvalidInputf(errors.CodeInvalidInput, "invalid ClickHouse SQL (recovered): %v", recovered)
-		}
-	}()
-
-	stmts, parseErr := chparser.NewParser(query).ParseStmts()
-	if parseErr != nil {
-		// Wrapped rather than formatted in, so that callers can recover the parser's *ParseError and read the position off it.
-		return errors.WrapInvalidInputf(parseErr, errors.CodeInvalidInput, "invalid ClickHouse SQL: %s", parseErr.Error())
-	}
-
-	if len(stmts) != 1 {
-		return errors.NewInvalidInputf(errors.CodeInvalidInput, "ClickHouse SQL must contain exactly one statement, found %d statements", len(stmts))
-	}
-
-	selectQuery, ok := stmts[0].(*chparser.SelectQuery)
-	if !ok {
-		return errors.NewInvalidInputf(errors.CodeInvalidInput, "only SELECT statements are allowed in ClickHouse SQL queries")
-	}
-
-	visitor := &chparser.DefaultASTVisitor{Visit: func(node chparser.Expr) error {
-		switch expr := node.(type) {
-		case *chparser.TableFunctionExpr:
-			// Source table functions remain usable in ClickHouse read-only mode.
-			return errors.NewInvalidInputf(errors.CodeInvalidInput, "ClickHouse table functions are not allowed in SQL queries: %s", chparser.Format(expr.Name))
-
-		case *chparser.TableIdentifier:
-			// Reading these is unaffected by ClickHouse read-only mode.
-			if expr.Database == nil {
-				return nil
-			}
-
-			if _, ok := internalDatabases[strings.ToLower(expr.Database.Name)]; ok {
-				return errors.NewInvalidInputf(errors.CodeInvalidInput, "the ClickHouse %s database is not allowed in SQL queries", expr.Database.Name)
-			}
-
-		case *chparser.SettingExpr:
-			// A query-level setting takes precedence over the context setting.
-			if strings.EqualFold(expr.Name.Name, "readonly") {
-				return errors.NewInvalidInputf(errors.CodeInvalidInput, "the ClickHouse readonly setting cannot be overridden")
-			}
-		}
-
-		return nil
-	}}
-
-	return selectQuery.Accept(visitor)
-}
-
-// TODO(@therealpandey): remove this and move to ErrIfStatementIsNotValid.
-func LogIfStatementIsNotValid(ctx context.Context, logger *slog.Logger, query string) {
-	if err := ErrIfStatementIsNotValid(query); err != nil {
-		logger.WarnContext(ctx, "clickhouse sql is not valid", errors.Attr(err), slog.String("query", query))
-	}
-}

pkg/querybuilder/clickhouse_sql_test.go

@@ -1,154 +0,0 @@
-package querybuilder
-
-import (
-	"testing"
-
-	chparser "github.com/AfterShip/clickhouse-sql-parser/parser"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-func TestErrIfStatementIsNotValid_Pass(t *testing.T) {
-	testCases := []struct {
-		name  string
-		query string
-	}{
-		// Shapes a telemetry read is allowed to take.
-		{"Select", "SELECT region AS r, zone FROM metrics WHERE metric_name = 'cpu' GROUP BY region, zone"},
-		{"TrailingSemicolon", "SELECT count() FROM signoz_logs.distributed_logs_v2;"},
-		{"CommonTableExpression", "WITH t AS (SELECT fingerprint FROM signoz_metrics.time_series_v4) SELECT * FROM t"},
-		{"Join", "SELECT * FROM t1 LEFT JOIN t2 ON t1.a = t2.b"},
-		{"GlobalIn", "SELECT a FROM t WHERE a GLOBAL IN (SELECT b FROM t2)"},
-		{"Union", "SELECT * FROM t UNION ALL SELECT * FROM t2"},
-		{"Intersect", "SELECT * FROM t INTERSECT SELECT * FROM t2"},
-		{"WindowFunction", "SELECT sum(v) OVER (PARTITION BY a ORDER BY t) FROM t"},
-		{"UnrelatedSetting", "SELECT * FROM t SETTINGS max_threads = 4"},
-		{"TerminatedBlockComment", "SELECT /* keep me */ count() FROM t"},
-		{"BlockCommentMarkerInsideStringLiteral", "SELECT count() FROM t WHERE body = '/* not a comment'"},
-		// The parser used to loop forever on this; it now reads the comment to the end of
-		// the input, so this doubles as a canary for that regression.
-		{"TrailingUnterminatedBlockComment", "SELECT count() FROM t /* unterminated"},
-		// The rule keys on the database, not on the table name.
-		{"TableNamedSystemInTelemetryDatabase", "SELECT * FROM signoz_logs.system"},
-		{"SignedLiteralAfterClosingParen", "SELECT (toUnixTimestamp(now()) - 3600)*1000000000"},
-		// order by interval
-		{"OrderByInterval", "SELECT toStartOfInterval(timestamp, INTERVAL 1 MINUTE) AS interval ORDER BY interval"},
-		{"OrderByIntervalAndDirection", "SELECT toStartOfInterval(timestamp, INTERVAL 1 MINUTE) AS `interval` ORDER BY `interval` ASC"},
-		{"TrimFunction", "SELECT trimBoth('/api/endpoint/', '/');"},
-	}
-
-	for _, testCase := range testCases {
-		t.Run(testCase.name, func(t *testing.T) {
-			err := ErrIfStatementIsNotValid(testCase.query)
-			assert.NoError(t, err)
-		})
-	}
-}
-
-func TestErrIfStatementIsNotValid_Fail(t *testing.T) {
-	testCases := []struct {
-		name  string
-		query string
-	}{
-		// Not a single statement, or not a statement at all.
-		{"Empty", ""},
-		{"UnterminatedBlockCommentOnly", "/* x"},
-		{"Unparseable", "SELECT FROM WHERE"},
-		{"MultipleStatements", "SELECT 1; DROP TABLE signoz_logs.logs_v2"},
-		// Parses, but is not a SELECT.
-		{"Drop", "DROP TABLE signoz_logs.logs_v2"},
-		{"Insert", "INSERT INTO signoz_logs.logs_v2 SELECT * FROM signoz_logs.logs_v2"},
-		{"AlterDelete", "ALTER TABLE signoz_logs.logs_v2 DELETE WHERE 1 = 1"},
-		{"CreateTable", "CREATE TABLE evil (a Int) ENGINE = Memory"},
-		{"Grant", "GRANT ALL ON *.* TO admin"},
-		{"Set", "SET readonly = 0"},
-		// These the parser rejects outright rather than classifying.
-		{"ShowGrants", "SHOW GRANTS"},
-		{"IntoOutfile", "SELECT * FROM t INTO OUTFILE '/tmp/x.csv'"},
-		// Table functions, which read through something other than a telemetry table.
-		{"UrlTableFunction", "SELECT * FROM url('http://attacker.example/x', CSV, 'a String')"},
-		{"FileTableFunction", "SELECT * FROM file('/etc/passwd', CSV, 'a String')"},
-		{"ExecutableTableFunction", "SELECT * FROM executable('script.sh', CSV, 'a String')"},
-		{"TableFunctionInJoin", "SELECT * FROM t1 JOIN url('http://x', CSV, 'a String') u ON 1 = 1"},
-		{"TableFunctionInCommonTableExpression", "WITH c AS (SELECT * FROM url('http://x', CSV, 'a String')) SELECT * FROM c"},
-		{"TableFunctionInWhereSubquery", "SELECT * FROM t WHERE a IN (SELECT * FROM file('/etc/passwd', CSV, 'a String'))"},
-		{"TableFunctionInUnion", "SELECT * FROM t UNION ALL SELECT * FROM url('http://x', CSV, 'a String')"},
-		// Internal databases, which hold grants and server metadata rather than telemetry.
-		{"SystemUsers", "SELECT * FROM system.users"},
-		{"SystemUppercase", "SELECT * FROM SYSTEM.USERS"},
-		{"SystemQuoted", "SELECT count() FROM `system`.`tables`"},
-		{"SystemInSubquery", "SELECT * FROM (SELECT name FROM system.parts)"},
-		{"SystemInJoin", "SELECT * FROM signoz_logs.distributed_logs_v2 AS l JOIN system.users AS u ON 1 = 1"},
-		{"SystemInIntersect", "SELECT * FROM t INTERSECT SELECT * FROM system.users"},
-		{"InformationSchema", "SELECT * FROM information_schema.tables"},
-		// A query-level setting takes precedence over the one the caller applies.
-		{"ReadonlySettingOverride", "SELECT * FROM t SETTINGS readonly = 0"},
-		{"ReadonlySettingOverrideAmongOthers", "SELECT * FROM t SETTINGS max_threads = 4, readonly = 0"},
-	}
-
-	for _, testCase := range testCases {
-		t.Run(testCase.name, func(t *testing.T) {
-			err := ErrIfStatementIsNotValid(testCase.query)
-			assert.Error(t, err)
-		})
-	}
-}
-
-// Queries the parser cannot read. ClickHouse runs all of them.
-func TestErrIfStatementIsNotValid_ShouldPassButFails(t *testing.T) {
-	testCases := []struct {
-		name  string
-		query string
-		// The construct the parser stops after, which is the one it cannot read.
-		expectedStopsAfter string
-		// The same construct written so the parser accepts it.
-		fix string
-	}{
-		{
-			name:               "IntervalAliasInOrderBy",
-			query:              "SELECT toStartOfInterval(timestamp, INTERVAL 1 MINUTE) AS interval, resource_string_service$$name AS `service.name`, attributes_string['http.route'] AS `http.route`, quantile(0.95)(duration_nano) / 1000000000 AS value FROM signoz_traces.distributed_signoz_index_v3 WHERE resource_string_service$$name = 'svc-a' AND resources_string['deployment.environment'] = 'dev' AND attributes_string['http.route'] = '/v1' AND http_method = 'POST' AND timestamp BETWEEN toDateTime(1784601720) AND toDateTime(1784602620) AND ts_bucket_start BETWEEN 1784601720 - 1800 AND 1784602620 GROUP BY `service.name`, `http.route`, interval ORDER BY interval ASC",
-			expectedStopsAfter: "ORDER BY interval ASC",
-			fix:                "SELECT count() AS interval FROM t ORDER BY `interval` ASC",
-		},
-		{
-			name:               "IntervalAliasInOrderByDesc",
-			query:              "SELECT count() AS value, toStartOfInterval(timestamp, INTERVAL 1 MINUTE) AS interval, serviceName, resourceTagsMap['deployment.environment'] AS environment, exceptionStacktrace FROM signoz_traces.distributed_signoz_error_index_v2 WHERE exceptionType != 'OSError' AND resourceTagsMap['deployment.environment'] = 'staging' AND timestamp BETWEEN toDateTime(1785186300) AND toDateTime(1785186600) GROUP BY serviceName, interval, environment, exceptionStacktrace ORDER BY interval DESC",
-			expectedStopsAfter: "ORDER BY interval DESC",
-			fix:                "SELECT count() AS interval FROM t ORDER BY `interval` DESC",
-		},
-		{
-			name:               "StandardTrimSyntax",
-			query:              "SELECT toStartOfInterval(fromUnixTimestamp64Nano(timestamp), INTERVAL 5 MINUTE) AS interval, resources_string['host.name'] as host_name, toFloat64(countIf( lower(trim(BOTH ' ' FROM replaceOne( JSONExtractString(body, 'Action'), 'health_status: ', '' ))) IN ('unhealthy','starting','failing') )) as value FROM signoz_logs.distributed_logs_v2 WHERE timestamp BETWEEN 1784602320000000000 AND 1784602620000000000 AND ts_bucket_start BETWEEN 1784602320 - 300 AND 1784602620 AND JSONExtractString(body, 'Type') = 'container' AND JSONExtractString(body, 'Actor', 'Attributes', 'name') IS NOT NULL AND resources_string['host.name'] IS NOT NULL AND resources_string['host.name'] = 'aihub-nightly' GROUP BY interval, host_name ORDER BY interval, host_name",
-			expectedStopsAfter: "trim(BOTH '",
-			fix:                "SELECT trimBoth(replaceOne( JSONExtractString(body, 'Action'), 'health_status: ', '' ), ' ')",
-		},
-		{
-			name:               "SignedLiteralAfterClosingParen",
-			query:              "SELECT now() AS ts, toFloat64(count()) AS value FROM ( SELECT attributes_string['TableName'] AS T, attributes_string['MissingId'] AS M, max(fromUnixTimestamp64Nano(timestamp)) AS last_seen, dateDiff('minute', min(fromUnixTimestamp64Nano(timestamp)), max(fromUnixTimestamp64Nano(timestamp))) AS age_min FROM signoz_logs.distributed_logs_v2 WHERE body='missing_map_record' AND timestamp >= (toUnixTimestamp(now())-3600)*1000000000 GROUP BY T, M ) WHERE age_min >= 20 AND last_seen >= now() - toIntervalMinute(8)",
-			expectedStopsAfter: "(toUnixTimestamp(now())",
-			fix:                "SELECT (toUnixTimestamp(now()) - 3600) * 1000000000",
-		},
-		{
-			name:               "SignedLiteralAfterClosingParenMinimal",
-			query:              "SELECT (1)-1",
-			expectedStopsAfter: "(1)",
-			fix:                "SELECT (1) - 1",
-		},
-	}
-
-	for _, testCase := range testCases {
-		t.Run(testCase.name, func(t *testing.T) {
-			err := ErrIfStatementIsNotValid(testCase.query)
-
-			var parseErr *chparser.ParseError
-			require.ErrorAs(t, err, &parseErr, "expected a parser failure rather than a rule violation")
-
-			// The parser reports the offset it stopped at, which sits just past the construct
-			// it choked on, so the text leading up to it is what needs looking at.
-			consumed := testCase.query[:parseErr.Pos]
-			assert.Equal(t, testCase.expectedStopsAfter, consumed[max(0, len(consumed)-len(testCase.expectedStopsAfter)):])
-
-			assert.NoError(t, ErrIfStatementIsNotValid(testCase.fix))
-		})
-	}
-}

pkg/querybuilder/init.go

@@ -0,0 +1 @@
+package querybuilder

pkg/templating/markdownrenderer/googlechat/doc.go

@@ -0,0 +1,14 @@
+// Copyright (c) 2026 SigNoz, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+// Package googlechat provides a goldmark extension that renders markdown as
+// Google Chat's webhook text format.
+//
+// Google Chat webhooks support a limited markdown subset with different syntax
+// than standard markdown: *bold* (not **bold**), _italic_ (not *italic*),
+// ~strikethrough~ (not ~~strikethrough~~), and <url|text> links (not [text](url)).
+//
+// This renderer converts standard markdown to Google Chat's format, allowing
+// custom alert templates authored in standard markdown to display correctly
+// in Google Chat notifications.
+package googlechat

pkg/templating/markdownrenderer/googlechat/googlechat.go

@@ -0,0 +1,226 @@
+// Copyright (c) 2026 SigNoz, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+package googlechat
+
+import (
+	"github.com/yuin/goldmark"
+	"github.com/yuin/goldmark/ast"
+	"github.com/yuin/goldmark/extension"
+	extensionast "github.com/yuin/goldmark/extension/ast"
+	"github.com/yuin/goldmark/renderer"
+	"github.com/yuin/goldmark/util"
+)
+
+// Extender is a goldmark extension that converts markdown to Google Chat format.
+var Extender = &extender{}
+
+type extender struct{}
+
+func (e *extender) Extend(m goldmark.Markdown) {
+	// Add strikethrough extension to parse ~~text~~ properly
+	extension.Strikethrough.Extend(m)
+	m.Renderer().AddOptions(
+		renderer.WithNodeRenderers(util.Prioritized(&googlechatRenderer{}, 0)),
+	)
+}
+
+type googlechatRenderer struct{}
+
+// RegisterFuncs implements renderer.NodeRenderer.
+func (r *googlechatRenderer) RegisterFuncs(reg renderer.NodeRendererFuncRegisterer) {
+	// Inline elements
+	reg.Register(ast.KindText, r.renderText)
+	reg.Register(ast.KindString, r.renderString)
+	reg.Register(ast.KindEmphasis, r.renderEmphasis)
+	reg.Register(ast.KindCodeSpan, r.renderCodeSpan)
+	reg.Register(ast.KindLink, r.renderLink)
+	reg.Register(ast.KindAutoLink, r.renderAutoLink)
+
+	// Extensions
+	reg.Register(extensionast.KindStrikethrough, r.renderStrikethrough)
+
+	// Block elements
+	reg.Register(ast.KindParagraph, r.renderParagraph)
+	reg.Register(ast.KindHeading, r.renderHeading)
+	reg.Register(ast.KindBlockquote, r.renderBlockquote)
+	reg.Register(ast.KindList, r.renderList)
+	reg.Register(ast.KindListItem, r.renderListItem)
+	reg.Register(ast.KindFencedCodeBlock, r.renderFencedCodeBlock)
+	reg.Register(ast.KindCodeBlock, r.renderCodeBlock)
+	reg.Register(ast.KindThematicBreak, r.renderThematicBreak)
+
+	// Document
+	reg.Register(ast.KindDocument, r.renderDocument)
+}
+
+func (r *googlechatRenderer) renderText(w util.BufWriter, source []byte, node ast.Node, entering bool) (ast.WalkStatus, error) {
+	if entering {
+		n := node.(*ast.Text)
+		_, _ = w.Write(n.Segment.Value(source))
+		if n.SoftLineBreak() {
+			_ = w.WriteByte('\n')
+		} else if n.HardLineBreak() {
+			_ = w.WriteByte('\n')
+		}
+	}
+	return ast.WalkContinue, nil
+}
+
+func (r *googlechatRenderer) renderString(w util.BufWriter, source []byte, node ast.Node, entering bool) (ast.WalkStatus, error) {
+	if entering {
+		n := node.(*ast.String)
+		_, _ = w.Write(n.Value)
+	}
+	return ast.WalkContinue, nil
+}
+
+func (r *googlechatRenderer) renderEmphasis(w util.BufWriter, source []byte, node ast.Node, entering bool) (ast.WalkStatus, error) {
+	n := node.(*ast.Emphasis)
+
+	if n.Level == 2 {
+		// Strong/bold: **text** → *text*
+		_ = w.WriteByte('*')
+	} else {
+		// Emphasis/italic: *text* or _text_ → _text_
+		_ = w.WriteByte('_')
+	}
+	return ast.WalkContinue, nil
+}
+
+func (r *googlechatRenderer) renderCodeSpan(w util.BufWriter, source []byte, node ast.Node, entering bool) (ast.WalkStatus, error) {
+	if entering {
+		_ = w.WriteByte('`')
+		for c := node.FirstChild(); c != nil; c = c.NextSibling() {
+			segment := c.(*ast.Text).Segment
+			_, _ = w.Write(segment.Value(source))
+		}
+		_ = w.WriteByte('`')
+	}
+	return ast.WalkSkipChildren, nil
+}
+
+func (r *googlechatRenderer) renderLink(w util.BufWriter, source []byte, node ast.Node, entering bool) (ast.WalkStatus, error) {
+	n := node.(*ast.Link)
+
+	if entering {
+		// Convert [text](url) → <url|text>
+		url := string(n.Destination)
+		_ = w.WriteByte('<')
+		_, _ = w.WriteString(url)
+		_ = w.WriteByte('|')
+	} else {
+		_ = w.WriteByte('>')
+	}
+	return ast.WalkContinue, nil
+}
+
+func (r *googlechatRenderer) renderAutoLink(w util.BufWriter, source []byte, node ast.Node, entering bool) (ast.WalkStatus, error) {
+	n := node.(*ast.AutoLink)
+	if entering {
+		// Auto links can be plain URLs
+		_, _ = w.Write(n.URL(source))
+	}
+	return ast.WalkContinue, nil
+}
+
+func (r *googlechatRenderer) renderParagraph(w util.BufWriter, source []byte, node ast.Node, entering bool) (ast.WalkStatus, error) {
+	if !entering && node.NextSibling() != nil {
+		// Add blank line between paragraphs
+		_, _ = w.WriteString("\n\n")
+	}
+	return ast.WalkContinue, nil
+}
+
+func (r *googlechatRenderer) renderHeading(w util.BufWriter, source []byte, node ast.Node, entering bool) (ast.WalkStatus, error) {
+	// Google Chat doesn't support headings in webhooks, so render as bold text
+	if entering {
+		_ = w.WriteByte('*')
+	} else {
+		_ = w.WriteByte('*')
+		if node.NextSibling() != nil {
+			_, _ = w.WriteString("\n\n")
+		}
+	}
+	return ast.WalkContinue, nil
+}
+
+func (r *googlechatRenderer) renderBlockquote(w util.BufWriter, source []byte, node ast.Node, entering bool) (ast.WalkStatus, error) {
+	if entering {
+		_ = w.WriteByte('>')
+	} else if node.NextSibling() != nil {
+		_, _ = w.WriteString("\n\n")
+	}
+	return ast.WalkContinue, nil
+}
+
+func (r *googlechatRenderer) renderList(w util.BufWriter, source []byte, node ast.Node, entering bool) (ast.WalkStatus, error) {
+	if !entering && node.NextSibling() != nil {
+		_, _ = w.WriteString("\n\n")
+	}
+	return ast.WalkContinue, nil
+}
+
+func (r *googlechatRenderer) renderListItem(w util.BufWriter, source []byte, node ast.Node, entering bool) (ast.WalkStatus, error) {
+	if entering {
+		// Use * for bullet points
+		_, _ = w.WriteString("* ")
+	} else {
+		_ = w.WriteByte('\n')
+	}
+	return ast.WalkContinue, nil
+}
+
+func (r *googlechatRenderer) renderFencedCodeBlock(w util.BufWriter, source []byte, node ast.Node, entering bool) (ast.WalkStatus, error) {
+	if entering {
+		_, _ = w.WriteString("```\n")
+		lines := node.Lines()
+		for i := 0; i < lines.Len(); i++ {
+			line := lines.At(i)
+			_, _ = w.Write(line.Value(source))
+		}
+		_, _ = w.WriteString("```")
+		if node.NextSibling() != nil {
+			_, _ = w.WriteString("\n\n")
+		}
+	}
+	return ast.WalkSkipChildren, nil
+}
+
+func (r *googlechatRenderer) renderCodeBlock(w util.BufWriter, source []byte, node ast.Node, entering bool) (ast.WalkStatus, error) {
+	if entering {
+		_, _ = w.WriteString("```\n")
+		lines := node.Lines()
+		for i := 0; i < lines.Len(); i++ {
+			line := lines.At(i)
+			_, _ = w.Write(line.Value(source))
+		}
+		_, _ = w.WriteString("```")
+		if node.NextSibling() != nil {
+			_, _ = w.WriteString("\n\n")
+		}
+	}
+	return ast.WalkSkipChildren, nil
+}
+
+func (r *googlechatRenderer) renderThematicBreak(w util.BufWriter, source []byte, node ast.Node, entering bool) (ast.WalkStatus, error) {
+	if entering {
+		// Google Chat doesn't have horizontal rules, use a line of dashes
+		_, _ = w.WriteString("---")
+		if node.NextSibling() != nil {
+			_, _ = w.WriteString("\n\n")
+		}
+	}
+	return ast.WalkContinue, nil
+}
+
+func (r *googlechatRenderer) renderDocument(w util.BufWriter, source []byte, node ast.Node, entering bool) (ast.WalkStatus, error) {
+	// Document doesn't render anything itself
+	return ast.WalkContinue, nil
+}
+
+func (r *googlechatRenderer) renderStrikethrough(w util.BufWriter, source []byte, node ast.Node, entering bool) (ast.WalkStatus, error) {
+	// Google Chat uses single tilde for strikethrough
+	_ = w.WriteByte('~')
+	return ast.WalkContinue, nil
+}

pkg/templating/markdownrenderer/googlechat/googlechat_test.go

@@ -0,0 +1,131 @@
+// Copyright (c) 2026 SigNoz, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+package googlechat_test
+
+import (
+	"bytes"
+	"testing"
+
+	"github.com/SigNoz/signoz/pkg/templating/markdownrenderer/googlechat"
+	"github.com/yuin/goldmark"
+)
+
+func TestRenderer(t *testing.T) {
+	md := goldmark.New(goldmark.WithExtensions(googlechat.Extender))
+
+	tests := []struct {
+		name     string
+		input    string
+		expected string
+	}{
+		{
+			name:     "empty input",
+			input:    "",
+			expected: "",
+		},
+		{
+			name:     "simple paragraph",
+			input:    "Hello, world!",
+			expected: "Hello, world!",
+		},
+		{
+			name:     "heading (rendered as bold)",
+			input:    "# My Heading",
+			expected: "*My Heading*",
+		},
+		{
+			name:     "multiple paragraphs",
+			input:    "First paragraph.\n\nSecond paragraph.",
+			expected: "First paragraph.\n\nSecond paragraph.",
+		},
+		{
+			name:     "bold text (** becomes *)",
+			input:    "This is **bold** text.",
+			expected: "This is *bold* text.",
+		},
+		{
+			name:     "italic text (* becomes _)",
+			input:    "This is *italic* text.",
+			expected: "This is _italic_ text.",
+		},
+		{
+			name:     "italic text (_ stays _)",
+			input:    "This is _italic_ text.",
+			expected: "This is _italic_ text.",
+		},
+		{
+			name:     "bold and italic",
+			input:    "**bold** and *italic* together.",
+			expected: "*bold* and _italic_ together.",
+		},
+		{
+			name:     "code span",
+			input:    "Use `code` here.",
+			expected: "Use `code` here.",
+		},
+		{
+			name:     "link conversion ([text](url) becomes <url|text>)",
+			input:    "Check [this link](https://example.com).",
+			expected: "Check <https://example.com|this link>.",
+		},
+		{
+			name:     "plain autolink",
+			input:    "<https://example.com>",
+			expected: "https://example.com",
+		},
+		{
+			name:     "bullet list",
+			input:    "- Item 1\n- Item 2\n- Item 3",
+			expected: "* Item 1\n* Item 2\n* Item 3\n",
+		},
+		{
+			name:     "fenced code block",
+			input:    "```\ncode line 1\ncode line 2\n```",
+			expected: "```\ncode line 1\ncode line 2\n```",
+		},
+		{
+			name:     "fenced code block with language",
+			input:    "```go\nfunc main() {}\n```",
+			expected: "```\nfunc main() {}\n```",
+		},
+		{
+			name:     "blockquote",
+			input:    "> This is a quote",
+			expected: ">This is a quote",
+		},
+		{
+			name:     "thematic break (--- for horizontal rule)",
+			input:    "Above\n\n---\n\nBelow",
+			expected: "Above\n\n---\n\nBelow",
+		},
+		{
+			name:     "mixed inline formatting",
+			input:    "**bold**, *italic*, `code`, and [link](https://example.com).",
+			expected: "*bold*, _italic_, `code`, and <https://example.com|link>.",
+		},
+		{
+			name:     "alert-like message",
+			input:    "# Alert: High CPU\n\n**Status:** Firing\n\n**Details:**\n- Host: server1\n- CPU: 95%",
+			expected: "*Alert: High CPU*\n\n*Status:* Firing\n\n*Details:*\n\n* Host: server1\n* CPU: 95%\n",
+		},
+		{
+			name:     "strikethrough (~~text~~ becomes ~text~)",
+			input:    "This is ~~strikethrough~~ text.",
+			expected: "This is ~strikethrough~ text.",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			var buf bytes.Buffer
+			if err := md.Convert([]byte(tt.input), &buf); err != nil {
+				t.Fatalf("Convert failed: %v", err)
+			}
+			got := buf.String()
+			if got != tt.expected {
+				t.Errorf("expected:\n%q\n\ngot:\n%q", tt.expected, got)
+			}
+		})
+	}
+}

pkg/templating/markdownrenderer/markdownrenderer.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/SigNoz/signoz/pkg/errors"
 	"github.com/SigNoz/signoz/pkg/templating/markdownrenderer/blockkit"
+	"github.com/SigNoz/signoz/pkg/templating/markdownrenderer/googlechat"
 	"github.com/SigNoz/signoz/pkg/templating/markdownrenderer/mrkdwn"
 	"github.com/yuin/goldmark"
 	"github.com/yuin/goldmark/extension"
@@ -32,6 +33,11 @@ var (
 			return goldmark.New(goldmark.WithExtensions(mrkdwn.Extender))
 		},
 	}
+	googlechatPool = sync.Pool{
+		New: func() any {
+			return goldmark.New(goldmark.WithExtensions(googlechat.Extender))
+		},
+	}
 )
 
 // RenderHTML converts markdown to HTML.
@@ -53,6 +59,13 @@ func RenderSlackMrkdwn(markdown string) (string, error) {
 	return render(md, markdown, "Slack mrkdwn")
 }
 
+// RenderGoogleChatMarkdown converts markdown to Google Chat's webhook text format.
+func RenderGoogleChatMarkdown(markdown string) (string, error) {
+	md := googlechatPool.Get().(goldmark.Markdown)
+	defer googlechatPool.Put(md)
+	return render(md, markdown, "Google Chat")
+}
+
 func render(md goldmark.Markdown, markdown string, format string) (string, error) {
 	var buf bytes.Buffer
 	if err := md.Convert([]byte(markdown), &buf); err != nil {

pkg/types/alertmanagertypes/googlechat.go

@@ -1,6 +1,10 @@
 package alertmanagertypes
 
 import (
+	"net/url"
+	"strings"
+
+	"github.com/SigNoz/signoz/pkg/errors"
 	"github.com/prometheus/alertmanager/config"
 	commoncfg "github.com/prometheus/common/config"
 )
@@ -32,3 +36,18 @@ func (c *GoogleChatReceiverConfig) UnmarshalYAML(unmarshal func(any) error) erro
 	type plain GoogleChatReceiverConfig
 	return unmarshal((*plain)(c))
 }
+
+// ValidateGoogleChatWebhookURL validates the Google Chat webhook URL format.
+func ValidateGoogleChatWebhookURL(rawURL string) error {
+	u, err := url.Parse(rawURL)
+	if err != nil {
+		return errors.Newf(errors.TypeInvalidInput, errors.CodeInvalidInput, "invalid google chat webhook_url: %v", err)
+	}
+	if u.Scheme != "https" {
+		return errors.New(errors.TypeInvalidInput, errors.CodeInvalidInput, "google chat webhook_url must use https")
+	}
+	if strings.ToLower(u.Hostname()) != "chat.googleapis.com" {
+		return errors.New(errors.TypeInvalidInput, errors.CodeInvalidInput, "google chat webhook_url must use chat.googleapis.com")
+	}
+	return nil
+}

pkg/types/alertmanagertypes/googlechat_test.go

@@ -0,0 +1,44 @@
+package alertmanagertypes
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestValidateGoogleChatWebhookURL(t *testing.T) {
+	cases := []struct {
+		name    string
+		url     string
+		wantErr bool
+	}{
+		{"valid", "https://chat.googleapis.com/v1/spaces/AAA/messages?key=k&token=t", false},
+		{"http scheme rejected", "http://chat.googleapis.com/v1/spaces/AAA/messages", true},
+		{"wrong host rejected", "https://example.com/v1/spaces/AAA/messages", true},
+		{"empty rejected", "", true},
+	}
+	for _, c := range cases {
+		t.Run(c.name, func(t *testing.T) {
+			err := ValidateGoogleChatWebhookURL(c.url)
+			if c.wantErr {
+				require.Error(t, err)
+			} else {
+				require.NoError(t, err)
+			}
+		})
+	}
+}
+
+func TestNewReceiverGoogleChatRejectsBadURL(t *testing.T) {
+	// http scheme
+	_, err := NewReceiver(`{"name":"gc","googlechat_configs":[{"webhook_url":"http://chat.googleapis.com/v1/spaces/x/messages"}]}`)
+	require.Error(t, err)
+
+	// wrong host
+	_, err = NewReceiver(`{"name":"gc","googlechat_configs":[{"webhook_url":"https://example.com/x"}]}`)
+	require.Error(t, err)
+
+	// missing webhook_url
+	_, err = NewReceiver(`{"name":"gc","googlechat_configs":[{"title":"x"}]}`)
+	require.Error(t, err)
+}

pkg/types/alertmanagertypes/receiver.go

@@ -45,12 +45,23 @@ func NewReceiver(input string) (*Receiver, error) {
 		if err != nil {
 			return nil, err
 		}
+		if err := validateGoogleChatConfig(defaulted); err != nil {
+			return nil, err
+		}
 		receiver.GoogleChatConfigs[i] = defaulted
 	}
 
 	return receiver, nil
 }
 
+// validateGoogleChatConfig validates a Google Chat receiver configuration.
+func validateGoogleChatConfig(cfg *GoogleChatReceiverConfig) error {
+	if cfg.WebhookURL == nil {
+		return errors.New(errors.TypeInvalidInput, errors.CodeInvalidInput, "google chat webhook_url is required")
+	}
+	return ValidateGoogleChatWebhookURL(cfg.WebhookURL.String())
+}
+
 func defaultedBaseReceiver(base *config.Receiver) (*config.Receiver, error) {
 	bytes, err := yaml.Marshal(base)
 	if err != nil {

pkg/types/cloudintegrationtypes/serviceid.go

@@ -43,7 +43,6 @@ var (
 	// GCP services.
 	GCPServiceCloudSQLPostgres = ServiceID{valuer.NewString("cloudsql_postgres")}
 	GCPServiceMemorystoreRedis = ServiceID{valuer.NewString("memorystore_redis")}
-	GCPServiceComputeEngine    = ServiceID{valuer.NewString("computeengine")}
 )
 
 func (ServiceID) Enum() []any {
@@ -77,7 +76,6 @@ func (ServiceID) Enum() []any {
 		AzureServiceRedis,
 		GCPServiceCloudSQLPostgres,
 		GCPServiceMemorystoreRedis,
-		GCPServiceComputeEngine,
 	}
 }
 
@@ -117,7 +115,6 @@ var SupportedServices = map[CloudProviderType][]ServiceID{
 	CloudProviderTypeGCP: {
 		GCPServiceCloudSQLPostgres,
 		GCPServiceMemorystoreRedis,
-		GCPServiceComputeEngine,
 	},
 }