refactor(telemetrystore): drop app-side bulk-filtering override

Stop managing secondary_indices_enable_bulk_filtering from the app. The ClickHouse#82283 workaround is fixed in 25.7+ (prod runs 25.12); the setting is controlled server-side via ClickHouse profiles. Assisted-by: Claude Opus 4.8
fix(telemetrystore): enable secondary_indices_enable_bulk_filtering
2026-09-16 00:10:42 +01:00 · 2026-09-15 19:24:11 +05:30 · 2026-09-15 18:54:20 +05:30
55 changed files with 819 additions and 1817 deletions
--- a/cmd/authz.go
+++ b/cmd/authz.go
@@ -103,7 +103,6 @@ func runGenerateAuthz(_ context.Context) error {
 		coretypes.NewResourceRef(coretypes.ResourceTelemetryResourceTraces).String():       true,
 		coretypes.NewResourceRef(coretypes.ResourceTelemetryResourceMetrics).String():      true,
 		coretypes.NewResourceRef(coretypes.ResourceTelemetryResourceMeterMetrics).String(): true,
-		coretypes.NewResourceRef(coretypes.ResourceMetaResourceQuickFilter).String():       true,
 	}

 	allowedTypes := map[string]bool{}
--- a/conf/example.yaml
+++ b/conf/example.yaml
@@ -202,7 +202,6 @@ telemetrystore:
      max_bytes_to_read: 0
      max_result_rows: 0
      ignore_data_skipping_indices: ""
-      secondary_indices_enable_bulk_filtering: false

 ##################### Prometheus #####################
 prometheus:
--- a/docs/api/openapi.yml
+++ b/docs/api/openapi.yml
@@ -197,7 +197,6 @@ components:
        title:
          type: string
        webhookUrl:
-          format: password
          type: string
      required:
      - webhookUrl
@@ -216,7 +215,6 @@ components:
        title:
          type: string
        token:
-          format: password
          type: string
        url:
          type: string
@@ -227,7 +225,6 @@ components:
    AlertmanagertypesChannelJSMOpsConfig:
      properties:
        apiKey:
-          format: password
          type: string
        description:
          type: string
@@ -246,7 +243,6 @@ components:
    AlertmanagertypesChannelJiraConfig:
      properties:
        apiToken:
-          format: password
          type: string
        customFields:
          additionalProperties: {}
@@ -321,7 +317,6 @@ components:
        title:
          type: string
        webhookUrl:
-          format: password
          type: string
      required:
      - webhookUrl
@@ -329,7 +324,6 @@ components:
    AlertmanagertypesChannelOpsgenieConfig:
      properties:
        apiKey:
-          format: password
          type: string
        apiUrl:
          type: string
@@ -370,7 +364,6 @@ components:
        group:
          type: string
        routingKey:
-          format: password
          type: string
        sendResolved:
          nullable: true
@@ -387,7 +380,6 @@ components:
    AlertmanagertypesChannelSlackConfig:
      properties:
        apiUrl:
-          format: password
          type: string
        channel:
          type: string
@@ -404,16 +396,13 @@ components:
    AlertmanagertypesChannelWebhookConfig:
      properties:
        bearerToken:
-          format: password
          type: string
        password:
-          format: password
          type: string
        sendResolved:
          nullable: true
          type: boolean
        url:
-          format: password
          type: string
        username:
          type: string
