Merge branch 'infraM/google_chat_integration_backend' into feat/alert-channels-google-chat-full-stack

Render each alert in its own card section with its own View Related
Logs/Traces buttons, and move Open in SigNoz to a shared footer button
(it's per-rule). Matches the slack/msteams per-alert layout; the default
template still produces one combined section.

Cap sections at 30 with a "+N more alerts" note: Google Chat allows 100
widgets per card and silently drops the section that crosses that count
and every section after it, so capping keeps the footer and trailing
alerts from vanishing. Cap is applied before the size guard so the trim
loop only touches rendered bodies.

Generalize the 32 KB size guard to trim the longest body, then the title.

cmd/authz.go

@@ -93,13 +93,9 @@ func runGenerateAuthz(_ context.Context) error {
 	registry := coretypes.NewRegistry()
 
 	allowedResources := map[string]bool{
-		coretypes.NewResourceRef(coretypes.ResourceServiceAccount).String():                true,
-		coretypes.NewResourceRef(coretypes.ResourceRole).String():                          true,
-		coretypes.NewResourceRef(coretypes.ResourceMetaResourceFactorAPIKey).String():      true,
-		coretypes.NewResourceRef(coretypes.ResourceTelemetryResourceLogs).String():         true,
-		coretypes.NewResourceRef(coretypes.ResourceTelemetryResourceTraces).String():       true,
-		coretypes.NewResourceRef(coretypes.ResourceTelemetryResourceMetrics).String():      true,
-		coretypes.NewResourceRef(coretypes.ResourceTelemetryResourceMeterMetrics).String(): true,
+		coretypes.NewResourceRef(coretypes.ResourceServiceAccount).String():           true,
+		coretypes.NewResourceRef(coretypes.ResourceRole).String():                     true,
+		coretypes.NewResourceRef(coretypes.ResourceMetaResourceFactorAPIKey).String(): true,
 	}
 
 	allowedTypes := map[string]bool{}

docs/api/openapi.yml

@@ -1497,8 +1497,6 @@ components:
       - cloudsql_postgres
       - memorystore_redis
       - computeengine
-      - gke
-      - cloudstorage
       type: string
     CloudintegrationtypesServiceMetadata:
       properties:

frontend/public/locales/en-GB/channels.json

@@ -24,6 +24,8 @@
   "tooltip_opsgenie_api_key": "Learn how to obtain the API key from your OpsGenie account [here](https://support.atlassian.com/opsgenie/docs/integrate-opsgenie-with-prometheus/).",
   "tooltip_email_to": "Enter email addresses separated by commas.",
   "tooltip_ms_teams_url": "The URL of the Microsoft Teams [webhook](https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498) to send alerts to. Learn more about Microsoft Teams integration in the docs [here](https://signoz.io/docs/alerts-management/notification-channel/ms-teams/).",
+  "tooltip_google_chat_url": "The URL of the Google Chat space [incoming webhook](https://developers.google.com/workspace/chat/quickstart/webhooks) to send alerts to. It must be an https URL on chat.googleapis.com.",
+  "google_chat_webhook_url_invalid": "Webhook URL must be an https URL on chat.googleapis.com",
 
   "field_slack_recipient": "Recipient",
   "field_slack_title": "Title",

frontend/public/locales/en/channels.json

@@ -24,6 +24,8 @@
   "tooltip_opsgenie_api_key": "Learn how to obtain the API key from your OpsGenie account [here](https://support.atlassian.com/opsgenie/docs/integrate-opsgenie-with-prometheus/).",
   "tooltip_email_to": "Enter email addresses separated by commas.",
   "tooltip_ms_teams_url": "The URL of the Microsoft Teams [webhook](https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498) to send alerts to. Learn more about Microsoft Teams integration in the docs [here](https://signoz.io/docs/alerts-management/notification-channel/ms-teams/).",
+  "tooltip_google_chat_url": "The URL of the Google Chat space [incoming webhook](https://developers.google.com/workspace/chat/quickstart/webhooks) to send alerts to. It must be an https URL on chat.googleapis.com.",
+  "google_chat_webhook_url_invalid": "Webhook URL must be an https URL on chat.googleapis.com",
   "field_slack_recipient": "Recipient",
   "field_slack_title": "Title",
   "field_slack_description": "Description",

frontend/src/AppRoutes/Private.tsx

@@ -14,10 +14,7 @@ import { useAppContext } from 'providers/App/App';
 import { LicensePlatform, LicenseState } from 'types/api/licensesV3/getActive';
 import { OrgPreference } from 'types/api/preferences/preference';
 import { USER_ROLES } from 'types/roles';
-import {
-	routePermission,
-	routeWithInitialAuthZSupport,
-} from 'utils/permission';
+import { routePermission } from 'utils/permission';
 
 import routes, {
 	LIST_LICENSES,
@@ -45,6 +42,7 @@ function PrivateRoute({ children }: PrivateRouteProps): JSX.Element {
 	const isAdmin = user.role === USER_ROLES.ADMIN;
 	const isAIAssistantEnabled = useIsAIAssistantEnabled();
 	const isAIObservabilityEnabled = useIsAIObservabilityEnabled();
+
 	const mapRoutes = useMemo(
 		() =>
 			new Map(
@@ -228,16 +226,7 @@ function PrivateRoute({ children }: PrivateRouteProps): JSX.Element {
 		if (isPrivate) {
 			if (isLoggedInState) {
 				const route = routePermission[key];
-				const hasInitialAuthZSupport = Object.hasOwn(
-					routeWithInitialAuthZSupport,
-					key,
-				);
-
-				if (
-					route &&
-					route.find((e) => e === user.role) === undefined &&
-					hasInitialAuthZSupport === false
-				) {
+				if (route && route.find((e) => e === user.role) === undefined) {
 					return <Redirect to={ROUTES.UN_AUTHORIZED} />;
 				}
 			} else {

frontend/src/AppRoutes/__tests__/Private.test.tsx

@@ -17,7 +17,6 @@ import {
 } from 'types/api/licensesV3/getActive';
 import { OrgPreference } from 'types/api/preferences/preference';
 import { ROLES, USER_ROLES } from 'types/roles';
-import { routeWithInitialAuthZSupport } from 'utils/permission';
 
 import PrivateRoute from '../Private';
 
@@ -179,7 +178,6 @@ function createMockAppContext(
 		isFetchingHosts: false,
 		isFetchingFeatureFlags: false,
 		isFetchingOrgPreferences: false,
-		isFetchingUserPreferences: false,
 		userFetchError: null,
 		activeLicenseFetchError: null,
 		hostsFetchError: null,
@@ -200,39 +198,24 @@ function createMockAppContext(
 	};
 }
 
-// Roles that no authz-aware route grants through the legacy routePermission table
-const DENIED_ROLES: ROLES[] = [
-	USER_ROLES.ANONYMOUS as ROLES,
-	USER_ROLES.AUTHOR as ROLES,
-];
-
-const PERMITTED_ROLES: ROLES[] = [
-	USER_ROLES.ADMIN as ROLES,
-	USER_ROLES.EDITOR as ROLES,
-	USER_ROLES.VIEWER as ROLES,
-];
-
-interface AuthzRouteCase {
-	path: string;
-	deniedRoles: ROLES[];
-}
-
 interface RenderPrivateRouteOptions {
 	initialRoute?: string;
 	appContext?: Partial<IAppContext>;
 	isCloudUser?: boolean;
 }
 
-function buildPrivateRouteTree(
-	options: RenderPrivateRouteOptions,
-): ReactElement {
-	const { initialRoute = ROUTES.HOME, appContext = {} } = options;
+function renderPrivateRoute(options: RenderPrivateRouteOptions = {}): void {
+	const {
+		initialRoute = ROUTES.HOME,
+		appContext = {},
+		isCloudUser = true,
+	} = options;
 
-	const contextValue = createMockAppContext({
-		...appContext,
-	});
+	mockIsCloudUser = isCloudUser;
 
-	return (
+	const contextValue = createMockAppContext(appContext);
+
+	render(
 		<QueryClientProvider client={queryClient}>
 			<MemoryRouter initialEntries={[initialRoute]}>
 				<AppContext.Provider value={contextValue}>
@@ -246,15 +229,10 @@ function buildPrivateRouteTree(
 					</PrivateRoute>
 				</AppContext.Provider>
 			</MemoryRouter>
-		</QueryClientProvider>
+		</QueryClientProvider>,
 	);
 }
 
-function renderPrivateRoute(options: RenderPrivateRouteOptions = {}): void {
-	mockIsCloudUser = options.isCloudUser ?? true;
-	render(buildPrivateRouteTree(options));
-}
-
 // Generic assertion helpers for navigation behavior
 // Using location-based assertions since Private.tsx now uses Redirect component
 
@@ -1454,25 +1432,6 @@ describe('PrivateRoute', () => {
 
 			assertStaysOnRoute(ROUTES.GET_STARTED_WITH_CLOUD);
 		});
-
-		it.each([...PERMITTED_ROLES, ...DENIED_ROLES])(
-			'should render the unauthorized page for a %s instead of bouncing off it',
-			(role) => {
-				// routePermission.UN_AUTHORIZED must grant every role: a role denied here
-				// is redirected to /un-authorized and then redirected away from it again,
-				// which loops until React bails out with a blank screen.
-				renderPrivateRoute({
-					initialRoute: ROUTES.UN_AUTHORIZED,
-					appContext: {
-						isLoggedIn: true,
-						user: createMockUser({ role }),
-					},
-				});
-
-				assertStaysOnRoute(ROUTES.UN_AUTHORIZED);
-				assertRendersChildren();
-			},
-		);
 	});
 
 	describe('Edge Cases', () => {
@@ -1518,174 +1477,6 @@ describe('PrivateRoute', () => {
 		});
 	});
 
-	describe('AuthZ Support (routeWithInitialAuthZSupport)', () => {
-		// Routes in routeWithInitialAuthZSupport always bypass legacy role check
-		const AUTHZ_ROUTE_CASES: Record<
-			keyof typeof routeWithInitialAuthZSupport,
-			AuthzRouteCase
-		> = {
-			// Everything under /settings resolves to the non-exact SETTINGS route
-			SETTINGS: { path: ROUTES.SETTINGS, deniedRoles: DENIED_ROLES },
-			MY_SETTINGS: { path: ROUTES.MY_SETTINGS, deniedRoles: DENIED_ROLES },
-			ROLES_SETTINGS: { path: ROUTES.ROLES_SETTINGS, deniedRoles: DENIED_ROLES },
-			ROLE_CREATE: { path: ROUTES.ROLE_CREATE, deniedRoles: DENIED_ROLES },
-			ROLE_DETAILS: {
-				path: ROUTES.ROLE_DETAILS.replace(':roleId', 'role-id-1'),
-				deniedRoles: DENIED_ROLES,
-			},
-			ROLE_EDIT: {
-				path: ROUTES.ROLE_EDIT.replace(':roleId', 'role-id-1'),
-				deniedRoles: DENIED_ROLES,
-			},
-			SERVICE_ACCOUNTS_SETTINGS: {
-				path: ROUTES.SERVICE_ACCOUNTS_SETTINGS,
-				deniedRoles: DENIED_ROLES,
-			},
-			TRACES_EXPLORER: { path: ROUTES.TRACES_EXPLORER, deniedRoles: DENIED_ROLES },
-			TRACE: { path: ROUTES.TRACE, deniedRoles: DENIED_ROLES },
-			TRACE_DETAIL: {
-				path: ROUTES.TRACE_DETAIL.replace(':id', 'trace-id-1'),
-				deniedRoles: DENIED_ROLES,
-			},
-			TRACE_DETAIL_OLD: {
-				path: ROUTES.TRACE_DETAIL_OLD.replace(':id', 'trace-id-1'),
-				deniedRoles: DENIED_ROLES,
-			},
-			// LOGS and LOGS_EXPLORER share a path - matchPath resolves it to whichever
-			// route definition comes last, and both keys are authz-aware either way.
-			LOGS: { path: ROUTES.LOGS, deniedRoles: DENIED_ROLES },
-			LOGS_EXPLORER: { path: ROUTES.LOGS_EXPLORER, deniedRoles: DENIED_ROLES },
-			LIVE_LOGS: { path: ROUTES.LIVE_LOGS, deniedRoles: DENIED_ROLES },
-			OLD_LOGS_EXPLORER: {
-				path: ROUTES.OLD_LOGS_EXPLORER,
-				deniedRoles: DENIED_ROLES,
-			},
-			METRICS_EXPLORER: {
-				path: ROUTES.METRICS_EXPLORER,
-				deniedRoles: DENIED_ROLES,
-			},
-			METRICS_EXPLORER_EXPLORER: {
-				path: ROUTES.METRICS_EXPLORER_EXPLORER,
-				deniedRoles: DENIED_ROLES,
-			},
-			METRICS_EXPLORER_VOLUME_CONTROL: {
-				path: ROUTES.METRICS_EXPLORER_VOLUME_CONTROL,
-				deniedRoles: DENIED_ROLES,
-			},
-			METER: { path: ROUTES.METER, deniedRoles: DENIED_ROLES },
-			METER_EXPLORER: { path: ROUTES.METER_EXPLORER, deniedRoles: DENIED_ROLES },
-			// SUPPORT already grants ANONYMOUS in routePermission, so only AUTHOR
-			// exercises the redirect branch here.
-			SUPPORT: {
-				path: ROUTES.SUPPORT,
-				deniedRoles: [USER_ROLES.AUTHOR as ROLES],
-			},
-		};
-
-		const authzRouteRolePairs: [string, string, ROLES][] = Object.entries(
-			AUTHZ_ROUTE_CASES,
-		).flatMap(([name, { path, deniedRoles }]) =>
-			deniedRoles.map((role): [string, string, ROLES] => [name, path, role]),
-		);
-
-		// Routes with no authz check - legacy role check still applies
-		const NON_AUTHZ_ROUTE_CASES: [string, string, ROLES][] = [
-			['ALERTS_NEW', ROUTES.ALERTS_NEW, USER_ROLES.VIEWER as ROLES],
-			['LIST_LICENSES', ROUTES.LIST_LICENSES, USER_ROLES.EDITOR as ROLES],
-			['ONBOARDING', ROUTES.ONBOARDING, USER_ROLES.VIEWER as ROLES],
-			['APPLICATION', ROUTES.APPLICATION, USER_ROLES.ANONYMOUS as ROLES],
-			[
-				'METRICS_EXPLORER_VIEWS',
-				ROUTES.METRICS_EXPLORER_VIEWS,
-				USER_ROLES.ANONYMOUS as ROLES,
-			],
-		];
-
-		it.each(authzRouteRolePairs)(
-			'should not redirect %s (%s) for role %s - authz routes bypass legacy role check',
-			(_name, path, role) => {
-				// Routes in routeWithInitialAuthZSupport always bypass the legacy role check.
-				// Authorization is handled by downstream components via fine-grained authz.
-				renderPrivateRoute({
-					initialRoute: path,
-					appContext: {
-						isLoggedIn: true,
-						user: createMockUser({ role }),
-					},
-				});
-
-				assertStaysOnRoute(path);
-				assertRendersChildren();
-			},
-		);
-
-		it.each([...PERMITTED_ROLES, ...DENIED_ROLES])(
-			'should not redirect a %s from an authz-aware route',
-			(role) => {
-				// All roles pass through - authorization handled downstream
-				renderPrivateRoute({
-					initialRoute: ROUTES.LOGS_EXPLORER,
-					appContext: {
-						isLoggedIn: true,
-						user: createMockUser({ role }),
-					},
-				});
-
-				assertStaysOnRoute(ROUTES.LOGS_EXPLORER);
-				assertRendersChildren();
-			},
-		);
-
-		it.each(NON_AUTHZ_ROUTE_CASES)(
-			'should redirect %s (%s) for role %s - non-authz routes use legacy role check',
-			async (_name, path, role) => {
-				// Routes NOT in routeWithInitialAuthZSupport still use legacy role check
-				renderPrivateRoute({
-					initialRoute: path,
-					appContext: {
-						isLoggedIn: true,
-						user: createMockUser({ role }),
-					},
-				});
-
-				await assertRedirectsTo(ROUTES.UN_AUTHORIZED);
-			},
-		);
-
-		it.each(authzRouteRolePairs)(
-			'should still redirect unauthenticated users away from %s (%s) with role %s',
-			async (_name, path, role) => {
-				// The authz bypass only relaxes the role check, never the login check.
-				renderPrivateRoute({
-					initialRoute: path,
-					appContext: {
-						isLoggedIn: false,
-						user: createMockUser({ role }),
-					},
-				});
-
-				await assertRedirectsTo(ROUTES.LOGIN);
-			},
-		);
-
-		it('should still redirect to workspace locked from an authz-aware route', async () => {
-			// Workspace guards run before the role check and must not be bypassed.
-			renderPrivateRoute({
-				initialRoute: ROUTES.LOGS_EXPLORER,
-				appContext: {
-					isLoggedIn: true,
-					isFetchingActiveLicense: false,
-					activeLicense: createMockLicense({ platform: LicensePlatform.CLOUD }),
-					trialInfo: createMockTrialInfo({ workSpaceBlock: true }),
-					user: createMockUser({ role: USER_ROLES.VIEWER as ROLES }),
-				},
-				isCloudUser: true,
-			});
-
-			await assertRedirectsTo(ROUTES.WORKSPACE_LOCKED);
-		});
-	});
-
 	describe('Old channel route redirects', () => {
 		it.each([
 			['/settings/channels', '/alerts', 'tab=Channels'],

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

@@ -2816,8 +2816,6 @@ export enum CloudintegrationtypesServiceIDDTO {
 	cloudsql_postgres = 'cloudsql_postgres',
 	memorystore_redis = 'memorystore_redis',
 	computeengine = 'computeengine',
-	gke = 'gke',
-	cloudstorage = 'cloudstorage',
 }
 export type CloudintegrationtypesCloudIntegrationServiceDTOAnyOf = {
 	/**

frontend/src/assets/Logos/gcp-cloud-storage.svg

@@ -1 +1 @@
-<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;}.cls-4{fill:#fff;}</style></defs><title>Icon_24px_CloudStorage_Color</title><g data-name="Product Icons"><rect class="cls-1" x="2" y="4" width="20" height="7"/><rect class="cls-2" x="20" y="4" width="2" height="7"/><polygon class="cls-3" points="22 4 20 4 20 11 22 4"/><rect class="cls-2" x="2" y="4" width="2" height="7"/><rect class="cls-4" x="6" y="7" width="6" height="1"/><rect class="cls-4" x="15" y="6" width="3" height="3" rx="1.5"/><rect class="cls-1" x="2" y="13" width="20" height="7"/><rect class="cls-2" x="20" y="13" width="2" height="7"/><polygon class="cls-3" points="22 13 20 13 20 20 22 13"/><rect class="cls-2" x="2" y="13" width="2" height="7"/><rect class="cls-4" x="6" y="16" width="6" height="1"/><rect class="cls-4" x="15" y="15" width="3" height="3" rx="1.5"/></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="1200" height="800" viewBox="-19.2 -28.483 166.401 170.898"><g transform="translate(0 -7.034)"><linearGradient id="a" x1="64" x2="64" y1="7.034" y2="120.789" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#4387fd"/><stop offset="1" stop-color="#4683ea"/></linearGradient><path fill="url(#a)" d="M27.79 115.217 1.54 69.749a11.5 11.5 0 0 1 0-11.499l26.25-45.467a11.5 11.5 0 0 1 9.96-5.75h52.5a11.5 11.5 0 0 1 9.959 5.75l26.25 45.467a11.5 11.5 0 0 1 0 11.5l-26.25 45.466a11.5 11.5 0 0 1-9.959 5.75h-52.5a11.5 11.5 0 0 1-9.96-5.75z"/></g><g transform="translate(0 -7.034)"><defs><path id="b" d="M27.791 115.217 1.541 69.749a11.5 11.5 0 0 1 0-11.499l26.25-45.467a11.5 11.5 0 0 1 9.959-5.75h52.5a11.5 11.5 0 0 1 9.96 5.75l26.25 45.467a11.5 11.5 0 0 1 0 11.5l-26.25 45.466a11.5 11.5 0 0 1-9.96 5.75h-52.5a11.5 11.5 0 0 1-9.959-5.75z"/></defs><clipPath id="c"><use xlink:href="#b" width="100%" height="100%" overflow="visible"/></clipPath><path d="m49.313 53.875-7.01 6.99 5.957 5.958-5.898 10.476 44.635 44.636 10.816.002L118.936 84 85.489 50.55z" clip-path="url(#c)" opacity=".07"/></g><path fill="#fff" d="M84.7 43.236H43.264c-.667 0-1.212.546-1.212 1.214v8.566c0 .666.546 1.212 1.212 1.212H84.7c.667 0 1.213-.546 1.213-1.212v-8.568c0-.666-.545-1.213-1.212-1.213m-6.416 7.976a2.484 2.484 0 0 1-2.477-2.48 2.475 2.475 0 0 1 2.477-2.477c1.37 0 2.48 1.103 2.48 2.477a2.48 2.48 0 0 1-2.48 2.48m6.415 8.491-41.436.002c-.667 0-1.212.546-1.212 1.214v8.565c0 .666.546 1.213 1.212 1.213H84.7c.667 0 1.213-.547 1.213-1.213v-8.567c0-.666-.545-1.214-1.212-1.214m-6.416 7.976a2.483 2.483 0 0 1-2.477-2.48 2.475 2.475 0 0 1 2.477-2.477 2.48 2.48 0 1 1 0 4.956"/></svg>

frontend/src/assets/Logos/gcp-gke.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24px" height="24px" viewBox="0 0 24 24"><defs><style>.cls-1{fill:#4285f4;}.cls-1,.cls-2,.cls-4{fill-rule:evenodd;}.cls-2{fill:#669df6;}.cls-3,.cls-4{fill:#aecbfa;}</style></defs><title>Icon_24px_K8Engine_Color</title><g data-name="Product Icons"><g ><polygon class="cls-1" points="14.68 13.06 19.23 15.69 19.23 16.68 14.29 13.83 14.68 13.06"/><polygon class="cls-2" points="9.98 13.65 4.77 16.66 4.45 15.86 9.53 12.92 9.98 13.65"/><rect class="cls-3" x="11.55" y="3.29" width="0.86" height="5.78"/><path class="cls-4" d="M3.25,7V17L12,22l8.74-5V7L12,2Zm15.63,8.89L12,19.78,5.12,15.89V8.11L12,4.22l6.87,3.89v7.78Z"/><polygon class="cls-4" points="11.98 11.5 15.96 9.21 11.98 6.91 8.01 9.21 11.98 11.5"/><polygon class="cls-2" points="11.52 12.3 7.66 10.01 7.66 14.6 11.52 16.89 11.52 12.3"/><polygon class="cls-1" points="12.48 12.3 12.48 16.89 16.34 14.6 16.34 10.01 12.48 12.3"/></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24"><path d="M19.73 6.56a1.73 1.73 0 0 0-1.68 1.68 1.83 1.83 0 0 0 .89 1.48v6.9l-5.16 3.06.8 1.28 5.55-3.25a.84.84 0 0 0 .4-.69v-7.3a1.64 1.64 0 0 0 .89-1.48 1.61 1.61 0 0 0-1.69-1.68" style="fill:#aecbfa"/><path d="m18 5.48-5.61-3.16a1.18 1.18 0 0 0-.79 0L5.25 6a1.72 1.72 0 0 0-2.68 1.35A1.73 1.73 0 0 0 4.26 9a1.73 1.73 0 0 0 1.68-1.65L12 3.9l5.15 3ZM11.2 18.5a1.57 1.57 0 0 0-.89.29l-5.16-3V9.92H3.56v6.31a.84.84 0 0 0 .4.69L9.52 20v.09a1.69 1.69 0 0 0 3.37 0 1.65 1.65 0 0 0-1.69-1.59" data-name="Path" style="fill:#aecbfa"/><path d="M16.96 8.63 12.1 5.78 7.13 8.63l4.97 2.77z" data-name="Path" style="fill:#669df6"/><path d="M12.1 12.38 6.84 9.32v2.47l5.26 2.96zM12.1 15.73l-5.26-3.05v2.07l5.26 3.06z" style="fill:#669df6"/><path d="M12.09 12.38v2.37l5.26-3.06V9.33Zm4.32-.94a.38.38 0 1 1 0-.76.38.38 0 0 1 0 .76M12.09 15.73v2.07l5.26-3.05v-2.07Zm4.32-1.07a.38.38 0 1 1 0-.76.38.38 0 0 1 0 .76" style="fill:#4285f4"/></svg>

frontend/src/constants/localStorage.ts

@@ -45,5 +45,4 @@ export enum LOCALSTORAGE {
 	DASHBOARDS_LIST_VISIBLE_COLUMNS = 'DASHBOARDS_LIST_VISIBLE_COLUMNS',
 	DASHBOARDS_LIST_VIEWS = 'DASHBOARDS_LIST_VIEWS',
 	DASHBOARD_V2_PANEL_COLUMN_WIDTHS = 'DASHBOARD_V2_PANEL_COLUMN_WIDTHS',
-	LLM_ATTRIBUTE_MAPPING_TEST_SPAN = 'LLM_ATTRIBUTE_MAPPING_TEST_SPAN',
 }

frontend/src/container/AllAlertChannels/__tests__/CreateAlertChannel.test.tsx

@@ -1,6 +1,9 @@
 import CreateAlertChannels from 'container/CreateAlertChannels';
 import { ChannelType } from 'container/CreateAlertChannels/config';
+import { GoogleChatInitialConfig } from 'container/CreateAlertChannels/defaults';
 import {
+	googleChatDescriptionDefaultValue,
+	googleChatTitleDefaultValue,
 	opsGenieDescriptionDefaultValue,
 	opsGenieMessageDefaultValue,
 	opsGeniePriorityDefaultValue,
@@ -419,5 +422,99 @@ describe('Create Alert Channel', () => {
 				expect(descriptionTextArea).toHaveTextContent(slackDescriptionDefaultValue);
 			});
 		});
+		describe('Google Chat', () => {
+			const validWebhookUrl =
+				'https://chat.googleapis.com/v1/spaces/AAAA/messages?key=dummy_key&token=dummy_token';
+
+			beforeEach(() => {
+				render(<CreateAlertChannels preType={ChannelType.GoogleChat} />);
+			});
+
+			it('Should check if the selected item in the type dropdown has text "Google Chat"', () => {
+				expect(screen.getByText('Google Chat')).toBeInTheDocument();
+			});
+
+			it('Should check if Webhook URL label and input are displayed properly', () => {
+				testLabelInputAndHelpValue({
+					labelText: 'field_webhook_url',
+					testId: 'webhook-url-textbox',
+				});
+			});
+
+			it('Should check if Title contains the google chat template', () => {
+				expect(screen.getByTestId('title-textarea')).toHaveTextContent(
+					googleChatTitleDefaultValue,
+				);
+			});
+
+			it('Should check if Description contains the google chat template', () => {
+				expect(screen.getByTestId('description-textarea')).toHaveTextContent(
+					googleChatDescriptionDefaultValue,
+				);
+			});
+
+			it('Should check if saving with a webhook url outside chat.googleapis.com displays error notification', async () => {
+				fireEvent.change(screen.getByTestId('channel-name-textbox'), {
+					target: { value: 'gchat-channel' },
+				});
+				fireEvent.change(screen.getByTestId('webhook-url-textbox'), {
+					target: { value: 'https://example.com/webhook' },
+				});
+
+				fireEvent.click(
+					screen.getByRole('button', { name: 'button_save_channel' }),
+				);
+
+				await waitFor(() =>
+					expect(errorNotification).toHaveBeenCalledWith({
+						message: 'Error',
+						description: 'google_chat_webhook_url_invalid',
+					}),
+				);
+			});
+
+			it('Should check if saving sends a googlechat_configs payload', async () => {
+				let requestBody: unknown;
+				server.use(
+					rest.post('http://localhost/api/v1/channels', async (req, res, ctx) => {
+						requestBody = await req.json();
+						return res(
+							ctx.status(201),
+							ctx.json({ status: 'success', data: 'channel created' }),
+						);
+					}),
+				);
+
+				fireEvent.change(screen.getByTestId('channel-name-textbox'), {
+					target: { value: 'gchat-channel' },
+				});
+				fireEvent.change(screen.getByTestId('webhook-url-textbox'), {
+					target: { value: validWebhookUrl },
+				});
+
+				fireEvent.click(
+					screen.getByRole('button', { name: 'button_save_channel' }),
+				);
+
+				await waitFor(() =>
+					expect(successNotification).toHaveBeenCalledWith({
+						message: 'Success',
+						description: 'channel_creation_done',
+					}),
+				);
+
+				expect(requestBody).toStrictEqual({
+					name: 'gchat-channel',
+					googlechat_configs: [
+						{
+							webhook_url: validWebhookUrl,
+							title: GoogleChatInitialConfig.title,
+							text: GoogleChatInitialConfig.text,
+							send_resolved: true,
+						},
+					],
+				});
+			});
+		});
 	});
 });

frontend/src/container/AppLayout/index.tsx

@@ -104,7 +104,6 @@ function AppLayout(props: AppLayoutProps): JSX.Element {
 		isFetchingFeatureFlags,
 		featureFlagsFetchError,
 		userPreferences,
-		isFetchingUserPreferences,
 		updateChangelog,
 		toggleChangelogModal,
 		showChangelogModal,
@@ -725,12 +724,12 @@ function AppLayout(props: AppLayoutProps): JSX.Element {
 		}
 	}, []);
 
-	// Set sidebar as loaded after user preferences fetch completes (success or error)
+	// Set sidebar as loaded after user preferences are fetched
 	useEffect(() => {
-		if (!isFetchingUserPreferences) {
+		if (userPreferences !== null) {
 			setIsSidebarLoaded(true);
 		}
-	}, [isFetchingUserPreferences]);
+	}, [userPreferences]);
 
 	// Use localStorage value as fallback until preferences are loaded
 	const isSideNavPinned = isSidebarLoaded

frontend/src/container/CreateAlertChannels/config.ts

@@ -104,6 +104,7 @@ export enum ChannelType {
 	Pagerduty = 'pagerduty',
 	Opsgenie = 'opsgenie',
 	MsTeams = 'msteams',
+	GoogleChat = 'googlechat',
 }
 
 // LabelFilterStatement will be used for preparing filter conditions / matchers
@@ -125,3 +126,11 @@ export interface MsTeamsChannel extends Channel {
 	title?: string;
 	text?: string;
 }
+
+export interface GoogleChatChannel extends Channel {
+	// incoming webhook url of the google chat space, must be an
+	// https url on chat.googleapis.com
+	webhook_url?: string;
+	title?: string;
+	text?: string;
+}

frontend/src/container/CreateAlertChannels/defaults.ts

@@ -1,4 +1,48 @@
-import { EmailChannel, OpsgenieChannel, PagerChannel } from './config';
+import {
+	EmailChannel,
+	GoogleChatChannel,
+	OpsgenieChannel,
+	PagerChannel,
+	SlackChannel,
+} from './config';
+
+// shared by slack and ms teams, both render the same title / description boxes
+export const SlackInitialConfig: Partial<SlackChannel> = {
+	text: `{{ range .Alerts -}}
+     *Alert:* {{ .Labels.alertname }}{{ if .Labels.severity }} - {{ .Labels.severity }}{{ end }}
+
+     *Summary:* {{ .Annotations.summary }}
+     *Description:* {{ .Annotations.description }}
+     *RelatedLogs:* {{ if gt (len .Annotations.related_logs) 0 -}} View in <{{ .Annotations.related_logs }}|logs explorer> {{- end}}
+     *RelatedTraces:* {{ if gt (len .Annotations.related_traces) 0 -}} View in <{{ .Annotations.related_traces }}|traces explorer> {{- end}}
+
+     *Details:*
+       {{ range .Labels.SortedPairs }} • *{{ .Name }}:* {{ .Value }}
+       {{ end }}
+     {{ end }}`,
+	title: `[{{ .Status | toUpper }}{{ if eq .Status "firing" }}:{{ .Alerts.Firing | len }}{{ end }}] {{ .CommonLabels.alertname }} for {{ .CommonLabels.job }}
+     {{- if gt (len .CommonLabels) (len .GroupLabels) -}}
+       {{" "}}(
+       {{- with .CommonLabels.Remove .GroupLabels.Names }}
+         {{- range $index, $label := .SortedPairs -}}
+           {{ if $index }}, {{ end }}
+           {{- $label.Name }}="{{ $label.Value -}}"
+         {{- end }}
+       {{- end -}}
+       )
+     {{- end }}`,
+};
+
+// mirrors DefaultGoogleChatReceiverConfig in pkg/types/alertmanagertypes/googlechat.go,
+// which the backend applies when title / text are left empty
+export const GoogleChatInitialConfig: Partial<GoogleChatChannel> = {
+	title: `[{{ .Status | toUpper }}{{ if eq .Status "firing" }}:{{ .Alerts.Firing | len }}{{ end }}] {{ .CommonLabels.alertname }}`,
+	text: `{{ range .Alerts -}}
+**Alert:** {{ .Labels.alertname }}{{ if .Labels.severity }} ({{ .Labels.severity }}){{ end }}{{ if .Annotations.summary }}
+**Summary:** {{ .Annotations.summary }}{{ end }}{{ if .Annotations.description }}
+**Description:** {{ .Annotations.description }}{{ end }}
+{{ end }}`,
+};
 
 export const PagerInitialConfig: Partial<PagerChannel> = {
 	description: `[{{ .Status | toUpper }}{{ if eq .Status "firing" }}:{{ .Alerts.Firing | len }}{{ end }}] {{ .CommonLabels.alertname }} for {{ .CommonLabels.job }}

frontend/src/container/CreateAlertChannels/index.tsx

@@ -14,16 +14,24 @@ import testPagerApi from 'api/channels/testPager';
 import testSlackApi from 'api/channels/testSlack';
 import testWebhookApi from 'api/channels/testWebhook';
 import logEvent from 'api/common/logEvent';
+import {
+	useCreateChannel,
+	useTestChannel,
+} from 'api/generated/services/channels';
+import { RenderErrorResponseDTO } from 'api/generated/services/sigNoz.schemas';
+import { ErrorType } from 'api/generatedAPIInstance';
 import ROUTES from 'constants/routes';
 import FormAlertChannels from 'container/FormAlertChannels';
 import { useNotifications } from 'hooks/useNotifications';
 import history from 'lib/history';
 import { useErrorModal } from 'providers/ErrorModalProvider';
 import APIError from 'types/api/error';
+import { toAPIError } from 'utils/errorUtils';
 
 import {
 	ChannelType,
 	EmailChannel,
+	GoogleChatChannel,
 	MsTeamsChannel,
 	OpsgenieChannel,
 	PagerChannel,
@@ -33,10 +41,16 @@ import {
 } from './config';
 import {
 	EmailInitialConfig,
+	GoogleChatInitialConfig,
 	OpsgenieInitialConfig,
 	PagerInitialConfig,
+	SlackInitialConfig,
 } from './defaults';
-import { isChannelType } from './utils';
+import {
+	isChannelType,
+	isValidGoogleChatWebhookURL,
+	prepareGoogleChatRequest,
+} from './utils';
 
 import './CreateAlertChannels.styles.scss';
 
@@ -60,38 +74,22 @@ function CreateAlertChannels({
 				PagerChannel &
 				MsTeamsChannel &
 				OpsgenieChannel &
-				EmailChannel
+				EmailChannel &
+				GoogleChatChannel
 		>
-	>({
+	>(() => ({
 		send_resolved: true,
-		text: `{{ range .Alerts -}}
-     *Alert:* {{ .Labels.alertname }}{{ if .Labels.severity }} - {{ .Labels.severity }}{{ end }}
-
-     *Summary:* {{ .Annotations.summary }}
-     *Description:* {{ .Annotations.description }}
-     *RelatedLogs:* {{ if gt (len .Annotations.related_logs) 0 -}} View in <{{ .Annotations.related_logs }}|logs explorer> {{- end}}
-     *RelatedTraces:* {{ if gt (len .Annotations.related_traces) 0 -}} View in <{{ .Annotations.related_traces }}|traces explorer> {{- end}}
-
-     *Details:*
-       {{ range .Labels.SortedPairs }} • *{{ .Name }}:* {{ .Value }}
-       {{ end }}
-     {{ end }}`,
-		title: `[{{ .Status | toUpper }}{{ if eq .Status "firing" }}:{{ .Alerts.Firing | len }}{{ end }}] {{ .CommonLabels.alertname }} for {{ .CommonLabels.job }}
-     {{- if gt (len .CommonLabels) (len .GroupLabels) -}}
-       {{" "}}(
-       {{- with .CommonLabels.Remove .GroupLabels.Names }}
-         {{- range $index, $label := .SortedPairs -}}
-           {{ if $index }}, {{ end }}
-           {{- $label.Name }}="{{ $label.Value -}}"
-         {{- end }}
-       {{- end -}}
-       )
-     {{- end }}`,
-	});
+		...(preType === ChannelType.GoogleChat
+			? GoogleChatInitialConfig
+			: SlackInitialConfig),
+	}));
 	const [savingState, setSavingState] = useState<boolean>(false);
 	const [testingState, setTestingState] = useState<boolean>(false);
 	const { notifications } = useNotifications();
 
+	const { mutateAsync: createChannel } = useCreateChannel();
+	const { mutateAsync: testChannel } = useTestChannel();
+
 	const [type, setType] = useState<ChannelType>(preType);
 	const onTypeChangeHandler = useCallback(
 		(value: string) => {
@@ -121,8 +119,26 @@ function CreateAlertChannels({
 					...EmailInitialConfig,
 				}));
 			}
+
+			// google chat prefills its own title / description templates, so switching
+			// in or out of it has to swap the templates the form is showing
+			if (
+				currentType !== value &&
+				(value === ChannelType.GoogleChat || currentType === ChannelType.GoogleChat)
+			) {
+				const templates =
+					value === ChannelType.GoogleChat
+						? GoogleChatInitialConfig
+						: SlackInitialConfig;
+
+				setSelectedConfig((selectedConfig) => ({
+					...selectedConfig,
+					...templates,
+				}));
+				formInstance.setFieldsValue(templates);
+			}
 		},
-		[type, selectedConfig],
+		[type, selectedConfig, formInstance],
 	);
 
 	const prepareSlackRequest = useCallback(
@@ -407,6 +423,56 @@ function CreateAlertChannels({
 		showErrorModal,
 	]);
 
+	const validateGoogleChatConfig = useCallback((): boolean => {
+		if (!selectedConfig.webhook_url) {
+			notifications.error({
+				message: 'Error',
+				description: t('webhook_url_required'),
+			});
+			return false;
+		}
+
+		if (!isValidGoogleChatWebhookURL(selectedConfig.webhook_url)) {
+			notifications.error({
+				message: 'Error',
+				description: t('google_chat_webhook_url_invalid'),
+			});
+			return false;
+		}
+
+		return true;
+	}, [selectedConfig.webhook_url, notifications, t]);
+
+	const onGoogleChatHandler = useCallback(async () => {
+		if (!validateGoogleChatConfig()) {
+			return { status: 'failed', statusMessage: t('channel_creation_failed') };
+		}
+
+		setSavingState(true);
+
+		try {
+			await createChannel({ data: prepareGoogleChatRequest(selectedConfig) });
+			notifications.success({
+				message: 'Success',
+				description: t('channel_creation_done'),
+			});
+			history.replace(ROUTES.ALL_CHANNELS);
+			return { status: 'success', statusMessage: t('channel_creation_done') };
+		} catch (error) {
+			showErrorModal(toAPIError(error as ErrorType<RenderErrorResponseDTO>));
+			return { status: 'failed', statusMessage: t('channel_creation_failed') };
+		} finally {
+			setSavingState(false);
+		}
+	}, [
+		validateGoogleChatConfig,
+		createChannel,
+		selectedConfig,
+		notifications,
+		t,
+		showErrorModal,
+	]);
+
 	const onSaveHandler = useCallback(
 		async (value: ChannelType) => {
 			if (!selectedConfig.name) {
@@ -424,6 +490,7 @@ function CreateAlertChannels({
 				[ChannelType.Opsgenie]: onOpsgenieHandler,
 				[ChannelType.MsTeams]: onMsTeamsHandler,
 				[ChannelType.Email]: onEmailHandler,
+				[ChannelType.GoogleChat]: onGoogleChatHandler,
 			};
 
 			if (isChannelType(value)) {
@@ -455,6 +522,7 @@ function CreateAlertChannels({
 			onOpsgenieHandler,
 			onMsTeamsHandler,
 			onEmailHandler,
+			onGoogleChatHandler,
 			notifications,
 			t,
 		],
@@ -492,6 +560,13 @@ function CreateAlertChannels({
 						request = prepareEmailRequest();
 						await testEmail(request);
 						break;
+					case ChannelType.GoogleChat:
+						if (!validateGoogleChatConfig()) {
+							setTestingState(false);
+							return;
+						}
+						await testChannel({ data: prepareGoogleChatRequest(selectedConfig) });
+						break;
 					default:
 						notifications.error({
 							message: 'Error',
@@ -513,7 +588,11 @@ function CreateAlertChannels({
 					status: 'Test success',
 				});
 			} catch (error) {
-				showErrorModal(error as APIError);
+				showErrorModal(
+					error instanceof APIError
+						? error
+						: toAPIError(error as ErrorType<RenderErrorResponseDTO>),
+				);
 
 				logEvent('Alert Channel: Test notification', {
 					type: channelType,
@@ -535,6 +614,8 @@ function CreateAlertChannels({
 			prepareSlackRequest,
 			prepareMsTeamsRequest,
 			prepareEmailRequest,
+			validateGoogleChatConfig,
+			testChannel,
 			notifications,
 		],
 	);

frontend/src/container/CreateAlertChannels/utils.ts

@@ -1,4 +1,39 @@
-import { ChannelType } from './config';
+import {
+	AlertmanagertypesPostableChannelDTO,
+	ConfigSecretURLDTO,
+} from 'api/generated/services/sigNoz.schemas';
+
+import { ChannelType, GoogleChatChannel } from './config';
 
 export const isChannelType = (type: string): type is ChannelType =>
 	Object.values(ChannelType).includes(type as ChannelType);
+
+const GOOGLE_CHAT_WEBHOOK_HOST = 'chat.googleapis.com';
+
+// the backend enforces the same two rules, this is only for a nicer error experience
+export const isValidGoogleChatWebhookURL = (url: string): boolean => {
+	try {
+		const { protocol, hostname } = new URL(url);
+		return (
+			protocol === 'https:' && hostname.toLowerCase() === GOOGLE_CHAT_WEBHOOK_HOST
+		);
+	} catch {
+		return false;
+	}
+};
+
+// create, update and test all send the same body shape
+export const prepareGoogleChatRequest = (
+	config: Partial<GoogleChatChannel>,
+): AlertmanagertypesPostableChannelDTO => ({
+	name: config.name || '',
+	googlechat_configs: [
+		{
+			// the generated type models go's config.SecretURL as an object, the api takes a string
+			webhook_url: (config.webhook_url || '') as unknown as ConfigSecretURLDTO,
+			title: config.title || '',
+			text: config.text || '',
+			send_resolved: config.send_resolved || false,
+		},
+	],
+});

frontend/src/container/EditAlertChannels/index.tsx

@@ -14,10 +14,17 @@ import testPagerApi from 'api/channels/testPager';
 import testSlackApi from 'api/channels/testSlack';
 import testWebhookApi from 'api/channels/testWebhook';
 import logEvent from 'api/common/logEvent';
+import {
+	useTestChannel,
+	useUpdateChannelByID,
+} from 'api/generated/services/channels';
+import { RenderErrorResponseDTO } from 'api/generated/services/sigNoz.schemas';
+import { ErrorType } from 'api/generatedAPIInstance';
 import ROUTES from 'constants/routes';
 import {
 	ChannelType,
 	EmailChannel,
+	GoogleChatChannel,
 	MsTeamsChannel,
 	OpsgenieChannel,
 	PagerChannel,
@@ -25,10 +32,15 @@ import {
 	ValidatePagerChannel,
 	WebhookChannel,
 } from 'container/CreateAlertChannels/config';
+import {
+	isValidGoogleChatWebhookURL,
+	prepareGoogleChatRequest,
+} from 'container/CreateAlertChannels/utils';
 import FormAlertChannels from 'container/FormAlertChannels';
 import { useNotifications } from 'hooks/useNotifications';
 import history from 'lib/history';
 import APIError from 'types/api/error';
+import { toAPIError } from 'utils/errorUtils';
 
 function EditAlertChannels({
 	initialValue,
@@ -45,7 +57,8 @@ function EditAlertChannels({
 				PagerChannel &
 				MsTeamsChannel &
 				OpsgenieChannel &
-				EmailChannel
+				EmailChannel &
+				GoogleChatChannel
 		>
 	>({
 		...initialValue,
@@ -54,6 +67,26 @@ function EditAlertChannels({
 	const [testingState, setTestingState] = useState<boolean>(false);
 	const { notifications } = useNotifications();
 
+	const { mutateAsync: updateChannel } = useUpdateChannelByID();
+	const { mutateAsync: testChannel } = useTestChannel();
+
+	const notifyError = useCallback(
+		(error: unknown): APIError => {
+			const apiError =
+				error instanceof APIError
+					? error
+					: toAPIError(error as ErrorType<RenderErrorResponseDTO>);
+
+			notifications.error({
+				message: apiError.getErrorCode(),
+				description: apiError.getErrorMessage(),
+			});
+
+			return apiError;
+		},
+		[notifications],
+	);
+
 	const [type, setType] = useState<ChannelType>(
 		initialValue?.type ? (initialValue.type as ChannelType) : ChannelType.Slack,
 	);
@@ -364,6 +397,61 @@ function EditAlertChannels({
 		}
 	}, [prepareMsTeamsRequest, t, notifications, selectedConfig]);
 
+	const validateGoogleChatConfig = useCallback((): string => {
+		if (!selectedConfig?.webhook_url) {
+			return t('webhook_url_required');
+		}
+
+		if (!isValidGoogleChatWebhookURL(selectedConfig.webhook_url)) {
+			return t('google_chat_webhook_url_invalid');
+		}
+
+		return '';
+	}, [selectedConfig, t]);
+
+	const onGoogleChatEditHandler = useCallback(async () => {
+		const validationError = validateGoogleChatConfig();
+
+		if (validationError !== '') {
+			notifications.error({
+				message: 'Error',
+				description: validationError,
+			});
+			return { status: 'failed', statusMessage: validationError };
+		}
+
+		setSavingState(true);
+
+		try {
+			await updateChannel({
+				pathParams: { id },
+				data: prepareGoogleChatRequest(selectedConfig),
+			});
+			notifications.success({
+				message: 'Success',
+				description: t('channel_edit_done'),
+			});
+			history.replace(ROUTES.ALL_CHANNELS);
+			return { status: 'success', statusMessage: t('channel_edit_done') };
+		} catch (error) {
+			const apiError = notifyError(error);
+			return {
+				status: 'failed',
+				statusMessage: apiError.getErrorMessage() || t('channel_edit_failed'),
+			};
+		} finally {
+			setSavingState(false);
+		}
+	}, [
+		validateGoogleChatConfig,
+		updateChannel,
+		id,
+		selectedConfig,
+		notifications,
+		notifyError,
+		t,
+	]);
+
 	const onSaveHandler = useCallback(
 		async (value: ChannelType) => {
 			let result;
@@ -379,6 +467,8 @@ function EditAlertChannels({
 				result = await onOpsgenieEditHandler();
 			} else if (value === ChannelType.Email) {
 				result = await onEmailEditHandler();
+			} else if (value === ChannelType.GoogleChat) {
+				result = await onGoogleChatEditHandler();
 			}
 			logEvent('Alert Channel: Save channel', {
 				type: value,
@@ -397,6 +487,7 @@ function EditAlertChannels({
 			onMsTeamsEditHandler,
 			onOpsgenieEditHandler,
 			onEmailEditHandler,
+			onGoogleChatEditHandler,
 		],
 	);
 
@@ -438,6 +529,19 @@ function EditAlertChannels({
 							await testEmail(request);
 						}
 						break;
+					case ChannelType.GoogleChat: {
+						const validationError = validateGoogleChatConfig();
+						if (validationError !== '') {
+							notifications.error({
+								message: 'Error',
+								description: validationError,
+							});
+							setTestingState(false);
+							return;
+						}
+						await testChannel({ data: prepareGoogleChatRequest(selectedConfig) });
+						break;
+					}
 					default:
 						notifications.error({
 							message: 'Error',
@@ -459,10 +563,7 @@ function EditAlertChannels({
 					status: 'Test success',
 				});
 			} catch (error) {
-				notifications.error({
-					message: (error as APIError).getErrorCode(),
-					description: (error as APIError).getErrorMessage(),
-				});
+				notifyError(error);
 				logEvent('Alert Channel: Test notification', {
 					type: channelType,
 					sendResolvedAlert: selectedConfig?.send_resolved,
@@ -476,6 +577,9 @@ function EditAlertChannels({
 		// eslint-disable-next-line react-hooks/exhaustive-deps
 		[
 			t,
+			notifyError,
+			validateGoogleChatConfig,
+			testChannel,
 			prepareWebhookRequest,
 			preparePagerRequest,
 			prepareSlackRequest,

frontend/src/container/FormAlertChannels/Settings/GoogleChat.tsx

@@ -0,0 +1,82 @@
+import { Dispatch, SetStateAction } from 'react';
+import { useTranslation } from 'react-i18next';
+import { Form, Input } from 'antd';
+import { MarkdownRenderer } from 'components/MarkdownRenderer/MarkdownRenderer';
+
+import { GoogleChatChannel } from '../../CreateAlertChannels/config';
+import { isValidGoogleChatWebhookURL } from '../../CreateAlertChannels/utils';
+
+function GoogleChat({ setSelectedConfig }: GoogleChatProps): JSX.Element {
+	const { t } = useTranslation('channels');
+
+	return (
+		<>
+			<Form.Item
+				name="webhook_url"
+				label={t('field_webhook_url')}
+				required
+				rules={[
+					{
+						validator: (_, value: string): Promise<void> =>
+							!value || isValidGoogleChatWebhookURL(value)
+								? Promise.resolve()
+								: Promise.reject(new Error(t('google_chat_webhook_url_invalid'))),
+					},
+				]}
+				tooltip={{
+					title: (
+						<MarkdownRenderer
+							markdownContent={t('tooltip_google_chat_url')}
+							variables={{}}
+						/>
+					),
+					overlayInnerStyle: { maxWidth: 400 },
+					placement: 'right',
+				}}
+			>
+				<Input
+					onChange={(event): void => {
+						setSelectedConfig((value) => ({
+							...value,
+							webhook_url: event.target.value,
+						}));
+					}}
+					data-testid="webhook-url-textbox"
+				/>
+			</Form.Item>
+
+			<Form.Item name="title" label={t('field_slack_title')}>
+				<Input.TextArea
+					rows={4}
+					onChange={(event): void =>
+						setSelectedConfig((value) => ({
+							...value,
+							title: event.target.value,
+						}))
+					}
+					data-testid="title-textarea"
+				/>
+			</Form.Item>
+
+			<Form.Item name="text" label={t('field_slack_description')}>
+				<Input.TextArea
+					rows={4}
+					onChange={(event): void =>
+						setSelectedConfig((value) => ({
+							...value,
+							text: event.target.value,
+						}))
+					}
+					data-testid="description-textarea"
+					placeholder={t('placeholder_slack_description')}
+				/>
+			</Form.Item>
+		</>
+	);
+}
+
+interface GoogleChatProps {
+	setSelectedConfig: Dispatch<SetStateAction<Partial<GoogleChatChannel>>>;
+}
+
+export default GoogleChat;

frontend/src/container/FormAlertChannels/index.tsx

@@ -9,6 +9,7 @@ import ROUTES from 'constants/routes';
 import {
 	ChannelType,
 	EmailChannel,
+	GoogleChatChannel,
 	OpsgenieChannel,
 	PagerChannel,
 	SlackChannel,
@@ -17,6 +18,7 @@ import {
 import history from 'lib/history';
 
 import EmailSettings from './Settings/Email';
+import GoogleChatSettings from './Settings/GoogleChat';
 import MsTeamsSettings from './Settings/MsTeams';
 import OpsgenieSettings from './Settings/Opsgenie';
 import PagerSettings from './Settings/Pager';
@@ -49,6 +51,8 @@ function FormAlertChannels({
 				return <PagerSettings setSelectedConfig={setSelectedConfig} />;
 			case ChannelType.MsTeams:
 				return <MsTeamsSettings setSelectedConfig={setSelectedConfig} />;
+			case ChannelType.GoogleChat:
+				return <GoogleChatSettings setSelectedConfig={setSelectedConfig} />;
 			case ChannelType.Opsgenie:
 				return <OpsgenieSettings setSelectedConfig={setSelectedConfig} />;
 			case ChannelType.Email:
@@ -129,6 +133,14 @@ function FormAlertChannels({
 						<Select.Option value="msteams" key="msteams" data-testid="select-option">
 							Microsoft Teams
 						</Select.Option>
+
+						<Select.Option
+							value="googlechat"
+							key="googlechat"
+							data-testid="select-option"
+						>
+							Google Chat
+						</Select.Option>
 					</Select>
 				</Form.Item>
 
@@ -176,7 +188,8 @@ interface FormAlertChannelsProps {
 					WebhookChannel &
 					PagerChannel &
 					OpsgenieChannel &
-					EmailChannel
+					EmailChannel &
+					GoogleChatChannel
 			>
 		>
 	>;

frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/__tests__/AttributeMappingsTab.test.tsx

@@ -15,18 +15,6 @@ jest.mock('@signozhq/ui/sonner', () => ({
 	},
 }));
 
-import { useAuthZ } from 'lib/authz/hooks/useAuthZ/useAuthZ';
-import {
-	mockUseAuthZDenyAll,
-	mockUseAuthZGrantAll,
-} from 'lib/authz/utils/authz-test-utils';
-
-// Admin gating on the write controls flows through useAuthZ. Mock it directly
-// (synchronous) so the functional tests stay synchronous; the read-only block
-// below flips it to deny-all.
-jest.mock('lib/authz/hooks/useAuthZ/useAuthZ');
-const mockedUseAuthZ = useAuthZ as jest.MockedFunction<typeof useAuthZ>;
-
 import {
 	GROUPS_ENDPOINT,
 	makeGroupsResponse,
@@ -114,8 +102,6 @@ describe('AttributeMappingsTab (integration)', () => {
 	beforeEach(() => {
 		// Reset URL state between tests — jsdom shares window.location across a file.
 		window.history.pushState(null, '', '/');
-		// Default to an admin; the read-only block overrides this.
-		mockedUseAuthZ.mockImplementation(mockUseAuthZGrantAll);
 	});
 
 	afterEach(() => {
@@ -521,55 +507,4 @@ describe('AttributeMappingsTab (integration)', () => {
 			).resolves.toBeInTheDocument();
 		});
 	});
-
-	// The write APIs (create/update/delete group & mapper) are Admin-only on the
-	// backend, so a non-admin gets a read-only view: the data renders, but every
-	// write control is hidden.
-	describe('read-only (non-admin)', () => {
-		beforeEach(() => {
-			mockedUseAuthZ.mockImplementation(mockUseAuthZDenyAll);
-		});
-
-		it('hides the "Add a new group" button', async () => {
-			setupGroups();
-			render(<AttributeMappingsTabWithStore />);
-
-			await screen.findByTestId('group-name-group-1');
-			expect(screen.queryByTestId('add-group-row')).not.toBeInTheDocument();
-		});
-
-		it('hides the group enable toggle and actions menu', async () => {
-			setupGroups();
-			render(<AttributeMappingsTabWithStore />);
-
-			await screen.findByTestId('group-name-group-1');
-			expect(
-				screen.queryByTestId('group-enabled-group-1'),
-			).not.toBeInTheDocument();
-			expect(
-				screen.queryByTestId('group-actions-group-1'),
-			).not.toBeInTheDocument();
-		});
-
-		it('renders mappers read-only: no "Add mapping" button or row actions', async () => {
-			const user = userEvent.setup({ pointerEventsCheck: 0 });
-			setupGroups();
-			setupMappers([makeMapper({ id: 'mapper-1', name: 'gen_ai.request.model' })]);
-			render(<AttributeMappingsTabWithStore />);
-
-			await screen.findByTestId('group-name-group-1');
-			await expandGroup(user);
-
-			// The mapper still renders...
-			await screen.findByTestId('mapper-target-mapper-1');
-			// ...but every write control is gone.
-			expect(screen.queryByTestId('add-mapper-group-1')).not.toBeInTheDocument();
-			expect(
-				screen.queryByTestId('mapper-enabled-mapper-1'),
-			).not.toBeInTheDocument();
-			expect(
-				screen.queryByRole('button', { name: 'Mapping actions' }),
-			).not.toBeInTheDocument();
-		});
-	});
 });

frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/GroupHeaderActions/GroupHeaderActions.tsx

@@ -1,7 +1,6 @@
 import { Switch } from '@signozhq/ui/switch';
 
 import { DraftGroup } from 'container/LLMObservability/AttributeMapping/types';
-import { useCanManageAttributeMapping } from 'container/LLMObservability/AttributeMapping/hooks/useCanManageAttributeMapping';
 import GroupActionsMenu from '../GroupActionsMenu/GroupActionsMenu';
 import styles from './GroupHeaderActions.module.scss';
 
@@ -17,11 +16,7 @@ function GroupHeaderActions({
 	onToggle,
 	onEdit,
 	onRemove,
-}: GroupHeaderActionsProps): JSX.Element | null {
-	const canManage = useCanManageAttributeMapping();
-	if (!canManage) {
-		return null;
-	}
+}: GroupHeaderActionsProps): JSX.Element {
 	return (
 		<div
 			className={styles.actions}

frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/GroupMappers/GroupMappers.tsx

@@ -11,7 +11,6 @@ import {
 	Mapper,
 } from 'container/LLMObservability/AttributeMapping/types';
 import { AttributeMappingEditor } from 'container/LLMObservability/AttributeMapping/hooks/useAttributeMappingEditor';
-import { useCanManageAttributeMapping } from 'container/LLMObservability/AttributeMapping/hooks/useCanManageAttributeMapping';
 import { COLUMN_COUNT } from '../constants';
 import MapperRow from '../MapperRow/MapperRow';
 import MapperRowSkeleton from '../MapperRow/MapperRowSkeleton';
@@ -40,7 +39,6 @@ function GroupMappers({
 	onEditMapper,
 }: GroupMappersProps): JSX.Element {
 	const { hydrateGroupMappers, removeMapper, toggleMapper } = editor;
-	const canManage = useCanManageAttributeMapping();
 
 	const hasServerId = group.serverId !== null;
 	const { data, isLoading, isError } = useListSpanMappers(
@@ -146,20 +144,16 @@ function GroupMappers({
 		/>
 	));
 
-	// The add-mapping row trails every non-error state (including loading/empty),
-	// but only for users who can manage mappings — non-admins get a read-only view.
+	// The add-mapping row trails every non-error state (including loading/empty).
 	let rows: JSX.Element[];
 	if (isErrorMappers) {
 		rows = [errorRow];
 	} else if (isLoadingMappers && mapperCount === 0) {
-		rows = [...skeletonRows];
+		rows = [...skeletonRows, addMapperRow];
 	} else if (mapperCount === 0) {
-		rows = [emptyRow];
+		rows = [emptyRow, addMapperRow];
 	} else {
-		rows = [...mapperRows];
-	}
-	if (canManage && !isErrorMappers) {
-		rows.push(addMapperRow);
+		rows = [...mapperRows, addMapperRow];
 	}
 
 	return (

frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/MapperRow/MapperRow.tsx

@@ -6,7 +6,6 @@ import cx from 'classnames';
 import { motion } from 'motion/react';
 
 import { DraftMapper } from 'container/LLMObservability/AttributeMapping/types';
-import { useCanManageAttributeMapping } from 'container/LLMObservability/AttributeMapping/hooks/useCanManageAttributeMapping';
 import MapperActionsMenu from '../MapperActionsMenu/MapperActionsMenu';
 import styles from './MapperRow.module.scss';
 
@@ -31,7 +30,6 @@ function MapperRow({
 	onRemove,
 	onToggle,
 }: MapperRowProps): JSX.Element {
-	const canManage = useCanManageAttributeMapping();
 	const sources = mapper.sources ?? [];
 	const visibleSources = sources.slice(0, MAX_VISIBLE_SOURCES);
 	const remainingSources = sources.length - visibleSources.length;
@@ -103,16 +101,14 @@ function MapperRow({
 				)}
 			</td>
 			<td className={cx(styles.cell, styles.actionsCell)}>
-				{canManage && (
-					<div className={styles.rowActions}>
-						<Switch
-							value={mapper.enabled}
-							onChange={(checked): void => onToggle(mapper.localId, checked)}
-							testId={`mapper-enabled-${mapper.localId}`}
-						/>
-						<MapperActionsMenu mapper={mapper} onEdit={onEdit} onRemove={onRemove} />
-					</div>
-				)}
+				<div className={styles.rowActions}>
+					<Switch
+						value={mapper.enabled}
+						onChange={(checked): void => onToggle(mapper.localId, checked)}
+						testId={`mapper-enabled-${mapper.localId}`}
+					/>
+					<MapperActionsMenu mapper={mapper} onEdit={onEdit} onRemove={onRemove} />
+				</div>
 			</td>
 		</motion.tr>
 	);

frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappingsTable/MappingsTable.tsx

@@ -11,7 +11,6 @@ import {
 	DraftMapper,
 } from 'container/LLMObservability/AttributeMapping/types';
 import { AttributeMappingEditor } from 'container/LLMObservability/AttributeMapping/hooks/useAttributeMappingEditor';
-import { useCanManageAttributeMapping } from 'container/LLMObservability/AttributeMapping/hooks/useCanManageAttributeMapping';
 import GroupHeader from './GroupHeader/GroupHeader';
 import GroupHeaderActions from './GroupHeaderActions/GroupHeaderActions';
 import GroupMappers from './GroupMappers/GroupMappers';
@@ -34,7 +33,6 @@ function MappingsTable({
 	const [expandedGroups, setExpandedGroups] = useState<string[]>([]);
 	const [targetGroupId, setTargetGroupId] = useState<string | null>(null);
 	const drawer = useMapperFormDrawer();
-	const canManage = useCanManageAttributeMapping();
 
 	const { upsertMapper, removeMapper } = editor;
 
@@ -122,20 +120,18 @@ function MappingsTable({
 
 	return (
 		<div className={styles.tableWrapper}>
-			{canManage && (
-				<div className={styles.toolbar}>
-					<Button
-						variant="solid"
-						color="primary"
-						prefix={<Plus size={14} />}
-						onClick={onAddGroup}
-						testId="add-group-row"
-						disabled={editor.isLoading}
-					>
-						Add a new group
-					</Button>
-				</div>
-			)}
+			<div className={styles.toolbar}>
+				<Button
+					variant="link"
+					color="primary"
+					prefix={<Plus size={14} />}
+					onClick={onAddGroup}
+					testId="add-group-row"
+					disabled={editor.isLoading}
+				>
+					Add a new group
+				</Button>
+			</div>
 
 			{isEmpty ? (
 				<div className={styles.tableState} data-testid="mapper-groups-empty">

frontend/src/container/LLMObservability/AttributeMapping/LLMObservabilityAttributeMapping.tsx

@@ -8,18 +8,12 @@ import AttributeMappingsTab from './AttributeMappingsTab/AttributeMappingsTab';
 import DiscardChangesDialog from './components/DiscardChangesDialog/DiscardChangesDialog';
 import GroupFormDrawer from './components/GroupFormDrawer/GroupFormDrawer';
 import styles from './LLMObservabilityAttributeMapping.module.scss';
-import TestTab from './TestTab/TestTab';
 import { useAttributeMappingEditor } from './hooks/useAttributeMappingEditor';
 import { useGroupFormDrawer } from './components/GroupFormDrawer/hooks/useGroupFormDrawer';
-import { useTestSpanMapper } from './TestTab/useTestSpanMapper';
-
-const MAPPINGS_TAB_KEY = 'attribute-mappings';
-const TEST_TAB_KEY = 'test';
 
 function LLMObservabilityAttributeMapping(): JSX.Element {
 	const editor = useAttributeMappingEditor();
 	const groupDrawer = useGroupFormDrawer();
-	const spanTest = useTestSpanMapper(editor.snapshot, editor.groups);
 
 	const { discard } = editor;
 	// Discarding wipes the whole working copy, so gate it behind a confirm
@@ -37,7 +31,7 @@ function LLMObservabilityAttributeMapping(): JSX.Element {
 
 	const tabItems = [
 		{
-			key: MAPPINGS_TAB_KEY,
+			key: 'attribute-mappings',
 			label: 'Attribute Mappings',
 			children: (
 				<AttributeMappingsTab
@@ -48,9 +42,11 @@ function LLMObservabilityAttributeMapping(): JSX.Element {
 			),
 		},
 		{
-			key: TEST_TAB_KEY,
+			key: 'test',
 			label: 'Test',
-			children: <TestTab spanTest={spanTest} />,
+			disabled: true,
+			disabledReason: 'Coming soon',
+			children: null,
 		},
 	];
 
@@ -75,7 +71,7 @@ function LLMObservabilityAttributeMapping(): JSX.Element {
 
 			<Tabs
 				testId="attribute-mapping-tabs"
-				defaultValue={MAPPINGS_TAB_KEY}
+				defaultValue="attribute-mappings"
 				items={tabItems}
 			/>
 			{groupDrawer.isOpen && (

frontend/src/container/LLMObservability/AttributeMapping/TestTab/JsonEditorSkeleton.module.scss

@@ -1,54 +0,0 @@
-.skeleton {
-	width: 100%;
-	height: 100%;
-	overflow: hidden;
-	background: var(--l1-background);
-}
-
-.line {
-	display: flex;
-	align-items: center;
-	height: 18px;
-}
-
-.lineNumber {
-	flex: 0 0 40px;
-	padding-right: var(--padding-3);
-	text-align: right;
-	font-family: 'Geist Mono', monospace;
-	font-size: var(--font-size-xs);
-	color: var(--l3-foreground);
-	opacity: 0.6;
-	user-select: none;
-}
-
-.lineContent {
-	display: flex;
-	align-items: center;
-	gap: var(--spacing-2);
-	min-width: 0;
-}
-
-.bar {
-	height: 8px;
-	border-radius: var(--radius-1);
-	background: var(--l2-border);
-	animation: jsonSkeletonPulse 1.4s ease-in-out infinite;
-}
-
-@media (prefers-reduced-motion: reduce) {
-	.bar {
-		animation: none;
-	}
-}
-
-@keyframes jsonSkeletonPulse {
-	0%,
-	100% {
-		opacity: 1;
-	}
-
-	50% {
-		opacity: 0.45;
-	}
-}

frontend/src/container/LLMObservability/AttributeMapping/TestTab/JsonEditorSkeleton.tsx

@@ -1,56 +0,0 @@
-import styles from './JsonEditorSkeleton.module.scss';
-
-interface SkeletonLine {
-	indent: number;
-	barWidths: number[];
-}
-
-const SKELETON_LINES: SkeletonLine[] = [
-	{ indent: 0, barWidths: [10] },
-	{ indent: 1, barWidths: [90, 10] },
-	{ indent: 2, barWidths: [155, 190] },
-	{ indent: 2, barWidths: [135, 190] },
-	{ indent: 2, barWidths: [150, 50] },
-	{ indent: 2, barWidths: [180, 35] },
-	{ indent: 2, barWidths: [185, 200] },
-	{ indent: 1, barWidths: [14] },
-	{ indent: 1, barWidths: [75, 10] },
-	{ indent: 2, barWidths: [95, 90] },
-	{ indent: 2, barWidths: [170, 85] },
-	{ indent: 1, barWidths: [10] },
-	{ indent: 0, barWidths: [10] },
-];
-
-const INDENT_WIDTH_PX = 14;
-
-function JsonEditorSkeleton(): JSX.Element {
-	return (
-		<div
-			className={styles.skeleton}
-			data-testid="json-editor-skeleton"
-			aria-hidden="true"
-		>
-			{SKELETON_LINES.map((line, lineIndex) => (
-				// eslint-disable-next-line react/no-array-index-key
-				<div key={lineIndex} className={styles.line}>
-					<span className={styles.lineNumber}>{lineIndex + 1}</span>
-					<span
-						className={styles.lineContent}
-						style={{ paddingLeft: line.indent * INDENT_WIDTH_PX }}
-					>
-						{line.barWidths.map((width, barIndex) => (
-							<span
-								// eslint-disable-next-line react/no-array-index-key
-								key={barIndex}
-								className={styles.bar}
-								style={{ width }}
-							/>
-						))}
-					</span>
-				</div>
-			))}
-		</div>
-	);
-}
-
-export default JsonEditorSkeleton;

frontend/src/container/LLMObservability/AttributeMapping/TestTab/TestResult.tsx

@@ -1,121 +0,0 @@
-import { Badge } from '@signozhq/ui/badge';
-import { SpantypesSpanMapperTestSpanDTO } from 'api/generated/services/sigNoz.schemas';
-import { useMemo } from 'react';
-
-import {
-	AttrChangeStatus,
-	AttrDiffEntry,
-	diffAttributeMaps,
-	formatAttributeValue,
-} from './testPayload';
-import styles from './TestTab.module.scss';
-import { TestTabAttributes, TestTabResource } from './useTestSpanMapper';
-
-interface TestResultProps {
-	index: number;
-	span: SpantypesSpanMapperTestSpanDTO;
-	inputAttributes: TestTabAttributes;
-	inputResource: TestTabResource;
-}
-
-const STATUS_BADGE: Partial<
-	Record<
-		AttrChangeStatus,
-		{ color: 'success' | 'robin' | 'sienna'; label: string }
-	>
-> = {
-	added: { color: 'success', label: 'populated' },
-	changed: { color: 'robin', label: 'remapped' },
-	removed: { color: 'sienna', label: 'moved out' },
-};
-
-const ROW_CLASS: Partial<Record<AttrChangeStatus, string>> = {
-	added: styles.added,
-	removed: styles.removed,
-};
-
-interface ResultSection {
-	key: string;
-	title: string;
-	entries: AttrDiffEntry[];
-}
-
-function TestResult({
-	index,
-	span,
-	inputAttributes,
-	inputResource,
-}: TestResultProps): JSX.Element {
-	const attributeEntries = useMemo(
-		() => diffAttributeMaps(inputAttributes, span.attributes ?? {}),
-		[inputAttributes, span.attributes],
-	);
-	const resourceEntries = useMemo(
-		() => diffAttributeMaps(inputResource, span.resource ?? {}),
-		[inputResource, span.resource],
-	);
-
-	const sections: ResultSection[] = [
-		{
-			key: 'attributes',
-			title: 'Resulting attributes',
-			entries: attributeEntries,
-		},
-	];
-	if (resourceEntries.length > 0) {
-		sections.push({
-			key: 'resource',
-			title: 'Resulting resource',
-			entries: resourceEntries,
-		});
-	}
-
-	return (
-		<div className={styles.resultCard} data-testid={`test-result-${index}`}>
-			{sections.map((section) => (
-				<div
-					key={section.key}
-					className={styles.resultSection}
-					data-testid={`test-result-${index}-${section.key}`}
-				>
-					<div className={styles.resultTitle}>{section.title}</div>
-
-					{section.entries.length === 0 ? (
-						<div className={styles.resultEmpty}>No keys in this map.</div>
-					) : (
-						<div className={styles.attrRows}>
-							{section.entries.map((entry) => {
-								const badge = STATUS_BADGE[entry.status];
-								return (
-									<div
-										key={entry.key}
-										className={`${styles.attrRow} ${ROW_CLASS[entry.status] ?? ''}`}
-									>
-										<span className={styles.attrKey} title={entry.key}>
-											{entry.key}
-										</span>
-										<span
-											className={styles.attrValue}
-											title={formatAttributeValue(entry.value)}
-										>
-											{formatAttributeValue(entry.value)}
-										</span>
-										{badge ? (
-											<Badge color={badge.color} variant="outline">
-												{badge.label}
-											</Badge>
-										) : (
-											<span />
-										)}
-									</div>
-								);
-							})}
-						</div>
-					)}
-				</div>
-			))}
-		</div>
-	);
-}
-
-export default TestResult;

frontend/src/container/LLMObservability/AttributeMapping/TestTab/TestTab.module.scss

@@ -1,177 +0,0 @@
-.testTab {
-	display: flex;
-	flex-direction: column;
-	gap: var(--spacing-6);
-	margin-top: var(--spacing-6);
-}
-
-.header {
-	display: flex;
-	align-items: flex-start;
-	justify-content: space-between;
-	gap: var(--spacing-6);
-}
-
-.headerActions {
-	display: flex;
-	align-items: center;
-	gap: var(--spacing-3);
-	flex-shrink: 0;
-}
-
-.headerText {
-	display: flex;
-	flex-direction: column;
-	gap: var(--spacing-2);
-	min-width: 0;
-}
-
-.heading {
-	display: flex;
-	align-items: center;
-	gap: var(--spacing-3);
-	margin: 0;
-	font-size: var(--periscope-font-size-base);
-	font-weight: var(--font-weight-semibold);
-}
-
-.description {
-	margin: 0;
-	font-size: var(--periscope-font-size-base);
-	color: var(--l3-foreground);
-}
-
-.body {
-	display: grid;
-	grid-template-columns: 1fr 1fr;
-	gap: var(--spacing-6);
-	height: calc(100vh - 320px);
-	min-height: 320px;
-}
-
-.editor {
-	width: 100%;
-	height: 100%;
-	border: 1px solid var(--l2-border);
-	border-radius: var(--radius-2);
-	overflow: hidden;
-}
-.validationCallout {
-	width: 100%;
-}
-
-// No top padding so results align with the editor's first line, which sits
-// flush against the top of its own panel.
-.resultsPanel {
-	height: 100%;
-	overflow-y: auto;
-	padding: var(--padding-4);
-	border: 1px solid var(--l2-border);
-	border-radius: var(--radius-2);
-	background: var(--l1-background);
-}
-
-// Pre-run empty state that fills the blank right half.
-.placeholder {
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	justify-content: center;
-	gap: var(--spacing-2);
-	height: 100%;
-	text-align: center;
-	color: var(--l3-foreground);
-	font-size: var(--periscope-font-size-base);
-}
-
-.placeholderTitle {
-	font-weight: var(--font-weight-semibold);
-	color: var(--l2-foreground);
-}
-
-.error {
-	padding: var(--padding-3) var(--padding-4);
-	border-radius: var(--radius-2);
-	background: var(--callout-error-background);
-	color: var(--callout-error-title);
-	font-size: var(--periscope-font-size-base);
-}
-
-.results {
-	display: flex;
-	flex-direction: column;
-	gap: var(--spacing-6);
-}
-
-.resultCard {
-	display: flex;
-	flex-direction: column;
-	gap: var(--spacing-6);
-	border-radius: var(--radius-2);
-	background: var(--l1-background);
-}
-
-.resultSection {
-	display: flex;
-	flex-direction: column;
-	gap: var(--spacing-4);
-}
-
-.resultTitle {
-	display: flex;
-	align-items: center;
-	gap: var(--spacing-3);
-	font-size: var(--periscope-font-size-base);
-	font-weight: var(--font-weight-semibold);
-}
-
-.resultEmpty {
-	color: var(--l3-foreground);
-	font-size: var(--periscope-font-size-base);
-}
-
-.attrRows {
-	display: flex;
-	flex-direction: column;
-	gap: var(--spacing-2);
-}
-
-.attrRow {
-	display: grid;
-	grid-template-columns: clamp(200px, 40%, 340px) minmax(0, 1fr) auto;
-	align-items: center;
-	gap: var(--spacing-4);
-	padding: var(--spacing-2) var(--padding-3);
-	border-radius: var(--radius-2);
-	font-family: 'Geist Mono', monospace;
-	font-size: var(--font-size-xs);
-
-	&.added {
-		background: var(--callout-success-background);
-	}
-
-	&.removed {
-		opacity: 0.65;
-
-		.attrKey,
-		.attrValue {
-			text-decoration: line-through;
-		}
-	}
-}
-
-.attrKey,
-.attrValue {
-	min-width: 0;
-	white-space: nowrap;
-	overflow: hidden;
-	text-overflow: ellipsis;
-}
-
-.attrKey {
-	font-weight: var(--font-weight-medium);
-}
-
-.attrValue {
-	color: var(--l3-foreground);
-}

frontend/src/container/LLMObservability/AttributeMapping/TestTab/TestTab.tsx

@@ -1,162 +0,0 @@
-import MEditor from '@monaco-editor/react';
-import { Play, RotateCcw } from '@signozhq/icons';
-import { Button } from '@signozhq/ui/button';
-import { Callout } from '@signozhq/ui/callout';
-import { useIsDarkMode } from 'hooks/useDarkMode';
-
-import styles from './TestTab.module.scss';
-import JsonEditorSkeleton from './JsonEditorSkeleton';
-import TestResult from './TestResult';
-import {
-	defineSignozJsonTheme,
-	SIGNOZ_JSON_THEME_DARK,
-	SIGNOZ_JSON_THEME_LIGHT,
-} from './jsonEditorTheme';
-import { UseTestSpanMapper } from './useTestSpanMapper';
-
-interface TestTabProps {
-	spanTest: UseTestSpanMapper;
-}
-
-function TestTab({ spanTest }: TestTabProps): JSX.Element {
-	const {
-		input,
-		setInput,
-		run,
-		resetToTemplate,
-		isTemplateInput,
-		isRunning,
-		result,
-		testedAttributes,
-		testedResource,
-		error,
-		validationError,
-	} = spanTest;
-	const isDarkMode = useIsDarkMode();
-
-	function renderResults(): JSX.Element {
-		if (error) {
-			return (
-				<div className={styles.error} role="alert" data-testid="test-error">
-					{error}
-				</div>
-			);
-		}
-		if (result) {
-			if (result.length === 0) {
-				return (
-					<div className={styles.resultEmpty} data-testid="test-results-empty">
-						No spans returned. The mappers produced no output for this input.
-					</div>
-				);
-			}
-			return (
-				<div className={styles.results} data-testid="test-results">
-					{result.map((span, index) => (
-						<TestResult
-							// eslint-disable-next-line react/no-array-index-key
-							key={index}
-							index={index}
-							span={span}
-							inputAttributes={testedAttributes ?? {}}
-							inputResource={testedResource ?? {}}
-						/>
-					))}
-				</div>
-			);
-		}
-		return (
-			<div className={styles.placeholder} data-testid="test-results-placeholder">
-				<span className={styles.placeholderTitle}>No results yet</span>
-				<span>
-					Run the test to see which target attributes your mappers populate.
-				</span>
-			</div>
-		);
-	}
-
-	return (
-		<div className={styles.testTab} data-testid="test-tab">
-			<div className={styles.header}>
-				<div className={styles.headerText}>
-					<h3 className={styles.heading}>Test with sample span</h3>
-					<p className={styles.description}>
-						Paste a JSON span object to see which target attributes get populated and
-						which source key matched.
-					</p>
-				</div>
-
-				<div className={styles.headerActions}>
-					<Button
-						testId="reset-template-button"
-						variant="outlined"
-						color="secondary"
-						prefix={<RotateCcw size={14} />}
-						onClick={resetToTemplate}
-						disabled={isTemplateInput}
-					>
-						Reset to Default Span
-					</Button>
-
-					<Button
-						testId="run-test-button"
-						variant="solid"
-						color="primary"
-						prefix={<Play size={14} />}
-						onClick={run}
-						loading={isRunning}
-						disabled={isRunning || validationError !== null}
-					>
-						Run Test
-					</Button>
-				</div>
-			</div>
-
-			<div className={styles.body}>
-				<div
-					className={styles.editor}
-					data-testid="test-span-input"
-					aria-label="Sample span JSON"
-				>
-					<MEditor
-						language="json"
-						value={input}
-						onChange={(value): void => setInput(value ?? '')}
-						height="100%"
-						loading={<JsonEditorSkeleton />}
-						theme={isDarkMode ? SIGNOZ_JSON_THEME_DARK : SIGNOZ_JSON_THEME_LIGHT}
-						beforeMount={defineSignozJsonTheme}
-						options={{
-							minimap: { enabled: false },
-							fontSize: 12,
-							lineNumbers: 'on',
-							wordWrap: 'on',
-							scrollBeyondLastLine: false,
-							formatOnPaste: true,
-							tabSize: 2,
-							automaticLayout: true,
-							scrollbar: { alwaysConsumeMouseWheel: false },
-						}}
-					/>
-				</div>
-
-				<div className={styles.resultsPanel} data-testid="test-results-panel">
-					{renderResults()}
-				</div>
-			</div>
-
-			{validationError && (
-				<Callout
-					type="error"
-					size="small"
-					showIcon
-					title={validationError}
-					testId="test-input-error"
-					className={styles.validationCallout}
-				/>
-			)}
-		</div>
-	);
-}
-
-export default TestTab;

frontend/src/container/LLMObservability/AttributeMapping/TestTab/jsonEditorTheme.ts

@@ -1,38 +0,0 @@
-//TODO: This is a local theme for now, but ideally for the editor as well. Just like prettyViewer, we have a theme. We should have a theme for the editor as well.
-import { Monaco } from '@monaco-editor/react';
-import { Color } from '@signozhq/design-tokens';
-
-export const SIGNOZ_JSON_THEME_DARK = 'signoz-attr-mapping-json-dark';
-export const SIGNOZ_JSON_THEME_LIGHT = 'signoz-attr-mapping-json-light';
-
-const SHARED_THEME = {
-	inherit: true,
-	colors: {
-		'editor.background': '#00000000', // transparent — inherit the panel bg
-	},
-	fontFamily: 'SF Mono, Geist Mono, Fira Code, monospace',
-	fontSize: 12,
-	fontWeight: 'normal',
-	lineHeight: 18,
-	letterSpacing: -0.06,
-};
-
-export function defineSignozJsonTheme(monaco: Monaco): void {
-	monaco.editor.defineTheme(SIGNOZ_JSON_THEME_DARK, {
-		...SHARED_THEME,
-		base: 'vs-dark',
-		rules: [
-			{ token: 'string.key.json', foreground: Color.BG_ROBIN_400 },
-			{ token: 'string.value.json', foreground: Color.BG_VANILLA_400 },
-		],
-	});
-
-	monaco.editor.defineTheme(SIGNOZ_JSON_THEME_LIGHT, {
-		...SHARED_THEME,
-		base: 'vs',
-		rules: [
-			{ token: 'string.key.json', foreground: Color.BG_ROBIN_500 },
-			{ token: 'string.value.json', foreground: Color.BG_INK_400 },
-		],
-	});
-}

frontend/src/container/LLMObservability/AttributeMapping/TestTab/spanInputStorage.ts

@@ -1,53 +0,0 @@
-import get from 'api/browser/localstorage/get';
-import remove from 'api/browser/localstorage/remove';
-import set from 'api/browser/localstorage/set';
-import { LOCALSTORAGE } from 'constants/localStorage';
-
-import { parseSpanInput } from './testPayload';
-
-export const SAMPLE_SPAN_JSON = `{
-  "attributes": {
-    "my_company.llm.input": "What is quantum computing?",
-    "llm.input_messages": "What is quantum computing?",
-    "gen_ai.request.model": "gpt-4",
-    "gen_ai.usage.total_tokens": 1250,
-    "gen_ai.content.completion": "Quantum computing leverages..."
-  },
-  "resource": {
-    "service.name": "llm-gateway",
-    "deployment.environment": "production"
-  }
-}`;
-
-function hasNoSpanData(input: string): boolean {
-	let span;
-	try {
-		span = parseSpanInput(input);
-	} catch {
-		return false;
-	}
-	return (
-		Object.keys(span.attributes ?? {}).length === 0 &&
-		Object.keys(span.resource ?? {}).length === 0
-	);
-}
-
-export function getStoredSpanInput(): string {
-	const stored = get(LOCALSTORAGE.LLM_ATTRIBUTE_MAPPING_TEST_SPAN);
-	if (!stored?.trim() || hasNoSpanData(stored)) {
-		return SAMPLE_SPAN_JSON;
-	}
-	return stored;
-}
-
-export function setStoredSpanInput(value: string): void {
-	if (!value.trim() || hasNoSpanData(value)) {
-		remove(LOCALSTORAGE.LLM_ATTRIBUTE_MAPPING_TEST_SPAN);
-		return;
-	}
-	set(LOCALSTORAGE.LLM_ATTRIBUTE_MAPPING_TEST_SPAN, value);
-}
-
-export function clearStoredSpanInput(): void {
-	remove(LOCALSTORAGE.LLM_ATTRIBUTE_MAPPING_TEST_SPAN);
-}

frontend/src/container/LLMObservability/AttributeMapping/TestTab/testPayload.ts

@@ -1,145 +0,0 @@
-import {
-	SpantypesPostableSpanMapperTestDTO,
-	SpantypesPostableSpanMapperTestGroupDTO,
-	SpantypesSpanMapperTestSpanDTO,
-} from 'api/generated/services/sigNoz.schemas';
-import { isEqual } from 'lodash-es';
-
-import { DraftGroup } from '../types';
-import {
-	buildPostableGroup,
-	buildPostableMapper,
-	groupDraftFromNode,
-	mapperDraftFromNode,
-} from '../utils';
-
-function shouldSendMappers(
-	snap: DraftGroup | undefined,
-	group: DraftGroup,
-): boolean {
-	if (!snap) {
-		return true;
-	}
-	return !isEqual(snap.mappers, group.mappers);
-}
-
-export function buildTestGroups(
-	snapshot: DraftGroup[],
-	draft: DraftGroup[],
-): SpantypesPostableSpanMapperTestGroupDTO[] {
-	const snapById = new Map(
-		snapshot
-			.filter((group) => group.serverId)
-			.map((group) => [group.serverId as string, group]),
-	);
-
-	return draft.map((group) => {
-		const base = buildPostableGroup(groupDraftFromNode(group));
-		const snap = group.serverId ? snapById.get(group.serverId) : undefined;
-		return {
-			...base,
-			mappers: shouldSendMappers(snap, group)
-				? group.mappers.map((mapper) =>
-						buildPostableMapper(mapperDraftFromNode(mapper)),
-					)
-				: null,
-		};
-	});
-}
-
-function isPlainObject(value: unknown): value is Record<string, unknown> {
-	return value !== null && typeof value === 'object' && !Array.isArray(value);
-}
-
-function isSpanEnvelope(parsed: Record<string, unknown>): boolean {
-	const keys = Object.keys(parsed);
-	return (
-		keys.length > 0 &&
-		keys.every((key) => key === 'attributes' || key === 'resource') &&
-		(isPlainObject(parsed.attributes) || isPlainObject(parsed.resource))
-	);
-}
-
-export function parseSpanInput(input: string): SpantypesSpanMapperTestSpanDTO {
-	const trimmed = input.trim();
-	if (!trimmed) {
-		throw new Error('Paste a JSON span object to run the test.');
-	}
-
-	let parsed: unknown;
-	try {
-		parsed = JSON.parse(trimmed);
-	} catch {
-		throw new Error(
-			'Invalid JSON — check for trailing commas or missing quotes.',
-		);
-	}
-
-	if (!isPlainObject(parsed)) {
-		throw new Error('Span must be a JSON object of attribute key-value pairs.');
-	}
-
-	if (isSpanEnvelope(parsed)) {
-		return {
-			attributes: isPlainObject(parsed.attributes) ? parsed.attributes : {},
-			resource: isPlainObject(parsed.resource) ? parsed.resource : {},
-		};
-	}
-
-	return { attributes: parsed, resource: {} };
-}
-
-export function buildTestRequest(
-	snapshot: DraftGroup[],
-	draft: DraftGroup[],
-	input: string,
-): SpantypesPostableSpanMapperTestDTO {
-	return {
-		groups: buildTestGroups(snapshot, draft),
-		spans: [parseSpanInput(input)],
-	};
-}
-
-export type AttrChangeStatus = 'added' | 'changed' | 'unchanged' | 'removed';
-
-export interface AttrDiffEntry {
-	key: string;
-	value: unknown;
-	status: AttrChangeStatus;
-}
-
-// Renders a diff value for display: strings as-is, everything else JSON-encoded.
-export function formatAttributeValue(value: unknown): string {
-	if (typeof value === 'string') {
-		return value;
-	}
-	return JSON.stringify(value);
-}
-
-export function diffAttributeMaps(
-	inputAttributes: Record<string, unknown>,
-	resultAttributes: Record<string, unknown>,
-): AttrDiffEntry[] {
-	const added: AttrDiffEntry[] = [];
-	const changed: AttrDiffEntry[] = [];
-	const unchanged: AttrDiffEntry[] = [];
-	const removed: AttrDiffEntry[] = [];
-
-	Object.entries(resultAttributes).forEach(([key, value]) => {
-		if (!(key in inputAttributes)) {
-			added.push({ key, value, status: 'added' });
-		} else if (!isEqual(inputAttributes[key], value)) {
-			changed.push({ key, value, status: 'changed' });
-		} else {
-			unchanged.push({ key, value, status: 'unchanged' });
-		}
-	});
-
-	Object.entries(inputAttributes).forEach(([key, value]) => {
-		if (!(key in resultAttributes)) {
-			removed.push({ key, value, status: 'removed' });
-		}
-	});
-
-	return [...added, ...changed, ...unchanged, ...removed];
-}

frontend/src/container/LLMObservability/AttributeMapping/TestTab/useTestSpanMapper.ts

@@ -1,155 +0,0 @@
-import { useCallback, useEffect, useMemo, useState } from 'react';
-import {
-	RenderErrorResponseDTO,
-	SpantypesSpanMapperTestSpanDTO,
-} from 'api/generated/services/sigNoz.schemas';
-import { useTestSpanMappers } from 'api/generated/services/spanmapper';
-import { AxiosError } from 'axios';
-import { debounce } from 'lodash-es';
-
-import { buildTestRequest, parseSpanInput } from './testPayload';
-import {
-	clearStoredSpanInput,
-	getStoredSpanInput,
-	SAMPLE_SPAN_JSON,
-	setStoredSpanInput,
-} from './spanInputStorage';
-import { DraftGroup } from '../types';
-
-export type TestTabAttributes = Record<string, unknown>;
-export type TestTabResource = Record<string, unknown>;
-
-const PERSIST_DEBOUNCE_MS = 500;
-
-function apiErrorMessage(error: unknown): string {
-	const axiosError = error as AxiosError<RenderErrorResponseDTO>;
-	return (
-		axiosError?.response?.data?.error?.message ??
-		(error instanceof Error ? error.message : 'Test failed. Please try again.')
-	);
-}
-
-export interface UseTestSpanMapper {
-	input: string;
-	setInput: (value: string) => void;
-	run: () => void;
-	reset: () => void;
-	resetToTemplate: () => void;
-	isTemplateInput: boolean;
-	isRunning: boolean;
-	validationError: string | null;
-	result: SpantypesSpanMapperTestSpanDTO[] | null;
-	testedAttributes: TestTabAttributes | null;
-	testedResource: TestTabResource | null;
-	error: string | null;
-}
-
-export function useTestSpanMapper(
-	snapshot: DraftGroup[],
-	draft: DraftGroup[],
-): UseTestSpanMapper {
-	const [input, setInputValue] = useState<string>(getStoredSpanInput);
-	const [error, setError] = useState<string | null>(null);
-	const [result, setResult] = useState<SpantypesSpanMapperTestSpanDTO[] | null>(
-		null,
-	);
-	const [testedAttributes, setTestedAttributes] =
-		useState<TestTabAttributes | null>(null);
-	const [testedResource, setTestedResource] = useState<TestTabResource | null>(
-		null,
-	);
-
-	const { mutate, isLoading } = useTestSpanMappers();
-
-	const persistInput = useMemo(
-		() => debounce(setStoredSpanInput, PERSIST_DEBOUNCE_MS),
-		[],
-	);
-
-	useEffect(
-		() => (): void => {
-			persistInput.flush();
-		},
-		[persistInput],
-	);
-
-	const setInput = useCallback(
-		(value: string): void => {
-			setInputValue(value);
-			persistInput(value);
-		},
-		[persistInput],
-	);
-
-	const validationError = useMemo((): string | null => {
-		try {
-			parseSpanInput(input);
-			return null;
-		} catch (err) {
-			return err instanceof Error ? err.message : 'Invalid span JSON.';
-		}
-	}, [input]);
-
-	const reset = useCallback((): void => {
-		setError(null);
-		setResult(null);
-		setTestedAttributes(null);
-		setTestedResource(null);
-	}, []);
-
-	const resetToTemplate = useCallback((): void => {
-		persistInput.cancel();
-		clearStoredSpanInput();
-		setInputValue(SAMPLE_SPAN_JSON);
-		reset();
-	}, [persistInput, reset]);
-
-	const isTemplateInput = input.trim() === SAMPLE_SPAN_JSON;
-
-	const run = useCallback((): void => {
-		reset();
-
-		let body;
-		try {
-			body = buildTestRequest(snapshot, draft, input);
-		} catch (parseError) {
-			setError(apiErrorMessage(parseError));
-			return;
-		}
-
-		const submittedSpan = body.spans?.[0];
-		const submittedAttributes = (submittedSpan?.attributes ??
-			{}) as TestTabAttributes;
-		const submittedResource = (submittedSpan?.resource ?? {}) as TestTabResource;
-
-		mutate(
-			{ data: body },
-			{
-				onSuccess: (response) => {
-					setTestedAttributes(submittedAttributes);
-					setTestedResource(submittedResource);
-					setResult(response.data?.spans ?? []);
-				},
-				onError: (mutationError) => {
-					setResult(null);
-					setError(apiErrorMessage(mutationError));
-				},
-			},
-		);
-	}, [snapshot, draft, input, mutate, reset]);
-
-	return {
-		input,
-		setInput,
-		run,
-		reset,
-		resetToTemplate,
-		isTemplateInput,
-		isRunning: isLoading,
-		validationError,
-		result,
-		testedAttributes,
-		testedResource,
-		error,
-	};
-}

frontend/src/container/LLMObservability/AttributeMapping/__tests__/LLMObservabilityAttributeMapping.test.tsx

@@ -1,32 +1,6 @@
 import { rest, server } from 'mocks-server/server';
-import { useAuthZ } from 'lib/authz/hooks/useAuthZ/useAuthZ';
-import { mockUseAuthZGrantAll } from 'lib/authz/utils/authz-test-utils';
 import { render, screen, userEvent, waitFor } from 'tests/test-utils';
 
-// The header's Save/Discard and the group toggle are Admin-gated via useAuthZ;
-// render as an admin so those controls are present.
-jest.mock('lib/authz/hooks/useAuthZ/useAuthZ');
-const mockedUseAuthZ = useAuthZ as jest.MockedFunction<typeof useAuthZ>;
-
-// Monaco can't run in jsdom — stand in a textarea so the span input is editable.
-jest.mock('@monaco-editor/react', () => ({
-	__esModule: true,
-	default: ({
-		value,
-		onChange,
-	}: {
-		value: string;
-		onChange: (next?: string) => void;
-	}): JSX.Element => (
-		<textarea
-			aria-label="span-json-editor"
-			data-testid="span-json-editor"
-			value={value}
-			onChange={(event): void => onChange(event.target.value)}
-		/>
-	),
-}));
-
 import LLMObservabilityAttributeMapping from '../LLMObservabilityAttributeMapping';
 import { GROUPS_ENDPOINT, makeGroupsResponse, mockGroups } from './fixtures';
 
@@ -42,7 +16,6 @@ describe('LLMObservabilityAttributeMapping', () => {
 	beforeEach(() => {
 		window.history.pushState(null, '', '/');
 		setupGroups();
-		mockedUseAuthZ.mockImplementation(mockUseAuthZGrantAll);
 	});
 
 	afterEach(() => {
@@ -113,26 +86,6 @@ describe('LLMObservabilityAttributeMapping', () => {
 		expect(screen.queryByTestId('discard-changes-btn')).not.toBeInTheDocument();
 	});
 
-	it('keeps the sample span input when switching away from the test tab and back', async () => {
-		const user = userEvent.setup({ pointerEventsCheck: 0 });
-		render(<LLMObservabilityAttributeMapping />);
-
-		await user.click(screen.getByRole('tab', { name: 'Test' }));
-		const editor = await screen.findByTestId('span-json-editor');
-		await user.clear(editor);
-		await user.type(editor, '{{ "my.attr": 1 }');
-
-		await user.click(screen.getByRole('tab', { name: 'Attribute Mappings' }));
-		await screen.findByTestId('attribute-mappings-tab');
-		expect(screen.queryByTestId('span-json-editor')).not.toBeInTheDocument();
-
-		await user.click(screen.getByRole('tab', { name: 'Test' }));
-
-		await expect(screen.findByTestId('span-json-editor')).resolves.toHaveValue(
-			'{ "my.attr": 1 }',
-		);
-	});
-
 	it('keeps staged changes when the discard prompt is dismissed', async () => {
 		const user = userEvent.setup({ pointerEventsCheck: 0 });
 		render(<LLMObservabilityAttributeMapping />);

frontend/src/container/LLMObservability/AttributeMapping/components/AttributeMappingHeader/AttributeMappingHeader.tsx

@@ -1,7 +1,6 @@
 import { Button } from '@signozhq/ui/button';
 import { Typography } from '@signozhq/ui/typography';
 
-import { useCanManageAttributeMapping } from '../../hooks/useCanManageAttributeMapping';
 import styles from './AttributeMappingHeader.module.scss';
 
 interface AttributeMappingHeaderProps {
@@ -17,13 +16,12 @@ function AttributeMappingHeader({
 	onDiscard,
 	onSave,
 }: AttributeMappingHeaderProps): JSX.Element {
-	const canManage = useCanManageAttributeMapping();
 	return (
 		<header className={styles.pageHeader}>
 			<Typography.Text as="p" size="base" color="muted">
 				Configure source-to-target attribute remapping for LLM traces
 			</Typography.Text>
-			{canManage && isDirty && (
+			{isDirty && (
 				<div className={styles.pageHeaderActions}>
 					<span className={styles.unsavedChanges} data-testid="unsaved-changes">
 						Unsaved changes

frontend/src/container/LLMObservability/AttributeMapping/hooks/useAttributeMappingEditor.ts

@@ -35,7 +35,6 @@ function clone(groups: DraftGroup[]): DraftGroup[] {
 
 export interface AttributeMappingEditor {
 	groups: DraftGroup[];
-	snapshot: DraftGroup[];
 	isLoading: boolean;
 	isError: boolean;
 	isDirty: boolean;
@@ -305,7 +304,6 @@ export function useAttributeMappingEditor(): AttributeMappingEditor {
 
 	return {
 		groups: draft ?? [],
-		snapshot,
 		isLoading: !ready || draft === null,
 		isError: groupsQuery.isError,
 		isDirty,

frontend/src/container/LLMObservability/AttributeMapping/hooks/useCanManageAttributeMapping.ts

@@ -1,9 +0,0 @@
-import { IsAdminPermission } from 'lib/authz/hooks/useAuthZ/legacy';
-import { useAuthZ } from 'lib/authz/hooks/useAuthZ/useAuthZ';
-
-const ADMIN_PERMISSION = [IsAdminPermission];
-
-export function useCanManageAttributeMapping(): boolean {
-	const { allowed } = useAuthZ(ADMIN_PERMISSION);
-	return allowed;
-}

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

@@ -756,14 +756,10 @@ function QueryBuilderSearchV2(
 
 			let operatorOptions;
 			if (currentFilterItem?.key?.dataType) {
-				// Fallback to universal suggestions if no match found for currentFilter dataType
-				const operatorsForDataType =
-					QUERY_BUILDER_OPERATORS_BY_TYPES[
-						currentFilterItem.key
-							.dataType as keyof typeof QUERY_BUILDER_OPERATORS_BY_TYPES
-					] ?? QUERY_BUILDER_OPERATORS_BY_TYPES.universal;
-
-				operatorOptions = operatorsForDataType.map((operator) => ({
+				operatorOptions = QUERY_BUILDER_OPERATORS_BY_TYPES[
+					currentFilterItem.key
+						.dataType as keyof typeof QUERY_BUILDER_OPERATORS_BY_TYPES
+				].map((operator) => ({
 					label: operator,
 					value: operator,
 				}));

frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/__test__/QueryBuilderSearchV2.test.tsx

@@ -1,6 +1,11 @@
 import { QueryClient, QueryClientProvider } from 'react-query';
-import { render, RenderResult, screen, within } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+import {
+	act,
+	fireEvent,
+	render,
+	RenderResult,
+	screen,
+} from '@testing-library/react';
 import {
 	initialQueriesMap,
 	initialQueryBuilderFormValues,
@@ -86,9 +91,6 @@ const renderWithContext = (props = {}): RenderResult => {
 	);
 };
 
-const getSearchCombobox = (): HTMLElement =>
-	within(screen.getByTestId('qb-search-select')).getByRole('combobox');
-
 // Constants to fix linter errors
 const TYPE_TAG = 'tag';
 const IS_COLUMN_FALSE = false;
@@ -111,14 +113,6 @@ const mockAggregateKeysData = {
 				isJSON: IS_JSON_FALSE,
 				id: 'service.name--string--tag--false',
 			},
-			{
-				key: 'unmapped.attribute',
-				dataType: 'not-a-real-data-type' as unknown as DataTypes,
-				type: TYPE_TAG,
-				isColumn: IS_COLUMN_FALSE,
-				isJSON: IS_JSON_FALSE,
-				id: 'unmapped.attribute--String--tag--false',
-			},
 		],
 	},
 };
@@ -171,28 +165,41 @@ jest.mock('hooks/dashboard/useDashboardVariables', () => ({
 }));
 
 describe('Suggestion Key -> Operator -> Value Flow', () => {
+	beforeEach(() => {
+		jest.clearAllMocks();
+	});
 	it('should complete full flow from key selection to value', async () => {
-		const user = userEvent.setup({ delay: null });
-		renderWithContext();
+		const { container } = renderWithContext();
 
-		const combobox = getSearchCombobox();
+		// Get the combobox input specifically
+		const combobox = container.querySelector(
+			'.query-builder-search-v2 .ant-select-selection-search-input',
+		) as HTMLInputElement;
 
 		// 1. Focus and type to trigger key suggestions
-		await user.click(combobox);
-		await user.type(combobox, 'http.');
+		await act(async () => {
+			fireEvent.focus(combobox);
+			fireEvent.change(combobox, { target: { value: 'http.' } });
+		});
 
 		// Wait for dropdown to appear
 		await screen.findByRole('listbox');
 
 		// 2. Select a key from suggestions
-		await user.click(await screen.findByText('http.status'));
+		const statusOption = await screen.findByText('http.status');
+		await act(async () => {
+			fireEvent.click(statusOption);
+		});
 
 		// Should show operator suggestions
 		expect(screen.getByText('=')).toBeInTheDocument();
 		expect(screen.getByText('!=')).toBeInTheDocument();
 
 		// 3. Select an operator
-		await user.click(screen.getByText('='));
+		const equalsOption = screen.getByText('=');
+		await act(async () => {
+			fireEvent.click(equalsOption);
+		});
 
 		// Should show value suggestions
 		expect(screen.getByText('200')).toBeInTheDocument();
@@ -200,7 +207,10 @@ describe('Suggestion Key -> Operator -> Value Flow', () => {
 		expect(screen.getByText('500')).toBeInTheDocument();
 
 		// 4. Select a value
-		await user.click(screen.getByText('200'));
+		const valueOption = screen.getByText('200');
+		await act(async () => {
+			fireEvent.click(valueOption);
+		});
 
 		// Verify final filter
 		expect(mockOnChange).toHaveBeenCalledWith(
@@ -217,52 +227,39 @@ describe('Suggestion Key -> Operator -> Value Flow', () => {
 	});
 });
 
-describe('Operator suggestions for data types missing from the operators map', () => {
-	it('should fall back to universal operators for a non-canonical data type', async () => {
-		const user = userEvent.setup({ delay: null });
-		renderWithContext();
-
-		const combobox = getSearchCombobox();
-
-		await user.click(combobox);
-		await user.type(combobox, 'unmapped.');
-
-		await screen.findByRole('listbox');
-
-		await user.click(await screen.findByText('unmapped.attribute'));
-
-		expect(screen.getByText('=')).toBeInTheDocument();
-		expect(screen.getByText('!=')).toBeInTheDocument();
-		expect(screen.getByText('>')).toBeInTheDocument();
-		expect(screen.getByText('<')).toBeInTheDocument();
-
-		expect(screen.queryByText('REGEX')).not.toBeInTheDocument();
-
-		await user.click(screen.getByText('='));
-
-		expect(combobox).toHaveDisplayValue(/unmapped\.attribute =/);
-	});
-});
-
 describe('Dynamic Variable Suggestions', () => {
-	it('should suggest dynamic variable when key matches a variable attribute', async () => {
-		const user = userEvent.setup({ delay: null });
-		renderWithContext();
+	beforeEach(() => {
+		jest.clearAllMocks();
+	});
 
-		const combobox = getSearchCombobox();
+	it('should suggest dynamic variable when key matches a variable attribute', async () => {
+		const { container } = renderWithContext();
+
+		// Get the combobox input
+		const combobox = container.querySelector(
+			'.query-builder-search-v2 .ant-select-selection-search-input',
+		) as HTMLInputElement;
 
 		// Focus and type to trigger key suggestions for service.name
-		await user.click(combobox);
-		await user.type(combobox, 'service.');
+		await act(async () => {
+			fireEvent.focus(combobox);
+			fireEvent.change(combobox, { target: { value: 'service.' } });
+		});
 
 		// Wait for dropdown to appear
 		await screen.findByRole('listbox');
 
 		// Select service.name key from suggestions
-		await user.click(await screen.findByText('service.name'));
+		const serviceNameOption = await screen.findByText('service.name');
+		await act(async () => {
+			fireEvent.click(serviceNameOption);
+		});
 
 		// Select equals operator
-		await user.click(screen.getByText('='));
+		await act(async () => {
+			const equalsOption = screen.getByText('=');
+			fireEvent.click(equalsOption);
+		});
 
 		// Should show value suggestions including the dynamic variable
 		// For 'service.name', we expect to see '$service' as the first suggestion
@@ -274,7 +271,9 @@ describe('Dynamic Variable Suggestions', () => {
 		expect(screen.getByText('404')).toBeInTheDocument();
 
 		// Select the variable suggestion
-		await user.click(variableSuggestion);
+		await act(async () => {
+			fireEvent.click(variableSuggestion);
+		});
 
 		// Verify the query was updated with the variable as value
 		expect(mockOnChange).toHaveBeenCalledWith(

frontend/src/container/RolesSettings/CreateEditRolePage/__tests__/JsonEditor.test.tsx

@@ -151,9 +151,7 @@ describe('JsonEditor', () => {
 			);
 			await user.click(await within(readToggle).findByText('Only selected'));
 
-			const input = screen.getByTestId(
-				'item-input-selector-input-factor-api-key-read',
-			);
+			const input = screen.getByTestId('item-input-selector-input');
 			await user.type(input, 'test-key-123{enter}');
 
 			await switchToJsonMode();

frontend/src/container/RolesSettings/CreateEditRolePage/__tests__/PermissionEditor.test.tsx

@@ -1,10 +1,17 @@
+import { Route, Switch } from 'react-router-dom';
+import ROUTES from 'constants/routes';
 import { server } from 'mocks-server/server';
-import { screen, userEvent, waitFor, within } from 'tests/test-utils';
+import { render, screen, userEvent, waitFor, within } from 'tests/test-utils';
 import { setupAuthzAdmin } from 'lib/authz/utils/authz-test-utils';
+import { TooltipProvider } from '@signozhq/ui/tooltip';
 
-import { expandResourceCard, renderCreateRolePage } from './testUtils';
+import CreateEditRolePage from '../CreateEditRolePage';
 
-jest.setTimeout(15_000);
+async function expandAllCards(): Promise<void> {
+	const user = userEvent.setup();
+	const expandButton = await screen.findByTestId('expand-all-button');
+	await user.click(expandButton);
+}
 
 beforeEach(() => {
 	server.use(setupAuthzAdmin());
@@ -14,16 +21,35 @@ afterEach(() => {
 	server.resetHandlers();
 });
 
+async function renderPage(): Promise<ReturnType<typeof render>> {
+	const result = render(
+		<TooltipProvider>
+			<Switch>
+				<Route path={ROUTES.ROLES_SETTINGS} exact>
+					<div data-testid="roles-list-redirect" />
+				</Route>
+				<Route path={ROUTES.ROLE_CREATE}>
+					<CreateEditRolePage />
+				</Route>
+			</Switch>
+		</TooltipProvider>,
+		undefined,
+		{ initialRoute: '/settings/roles/new' },
+	);
+	await screen.findByTestId('permission-editor');
+	return result;
+}
+
 describe('PermissionEditor', () => {
 	describe('mode toggle', () => {
 		it('renders permission editor with testId', async () => {
-			await renderCreateRolePage();
+			await renderPage();
 
 			expect(screen.getByTestId('permission-editor')).toBeInTheDocument();
 		});
 
 		it('defaults to interactive mode', async () => {
-			await renderCreateRolePage();
+			await renderPage();
 
 			const interactiveRadio = screen.getByTestId(
 				'permission-editor-mode-interactive',
@@ -33,7 +59,7 @@ describe('PermissionEditor', () => {
 
 		it('switches to JSON mode when clicked', async () => {
 			const user = userEvent.setup();
-			await renderCreateRolePage();
+			await renderPage();
 
 			const jsonRadio = screen.getByTestId('permission-editor-mode-json');
 			await user.click(jsonRadio);
@@ -44,7 +70,7 @@ describe('PermissionEditor', () => {
 
 		it('switches back to interactive mode', async () => {
 			const user = userEvent.setup();
-			await renderCreateRolePage();
+			await renderPage();
 
 			const jsonRadio = screen.getByTestId('permission-editor-mode-json');
 			await user.click(jsonRadio);
@@ -61,7 +87,7 @@ describe('PermissionEditor', () => {
 
 	describe('resource cards', () => {
 		it('renders all resource cards', async () => {
-			await renderCreateRolePage();
+			await renderPage();
 
 			expect(
 				screen.getByTestId('resource-card-factor-api-key'),
@@ -73,7 +99,7 @@ describe('PermissionEditor', () => {
 		});
 
 		it('resource cards are collapsed by default', async () => {
-			await renderCreateRolePage();
+			await renderPage();
 
 			const apiKeyCard = screen.getByTestId('resource-card-factor-api-key');
 			const header = within(apiKeyCard).getByTestId(
@@ -85,7 +111,7 @@ describe('PermissionEditor', () => {
 
 		it('expands resource card when header clicked', async () => {
 			const user = userEvent.setup();
-			await renderCreateRolePage();
+			await renderPage();
 
 			const apiKeyCard = screen.getByTestId('resource-card-factor-api-key');
 			const header = within(apiKeyCard).getByTestId(
@@ -99,7 +125,7 @@ describe('PermissionEditor', () => {
 
 		it('collapses expanded resource card when header clicked again', async () => {
 			const user = userEvent.setup();
-			await renderCreateRolePage();
+			await renderPage();
 
 			const apiKeyCard = screen.getByTestId('resource-card-factor-api-key');
 			const header = within(apiKeyCard).getByTestId(
@@ -113,7 +139,7 @@ describe('PermissionEditor', () => {
 		});
 
 		it('shows granted count in resource card header', async () => {
-			await renderCreateRolePage();
+			await renderPage();
 
 			const apiKeyCard = screen.getByTestId('resource-card-factor-api-key');
 			await expect(
@@ -124,8 +150,8 @@ describe('PermissionEditor', () => {
 
 	describe('action toggles', () => {
 		it('renders action toggles for each available action', async () => {
-			await renderCreateRolePage();
-			await expandResourceCard('factor-api-key');
+			await renderPage();
+			await expandAllCards();
 
 			const apiKeyCard = screen.getByTestId('resource-card-factor-api-key');
 			expect(
@@ -143,8 +169,8 @@ describe('PermissionEditor', () => {
 		});
 
 		it('defaults all actions to None scope', async () => {
-			await renderCreateRolePage();
-			await expandResourceCard('factor-api-key');
+			await renderPage();
+			await expandAllCards();
 
 			const apiKeyCard = screen.getByTestId('resource-card-factor-api-key');
 			const createToggle = within(apiKeyCard).getByTestId(
@@ -161,8 +187,8 @@ describe('PermissionEditor', () => {
 
 		it('changes scope to All when clicked', async () => {
 			const user = userEvent.setup();
-			await renderCreateRolePage();
-			await expandResourceCard('factor-api-key');
+			await renderPage();
+			await expandAllCards();
 
 			const apiKeyCard = screen.getByTestId('resource-card-factor-api-key');
 			const createToggle = within(apiKeyCard).getByTestId(
@@ -182,8 +208,8 @@ describe('PermissionEditor', () => {
 
 		it('updates granted count when scope changed', async () => {
 			const user = userEvent.setup();
-			await renderCreateRolePage();
-			await expandResourceCard('factor-api-key');
+			await renderPage();
+			await expandAllCards();
 
 			const apiKeyCard = screen.getByTestId('resource-card-factor-api-key');
 			const createToggle = within(apiKeyCard).getByTestId(
@@ -201,8 +227,8 @@ describe('PermissionEditor', () => {
 	describe('Only Selected scope', () => {
 		it('shows item input selector when Only Selected is chosen', async () => {
 			const user = userEvent.setup();
-			await renderCreateRolePage();
-			await expandResourceCard('factor-api-key');
+			await renderPage();
+			await expandAllCards();
 
 			const apiKeyCard = screen.getByTestId('resource-card-factor-api-key');
 			const createToggle = within(apiKeyCard).getByTestId(
@@ -213,15 +239,13 @@ describe('PermissionEditor', () => {
 				await within(createToggle).findByText('Only selected');
 			await user.click(onlySelectedBtn);
 
-			expect(
-				screen.getByTestId('item-input-selector-factor-api-key-read'),
-			).toBeInTheDocument();
+			expect(screen.getByTestId('item-input-selector')).toBeInTheDocument();
 		});
 
 		it('adds item when typed and Enter pressed', async () => {
 			const user = userEvent.setup();
-			await renderCreateRolePage();
-			await expandResourceCard('factor-api-key');
+			await renderPage();
+			await expandAllCards();
 
 			const apiKeyCard = screen.getByTestId('resource-card-factor-api-key');
 			const createToggle = within(apiKeyCard).getByTestId(
@@ -230,9 +254,7 @@ describe('PermissionEditor', () => {
 
 			await user.click(await within(createToggle).findByText('Only selected'));
 
-			const input = screen.getByTestId(
-				'item-input-selector-input-factor-api-key-read',
-			);
+			const input = screen.getByTestId('item-input-selector-input');
 			await user.type(input, 'api-key-001{enter}');
 
 			await expect(screen.findByText('api-key-001')).resolves.toBeInTheDocument();
@@ -240,8 +262,8 @@ describe('PermissionEditor', () => {
 
 		it('adds item when Add button clicked', async () => {
 			const user = userEvent.setup();
-			await renderCreateRolePage();
-			await expandResourceCard('factor-api-key');
+			await renderPage();
+			await expandAllCards();
 
 			const apiKeyCard = screen.getByTestId('resource-card-factor-api-key');
 			const createToggle = within(apiKeyCard).getByTestId(
@@ -250,14 +272,10 @@ describe('PermissionEditor', () => {
 
 			await user.click(await within(createToggle).findByText('Only selected'));
 
-			const input = screen.getByTestId(
-				'item-input-selector-input-factor-api-key-read',
-			);
+			const input = screen.getByTestId('item-input-selector-input');
 			await user.type(input, 'api-key-002');
 
-			const addBtn = screen.getByTestId(
-				'item-input-selector-add-btn-factor-api-key-read',
-			);
+			const addBtn = screen.getByTestId('item-input-selector-add-btn');
 			await user.click(addBtn);
 
 			await expect(screen.findByText('api-key-002')).resolves.toBeInTheDocument();
@@ -265,8 +283,8 @@ describe('PermissionEditor', () => {
 
 		it('adds multiple items separated by comma', async () => {
 			const user = userEvent.setup();
-			await renderCreateRolePage();
-			await expandResourceCard('factor-api-key');
+			await renderPage();
+			await expandAllCards();
 
 			const apiKeyCard = screen.getByTestId('resource-card-factor-api-key');
 			const createToggle = within(apiKeyCard).getByTestId(
@@ -275,9 +293,7 @@ describe('PermissionEditor', () => {
 
 			await user.click(await within(createToggle).findByText('Only selected'));
 
-			const input = screen.getByTestId(
-				'item-input-selector-input-factor-api-key-read',
-			);
+			const input = screen.getByTestId('item-input-selector-input');
 			await user.type(input, 'key-a, key-b, key-c{enter}');
 
 			await expect(screen.findByText('key-a')).resolves.toBeInTheDocument();
@@ -287,8 +303,8 @@ describe('PermissionEditor', () => {
 
 		it('adds multiple items separated by space', async () => {
 			const user = userEvent.setup();
-			await renderCreateRolePage();
-			await expandResourceCard('factor-api-key');
+			await renderPage();
+			await expandAllCards();
 
 			const apiKeyCard = screen.getByTestId('resource-card-factor-api-key');
 			const createToggle = within(apiKeyCard).getByTestId(
@@ -297,9 +313,7 @@ describe('PermissionEditor', () => {
 
 			await user.click(await within(createToggle).findByText('Only selected'));
 
-			const input = screen.getByTestId(
-				'item-input-selector-input-factor-api-key-read',
-			);
+			const input = screen.getByTestId('item-input-selector-input');
 			await user.type(input, 'key-x key-y key-z{enter}');
 
 			await expect(screen.findByText('key-x')).resolves.toBeInTheDocument();
@@ -309,8 +323,8 @@ describe('PermissionEditor', () => {
 
 		it('does not add duplicate items', async () => {
 			const user = userEvent.setup();
-			await renderCreateRolePage();
-			await expandResourceCard('factor-api-key');
+			await renderPage();
+			await expandAllCards();
 
 			const apiKeyCard = screen.getByTestId('resource-card-factor-api-key');
 			const createToggle = within(apiKeyCard).getByTestId(
@@ -319,9 +333,7 @@ describe('PermissionEditor', () => {
 
 			await user.click(await within(createToggle).findByText('Only selected'));
 
-			const input = screen.getByTestId(
-				'item-input-selector-input-factor-api-key-read',
-			);
+			const input = screen.getByTestId('item-input-selector-input');
 			await user.type(input, 'same-key{enter}');
 			await user.type(input, 'same-key{enter}');
 
@@ -331,8 +343,8 @@ describe('PermissionEditor', () => {
 
 		it('removes item when X clicked', async () => {
 			const user = userEvent.setup();
-			await renderCreateRolePage();
-			await expandResourceCard('factor-api-key');
+			await renderPage();
+			await expandAllCards();
 
 			const apiKeyCard = screen.getByTestId('resource-card-factor-api-key');
 			const createToggle = within(apiKeyCard).getByTestId(
@@ -341,139 +353,21 @@ describe('PermissionEditor', () => {
 
 			await user.click(await within(createToggle).findByText('Only selected'));
 
-			const input = screen.getByTestId(
-				'item-input-selector-input-factor-api-key-read',
-			);
+			const input = screen.getByTestId('item-input-selector-input');
 			await user.type(input, 'removable-key{enter}');
 
-			const badge = await screen.findByTestId('item-badge-factor-api-key-read-0');
-			const removeBtn = within(badge).getByRole('button', {
-				name: 'Remove removable-key',
+			const removeBtn = screen.getByRole('button', {
+				name: /remove removable-key/i,
 			});
 			await user.click(removeBtn);
 
 			expect(screen.queryByText('removable-key')).not.toBeInTheDocument();
 		});
 
-		it('names each badge close button after the item it removes', async () => {
-			const user = userEvent.setup();
-			await renderCreateRolePage();
-			await expandResourceCard('factor-api-key');
-
-			const apiKeyCard = screen.getByTestId('resource-card-factor-api-key');
-			const readToggle = within(apiKeyCard).getByTestId(
-				'action-toggle-factor-api-key-read',
-			);
-			await user.click(await within(readToggle).findByText('Only selected'));
-
-			const input = screen.getByTestId(
-				'item-input-selector-input-factor-api-key-read',
-			);
-			await user.type(input, 'key-one key-two{enter}');
-
-			const firstBadge = await screen.findByTestId(
-				'item-badge-factor-api-key-read-0',
-			);
-			const secondBadge = screen.getByTestId('item-badge-factor-api-key-read-1');
-
-			expect(
-				within(firstBadge).getByRole('button', { name: 'Remove key-one' }),
-			).toBeInTheDocument();
-			expect(
-				within(secondBadge).getByRole('button', { name: 'Remove key-two' }),
-			).toBeInTheDocument();
-		});
-
-		it('exposes the full item value as a title so truncated badges stay readable', async () => {
-			const user = userEvent.setup();
-			await renderCreateRolePage();
-			await expandResourceCard('factor-api-key');
-
-			const apiKeyCard = screen.getByTestId('resource-card-factor-api-key');
-			const readToggle = within(apiKeyCard).getByTestId(
-				'action-toggle-factor-api-key-read',
-			);
-			await user.click(await within(readToggle).findByText('Only selected'));
-
-			const input = screen.getByTestId(
-				'item-input-selector-input-factor-api-key-read',
-			);
-			await user.type(input, 'a-very-long-api-key-identifier-000001{enter}');
-
-			const badge = await screen.findByTestId('item-badge-factor-api-key-read-0');
-			expect(
-				within(badge).getByTitle('a-very-long-api-key-identifier-000001'),
-			).toBeInTheDocument();
-		});
-
-		it('moves focus to the previous badge when closed with the keyboard', async () => {
-			const user = userEvent.setup();
-			await renderCreateRolePage();
-			await expandResourceCard('factor-api-key');
-
-			const apiKeyCard = screen.getByTestId('resource-card-factor-api-key');
-			const readToggle = within(apiKeyCard).getByTestId(
-				'action-toggle-factor-api-key-read',
-			);
-			await user.click(await within(readToggle).findByText('Only selected'));
-
-			const input = screen.getByTestId(
-				'item-input-selector-input-factor-api-key-read',
-			);
-			await user.type(input, 'key-one key-two{enter}');
-
-			const secondBadge = await screen.findByTestId(
-				'item-badge-factor-api-key-read-1',
-			);
-			within(secondBadge).getByRole('button', { name: 'Remove key-two' }).focus();
-
-			await user.keyboard('{Enter}');
-
-			await waitFor(() => {
-				const firstBadge = screen.getByTestId('item-badge-factor-api-key-read-0');
-				expect(
-					within(firstBadge).getByRole('button', { name: 'Remove key-one' }),
-				).toHaveFocus();
-			});
-		});
-
-		it('does not steal focus when a badge is closed with the mouse', async () => {
-			const user = userEvent.setup();
-			await renderCreateRolePage();
-			await expandResourceCard('factor-api-key');
-
-			const apiKeyCard = screen.getByTestId('resource-card-factor-api-key');
-			const readToggle = within(apiKeyCard).getByTestId(
-				'action-toggle-factor-api-key-read',
-			);
-			await user.click(await within(readToggle).findByText('Only selected'));
-
-			const input = screen.getByTestId(
-				'item-input-selector-input-factor-api-key-read',
-			);
-			await user.type(input, 'key-one key-two{enter}');
-
-			const secondBadge = await screen.findByTestId(
-				'item-badge-factor-api-key-read-1',
-			);
-			await user.click(
-				within(secondBadge).getByRole('button', { name: 'Remove key-two' }),
-			);
-
-			await waitFor(() => {
-				expect(screen.queryByText('key-two')).not.toBeInTheDocument();
-			});
-
-			const firstBadge = screen.getByTestId('item-badge-factor-api-key-read-0');
-			expect(
-				within(firstBadge).getByRole('button', { name: 'Remove key-one' }),
-			).not.toHaveFocus();
-		});
-
 		it('shows Add button disabled when input is empty', async () => {
 			const user = userEvent.setup();
-			await renderCreateRolePage();
-			await expandResourceCard('factor-api-key');
+			await renderPage();
+			await expandAllCards();
 
 			const apiKeyCard = screen.getByTestId('resource-card-factor-api-key');
 			const createToggle = within(apiKeyCard).getByTestId(
@@ -482,9 +376,7 @@ describe('PermissionEditor', () => {
 
 			await user.click(await within(createToggle).findByText('Only selected'));
 
-			const addBtn = screen.getByTestId(
-				'item-input-selector-add-btn-factor-api-key-read',
-			);
+			const addBtn = screen.getByTestId('item-input-selector-add-btn');
 			expect(addBtn).toBeDisabled();
 		});
 	});
@@ -492,8 +384,8 @@ describe('PermissionEditor', () => {
 	describe('scope change confirmation dialog', () => {
 		it('shows confirm dialog when leaving Only Selected with items', async () => {
 			const user = userEvent.setup();
-			await renderCreateRolePage();
-			await expandResourceCard('factor-api-key');
+			await renderPage();
+			await expandAllCards();
 
 			const apiKeyCard = screen.getByTestId('resource-card-factor-api-key');
 			const createToggle = within(apiKeyCard).getByTestId(
@@ -502,9 +394,7 @@ describe('PermissionEditor', () => {
 
 			await user.click(await within(createToggle).findByText('Only selected'));
 
-			const input = screen.getByTestId(
-				'item-input-selector-input-factor-api-key-read',
-			);
+			const input = screen.getByTestId('item-input-selector-input');
 			await user.type(input, 'will-be-cleared{enter}');
 
 			await user.click(await within(createToggle).findByText('All'));
@@ -516,8 +406,8 @@ describe('PermissionEditor', () => {
 
 		it('clears items when confirmed', async () => {
 			const user = userEvent.setup();
-			await renderCreateRolePage();
-			await expandResourceCard('factor-api-key');
+			await renderPage();
+			await expandAllCards();
 
 			const apiKeyCard = screen.getByTestId('resource-card-factor-api-key');
 			const createToggle = within(apiKeyCard).getByTestId(
@@ -526,9 +416,7 @@ describe('PermissionEditor', () => {
 
 			await user.click(await within(createToggle).findByText('Only selected'));
 
-			const input = screen.getByTestId(
-				'item-input-selector-input-factor-api-key-read',
-			);
+			const input = screen.getByTestId('item-input-selector-input');
 			await user.type(input, 'to-be-cleared{enter}');
 
 			await user.click(await within(createToggle).findByText('All'));
@@ -545,8 +433,8 @@ describe('PermissionEditor', () => {
 
 		it('keeps items when cancelled', async () => {
 			const user = userEvent.setup();
-			await renderCreateRolePage();
-			await expandResourceCard('factor-api-key');
+			await renderPage();
+			await expandAllCards();
 
 			const apiKeyCard = screen.getByTestId('resource-card-factor-api-key');
 			const createToggle = within(apiKeyCard).getByTestId(
@@ -555,9 +443,7 @@ describe('PermissionEditor', () => {
 
 			await user.click(await within(createToggle).findByText('Only selected'));
 
-			const input = screen.getByTestId(
-				'item-input-selector-input-factor-api-key-read',
-			);
+			const input = screen.getByTestId('item-input-selector-input');
 			await user.type(input, 'preserved-key{enter}');
 
 			await user.click(await within(createToggle).findByText('None'));
@@ -569,15 +455,13 @@ describe('PermissionEditor', () => {
 				screen.findByText('preserved-key'),
 			).resolves.toBeInTheDocument();
 
-			expect(
-				screen.getByTestId('item-input-selector-factor-api-key-read'),
-			).toBeInTheDocument();
+			expect(screen.getByTestId('item-input-selector')).toBeInTheDocument();
 		});
 
 		it('does not show dialog when leaving Only Selected with no items', async () => {
 			const user = userEvent.setup();
-			await renderCreateRolePage();
-			await expandResourceCard('factor-api-key');
+			await renderPage();
+			await expandAllCards();
 
 			const apiKeyCard = screen.getByTestId('resource-card-factor-api-key');
 			const createToggle = within(apiKeyCard).getByTestId(
@@ -595,8 +479,8 @@ describe('PermissionEditor', () => {
 
 	describe('verbs without Only Selected option', () => {
 		it('does not show Only Selected for list verb', async () => {
-			await renderCreateRolePage();
-			await expandResourceCard('factor-api-key');
+			await renderPage();
+			await expandAllCards();
 
 			const apiKeyCard = screen.getByTestId('resource-card-factor-api-key');
 			const listToggle = within(apiKeyCard).getByTestId(
@@ -617,7 +501,7 @@ describe('PermissionEditor', () => {
 
 	describe('collapse/expand all resources', () => {
 		it('shows expand/collapse toggle group', async () => {
-			await renderCreateRolePage();
+			await renderPage();
 
 			expect(screen.getByTestId('toggle-all-group')).toBeInTheDocument();
 			expect(screen.getByTestId('expand-all-button')).toBeInTheDocument();
@@ -625,23 +509,21 @@ describe('PermissionEditor', () => {
 		});
 
 		it('expands all cards when expand button clicked', async () => {
-			const user = userEvent.setup();
-			await renderCreateRolePage();
+			await renderPage();
+			await expandAllCards();
 
-			await user.click(screen.getByTestId('expand-all-button'));
-
-			const headers = screen.getAllByTestId(/^resource-card-header-/);
-			expect(headers.length).toBeGreaterThan(1);
-			headers.forEach((header) => {
-				expect(header).toHaveAttribute('aria-expanded', 'true');
-			});
+			const apiKeyCard = screen.getByTestId('resource-card-factor-api-key');
+			const header = within(apiKeyCard).getByTestId(
+				'resource-card-header-factor-api-key',
+			);
+			expect(header).toHaveAttribute('aria-expanded', 'true');
 		});
 	});
 
 	describe('resource card error states', () => {
 		it('shows error border on collapsed card with validation error', async () => {
 			const user = userEvent.setup();
-			await renderCreateRolePage();
+			await renderPage();
 
 			const nameInput = screen.getByTestId('role-name-input');
 			await user.type(nameInput, 'valid-role');
@@ -671,7 +553,7 @@ describe('PermissionEditor', () => {
 
 		it('hides error border when card is expanded', async () => {
 			const user = userEvent.setup();
-			await renderCreateRolePage();
+			await renderPage();
 
 			const nameInput = screen.getByTestId('role-name-input');
 			await user.type(nameInput, 'valid-role');
@@ -708,7 +590,7 @@ describe('PermissionEditor', () => {
 
 		it('clears validation error when permission is changed', async () => {
 			const user = userEvent.setup();
-			await renderCreateRolePage();
+			await renderPage();
 
 			const nameInput = screen.getByTestId('role-name-input');
 			await user.type(nameInput, 'valid-role');

frontend/src/container/RolesSettings/CreateEditRolePage/__tests__/PermissionEditor.wizard.test.tsx

@@ -1,466 +0,0 @@
-import { server } from 'mocks-server/server';
-import { screen, userEvent, waitFor, within } from 'tests/test-utils';
-import { setupAuthzAdmin } from 'lib/authz/utils/authz-test-utils';
-
-import { expandResourceCard, renderCreateRolePage } from './testUtils';
-
-jest.setTimeout(15_000);
-
-beforeEach(() => {
-	server.use(setupAuthzAdmin());
-});
-
-afterEach(() => {
-	server.resetHandlers();
-});
-
-async function selectOnlySelected(
-	user: ReturnType<typeof userEvent.setup>,
-	resource = 'logs',
-): Promise<void> {
-	await renderCreateRolePage();
-	await expandResourceCard(resource);
-
-	const card = screen.getByTestId(`resource-card-${resource}`);
-	const readToggle = within(card).getByTestId(`action-toggle-${resource}-read`);
-	await user.click(await within(readToggle).findByText('Only selected'));
-}
-
-async function selectLogsOnlySelected(
-	user: ReturnType<typeof userEvent.setup>,
-): Promise<void> {
-	await selectOnlySelected(user, 'logs');
-}
-
-async function openWizard(
-	user: ReturnType<typeof userEvent.setup>,
-	resource = 'logs',
-): Promise<void> {
-	await selectOnlySelected(user, resource);
-
-	await user.click(
-		screen.getByTestId(`telemetry-wizard-trigger-${resource}-read`),
-	);
-	await screen.findByTestId(`telemetry-wizard-dialog-${resource}-read`);
-}
-
-async function openLogsWizard(
-	user: ReturnType<typeof userEvent.setup>,
-): Promise<void> {
-	await openWizard(user, 'logs');
-}
-
-describe('PermissionEditor - TelemetrySelectorWizard', () => {
-	it('shows wizard button for telemetry resources', async () => {
-		const user = userEvent.setup();
-		await selectLogsOnlySelected(user);
-
-		expect(
-			screen.getByTestId('telemetry-wizard-trigger-logs-read'),
-		).toBeInTheDocument();
-	});
-
-	it('does not show wizard button for non-telemetry resources', async () => {
-		await renderCreateRolePage();
-		await expandResourceCard('factor-api-key');
-
-		const apiKeyCard = screen.getByTestId('resource-card-factor-api-key');
-		const readToggle = within(apiKeyCard).getByTestId(
-			'action-toggle-factor-api-key-read',
-		);
-
-		const user = userEvent.setup();
-		await user.click(await within(readToggle).findByText('Only selected'));
-
-		expect(
-			within(apiKeyCard).queryByTestId(
-				'telemetry-wizard-trigger-factor-api-key-read',
-			),
-		).not.toBeInTheDocument();
-	});
-
-	it('opens wizard dialog when trigger clicked', async () => {
-		const user = userEvent.setup();
-		await selectLogsOnlySelected(user);
-
-		await user.click(screen.getByTestId('telemetry-wizard-trigger-logs-read'));
-
-		await expect(
-			screen.findByTestId('telemetry-wizard-dialog-logs-read'),
-		).resolves.toBeInTheDocument();
-	});
-
-	it('adds a query-type wildcard when the value is left empty', async () => {
-		const user = userEvent.setup();
-		await openLogsWizard(user);
-
-		await user.click(screen.getByTestId('wizard-add-btn-logs-read'));
-
-		await expect(
-			screen.findByText('builder_query/*'),
-		).resolves.toBeInTheDocument();
-	});
-
-	it('does not offer builder sub query', async () => {
-		const user = userEvent.setup();
-		await openLogsWizard(user);
-
-		await user.click(screen.getByTestId('wizard-query-type-select-logs-read'));
-
-		expect(screen.queryByText('Builder Sub Query')).not.toBeInTheDocument();
-	});
-
-	it('does not show PromQL for logs', async () => {
-		const user = userEvent.setup();
-		await openLogsWizard(user);
-
-		await user.click(screen.getByTestId('wizard-query-type-select-logs-read'));
-
-		expect(
-			screen.queryByTestId('wizard-query-type-option-promql-logs-read'),
-		).not.toBeInTheDocument();
-	});
-
-	it('does not show PromQL for traces', async () => {
-		const user = userEvent.setup();
-		await openWizard(user, 'traces');
-
-		await user.click(screen.getByTestId('wizard-query-type-select-traces-read'));
-
-		expect(
-			screen.queryByTestId('wizard-query-type-option-promql-traces-read'),
-		).not.toBeInTheDocument();
-	});
-
-	it('allows PromQL for metrics', async () => {
-		const user = userEvent.setup();
-		await openWizard(user, 'metrics');
-
-		await user.click(screen.getByTestId('wizard-query-type-select-metrics-read'));
-		await user.click(
-			await screen.findByTestId('wizard-query-type-option-promql-metrics-read'),
-		);
-
-		await user.click(screen.getByTestId('wizard-add-btn-metrics-read'));
-
-		await expect(screen.findByText('promql/*')).resolves.toBeInTheDocument();
-	});
-
-	it('hardcodes the key and does not let it be edited', async () => {
-		const user = userEvent.setup();
-		await openLogsWizard(user);
-
-		const keyInput = screen.getByTestId('wizard-key-input-logs-read');
-		expect(keyInput).toHaveValue('signoz.workspace.key.id');
-		expect(keyInput).toBeDisabled();
-	});
-
-	it('hides Key field for query types that do not support key scoping', async () => {
-		const user = userEvent.setup();
-		await openLogsWizard(user);
-
-		await user.click(screen.getByTestId('wizard-query-type-select-logs-read'));
-		await user.click(await screen.findByText('ClickHouse SQL'));
-
-		expect(
-			screen.queryByTestId('wizard-key-input-logs-read'),
-		).not.toBeInTheDocument();
-	});
-
-	it('adds a key-scoped selector when the value is filled', async () => {
-		const user = userEvent.setup();
-		await openLogsWizard(user);
-
-		await user.type(screen.getByTestId('wizard-value-input-logs-read'), '123');
-
-		expect(screen.getByTestId('wizard-selector-input-logs-read')).toHaveValue(
-			'builder_query/signoz.workspace.key.id/123',
-		);
-
-		await user.click(screen.getByTestId('wizard-add-btn-logs-read'));
-
-		await expect(
-			screen.findByText('builder_query/signoz.workspace.key.id/123'),
-		).resolves.toBeInTheDocument();
-	});
-
-	it('replaces the value with a wildcard when any resource is checked', async () => {
-		const user = userEvent.setup();
-		await openLogsWizard(user);
-
-		await user.click(screen.getByLabelText('Any value'));
-
-		expect(screen.getByTestId('wizard-value-input-logs-read')).toHaveValue('*');
-
-		await user.click(screen.getByTestId('wizard-add-btn-logs-read'));
-
-		await expect(
-			screen.findByText('builder_query/signoz.workspace.key.id/*'),
-		).resolves.toBeInTheDocument();
-	});
-
-	it('clears the value when any resource is unchecked', async () => {
-		const user = userEvent.setup();
-		await openLogsWizard(user);
-
-		const anyResource = screen.getByLabelText('Any value');
-		await user.click(anyResource);
-		expect(anyResource).toBeChecked();
-
-		await user.click(anyResource);
-
-		expect(anyResource).not.toBeChecked();
-		expect(screen.getByTestId('wizard-value-input-logs-read')).toHaveValue('');
-	});
-
-	it('checks any resource when the value is typed as a wildcard', async () => {
-		const user = userEvent.setup();
-		await openLogsWizard(user);
-
-		await user.type(screen.getByTestId('wizard-value-input-logs-read'), '*');
-
-		expect(screen.getByLabelText('Any value')).toBeChecked();
-	});
-
-	it('disables value scoping for query types that do not support it', async () => {
-		const user = userEvent.setup();
-		await openLogsWizard(user);
-
-		await user.click(screen.getByTestId('wizard-query-type-select-logs-read'));
-		await user.click(await screen.findByText('ClickHouse SQL'));
-
-		expect(screen.getByTestId('wizard-value-input-logs-read')).toBeDisabled();
-		expect(screen.getByLabelText('Any value')).toBeDisabled();
-	});
-
-	it('clears the value when switching to a query type without key scoping', async () => {
-		const user = userEvent.setup();
-		await openLogsWizard(user);
-
-		await user.type(screen.getByTestId('wizard-value-input-logs-read'), '123');
-
-		await user.click(screen.getByTestId('wizard-query-type-select-logs-read'));
-		await user.click(await screen.findByText('ClickHouse SQL'));
-
-		expect(screen.getByTestId('wizard-value-input-logs-read')).toHaveValue('');
-		expect(screen.getByTestId('wizard-selector-input-logs-read')).toHaveValue(
-			'clickhouse_sql/*',
-		);
-
-		await user.click(screen.getByTestId('wizard-add-btn-logs-read'));
-
-		await expect(
-			screen.findByText('clickhouse_sql/*'),
-		).resolves.toBeInTheDocument();
-	});
-
-	it('follows a hand-edited selector on the query type and value inputs', async () => {
-		const user = userEvent.setup();
-		await openLogsWizard(user);
-
-		const selectorInput = screen.getByTestId('wizard-selector-input-logs-read');
-		await user.clear(selectorInput);
-		await user.type(
-			selectorInput,
-			'clickhouse_sql/signoz.workspace.key.id/checkout',
-		);
-
-		const selectTrigger = screen.getByTestId(
-			'wizard-query-type-select-logs-read',
-		);
-		expect(within(selectTrigger).getByText('ClickHouse SQL')).toBeInTheDocument();
-		expect(screen.getByTestId('wizard-value-input-logs-read')).toHaveValue(
-			'checkout',
-		);
-	});
-
-	it('checks any resource when the selector is edited to a wildcard value', async () => {
-		const user = userEvent.setup();
-		await openLogsWizard(user);
-
-		const selectorInput = screen.getByTestId('wizard-selector-input-logs-read');
-		await user.clear(selectorInput);
-		await user.type(selectorInput, 'builder_query/signoz.workspace.key.id/*');
-
-		expect(screen.getByLabelText('Any value')).toBeChecked();
-	});
-
-	it('keeps the key input hardcoded when the selector uses another key', async () => {
-		const user = userEvent.setup();
-		await openLogsWizard(user);
-
-		const selectorInput = screen.getByTestId('wizard-selector-input-logs-read');
-		await user.clear(selectorInput);
-		await user.type(selectorInput, 'builder_query/service.name/frontend');
-
-		expect(screen.getByTestId('wizard-key-input-logs-read')).toHaveValue(
-			'signoz.workspace.key.id',
-		);
-		expect(
-			screen.getByTestId('wizard-selector-hint-logs-read'),
-		).toHaveTextContent('Allow service.name=frontend for Builder Query queries.');
-		expect(screen.getByTestId('wizard-add-btn-logs-read')).not.toBeDisabled();
-	});
-
-	it('restores the hardcoded key in the selector once the value changes', async () => {
-		const user = userEvent.setup();
-		await openLogsWizard(user);
-
-		const selectorInput = screen.getByTestId('wizard-selector-input-logs-read');
-		await user.clear(selectorInput);
-		await user.type(selectorInput, 'builder_query/service.name/frontend');
-
-		await user.type(screen.getByTestId('wizard-value-input-logs-read'), '2');
-
-		expect(selectorInput).toHaveValue(
-			'builder_query/signoz.workspace.key.id/frontend2',
-		);
-		expect(screen.getByTestId('wizard-add-btn-logs-read')).not.toBeDisabled();
-	});
-
-	it('blocks adding when the selector has an unknown query type', async () => {
-		const user = userEvent.setup();
-		await openLogsWizard(user);
-
-		const selectorInput = screen.getByTestId('wizard-selector-input-logs-read');
-		await user.clear(selectorInput);
-		await user.type(selectorInput, 'sql_query/*');
-
-		expect(
-			screen.getByTestId('wizard-selector-hint-logs-read'),
-		).toHaveTextContent('"sql_query" is not a supported query type.');
-		expect(screen.getByTestId('wizard-add-btn-logs-read')).toBeDisabled();
-	});
-
-	it('blocks adding when the selector is emptied', async () => {
-		const user = userEvent.setup();
-		await openLogsWizard(user);
-
-		await user.clear(screen.getByTestId('wizard-selector-input-logs-read'));
-
-		expect(
-			screen.getByTestId('wizard-selector-hint-logs-read'),
-		).toHaveTextContent('Enter a selector.');
-		expect(screen.getByTestId('wizard-add-btn-logs-read')).toBeDisabled();
-	});
-
-	it('adds the hand-edited selector verbatim', async () => {
-		const user = userEvent.setup();
-		await openLogsWizard(user);
-
-		const selectorInput = screen.getByTestId('wizard-selector-input-logs-read');
-		await user.clear(selectorInput);
-		await user.type(selectorInput, 'builder_query/signoz.workspace.key.id/a/b');
-
-		await user.click(screen.getByTestId('wizard-add-btn-logs-read'));
-
-		await expect(
-			screen.findByText('builder_query/signoz.workspace.key.id/a/b'),
-		).resolves.toBeInTheDocument();
-	});
-
-	it('closes dialog after adding selector', async () => {
-		const user = userEvent.setup();
-		await openLogsWizard(user);
-
-		await user.click(screen.getByTestId('wizard-add-btn-logs-read'));
-
-		await waitFor(() => {
-			expect(
-				screen.queryByTestId('telemetry-wizard-dialog-logs-read'),
-			).not.toBeInTheDocument();
-		});
-	});
-
-	it('does not add duplicate selectors', async () => {
-		const user = userEvent.setup();
-		await openLogsWizard(user);
-		await user.click(screen.getByTestId('wizard-add-btn-logs-read'));
-
-		await user.click(screen.getByTestId('telemetry-wizard-trigger-logs-read'));
-		await screen.findByTestId('telemetry-wizard-dialog-logs-read');
-		await user.click(screen.getByTestId('wizard-add-btn-logs-read'));
-
-		const badges = screen.getAllByText('builder_query/*');
-		expect(badges).toHaveLength(1);
-	});
-
-	it('resets wizard state when dialog is closed and reopened', async () => {
-		const user = userEvent.setup();
-		await openLogsWizard(user);
-
-		await user.type(screen.getByTestId('wizard-value-input-logs-read'), '123');
-		await user.click(screen.getByTestId('wizard-query-type-select-logs-read'));
-		await user.click(await screen.findByText('ClickHouse SQL'));
-
-		await user.click(screen.getByRole('button', { name: /cancel/i }));
-
-		await waitFor(() => {
-			expect(
-				screen.queryByTestId('telemetry-wizard-dialog-logs-read'),
-			).not.toBeInTheDocument();
-		});
-
-		await user.click(screen.getByTestId('telemetry-wizard-trigger-logs-read'));
-		const selectTrigger = await screen.findByTestId(
-			'wizard-query-type-select-logs-read',
-		);
-
-		expect(within(selectTrigger).getByText('Builder Query')).toBeInTheDocument();
-		expect(screen.getByTestId('wizard-value-input-logs-read')).toHaveValue('');
-		expect(screen.getByTestId('wizard-selector-input-logs-read')).toHaveValue(
-			'builder_query/*',
-		);
-	});
-
-	it('previews the query-type wildcard while the value is empty', async () => {
-		const user = userEvent.setup();
-		await openLogsWizard(user);
-
-		expect(screen.getByTestId('wizard-selector-input-logs-read')).toHaveValue(
-			'builder_query/*',
-		);
-		expect(
-			screen.getByTestId('wizard-selector-hint-logs-read'),
-		).toHaveTextContent('Allow every "Builder Query" query.');
-	});
-
-	it('describes a key-scoped selector', async () => {
-		const user = userEvent.setup();
-		await openLogsWizard(user);
-
-		await user.type(screen.getByTestId('wizard-value-input-logs-read'), '123');
-
-		expect(
-			screen.getByTestId('wizard-selector-hint-logs-read'),
-		).toHaveTextContent(
-			'Allow signoz.workspace.key.id=123 for Builder Query queries.',
-		);
-	});
-
-	it('describes an any-resource selector', async () => {
-		const user = userEvent.setup();
-		await openLogsWizard(user);
-
-		await user.click(screen.getByLabelText('Any value'));
-
-		expect(
-			screen.getByTestId('wizard-selector-hint-logs-read'),
-		).toHaveTextContent(
-			'Allow every signoz.workspace.key.id for Builder Query queries.',
-		);
-	});
-
-	it('does not show query type descriptions', async () => {
-		const user = userEvent.setup();
-		await openLogsWizard(user);
-
-		await user.click(screen.getByTestId('wizard-query-type-select-logs-read'));
-
-		expect(
-			screen.queryByText(
-				'Visual query builder for selecting data sources, filters, and aggregations',
-			),
-		).not.toBeInTheDocument();
-	});
-});

frontend/src/container/RolesSettings/CreateEditRolePage/__tests__/testUtils.tsx

@@ -1,35 +0,0 @@
-import { Route, Switch } from 'react-router-dom';
-import ROUTES from 'constants/routes';
-import { render, screen, userEvent, within } from 'tests/test-utils';
-import { TooltipProvider } from '@signozhq/ui/tooltip';
-
-import CreateEditRolePage from '../CreateEditRolePage';
-
-export async function renderCreateRolePage(): Promise<
-	ReturnType<typeof render>
-> {
-	const result = render(
-		<TooltipProvider>
-			<Switch>
-				<Route path={ROUTES.ROLES_SETTINGS} exact>
-					<div data-testid="roles-list-redirect" />
-				</Route>
-				<Route path={ROUTES.ROLE_CREATE}>
-					<CreateEditRolePage />
-				</Route>
-			</Switch>
-		</TooltipProvider>,
-		undefined,
-		{ initialRoute: '/settings/roles/new' },
-	);
-	await screen.findByTestId('permission-editor');
-	return result;
-}
-
-export async function expandResourceCard(resourceId: string): Promise<void> {
-	const user = userEvent.setup();
-	const card = await screen.findByTestId(`resource-card-${resourceId}`);
-	await user.click(
-		within(card).getByTestId(`resource-card-header-${resourceId}`),
-	);
-}

frontend/src/container/RolesSettings/CreateEditRolePage/components/ActionToggle.tsx

@@ -7,7 +7,6 @@ import { Typography } from '@signozhq/ui/typography';
 import { PermissionScope } from '../../types';
 import { getResourcePanel } from '../../permissions.config';
 import ItemInputSelector from './ItemInputSelector';
-import TelemetrySelectorWizard from './TelemetrySelectorWizard';
 
 import styles from './ActionToggle.module.scss';
 import { AuthZResource, AuthZVerb } from 'lib/authz/hooks/useAuthZ/types';
@@ -40,13 +39,10 @@ function ActionToggle({
 	onSelectedIdsChange,
 	hasError = false,
 }: ActionToggleProps): JSX.Element {
-	const panel = getResourcePanel(resource);
-
 	const [confirmDialogOpen, setConfirmDialogOpen] = useState(false);
 	const [pendingScope, setPendingScope] = useState<PermissionScope | null>(null);
 
 	const displayLabel = getActionLabel(action);
-	const selectorTestId = `${resource}-${action}`;
 
 	const scopeItems: Array<{ value: PermissionScope; label: string }> =
 		useMemo(() => {
@@ -125,25 +121,11 @@ function ActionToggle({
 						<Divider />
 
 						<ItemInputSelector
-							placeholder={panel.selectorPlaceholder}
+							placeholder={getResourcePanel(resource).selectorPlaceholder}
 							selectedIds={selectedIds}
 							onChange={onSelectedIdsChange}
-							testId={selectorTestId}
-							docsAnchor={panel.docsAnchor}
+							docsAnchor={getResourcePanel(resource).docsAnchor}
 							hasError={hasError}
-							prefixElement={
-								panel.selectorType === 'telemetryBuilder' ? (
-									<TelemetrySelectorWizard
-										resource={resource}
-										testId={selectorTestId}
-										onAdd={(selector): void => {
-											if (!selectedIds.includes(selector)) {
-												onSelectedIdsChange([...selectedIds, selector]);
-											}
-										}}
-									/>
-								) : null
-							}
 						/>
 					</div>
 				)}

frontend/src/container/RolesSettings/CreateEditRolePage/components/ItemInputSelector.module.scss

@@ -4,10 +4,9 @@
 	gap: var(--spacing-4);
 	background: var(--l1-background);
 	border: 1px solid var(--l1-border);
-	border-radius: var(--radius-2);
+	border-radius: 4px;
 	padding: var(--spacing-4);
 
-	--input-prefix-padding: var(--spacing-2);
 	--input-suffix-padding: var(--spacing-2);
 }
 
@@ -42,11 +41,6 @@
 	overflow-y: auto;
 }
 
-.itemInputSelectorBadge {
-	--badge-border-radius: 4px;
-	--badge-hover-background: var(--l2-background) !important;
-}
-
 .itemInputSelectorInfoIcon {
 	flex-shrink: 0;
 	color: var(--l2-foreground);
@@ -57,7 +51,55 @@
 	}
 }
 
+.itemInputSelectorBadge {
+	display: inline-flex;
+	align-items: center;
+	gap: 4px;
+	max-width: 140px;
+	padding: 2px 4px 2px 6px;
+	background: var(--l2-background);
+	border: 1px solid var(--l2-border);
+	border-radius: 4px;
+}
+
+.itemInputSelectorBadgeLabel {
+	flex: 1;
+	min-width: 0;
+}
+
+.itemInputSelectorBadgeRemove {
+	flex-shrink: 0;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	width: 14px;
+	height: 14px;
+	padding: 0;
+	background: transparent;
+	border: none;
+	border-radius: 2px;
+	color: var(--l2-foreground);
+	cursor: pointer;
+	transition:
+		background 0.15s ease,
+		color 0.15s ease;
+
+	&:hover {
+		background: var(--l1-background);
+		color: var(--l1-foreground);
+	}
+}
+
 .itemInputSelectorHint {
 	margin: 0;
 	color: var(--l2-foreground);
+
+	a {
+		color: var(--primary);
+		text-decoration: none;
+
+		&:hover {
+			text-decoration: underline;
+		}
+	}
 }

frontend/src/container/RolesSettings/CreateEditRolePage/components/ItemInputSelector.tsx

@@ -1,6 +1,5 @@
 import { useCallback, useRef, useState } from 'react';
-import { Info, Plus } from '@signozhq/icons';
-import { Badge } from '@signozhq/ui/badge';
+import { Info, Plus, X } from '@signozhq/icons';
 import { Button } from '@signozhq/ui/button';
 import { Input } from '@signozhq/ui/input';
 import { Typography } from '@signozhq/ui/typography';
@@ -16,10 +15,8 @@ export interface ItemInputSelectorProps {
 	placeholder: string;
 	selectedIds: string[];
 	onChange: (ids: string[]) => void;
-	testId: string;
 	docsAnchor?: string;
 	hasError?: boolean;
-	prefixElement?: React.ReactNode;
 }
 
 function parseInputValues(input: string): string[] {
@@ -33,13 +30,11 @@ function ItemInputSelector({
 	placeholder,
 	selectedIds,
 	onChange,
-	testId,
 	docsAnchor = 'role',
 	hasError = false,
-	prefixElement,
 }: ItemInputSelectorProps): JSX.Element {
 	const [inputValue, setInputValue] = useState('');
-	const badgesRef = useRef<HTMLDivElement>(null);
+	const footerRef = useRef<HTMLDivElement>(null);
 
 	const addValues = useCallback(
 		(input: string): void => {
@@ -92,24 +87,26 @@ function ItemInputSelector({
 		[selectedIds, onChange],
 	);
 
-	const handleBadgeClose = useCallback(
-		(e: React.MouseEvent, itemId: string, index: number): void => {
-			e.preventDefault();
-			handleRemove(itemId);
-
-			// Activating a button via Enter/Space reports detail 0;
-			// a real click reports 1 or more
-			// Only trigger focus when using keyboard
-			const isKeyboardActivation = e.detail === 0;
-
-			if (!isKeyboardActivation) {
+	const handleBadgeKeyDown = useCallback(
+		(
+			e: React.KeyboardEvent<HTMLButtonElement>,
+			itemId: string,
+			index: number,
+		): void => {
+			if (e.key !== 'Enter' && e.key !== ' ') {
 				return;
 			}
 
+			e.preventDefault();
+			handleRemove(itemId);
+
 			const targetIndex = index > 0 ? index - 1 : 0;
 			requestAnimationFrame(() => {
-				const buttons = badgesRef.current?.querySelectorAll('button');
-				buttons?.[targetIndex]?.focus();
+				const buttons = footerRef.current?.querySelectorAll('button');
+				const targetButton = buttons?.[targetIndex] as
+					| HTMLButtonElement
+					| undefined;
+				targetButton?.focus();
 			});
 		},
 		[handleRemove],
@@ -123,7 +120,7 @@ function ItemInputSelector({
 				styles.itemInputSelector,
 				showError ? styles.itemInputSelectorError : '',
 			)}
-			data-testid={`item-input-selector-${testId}`}
+			data-testid="item-input-selector"
 		>
 			<Input
 				placeholder={placeholder}
@@ -131,15 +128,14 @@ function ItemInputSelector({
 				onChange={handleInputChange}
 				onKeyDown={handleInputKeyDown}
 				onBlur={handleInputBlur}
-				data-testid={`item-input-selector-input-${testId}`}
-				prefix={prefixElement}
+				data-testid="item-input-selector-input"
 				suffix={
 					<Button
 						variant="solid"
 						size="sm"
 						onClick={handleAddClick}
 						disabled={!inputValue.trim()}
-						data-testid={`item-input-selector-add-btn-${testId}`}
+						data-testid="item-input-selector-add-btn"
 					>
 						<Plus size={14} />
 						Add
@@ -148,22 +144,28 @@ function ItemInputSelector({
 			/>
 
 			{selectedIds.length > 0 ? (
-				<div className={styles.itemInputSelectorFooter}>
-					<div ref={badgesRef} className={styles.itemInputSelectorBadges}>
+				<div ref={footerRef} className={styles.itemInputSelectorFooter}>
+					<div className={styles.itemInputSelectorBadges}>
 						{selectedIds.map((id, index) => (
-							<Badge
-								key={id}
-								color="secondary"
-								className={styles.itemInputSelectorBadge}
-								testId={`item-badge-${testId}-${index}`}
-								closable
-								closeAriaLabel={`Remove ${id}`}
-								onClose={(e): void => handleBadgeClose(e, id, index)}
-							>
-								<Typography as="span" size="small" truncate={1} title={id}>
+							<span key={id} className={styles.itemInputSelectorBadge} title={id}>
+								<Typography
+									as="span"
+									size="small"
+									truncate={1}
+									className={styles.itemInputSelectorBadgeLabel}
+								>
 									{id}
 								</Typography>
-							</Badge>
+								<button
+									type="button"
+									className={styles.itemInputSelectorBadgeRemove}
+									onClick={(): void => handleRemove(id)}
+									onKeyDown={(e): void => handleBadgeKeyDown(e, id, index)}
+									aria-label={`Remove ${id}`}
+								>
+									<X size={10} />
+								</button>
+							</span>
 						))}
 					</div>
 					<TooltipSimple

frontend/src/container/RolesSettings/CreateEditRolePage/components/TelemetrySelectorWizard.constants.ts

@@ -1,50 +0,0 @@
-// intentionally omitting few query types
-// from pkg/types/querybuildertypes/querybuildertypesv5/query_type.go
-export type QueryTypeId = 'builder_query' | 'promql' | 'clickhouse_sql';
-
-export interface QueryTypeOption {
-	id: QueryTypeId;
-	label: string;
-	supportsKeyScoping: boolean;
-	metricsOnly?: boolean;
-}
-
-export const QUERY_TYPES: readonly QueryTypeOption[] = [
-	{
-		id: 'builder_query',
-		label: 'Builder Query',
-		supportsKeyScoping: true,
-	},
-	{
-		id: 'promql',
-		label: 'PromQL',
-		supportsKeyScoping: false,
-		metricsOnly: true,
-	},
-	{
-		id: 'clickhouse_sql',
-		label: 'ClickHouse SQL',
-		supportsKeyScoping: false,
-	},
-] as const;
-
-export const DEFAULT_QUERY_TYPE: QueryTypeId = 'builder_query';
-
-export const SUPPORTED_GRANT_KEY = 'signoz.workspace.key.id';
-
-export const ANY_RESOURCE_VALUE = '*';
-
-export interface SelectorDraft {
-	queryType: QueryTypeId;
-	value: string;
-}
-
-export interface ParsedSelector {
-	queryType?: QueryTypeId;
-	value: string;
-}
-
-export interface SelectorValidation {
-	message: string;
-	isError: boolean;
-}

frontend/src/container/RolesSettings/CreateEditRolePage/components/TelemetrySelectorWizard.module.scss

@@ -1,52 +0,0 @@
-.wizardDialog {
-	border-color: var(--l1-border);
-
-	--select-trigger-background-color: var(--l3-background);
-	--select-trigger-border-color: var(--l3-background);
-	--select-content-background: var(--l3-background);
-	--select-item-highlight-background: var(--l3-background-hover);
-	--select-trigger-outline-width: 1px;
-	--select-trigger-outline-offset: 0px;
-
-	--input-background: var(--l3-background);
-	--input-hover-background: var(--l3-background);
-	--input-focus-background: var(--l3-background);
-	--input-disabled-background: var(--l3-background);
-	--input-border-color: var(--l3-border);
-	--input-hover-border-color: var(--l3-border);
-	--input-focus-border-color: var(--l3-border);
-
-	outline: none;
-
-	& > div {
-		background-color: var(--l2-background);
-	}
-}
-
-.wizardBody {
-	display: flex;
-	flex-direction: column;
-	gap: var(--spacing-6);
-}
-
-.wizardField {
-	display: flex;
-	flex-direction: column;
-	gap: var(--spacing-2);
-}
-
-.wizardValueRow {
-	display: flex;
-	align-items: center;
-	gap: var(--spacing-3);
-}
-
-.wizardValueInput {
-	flex: 1;
-	min-width: 0;
-}
-
-.selectContent {
-	z-index: 10;
-	background-color: var(--l3-background);
-}

frontend/src/container/RolesSettings/CreateEditRolePage/components/TelemetrySelectorWizard.tsx

@@ -1,190 +0,0 @@
-import { Wand } from '@signozhq/icons';
-import { Button } from '@signozhq/ui/button';
-import { Checkbox } from '@signozhq/ui/checkbox';
-import { DialogWrapper } from '@signozhq/ui/dialog';
-import { Input } from '@signozhq/ui/input';
-import {
-	Select,
-	SelectContent,
-	SelectItem,
-	SelectTrigger,
-	SelectValue,
-} from '@signozhq/ui/select';
-import { Typography } from '@signozhq/ui/typography';
-
-import {
-	ANY_RESOURCE_VALUE,
-	QUERY_TYPES,
-	SUPPORTED_GRANT_KEY,
-} from './TelemetrySelectorWizard.constants';
-import { isQueryTypeAvailable } from './TelemetrySelectorWizard.utils';
-import useTelemetrySelectorWizard from './useTelemetrySelectorWizard';
-
-import styles from './TelemetrySelectorWizard.module.scss';
-import { AuthZResource } from 'lib/authz/hooks/useAuthZ/types';
-
-interface TelemetrySelectorWizardProps {
-	onAdd: (selector: string) => void;
-	resource: AuthZResource;
-	testId: string;
-}
-
-function TelemetrySelectorWizard({
-	onAdd,
-	resource,
-	testId,
-}: TelemetrySelectorWizardProps): JSX.Element {
-	const {
-		open,
-		queryType,
-		selectedQueryType,
-		value,
-		selector,
-		isAnyResource,
-		supportsKeyScoping,
-		validation,
-		canAdd,
-		handleOpenChange,
-		handleQueryTypeChange,
-		handleValueChange,
-		handleAnyResourceChange,
-		handleSelectorChange,
-		handleAdd,
-		handleInputKeyDown,
-	} = useTelemetrySelectorWizard({ onAdd });
-
-	const trigger = (
-		<Button
-			variant="solid"
-			size="sm"
-			data-testid={`telemetry-wizard-trigger-${testId}`}
-		>
-			<Wand size={14} />
-			Wizard
-		</Button>
-	);
-
-	const footer = (
-		<>
-			<Button
-				variant="ghost"
-				color="secondary"
-				onClick={(): void => handleOpenChange(false)}
-			>
-				Cancel
-			</Button>
-			<Button
-				variant="solid"
-				onClick={handleAdd}
-				disabled={!canAdd}
-				data-testid={`wizard-add-btn-${testId}`}
-			>
-				Add Selector
-			</Button>
-		</>
-	);
-
-	return (
-		<DialogWrapper
-			open={open}
-			onOpenChange={handleOpenChange}
-			title="Selector Wizard"
-			width="wide"
-			testId={`telemetry-wizard-dialog-${testId}`}
-			trigger={trigger}
-			footer={footer}
-			className={styles.wizardDialog}
-		>
-			<div className={styles.wizardBody}>
-				<div className={styles.wizardField}>
-					<Typography as="label" weight="medium">
-						Query Type
-					</Typography>
-					<Select value={queryType} onChange={handleQueryTypeChange}>
-						<SelectTrigger data-testid={`wizard-query-type-select-${testId}`}>
-							<SelectValue>{selectedQueryType?.label}</SelectValue>
-						</SelectTrigger>
-						<SelectContent withPortal={false} className={styles.selectContent}>
-							{QUERY_TYPES.filter((queryTypeOption) =>
-								isQueryTypeAvailable(queryTypeOption, resource),
-							).map((queryTypeOption) => (
-								<SelectItem
-									key={queryTypeOption.id}
-									value={queryTypeOption.id}
-									testId={`wizard-query-type-option-${queryTypeOption.id}-${testId}`}
-								>
-									{queryTypeOption.label}
-								</SelectItem>
-							))}
-						</SelectContent>
-					</Select>
-				</div>
-
-				{supportsKeyScoping && (
-					<div className={styles.wizardField}>
-						<Typography as="label" weight="medium">
-							Key
-						</Typography>
-						<Input
-							value={SUPPORTED_GRANT_KEY}
-							readOnly
-							disabled
-							testId={`wizard-key-input-${testId}`}
-						/>
-					</div>
-				)}
-
-				<div className={styles.wizardField}>
-					<Typography as="label" weight="medium">
-						Value
-					</Typography>
-					<div className={styles.wizardValueRow}>
-						<Input
-							className={styles.wizardValueInput}
-							placeholder={
-								supportsKeyScoping
-									? 'Value or leave empty to allow every query'
-									: ANY_RESOURCE_VALUE
-							}
-							value={value}
-							disabled={!supportsKeyScoping}
-							onChange={handleValueChange}
-							onKeyDown={handleInputKeyDown}
-							testId={`wizard-value-input-${testId}`}
-						/>
-						<Checkbox
-							id={`wizard-any-resource-${testId}`}
-							value={isAnyResource}
-							disabled={!supportsKeyScoping}
-							onChange={(checked): void => handleAnyResourceChange(checked === true)}
-							testId={`wizard-any-resource-checkbox-${testId}`}
-						>
-							Any value
-						</Checkbox>
-					</div>
-				</div>
-
-				<div className={styles.wizardField}>
-					<Typography as="label" weight="medium">
-						Selector
-					</Typography>
-					<Input
-						value={selector}
-						onChange={handleSelectorChange}
-						onKeyDown={handleInputKeyDown}
-						testId={`wizard-selector-input-${testId}`}
-					/>
-					<Typography.Text
-						size="small"
-						color={validation.isError ? 'danger' : 'muted'}
-						testId={`wizard-selector-hint-${testId}`}
-					>
-						{validation.message}
-					</Typography.Text>
-				</div>
-			</div>
-		</DialogWrapper>
-	);
-}
-
-export default TelemetrySelectorWizard;

frontend/src/container/RolesSettings/CreateEditRolePage/components/TelemetrySelectorWizard.utils.ts

@@ -1,139 +0,0 @@
-import { AuthZResource } from 'lib/authz/hooks/useAuthZ/types';
-
-import {
-	ANY_RESOURCE_VALUE,
-	ParsedSelector,
-	QUERY_TYPES,
-	QueryTypeId,
-	QueryTypeOption,
-	SelectorDraft,
-	SelectorValidation,
-	SUPPORTED_GRANT_KEY,
-} from './TelemetrySelectorWizard.constants';
-
-const METRIC_RESOURCES: ReadonlySet<AuthZResource> = new Set<AuthZResource>([
-	'metrics',
-	'meter-metrics',
-]);
-
-export function getQueryTypeOption(
-	queryType: string,
-): QueryTypeOption | undefined {
-	return QUERY_TYPES.find((option) => option.id === queryType);
-}
-
-export function isQueryTypeAvailable(
-	option: QueryTypeOption,
-	resource: AuthZResource,
-): boolean {
-	return !option.metricsOnly || METRIC_RESOURCES.has(resource);
-}
-
-export function supportsKeyScoping(queryType: string): boolean {
-	return getQueryTypeOption(queryType)?.supportsKeyScoping ?? false;
-}
-
-export function isAnyResourceValue(value: string): boolean {
-	return value.trim() === ANY_RESOURCE_VALUE;
-}
-
-function splitSelector(selector: string): string[] {
-	const parts = selector.split('/');
-
-	if (parts.length <= 3) {
-		return parts;
-	}
-
-	return [parts[0], parts[1], parts.slice(2).join('/')];
-}
-
-export function buildSelector({ queryType, value }: SelectorDraft): string {
-	const trimmedValue = value.trim();
-
-	if (!supportsKeyScoping(queryType) || !trimmedValue) {
-		return `${queryType}/${ANY_RESOURCE_VALUE}`;
-	}
-
-	return `${queryType}/${SUPPORTED_GRANT_KEY}/${trimmedValue}`;
-}
-
-export function parseSelector(selector: string): ParsedSelector {
-	const parts = splitSelector(selector.trim());
-
-	return {
-		queryType: getQueryTypeOption(parts[0])?.id,
-		value: parts.length >= 3 ? parts[2] : '',
-	};
-}
-
-/**
- * This does a basic validation, intentionally omitting deep validations since this is to be made at backend,
- * so this will allow to produce invalid selectors, and the validation will be done after the user try to save
- */
-export function validateSelector(selector: string): SelectorValidation {
-	const trimmed = selector.trim();
-
-	if (!trimmed) {
-		return { message: 'Enter a selector.', isError: true };
-	}
-
-	if (trimmed === ANY_RESOURCE_VALUE) {
-		return { message: 'Allow every query of every type.', isError: false };
-	}
-
-	const parts = splitSelector(trimmed);
-	const option = getQueryTypeOption(parts[0]);
-
-	if (!option) {
-		return {
-			message: `"${parts[0]}" is not a supported query type.`,
-			isError: true,
-		};
-	}
-
-	if (parts.length < 3) {
-		if (parts.length === 2 && parts[1] !== ANY_RESOURCE_VALUE) {
-			if (!option.supportsKeyScoping) {
-				return {
-					message: `This query type does not support key scoping. Use ${option.id}/*`,
-					isError: false, // intentionally not an error
-				};
-			}
-
-			return {
-				message: `Use <query-type>/${ANY_RESOURCE_VALUE} or <query-type>/${SUPPORTED_GRANT_KEY}/<value>.`,
-				isError: false, // intentionally not an error
-			};
-		}
-
-		return {
-			message: `Allow every "${option.label}" query.`,
-			isError: false,
-		};
-	}
-
-	const [, key, value] = parts;
-
-	if (value === ANY_RESOURCE_VALUE) {
-		return {
-			message: `Allow every ${key} for ${option.label} queries.`,
-			isError: false,
-		};
-	}
-
-	if (!option.supportsKeyScoping) {
-		return {
-			message: `This query type does not support key scoping. Use ${option.id}/*`,
-			isError: false, // intentionally not an error
-		};
-	}
-
-	return {
-		message: `Allow ${key}=${value} for ${option.label} queries.`,
-		isError: false,
-	};
-}
-
-export function getDefaultSelector(queryType: QueryTypeId): string {
-	return buildSelector({ queryType, value: '' });
-}

frontend/src/container/RolesSettings/CreateEditRolePage/components/jsonSchema.config.ts

@@ -76,10 +76,9 @@ function createGrantPermissionAsReadonly(
 	return {
 		label: 'readonly',
 		insertText: resources
-			.filter((r) => {
-				const verbs: readonly string[] = r.allowedVerbs;
-				return verbs.includes('read') || verbs.includes('list');
-			})
+			.filter(
+				(r) => r.allowedVerbs.includes('read') || r.allowedVerbs.includes('list'),
+			)
 			.flatMap((r) => {
 				const verbs = r.allowedVerbs.filter((v) => v === 'read' || v === 'list');
 				return verbs.map(
@@ -104,12 +103,7 @@ function buildResourceSnippets(): SnippetDef[] {
 	for (const resource of resources) {
 		const { kind, type, allowedVerbs } = resource;
 
-		// If only one verb is supported, no point on add grant all
-		// that will only add one permission at time, just leave the verb snippet
-		// and it will look cleaner
-		if (allowedVerbs.length > 1) {
-			snippets.push(createGrantAllPermissionSnippet(kind, allowedVerbs, type));
-		}
+		snippets.push(createGrantAllPermissionSnippet(kind, allowedVerbs, type));
 
 		for (const verb of allowedVerbs) {
 			snippets.push(createGrantPermissionToVerbAndKind(kind, verb, type));

frontend/src/container/RolesSettings/CreateEditRolePage/components/useTelemetrySelectorWizard.ts

@@ -1,157 +0,0 @@
-import { useCallback, useMemo, useState } from 'react';
-
-import {
-	ANY_RESOURCE_VALUE,
-	DEFAULT_QUERY_TYPE,
-	QueryTypeId,
-	QueryTypeOption,
-	SelectorValidation,
-} from './TelemetrySelectorWizard.constants';
-import {
-	buildSelector,
-	getDefaultSelector,
-	getQueryTypeOption,
-	isAnyResourceValue,
-	parseSelector,
-	validateSelector,
-} from './TelemetrySelectorWizard.utils';
-
-interface UseTelemetrySelectorWizardParams {
-	onAdd: (selector: string) => void;
-}
-
-interface UseTelemetrySelectorWizardResult {
-	open: boolean;
-	queryType: QueryTypeId;
-	selectedQueryType: QueryTypeOption | undefined;
-	value: string;
-	selector: string;
-	isAnyResource: boolean;
-	supportsKeyScoping: boolean;
-	validation: SelectorValidation;
-	canAdd: boolean;
-	handleOpenChange: (nextOpen: boolean) => void;
-	handleQueryTypeChange: (value: string | string[]) => void;
-	handleValueChange: (event: React.ChangeEvent<HTMLInputElement>) => void;
-	handleAnyResourceChange: (checked: boolean) => void;
-	handleSelectorChange: (event: React.ChangeEvent<HTMLInputElement>) => void;
-	handleAdd: () => void;
-	handleInputKeyDown: (event: React.KeyboardEvent<HTMLInputElement>) => void;
-}
-
-function useTelemetrySelectorWizard({
-	onAdd,
-}: UseTelemetrySelectorWizardParams): UseTelemetrySelectorWizardResult {
-	const [open, setOpen] = useState(false);
-	const [queryType, setQueryType] = useState<QueryTypeId>(DEFAULT_QUERY_TYPE);
-	const [value, setValue] = useState('');
-	const [selector, setSelector] = useState(() =>
-		getDefaultSelector(DEFAULT_QUERY_TYPE),
-	);
-
-	const selectedQueryType = useMemo(
-		() => getQueryTypeOption(queryType),
-		[queryType],
-	);
-	const supportsKeyScoping = selectedQueryType?.supportsKeyScoping ?? false;
-
-	const validation = useMemo(() => validateSelector(selector), [selector]);
-
-	const applyDraft = useCallback(
-		(nextQueryType: QueryTypeId, nextValue: string): void => {
-			setQueryType(nextQueryType);
-			setValue(nextValue);
-			setSelector(buildSelector({ queryType: nextQueryType, value: nextValue }));
-		},
-		[],
-	);
-
-	const handleQueryTypeChange = useCallback(
-		(next: string | string[]): void => {
-			const selected = (Array.isArray(next) ? next[0] : next) as QueryTypeId;
-			const keepsValue = getQueryTypeOption(selected)?.supportsKeyScoping ?? false;
-
-			applyDraft(selected, keepsValue ? value : '');
-		},
-		[applyDraft, value],
-	);
-
-	const handleValueChange = useCallback(
-		(event: React.ChangeEvent<HTMLInputElement>): void => {
-			applyDraft(queryType, event.target.value);
-		},
-		[applyDraft, queryType],
-	);
-
-	const handleAnyResourceChange = useCallback(
-		(checked: boolean): void => {
-			applyDraft(queryType, checked ? ANY_RESOURCE_VALUE : '');
-		},
-		[applyDraft, queryType],
-	);
-
-	const handleSelectorChange = useCallback(
-		(event: React.ChangeEvent<HTMLInputElement>): void => {
-			const nextSelector = event.target.value;
-			setSelector(nextSelector);
-
-			const parsed = parseSelector(nextSelector);
-			if (parsed.queryType) {
-				setQueryType(parsed.queryType);
-			}
-			setValue(parsed.value);
-		},
-		[],
-	);
-
-	const handleOpenChange = useCallback((nextOpen: boolean): void => {
-		setOpen(nextOpen);
-
-		if (!nextOpen) {
-			setQueryType(DEFAULT_QUERY_TYPE);
-			setValue('');
-			setSelector(getDefaultSelector(DEFAULT_QUERY_TYPE));
-		}
-	}, []);
-
-	const handleAdd = useCallback((): void => {
-		const trimmed = selector.trim();
-
-		if (validateSelector(trimmed).isError) {
-			return;
-		}
-
-		onAdd(trimmed);
-		handleOpenChange(false);
-	}, [selector, onAdd, handleOpenChange]);
-
-	const handleInputKeyDown = useCallback(
-		(event: React.KeyboardEvent<HTMLInputElement>): void => {
-			if (event.key === 'Enter') {
-				handleAdd();
-			}
-		},
-		[handleAdd],
-	);
-
-	return {
-		open,
-		queryType,
-		selectedQueryType,
-		value,
-		selector,
-		isAnyResource: isAnyResourceValue(value),
-		supportsKeyScoping,
-		validation,
-		canAdd: !validation.isError,
-		handleOpenChange,
-		handleQueryTypeChange,
-		handleValueChange,
-		handleAnyResourceChange,
-		handleSelectorChange,
-		handleAdd,
-		handleInputKeyDown,
-	};
-}
-
-export default useTelemetrySelectorWizard;

frontend/src/container/RolesSettings/hooks/__tests__/useRolePermissions.test.ts

@@ -329,15 +329,11 @@ describe('transformTransactionGroupsToResourcePermissions', () => {
 	it('returns all resources from RESOURCE_ORDER even with empty transaction groups', () => {
 		const result = transformTransactionGroupsToResourcePermissions([]);
 
-		expect(result).toHaveLength(7);
+		expect(result).toHaveLength(3);
 		expect(result.map((r) => r.resourceKind)).toStrictEqual([
 			'factor-api-key',
 			'role',
 			'serviceaccount',
-			'logs',
-			'traces',
-			'metrics',
-			'meter-metrics',
 		]);
 	});
 
@@ -418,15 +414,11 @@ describe('createEmptyRolePermissions', () => {
 	it('creates permissions for all resources in RESOURCE_ORDER', () => {
 		const result = createEmptyRolePermissions();
 
-		expect(result).toHaveLength(7);
+		expect(result).toHaveLength(3);
 		expect(result.map((r) => r.resourceKind)).toStrictEqual([
 			'factor-api-key',
 			'role',
 			'serviceaccount',
-			'logs',
-			'traces',
-			'metrics',
-			'meter-metrics',
 		]);
 	});
 

frontend/src/container/RolesSettings/permissions.config.ts

@@ -1,12 +1,4 @@
-import {
-	Bot,
-	ChartLine,
-	DraftingCompass,
-	Gauge,
-	Key,
-	Logs,
-	Shield,
-} from '@signozhq/icons';
+import { Bot, Key, Shield } from '@signozhq/icons';
 
 import permissionsType from 'lib/authz/hooks/useAuthZ/permissions.type';
 import {
@@ -22,15 +14,12 @@ type IconComponent = typeof Shield;
 
 const OBJECT_SCOPED_VERB_SET = new Set<string>(OBJECT_SCOPED_VERBS);
 
-export type SelectorType = 'input' | 'telemetryBuilder';
-
 export interface ResourcePanelConfig {
 	label: string;
 	description: string;
 	icon: IconComponent;
 	selectorPlaceholder: string;
 	docsAnchor: string;
-	selectorType?: SelectorType;
 }
 
 /**
@@ -61,42 +50,6 @@ export const RESOURCE_PANELS: Record<AuthZResource, ResourcePanelConfig> = {
 			'Type service account ID, separate multiple with comma or space',
 		docsAnchor: 'service-account',
 	},
-	logs: {
-		label: 'Logs',
-		description: 'Log data collected across the workspace.',
-		icon: Logs,
-		selectorPlaceholder:
-			'Enter selector as <query-type>/<key>/<value> or <query-type>/* or use wizard...',
-		docsAnchor: 'logs',
-		selectorType: 'telemetryBuilder',
-	},
-	traces: {
-		label: 'Traces',
-		description: 'Distributed tracing data collected across the workspace.',
-		icon: DraftingCompass,
-		selectorPlaceholder:
-			'Enter selector as <query-type>/<key>/<value> or <query-type>/* or use wizard...',
-		docsAnchor: 'traces',
-		selectorType: 'telemetryBuilder',
-	},
-	metrics: {
-		label: 'Metrics',
-		description: 'Metric data collected across the workspace.',
-		icon: ChartLine,
-		selectorPlaceholder:
-			'Enter selector as <query-type>/<key>/<value> or <query-type>/* or use wizard...',
-		docsAnchor: 'metrics',
-		selectorType: 'telemetryBuilder',
-	},
-	'meter-metrics': {
-		label: 'Meter Metrics',
-		description: 'Usage metering data for the workspace.',
-		icon: Gauge,
-		selectorPlaceholder:
-			'Enter selector as <query-type>/<key>/<value> or <query-type>/* or use wizard...',
-		docsAnchor: 'meter-metrics',
-		selectorType: 'telemetryBuilder',
-	},
 };
 
 export const RESOURCE_ORDER = Object.keys(RESOURCE_PANELS) as AuthZResource[];

frontend/src/container/RoutingPolicies/__tests__/testUtils.ts

@@ -108,7 +108,6 @@ export function getAppContextMockState(
 		isFetchingHosts: false,
 		isFetchingFeatureFlags: false,
 		isFetchingOrgPreferences: false,
-		isFetchingUserPreferences: false,
 		userFetchError: undefined,
 		activeLicenseFetchError: null,
 		hostsFetchError: undefined,

frontend/src/container/SideNav/SideNav.tsx

@@ -144,7 +144,6 @@ function SideNav({ isPinned }: { isPinned: boolean }): JSX.Element {
 		trialInfo,
 		isLoggedIn,
 		userPreferences,
-		isFetchingUserPreferences,
 		changelog,
 		toggleChangelogModal,
 		updateUserPreferenceInContext,
@@ -262,11 +261,6 @@ function SideNav({ isPinned }: { isPinned: boolean }): JSX.Element {
 
 	// Compute initial pinned items and secondary menu items synchronously to avoid flash
 	const computedPinnedMenuItems = useMemo(() => {
-		// While loading, return empty to avoid flash
-		if (isFetchingUserPreferences) {
-			return [];
-		}
-
 		const navShortcutsPreference = userPreferences?.find(
 			(preference) => preference.name === USER_PREFERENCES.NAV_SHORTCUTS,
 		);
@@ -274,6 +268,11 @@ function SideNav({ isPinned }: { isPinned: boolean }): JSX.Element {
 			| string[]
 			| undefined;
 
+		// If userPreferences not loaded yet, return empty to avoid showing defaults before preferences load
+		if (userPreferences === null) {
+			return [];
+		}
+
 		// If preference exists with non-empty array, use stored shortcuts
 		if (isArray(navShortcuts) && navShortcuts.length > 0) {
 			return navShortcuts
@@ -283,9 +282,9 @@ function SideNav({ isPinned }: { isPinned: boolean }): JSX.Element {
 				.filter((item): item is SidebarItem => item !== undefined);
 		}
 
-		// No preference, or empty array, or error loading → use defaults
+		// No preference, or empty array → use defaults
 		return defaultMoreMenuItems.filter((item) => item.isPinned);
-	}, [isFetchingUserPreferences, userPreferences]);
+	}, [userPreferences]);
 
 	const computedSecondaryMenuItems = useMemo(() => {
 		const shouldShowIntegrationsValue =
@@ -323,16 +322,12 @@ function SideNav({ isPinned }: { isPinned: boolean }): JSX.Element {
 	// Sync state only on initial load when userPreferences first becomes available
 	useEffect(() => {
 		// Only sync once: when userPreferences loads for the first time
-		if (!hasInitializedRef.current && isFetchingUserPreferences === false) {
+		if (!hasInitializedRef.current && userPreferences !== null) {
 			setPinnedMenuItems(computedPinnedMenuItems);
 			setSecondaryMenuItems(computedSecondaryMenuItems);
 			hasInitializedRef.current = true;
 		}
-	}, [
-		computedPinnedMenuItems,
-		computedSecondaryMenuItems,
-		isFetchingUserPreferences,
-	]);
+	}, [computedPinnedMenuItems, computedSecondaryMenuItems, userPreferences]);
 
 	const isChatSupportEnabled = featureFlags?.find(
 		(flag) => flag.name === FeatureKeys.CHAT_SUPPORT,

frontend/src/lib/authz/components/PermissionDeniedCallout/PermissionDeniedCallout.test.tsx

@@ -19,7 +19,7 @@ describe('PermissionDeniedCallout', () => {
 	it('renders multiple denied permissions', () => {
 		const deniedPermissions = [
 			buildPermission('read', buildObjectString('serviceaccount', '*')),
-			buildPermission('update', buildObjectString<'update'>('role', 'admin')),
+			buildPermission('update', buildObjectString('role', 'admin')),
 		];
 		render(<PermissionDeniedCallout deniedPermissions={deniedPermissions} />);
 

frontend/src/lib/authz/components/PermissionDeniedFullPage/PermissionDeniedFullPage.test.tsx

@@ -20,7 +20,7 @@ describe('PermissionDeniedFullPage', () => {
 	it('renders with multiple denied permissions', () => {
 		const deniedPermissions = [
 			buildPermission('read', buildObjectString('role', 'admin')),
-			buildPermission('update', buildObjectString<'update'>('role', 'admin')),
+			buildPermission('update', buildObjectString('role', 'admin')),
 		];
 		render(<PermissionDeniedFullPage deniedPermissions={deniedPermissions} />);
 		expect(screen.getByText(/read:role:admin/)).toBeInTheDocument();

frontend/src/lib/authz/hooks/useAuthZ/permissions.type.ts

@@ -35,26 +35,6 @@ export default {
 					'update',
 				],
 			},
-			{
-				kind: 'logs',
-				type: 'telemetryresource',
-				allowedVerbs: ['read'],
-			},
-			{
-				kind: 'meter-metrics',
-				type: 'telemetryresource',
-				allowedVerbs: ['read'],
-			},
-			{
-				kind: 'metrics',
-				type: 'telemetryresource',
-				allowedVerbs: ['read'],
-			},
-			{
-				kind: 'traces',
-				type: 'telemetryresource',
-				allowedVerbs: ['read'],
-			},
 		],
 		relations: {
 			assignee: ['role'],
@@ -63,7 +43,7 @@ export default {
 			delete: ['metaresource', 'role', 'serviceaccount'],
 			detach: ['metaresource', 'role', 'serviceaccount'],
 			list: ['metaresource', 'role', 'serviceaccount'],
-			read: ['metaresource', 'role', 'serviceaccount', 'telemetryresource'],
+			read: ['metaresource', 'role', 'serviceaccount'],
 			update: ['metaresource', 'role', 'serviceaccount'],
 		},
 	},

frontend/src/lib/authz/hooks/useAuthZ/utils.ts

@@ -23,40 +23,6 @@ export function buildPermission<R extends AuthZRelation>(
 	return `${relation}${PermissionSeparator}${object}` as BrandedPermission;
 }
 
-/**
- * Builds an object string for use with `buildPermission`.
- *
- * ## Type Inference Behavior
- *
- * TypeScript infers `R` from `resource`. If a resource belongs to multiple relations,
- * the return type becomes a union of all matching `AuthZObject` types.
- *
- * Example: 'role' is valid for 'read', 'update', 'delete', 'assignee'.
- * Without explicit generic, return type = `AuthZObject<'read' | 'update' | 'delete' | 'assignee'>`.
- *
- * ## When to specify explicit generic
- *
- * **Needed** when resource belongs to multiple relations AND you pass result to `buildPermission`
- * with a relation that has FEWER valid resources than others:
- *
- * ```ts
- * // ERROR: 'read' includes telemetry resources, 'update' does not
- * buildPermission('update', buildObjectString('role', 'admin'))
- *
- * // OK: explicit generic narrows return type
- * buildPermission('update', buildObjectString<'update'>('role', 'admin'))
- * ```
- *
- * **Not needed** when:
- * - Resource only belongs to one relation in the constraint
- * - Using with 'read' relation (widest type, accepts all)
- * - Storing in a variable typed as `BrandedPermission` (already opaque)
- *
- * ```ts
- * // OK: 'read' is widest, accepts union return type
- * buildPermission('read', buildObjectString('role', 'admin'))
- * ```
- */
 export function buildObjectString<
 	R extends 'delete' | 'read' | 'update' | 'assignee',
 >(resource: ResourcesForRelation<R>, objectId: string): AuthZObject<R> {

frontend/src/mocks-server/__mockdata__/alerts.ts

@@ -27,6 +27,10 @@ export const slackTitleDefaultValue = `[{{ .Status | toUpper }}{{ if eq .Status
 
 export const slackDescriptionDefaultValue = `{{ range .Alerts -}} *Alert:* {{ .Labels.alertname }}{{ if .Labels.severity }} - {{ .Labels.severity }}{{ end }} *Summary:* {{ .Annotations.summary }} *Description:* {{ .Annotations.description }} *RelatedLogs:* {{ if gt (len .Annotations.related_logs) 0 -}} View in <{{ .Annotations.related_logs }}|logs explorer> {{- end}} *RelatedTraces:* {{ if gt (len .Annotations.related_traces) 0 -}} View in <{{ .Annotations.related_traces }}|traces explorer> {{- end}} *Details:* {{ range .Labels.SortedPairs }} • *{{ .Name }}:* {{ .Value }} {{ end }} {{ end }}`;
 
+export const googleChatTitleDefaultValue = `[{{ .Status | toUpper }}{{ if eq .Status "firing" }}:{{ .Alerts.Firing | len }}{{ end }}] {{ .CommonLabels.alertname }}`;
+
+export const googleChatDescriptionDefaultValue = `{{ range .Alerts -}} **Alert:** {{ .Labels.alertname }}{{ if .Labels.severity }} ({{ .Labels.severity }}){{ end }}{{ if .Annotations.summary }} **Summary:** {{ .Annotations.summary }}{{ end }}{{ if .Annotations.description }} **Description:** {{ .Annotations.description }}{{ end }} {{ end }}`;
+
 export const editSlackDescriptionDefaultValue = `{{ range .Alerts -}} *Alert:* {{ .Labels.alertname }}{{ if .Labels.severity }} - {{ .Labels.severity }}{{ end }} dummy_summary *Summary:* {{ .Annotations.summary }} *Description:* {{ .Annotations.description }} *Details:* {{ range .Labels.SortedPairs }} • *{{ .Name }}:* {{ .Value }} {{ end }} {{ end }}`;
 
 export const pagerDutyDescriptionDefaultVaule = `{{ if gt (len .Alerts.Firing) 0 -}} Alerts Firing: {{ range .Alerts.Firing }} - Message: {{ .Annotations.description }} Labels: {{ range .Labels.SortedPairs }} - {{ .Name }} = {{ .Value }} {{ end }} Annotations: {{ range .Annotations.SortedPairs }} - {{ .Name }} = {{ .Value }} {{ end }} Source: {{ .GeneratorURL }} {{ end }} {{- end }} {{ if gt (len .Alerts.Resolved) 0 -}} Alerts Resolved: {{ range .Alerts.Resolved }} - Message: {{ .Annotations.description }} Labels: {{ range .Labels.SortedPairs }} - {{ .Name }} = {{ .Value }} {{ end }} Annotations: {{ range .Annotations.SortedPairs }} - {{ .Name }} = {{ .Value }} {{ end }} Source: {{ .GeneratorURL }} {{ end }} {{- end }}`;

frontend/src/pages/ChannelsEdit/index.tsx

@@ -10,6 +10,7 @@ import Spinner from 'components/Spinner';
 import ROUTES from 'constants/routes';
 import {
 	ChannelType,
+	GoogleChatChannel,
 	MsTeamsChannel,
 	PagerChannel,
 	SlackChannel,
@@ -59,9 +60,17 @@ function ChannelsEdit(): JSX.Element {
 
 	const prepChannelConfig = (): {
 		type: string;
-		channel: SlackChannel & WebhookChannel & PagerChannel & MsTeamsChannel;
+		channel: SlackChannel &
+			WebhookChannel &
+			PagerChannel &
+			MsTeamsChannel &
+			GoogleChatChannel;
 	} => {
-		let channel: SlackChannel & WebhookChannel & PagerChannel & MsTeamsChannel = {
+		let channel: SlackChannel &
+			WebhookChannel &
+			PagerChannel &
+			MsTeamsChannel &
+			GoogleChatChannel = {
 			name: '',
 		};
 		if (value && 'slack_configs' in value) {
@@ -81,6 +90,15 @@ function ChannelsEdit(): JSX.Element {
 				channel,
 			};
 		}
+		if (value && 'googlechat_configs' in value) {
+			const [googleChatConfig] = value.googlechat_configs;
+			channel = googleChatConfig;
+			return {
+				type: ChannelType.GoogleChat,
+				channel,
+			};
+		}
+
 		if (value && 'pagerduty_configs' in value) {
 			const pagerConfig = value.pagerduty_configs[0];
 			channel = pagerConfig;

frontend/src/providers/App/App.tsx

@@ -434,7 +434,6 @@ export function AppProvider({ children }: PropsWithChildren): JSX.Element {
 			isFetchingHosts,
 			isFetchingFeatureFlags,
 			isFetchingOrgPreferences,
-			isFetchingUserPreferences,
 			userFetchError,
 			activeLicenseFetchError,
 			hostsFetchError,
@@ -465,7 +464,6 @@ export function AppProvider({ children }: PropsWithChildren): JSX.Element {
 			isFetchingHosts,
 			isFetchingFeatureFlags,
 			isFetchingOrgPreferences,
-			isFetchingUserPreferences,
 			isFetchingUser,
 			isLoggedIn,
 			hostsData,

frontend/src/providers/App/types.ts

@@ -27,7 +27,6 @@ export interface IAppContext {
 	isFetchingHosts: boolean;
 	isFetchingFeatureFlags: boolean;
 	isFetchingOrgPreferences: boolean;
-	isFetchingUserPreferences: boolean;
 	userFetchError: unknown;
 	activeLicenseFetchError: APIError | null;
 	hostsFetchError: unknown;

frontend/src/tests/test-utils.tsx

@@ -242,7 +242,6 @@ export function getAppContextMock(
 		userPreferences: [],
 		updateUserPreferenceInContext: jest.fn(),
 		isFetchingOrgPreferences: false,
-		isFetchingUserPreferences: false,
 		orgPreferencesFetchError: null,
 		isLoggedIn: true,
 		isPreflightLoading: false,

frontend/src/utils/permission/index.ts

@@ -23,11 +23,6 @@ export type ComponentTypes =
 	| 'add_panel_locked_dashboard'
 	| 'manage_llm_pricing';
 
-/**
- * @deprecated Before adding a new value here, check if what you want to add permission is supported by authz.
- * If so, read AuthZ Guidelines on how to add permission check via AuthZ.
- * If not, you can keep adding to this record.
- */
 export const componentPermission: Record<ComponentTypes, ROLES[]> = {
 	current_org_settings: ['ADMIN'],
 	invite_members: ['ADMIN'],
@@ -51,16 +46,11 @@ export const componentPermission: Record<ComponentTypes, ROLES[]> = {
 	manage_llm_pricing: ['ADMIN'],
 };
 
-/**
- * @deprecated You can still add new permissions/routes here but be aware if this page/module supports authz.
- * If so, also implement the correct authz checks in the page itself, and here you can add ADMIN/EDITOR/VIEWER,
- * and also update/include the route at {@link routeWithInitialAuthZSupport}
- */
 export const routePermission: Record<keyof typeof ROUTES, ROLES[]> = {
 	HOME: ['ADMIN', 'EDITOR', 'VIEWER'],
 	ALERTS_NEW: ['ADMIN', 'EDITOR'],
 	ORG_SETTINGS: ['ADMIN'],
-	MY_SETTINGS: ['ADMIN', 'EDITOR', 'VIEWER'],
+	MY_SETTINGS: ['ADMIN', 'EDITOR', 'VIEWER', 'ANONYMOUS'],
 	SERVICE_MAP: ['ADMIN', 'EDITOR', 'VIEWER'],
 	ALL_CHANNELS: ['ADMIN', 'EDITOR', 'VIEWER'],
 	INGESTION_SETTINGS: ['ADMIN', 'EDITOR', 'VIEWER'],
@@ -85,15 +75,13 @@ export const routePermission: Record<keyof typeof ROUTES, ROLES[]> = {
 	NOT_FOUND: ['ADMIN', 'VIEWER', 'EDITOR', 'ANONYMOUS'],
 	PASSWORD_RESET: ['ADMIN', 'EDITOR', 'VIEWER'],
 	SERVICE_METRICS: ['ADMIN', 'EDITOR', 'VIEWER'],
-	SETTINGS: ['ADMIN', 'EDITOR', 'VIEWER'],
+	SETTINGS: ['ADMIN', 'EDITOR', 'VIEWER', 'ANONYMOUS'],
 	SIGN_UP: ['ADMIN', 'EDITOR', 'VIEWER'],
 	TRACES_EXPLORER: ['ADMIN', 'EDITOR', 'VIEWER'],
 	TRACE: ['ADMIN', 'EDITOR', 'VIEWER'],
 	TRACE_DETAIL: ['ADMIN', 'EDITOR', 'VIEWER'],
 	TRACE_DETAIL_OLD: ['ADMIN', 'EDITOR', 'VIEWER'],
-	// Every role must be able to land here - a role missing from this list is
-	// redirected to /un-authorized and then redirected off it again, looping.
-	UN_AUTHORIZED: ['ADMIN', 'EDITOR', 'VIEWER', 'ANONYMOUS', 'AUTHOR'],
+	UN_AUTHORIZED: ['ADMIN', 'EDITOR', 'VIEWER', 'ANONYMOUS'],
 	USAGE_EXPLORER: ['ADMIN', 'EDITOR', 'VIEWER'],
 	VERSION: ['ADMIN', 'EDITOR', 'VIEWER'],
 	LOGS: ['ADMIN', 'EDITOR', 'VIEWER'],
@@ -107,12 +95,12 @@ export const routePermission: Record<keyof typeof ROUTES, ROLES[]> = {
 	GET_STARTED_WITH_CLOUD: ['ADMIN', 'EDITOR'],
 	WORKSPACE_LOCKED: ['ADMIN', 'EDITOR', 'VIEWER'],
 	WORKSPACE_SUSPENDED: ['ADMIN', 'EDITOR', 'VIEWER'],
-	ROLES_SETTINGS: ['ADMIN', 'EDITOR', 'VIEWER'],
-	ROLE_CREATE: ['ADMIN', 'EDITOR', 'VIEWER'],
-	ROLE_DETAILS: ['ADMIN', 'EDITOR', 'VIEWER'],
-	ROLE_EDIT: ['ADMIN', 'EDITOR', 'VIEWER'],
+	ROLES_SETTINGS: ['ADMIN', 'EDITOR', 'VIEWER', 'ANONYMOUS'],
+	ROLE_CREATE: ['ADMIN', 'EDITOR', 'VIEWER', 'ANONYMOUS'],
+	ROLE_DETAILS: ['ADMIN', 'EDITOR', 'VIEWER', 'ANONYMOUS'],
+	ROLE_EDIT: ['ADMIN', 'EDITOR', 'VIEWER', 'ANONYMOUS'],
 	MEMBERS_SETTINGS: ['ADMIN'],
-	SERVICE_ACCOUNTS_SETTINGS: ['ADMIN', 'EDITOR', 'VIEWER'],
+	SERVICE_ACCOUNTS_SETTINGS: ['ADMIN', 'EDITOR', 'VIEWER', 'ANONYMOUS'],
 	BILLING: ['ADMIN'],
 	SUPPORT: ['ADMIN', 'EDITOR', 'VIEWER', 'ANONYMOUS'],
 	SOMETHING_WENT_WRONG: ['ADMIN', 'EDITOR', 'VIEWER'],
@@ -153,34 +141,3 @@ export const routePermission: Record<keyof typeof ROUTES, ROLES[]> = {
 	AI_OBSERVABILITY_OVERVIEW: ['ADMIN', 'EDITOR', 'VIEWER'],
 	AI_OBSERVABILITY_CONFIGURATION: ['ADMIN', 'EDITOR', 'VIEWER'],
 };
-
-/**
- * Any route that will start be supported under AuthZ should be added here.
- * This will help correctly identify when fallback to show the page
- * or just return unauthorized.
- *
- * This prevents us from adding `ANONYMOUS` on the `routePermission`
- */
-export const routeWithInitialAuthZSupport = {
-	MY_SETTINGS: true,
-	SETTINGS: true,
-	TRACES_EXPLORER: true,
-	TRACE: true,
-	TRACE_DETAIL: true,
-	TRACE_DETAIL_OLD: true,
-	LOGS: true,
-	LOGS_EXPLORER: true,
-	LIVE_LOGS: true,
-	ROLES_SETTINGS: true,
-	ROLE_CREATE: true,
-	ROLE_DETAILS: true,
-	ROLE_EDIT: true,
-	SERVICE_ACCOUNTS_SETTINGS: true,
-	SUPPORT: true,
-	OLD_LOGS_EXPLORER: true,
-	METRICS_EXPLORER: true,
-	METRICS_EXPLORER_EXPLORER: true,
-	METRICS_EXPLORER_VOLUME_CONTROL: true,
-	METER_EXPLORER: true,
-	METER: true,
-} as const satisfies Partial<Record<keyof typeof ROUTES, true>>;

pkg/alertmanager/alertmanagernotify/googlechat/googlechat.go

@@ -0,0 +1,298 @@
+package googlechat
+
+import (
+	"bytes"
+	"context"
+	"encoding/json"
+	"fmt"
+	"log/slog"
+	"net/http"
+	"net/url"
+	"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/SigNoz/signoz/pkg/types/ruletypes"
+	"github.com/prometheus/alertmanager/notify"
+	"github.com/prometheus/alertmanager/template"
+	"github.com/prometheus/alertmanager/types"
+	"github.com/prometheus/common/model"
+)
+
+func New(conf *alertmanagertypes.GoogleChatReceiverConfig, t *template.Template, l *slog.Logger, templater alertmanagertypes.Templater) (*Notifier, error) {
+	if conf.HTTPConfig == nil {
+		return nil, errors.New(errors.TypeInvalidInput, errors.CodeInvalidInput, "google chat http_config is nil")
+	}
+	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
+	}
+	// Empty title and every body empty means a misconfigured template, so fail
+	// loudly and non-retryably instead of sending a card with no content.
+	if c.title == "" && !isAnyNonEmpty(c.bodies) {
+		return false, errors.New(errors.TypeInvalidInput, errors.CodeInvalidInput, "google chat message rendered empty; check the channel title/text templates")
+	}
+
+	status := statusLine(alerts)
+
+	// Cap per-alert sections well under Google Chat's 100-widget limit and keep
+	// the card readable; the overflow count drives a "+N more" note. Capping
+	// before the size guard keeps the trim loop working only on rendered bodies.
+	capAlerts, capBodies, remaining := capAlertSections(alerts, c.bodies)
+
+	// Serialized-size guard: keep the payload within Google Chat's byte limit by
+	// trimming the longest body first, then the title (which appears in both the
+	// summary and the card header). Banners/buttons are small and bounded, so
+	// trimming the text fields always brings the payload under the limit.
+	title := c.title
+	bodies := append([]string(nil), capBodies...)
+	buf, err := encodeMessage(buildMessage(title, status, capAlerts, bodies, remaining))
+	if err != nil {
+		return false, err
+	}
+	for buf.Len() > maxMessageBytes {
+		over := buf.Len() - maxMessageBytes
+		if i := longestBodyIndex(bodies); i >= 0 {
+			bodies[i] = truncateToByteLimit(bodies[i], max(len(bodies[i])-over, 0))
+		} else if title != "" {
+			title = truncateToByteLimit(title, max(len(title)-over, 0))
+		} else {
+			break
+		}
+		if buf, err = encodeMessage(buildMessage(title, status, capAlerts, bodies, remaining)); 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. The title is used as a plain
+// summary + card header; the body is converted to HTML for the card text widget.
+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
+	}
+
+	// Each body goes into a per-alert card textParagraph, which renders HTML.
+	// Default and custom templates are both standard markdown, so convert each
+	// one. Bold/links/lists/code render well; tables flatten (rare in alerts).
+	bodies := make([]string, len(result.Body))
+	for i, body := range result.Body {
+		if body == "" {
+			continue
+		}
+		html, err := markdownrenderer.RenderHTML(body)
+		if err != nil {
+			return content{}, err
+		}
+		bodies[i] = html
+	}
+
+	return content{title: result.Title, bodies: bodies}, nil
+}
+
+// statusLine returns a colored firing/resolved banner for the card body.
+func statusLine(alerts []*types.Alert) string {
+	if types.Alerts(alerts...).Status() == model.AlertResolved {
+		return `<font color="#33a853"><b>🟢 RESOLVED</b></font>`
+	}
+	return `<font color="#d32f2f"><b>🔴 FIRING</b></font>`
+}
+
+// relatedButtons builds the per-alert "View Related Logs/Traces" buttons from
+// the annotations the ruler attaches to each alert. Empty links are skipped.
+func relatedButtons(alert *types.Alert) []button {
+	var buttons []button
+	add := func(text, u string) {
+		if u != "" {
+			buttons = append(buttons, button{Text: text, OnClick: onClick{OpenLink: openLink{URL: u}}})
+		}
+	}
+	add("View Related Logs", string(alert.Annotations[ruletypes.AnnotationRelatedLogs]))
+	add("View Related Traces", string(alert.Annotations[ruletypes.AnnotationRelatedTraces]))
+	return buttons
+}
+
+// sigNozButton builds the shared "Open in SigNoz" button from the ruleSource
+// label, which is per-rule (identical for every alert in the group).
+func sigNozButton(alert *types.Alert) *button {
+	if u := string(alert.Labels[ruletypes.LabelRuleSource]); u != "" {
+		return &button{Text: "Open in SigNoz", OnClick: onClick{OpenLink: openLink{URL: u}}}
+	}
+	return nil
+}
+
+// capAlertSections keeps the first maxAlertSections non-empty bodies (with their
+// aligned alerts) and returns the count of non-empty bodies dropped beyond the
+// cap. Capping the render set up front keeps the card within Google Chat's
+// widget limit and bounds the size-guard trim loop.
+func capAlertSections(alerts []*types.Alert, bodies []string) ([]*types.Alert, []string, int) {
+	capAlerts := make([]*types.Alert, 0, maxAlertSections)
+	capBodies := make([]string, 0, maxAlertSections)
+	remaining := 0
+	for i, body := range bodies {
+		if body == "" {
+			continue
+		}
+		if len(capBodies) >= maxAlertSections {
+			remaining++
+			continue
+		}
+		var alert *types.Alert
+		if i < len(alerts) {
+			alert = alerts[i]
+		}
+		capAlerts = append(capAlerts, alert)
+		capBodies = append(capBodies, body)
+	}
+	return capAlerts, capBodies, remaining
+}
+
+// buildMessage assembles the text+card payload: a plain text summary plus a card
+// with a status banner, one section per alert (its body + related-link buttons),
+// an optional "+N more" note, and a shared "Open in SigNoz" footer button. The
+// alerts and bodies slices are the already-capped, aligned render set.
+func buildMessage(title, statusHTML string, alerts []*types.Alert, bodies []string, remaining int) Message {
+	sections := []cardSection{{Widgets: []widget{{TextParagraph: &textParagraph{Text: statusHTML}}}}}
+
+	for i, body := range bodies {
+		if body == "" {
+			continue
+		}
+		widgets := []widget{{TextParagraph: &textParagraph{Text: body}}}
+		if i < len(alerts) && alerts[i] != nil {
+			if btns := relatedButtons(alerts[i]); len(btns) > 0 {
+				widgets = append(widgets, widget{ButtonList: &buttonList{Buttons: btns}})
+			}
+		}
+		sections = append(sections, cardSection{Widgets: widgets})
+	}
+
+	if remaining > 0 {
+		note := fmt.Sprintf("<i>…and %d more alerts. Open in SigNoz for the full list.</i>", remaining)
+		sections = append(sections, cardSection{Widgets: []widget{{TextParagraph: &textParagraph{Text: note}}}})
+	}
+
+	if len(alerts) > 0 && alerts[0] != nil {
+		if btn := sigNozButton(alerts[0]); btn != nil {
+			sections = append(sections, cardSection{Widgets: []widget{{ButtonList: &buttonList{Buttons: []button{*btn}}}}})
+		}
+	}
+
+	return Message{
+		Text: title,
+		CardsV2: []cardWithID{{
+			CardID: "signoz-alert",
+			Card:   card{Header: &cardHeader{Title: title}, Sections: sections},
+		}},
+	}
+}
+
+// isAnyNonEmpty reports whether any string in ss is non-empty.
+func isAnyNonEmpty(ss []string) bool {
+	for _, s := range ss {
+		if s != "" {
+			return true
+		}
+	}
+	return false
+}
+
+// longestBodyIndex returns the index of the longest non-empty body, or -1 when
+// all bodies are empty.
+func longestBodyIndex(bodies []string) int {
+	idx, best := -1, 0
+	for i, b := range bodies {
+		if len(b) > best {
+			idx, best = i, len(b)
+		}
+	}
+	return idx
+}
+
+func encodeMessage(msg Message) (*bytes.Buffer, error) {
+	var buf bytes.Buffer
+	if err := json.NewEncoder(&buf).Encode(msg); err != nil {
+		return nil, err
+	}
+	return &buf, 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,551 @@
+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()
+
+	n := newTestNotifier(t, server.URL, "TITLE", "BODY")
+	retry, err := n.Notify(newTestContext(), newTestAlerts("TestAlert")...)
+
+	require.NoError(t, err)
+	require.False(t, retry)
+	// Title is the plain summary + card header; body lives in a card widget.
+	require.Equal(t, "TITLE", got.Text)
+	require.Equal(t, "TITLE", got.CardsV2[0].Card.Header.Title)
+	require.Contains(t, cardBody(t, got), "BODY")
+}
+
+// cardBody concatenates the text of all textParagraph widgets in the message.
+func cardBody(t *testing.T, m Message) string {
+	t.Helper()
+	require.NotEmpty(t, m.CardsV2)
+	var b strings.Builder
+	for _, s := range m.CardsV2[0].Card.Sections {
+		for _, w := range s.Widgets {
+			if w.TextParagraph != nil {
+				b.WriteString(w.TextParagraph.Text)
+				b.WriteByte('\n')
+			}
+		}
+	}
+	return b.String()
+}
+
+// cardButtons returns all buttons across every buttonList widget in the card.
+func cardButtons(t *testing.T, m Message) []button {
+	t.Helper()
+	require.NotEmpty(t, m.CardsV2)
+	var buttons []button
+	for _, s := range m.CardsV2[0].Card.Sections {
+		for _, w := range s.Widgets {
+			if w.ButtonList != nil {
+				buttons = append(buttons, w.ButtonList.Buttons...)
+			}
+		}
+	}
+	return buttons
+}
+
+// cardSectionCount returns the number of sections in the card.
+func cardSectionCount(t *testing.T, m Message) int {
+	t.Helper()
+	require.NotEmpty(t, m.CardsV2)
+	return len(m.CardsV2[0].Card.Sections)
+}
+
+func TestGoogleChatNilHTTPConfig(t *testing.T) {
+	// A nil HTTPConfig must fail cleanly, not panic on the *conf.HTTPConfig deref.
+	tmpl := test.CreateTmpl(t)
+	n, err := New(&alertmanagertypes.GoogleChatReceiverConfig{
+		HTTPConfig: nil,
+		WebhookURL: secretURLFromString(t, "https://chat.googleapis.com/v1/spaces/test/messages"),
+	}, tmpl, slog.New(slog.DiscardHandler), newTestTemplater(tmpl))
+	require.Error(t, err)
+	require.Nil(t, n)
+}
+
+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)
+
+	// Custom body is standard markdown → converted to card HTML.
+	body := cardBody(t, got)
+	require.Contains(t, body, "<strong>bold</strong>", "** should convert to HTML bold")
+	require.Contains(t, body, `<a href="https://x">link</a>`, "[t](u) should convert to an HTML link")
+}
+
+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)
+}
+
+func TestGoogleChatLinkButtons(t *testing.T) {
+	cases := []struct {
+		name        string
+		labels      model.LabelSet
+		annotations model.LabelSet
+		wantButtons map[string]string
+	}{
+		{
+			name: "all links present",
+			labels: model.LabelSet{
+				"alertname":               "X",
+				ruletypes.LabelRuleSource: "https://signoz.example/alerts/1",
+			},
+			annotations: model.LabelSet{
+				ruletypes.AnnotationRelatedLogs:   "https://signoz.example/logs",
+				ruletypes.AnnotationRelatedTraces: "https://signoz.example/traces",
+			},
+			wantButtons: map[string]string{
+				"Open in SigNoz":      "https://signoz.example/alerts/1",
+				"View Related Logs":   "https://signoz.example/logs",
+				"View Related Traces": "https://signoz.example/traces",
+			},
+		},
+		{
+			name:        "no links → no buttons",
+			labels:      model.LabelSet{"alertname": "X"},
+			annotations: model.LabelSet{"summary": "s"},
+			wantButtons: map[string]string{},
+		},
+	}
+	for _, c := range cases {
+		t.Run(c.name, func(t *testing.T) {
+			var got Message
+			server := captureServer(t, &got)
+			defer server.Close()
+
+			alerts := []*types.Alert{{Alert: model.Alert{
+				Labels:      c.labels,
+				Annotations: c.annotations,
+				StartsAt:    time.Now(),
+				EndsAt:      time.Now().Add(time.Minute),
+			}}}
+			// Non-empty body so the alert section (which carries related buttons) exists.
+			n := newTestNotifier(t, server.URL, "T", "an alert")
+			_, err := n.Notify(newTestContext(), alerts...)
+			require.NoError(t, err)
+
+			buttons := cardButtons(t, got)
+			require.Len(t, buttons, len(c.wantButtons))
+			for _, b := range buttons {
+				require.Equal(t, c.wantButtons[b.Text], b.OnClick.OpenLink.URL, "button %q", b.Text)
+			}
+		})
+	}
+}
+
+func TestGoogleChatMultiAlertSections(t *testing.T) {
+	var got Message
+	server := captureServer(t, &got)
+	defer server.Close()
+
+	// A per-alert custom body template yields one card section per alert, each
+	// with that alert's own related-link buttons, plus one shared SigNoz button.
+	mkAlert := func(pod, logs string) *types.Alert {
+		return &types.Alert{Alert: model.Alert{
+			Labels: model.LabelSet{
+				"alertname":               "X",
+				"pod":                     model.LabelValue(pod),
+				ruletypes.LabelRuleSource: "https://signoz.example/alerts/1",
+			},
+			Annotations: model.LabelSet{
+				ruletypes.AnnotationBodyTemplate: "an alert fired",
+				ruletypes.AnnotationRelatedLogs:  model.LabelValue(logs),
+			},
+			StartsAt: time.Now(),
+			EndsAt:   time.Now().Add(time.Minute),
+		}}
+	}
+	alerts := []*types.Alert{
+		mkAlert("pod-1", "https://signoz.example/logs?pod=pod-1"),
+		mkAlert("pod-2", "https://signoz.example/logs?pod=pod-2"),
+	}
+	n := newTestNotifier(t, server.URL, "T", "default body")
+	_, err := n.Notify(newTestContext(), alerts...)
+	require.NoError(t, err)
+
+	// banner + one section per alert + shared SigNoz footer.
+	require.Equal(t, 4, cardSectionCount(t, got))
+
+	sigNoz := 0
+	logsURLs := map[string]bool{}
+	for _, b := range cardButtons(t, got) {
+		switch b.Text {
+		case "Open in SigNoz":
+			sigNoz++
+		case "View Related Logs":
+			logsURLs[b.OnClick.OpenLink.URL] = true
+		}
+	}
+	require.Equal(t, 1, sigNoz, "SigNoz button must appear once (shared, per-rule)")
+	require.True(t, logsURLs["https://signoz.example/logs?pod=pod-1"], "pod-1's logs button")
+	require.True(t, logsURLs["https://signoz.example/logs?pod=pod-2"], "pod-2's logs button")
+}
+
+func TestGoogleChatDefaultBodyGrouped(t *testing.T) {
+	var got Message
+	server := captureServer(t, &got)
+	defer server.Close()
+
+	// Default body template (no per-alert annotation): the templater combines all
+	// grouped alerts into ONE section, carrying only the first alert's buttons.
+	mkAlert := func(pod string) *types.Alert {
+		return &types.Alert{Alert: model.Alert{
+			Labels: model.LabelSet{
+				"alertname":               "X",
+				"pod":                     model.LabelValue(pod),
+				ruletypes.LabelRuleSource: "https://signoz.example/alerts/1",
+			},
+			Annotations: model.LabelSet{
+				ruletypes.AnnotationRelatedLogs: model.LabelValue("https://signoz.example/logs?pod=" + pod),
+			},
+			StartsAt: time.Now(),
+			EndsAt:   time.Now().Add(time.Minute),
+		}}
+	}
+	alerts := []*types.Alert{mkAlert("pod-1"), mkAlert("pod-2")}
+	n := newTestNotifier(t, server.URL, "T", "{{ range .Alerts }}pod {{ .Labels.pod }} {{ end }}")
+	_, err := n.Notify(newTestContext(), alerts...)
+	require.NoError(t, err)
+
+	// banner + one combined alert section + shared SigNoz footer = 3 sections.
+	require.Equal(t, 3, cardSectionCount(t, got))
+
+	body := cardBody(t, got)
+	require.Contains(t, body, "pod-1")
+	require.Contains(t, body, "pod-2", "default template combines all alerts into one section")
+
+	logs := 0
+	for _, b := range cardButtons(t, got) {
+		if b.Text == "View Related Logs" {
+			logs++
+		}
+	}
+	require.Equal(t, 1, logs, "default path surfaces only the first alert's related buttons")
+}
+
+func TestGoogleChatSectionCap(t *testing.T) {
+	var got Message
+	server := captureServer(t, &got)
+	defer server.Close()
+
+	// 35 grouped alerts (custom body → per-alert bodies) exceed the 30 cap.
+	const total = 35
+	alerts := make([]*types.Alert, 0, total)
+	for range total {
+		alerts = append(alerts, &types.Alert{Alert: model.Alert{
+			Labels: model.LabelSet{
+				"alertname":               "X",
+				ruletypes.LabelRuleSource: "https://signoz.example/alerts/1",
+			},
+			Annotations: model.LabelSet{ruletypes.AnnotationBodyTemplate: "an alert fired"},
+			StartsAt:    time.Now(),
+			EndsAt:      time.Now().Add(time.Minute),
+		}})
+	}
+	n := newTestNotifier(t, server.URL, "T", "default body")
+	_, err := n.Notify(newTestContext(), alerts...)
+	require.NoError(t, err)
+
+	// banner + 30 alert sections + "+N more" note + shared SigNoz footer.
+	require.Equal(t, 1+maxAlertSections+1+1, cardSectionCount(t, got))
+
+	body := cardBody(t, got)
+	require.Contains(t, body, "5 more alerts", "overflow note must state the dropped count")
+
+	// The SigNoz footer must survive after the note (last section).
+	sigNoz := 0
+	for _, b := range cardButtons(t, got) {
+		if b.Text == "Open in SigNoz" {
+			sigNoz++
+		}
+	}
+	require.Equal(t, 1, sigNoz, "SigNoz footer must be present despite the cap")
+}
+
+func TestGoogleChatStatusLine(t *testing.T) {
+	cases := []struct {
+		name     string
+		resolved bool
+		want     string
+	}{
+		{"firing", false, "🔴 FIRING"},
+		{"resolved", true, "🟢 RESOLVED"},
+	}
+	for _, c := range cases {
+		t.Run(c.name, func(t *testing.T) {
+			var got Message
+			server := captureServer(t, &got)
+			defer server.Close()
+
+			endsAt := time.Now().Add(time.Minute)
+			if c.resolved {
+				endsAt = time.Now().Add(-time.Minute) // EndsAt in the past → resolved
+			}
+			alerts := []*types.Alert{{Alert: model.Alert{
+				Labels:   model.LabelSet{"alertname": "X"},
+				StartsAt: time.Now().Add(-2 * time.Minute),
+				EndsAt:   endsAt,
+			}}}
+			n := newTestNotifier(t, server.URL, "T", "")
+			_, err := n.Notify(newTestContext(), alerts...)
+			require.NoError(t, err)
+
+			require.Contains(t, cardBody(t, got), c.want)
+		})
+	}
+}

pkg/alertmanager/alertmanagernotify/googlechat/types.go

@@ -0,0 +1,95 @@
+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
+	// maxAlertSections caps per-alert sections in a grouped card. Google Chat
+	// allows 100 widgets per card and silently drops the section that crosses
+	// that count and every section after it, so we cap well under the limit
+	// (~63 widgets worst case) and add a "+N more" note for the overflow.
+	// https://developers.google.com/workspace/chat/api/reference/rpc/google.apps.card.v1#card
+	maxAlertSections = 30
+)
+
+// 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. A message carries a short text
+// summary (space list / push preview) and a rich card.
+type Message struct {
+	Text    string       `json:"text,omitempty"`
+	CardsV2 []cardWithID `json:"cardsV2,omitempty"`
+}
+
+type cardWithID struct {
+	CardID string `json:"cardId"`
+	Card   card   `json:"card"`
+}
+
+type card struct {
+	Header   *cardHeader   `json:"header,omitempty"`
+	Sections []cardSection `json:"sections"`
+}
+
+type cardHeader struct {
+	Title    string `json:"title,omitempty"`
+	Subtitle string `json:"subtitle,omitempty"`
+}
+
+type cardSection struct {
+	Header  string   `json:"header,omitempty"`
+	Widgets []widget `json:"widgets"`
+}
+
+// widget is a one-of: exactly one field is set per instance.
+type widget struct {
+	TextParagraph *textParagraph `json:"textParagraph,omitempty"`
+	ButtonList    *buttonList    `json:"buttonList,omitempty"`
+}
+
+type textParagraph struct {
+	Text string `json:"text"`
+}
+
+type buttonList struct {
+	Buttons []button `json:"buttons"`
+}
+
+type button struct {
+	Text    string  `json:"text"`
+	OnClick onClick `json:"onClick"`
+}
+
+type onClick struct {
+	OpenLink openLink `json:"openLink"`
+}
+
+type openLink struct {
+	URL string `json:"url"`
+}
+
+// content holds the rendered title and the HTML bodies for a Google Chat message.
+// bodies is per-alert (positionally aligned with the alerts slice) for a custom
+// body template, but a single combined entry for the default template.
+type content struct {
+	title  string
+	bodies []string
+}

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/cloudstorage/assets/dashboards/overview.json

@@ -1,956 +0,0 @@
-{
-  "schemaVersion": "v6",
-  "image": "/assets/Logos/gcp-cloud-storage",
-  "name": "",
-  "generateName": true,
-  "tags": [
-    {
-      "key": "tag",
-      "value": "observability"
-    }
-  ],
-  "spec": {
-    "display": {
-      "name": "GCP Cloud Storage Overview",
-      "description": "Dashboard for GCP Cloud Storage overview"
-    },
-    "variables": [
-      {
-        "kind": "ListVariable",
-        "spec": {
-          "display": {
-            "name": "project_id",
-            "description": "GCP Project ID"
-          },
-          "allowAllValue": false,
-          "allowMultiple": false,
-          "customAllValue": "",
-          "capturingRegexp": "",
-          "sort": "none",
-          "plugin": {
-            "kind": "signoz/DynamicVariable",
-            "spec": {
-              "name": "project_id",
-              "signal": "metrics"
-            }
-          },
-          "name": "project_id"
-        }
-      },
-      {
-        "kind": "ListVariable",
-        "spec": {
-          "display": {
-            "name": "bucket_name",
-            "description": "GCS bucket name"
-          },
-          "allowAllValue": true,
-          "allowMultiple": true,
-          "customAllValue": "",
-          "capturingRegexp": "",
-          "sort": "none",
-          "plugin": {
-            "kind": "signoz/DynamicVariable",
-            "spec": {
-              "name": "bucket_name",
-              "signal": "metrics"
-            }
-          },
-          "name": "bucket_name"
-        }
-      }
-    ],
-    "panels": {
-      "1f0a4d5b-6c2e-4a71-8b3d-9e5c07a41d20": {
-        "kind": "Panel",
-        "spec": {
-          "display": {
-            "name": "Bucket size",
-            "description": "Total size of all objects in the bucket, grouped by storage class."
-          },
-          "plugin": {
-            "kind": "signoz/TablePanel",
-            "spec": {
-              "visualization": {
-                "timePreference": "global_time"
-              },
-              "formatting": {
-                "columnUnits": {
-                  "A": "By"
-                },
-                "decimalPrecision": "2"
-              },
-              "thresholds": null
-            }
-          },
-          "queries": [
-            {
-              "kind": "scalar",
-              "spec": {
-                "name": "A",
-                "plugin": {
-                  "kind": "signoz/BuilderQuery",
-                  "spec": {
-                    "name": "A",
-                    "signal": "metrics",
-                    "source": "",
-                    "aggregations": [
-                      {
-                        "metricName": "storage.googleapis.com/storage/v2/total_bytes",
-                        "temporality": "",
-                        "timeAggregation": "latest",
-                        "spaceAggregation": "sum",
-                        "reduceTo": "last"
-                      }
-                    ],
-                    "disabled": false,
-                    "filter": {
-                      "expression": "project_id = $project_id AND bucket_name in $bucket_name AND gcp.resource_type = 'gcs_bucket'"
-                    },
-                    "groupBy": [
-                      {
-                        "name": "bucket_name",
-                        "signal": "",
-                        "fieldContext": "attribute",
-                        "fieldDataType": "string"
-                      },
-                      {
-                        "name": "storage_class",
-                        "signal": "",
-                        "fieldContext": "attribute",
-                        "fieldDataType": "string"
-                      }
-                    ],
-                    "order": [],
-                    "having": {
-                      "expression": ""
-                    },
-                    "functions": [],
-                    "legend": "Size"
-                  }
-                }
-              }
-            }
-          ],
-          "links": []
-        }
-      },
-      "29ed9824-21db-44c3-9537-12be458f5c20": {
-        "kind": "Panel",
-        "spec": {
-          "display": {
-            "name": "Total object bytes",
-            "description": "Total size of all objects in the bucket, grouped by storage class and type."
-          },
-          "plugin": {
-            "kind": "signoz/TimeSeriesPanel",
-            "spec": {
-              "visualization": {
-                "timePreference": "global_time",
-                "fillSpans": false
-              },
-              "formatting": {
-                "unit": "By",
-                "decimalPrecision": "2"
-              },
-              "chartAppearance": {
-                "lineInterpolation": "spline",
-                "showPoints": false,
-                "lineStyle": "solid",
-                "fillMode": "none",
-                "spanGaps": {
-                  "fillOnlyBelow": false,
-                  "fillLessThan": ""
-                }
-              },
-              "axes": {
-                "softMin": 0,
-                "softMax": 0,
-                "isLogScale": false
-              },
-              "legend": {
-                "position": "right",
-                "mode": "list",
-                "customColors": null
-              },
-              "thresholds": null
-            }
-          },
-          "queries": [
-            {
-              "kind": "time_series",
-              "spec": {
-                "name": "A",
-                "plugin": {
-                  "kind": "signoz/BuilderQuery",
-                  "spec": {
-                    "name": "A",
-                    "signal": "metrics",
-                    "source": "",
-                    "aggregations": [
-                      {
-                        "metricName": "storage.googleapis.com/storage/v2/total_bytes",
-                        "temporality": "",
-                        "timeAggregation": "latest",
-                        "spaceAggregation": "sum",
-                        "reduceTo": "avg"
-                      }
-                    ],
-                    "disabled": false,
-                    "filter": {
-                      "expression": "project_id = $project_id AND bucket_name in $bucket_name AND gcp.resource_type = 'gcs_bucket'"
-                    },
-                    "groupBy": [
-                      {
-                        "name": "bucket_name",
-                        "signal": "",
-                        "fieldContext": "attribute",
-                        "fieldDataType": "string"
-                      },
-                      {
-                        "name": "storage_class",
-                        "signal": "",
-                        "fieldContext": "attribute",
-                        "fieldDataType": "string"
-                      },
-                      {
-                        "name": "type",
-                        "signal": "",
-                        "fieldContext": "attribute",
-                        "fieldDataType": "string"
-                      }
-                    ],
-                    "order": [],
-                    "having": {
-                      "expression": ""
-                    },
-                    "functions": [],
-                    "legend": "{{bucket_name}}/{{storage_class}}/{{type}}"
-                  }
-                }
-              }
-            }
-          ],
-          "links": []
-        }
-      },
-      "cbc53174-5527-4bce-b32d-317403849e48": {
-        "kind": "Panel",
-        "spec": {
-          "display": {
-            "name": "Total object count",
-            "description": "Total number of objects and multipart-uploads per bucket, grouped by storage class and type, where type can be live-object, noncurrent-object, soft-deleted-object or multipart-upload."
-          },
-          "plugin": {
-            "kind": "signoz/TimeSeriesPanel",
-            "spec": {
-              "visualization": {
-                "timePreference": "global_time",
-                "fillSpans": false
-              },
-              "formatting": {
-                "unit": "{count}",
-                "decimalPrecision": "2"
-              },
-              "chartAppearance": {
-                "lineInterpolation": "spline",
-                "showPoints": false,
-                "lineStyle": "solid",
-                "fillMode": "none",
-                "spanGaps": {
-                  "fillOnlyBelow": false,
-                  "fillLessThan": ""
-                }
-              },
-              "axes": {
-                "softMin": 0,
-                "softMax": 0,
-                "isLogScale": false
-              },
-              "legend": {
-                "position": "right",
-                "mode": "list",
-                "customColors": null
-              },
-              "thresholds": null
-            }
-          },
-          "queries": [
-            {
-              "kind": "time_series",
-              "spec": {
-                "name": "A",
-                "plugin": {
-                  "kind": "signoz/BuilderQuery",
-                  "spec": {
-                    "name": "A",
-                    "signal": "metrics",
-                    "source": "",
-                    "aggregations": [
-                      {
-                        "metricName": "storage.googleapis.com/storage/v2/total_count",
-                        "temporality": "",
-                        "timeAggregation": "latest",
-                        "spaceAggregation": "sum",
-                        "reduceTo": "avg"
-                      }
-                    ],
-                    "disabled": false,
-                    "filter": {
-                      "expression": "project_id = $project_id AND bucket_name in $bucket_name AND gcp.resource_type = 'gcs_bucket'"
-                    },
-                    "groupBy": [
-                      {
-                        "name": "bucket_name",
-                        "signal": "",
-                        "fieldContext": "attribute",
-                        "fieldDataType": "string"
-                      },
-                      {
-                        "name": "storage_class",
-                        "signal": "",
-                        "fieldContext": "attribute",
-                        "fieldDataType": "string"
-                      },
-                      {
-                        "name": "type",
-                        "signal": "",
-                        "fieldContext": "attribute",
-                        "fieldDataType": "string"
-                      }
-                    ],
-                    "order": [],
-                    "having": {
-                      "expression": ""
-                    },
-                    "functions": [],
-                    "legend": "{{bucket_name}}/{{storage_class}}/{{type}}"
-                  }
-                }
-              }
-            }
-          ],
-          "links": []
-        }
-      },
-      "76e70ce5-47e4-4b5b-9715-49fa21c58b0c": {
-        "kind": "Panel",
-        "spec": {
-          "display": {
-            "name": "Deleted bytes",
-            "description": "Rate of deleted bytes per bucket, grouped by storage class."
-          },
-          "plugin": {
-            "kind": "signoz/TimeSeriesPanel",
-            "spec": {
-              "visualization": {
-                "timePreference": "global_time",
-                "fillSpans": false
-              },
-              "formatting": {
-                "unit": "By/s",
-                "decimalPrecision": "2"
-              },
-              "chartAppearance": {
-                "lineInterpolation": "spline",
-                "showPoints": false,
-                "lineStyle": "solid",
-                "fillMode": "none",
-                "spanGaps": {
-                  "fillOnlyBelow": false,
-                  "fillLessThan": ""
-                }
-              },
-              "axes": {
-                "softMin": 0,
-                "softMax": 0,
-                "isLogScale": false
-              },
-              "legend": {
-                "position": "right",
-                "mode": "list",
-                "customColors": null
-              },
-              "thresholds": null
-            }
-          },
-          "queries": [
-            {
-              "kind": "time_series",
-              "spec": {
-                "name": "A",
-                "plugin": {
-                  "kind": "signoz/BuilderQuery",
-                  "spec": {
-                    "name": "A",
-                    "signal": "metrics",
-                    "source": "",
-                    "aggregations": [
-                      {
-                        "metricName": "storage.googleapis.com/storage/v2/deleted_bytes",
-                        "temporality": "",
-                        "timeAggregation": "rate",
-                        "spaceAggregation": "sum",
-                        "reduceTo": "sum"
-                      }
-                    ],
-                    "disabled": false,
-                    "filter": {
-                      "expression": "project_id = $project_id AND bucket_name in $bucket_name AND gcp.resource_type = 'gcs_bucket'"
-                    },
-                    "groupBy": [
-                      {
-                        "name": "bucket_name",
-                        "signal": "",
-                        "fieldContext": "attribute",
-                        "fieldDataType": "string"
-                      },
-                      {
-                        "name": "storage_class",
-                        "signal": "",
-                        "fieldContext": "attribute",
-                        "fieldDataType": "string"
-                      }
-                    ],
-                    "order": [],
-                    "having": {
-                      "expression": ""
-                    },
-                    "functions": [],
-                    "legend": "{{bucket_name}}/{{storage_class}}"
-                  }
-                }
-              }
-            }
-          ],
-          "links": []
-        }
-      },
-      "c5af2813-34ec-41a9-8d53-c9acd67f569f": {
-        "kind": "Panel",
-        "spec": {
-          "display": {
-            "name": "Request count",
-            "description": "Rate of API calls, grouped by the API method name and response code."
-          },
-          "plugin": {
-            "kind": "signoz/TimeSeriesPanel",
-            "spec": {
-              "visualization": {
-                "timePreference": "global_time",
-                "fillSpans": false
-              },
-              "formatting": {
-                "unit": "{count}/s",
-                "decimalPrecision": "2"
-              },
-              "chartAppearance": {
-                "lineInterpolation": "spline",
-                "showPoints": false,
-                "lineStyle": "solid",
-                "fillMode": "none",
-                "spanGaps": {
-                  "fillOnlyBelow": false,
-                  "fillLessThan": ""
-                }
-              },
-              "axes": {
-                "softMin": 0,
-                "softMax": 0,
-                "isLogScale": false
-              },
-              "legend": {
-                "position": "right",
-                "mode": "list",
-                "customColors": null
-              },
-              "thresholds": null
-            }
-          },
-          "queries": [
-            {
-              "kind": "time_series",
-              "spec": {
-                "name": "A",
-                "plugin": {
-                  "kind": "signoz/BuilderQuery",
-                  "spec": {
-                    "name": "A",
-                    "signal": "metrics",
-                    "source": "",
-                    "aggregations": [
-                      {
-                        "metricName": "storage.googleapis.com/api/request_count",
-                        "temporality": "",
-                        "timeAggregation": "rate",
-                        "spaceAggregation": "sum",
-                        "reduceTo": "sum"
-                      }
-                    ],
-                    "disabled": false,
-                    "filter": {
-                      "expression": "project_id = $project_id AND bucket_name in $bucket_name AND gcp.resource_type = 'gcs_bucket'"
-                    },
-                    "groupBy": [
-                      {
-                        "name": "bucket_name",
-                        "signal": "",
-                        "fieldContext": "attribute",
-                        "fieldDataType": "string"
-                      },
-                      {
-                        "name": "method",
-                        "signal": "",
-                        "fieldContext": "attribute",
-                        "fieldDataType": "string"
-                      },
-                      {
-                        "name": "response_code",
-                        "signal": "",
-                        "fieldContext": "attribute",
-                        "fieldDataType": "string"
-                      }
-                    ],
-                    "order": [],
-                    "having": {
-                      "expression": ""
-                    },
-                    "functions": [],
-                    "legend": "{{bucket_name}}/{{method}} - {{response_code}}"
-                  }
-                }
-              }
-            }
-          ],
-          "links": []
-        }
-      },
-      "70333210-68c3-4387-a6b7-afa2459d27dd": {
-        "kind": "Panel",
-        "spec": {
-          "display": {
-            "name": "Authentication count",
-            "description": "Rate of HMAC/RSA signed requests, grouped by authentication method, API method name and response code."
-          },
-          "plugin": {
-            "kind": "signoz/TimeSeriesPanel",
-            "spec": {
-              "visualization": {
-                "timePreference": "global_time",
-                "fillSpans": false
-              },
-              "formatting": {
-                "unit": "{count}/s",
-                "decimalPrecision": "2"
-              },
-              "chartAppearance": {
-                "lineInterpolation": "spline",
-                "showPoints": false,
-                "lineStyle": "solid",
-                "fillMode": "none",
-                "spanGaps": {
-                  "fillOnlyBelow": false,
-                  "fillLessThan": ""
-                }
-              },
-              "axes": {
-                "softMin": 0,
-                "softMax": 0,
-                "isLogScale": false
-              },
-              "legend": {
-                "position": "right",
-                "mode": "list",
-                "customColors": null
-              },
-              "thresholds": null
-            }
-          },
-          "queries": [
-            {
-              "kind": "time_series",
-              "spec": {
-                "name": "A",
-                "plugin": {
-                  "kind": "signoz/BuilderQuery",
-                  "spec": {
-                    "name": "A",
-                    "signal": "metrics",
-                    "source": "",
-                    "aggregations": [
-                      {
-                        "metricName": "storage.googleapis.com/authn/authentication_count",
-                        "temporality": "",
-                        "timeAggregation": "rate",
-                        "spaceAggregation": "sum",
-                        "reduceTo": "sum"
-                      }
-                    ],
-                    "disabled": false,
-                    "filter": {
-                      "expression": "project_id = $project_id AND bucket_name in $bucket_name AND gcp.resource_type = 'gcs_bucket'"
-                    },
-                    "groupBy": [
-                      {
-                        "name": "bucket_name",
-                        "signal": "",
-                        "fieldContext": "attribute",
-                        "fieldDataType": "string"
-                      },
-                      {
-                        "name": "authentication_method",
-                        "signal": "",
-                        "fieldContext": "attribute",
-                        "fieldDataType": "string"
-                      },
-                      {
-                        "name": "method",
-                        "signal": "",
-                        "fieldContext": "attribute",
-                        "fieldDataType": "string"
-                      },
-                      {
-                        "name": "response_code",
-                        "signal": "",
-                        "fieldContext": "attribute",
-                        "fieldDataType": "string"
-                      }
-                    ],
-                    "order": [],
-                    "having": {
-                      "expression": ""
-                    },
-                    "functions": [],
-                    "legend": "{{bucket_name}}/{{authentication_method}}/{{method}} - {{response_code}}"
-                  }
-                }
-              }
-            }
-          ],
-          "links": []
-        }
-      },
-      "7a98084c-2cd3-4146-a831-f5382162ffe5": {
-        "kind": "Panel",
-        "spec": {
-          "display": {
-            "name": "Received bytes",
-            "description": "Rate of bytes received over the network, grouped by the API method name and response code."
-          },
-          "plugin": {
-            "kind": "signoz/TimeSeriesPanel",
-            "spec": {
-              "visualization": {
-                "timePreference": "global_time",
-                "fillSpans": false
-              },
-              "formatting": {
-                "unit": "By/s",
-                "decimalPrecision": "2"
-              },
-              "chartAppearance": {
-                "lineInterpolation": "spline",
-                "showPoints": false,
-                "lineStyle": "solid",
-                "fillMode": "none",
-                "spanGaps": {
-                  "fillOnlyBelow": false,
-                  "fillLessThan": ""
-                }
-              },
-              "axes": {
-                "softMin": 0,
-                "softMax": 0,
-                "isLogScale": false
-              },
-              "legend": {
-                "position": "right",
-                "mode": "list",
-                "customColors": null
-              },
-              "thresholds": null
-            }
-          },
-          "queries": [
-            {
-              "kind": "time_series",
-              "spec": {
-                "name": "A",
-                "plugin": {
-                  "kind": "signoz/BuilderQuery",
-                  "spec": {
-                    "name": "A",
-                    "signal": "metrics",
-                    "source": "",
-                    "aggregations": [
-                      {
-                        "metricName": "storage.googleapis.com/network/received_bytes_count",
-                        "temporality": "",
-                        "timeAggregation": "rate",
-                        "spaceAggregation": "sum",
-                        "reduceTo": "sum"
-                      }
-                    ],
-                    "disabled": false,
-                    "filter": {
-                      "expression": "project_id = $project_id AND bucket_name in $bucket_name AND gcp.resource_type = 'gcs_bucket'"
-                    },
-                    "groupBy": [
-                      {
-                        "name": "bucket_name",
-                        "signal": "",
-                        "fieldContext": "attribute",
-                        "fieldDataType": "string"
-                      },
-                      {
-                        "name": "method",
-                        "signal": "",
-                        "fieldContext": "attribute",
-                        "fieldDataType": "string"
-                      },
-                      {
-                        "name": "response_code",
-                        "signal": "",
-                        "fieldContext": "attribute",
-                        "fieldDataType": "string"
-                      }
-                    ],
-                    "order": [],
-                    "having": {
-                      "expression": ""
-                    },
-                    "functions": [],
-                    "legend": "{{bucket_name}}/{{method}} - {{response_code}}"
-                  }
-                }
-              }
-            }
-          ],
-          "links": []
-        }
-      },
-      "7138bf98-b41a-46d8-90ef-8e7470819cdf": {
-        "kind": "Panel",
-        "spec": {
-          "display": {
-            "name": "Sent bytes",
-            "description": "Rate of bytes sent over the network, grouped by the API method name and response code."
-          },
-          "plugin": {
-            "kind": "signoz/TimeSeriesPanel",
-            "spec": {
-              "visualization": {
-                "timePreference": "global_time",
-                "fillSpans": false
-              },
-              "formatting": {
-                "unit": "By/s",
-                "decimalPrecision": "2"
-              },
-              "chartAppearance": {
-                "lineInterpolation": "spline",
-                "showPoints": false,
-                "lineStyle": "solid",
-                "fillMode": "none",
-                "spanGaps": {
-                  "fillOnlyBelow": false,
-                  "fillLessThan": ""
-                }
-              },
-              "axes": {
-                "softMin": 0,
-                "softMax": 0,
-                "isLogScale": false
-              },
-              "legend": {
-                "position": "right",
-                "mode": "list",
-                "customColors": null
-              },
-              "thresholds": null
-            }
-          },
-          "queries": [
-            {
-              "kind": "time_series",
-              "spec": {
-                "name": "A",
-                "plugin": {
-                  "kind": "signoz/BuilderQuery",
-                  "spec": {
-                    "name": "A",
-                    "signal": "metrics",
-                    "source": "",
-                    "aggregations": [
-                      {
-                        "metricName": "storage.googleapis.com/network/sent_bytes_count",
-                        "temporality": "",
-                        "timeAggregation": "rate",
-                        "spaceAggregation": "sum",
-                        "reduceTo": "sum"
-                      }
-                    ],
-                    "disabled": false,
-                    "filter": {
-                      "expression": "project_id = $project_id AND bucket_name in $bucket_name AND gcp.resource_type = 'gcs_bucket'"
-                    },
-                    "groupBy": [
-                      {
-                        "name": "bucket_name",
-                        "signal": "",
-                        "fieldContext": "attribute",
-                        "fieldDataType": "string"
-                      },
-                      {
-                        "name": "method",
-                        "signal": "",
-                        "fieldContext": "attribute",
-                        "fieldDataType": "string"
-                      },
-                      {
-                        "name": "response_code",
-                        "signal": "",
-                        "fieldContext": "attribute",
-                        "fieldDataType": "string"
-                      }
-                    ],
-                    "order": [],
-                    "having": {
-                      "expression": ""
-                    },
-                    "functions": [],
-                    "legend": "{{bucket_name}}/{{method}} - {{response_code}}"
-                  }
-                }
-              }
-            }
-          ],
-          "links": []
-        }
-      }
-    },
-    "layouts": [
-      {
-        "kind": "Grid",
-        "spec": {
-          "items": [
-            {
-              "x": 0,
-              "y": 0,
-              "width": 6,
-              "height": 6,
-              "content": {
-                "$ref": "#/spec/panels/1f0a4d5b-6c2e-4a71-8b3d-9e5c07a41d20"
-              }
-            }
-          ]
-        }
-      },
-      {
-        "kind": "Grid",
-        "spec": {
-          "display": {
-            "title": "Storage",
-            "collapse": {
-              "open": true
-            }
-          },
-          "items": [
-            {
-              "x": 0,
-              "y": 0,
-              "width": 6,
-              "height": 6,
-              "content": {
-                "$ref": "#/spec/panels/29ed9824-21db-44c3-9537-12be458f5c20"
-              }
-            },
-            {
-              "x": 6,
-              "y": 0,
-              "width": 6,
-              "height": 6,
-              "content": {
-                "$ref": "#/spec/panels/cbc53174-5527-4bce-b32d-317403849e48"
-              }
-            },
-            {
-              "x": 0,
-              "y": 6,
-              "width": 6,
-              "height": 6,
-              "content": {
-                "$ref": "#/spec/panels/76e70ce5-47e4-4b5b-9715-49fa21c58b0c"
-              }
-            }
-          ]
-        }
-      },
-      {
-        "kind": "Grid",
-        "spec": {
-          "display": {
-            "title": "API & Authentication",
-            "collapse": {
-              "open": true
-            }
-          },
-          "items": [
-            {
-              "x": 0,
-              "y": 0,
-              "width": 6,
-              "height": 6,
-              "content": {
-                "$ref": "#/spec/panels/c5af2813-34ec-41a9-8d53-c9acd67f569f"
-              }
-            },
-            {
-              "x": 6,
-              "y": 0,
-              "width": 6,
-              "height": 6,
-              "content": {
-                "$ref": "#/spec/panels/70333210-68c3-4387-a6b7-afa2459d27dd"
-              }
-            }
-          ]
-        }
-      },
-      {
-        "kind": "Grid",
-        "spec": {
-          "display": {
-            "title": "Network",
-            "collapse": {
-              "open": true
-            }
-          },
-          "items": [
-            {
-              "x": 0,
-              "y": 0,
-              "width": 6,
-              "height": 6,
-              "content": {
-                "$ref": "#/spec/panels/7a98084c-2cd3-4146-a831-f5382162ffe5"
-              }
-            },
-            {
-              "x": 6,
-              "y": 0,
-              "width": 6,
-              "height": 6,
-              "content": {
-                "$ref": "#/spec/panels/7138bf98-b41a-46d8-90ef-8e7470819cdf"
-              }
-            }
-          ]
-        }
-      }
-    ],
-    "duration": "",
-    "refreshInterval": "",
-    "links": []
-  }
-}

pkg/modules/cloudintegration/implcloudintegration/fs/definitions/gcp/cloudstorage/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;}.cls-4{fill:#fff;}</style></defs><title>Icon_24px_CloudStorage_Color</title><g data-name="Product Icons"><rect class="cls-1" x="2" y="4" width="20" height="7"/><rect class="cls-2" x="20" y="4" width="2" height="7"/><polygon class="cls-3" points="22 4 20 4 20 11 22 4"/><rect class="cls-2" x="2" y="4" width="2" height="7"/><rect class="cls-4" x="6" y="7" width="6" height="1"/><rect class="cls-4" x="15" y="6" width="3" height="3" rx="1.5"/><rect class="cls-1" x="2" y="13" width="20" height="7"/><rect class="cls-2" x="20" y="13" width="2" height="7"/><polygon class="cls-3" points="22 13 20 13 20 20 22 13"/><rect class="cls-2" x="2" y="13" width="2" height="7"/><rect class="cls-4" x="6" y="16" width="6" height="1"/><rect class="cls-4" x="15" y="15" width="3" height="3" rx="1.5"/></g></svg>

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

@@ -1,70 +0,0 @@
-{
-  "id": "cloudstorage",
-  "title": "GCP Cloud Storage",
-  "icon": "file://icon.svg",
-  "overview": "file://overview.md",
-  "supportedSignals": {
-    "metrics": true,
-    "logs": true
-  },
-  "dataCollected": {
-    "metrics": [
-      {
-        "name": "storage.googleapis.com/storage/v2/total_bytes",
-        "unit": "Bytes",
-        "type": "Gauge",
-        "description": ""
-      },
-      {
-        "name": "storage.googleapis.com/storage/v2/total_count",
-        "unit": "Count",
-        "type": "Gauge",
-        "description": ""
-      },
-      {
-        "name": "storage.googleapis.com/storage/v2/deleted_bytes",
-        "unit": "Bytes",
-        "type": "Sum",
-        "description": ""
-      },
-      {
-        "name": "storage.googleapis.com/api/request_count",
-        "unit": "Count",
-        "type": "Sum",
-        "description": ""
-      },
-      {
-        "name": "storage.googleapis.com/network/received_bytes_count",
-        "unit": "Bytes",
-        "type": "Sum",
-        "description": ""
-      },
-      {
-        "name": "storage.googleapis.com/network/sent_bytes_count",
-        "unit": "Bytes",
-        "type": "Sum",
-        "description": ""
-      },
-      {
-        "name": "storage.googleapis.com/authn/authentication_count",
-        "unit": "Count",
-        "type": "Sum",
-        "description": ""
-      }
-    ],
-    "logs": []
-  },
-  "telemetryCollectionStrategy": {
-    "gcp": {}
-  },
-  "assets": {
-    "dashboards": [
-      {
-        "id": "overview",
-        "title": "GCP Cloud Storage Overview",
-        "description": "Overview of GCP Cloud Storage metrics",
-        "definition": "file://assets/dashboards/overview.json"
-      }
-    ]
-  }
-}

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

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

pkg/modules/cloudintegration/implcloudintegration/fs/definitions/gcp/gke/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:#4285f4;}.cls-1,.cls-2,.cls-4{fill-rule:evenodd;}.cls-2{fill:#669df6;}.cls-3,.cls-4{fill:#aecbfa;}</style></defs><title>Icon_24px_K8Engine_Color</title><g data-name="Product Icons"><g ><polygon class="cls-1" points="14.68 13.06 19.23 15.69 19.23 16.68 14.29 13.83 14.68 13.06"/><polygon class="cls-2" points="9.98 13.65 4.77 16.66 4.45 15.86 9.53 12.92 9.98 13.65"/><rect class="cls-3" x="11.55" y="3.29" width="0.86" height="5.78"/><path class="cls-4" d="M3.25,7V17L12,22l8.74-5V7L12,2Zm15.63,8.89L12,19.78,5.12,15.89V8.11L12,4.22l6.87,3.89v7.78Z"/><polygon class="cls-4" points="11.98 11.5 15.96 9.21 11.98 6.91 8.01 9.21 11.98 11.5"/><polygon class="cls-2" points="11.52 12.3 7.66 10.01 7.66 14.6 11.52 16.89 11.52 12.3"/><polygon class="cls-1" points="12.48 12.3 12.48 16.89 16.34 14.6 16.34 10.01 12.48 12.3"/></g></g></svg>

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

@@ -1,124 +0,0 @@
-{
-  "id": "gke",
-  "title": "GCP Kubernetes Engine",
-  "icon": "file://icon.svg",
-  "overview": "file://overview.md",
-  "supportedSignals": {
-    "metrics": true,
-    "logs": true
-  },
-  "dataCollected": {
-    "metrics": [
-      {
-        "name": "kubernetes.io/container/cpu/limit_utilization",
-        "unit": "None",
-        "type": "Gauge",
-        "description": ""
-      },
-      {
-        "name": "kubernetes.io/container/cpu/request_utilization",
-        "unit": "None",
-        "type": "Gauge",
-        "description": ""
-      },
-      {
-        "name": "kubernetes.io/container/memory/limit_utilization",
-        "unit": "None",
-        "type": "Gauge",
-        "description": ""
-      },
-      {
-        "name": "kubernetes.io/container/memory/request_utilization",
-        "unit": "None",
-        "type": "Gauge",
-        "description": ""
-      },
-      {
-        "name": "kubernetes.io/container/restart_count",
-        "unit": "Count",
-        "type": "Sum",
-        "description": ""
-      },
-      {
-        "name": "kubernetes.io/pod/latencies/pod_first_ready",
-        "unit": "Seconds",
-        "type": "Gauge",
-        "description": ""
-      },
-      {
-        "name": "kubernetes.io/pod/network/received_bytes_count",
-        "unit": "Bytes",
-        "type": "Sum",
-        "description": ""
-      },
-      {
-        "name": "kubernetes.io/pod/network/sent_bytes_count",
-        "unit": "Bytes",
-        "type": "Sum",
-        "description": ""
-      },
-      {
-        "name": "kubernetes.io/pod/volume/utilization",
-        "unit": "None",
-        "type": "Gauge",
-        "description": ""
-      },
-      {
-        "name": "kubernetes.io/node/cpu/allocatable_utilization",
-        "unit": "None",
-        "type": "Gauge",
-        "description": ""
-      },
-      {
-        "name": "kubernetes.io/node/memory/allocatable_utilization",
-        "unit": "None",
-        "type": "Gauge",
-        "description": ""
-      },
-      {
-        "name": "kubernetes.io/node/ephemeral_storage/used_bytes",
-        "unit": "Bytes",
-        "type": "Gauge",
-        "description": ""
-      },
-      {
-        "name": "kubernetes.io/node/ephemeral_storage/allocatable_bytes",
-        "unit": "Bytes",
-        "type": "Gauge",
-        "description": ""
-      },
-      {
-        "name": "kubernetes.io/node/network/received_bytes_count",
-        "unit": "Bytes",
-        "type": "Sum",
-        "description": ""
-      },
-      {
-        "name": "kubernetes.io/node/network/sent_bytes_count",
-        "unit": "Bytes",
-        "type": "Sum",
-        "description": ""
-      },
-      {
-        "name": "kubernetes.io/node/status_condition",
-        "unit": "None",
-        "type": "Gauge",
-        "description": ""
-      }
-    ],
-    "logs": []
-  },
-  "telemetryCollectionStrategy": {
-    "gcp": {}
-  },
-  "assets": {
-    "dashboards": [
-      {
-        "id": "overview",
-        "title": "GCP Kubernetes Engine Overview",
-        "description": "Overview of GCP Kubernetes Engine metrics",
-        "definition": "file://assets/dashboards/overview.json"
-      }
-    ]
-  }
-}

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

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

pkg/signoz/provider.go

@@ -230,7 +230,6 @@ func NewSQLMigrationProviderFactories(
 		sqlmigration.NewAddTagRelationRankFactory(sqlstore, sqlschema),
 		sqlmigration.NewMigrateDashboardsV1ToV2Factory(sqlstore, sqlschema, dashboardStore, tagModule),
 		sqlmigration.NewFillDashboardMeterSourceFactory(sqlstore, dashboardStore),
-		sqlmigration.NewUpdateRoleTransactionGroupsFactory(),
 	)
 }
 

pkg/sqlmigration/105_update_role_transaction_groups.go

@@ -1,77 +0,0 @@
-package sqlmigration
-
-import (
-	"context"
-	"database/sql"
-	"encoding/json"
-
-	"github.com/SigNoz/signoz/pkg/factory"
-	"github.com/SigNoz/signoz/pkg/types/authtypes"
-	"github.com/SigNoz/signoz/pkg/types/coretypes"
-	"github.com/uptrace/bun"
-	"github.com/uptrace/bun/migrate"
-)
-
-type updateRoleTransactionGroups struct{}
-
-func NewUpdateRoleTransactionGroupsFactory() factory.ProviderFactory[SQLMigration, Config] {
-	return factory.NewProviderFactory(
-		factory.MustNewName("update_role_transaction_groups"),
-		func(ctx context.Context, ps factory.ProviderSettings, c Config) (SQLMigration, error) {
-			return &updateRoleTransactionGroups{}, nil
-		},
-	)
-}
-
-func (migration *updateRoleTransactionGroups) Register(migrations *migrate.Migrations) error {
-	return migrations.Register(migration.Up, migration.Down)
-}
-
-func (migration *updateRoleTransactionGroups) Up(ctx context.Context, db *bun.DB) error {
-	tx, err := db.BeginTx(ctx, nil)
-	if err != nil {
-		return err
-	}
-
-	defer func() {
-		_ = tx.Rollback()
-	}()
-
-	var orgIDs []string
-	err = tx.NewSelect().
-		Table("organizations").
-		Column("id").
-		Scan(ctx, &orgIDs)
-	if err != nil && err != sql.ErrNoRows {
-		return err
-	}
-
-	managedRoleGroups := make(map[string]string, len(coretypes.ManagedRoleToTransactions))
-	for roleName, transactions := range coretypes.ManagedRoleToTransactions {
-		data, err := json.Marshal(authtypes.NewTransactionGroupsFromTransactions(transactions))
-		if err != nil {
-			return err
-		}
-		managedRoleGroups[roleName] = string(data)
-	}
-
-	for _, orgID := range orgIDs {
-		for roleName, data := range managedRoleGroups {
-			if _, err := tx.NewUpdate().
-				Model(new(roles)).
-				Set("transaction_groups = ?", data).
-				Where("org_id = ?", orgID).
-				Where("type = ?", authtypes.RoleTypeManaged.StringValue()).
-				Where("name = ?", roleName).
-				Exec(ctx); err != nil {
-				return err
-			}
-		}
-	}
-
-	return tx.Commit()
-}
-
-func (migration *updateRoleTransactionGroups) Down(context.Context, *bun.DB) error {
-	return 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"
 )
@@ -21,9 +25,9 @@ var DefaultGoogleChatReceiverConfig = GoogleChatReceiverConfig{
 	},
 	Title: `[{{ .Status | toUpper }}{{ if eq .Status "firing" }}:{{ .Alerts.Firing | len }}{{ end }}] {{ .CommonLabels.alertname }}`,
 	Text: `{{ range .Alerts -}}
-*Alert:* {{ .Labels.alertname }}{{ if .Labels.severity }} ({{ .Labels.severity }}){{ end }}{{ if .Annotations.summary }}
-*Summary:* {{ .Annotations.summary }}{{ end }}{{ if .Annotations.description }}
-*Description:* {{ .Annotations.description }}{{ end }}
+**Alert:** {{ .Labels.alertname }}{{ if .Labels.severity }} ({{ .Labels.severity }}){{ end }}{{ if .Annotations.summary }}
+**Summary:** {{ .Annotations.summary }}{{ end }}{{ if .Annotations.description }}
+**Description:** {{ .Annotations.description }}{{ end }}
 {{ end }}`,
 }
 
@@ -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

@@ -44,8 +44,6 @@ var (
 	GCPServiceCloudSQLPostgres = ServiceID{valuer.NewString("cloudsql_postgres")}
 	GCPServiceMemorystoreRedis = ServiceID{valuer.NewString("memorystore_redis")}
 	GCPServiceComputeEngine    = ServiceID{valuer.NewString("computeengine")}
-	GCPServiceGKE              = ServiceID{valuer.NewString("gke")}
-	GCPServiceCloudStorage     = ServiceID{valuer.NewString("cloudstorage")}
 )
 
 func (ServiceID) Enum() []any {
@@ -80,8 +78,6 @@ func (ServiceID) Enum() []any {
 		GCPServiceCloudSQLPostgres,
 		GCPServiceMemorystoreRedis,
 		GCPServiceComputeEngine,
-		GCPServiceGKE,
-		GCPServiceCloudStorage,
 	}
 }
 
@@ -122,8 +118,6 @@ var SupportedServices = map[CloudProviderType][]ServiceID{
 		GCPServiceCloudSQLPostgres,
 		GCPServiceMemorystoreRedis,
 		GCPServiceComputeEngine,
-		GCPServiceGKE,
-		GCPServiceCloudStorage,
 	},
 }