--- a/frontend/orval.config.ts
+++ b/frontend/orval.config.ts
@@ -28,10 +28,8 @@ export default defineConfig({
 			clean: true,
 			override: {
 				query: {
-					// Leave useQuery/useMutation unset. Orval's verb tiebreak
-					// (`if (verb === GET && isMutation) isQuery = false`) inverts every
-					// operation when both are forced to true: GET becomes a mutation and
-					// the write verbs become queries.
+					useQuery: true,
+					useMutation: true,
 					useInvalidate: true,
 					signal: true,
 					useOperationIdAsQueryKey: false,
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -78,7 +78,7 @@
    "crypto-js": "4.2.0",
    "d3-hierarchy": "3.1.2",
    "dayjs": "^1.10.7",
-    "dompurify": "3.4.15",
+    "dompurify": "3.4.12",
    "event-source-polyfill": "1.0.31",
    "eventemitter3": "5.0.1",
    "history": "4.10.1",
@@ -118,7 +118,7 @@
    "react-redux": "^7.2.2",
    "react-rnd": "^10.5.3",
    "react-router-dom": "^5.2.0",
-    "react-router-dom-v5-compat": "6.30.6",
+    "react-router-dom-v5-compat": "6.30.3",
    "react-syntax-highlighter": "15.5.0",
    "react-use": "^17.3.2",
    "react-virtuoso": "4.0.3",
@@ -200,7 +200,7 @@
    "json-schema-to-typescript": "^15.0.4",
    "lint-staged": "^17.0.4",
    "msw": "1.3.2",
-    "orval": "8.22.0",
+    "orval": "8.9.1",
    "oxfmt": "0.54.0",
    "oxlint": "1.69.0",
    "oxlint-tsgolint": "0.23.0",
@@ -209,10 +209,10 @@
    "react-resizable": "3.0.4",
    "redux-mock-store": "1.5.4",
    "sass": "1.97.3",
-    "sharp": "0.35.4",
+    "sharp": "0.35.0",
    "storybook": "10.5.9",
-    "stylelint": "17.15.0",
-    "svgo": "4.1.0",
+    "stylelint": "17.7.0",
+    "svgo": "4.0.2",
    "ts-jest": "29.4.9",
    "typescript-plugin-css-modules": "5.2.0",
    "use-sync-external-store": "1.6.0",
@@ -232,5 +232,26 @@
    "*.(scss|css)": [
      "stylelint"
    ]
+  },
+  "overrides": {
+    "@babel/core@<=7.29.0": ">=7.29.6 <8",
+    "@istanbuljs/load-nyc-config>js-yaml": ">=4.3.1 <5",
+    "cookie@<0.7.0": ">=0.7.1 <1",
+    "dompurify@<=3.4.10": ">=3.4.11 <4",
+    "esbuild@>=0.27.3 <0.28.1": ">=0.28.1 <0.29.0",
+    "js-cookie@<=3.0.5": ">=3.0.7 <4",
+    "js-yaml@>=4.0.0 <=4.1.1": ">=4.2.0 <5",
+    "prismjs@<1.30.0": ">=1.30.0 <2",
+    "react-router@>=6.7.0 <6.30.4": ">=6.30.4 <7",
+    "tmp@<0.2.6": ">=0.2.6 <0.3.0",
+    "yaml@>=1.0.0 <1.10.3": ">=1.10.3 <2",
+    "brace-expansion@<1.1.18": ">=1.1.18 <2",
+    "brace-expansion@>=2.0.0 <2.1.4": ">=2.1.4 <3",
+    "brace-expansion@>=5.0.0 <5.0.9": ">=5.0.9 <6",
+    "fast-uri@<3.1.5": ">=3.1.5 <4",
+    "immutable@<5.1.8": ">=5.1.8 <6",
+    "js-yaml@>=4.0.0 <4.3.1": ">=4.3.1 <5",
+    "less@<4.5.0": ">=4.5.0 <5",
+    "nanoid@<3.3.18": ">=3.3.18 <4"
  }
 }
--- a/frontend/pnpm-lock.yaml
+++ b/frontend/pnpm-lock.yaml
--- a/frontend/pnpm-workspace.yaml
+++ b/frontend/pnpm-workspace.yaml
@@ -13,11 +13,7 @@ overrides:
 '@babel/core@<=7.29.0': '>=7.29.6 <8'
 # via: jest > babel-plugin-istanbul > @istanbuljs/load-nyc-config@1.1.0 (js-yaml ^3.13.1)
 # remove: blocked — 1.1.0 is latest and still depends on js-yaml 3.x
- '@istanbuljs/load-nyc-config>js-yaml': '>=4.3.2 <5'
- # via: msw@1.3.2 (devDep) > @mswjs/interceptors@0.17.10 (@xmldom/xmldom ^0.8.3)
- # remove: upgrade msw to >=2 (drops the 0.8.x interceptor). Do NOT open the cap:
- # 0.9.x is ESM-only and changes the DOMParser error contract
- '@xmldom/xmldom@<0.8.15': '>=0.8.15 <0.9'
+ '@istanbuljs/load-nyc-config>js-yaml': '>=4.3.1 <5'
 # via: babel-plugin-istanbul > test-exclude@6 > minimatch@3.1.5 (^1.1.7); also glob@7
 # remove: blocked — babel-plugin-istanbul pins test-exclude@6, which pins minimatch@3
 brace-expansion@<1.1.18: '>=1.1.18 <2'
@@ -27,39 +23,32 @@ overrides:
 # via: eslint-plugin-sonarjs@4.0.2 (minimatch ^10.2.4) > minimatch@10.2.5 (^5.0.5)
 # remove: blocked — minimatch@10.2.6 (latest) only widens to ^5.0.8, still vulnerable
 'brace-expansion@>=5.0.0 <5.0.9': '>=5.0.9 <6'
- # via: direct devDep @babel/core > @babel/helper-compilation-targets (browserslist ^4.24.0)
- # remove: blocked, the range is open so the floor is what pulls the fix.
- # Also lifts baseline-browser-mapping, which browserslist@4.28.7 floors at ^2.11.20
- browserslist@<4.28.7: '>=4.28.7 <5'
 # via: msw@1.3.2 (devDep) > cookie ^0.4.2
 # remove: upgrade msw to >=2 (ships cookie ^1). Do NOT open the cap: cookie >=1 is
 # ESM-only and breaks msw under jest's CJS sandbox (kills every test suite)
 cookie@<0.7.0: '>=0.7.1 <1'
- # via: @grafana/data@11.6.15 (3.4.0/3.2.4 exact);
+ # via: direct dep dompurify 3.4.0; @grafana/data@11.6.15 (3.4.0/3.2.4 exact);
 #      @monaco-editor/react > monaco-editor@0.55.1 (3.2.7 exact)
- # remove: blocked. The direct dep is already on 3.4.15, but @grafana/data
- #         (latest 13.1.0) and monaco-editor (latest 0.55.1) still pin vulnerable versions
- dompurify@<=3.4.12: '>=3.4.13 <4'
- # via: rolldown-vite@7.3.1 (esbuild ^0.27.0); ts-jest@29.4.9 (~0.27.4)
+ # remove: bump direct dep to 3.4.11; @grafana/data (latest 13.1.0) and
+ #         monaco-editor (latest 0.55.1) still pin vulnerable versions — blocked
+ dompurify@<=3.4.10: '>=3.4.11 <4'
+ # via: rolldown-vite@7.3.1 (esbuild ^0.27.0); orval@8.9.1 (^0.27.4); ts-jest@29.4.9 (~0.27.4)
 # remove: blocked on rolldown-vite (7.3.1 is latest, still ^0.27.0);
 #         orval >=8.20.0 and ts-jest >=29.4.11 already fixed on their side
 esbuild@>=0.27.3 <0.28.1: '>=0.28.1 <0.29.0'
 # via: @commitlint/cli > @commitlint/config-validator > ajv@8 (fast-uri ^3.0.1)
- # remove: blocked — ajv@8 caps fast-uri at ^3, and only 3.1.6 carries the fix
- fast-uri@<3.1.6: '>=3.1.6 <4'
- # via: direct dep posthog-js@1.298.0 (fflate ^0.4.8)
- # remove: blocked, posthog-js 1.430.2 (latest) is still on ^0.4.8
- fflate@<0.4.9: '>=0.4.9 <0.5'
+ # remove: blocked — ajv@8 caps fast-uri at ^3, and only 3.1.5 carries the fix
+ fast-uri@<3.1.5: '>=3.1.5 <4'
 # via: direct devDep sass@1.97.3 (immutable ^5.0.2)
 # remove: blocked — plain sass bumps stay within ^5, so the floor is what pulls 5.1.8
 immutable@<5.1.8: '>=5.1.8 <6'
 # via: react-use@17.5.1 (direct, js-cookie ^2.2.1); @grafana/data > react-use@17.6.0
 # remove: bump react-use to >=17.6.1 (js-cookie ^3); @grafana/data side blocked
 js-cookie@<=3.0.5: '>=3.0.7 <4'
- # via: json-schema-to-typescript@15 > @apidevtools/json-schema-ref-parser (^4.1.0);
- #      @commitlint/cli > @commitlint/load > cosmiconfig@9 (^4.1.0)
- # remove: blocked, both consumers cap js-yaml at ^4 and only 4.3.2 carries the fix
- 'js-yaml@>=4.0.0 <4.3.2': '>=4.3.2 <5'
+ # via: @orval/core@8.9.1 (devDep, js-yaml 4.1.1 EXACT pin — not deletable);
+ #      json-schema-to-typescript@15 > @apidevtools/json-schema-ref-parser (^4.1.0)
+ # remove: upgrade orval to >=8.20.0 (drops js-yaml dependency entirely)
+ 'js-yaml@>=4.0.0 <4.3.1': '>=4.3.1 <5'
 # via: typescript-plugin-css-modules@5.2.0 (less ^4.2.0) > less@4.4.0 (image-size ~0.5.0)
 # remove: bump typescript-plugin-css-modules once it floors less itself; image-size has
 #         no patched release at all, so dropping the dep is the only fix — less@4.5.0 did
@@ -70,15 +59,10 @@ overrides:
 # via: react-syntax-highlighter@15.5.0 (prismjs ^1.27.0 + refractor@3 ~1.27.0 tilde-pinned)
 # remove: bump react-syntax-highlighter to >=16.1.1 (prismjs ^1.30.0, refractor@5)
 prismjs@<1.30.0: '>=1.30.0 <2'
- # via: typescript-plugin-css-modules@5.2.0 > postcss-modules-local-by-default@4.2.0
- #      (postcss-selector-parser ^7.0.0)
- # remove: blocked, 4.2.0 is latest and the range is open, so the floor is what pulls the fix
- postcss-selector-parser@>=7.1.0 <7.1.3: '>=7.1.3 <8'
- # via: @signozhq/ui > nuqs@2 (react-router ^6.4.0 || ^7)
- # remove: blocked. GHSA-wrjc-x8rr-h8h6 and the deserializeErrors advisory are patched
- # only in 7.18.0. Do NOT open the cap: react-router >=7 requires React 19 and breaks
- # the app-wide CompatRouter, so those two moderates stay until the app moves to React 19
- react-router@>=6.7.0 <6.30.6: '>=6.30.6 <7'
+ # via: direct dep react-router-dom-v5-compat@6.30.3 (react-router 6.30.3 exact)
+ # remove: bump react-router-dom-v5-compat to 6.30.4. Do NOT open the cap:
+ # react-router >=7 requires React 19 and breaks the app-wide CompatRouter
+ react-router@>=6.7.0 <6.30.4: '>=6.30.4 <7'
 # via: msw@1.3.2 (devDep) > inquirer@8 > external-editor@3.1.0 (tmp ^0.0.33)
 # remove: upgrade msw to >=2 (drops the inquirer/external-editor chain)
 tmp@<0.2.6: '>=0.2.6 <0.3.0'
--- a/frontend/scripts/post-types-generation.sh
+++ b/frontend/scripts/post-types-generation.sh
@@ -14,6 +14,15 @@ done

 echo "\n✅ Tag files renamed to index.ts"

+# Format generated files
+echo "\n\n---\nRunning prettier...\n"
+if ! pnpm prettify src/api/generated; then
+  echo "Formatting failed!"
+  exit 1
+fi
+echo "\n✅ Formatting successful"
+
+
 # Fix linting issues
 echo "\n\n---\nRunning lint...\n"
 if ! pnpm lint:generated; then
@@ -23,15 +32,6 @@ fi
 echo "\n✅ Lint check successful"


-# Format generated files (must run after lint: oxlint --fix writes unformatted autofixes)
-echo "\n\n---\nRunning prettier...\n"
-if ! pnpm prettify src/api/generated; then
-  echo "Formatting failed!"
-  exit 1
-fi
-echo "\n✅ Formatting successful"
-
-
 # Check for type errors
 echo "\n\n---\nChecking for type errors...\n"
 if ! tsc --noEmit; then
--- a/frontend/src/api/generated/services/ai-observability/index.ts
+++ b/frontend/src/api/generated/services/ai-observability/index.ts
@@ -25,26 +25,6 @@ import type {
 import { GeneratedAPIInstance } from '../../../generatedAPIInstance';
 import type { ErrorType } from '../../../generatedAPIInstance';

-const withQueryKey = <T extends object, K>(
-	query: T,
-	queryKey: K,
-): T & { queryKey: K } => {
-	const result = { queryKey } as T & { queryKey: K };
-	for (const key of Object.keys(query)) {
-		// The explicit queryKey always wins, matching the previous
-		// `{ ...query, queryKey }` spread where it was set last.
-		if (key === 'queryKey') {
-			continue;
-		}
-		Object.defineProperty(result, key, {
-			enumerable: true,
-			configurable: true,
-			get: () => (query as Record<string, unknown>)[key],
-		});
-	}
-	return result;
-};
-
 /**
 * This endpoint returns the field keys the AI observability explorer can filter on, including the computed per-trace aggregates
 * @summary Get AI observability field keys
@@ -131,7 +111,7 @@ export function useGetAIObservabilityFieldsKeys<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -236,7 +216,7 @@ export function useGetAIObservabilityFieldsValues<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
--- a/frontend/src/api/generated/services/alerts/index.ts
+++ b/frontend/src/api/generated/services/alerts/index.ts
@@ -19,26 +19,6 @@ import type { GetAlerts200, RenderErrorResponseDTO } from '../sigNoz.schemas';
 import { GeneratedAPIInstance } from '../../../generatedAPIInstance';
 import type { ErrorType } from '../../../generatedAPIInstance';

-const withQueryKey = <T extends object, K>(
-	query: T,
-	queryKey: K,
-): T & { queryKey: K } => {
-	const result = { queryKey } as T & { queryKey: K };
-	for (const key of Object.keys(query)) {
-		// The explicit queryKey always wins, matching the previous
-		// `{ ...query, queryKey }` spread where it was set last.
-		if (key === 'queryKey') {
-			continue;
-		}
-		Object.defineProperty(result, key, {
-			enumerable: true,
-			configurable: true,
-			get: () => (query as Record<string, unknown>)[key],
-		});
-	}
-	return result;
-};
-
 /**
 * This endpoint returns alerts for the organization
 * @summary Get alerts
@@ -97,7 +77,7 @@ export function useGetAlerts<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
--- a/frontend/src/api/generated/services/authdomains/index.ts
+++ b/frontend/src/api/generated/services/authdomains/index.ts
@@ -32,26 +32,6 @@ import type {
 import { GeneratedAPIInstance } from '../../../generatedAPIInstance';
 import type { ErrorType, BodyType } from '../../../generatedAPIInstance';

-const withQueryKey = <T extends object, K>(
-	query: T,
-	queryKey: K,
-): T & { queryKey: K } => {
-	const result = { queryKey } as T & { queryKey: K };
-	for (const key of Object.keys(query)) {
-		// The explicit queryKey always wins, matching the previous
-		// `{ ...query, queryKey }` spread where it was set last.
-		if (key === 'queryKey') {
-			continue;
-		}
-		Object.defineProperty(result, key, {
-			enumerable: true,
-			configurable: true,
-			get: () => (query as Record<string, unknown>)[key],
-		});
-	}
-	return result;
-};
-
 /**
 * This endpoint lists all auth domains
 * @summary List all auth domains
@@ -118,7 +98,7 @@ export function useListAuthDomains<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -343,7 +323,7 @@ export const getGetAuthDomainQueryOptions = <
 	return {
 		queryKey,
 		queryFn,
-		enabled: id !== null && id !== undefined,
+		enabled: !!id,
 		...queryOptions,
 	} as UseQueryOptions<
 		Awaited<ReturnType<typeof getAuthDomain>>,
@@ -380,7 +360,7 @@ export function useGetAuthDomain<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
--- a/frontend/src/api/generated/services/channels/index.ts
+++ b/frontend/src/api/generated/services/channels/index.ts
@@ -43,26 +43,6 @@ import type {
 import { GeneratedAPIInstance } from '../../../generatedAPIInstance';
 import type { ErrorType, BodyType } from '../../../generatedAPIInstance';

-const withQueryKey = <T extends object, K>(
-	query: T,
-	queryKey: K,
-): T & { queryKey: K } => {
-	const result = { queryKey } as T & { queryKey: K };
-	for (const key of Object.keys(query)) {
-		// The explicit queryKey always wins, matching the previous
-		// `{ ...query, queryKey }` spread where it was set last.
-		if (key === 'queryKey') {
-			continue;
-		}
-		Object.defineProperty(result, key, {
-			enumerable: true,
-			configurable: true,
-			get: () => (query as Record<string, unknown>)[key],
-		});
-	}
-	return result;
-};
-
 /**
 * This endpoint lists all notification channels for the organization
 * @summary List notification channels
@@ -129,7 +109,7 @@ export function useListChannels<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -354,7 +334,7 @@ export const getGetChannelByIDQueryOptions = <
 	return {
 		queryKey,
 		queryFn,
-		enabled: id !== null && id !== undefined,
+		enabled: !!id,
 		...queryOptions,
 	} as UseQueryOptions<
 		Awaited<ReturnType<typeof getChannelByID>>,
@@ -391,7 +371,7 @@ export function useGetChannelByID<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -758,7 +738,7 @@ export function useListNotificationChannels<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -987,7 +967,7 @@ export const getGetNotificationChannelQueryOptions = <
 	return {
 		queryKey,
 		queryFn,
-		enabled: id !== null && id !== undefined,
+		enabled: !!id,
 		...queryOptions,
 	} as UseQueryOptions<
 		Awaited<ReturnType<typeof getNotificationChannel>>,
@@ -1025,7 +1005,7 @@ export function useGetNotificationChannel<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
--- a/frontend/src/api/generated/services/cloudintegration/index.ts
+++ b/frontend/src/api/generated/services/cloudintegration/index.ts
@@ -51,26 +51,6 @@ import type {
 import { GeneratedAPIInstance } from '../../../generatedAPIInstance';
 import type { ErrorType, BodyType } from '../../../generatedAPIInstance';

-const withQueryKey = <T extends object, K>(
-	query: T,
-	queryKey: K,
-): T & { queryKey: K } => {
-	const result = { queryKey } as T & { queryKey: K };
-	for (const key of Object.keys(query)) {
-		// The explicit queryKey always wins, matching the previous
-		// `{ ...query, queryKey }` spread where it was set last.
-		if (key === 'queryKey') {
-			continue;
-		}
-		Object.defineProperty(result, key, {
-			enumerable: true,
-			configurable: true,
-			get: () => (query as Record<string, unknown>)[key],
-		});
-	}
-	return result;
-};
-
 /**
 * [Deprecated] This endpoint is called by the deployed agent to check in
 * @deprecated
@@ -219,7 +199,7 @@ export const getListAccountsQueryOptions = <
 	return {
 		queryKey,
 		queryFn,
-		enabled: cloudProvider !== null && cloudProvider !== undefined,
+		enabled: !!cloudProvider,
 		...queryOptions,
 	} as UseQueryOptions<
 		Awaited<ReturnType<typeof listAccounts>>,
@@ -256,7 +236,7 @@ export function useListAccounts<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -500,11 +480,7 @@ export const getGetAccountQueryOptions = <
 	return {
 		queryKey,
 		queryFn,
-		enabled:
-			cloudProvider !== null &&
-			cloudProvider !== undefined &&
-			id !== null &&
-			id !== undefined,
+		enabled: !!(cloudProvider && id),
 		...queryOptions,
 	} as UseQueryOptions<Awaited<ReturnType<typeof getAccount>>, TError, TData> & {
 		queryKey: QueryKey;
@@ -539,7 +515,7 @@ export function useGetAccount<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -707,11 +683,7 @@ export const getListAccountServicesMetadataQueryOptions = <
 	return {
 		queryKey,
 		queryFn,
-		enabled:
-			cloudProvider !== null &&
-			cloudProvider !== undefined &&
-			id !== null &&
-			id !== undefined,
+		enabled: !!(cloudProvider && id),
 		...queryOptions,
 	} as UseQueryOptions<
 		Awaited<ReturnType<typeof listAccountServicesMetadata>>,
@@ -752,7 +724,7 @@ export function useListAccountServicesMetadata<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -823,13 +795,7 @@ export const getGetAccountServiceQueryOptions = <
 	return {
 		queryKey,
 		queryFn,
-		enabled:
-			cloudProvider !== null &&
-			cloudProvider !== undefined &&
-			id !== null &&
-			id !== undefined &&
-			serviceId !== null &&
-			serviceId !== undefined,
+		enabled: !!(cloudProvider && id && serviceId),
 		...queryOptions,
 	} as UseQueryOptions<
 		Awaited<ReturnType<typeof getAccountService>>,
@@ -869,7 +835,7 @@ export function useGetAccountService<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -1133,7 +1099,7 @@ export const getGetConnectionCredentialsQueryOptions = <
 	return {
 		queryKey,
 		queryFn,
-		enabled: cloudProvider !== null && cloudProvider !== undefined,
+		enabled: !!cloudProvider,
 		...queryOptions,
 	} as UseQueryOptions<
 		Awaited<ReturnType<typeof getConnectionCredentials>>,
@@ -1174,7 +1140,7 @@ export function useGetConnectionCredentials<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -1239,7 +1205,7 @@ export const getListServicesMetadataQueryOptions = <
 	return {
 		queryKey,
 		queryFn,
-		enabled: cloudProvider !== null && cloudProvider !== undefined,
+		enabled: !!cloudProvider,
 		...queryOptions,
 	} as UseQueryOptions<
 		Awaited<ReturnType<typeof listServicesMetadata>>,
@@ -1279,7 +1245,7 @@ export function useListServicesMetadata<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -1347,11 +1313,7 @@ export const getGetServiceQueryOptions = <
 	return {
 		queryKey,
 		queryFn,
-		enabled:
-			cloudProvider !== null &&
-			cloudProvider !== undefined &&
-			serviceId !== null &&
-			serviceId !== undefined,
+		enabled: !!(cloudProvider && serviceId),
 		...queryOptions,
 	} as UseQueryOptions<Awaited<ReturnType<typeof getService>>, TError, TData> & {
 		queryKey: QueryKey;
@@ -1389,7 +1351,7 @@ export function useGetService<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
--- a/frontend/src/api/generated/services/dashboard/index.ts
+++ b/frontend/src/api/generated/services/dashboard/index.ts
@@ -72,26 +72,6 @@ import type {
 import { GeneratedAPIInstance } from '../../../generatedAPIInstance';
 import type { ErrorType, BodyType } from '../../../generatedAPIInstance';

-const withQueryKey = <T extends object, K>(
-	query: T,
-	queryKey: K,
-): T & { queryKey: K } => {
-	const result = { queryKey } as T & { queryKey: K };
-	for (const key of Object.keys(query)) {
-		// The explicit queryKey always wins, matching the previous
-		// `{ ...query, queryKey }` spread where it was set last.
-		if (key === 'queryKey') {
-			continue;
-		}
-		Object.defineProperty(result, key, {
-			enumerable: true,
-			configurable: true,
-			get: () => (query as Record<string, unknown>)[key],
-		});
-	}
-	return result;
-};
-
 /**
 * This endpoint deletes the public sharing config and disables the public sharing of a dashboard
 * @summary Delete public dashboard
@@ -218,7 +198,7 @@ export const getGetPublicDashboardQueryOptions = <
 	return {
 		queryKey,
 		queryFn,
-		enabled: id !== null && id !== undefined,
+		enabled: !!id,
 		...queryOptions,
 	} as UseQueryOptions<
 		Awaited<ReturnType<typeof getPublicDashboard>>,
@@ -255,7 +235,7 @@ export function useGetPublicDashboard<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -520,7 +500,7 @@ export const getGetPublicDashboardDataQueryOptions = <
 	return {
 		queryKey,
 		queryFn,
-		enabled: id !== null && id !== undefined,
+		enabled: !!id,
 		...queryOptions,
 	} as UseQueryOptions<
 		Awaited<ReturnType<typeof getPublicDashboardData>>,
@@ -558,7 +538,7 @@ export function useGetPublicDashboardData<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -625,7 +605,7 @@ export const getGetPublicDashboardWidgetQueryRangeQueryOptions = <
 	return {
 		queryKey,
 		queryFn,
-		enabled: id !== null && id !== undefined && idx !== null && idx !== undefined,
+		enabled: !!(id && idx),
 		...queryOptions,
 	} as UseQueryOptions<
 		Awaited<ReturnType<typeof getPublicDashboardWidgetQueryRange>>,
@@ -666,7 +646,7 @@ export function useGetPublicDashboardWidgetQueryRange<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -751,7 +731,7 @@ export function useListDashboardViews<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -1111,7 +1091,7 @@ export function useListDashboardsV2<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -1337,7 +1317,7 @@ export const getGetDashboardV2QueryOptions = <
 	return {
 		queryKey,
 		queryFn,
-		enabled: id !== null && id !== undefined,
+		enabled: !!id,
 		...queryOptions,
 	} as UseQueryOptions<
 		Awaited<ReturnType<typeof getDashboardV2>>,
@@ -1374,7 +1354,7 @@ export function useGetDashboardV2<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -1953,7 +1933,7 @@ export const getGetSystemDashboardQueryOptions = <
 	return {
 		queryKey,
 		queryFn,
-		enabled: name !== null && name !== undefined,
+		enabled: !!name,
 		...queryOptions,
 	} as UseQueryOptions<
 		Awaited<ReturnType<typeof getSystemDashboard>>,
@@ -1990,7 +1970,7 @@ export function useGetSystemDashboard<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -2055,7 +2035,7 @@ export const getGetPublicDashboardDataV2QueryOptions = <
 	return {
 		queryKey,
 		queryFn,
-		enabled: id !== null && id !== undefined,
+		enabled: !!id,
 		...queryOptions,
 	} as UseQueryOptions<
 		Awaited<ReturnType<typeof getPublicDashboardDataV2>>,
@@ -2093,7 +2073,7 @@ export function useGetPublicDashboardDataV2<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -2167,7 +2147,7 @@ export const getGetPublicDashboardPanelQueryRangeV2QueryOptions = <
 	return {
 		queryKey,
 		queryFn,
-		enabled: id !== null && id !== undefined && key !== null && key !== undefined,
+		enabled: !!(id && key),
 		...queryOptions,
 	} as UseQueryOptions<
 		Awaited<ReturnType<typeof getPublicDashboardPanelQueryRangeV2>>,
@@ -2210,7 +2190,7 @@ export function useGetPublicDashboardPanelQueryRangeV2<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -2315,7 +2295,7 @@ export function useListDashboardsForUserV2<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
--- a/frontend/src/api/generated/services/downtimeschedules/index.ts
+++ b/frontend/src/api/generated/services/downtimeschedules/index.ts
@@ -32,26 +32,6 @@ import type {
 import { GeneratedAPIInstance } from '../../../generatedAPIInstance';
 import type { ErrorType, BodyType } from '../../../generatedAPIInstance';

-const withQueryKey = <T extends object, K>(
-	query: T,
-	queryKey: K,
-): T & { queryKey: K } => {
-	const result = { queryKey } as T & { queryKey: K };
-	for (const key of Object.keys(query)) {
-		// The explicit queryKey always wins, matching the previous
-		// `{ ...query, queryKey }` spread where it was set last.
-		if (key === 'queryKey') {
-			continue;
-		}
-		Object.defineProperty(result, key, {
-			enumerable: true,
-			configurable: true,
-			get: () => (query as Record<string, unknown>)[key],
-		});
-	}
-	return result;
-};
-
 /**
 * This endpoint lists all planned maintenance / downtime schedules
 * @summary List downtime schedules
@@ -131,7 +111,7 @@ export function useListDowntimeSchedules<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -360,7 +340,7 @@ export const getGetDowntimeScheduleByIDQueryOptions = <
 	return {
 		queryKey,
 		queryFn,
-		enabled: id !== null && id !== undefined,
+		enabled: !!id,
 		...queryOptions,
 	} as UseQueryOptions<
 		Awaited<ReturnType<typeof getDowntimeScheduleByID>>,
@@ -398,7 +378,7 @@ export function useGetDowntimeScheduleByID<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
--- a/frontend/src/api/generated/services/features/index.ts
+++ b/frontend/src/api/generated/services/features/index.ts
@@ -19,26 +19,6 @@ import type { GetFeatures200, RenderErrorResponseDTO } from '../sigNoz.schemas';
 import { GeneratedAPIInstance } from '../../../generatedAPIInstance';
 import type { ErrorType } from '../../../generatedAPIInstance';

-const withQueryKey = <T extends object, K>(
-	query: T,
-	queryKey: K,
-): T & { queryKey: K } => {
-	const result = { queryKey } as T & { queryKey: K };
-	for (const key of Object.keys(query)) {
-		// The explicit queryKey always wins, matching the previous
-		// `{ ...query, queryKey }` spread where it was set last.
-		if (key === 'queryKey') {
-			continue;
-		}
-		Object.defineProperty(result, key, {
-			enumerable: true,
-			configurable: true,
-			get: () => (query as Record<string, unknown>)[key],
-		});
-	}
-	return result;
-};
-
 /**
 * This endpoint returns the supported features and their details
 * @summary Get features
@@ -105,7 +85,7 @@ export function useGetFeatures<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
--- a/frontend/src/api/generated/services/fields/index.ts
+++ b/frontend/src/api/generated/services/fields/index.ts
@@ -25,26 +25,6 @@ import type {
 import { GeneratedAPIInstance } from '../../../generatedAPIInstance';
 import type { ErrorType } from '../../../generatedAPIInstance';

-const withQueryKey = <T extends object, K>(
-	query: T,
-	queryKey: K,
-): T & { queryKey: K } => {
-	const result = { queryKey } as T & { queryKey: K };
-	for (const key of Object.keys(query)) {
-		// The explicit queryKey always wins, matching the previous
-		// `{ ...query, queryKey }` spread where it was set last.
-		if (key === 'queryKey') {
-			continue;
-		}
-		Object.defineProperty(result, key, {
-			enumerable: true,
-			configurable: true,
-			get: () => (query as Record<string, unknown>)[key],
-		});
-	}
-	return result;
-};
-
 /**
 * This endpoint returns field keys
 * @summary Get field keys
@@ -121,7 +101,7 @@ export function useGetFieldsKeys<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -216,7 +196,7 @@ export function useGetFieldsValues<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
--- a/frontend/src/api/generated/services/gateway/index.ts
+++ b/frontend/src/api/generated/services/gateway/index.ts
@@ -48,26 +48,6 @@ import type {
 import { GeneratedAPIInstance } from '../../../generatedAPIInstance';
 import type { ErrorType, BodyType } from '../../../generatedAPIInstance';

-const withQueryKey = <T extends object, K>(
-	query: T,
-	queryKey: K,
-): T & { queryKey: K } => {
-	const result = { queryKey } as T & { queryKey: K };
-	for (const key of Object.keys(query)) {
-		// The explicit queryKey always wins, matching the previous
-		// `{ ...query, queryKey }` spread where it was set last.
-		if (key === 'queryKey') {
-			continue;
-		}
-		Object.defineProperty(result, key, {
-			enumerable: true,
-			configurable: true,
-			get: () => (query as Record<string, unknown>)[key],
-		});
-	}
-	return result;
-};
-
 /**
 * This endpoint returns the ingestion keys for a workspace
 * @summary Get ingestion keys for workspace
@@ -149,7 +129,7 @@ export function useGetIngestionKeys<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -376,7 +356,7 @@ export const getGetIngestionKeyQueryOptions = <
 	return {
 		queryKey,
 		queryFn,
-		enabled: keyId !== null && keyId !== undefined,
+		enabled: !!keyId,
 		...queryOptions,
 	} as UseQueryOptions<
 		Awaited<ReturnType<typeof getIngestionKey>>,
@@ -413,7 +393,7 @@ export function useGetIngestionKey<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -577,7 +557,7 @@ export const getGetIngestionKeyLimitsQueryOptions = <
 	return {
 		queryKey,
 		queryFn,
-		enabled: keyId !== null && keyId !== undefined,
+		enabled: !!keyId,
 		...queryOptions,
 	} as UseQueryOptions<
 		Awaited<ReturnType<typeof getIngestionKeyLimits>>,
@@ -614,7 +594,7 @@ export function useGetIngestionKeyLimits<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -1001,7 +981,7 @@ export function useSearchIngestionKeys<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -1230,7 +1210,7 @@ export const getGetIngestionLimitQueryOptions = <
 	return {
 		queryKey,
 		queryFn,
-		enabled: limitId !== null && limitId !== undefined,
+		enabled: !!limitId,
 		...queryOptions,
 	} as UseQueryOptions<
 		Awaited<ReturnType<typeof getIngestionLimit>>,
@@ -1267,7 +1247,7 @@ export function useGetIngestionLimit<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
--- a/frontend/src/api/generated/services/global/index.ts
+++ b/frontend/src/api/generated/services/global/index.ts
@@ -22,26 +22,6 @@ import type {
 import { GeneratedAPIInstance } from '../../../generatedAPIInstance';
 import type { ErrorType } from '../../../generatedAPIInstance';

-const withQueryKey = <T extends object, K>(
-	query: T,
-	queryKey: K,
-): T & { queryKey: K } => {
-	const result = { queryKey } as T & { queryKey: K };
-	for (const key of Object.keys(query)) {
-		// The explicit queryKey always wins, matching the previous
-		// `{ ...query, queryKey }` spread where it was set last.
-		if (key === 'queryKey') {
-			continue;
-		}
-		Object.defineProperty(result, key, {
-			enumerable: true,
-			configurable: true,
-			get: () => (query as Record<string, unknown>)[key],
-		});
-	}
-	return result;
-};
-
 /**
 * This endpoint returns global config
 * @summary Get global config
@@ -108,7 +88,7 @@ export function useGetGlobalConfig<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
--- a/frontend/src/api/generated/services/health/index.ts
+++ b/frontend/src/api/generated/services/health/index.ts
@@ -26,26 +26,6 @@ import type {
 import { GeneratedAPIInstance } from '../../../generatedAPIInstance';
 import type { ErrorType } from '../../../generatedAPIInstance';

-const withQueryKey = <T extends object, K>(
-	query: T,
-	queryKey: K,
-): T & { queryKey: K } => {
-	const result = { queryKey } as T & { queryKey: K };
-	for (const key of Object.keys(query)) {
-		// The explicit queryKey always wins, matching the previous
-		// `{ ...query, queryKey }` spread where it was set last.
-		if (key === 'queryKey') {
-			continue;
-		}
-		Object.defineProperty(result, key, {
-			enumerable: true,
-			configurable: true,
-			get: () => (query as Record<string, unknown>)[key],
-		});
-	}
-	return result;
-};
-
 /**
 * @summary Health check
 */
@@ -103,7 +83,7 @@ export function useHealthz<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -176,7 +156,7 @@ export function useLivez<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -246,7 +226,7 @@ export function useReadyz<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
--- a/frontend/src/api/generated/services/inframonitoring/index.ts
+++ b/frontend/src/api/generated/services/inframonitoring/index.ts
@@ -48,26 +48,6 @@ import type {
 import { GeneratedAPIInstance } from '../../../generatedAPIInstance';
 import type { ErrorType, BodyType } from '../../../generatedAPIInstance';

-const withQueryKey = <T extends object, K>(
-	query: T,
-	queryKey: K,
-): T & { queryKey: K } => {
-	const result = { queryKey } as T & { queryKey: K };
-	for (const key of Object.keys(query)) {
-		// The explicit queryKey always wins, matching the previous
-		// `{ ...query, queryKey }` spread where it was set last.
-		if (key === 'queryKey') {
-			continue;
-		}
-		Object.defineProperty(result, key, {
-			enumerable: true,
-			configurable: true,
-			get: () => (query as Record<string, unknown>)[key],
-		});
-	}
-	return result;
-};
-
 /**
 * Checks whether the metrics and attributes required to power the infra-monitoring section selected by the 'type' query parameter (hosts, processes, pods, nodes, deployments, daemonsets, statefulsets, jobs, namespaces, clusters, volumes) are being received. For each collector receiver or processor that contributes required metrics or attributes, lists what is present and what is missing, with a prebuilt user-facing message and a docs link per missing component. Default-enabled metrics are those expected as soon as the receiver is configured; optional metrics require 'enabled: true' in receiver config. 'ready' is true only when every missing list is empty.
 * @summary Run Infra Monitoring Setup Checks
@@ -136,7 +116,7 @@ export function useGetChecks<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
--- a/frontend/src/api/generated/services/licenses/index.ts
+++ b/frontend/src/api/generated/services/licenses/index.ts
@@ -32,26 +32,6 @@ import type {
 import { GeneratedAPIInstance } from '../../../generatedAPIInstance';
 import type { ErrorType, BodyType } from '../../../generatedAPIInstance';

-const withQueryKey = <T extends object, K>(
-	query: T,
-	queryKey: K,
-): T & { queryKey: K } => {
-	const result = { queryKey } as T & { queryKey: K };
-	for (const key of Object.keys(query)) {
-		// The explicit queryKey always wins, matching the previous
-		// `{ ...query, queryKey }` spread where it was set last.
-		if (key === 'queryKey') {
-			continue;
-		}
-		Object.defineProperty(result, key, {
-			enumerable: true,
-			configurable: true,
-			get: () => (query as Record<string, unknown>)[key],
-		});
-	}
-	return result;
-};
-
 /**
 * This endpoint validates the license key with the upstream server and activates the license for the organization.
 * @deprecated
@@ -281,7 +261,7 @@ export function useListLicenses<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -504,7 +484,7 @@ export const getGetLicenseQueryOptions = <
 	return {
 		queryKey,
 		queryFn,
-		enabled: id !== null && id !== undefined,
+		enabled: !!id,
 		...queryOptions,
 	} as UseQueryOptions<Awaited<ReturnType<typeof getLicense>>, TError, TData> & {
 		queryKey: QueryKey;
@@ -539,7 +519,7 @@ export function useGetLicense<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -703,7 +683,7 @@ export function useGetActiveLicense<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
--- a/frontend/src/api/generated/services/llmpricingrules/index.ts
+++ b/frontend/src/api/generated/services/llmpricingrules/index.ts
@@ -31,26 +31,6 @@ import type {
 import { GeneratedAPIInstance } from '../../../generatedAPIInstance';
 import type { ErrorType, BodyType } from '../../../generatedAPIInstance';

-const withQueryKey = <T extends object, K>(
-	query: T,
-	queryKey: K,
-): T & { queryKey: K } => {
-	const result = { queryKey } as T & { queryKey: K };
-	for (const key of Object.keys(query)) {
-		// The explicit queryKey always wins, matching the previous
-		// `{ ...query, queryKey }` spread where it was set last.
-		if (key === 'queryKey') {
-			continue;
-		}
-		Object.defineProperty(result, key, {
-			enumerable: true,
-			configurable: true,
-			get: () => (query as Record<string, unknown>)[key],
-		});
-	}
-	return result;
-};
-
 /**
 * Returns all LLM pricing rules for the authenticated org, with pagination.
 * @summary List pricing rules
@@ -130,7 +110,7 @@ export function useListLLMPricingRules<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -359,7 +339,7 @@ export const getGetLLMPricingRuleQueryOptions = <
 	return {
 		queryKey,
 		queryFn,
-		enabled: id !== null && id !== undefined,
+		enabled: !!id,
 		...queryOptions,
 	} as UseQueryOptions<
 		Awaited<ReturnType<typeof getLLMPricingRule>>,
@@ -396,7 +376,7 @@ export function useGetLLMPricingRule<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -481,7 +461,7 @@ export function useListUnmappedLLMModels<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
--- a/frontend/src/api/generated/services/logs/index.ts
+++ b/frontend/src/api/generated/services/logs/index.ts
@@ -28,26 +28,6 @@ import type {
 import { GeneratedAPIInstance } from '../../../generatedAPIInstance';
 import type { ErrorType, BodyType } from '../../../generatedAPIInstance';

-const withQueryKey = <T extends object, K>(
-	query: T,
-	queryKey: K,
-): T & { queryKey: K } => {
-	const result = { queryKey } as T & { queryKey: K };
-	for (const key of Object.keys(query)) {
-		// The explicit queryKey always wins, matching the previous
-		// `{ ...query, queryKey }` spread where it was set last.
-		if (key === 'queryKey') {
-			continue;
-		}
-		Object.defineProperty(result, key, {
-			enumerable: true,
-			configurable: true,
-			get: () => (query as Record<string, unknown>)[key],
-		});
-	}
-	return result;
-};
-
 /**
 * This endpoints allows complex query exporting raw data for traces and logs
 * @summary Export raw data
@@ -217,7 +197,7 @@ export function useListPromotedAndIndexedPaths<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
--- a/frontend/src/api/generated/services/metrics/index.ts
+++ b/frontend/src/api/generated/services/metrics/index.ts
@@ -60,26 +60,6 @@ import type {
 import { GeneratedAPIInstance } from '../../../generatedAPIInstance';
 import type { ErrorType, BodyType } from '../../../generatedAPIInstance';

-const withQueryKey = <T extends object, K>(
-	query: T,
-	queryKey: K,
-): T & { queryKey: K } => {
-	const result = { queryKey } as T & { queryKey: K };
-	for (const key of Object.keys(query)) {
-		// The explicit queryKey always wins, matching the previous
-		// `{ ...query, queryKey }` spread where it was set last.
-		if (key === 'queryKey') {
-			continue;
-		}
-		Object.defineProperty(result, key, {
-			enumerable: true,
-			configurable: true,
-			get: () => (query as Record<string, unknown>)[key],
-		});
-	}
-	return result;
-};
-
 /**
 * Returns active metric volume-control (label reduction) rules.
 * @summary List metric reduction rules
@@ -163,7 +143,7 @@ export function useListMetricReductionRules<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -392,7 +372,7 @@ export const getGetMetricReductionRuleByIDQueryOptions = <
 	return {
 		queryKey,
 		queryFn,
-		enabled: id !== null && id !== undefined,
+		enabled: !!id,
 		...queryOptions,
 	} as UseQueryOptions<
 		Awaited<ReturnType<typeof getMetricReductionRuleByID>>,
@@ -433,7 +413,7 @@ export function useGetMetricReductionRuleByID<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -704,7 +684,7 @@ export function useGetMetricReductionRuleStats<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -790,7 +770,7 @@ export function useGetMetricReductionRuleTimeseries<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -884,7 +864,7 @@ export function useListMetrics<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -979,7 +959,7 @@ export function useGetMetricAlerts<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -1077,7 +1057,7 @@ export function useGetMetricAttributes<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -1175,7 +1155,7 @@ export function useGetMetricDashboards<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -1273,7 +1253,7 @@ export function useGetMetricHighlights<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -1454,7 +1434,7 @@ export function useGetMetricMetadata<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -1625,7 +1605,7 @@ export function useGetMetricsOnboardingStatus<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -1888,7 +1868,7 @@ export function useGetMetricDashboardsV2<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
--- a/frontend/src/api/generated/services/orgs/index.ts
+++ b/frontend/src/api/generated/services/orgs/index.ts
@@ -26,26 +26,6 @@ import type {
 import { GeneratedAPIInstance } from '../../../generatedAPIInstance';
 import type { ErrorType, BodyType } from '../../../generatedAPIInstance';

-const withQueryKey = <T extends object, K>(
-	query: T,
-	queryKey: K,
-): T & { queryKey: K } => {
-	const result = { queryKey } as T & { queryKey: K };
-	for (const key of Object.keys(query)) {
-		// The explicit queryKey always wins, matching the previous
-		// `{ ...query, queryKey }` spread where it was set last.
-		if (key === 'queryKey') {
-			continue;
-		}
-		Object.defineProperty(result, key, {
-			enumerable: true,
-			configurable: true,
-			get: () => (query as Record<string, unknown>)[key],
-		});
-	}
-	return result;
-};
-
 /**
 * This endpoint returns the organization I belong to
 * @summary Get my organization
@@ -112,7 +92,7 @@ export function useGetMyOrganization<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
--- a/frontend/src/api/generated/services/preferences/index.ts
+++ b/frontend/src/api/generated/services/preferences/index.ts
@@ -33,26 +33,6 @@ import type {
 import { GeneratedAPIInstance } from '../../../generatedAPIInstance';
 import type { ErrorType, BodyType } from '../../../generatedAPIInstance';

-const withQueryKey = <T extends object, K>(
-	query: T,
-	queryKey: K,
-): T & { queryKey: K } => {
-	const result = { queryKey } as T & { queryKey: K };
-	for (const key of Object.keys(query)) {
-		// The explicit queryKey always wins, matching the previous
-		// `{ ...query, queryKey }` spread where it was set last.
-		if (key === 'queryKey') {
-			continue;
-		}
-		Object.defineProperty(result, key, {
-			enumerable: true,
-			configurable: true,
-			get: () => (query as Record<string, unknown>)[key],
-		});
-	}
-	return result;
-};
-
 /**
 * This endpoint lists all org preferences
 * @summary List org preferences
@@ -119,7 +99,7 @@ export function useListOrgPreferences<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -183,7 +163,7 @@ export const getGetOrgPreferenceQueryOptions = <
 	return {
 		queryKey,
 		queryFn,
-		enabled: name !== null && name !== undefined,
+		enabled: !!name,
 		...queryOptions,
 	} as UseQueryOptions<
 		Awaited<ReturnType<typeof getOrgPreference>>,
@@ -220,7 +200,7 @@ export function useGetOrgPreference<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -405,7 +385,7 @@ export function useListUserPreferences<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -469,7 +449,7 @@ export const getGetUserPreferenceQueryOptions = <
 	return {
 		queryKey,
 		queryFn,
-		enabled: name !== null && name !== undefined,
+		enabled: !!name,
 		...queryOptions,
 	} as UseQueryOptions<
 		Awaited<ReturnType<typeof getUserPreference>>,
@@ -506,7 +486,7 @@ export function useGetUserPreference<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
--- a/frontend/src/api/generated/services/prometheus/index.ts
+++ b/frontend/src/api/generated/services/prometheus/index.ts
@@ -30,26 +30,6 @@ import type {
 import { GeneratedAPIInstance } from '../../../generatedAPIInstance';
 import type { ErrorType } from '../../../generatedAPIInstance';

-const withQueryKey = <T extends object, K>(
-	query: T,
-	queryKey: K,
-): T & { queryKey: K } => {
-	const result = { queryKey } as T & { queryKey: K };
-	for (const key of Object.keys(query)) {
-		// The explicit queryKey always wins, matching the previous
-		// `{ ...query, queryKey }` spread where it was set last.
-		if (key === 'queryKey') {
-			continue;
-		}
-		Object.defineProperty(result, key, {
-			enumerable: true,
-			configurable: true,
-			get: () => (query as Record<string, unknown>)[key],
-		});
-	}
-	return result;
-};
-
 /**
 * Prometheus-compatible endpoint: the request and response contract is the upstream Prometheus HTTP API (https://prometheus.io/docs/prometheus/latest/querying/api/). Parameters are accepted as URL query parameters or a form-encoded body, on GET and POST alike.
 * @summary Prometheus instant query
@@ -128,7 +108,7 @@ export function usePrometheusQuery<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -313,7 +293,7 @@ export function usePrometheusQueryRange<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
--- a/frontend/src/api/generated/services/quick-filter/index.ts
+++ b/frontend/src/api/generated/services/quick-filter/index.ts
@@ -29,26 +29,6 @@ import type {
 import { GeneratedAPIInstance } from '../../../generatedAPIInstance';
 import type { ErrorType, BodyType } from '../../../generatedAPIInstance';

-const withQueryKey = <T extends object, K>(
-	query: T,
-	queryKey: K,
-): T & { queryKey: K } => {
-	const result = { queryKey } as T & { queryKey: K };
-	for (const key of Object.keys(query)) {
-		// The explicit queryKey always wins, matching the previous
-		// `{ ...query, queryKey }` spread where it was set last.
-		if (key === 'queryKey') {
-			continue;
-		}
-		Object.defineProperty(result, key, {
-			enumerable: true,
-			configurable: true,
-			get: () => (query as Record<string, unknown>)[key],
-		});
-	}
-	return result;
-};
-
 /**
 * Returns the org's quick filters for every source, each filter as a telemetry field key.
 * @summary List quick filters
@@ -115,7 +95,7 @@ export function useListQuickFilters<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -179,7 +159,7 @@ export const getGetQuickFiltersQueryOptions = <
 	return {
 		queryKey,
 		queryFn,
-		enabled: source !== null && source !== undefined,
+		enabled: !!source,
 		...queryOptions,
 	} as UseQueryOptions<
 		Awaited<ReturnType<typeof getQuickFilters>>,
@@ -216,7 +196,7 @@ export function useGetQuickFilters<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
--- a/frontend/src/api/generated/services/role/index.ts
+++ b/frontend/src/api/generated/services/role/index.ts
@@ -32,26 +32,6 @@ import type {
 import { GeneratedAPIInstance } from '../../../generatedAPIInstance';
 import type { ErrorType, BodyType } from '../../../generatedAPIInstance';

-const withQueryKey = <T extends object, K>(
-	query: T,
-	queryKey: K,
-): T & { queryKey: K } => {
-	const result = { queryKey } as T & { queryKey: K };
-	for (const key of Object.keys(query)) {
-		// The explicit queryKey always wins, matching the previous
-		// `{ ...query, queryKey }` spread where it was set last.
-		if (key === 'queryKey') {
-			continue;
-		}
-		Object.defineProperty(result, key, {
-			enumerable: true,
-			configurable: true,
-			get: () => (query as Record<string, unknown>)[key],
-		});
-	}
-	return result;
-};
-
 /**
 * This endpoint lists all roles
 * @summary List roles
@@ -110,7 +90,7 @@ export function useListRoles<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -329,7 +309,7 @@ export const getGetRoleQueryOptions = <
 	return {
 		queryKey,
 		queryFn,
-		enabled: id !== null && id !== undefined,
+		enabled: !!id,
 		...queryOptions,
 	} as UseQueryOptions<Awaited<ReturnType<typeof getRole>>, TError, TData> & {
 		queryKey: QueryKey;
@@ -360,7 +340,7 @@ export function useGetRole<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
--- a/frontend/src/api/generated/services/routepolicies/index.ts
+++ b/frontend/src/api/generated/services/routepolicies/index.ts
@@ -32,26 +32,6 @@ import type {
 import { GeneratedAPIInstance } from '../../../generatedAPIInstance';
 import type { ErrorType, BodyType } from '../../../generatedAPIInstance';

-const withQueryKey = <T extends object, K>(
-	query: T,
-	queryKey: K,
-): T & { queryKey: K } => {
-	const result = { queryKey } as T & { queryKey: K };
-	for (const key of Object.keys(query)) {
-		// The explicit queryKey always wins, matching the previous
-		// `{ ...query, queryKey }` spread where it was set last.
-		if (key === 'queryKey') {
-			continue;
-		}
-		Object.defineProperty(result, key, {
-			enumerable: true,
-			configurable: true,
-			get: () => (query as Record<string, unknown>)[key],
-		});
-	}
-	return result;
-};
-
 /**
 * This endpoint lists all route policies for the organization
 * @summary List route policies
@@ -118,7 +98,7 @@ export function useGetAllRoutePolicies<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -345,7 +325,7 @@ export const getGetRoutePolicyByIDQueryOptions = <
 	return {
 		queryKey,
 		queryFn,
-		enabled: id !== null && id !== undefined,
+		enabled: !!id,
 		...queryOptions,
 	} as UseQueryOptions<
 		Awaited<ReturnType<typeof getRoutePolicyByID>>,
@@ -382,7 +362,7 @@ export function useGetRoutePolicyByID<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
--- a/frontend/src/api/generated/services/rules/index.ts
+++ b/frontend/src/api/generated/services/rules/index.ts
@@ -52,26 +52,6 @@ import type {
 import { GeneratedAPIInstance } from '../../../generatedAPIInstance';
 import type { ErrorType, BodyType } from '../../../generatedAPIInstance';

-const withQueryKey = <T extends object, K>(
-	query: T,
-	queryKey: K,
-): T & { queryKey: K } => {
-	const result = { queryKey } as T & { queryKey: K };
-	for (const key of Object.keys(query)) {
-		// The explicit queryKey always wins, matching the previous
-		// `{ ...query, queryKey }` spread where it was set last.
-		if (key === 'queryKey') {
-			continue;
-		}
-		Object.defineProperty(result, key, {
-			enumerable: true,
-			configurable: true,
-			get: () => (query as Record<string, unknown>)[key],
-		});
-	}
-	return result;
-};
-
 /**
 * This endpoint lists all alert rules with their current evaluation state
 * @summary List alert rules
@@ -130,7 +110,7 @@ export function useListRules<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -353,7 +333,7 @@ export const getGetRuleByIDQueryOptions = <
 	return {
 		queryKey,
 		queryFn,
-		enabled: id !== null && id !== undefined,
+		enabled: !!id,
 		...queryOptions,
 	} as UseQueryOptions<
 		Awaited<ReturnType<typeof getRuleByID>>,
@@ -390,7 +370,7 @@ export function useGetRuleByID<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -660,7 +640,7 @@ export const getGetRuleHistoryFilterKeysQueryOptions = <
 	return {
 		queryKey,
 		queryFn,
-		enabled: id !== null && id !== undefined,
+		enabled: !!id,
 		...queryOptions,
 	} as UseQueryOptions<
 		Awaited<ReturnType<typeof getRuleHistoryFilterKeys>>,
@@ -703,7 +683,7 @@ export function useGetRuleHistoryFilterKeys<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -777,7 +757,7 @@ export const getGetRuleHistoryFilterValuesQueryOptions = <
 	return {
 		queryKey,
 		queryFn,
-		enabled: id !== null && id !== undefined,
+		enabled: !!id,
 		...queryOptions,
 	} as UseQueryOptions<
 		Awaited<ReturnType<typeof getRuleHistoryFilterValues>>,
@@ -820,7 +800,7 @@ export function useGetRuleHistoryFilterValues<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -894,7 +874,7 @@ export const getGetRuleHistoryOverallStatusQueryOptions = <
 	return {
 		queryKey,
 		queryFn,
-		enabled: id !== null && id !== undefined,
+		enabled: !!id,
 		...queryOptions,
 	} as UseQueryOptions<
 		Awaited<ReturnType<typeof getRuleHistoryOverallStatus>>,
@@ -937,7 +917,7 @@ export function useGetRuleHistoryOverallStatus<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -1010,7 +990,7 @@ export const getGetRuleHistoryStatsQueryOptions = <
 	return {
 		queryKey,
 		queryFn,
-		enabled: id !== null && id !== undefined,
+		enabled: !!id,
 		...queryOptions,
 	} as UseQueryOptions<
 		Awaited<ReturnType<typeof getRuleHistoryStats>>,
@@ -1052,7 +1032,7 @@ export function useGetRuleHistoryStats<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -1125,7 +1105,7 @@ export const getGetRuleHistoryTimelineQueryOptions = <
 	return {
 		queryKey,
 		queryFn,
-		enabled: id !== null && id !== undefined,
+		enabled: !!id,
 		...queryOptions,
 	} as UseQueryOptions<
 		Awaited<ReturnType<typeof getRuleHistoryTimeline>>,
@@ -1168,7 +1148,7 @@ export function useGetRuleHistoryTimeline<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -1242,7 +1222,7 @@ export const getGetRuleHistoryTopContributorsQueryOptions = <
 	return {
 		queryKey,
 		queryFn,
-		enabled: id !== null && id !== undefined,
+		enabled: !!id,
 		...queryOptions,
 	} as UseQueryOptions<
 		Awaited<ReturnType<typeof getRuleHistoryTopContributors>>,
@@ -1285,7 +1265,7 @@ export function useGetRuleHistoryTopContributors<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
--- a/frontend/src/api/generated/services/saved-view/index.ts
+++ b/frontend/src/api/generated/services/saved-view/index.ts
@@ -33,26 +33,6 @@ import type {
 import { GeneratedAPIInstance } from '../../../generatedAPIInstance';
 import type { ErrorType, BodyType } from '../../../generatedAPIInstance';

-const withQueryKey = <T extends object, K>(
-	query: T,
-	queryKey: K,
-): T & { queryKey: K } => {
-	const result = { queryKey } as T & { queryKey: K };
-	for (const key of Object.keys(query)) {
-		// The explicit queryKey always wins, matching the previous
-		// `{ ...query, queryKey }` spread where it was set last.
-		if (key === 'queryKey') {
-			continue;
-		}
-		Object.defineProperty(result, key, {
-			enumerable: true,
-			configurable: true,
-			get: () => (query as Record<string, unknown>)[key],
-		});
-	}
-	return result;
-};
-
 /**
 * Returns saved views, optionally filtered by source and name.
 * @summary List saved views
@@ -129,7 +109,7 @@ export function useListSavedViews<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -353,7 +333,7 @@ export const getGetSavedViewQueryOptions = <
 	return {
 		queryKey,
 		queryFn,
-		enabled: id !== null && id !== undefined,
+		enabled: !!id,
 		...queryOptions,
 	} as UseQueryOptions<
 		Awaited<ReturnType<typeof getSavedView>>,
@@ -390,7 +370,7 @@ export function useGetSavedView<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
--- a/frontend/src/api/generated/services/serviceaccount/index.ts
+++ b/frontend/src/api/generated/services/serviceaccount/index.ts
@@ -47,26 +47,6 @@ import type {
 import { GeneratedAPIInstance } from '../../../generatedAPIInstance';
 import type { ErrorType, BodyType } from '../../../generatedAPIInstance';

-const withQueryKey = <T extends object, K>(
-	query: T,
-	queryKey: K,
-): T & { queryKey: K } => {
-	const result = { queryKey } as T & { queryKey: K };
-	for (const key of Object.keys(query)) {
-		// The explicit queryKey always wins, matching the previous
-		// `{ ...query, queryKey }` spread where it was set last.
-		if (key === 'queryKey') {
-			continue;
-		}
-		Object.defineProperty(result, key, {
-			enumerable: true,
-			configurable: true,
-			get: () => (query as Record<string, unknown>)[key],
-		});
-	}
-	return result;
-};
-
 /**
 * This endpoint assigns a role to a service account
 * @summary Create service account role
@@ -277,7 +257,7 @@ export const getGetServiceAccountRoleQueryOptions = <
 	return {
 		queryKey,
 		queryFn,
-		enabled: id !== null && id !== undefined,
+		enabled: !!id,
 		...queryOptions,
 	} as UseQueryOptions<
 		Awaited<ReturnType<typeof getServiceAccountRole>>,
@@ -314,7 +294,7 @@ export function useGetServiceAccountRole<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -399,7 +379,7 @@ export function useListServiceAccounts<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -627,7 +607,7 @@ export const getGetServiceAccountQueryOptions = <
 	return {
 		queryKey,
 		queryFn,
-		enabled: id !== null && id !== undefined,
+		enabled: !!id,
 		...queryOptions,
 	} as UseQueryOptions<
 		Awaited<ReturnType<typeof getServiceAccount>>,
@@ -664,7 +644,7 @@ export function useGetServiceAccount<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -829,7 +809,7 @@ export const getListServiceAccountKeysQueryOptions = <
 	return {
 		queryKey,
 		queryFn,
-		enabled: id !== null && id !== undefined,
+		enabled: !!id,
 		...queryOptions,
 	} as UseQueryOptions<
 		Awaited<ReturnType<typeof listServiceAccountKeys>>,
@@ -867,7 +847,7 @@ export function useListServiceAccountKeys<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -1212,7 +1192,7 @@ export const getGetServiceAccountRolesQueryOptions = <
 	return {
 		queryKey,
 		queryFn,
-		enabled: id !== null && id !== undefined,
+		enabled: !!id,
 		...queryOptions,
 	} as UseQueryOptions<
 		Awaited<ReturnType<typeof getServiceAccountRoles>>,
@@ -1250,7 +1230,7 @@ export function useGetServiceAccountRoles<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -1335,7 +1315,7 @@ export function useGetMyServiceAccount<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
--- a/frontend/src/api/generated/services/sessions/index.ts
+++ b/frontend/src/api/generated/services/sessions/index.ts
@@ -34,26 +34,6 @@ import type {
 import { GeneratedAPIInstance } from '../../../generatedAPIInstance';
 import type { ErrorType, BodyType } from '../../../generatedAPIInstance';

-const withQueryKey = <T extends object, K>(
-	query: T,
-	queryKey: K,
-): T & { queryKey: K } => {
-	const result = { queryKey } as T & { queryKey: K };
-	for (const key of Object.keys(query)) {
-		// The explicit queryKey always wins, matching the previous
-		// `{ ...query, queryKey }` spread where it was set last.
-		if (key === 'queryKey') {
-			continue;
-		}
-		Object.defineProperty(result, key, {
-			enumerable: true,
-			configurable: true,
-			get: () => (query as Record<string, unknown>)[key],
-		});
-	}
-	return result;
-};
-
 /**
 * This endpoint creates a session for a user using google callback
 * @summary Create session by google callback
@@ -123,7 +103,7 @@ export function useCreateSessionByGoogleCallback<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -210,7 +190,7 @@ export function useCreateSessionByOIDCCallback<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -484,7 +464,7 @@ export function useGetSessionContext<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
--- a/frontend/src/api/generated/services/sigNoz.schemas.ts
+++ b/frontend/src/api/generated/services/sigNoz.schemas.ts
@@ -43,7 +43,6 @@ export enum AlertmanagertypesChannelConfigVariantGithubComSigNozSignozPkgTypesAl
 export interface AlertmanagertypesChannelSlackConfigDTO {
 	/**
 	 * @type string
-	 * @format password
 	 */
 	apiUrl: string;
 	/**
@@ -114,12 +113,10 @@ export enum AlertmanagertypesChannelConfigVariantGithubComSigNozSignozPkgTypesAl
 export interface AlertmanagertypesChannelWebhookConfigDTO {
 	/**
 	 * @type string
-	 * @format password
 	 */
 	bearerToken?: string;
 	/**
 	 * @type string
-	 * @format password
 	 */
 	password?: string;
 	/**
@@ -128,7 +125,6 @@ export interface AlertmanagertypesChannelWebhookConfigDTO {
 	sendResolved?: boolean | null;
 	/**
 	 * @type string
-	 * @format password
 	 */
 	url: string;
 	/**
@@ -184,7 +180,6 @@ export interface AlertmanagertypesChannelPagerdutyConfigDTO {
 	group?: string;
 	/**
 	 * @type string
-	 * @format password
 	 */
 	routingKey: string;
 	/**
@@ -224,7 +219,6 @@ export type AlertmanagertypesChannelOpsgenieConfigDTODetails = {
 export interface AlertmanagertypesChannelOpsgenieConfigDTO {
 	/**
 	 * @type string
-	 * @format password
 	 */
 	apiKey: string;
 	/**
@@ -284,7 +278,6 @@ export interface AlertmanagertypesChannelMSTeamsConfigDTO {
 	title?: string;
 	/**
 	 * @type string
-	 * @format password
 	 */
 	webhookUrl: string;
 }
@@ -316,7 +309,6 @@ export interface AlertmanagertypesChannelGoogleChatConfigDTO {
 	title?: string;
 	/**
 	 * @type string
-	 * @format password
 	 */
 	webhookUrl: string;
 }
@@ -340,7 +332,6 @@ export type AlertmanagertypesChannelJiraConfigDTOCustomFields = {
 export interface AlertmanagertypesChannelJiraConfigDTO {
 	/**
 	 * @type string
-	 * @format password
 	 */
 	apiToken: string;
 	/**
@@ -416,7 +407,6 @@ export enum AlertmanagertypesChannelConfigVariantGithubComSigNozSignozPkgTypesAl
 export interface AlertmanagertypesChannelJSMOpsConfigDTO {
 	/**
 	 * @type string
-	 * @format password
 	 */
 	apiKey: string;
 	/**
@@ -476,7 +466,6 @@ export interface AlertmanagertypesChannelIncidentIOConfigDTO {
 	title?: string;
 	/**
 	 * @type string
-	 * @format password
 	 */
 	token: string;
 	/**
@@ -3231,30 +3220,33 @@ export interface CloudintegrationtypesAWSServiceConfigDTO {
 	metrics?: CloudintegrationtypesAWSServiceMetricsConfigDTO;
 }

-export type CloudintegrationtypesAgentReportDTODataAnyOf = {
+export type CloudintegrationtypesAgentReportDTOAnyOfDataAnyOf = {
 	[key: string]: unknown;
 };

 /**
 * @nullable
 */
-export type CloudintegrationtypesAgentReportDTOData =
-	CloudintegrationtypesAgentReportDTODataAnyOf | null;
+export type CloudintegrationtypesAgentReportDTOAnyOfData =
+	CloudintegrationtypesAgentReportDTOAnyOfDataAnyOf | null;

-/**
- * @nullable
- */
-export type CloudintegrationtypesAgentReportDTO = {
+export type CloudintegrationtypesAgentReportDTOAnyOf = {
 	/**
 	 * @type object,null
 	 */
-	data: CloudintegrationtypesAgentReportDTOData;
+	data: CloudintegrationtypesAgentReportDTOAnyOfData;
 	/**
 	 * @type integer
 	 * @format int64
 	 */
 	timestampMillis: number;
-} | null;
+};
+
+/**
+ * @nullable
+ */
+export type CloudintegrationtypesAgentReportDTO =
+	CloudintegrationtypesAgentReportDTOAnyOf | null;

 export interface CloudintegrationtypesAzureAccountConfigDTO {
 	/**
@@ -3453,10 +3445,7 @@ export enum CloudintegrationtypesServiceIDDTO {
 	cloudstorage = 'cloudstorage',
 	cloudsql_mysql = 'cloudsql_mysql',
 }
-/**
- * @nullable
- */
-export type CloudintegrationtypesCloudIntegrationServiceDTO = {
+export type CloudintegrationtypesCloudIntegrationServiceDTOAnyOf = {
 	/**
 	 * @type string
 	 */
@@ -3477,7 +3466,13 @@ export type CloudintegrationtypesCloudIntegrationServiceDTO = {
 	 * @format date-time
 	 */
 	updatedAt?: string;
-} | null;
+};
+
+/**
+ * @nullable
+ */
+export type CloudintegrationtypesCloudIntegrationServiceDTO =
+	CloudintegrationtypesCloudIntegrationServiceDTOAnyOf | null;

 export interface CloudintegrationtypesCollectedLogAttributeDTO {
 	/**
@@ -3631,16 +3626,19 @@ export interface CloudintegrationtypesOldAWSCollectionStrategyDTO {
 	s3_buckets?: CloudintegrationtypesOldAWSCollectionStrategyDTOS3Buckets;
 }

-/**
- * @nullable
- */
-export type CloudintegrationtypesIntegrationConfigDTO = {
+export type CloudintegrationtypesIntegrationConfigDTOAnyOf = {
 	/**
 	 * @type array
 	 */
 	enabled_regions: string[];
 	telemetry: CloudintegrationtypesOldAWSCollectionStrategyDTO;
-} | null;
+};
+
+/**
+ * @nullable
+ */
+export type CloudintegrationtypesIntegrationConfigDTO =
+	CloudintegrationtypesIntegrationConfigDTOAnyOf | null;

 export interface CloudintegrationtypesProviderIntegrationConfigDTO {
 	aws?: CloudintegrationtypesAWSIntegrationConfigDTO;
@@ -9461,10 +9459,7 @@ export interface TelemetrystoretypesMergeTreeReadDTO {
 	table: string;
 }

-/**
- * @nullable
- */
-export type TelemetrystoretypesGranulesDTO = {
+export type TelemetrystoretypesGranulesDTOAnyOf = {
 	/**
 	 * @type integer
 	 * @format int64
@@ -9484,7 +9479,13 @@ export type TelemetrystoretypesGranulesDTO = {
 	 * @format int64
 	 */
 	skipped: number;
-} | null;
+};
+
+/**
+ * @nullable
+ */
+export type TelemetrystoretypesGranulesDTO =
+	TelemetrystoretypesGranulesDTOAnyOf | null;

 export interface Querybuildertypesv5PreviewStatementDTO {
 	/**
@@ -10682,10 +10683,7 @@ export interface SpantypesGettableFlamegraphTraceDTO {
 	startTimestampMillis: number;
 }

-/**
- * @nullable
- */
-export type SpantypesSpanMapperGroupConditionDTO = {
+export type SpantypesSpanMapperGroupConditionDTOAnyOf = {
 	/**
 	 * @type array,null
 	 */
@@ -10694,7 +10692,13 @@ export type SpantypesSpanMapperGroupConditionDTO = {
 	 * @type array,null
 	 */
 	resource: string[] | null;
-} | null;
+};
+
+/**
+ * @nullable
+ */
+export type SpantypesSpanMapperGroupConditionDTO =
+	SpantypesSpanMapperGroupConditionDTOAnyOf | null;

 export interface SpantypesSpanMapperGroupDTO {
 	condition: SpantypesSpanMapperGroupConditionDTO | null;
--- a/frontend/src/api/generated/services/spanmapper/index.ts
+++ b/frontend/src/api/generated/services/spanmapper/index.ts
@@ -41,26 +41,6 @@ import type {
 import { GeneratedAPIInstance } from '../../../generatedAPIInstance';
 import type { ErrorType, BodyType } from '../../../generatedAPIInstance';

-const withQueryKey = <T extends object, K>(
-	query: T,
-	queryKey: K,
-): T & { queryKey: K } => {
-	const result = { queryKey } as T & { queryKey: K };
-	for (const key of Object.keys(query)) {
-		// The explicit queryKey always wins, matching the previous
-		// `{ ...query, queryKey }` spread where it was set last.
-		if (key === 'queryKey') {
-			continue;
-		}
-		Object.defineProperty(result, key, {
-			enumerable: true,
-			configurable: true,
-			get: () => (query as Record<string, unknown>)[key],
-		});
-	}
-	return result;
-};
-
 /**
 * Returns all span attribute mapping groups for the authenticated org.
 * @summary List span attribute mapping groups
@@ -140,7 +120,7 @@ export function useListSpanMapperGroups<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -469,7 +449,7 @@ export const getListSpanMappersQueryOptions = <
 	return {
 		queryKey,
 		queryFn,
-		enabled: groupId !== null && groupId !== undefined,
+		enabled: !!groupId,
 		...queryOptions,
 	} as UseQueryOptions<
 		Awaited<ReturnType<typeof listSpanMappers>>,
@@ -506,7 +486,7 @@ export function useListSpanMappers<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
--- a/frontend/src/api/generated/services/stats/index.ts
+++ b/frontend/src/api/generated/services/stats/index.ts
@@ -19,26 +19,6 @@ import type { GetStats200, RenderErrorResponseDTO } from '../sigNoz.schemas';
 import { GeneratedAPIInstance } from '../../../generatedAPIInstance';
 import type { ErrorType } from '../../../generatedAPIInstance';

-const withQueryKey = <T extends object, K>(
-	query: T,
-	queryKey: K,
-): T & { queryKey: K } => {
-	const result = { queryKey } as T & { queryKey: K };
-	for (const key of Object.keys(query)) {
-		// The explicit queryKey always wins, matching the previous
-		// `{ ...query, queryKey }` spread where it was set last.
-		if (key === 'queryKey') {
-			continue;
-		}
-		Object.defineProperty(result, key, {
-			enumerable: true,
-			configurable: true,
-			get: () => (query as Record<string, unknown>)[key],
-		});
-	}
-	return result;
-};
-
 /**
 * This endpoint returns the collected stats for the organization
 * @summary Get stats
@@ -97,7 +77,7 @@ export function useGetStats<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
--- a/frontend/src/api/generated/services/subscriptions/index.ts
+++ b/frontend/src/api/generated/services/subscriptions/index.ts
@@ -28,26 +28,6 @@ import type {
 import { GeneratedAPIInstance } from '../../../generatedAPIInstance';
 import type { ErrorType, BodyType } from '../../../generatedAPIInstance';

-const withQueryKey = <T extends object, K>(
-	query: T,
-	queryKey: K,
-): T & { queryKey: K } => {
-	const result = { queryKey } as T & { queryKey: K };
-	for (const key of Object.keys(query)) {
-		// The explicit queryKey always wins, matching the previous
-		// `{ ...query, queryKey }` spread where it was set last.
-		if (key === 'queryKey') {
-			continue;
-		}
-		Object.defineProperty(result, key, {
-			enumerable: true,
-			configurable: true,
-			get: () => (query as Record<string, unknown>)[key],
-		});
-	}
-	return result;
-};
-
 /**
 * This endpoint gets the organization's subscription along with its usage and billing details.
 * @summary Get the subscription.
@@ -114,7 +94,7 @@ export function useGetSubscription<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
--- a/frontend/src/api/generated/services/users/index.ts
+++ b/frontend/src/api/generated/services/users/index.ts
@@ -50,26 +50,6 @@ import type {
 import { GeneratedAPIInstance } from '../../../generatedAPIInstance';
 import type { ErrorType, BodyType } from '../../../generatedAPIInstance';

-const withQueryKey = <T extends object, K>(
-	query: T,
-	queryKey: K,
-): T & { queryKey: K } => {
-	const result = { queryKey } as T & { queryKey: K };
-	for (const key of Object.keys(query)) {
-		// The explicit queryKey always wins, matching the previous
-		// `{ ...query, queryKey }` spread where it was set last.
-		if (key === 'queryKey') {
-			continue;
-		}
-		Object.defineProperty(result, key, {
-			enumerable: true,
-			configurable: true,
-			get: () => (query as Record<string, unknown>)[key],
-		});
-	}
-	return result;
-};
-
 /**
 * This endpoint is deprecated and always fails. Use GET /api/v2/users/me instead.
 * @deprecated
@@ -138,7 +118,7 @@ export function useGetMyUserDeprecated<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -452,7 +432,7 @@ export const getGetUsersByRoleIDQueryOptions = <
 	return {
 		queryKey,
 		queryFn,
-		enabled: id !== null && id !== undefined,
+		enabled: !!id,
 		...queryOptions,
 	} as UseQueryOptions<
 		Awaited<ReturnType<typeof getUsersByRoleID>>,
@@ -489,7 +469,7 @@ export function useGetUsersByRoleID<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -713,7 +693,7 @@ export const getGetUserRoleQueryOptions = <
 	return {
 		queryKey,
 		queryFn,
-		enabled: id !== null && id !== undefined,
+		enabled: !!id,
 		...queryOptions,
 	} as UseQueryOptions<
 		Awaited<ReturnType<typeof getUserRole>>,
@@ -750,7 +730,7 @@ export function useGetUserRole<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -827,7 +807,7 @@ export function useListUsers<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -1046,7 +1026,7 @@ export const getGetUserQueryOptions = <
 	return {
 		queryKey,
 		queryFn,
-		enabled: id !== null && id !== undefined,
+		enabled: !!id,
 		...queryOptions,
 	} as UseQueryOptions<Awaited<ReturnType<typeof getUser>>, TError, TData> & {
 		queryKey: QueryKey;
@@ -1077,7 +1057,7 @@ export function useGetUser<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -1241,7 +1221,7 @@ export const getGetResetPasswordTokenQueryOptions = <
 	return {
 		queryKey,
 		queryFn,
-		enabled: id !== null && id !== undefined,
+		enabled: !!id,
 		...queryOptions,
 	} as UseQueryOptions<
 		Awaited<ReturnType<typeof getResetPasswordToken>>,
@@ -1278,7 +1258,7 @@ export function useGetResetPasswordToken<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -1422,7 +1402,7 @@ export const getGetRolesByUserIDQueryOptions = <
 	return {
 		queryKey,
 		queryFn,
-		enabled: id !== null && id !== undefined,
+		enabled: !!id,
 		...queryOptions,
 	} as UseQueryOptions<
 		Awaited<ReturnType<typeof getRolesByUserID>>,
@@ -1459,7 +1439,7 @@ export function useGetRolesByUserID<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
@@ -1536,7 +1516,7 @@ export function useGetMyUser<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
--- a/frontend/src/api/generated/services/zeus/index.ts
+++ b/frontend/src/api/generated/services/zeus/index.ts
@@ -27,26 +27,6 @@ import type {
 import { GeneratedAPIInstance } from '../../../generatedAPIInstance';
 import type { ErrorType, BodyType } from '../../../generatedAPIInstance';

-const withQueryKey = <T extends object, K>(
-	query: T,
-	queryKey: K,
-): T & { queryKey: K } => {
-	const result = { queryKey } as T & { queryKey: K };
-	for (const key of Object.keys(query)) {
-		// The explicit queryKey always wins, matching the previous
-		// `{ ...query, queryKey }` spread where it was set last.
-		if (key === 'queryKey') {
-			continue;
-		}
-		Object.defineProperty(result, key, {
-			enumerable: true,
-			configurable: true,
-			get: () => (query as Record<string, unknown>)[key],
-		});
-	}
-	return result;
-};
-
 /**
 * This endpoint gets the host info from zeus.
 * @summary Get host info from Zeus.
@@ -105,7 +85,7 @@ export function useGetHosts<
 		queryKey: QueryKey;
 	};

-	return withQueryKey(query, queryOptions.queryKey);
+	return { ...query, queryKey: queryOptions.queryKey };
 }

 /**
--- a/frontend/src/api/utils.ts
+++ b/frontend/src/api/utils.ts
@@ -20,6 +20,7 @@ export const Logout = async (): Promise<void> => {
 	deleteLocalStorageKey(LOCALSTORAGE.LOGGED_IN_USER_NAME);
 	deleteLocalStorageKey(LOCALSTORAGE.CHAT_SUPPORT);
 	deleteLocalStorageKey(LOCALSTORAGE.USER_ID);
+	deleteLocalStorageKey(LOCALSTORAGE.QUICK_FILTERS_SETTINGS_ANNOUNCEMENT);
 	window.dispatchEvent(new CustomEvent('LOGOUT'));
 	history.push(ROUTES.LOGIN);
 };
--- a/frontend/src/components/QuickFilters/QuickFilters.styles.scss
+++ b/frontend/src/components/QuickFilters/QuickFilters.styles.scss
@@ -95,7 +95,6 @@
 			gap: 10px;
 			width: 100%;
 			justify-content: flex-end;
-			--button-variant-link-color: var(--l1-foreground);

 			.divider-filter {
 				width: 1px;
--- a/frontend/src/components/QuickFilters/QuickFilters.tsx
+++ b/frontend/src/components/QuickFilters/QuickFilters.tsx
@@ -15,30 +15,28 @@ import {
 	ComboboxTrigger,
 } from '@signozhq/ui/combobox';
 import { Skeleton, Tooltip } from 'antd';
-import { Button } from '@signozhq/ui/button';
 import { Switch } from '@signozhq/ui/switch';
 import { Typography } from '@signozhq/ui/typography';
+import getLocalStorageKey from 'api/browser/localstorage/get';
+import setLocalStorageKey from 'api/browser/localstorage/set';
 import logEvent from 'api/common/logEvent';
 import classNames from 'classnames';
 import OverlayScrollbar from 'components/OverlayScrollbar/OverlayScrollbar';
+import { LOCALSTORAGE } from 'constants/localStorage';
 import { PANEL_TYPES } from 'constants/queryBuilder';
 import { useApiMonitoringParams } from 'container/ApiMonitoring/queryParams';
 import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
-import { AuthZGuardContent } from 'lib/authz/components/AuthZGuard/AuthZGuardContent';
-import AuthZButton from 'lib/authz/components/AuthZButton/AuthZButton';
-import { useAuthZ } from 'lib/authz/hooks/useAuthZ/useAuthZ';
-import {
-	QuickFilterManagePermissions,
-	QuickFilterReadPermission,
-} from 'lib/authz/hooks/useAuthZ/permissions/quick-filter.permissions';
-import { isFunction } from 'lodash-es';
+import { isFunction, isNull } from 'lodash-es';
+import { useAppContext } from 'providers/App/App';
 import { Query } from 'types/api/queryBuilder/queryBuilderData';
+import { USER_ROLES } from 'types/roles';

 import Checkbox from './FilterRenderers/Checkbox/Checkbox';
 import CheckboxV2 from './FilterRenderers/Checkbox/v2/CheckboxFilterV2';
 import Duration from './FilterRenderers/Duration/Duration';
 import Slider from './FilterRenderers/Slider/Slider';
 import useFilterConfig from './hooks/useFilterConfig';
+import AnnouncementTooltip from './QuickFiltersSettings/AnnouncementTooltip';
 import QuickFiltersSettings from './QuickFiltersSettings/QuickFiltersSettings';
 import { FiltersType, IQuickFiltersProps, QuickFiltersSource } from './types';

@@ -57,7 +55,9 @@ export default function QuickFilters(props: IQuickFiltersProps): JSX.Element {
 		showQueryName = true,
 		useFieldApis,
 	} = props;
+	const { user } = useAppContext();
 	const [isSettingsOpen, setIsSettingsOpen] = useState(false);
+	const isAdmin = user.role === USER_ROLES.ADMIN;
 	const [params, setParams] = useApiMonitoringParams();
 	const showIP = params.showIP ?? true;

@@ -68,12 +68,6 @@ export default function QuickFilters(props: IQuickFiltersProps): JSX.Element {
 		refetchCustomFilters,
 		isCustomFiltersLoading,
 	} = useFilterConfig({ signal, config });
-	const {
-		deniedPermissions: deniedSettingsPermissions,
-		isLoading: isSettingsChecking,
-	} = useAuthZ(QuickFilterManagePermissions, { enabled: isDynamicFilters });
-	const isSettingsDisabled =
-		isSettingsChecking || deniedSettingsPermissions.length > 0;

 	const {
 		currentQuery,
@@ -113,6 +107,16 @@ export default function QuickFilters(props: IQuickFiltersProps): JSX.Element {
 	const shouldShowDropdownInListView =
 		isListView && source === QuickFiltersSource.TRACES_EXPLORER;

+	const showAnnouncementTooltip = useMemo(() => {
+		const localStorageValue = getLocalStorageKey(
+			LOCALSTORAGE.QUICK_FILTERS_SETTINGS_ANNOUNCEMENT,
+		);
+		if (!isNull(localStorageValue)) {
+			return !(localStorageValue === 'false');
+		}
+		return true;
+	}, []);
+
 	const activeQueryIndex = useMemo(() => {
 		if (isListView) {
 			return source === QuickFiltersSource.TRACES_EXPLORER
@@ -228,49 +232,49 @@ export default function QuickFilters(props: IQuickFiltersProps): JSX.Element {
 	const renderRightActions = (): JSX.Element => (
 		<section className="right-actions">
 			<Tooltip title="Reset All">
-				<Button
-					variant="link"
-					color="secondary"
-					aria-label="Reset All"
-					className="right-action-icon-container"
-					onClick={handleReset}
-					prefix={<RefreshCw className="sync-icon" size="md" />}
-				/>
+				<div className="right-action-icon-container">
+					<RefreshCw className="sync-icon" size="md" onClick={handleReset} />
+				</div>
 			</Tooltip>
 			{showFilterCollapse && (
 				<Tooltip title="Collapse Filters">
-					<Button
-						variant="link"
-						color="secondary"
-						aria-label="Collapse Filters"
-						className="right-action-icon-container"
-						onClick={handleFilterVisibilityChange}
-						prefix={<ArrowUpToLine style={{ rotate: '270deg' }} size="md" />}
-					/>
+					<div className="right-action-icon-container">
+						<ArrowUpToLine
+							style={{ rotate: '270deg', cursor: 'pointer' }}
+							size="md"
+							onClick={handleFilterVisibilityChange}
+						/>
+					</div>
 				</Tooltip>
 			)}
-			{isDynamicFilters && (
-				<AuthZButton
-					checks={QuickFilterManagePermissions}
-					variant="link"
-					color="secondary"
-					aria-label="Settings"
-					className={classNames('right-action-icon-container', {
-						active: isSettingsOpen,
-					})}
-					onClick={(): void => setIsSettingsOpen(true)}
-					testId="settings-icon-container"
-					prefix={
-						<Tooltip title="Settings" open={isSettingsDisabled ? false : undefined}>
-							<SettingsIcon
-								className="settings-icon"
-								data-testid="settings-icon"
-								width={14}
-								height={14}
-							/>
-						</Tooltip>
-					}
-				/>
+			{isDynamicFilters && isAdmin && (
+				<Tooltip title="Settings">
+					<div
+						className={classNames('right-action-icon-container', {
+							active: isSettingsOpen,
+						})}
+					>
+						<SettingsIcon
+							className="settings-icon"
+							data-testid="settings-icon"
+							width={14}
+							height={14}
+							onClick={(): void => setIsSettingsOpen(true)}
+						/>
+						<AnnouncementTooltip
+							show={showAnnouncementTooltip}
+							position={{ top: -5, left: 15 }}
+							title="Edit your quick filters"
+							message="You can now customize and re-arrange your quick filters panel. Select the quick filters you’d need and hide away the rest for faster exploration."
+							onClose={(): void => {
+								setLocalStorageKey(
+									LOCALSTORAGE.QUICK_FILTERS_SETTINGS_ANNOUNCEMENT,
+									'false',
+								);
+							}}
+						/>
+					</div>
+				</Tooltip>
 			)}
 		</section>
 	);
@@ -357,21 +361,6 @@ export default function QuickFilters(props: IQuickFiltersProps): JSX.Element {
 		</>
 	);

-	const filtersSkeleton = (
-		<div className="quick-filters-skeleton">
-			{Array.from({ length: 5 }).map((_, index) => (
-				// eslint-disable-next-line react/no-array-index-key
-				<Skeleton.Input active size="small" key={index} />
-			))}
-		</div>
-	);
-
-	const filtersContent = isCustomFiltersLoading ? (
-		filtersSkeleton
-	) : (
-		<OverlayScrollbar>{renderContent()}</OverlayScrollbar>
-	);
-
 	return (
 		<div className="quick-filters-container">
 			<div className="quick-filters">
@@ -382,15 +371,15 @@ export default function QuickFilters(props: IQuickFiltersProps): JSX.Element {
 					</section>
 				)}

-				{signal ? (
-					<AuthZGuardContent
-						checks={[QuickFilterReadPermission]}
-						fallbackOnLoading={filtersSkeleton}
-					>
-						{filtersContent}
-					</AuthZGuardContent>
+				{isCustomFiltersLoading ? (
+					<div className="quick-filters-skeleton">
+						{Array.from({ length: 5 }).map((_, index) => (
+							// eslint-disable-next-line react/no-array-index-key
+							<Skeleton.Input active size="small" key={index} />
+						))}
+					</div>
 				) : (
-					filtersContent
+					<OverlayScrollbar>{renderContent()}</OverlayScrollbar>
 				)}
 			</div>
 			<div className="quick-filters-settings-container">
--- a/frontend/src/components/QuickFilters/hooks/useFilterConfig.tsx
+++ b/frontend/src/components/QuickFilters/hooks/useFilterConfig.tsx
@@ -35,7 +35,10 @@ const useFilterConfig = ({
 		[data],
 	);

-	const isDynamicFilters = !!signal;
+	const isDynamicFilters = useMemo(
+		() => customFilters.length > 0,
+		[customFilters],
+	);

 	const filterConfig = useMemo(
 		() => getFilterConfig(signal, customFilters, config),
--- a/frontend/src/components/QuickFilters/tests/QuickFilters.authz.test.tsx
+++ b/frontend/src/components/QuickFilters/tests/QuickFilters.authz.test.tsx
@@ -1,212 +0,0 @@
-import { ENVIRONMENT } from 'constants/env';
-import {
-	ApiMonitoringParams,
-	useApiMonitoringParams,
-} from 'container/ApiMonitoring/queryParams';
-import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
-import {
-	QuickFilterReadPermission,
-	QuickFilterUpdatePermission,
-} from 'lib/authz/hooks/useAuthZ/permissions/quick-filter.permissions';
-import {
-	AUTHZ_CHECK_URL,
-	setupAuthzAdmin,
-	setupAuthzDeny,
-	setupAuthzDenyAll,
-} from 'lib/authz/utils/authz-test-utils';
-import {
-	otherFiltersResponse,
-	quickFiltersAttributeValuesResponse,
-	quickFiltersListResponse,
-} from 'mocks-server/__mockdata__/customQuickFilters';
-import { server } from 'mocks-server/server';
-import { rest } from 'msw';
-import { render, screen, userEvent, waitFor } from 'tests/test-utils';
-
-import QuickFilters from '../QuickFilters';
-import { QuickFiltersSource, SignalType } from '../types';
-import { QuickFiltersConfig } from './constants';
-
-jest.mock('hooks/queryBuilder/useQueryBuilder', () => ({
-	useQueryBuilder: jest.fn(),
-}));
-jest.mock('container/ApiMonitoring/queryParams');
-
-const mockUseApiMonitoringParams = jest.mocked(useApiMonitoringParams);
-
-const BASE_URL = ENVIRONMENT.baseURL;
-const SIGNAL = SignalType.LOGS;
-const quickFiltersListURL = `${BASE_URL}/api/v2/quick_filters/${SIGNAL}`;
-const fieldsKeysURL = `${BASE_URL}/api/v1/fields/keys`;
-const attributeValuesURL = `${BASE_URL}/api/v3/autocomplete/attribute_values`;
-const fieldsValuesURL = `${BASE_URL}/api/v1/fields/values`;
-
-const NOT_AUTHORIZED_TEXT = /is not authorized to perform/i;
-const FILTER_SERVICE_NAME = 'Service Name';
-const SETTINGS_CONTAINER_TEST_ID = 'settings-icon-container';
-
-beforeEach(() => {
-	(useQueryBuilder as jest.Mock).mockReturnValue({
-		currentQuery: {
-			builder: {
-				queryData: [
-					{
-						queryName: 'Test Query',
-						filters: { items: [] },
-					},
-				],
-			},
-		},
-		lastUsedQuery: 0,
-		redirectWithQueryBuilderData: jest.fn(),
-	});
-	mockUseApiMonitoringParams.mockReturnValue([
-		{ showIP: true } as ApiMonitoringParams,
-		jest.fn(),
-	]);
-	server.use(
-		rest.get(quickFiltersListURL, (_req, res, ctx) =>
-			res(ctx.status(200), ctx.json(quickFiltersListResponse)),
-		),
-		rest.get(fieldsKeysURL, (_req, res, ctx) =>
-			res(ctx.status(200), ctx.json(otherFiltersResponse)),
-		),
-		rest.get(attributeValuesURL, (_req, res, ctx) =>
-			res(ctx.status(200), ctx.json(quickFiltersAttributeValuesResponse)),
-		),
-		rest.get(fieldsValuesURL, (_req, res, ctx) =>
-			res(ctx.status(200), ctx.json(quickFiltersAttributeValuesResponse)),
-		),
-	);
-});
-
-afterEach(() => {
-	server.resetHandlers();
-	jest.clearAllMocks();
-});
-
-function renderWithSignal(): void {
-	render(
-		<QuickFilters
-			source={QuickFiltersSource.LOGS_EXPLORER}
-			signal={SIGNAL}
-			handleFilterVisibilityChange={jest.fn()}
-		/>,
-	);
-}
-
-function renderStaticConfig(): void {
-	render(
-		<QuickFilters
-			source={QuickFiltersSource.EXCEPTIONS}
-			config={QuickFiltersConfig}
-			handleFilterVisibilityChange={jest.fn()}
-		/>,
-	);
-}
-
-describe('QuickFilters - AuthZ', () => {
-	describe('read denied', () => {
-		it('shows the inline denial instead of the filters, header stays', async () => {
-			server.use(setupAuthzDeny(QuickFilterReadPermission));
-
-			renderWithSignal();
-
-			await expect(
-				screen.findByText(NOT_AUTHORIZED_TEXT),
-			).resolves.toBeInTheDocument();
-
-			expect(screen.queryByText(FILTER_SERVICE_NAME)).not.toBeInTheDocument();
-			expect(screen.getByText('Filters for')).toBeInTheDocument();
-
-			const settingsTrigger = await screen.findByTestId(
-				SETTINGS_CONTAINER_TEST_ID,
-			);
-			await waitFor(() =>
-				expect(settingsTrigger).toHaveAttribute(
-					'data-denied-permissions',
-					expect.stringContaining('read'),
-				),
-			);
-		});
-	});
-
-	describe('update denied', () => {
-		it('renders the filters but disables the settings trigger', async () => {
-			server.use(setupAuthzDeny(QuickFilterUpdatePermission));
-
-			renderWithSignal();
-
-			await expect(
-				screen.findByText(FILTER_SERVICE_NAME),
-			).resolves.toBeInTheDocument();
-
-			const settingsTrigger = await screen.findByTestId(
-				SETTINGS_CONTAINER_TEST_ID,
-			);
-			await waitFor(() =>
-				expect(settingsTrigger).toHaveAttribute(
-					'data-denied-permissions',
-					expect.stringContaining('update'),
-				),
-			);
-
-			await userEvent.click(settingsTrigger);
-			expect(screen.queryByText(/ADDED FILTERS/i)).not.toBeInTheDocument();
-		});
-	});
-
-	describe('all permissions granted', () => {
-		it('renders the filters and opens settings from the trigger', async () => {
-			server.use(setupAuthzAdmin());
-
-			renderWithSignal();
-
-			await expect(
-				screen.findByText(FILTER_SERVICE_NAME),
-			).resolves.toBeInTheDocument();
-
-			const settingsTrigger = await screen.findByTestId(
-				SETTINGS_CONTAINER_TEST_ID,
-			);
-			expect(settingsTrigger).not.toHaveAttribute('data-denied-permissions');
-
-			await userEvent.click(settingsTrigger);
-			await expect(
-				screen.findByText(/ADDED FILTERS/i),
-			).resolves.toBeInTheDocument();
-		});
-	});
-
-	describe('static config pages (no signal)', () => {
-		it('is not gated even when every permission is denied', async () => {
-			server.use(setupAuthzDenyAll());
-
-			renderStaticConfig();
-
-			await expect(
-				screen.findByText(FILTER_SERVICE_NAME),
-			).resolves.toBeInTheDocument();
-			expect(screen.queryByText(NOT_AUTHORIZED_TEXT)).not.toBeInTheDocument();
-		});
-	});
-
-	describe('permission check loading', () => {
-		it('shows the skeleton, not the filters or a denial', async () => {
-			server.use(
-				rest.post(AUTHZ_CHECK_URL, (_req, res, ctx) => res(ctx.delay('infinite'))),
-			);
-
-			renderWithSignal();
-
-			await waitFor(() =>
-				// eslint-disable-next-line testing-library/no-node-access
-				expect(
-					document.querySelector('.quick-filters-skeleton'),
-				).toBeInTheDocument(),
-			);
-			expect(screen.queryByText(NOT_AUTHORIZED_TEXT)).not.toBeInTheDocument();
-			expect(screen.queryByText(FILTER_SERVICE_NAME)).not.toBeInTheDocument();
-		});
-	});
-});
--- a/frontend/src/components/QuickFilters/types.ts
+++ b/frontend/src/components/QuickFilters/types.ts
@@ -54,7 +54,6 @@ export interface IQuickFiltersProps {
 	source: QuickFiltersSource;
 	onFilterChange?: (query: Query) => void;
 	onQuickFilterChange?: (data: QuickFilterChangeEventData) => void;
-	/** Pass to fetch quick filters for this signal; omit to use `config` as-is */
 	signal?: SignalType;
 	className?: string;
 	showFilterCollapse?: boolean;
--- a/frontend/src/constants/localStorage.ts
+++ b/frontend/src/constants/localStorage.ts
@@ -31,6 +31,7 @@ export enum LOCALSTORAGE {
 	DONT_SHOW_SLOW_API_WARNING = 'DONT_SHOW_SLOW_API_WARNING',
 	METRICS_LIST_OPTIONS = 'METRICS_LIST_OPTIONS',
 	SHOW_EXCEPTIONS_QUICK_FILTERS = 'SHOW_EXCEPTIONS_QUICK_FILTERS',
+	QUICK_FILTERS_SETTINGS_ANNOUNCEMENT = 'QUICK_FILTERS_SETTINGS_ANNOUNCEMENT',
 	FUNNEL_STEPS = 'FUNNEL_STEPS',
 	SPAN_DETAILS_PINNED_ATTRIBUTES = 'SPAN_DETAILS_PINNED_ATTRIBUTES',
 	LAST_USED_CUSTOM_TIME_RANGES = 'LAST_USED_CUSTOM_TIME_RANGES',
--- a/frontend/src/container/RolesSettings/hooks/tests/useRolePermissions.test.ts
+++ b/frontend/src/container/RolesSettings/hooks/tests/useRolePermissions.test.ts
@@ -329,7 +329,7 @@ describe('transformTransactionGroupsToResourcePermissions', () => {
 	it('returns all resources from RESOURCE_ORDER even with empty transaction groups', () => {
 		const result = transformTransactionGroupsToResourcePermissions([]);

-		expect(result).toHaveLength(11);
+		expect(result).toHaveLength(10);
 		expect(result.map((r) => r.resourceKind)).toStrictEqual([
 			'factor-api-key',
 			'dashboard',
@@ -337,7 +337,6 @@ describe('transformTransactionGroupsToResourcePermissions', () => {
 			'logs',
 			'meter-metrics',
 			'metrics',
-			'quick-filter',
 			'role',
 			'serviceaccount',
 			'subscription',
@@ -422,7 +421,7 @@ describe('createEmptyRolePermissions', () => {
 	it('creates permissions for all resources in RESOURCE_ORDER', () => {
 		const result = createEmptyRolePermissions();

-		expect(result).toHaveLength(11);
+		expect(result).toHaveLength(10);
 		expect(result.map((r) => r.resourceKind)).toStrictEqual([
 			'factor-api-key',
 			'dashboard',
@@ -430,7 +429,6 @@ describe('createEmptyRolePermissions', () => {
 			'logs',
 			'meter-metrics',
 			'metrics',
-			'quick-filter',
 			'role',
 			'serviceaccount',
 			'subscription',
--- a/frontend/src/container/RolesSettings/permissions.config.ts
+++ b/frontend/src/container/RolesSettings/permissions.config.ts
@@ -6,7 +6,6 @@ import {
 	Gauge,
 	Grid3X3,
 	Key,
-	ListFilter,
 	Logs,
 	Receipt,
 	Shield,
@@ -87,14 +86,6 @@ export const RESOURCE_PANELS: Record<AuthZResource, ResourcePanelConfig> = {
 		selectorPlaceholder: 'Type * to cover the workspace subscription',
 		docsAnchor: 'subscription',
 	},
-	'quick-filter': {
-		label: 'Quick Filters',
-		description: 'Quick filters shown in the logs, traces, and other explorers.',
-		icon: ListFilter,
-		selectorPlaceholder:
-			'Type quick filter ID, separate multiple with comma or space',
-		docsAnchor: 'quick-filter',
-	},
 	logs: {
 		label: 'Logs',
 		description: 'Log data collected across the workspace.',
--- a/frontend/src/lib/authz/hooks/useAuthZ/permissions.type.ts
+++ b/frontend/src/lib/authz/hooks/useAuthZ/permissions.type.ts
@@ -18,11 +18,6 @@ export default {
 				type: 'metaresource',
 				allowedVerbs: ['create', 'delete', 'list', 'read', 'update'],
 			},
-			{
-				kind: 'quick-filter',
-				type: 'metaresource',
-				allowedVerbs: ['list', 'read', 'update'],
-			},
 			{
 				kind: 'subscription',
 				type: 'metaresource',
--- a/frontend/src/lib/authz/hooks/useAuthZ/permissions/quick-filter.permissions.ts
+++ b/frontend/src/lib/authz/hooks/useAuthZ/permissions/quick-filter.permissions.ts
@@ -1,16 +0,0 @@
-import { buildPermission } from '../utils';
-
-export const QuickFilterReadPermission = buildPermission(
-	'read',
-	'quick-filter:*',
-);
-export const QuickFilterUpdatePermission = buildPermission(
-	'update',
-	'quick-filter:*',
-);
-
-// Editing quick filters needs read as well as update
-export const QuickFilterManagePermissions = [
-	QuickFilterReadPermission,
-	QuickFilterUpdatePermission,
-];
--- a/pkg/telemetrystore/config.go
+++ b/pkg/telemetrystore/config.go
@@ -46,7 +46,6 @@ type QuerySettings struct {
 	MaxBytesToRead                      int    `mapstructure:"max_bytes_to_read"`
 	MaxResultRows                       int    `mapstructure:"max_result_rows"`
 	IgnoreDataSkippingIndices           string `mapstructure:"ignore_data_skipping_indices"`
-	SecondaryIndicesEnableBulkFiltering bool   `mapstructure:"secondary_indices_enable_bulk_filtering"`
 }

 func NewConfigFactory() factory.ConfigFactory {
--- a/pkg/telemetrystore/telemetrystorehook/settings.go
+++ b/pkg/telemetrystore/telemetrystorehook/settings.go
@@ -72,10 +72,6 @@ func (h *provider) BeforeQuery(ctx context.Context, _ *telemetrystore.QueryEvent
 		settings["result_overflow_mode"] = ctx.Value("result_overflow_mode")
 	}

-	// TODO(srikanthccv): enable it when the "Cannot read all data" issue is fixed
-	// https://github.com/ClickHouse/ClickHouse/issues/82283
-	settings["secondary_indices_enable_bulk_filtering"] = false
-
 	ctx = clickhouse.Context(ctx, clickhouse.WithSettings(settings))
 	return ctx
 }
--- a/pkg/types/alertmanagertypes/channelconfig.go
+++ b/pkg/types/alertmanagertypes/channelconfig.go
@@ -207,7 +207,7 @@ type ChannelSpec interface {

 type ChannelSlackConfig struct {
 	SendResolved *bool                        `json:"sendResolved,omitempty"`
-	APIURL       string                       `json:"apiUrl" required:"true" format:"password"`
+	APIURL       string                       `json:"apiUrl" required:"true"`
 	Channel      string                       `json:"channel"`
 	Title        valuer.UnsetOrNonEmptyString `json:"title"`
 	Text         valuer.UnsetOrNonEmptyString `json:"text"`
@@ -312,10 +312,10 @@ func newChannelEmailConfigFromReceiver(_ string, receiver *Receiver) (ChannelSpe
 // was really a bearer token.
 type ChannelWebhookConfig struct {
 	SendResolved *bool  `json:"sendResolved,omitempty"`
-	URL          string `json:"url" required:"true" format:"password"`
+	URL          string `json:"url" required:"true"`
 	Username     string `json:"username"`
-	Password     string `json:"password" format:"password"`
-	BearerToken  string `json:"bearerToken" format:"password"`
+	Password     string `json:"password"`
+	BearerToken  string `json:"bearerToken"`
 }

 func (c ChannelWebhookConfig) Validate() error {
@@ -403,7 +403,7 @@ func newChannelWebhookConfigFromReceiver(name string, receiver *Receiver) (Chann

 type ChannelPagerdutyConfig struct {
 	SendResolved *bool                        `json:"sendResolved,omitempty"`
-	RoutingKey   string                       `json:"routingKey" required:"true" format:"password"`
+	RoutingKey   string                       `json:"routingKey" required:"true"`
 	URL          string                       `json:"url"`
 	Source       valuer.UnsetOrNonEmptyString `json:"source"`
 	Client       valuer.UnsetOrNonEmptyString `json:"client"`
@@ -488,7 +488,7 @@ func newChannelPagerdutyConfigFromReceiver(name string, receiver *Receiver) (Cha

 type ChannelOpsgenieConfig struct {
 	SendResolved *bool                        `json:"sendResolved,omitempty"`
-	APIKey       string                       `json:"apiKey" required:"true" format:"password"`
+	APIKey       string                       `json:"apiKey" required:"true"`
 	APIURL       string                       `json:"apiUrl"`
 	Message      valuer.UnsetOrNonEmptyString `json:"message"`
 	Description  valuer.UnsetOrNonEmptyString `json:"description"`
@@ -552,7 +552,7 @@ func newChannelOpsgenieConfigFromReceiver(name string, receiver *Receiver) (Chan

 type ChannelMSTeamsConfig struct {
 	SendResolved *bool                        `json:"sendResolved,omitempty"`
-	WebhookURL   string                       `json:"webhookUrl" required:"true" format:"password"`
+	WebhookURL   string                       `json:"webhookUrl" required:"true"`
 	Title        valuer.UnsetOrNonEmptyString `json:"title"`
 	Text         valuer.UnsetOrNonEmptyString `json:"text"`
 }
@@ -600,7 +600,7 @@ func newChannelMSTeamsConfigFromReceiver(name string, receiver *Receiver) (Chann

 type ChannelGoogleChatConfig struct {
 	SendResolved *bool                        `json:"sendResolved,omitempty"`
-	WebhookURL   string                       `json:"webhookUrl" required:"true" format:"password"`
+	WebhookURL   string                       `json:"webhookUrl" required:"true"`
 	Title        valuer.UnsetOrNonEmptyString `json:"title"`
 	Text         valuer.UnsetOrNonEmptyString `json:"text"`
 }
@@ -664,7 +664,7 @@ type ChannelJiraConfig struct {
 	CustomFields      map[string]any               `json:"customFields,omitempty"`

 	Email    string `json:"email" required:"true"`
-	APIToken string `json:"apiToken" required:"true" format:"password"`
+	APIToken string `json:"apiToken" required:"true"`
 }

 func (c ChannelJiraConfig) Validate() error {
@@ -785,7 +785,7 @@ func newChannelJiraConfigFromReceiver(name string, receiver *Receiver) (ChannelS
 // keyed by the integration API key, which the notifier pins itself.
 type ChannelJSMOpsConfig struct {
 	SendResolved *bool                        `json:"sendResolved,omitempty"`
-	APIKey       string                       `json:"apiKey" required:"true" format:"password"`
+	APIKey       string                       `json:"apiKey" required:"true"`
 	Message      valuer.UnsetOrNonEmptyString `json:"message"`
 	Description  valuer.UnsetOrNonEmptyString `json:"description"`
 	Priority     string                       `json:"priority"`
@@ -836,7 +836,7 @@ func newChannelJSMOpsConfigFromReceiver(name string, receiver *Receiver) (Channe
 type ChannelIncidentIOConfig struct {
 	SendResolved *bool                        `json:"sendResolved,omitempty"`
 	URL          string                       `json:"url" required:"true"`
-	Token        string                       `json:"token" required:"true" format:"password"`
+	Token        string                       `json:"token" required:"true"`
 	Title        valuer.UnsetOrNonEmptyString `json:"title"`
 	Description  valuer.UnsetOrNonEmptyString `json:"description"`
 	Metadata     map[string]string            `json:"metadata,omitempty"`