chore: add missing files

Resolve pkg/telemetrymetrics/tables.go: adopt main's buffer/reduced table
constants (including the local-table variants) and keep this branch's
reduction-rules table constants. Update the metric-reduction ClickHouse
queries to main's renamed samples-reduced constants
(SamplesV4ReducedLast/SumTableName).

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

.github/workflows/e2eci.yaml

@@ -70,11 +70,7 @@ jobs:
           cd tests/e2e && pnpm install --frozen-lockfile
       - name: playwright-browsers
         run: |
-          docker create --name pw mcr.microsoft.com/playwright:v1.57.0-noble
-          docker cp pw:/ms-playwright "$RUNNER_TEMP/ms-playwright"
-          docker rm pw
-          echo "PLAYWRIGHT_BROWSERS_PATH=$RUNNER_TEMP/ms-playwright" >> "$GITHUB_ENV"
-          cd tests/e2e && pnpm playwright install-deps ${{ matrix.project }}
+          cd tests/e2e && pnpm playwright install --with-deps ${{ matrix.project }}
       - name: bring-up-stack
         run: |
           cd tests && \

.github/workflows/goci.yaml

@@ -140,20 +140,3 @@ jobs:
         run: |
           go run cmd/enterprise/*.go generate config web-settings
           git diff --compact-summary --exit-code || (echo; echo "Unexpected difference in web settings schema. Run go run cmd/enterprise/*.go generate config web-settings locally and commit."; exit 1)
-  transaction-groups:
-    if: |
-      github.event_name == 'merge_group' ||
-      (github.event_name == 'pull_request' && ! github.event.pull_request.head.repo.fork && github.event.pull_request.user.login != 'dependabot[bot]' && ! contains(github.event.pull_request.labels.*.name, 'safe-to-test')) ||
-      (github.event_name == 'pull_request_target' && contains(github.event.pull_request.labels.*.name, 'safe-to-test'))
-    runs-on: ubuntu-latest
-    steps:
-      - name: self-checkout
-        uses: actions/checkout@v4
-      - name: go-install
-        uses: actions/setup-go@v5
-        with:
-          go-version: "1.24"
-      - name: generate-transaction-groups
-        run: |
-          go run cmd/enterprise/*.go generate config transaction-groups
-          git diff --compact-summary --exit-code || (echo; echo "Unexpected difference in transaction groups schema. Run go run cmd/enterprise/*.go generate config transaction-groups locally and commit."; exit 1)

.github/workflows/jsci.yaml

@@ -56,6 +56,17 @@ jobs:
       PRIMUS_REF: main
       JS_SRC: frontend
       JS_PKG_MANAGER: pnpm
+  languages:
+    if: |
+      github.event_name == 'merge_group' ||
+      (github.event_name == 'pull_request' && ! github.event.pull_request.head.repo.fork && github.event.pull_request.user.login != 'dependabot[bot]' && ! contains(github.event.pull_request.labels.*.name, 'safe-to-test')) ||
+      (github.event_name == 'pull_request_target' && contains(github.event.pull_request.labels.*.name, 'safe-to-test'))
+    runs-on: ubuntu-latest
+    steps:
+      - name: self-checkout
+        uses: actions/checkout@v4
+      - name: run
+        run: bash frontend/scripts/validate-md-languages.sh
   openapi:
     if: |
       github.event_name == 'merge_group' ||

cmd/community/server.go

@@ -121,7 +121,7 @@ func runServer(ctx context.Context, config signoz.Config, logger *slog.Logger) e
 		func(_ sqlstore.SQLStore, _ dashboard.Module, _ global.Global, _ zeus.Zeus, _ gateway.Gateway, _ licensing.Licensing, _ serviceaccount.Module, _ cloudintegration.Config) (cloudintegration.Module, error) {
 			return implcloudintegration.NewModule(), nil
 		},
-		func(_ sqlstore.SQLStore, _ telemetrystore.TelemetryStore, _ dashboard.Module, _ queryparser.QueryParser, _ licensing.Licensing, _ flagger.Flagger, _ telemetrytypes.MetadataStore, _ factory.ProviderSettings, _ int) metricreductionrule.Module {
+		func(_ sqlstore.SQLStore, _ telemetrystore.TelemetryStore, _ dashboard.Module, _ queryparser.QueryParser, _ licensing.Licensing, _ flagger.Flagger, _ factory.ProviderSettings, _ int) metricreductionrule.Module {
 			return implmetricreductionrule.NewModule()
 		},
 		func(c cache.Cache, am alertmanager.Alertmanager, ss sqlstore.SQLStore, ts telemetrystore.TelemetryStore, ms telemetrytypes.MetadataStore, p prometheus.Prometheus, og organization.Getter, rsh rulestatehistory.Module, q querier.Querier, qp queryparser.QueryParser) factory.NamedMap[factory.ProviderFactory[ruler.Ruler, ruler.Config]] {

cmd/enterprise/server.go

@@ -24,7 +24,7 @@ import (
 	"github.com/SigNoz/signoz/ee/modules/cloudintegration/implcloudintegration"
 	"github.com/SigNoz/signoz/ee/modules/cloudintegration/implcloudintegration/implcloudprovider"
 	"github.com/SigNoz/signoz/ee/modules/dashboard/impldashboard"
-	eeimplmetricreductionrule "github.com/SigNoz/signoz/ee/modules/metricreductionrule/implmetricreductionrule"
+	"github.com/SigNoz/signoz/ee/modules/metricreductionrule/implmetricreductionrule"
 	eequerier "github.com/SigNoz/signoz/ee/querier"
 	enterpriseapp "github.com/SigNoz/signoz/ee/query-service/app"
 	eerules "github.com/SigNoz/signoz/ee/query-service/rules"
@@ -184,8 +184,8 @@ func runServer(ctx context.Context, config signoz.Config, logger *slog.Logger) e
 
 			return implcloudintegration.NewModule(pkgcloudintegration.NewStore(sqlStore), dashboardModule, global, zeus, gateway, licensing, serviceAccount, cloudProvidersMap, config)
 		},
-		func(sqlStore sqlstore.SQLStore, ts telemetrystore.TelemetryStore, dashboardModule dashboard.Module, queryParser queryparser.QueryParser, lic licensing.Licensing, flgr pkgflagger.Flagger, ms telemetrytypes.MetadataStore, ps factory.ProviderSettings, threads int) metricreductionrule.Module {
-			return eeimplmetricreductionrule.NewModule(sqlStore, ts, dashboardModule, queryParser, lic, flgr, ms, ps, threads)
+		func(sqlStore sqlstore.SQLStore, ts telemetrystore.TelemetryStore, dashboardModule dashboard.Module, queryParser queryparser.QueryParser, licensing licensing.Licensing, flagger pkgflagger.Flagger, ps factory.ProviderSettings, threads int) metricreductionrule.Module {
+			return implmetricreductionrule.NewModule(sqlStore, ts, dashboardModule, queryParser, licensing, flagger, ps, threads)
 		},
 		func(c cache.Cache, am alertmanager.Alertmanager, ss sqlstore.SQLStore, ts telemetrystore.TelemetryStore, ms telemetrytypes.MetadataStore, p prometheus.Prometheus, og organization.Getter, rsh rulestatehistory.Module, q querier.Querier, qp queryparser.QueryParser) factory.NamedMap[factory.ProviderFactory[ruler.Ruler, ruler.Config]] {
 			return factory.MustNewNamedMap(signozruler.NewFactory(c, am, ss, ts, ms, p, og, rsh, q, qp, eerules.PrepareTaskFunc, eerules.TestNotification))

cmd/genconfig.go

@@ -6,15 +6,12 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/SigNoz/signoz/pkg/types/authtypes"
 	"github.com/SigNoz/signoz/pkg/web"
 	"github.com/spf13/cobra"
 	"github.com/swaggest/jsonschema-go"
 )
 
-const webSettingsSchemaPath = "frontend/src/schemas/generated/webSettings.schema.json"
-
-const transactionGroupsSchemaPath = "frontend/src/schemas/generated/transactionGroups.schema.json"
+const webSettingsSchemaPath = "docs/config/web-settings.json"
 
 func registerGenerateConfig(parentCmd *cobra.Command) {
 	configCmd := &cobra.Command{
@@ -30,14 +27,6 @@ func registerGenerateConfig(parentCmd *cobra.Command) {
 		},
 	})
 
-	configCmd.AddCommand(&cobra.Command{
-		Use:   "transaction-groups",
-		Short: "Generate JSON Schema for transaction groups",
-		RunE: func(currCmd *cobra.Command, args []string) error {
-			return generateTransactionGroups()
-		},
-	})
-
 	parentCmd.AddCommand(configCmd)
 }
 
@@ -63,7 +52,6 @@ func generateWebSettings() error {
 		return err
 	}
 
-	schema.WithTitle("WebSettings")
 	data, err := json.MarshalIndent(schema, "", "  ")
 	if err != nil {
 		return err
@@ -71,31 +59,3 @@ func generateWebSettings() error {
 
 	return os.WriteFile(webSettingsSchemaPath, append(data, '\n'), 0o600)
 }
-
-func generateTransactionGroups() error {
-	falseVal := false
-	noAdditional := jsonschema.SchemaOrBool{TypeBoolean: &falseVal}
-
-	reflector := jsonschema.Reflector{}
-	reflector.DefaultOptions = append(reflector.DefaultOptions,
-		jsonschema.InterceptSchema(func(params jsonschema.InterceptSchemaParams) (bool, error) {
-			if params.Value.Kind() == reflect.Struct {
-				params.Schema.AdditionalProperties = &noAdditional
-			}
-			return false, nil
-		}),
-	)
-
-	schema, err := reflector.Reflect(authtypes.TransactionGroups{})
-	if err != nil {
-		return err
-	}
-
-	schema.WithTitle("TransactionGroups")
-	data, err := json.MarshalIndent(schema, "", "  ")
-	if err != nil {
-		return err
-	}
-
-	return os.WriteFile(transactionGroupsSchemaPath, append(data, '\n'), 0o600)
-}

conf/example.yaml

@@ -141,10 +141,6 @@ querier:
   flux_interval: 5m
   # The maximum number of concurrent queries for missing ranges.
   max_concurrent_queries: 4
-  # When filtering logs by trace_id, clamp the query window to the trace time
-  # range with padding to include slightly delayed log exports. Logs only; set
-  # to 0 to disable.
-  log_trace_id_window_padding: 5m
 
 ##################### TelemetryStore #####################
 telemetrystore:

deploy/MIGRATION.md

@@ -1,76 +1,48 @@
-# Migrating from the install script and `deploy/` to Foundry
-
-The install script (`install.sh`) and the bundled Compose and Swarm files
-under `deploy/` are deprecated in favor of [Foundry][foundry], the supported
-way to install and manage SigNoz. This guide moves an existing Docker Compose
-or Docker Swarm deployment to Foundry and reattaches your existing volumes, so
-your data is preserved.
+# Migrating from the install script to Foundry
 
 > [!IMPORTANT]
-> This guide is only for **existing** `install.sh` / `deploy/` deployments.
-> Setting up SigNoz for the first time? Skip migration and install Foundry
-> directly: [SigNoz install docs][install-docs].
+> The install script is now deprecated and will no longer receive updates.
 
-## How it works
+This guide walks you through migrating an existing SigNoz deployment running via
+Docker Compose to [Foundry](https://signoz.io/docs/install/docker/).
 
-Foundry splits a deployment into two commands:
+> [!NOTE]
+> Setting up SigNoz for the first time? You don't need this guide — follow the [SigNoz installation docs](https://signoz.io/docs/install/) instead.
 
-- `foundryctl forge` generates the deployment manifests from a `casting.yaml`.
-  It never touches running containers, so it is safe to re-run while you
-  iterate.
-- `foundryctl cast` applies those manifests: it (re)creates the containers and
-  reuses the volumes you point it at.
+## Overview
+To stay up to date on new installation platforms and patterns, please refer to [Foundry](https://github.com/SigNoz/foundry).
 
-You write one `casting.yaml`, point a few patches at your existing data
-volumes, then cast. The steps below are the same for Compose and Swarm; they
-differ only in the casting (step 3) and how you stop the old stack (step 5).
+Two `foundryctl` commands are used throughout this guide:
+- **`forge`** — generates deployment manifests from your `casting.yaml`. It does not touch running containers, so it is safe to re-run while you iterate.
+- **`cast`** — applies the generated manifests: it creates and starts the containers (and pulls new images).
 
 ## Prerequisites
+- [ ] Install Foundry - `curl -fsSL https://signoz.io/foundry.sh | bash`
 
-- An existing SigNoz deployment from `install.sh` or `deploy/` (Compose or
-  Swarm).
-- `foundryctl` (installed in step 1).
+## Migration Steps
+> [!WARNING]
+> **Before proceeding, back up both:**
+> - **Your docker volumes** — these hold your data.
+> - **Your existing `docker-compose.yaml` (and any config it references)** — keep a copy somewhere safe. The compose manifests are no longer distributed by SigNoz, so this backup is your only way to roll back to your previous setup.
 
-## Migrate
+1. Make a note of the volume names used by your existing deployment for the following components:
+- ClickHouse
+- SigNoz
+- ZooKeeper
 
-### 1. Install Foundry
+> If you used the docker compose file we provided, the volumes will be `signoz-clickhouse`, `signoz-sqlite`, and `signoz-zookeeper-1`.
 
-```bash
-curl -fsSL https://signoz.io/foundry.sh | bash
-```
+2. Generate your `casting.yaml`. Based on internal testing, the following casting should generate the manifests that mimic the legacy docker compose setup (compare against your backed-up `docker-compose.yaml`). Once created, run `foundryctl forge -f casting.yaml`.
 
-### 2. Keep your rollback path
+Foundry has a [Docker Compose example](https://github.com/SigNoz/foundry/tree/main/docs/examples/docker/compose). Please use it as a reference.
 
-This migration reattaches your existing volumes in place; it does not move or
-delete your data. The only destructive action is passing `--volumes` / `-v`
-when you stop the old stack (step 5), so avoid that flag.
+> [!WARNING]
+> If your deployment had more than 1 shard or replica, you will need to adjust your manifest volumes accordingly.
 
 > [!IMPORTANT]
-> Keep a copy of your existing `docker-compose.yaml` / stack file (and any
-> config it references). SigNoz no longer distributes these files, so this copy
-> is your only way to roll back.
-
-### 3. Write your `casting.yaml`
-
-Use the casting for your deployment. Both reproduce the legacy single-node
-setup (ClickHouse + ZooKeeper + SQLite) and reattach your existing volumes;
-they differ only in `spec.deployment.flavor` and the volume-reuse patch
-(Compose volumes have a `name` to replace; Swarm volumes are bare, so the whole
-entry is replaced). If your deployment ran more than one shard or replica,
-adjust the volume patches accordingly. The
-[Docker Compose example][compose-example] is a useful reference.
-
-> [!IMPORTANT]
-> The `replica` and `shard` macros are placeholders. Replace them with the
-> values from your existing ClickHouse config (the `macros` section of
-> `config.xml` / `metrika.xml`), or the generated manifests will not match your
-> existing data.
-
-<details>
-<summary><b>Docker Compose</b> casting.yaml</summary>
+> The `replica` and `shard` macros below are placeholders. Replace them with the values from your existing ClickHouse configuration (check the `macros` section of your current ClickHouse config, e.g. `config.xml`/`metrika.xml`), otherwise the generated manifests will not match your existing data.
 
 ```yaml
-# casting.yaml
 apiVersion: v1alpha1
 kind: Installation
 metadata:
@@ -89,8 +61,8 @@ spec:
         data:
           config-0-0.yaml: |
             macros:
-              replica: "example01-01-1" # replace with your replica macro
-              shard: "01" # replace with your shard macro
+              replica: "example01-01-1" # replace with your existing ClickHouse replica macro (see legacy configuration files for reference)
+              shard: "01"               # replace with your existing ClickHouse shard macro (see legacy configuration files for reference)
   patches:
     - target: "deployment/compose.yaml"
       operations:
@@ -108,163 +80,50 @@ spec:
           value: root
 ```
 
-</details>
+> [!NOTE]
+> The `user: root` patch on the ZooKeeper service is required so the container can read/write the data in your reused ZooKeeper volume, which was created with `root`-owned files by the legacy compose setup. Without it, ZooKeeper may fail to start with permission errors.
 
-<details>
-<summary><b>Docker Swarm</b> casting.yaml</summary>
+If you had custom configurations for features like SMTP or additional ingestion processors/receivers, you will need to include those in your casting file via [patches](https://github.com/SigNoz/foundry/blob/main/docs/concepts/patches.md), [custom configuration](https://github.com/SigNoz/foundry/blob/main/docs/concepts/moldings.md#custom-config-files) or [environment variables](https://github.com/SigNoz/foundry/blob/main/docs/reference/casting-file.md#molding-spec) based on your previous configuration.
 
-```yaml
-# casting.yaml
-apiVersion: v1alpha1
-kind: Installation
-metadata:
-  name: signoz
-spec:
-  deployment:
-    flavor: swarm
-    mode: docker
-  metastore:
-    kind: sqlite
-  telemetrykeeper:
-    kind: zookeeper
-  telemetrystore:
-    spec:
-      config:
-        data:
-          config-0-0.yaml: |
-            macros:
-              replica: "example01-01-1" # replace with your replica macro
-              shard: "01" # replace with your shard macro
-  patches:
-    - target: "deployment/compose.yaml"
-      operations:
-        - op: replace
-          path: /volumes/signoz-telemetrykeeper-0-data
-          value:
-            name: signoz-zookeeper-1
-        - op: replace
-          path: /volumes/signoz-telemetrystore-0-0-data
-          value:
-            name: signoz-clickhouse
-        - op: replace
-          path: /volumes/signoz-metastore-sqlite-0-data
-          value:
-            name: signoz-sqlite
-        - op: add
-          path: /services/signoz-telemetrykeeper-zookeeper-0/user
-          value: root
-```
+3. Review your manifests, we suggest executing the following checks on your manifests before proceeding:
+- [ ] Validate the container images match what your deployment had, Foundry uses `latest` on generation by default.
+- [ ] If your signoz version was older than latest, please check the [upgrade path](https://signoz.io/docs/operate/upgrade/) first.
+- [ ] Check the produced manifests in `pours/deployment` match your older configurations. Extra consideration and review needs to be done on `compose.yaml` as this will be the main entry point for your new deployment.
+- [ ] The configuration files for clickhouse are now in YAML so validate your custom settings are present.
 
-</details>
+4. Execute a `docker compose down`. **Do not** include parameters such as `--volumes` (or `-v`), as it will wipe the volumes we need to maintain and reuse to avoid data loss. 
 
 > [!NOTE]
-> The `user: root` patch on the ZooKeeper service lets the container read and
-> write the data in your reused ZooKeeper volume, whose files the legacy setup
-> created as `root`. Without it, ZooKeeper may fail to start with permission
-> errors.
+> This will generate downtime so please plan accordingly.
 
-If you had custom configuration (SMTP, extra ingestion receivers/processors,
-or custom ClickHouse settings), carry it over via [patches][patches],
-[custom config files][custom-config], or [environment variables][env-vars].
+5. Validate the SigNoz containers are down with `docker ps -a`. Multiple containers cannot bind the same volume.
 
-### 4. Generate and review the manifests
-
-```bash
-foundryctl forge -f casting.yaml
-```
-
-Review `pours/deployment/` before deploying:
-
-- [ ] Container images match your current deployment. Foundry generates with
-  `latest` by default; if your SigNoz version was older than latest, check the
-  [upgrade path][upgrade-path] first.
-- [ ] The generated manifests match your previous configuration, especially
-  `compose.yaml` (the new entry point for your deployment).
-- [ ] The ClickHouse config is now YAML rather than XML; confirm your custom
-  settings carried over (see [ClickHouse configuration files][ch-config] for
-  the XML-to-YAML mapping).
-
-### 5. Stop the old deployment
-
-Use the command for your deployment. Do **not** pass `--volumes` / `-v`; that
-would delete the data you are migrating.
-
-```bash
-docker compose down        # Compose
-docker stack rm signoz     # Swarm
-```
+6. Run `foundryctl cast -f casting.yaml`. This will recreate the containers based on the spec. This process will download new container images.
 
 > [!NOTE]
-> This causes downtime, so plan accordingly.
+> When `cast` is run, the migration container will execute its migrations.
 
-Confirm nothing is still bound to the volumes before continuing:
+## Verifying the Migration
+- SigNoz containers will be up and running.
+- Log in to the SigNoz UI and verify that data is present.
+    - Signoz will run on localhost:8080
+- Validate that your data ingestion is receiving data.
+    - Ingesters will receive data on localhost:4317(grpc) and localhost:4318(http)
+- Review the logs from both ClickHouse and ZooKeeper; no errors should be present.
 
-```bash
-docker ps -a
-```
+## Rolling Back
+Because step 4 brought the legacy stack down *without* `-v`, your original volumes
+are untouched and still hold your data. To roll back:
 
-### 6. Deploy with Foundry
-
-```bash
-foundryctl cast -f casting.yaml
-```
-
-This recreates the containers against your existing volumes and pulls the
-images. The migration container runs the schema migrations as part of `cast`.
-
-**Prefer not to use `cast`?** The manifests in `pours/deployment/` are standard
-Docker artifacts you can apply yourself. Run the command from that directory so
-the relative config paths resolve:
-
-```bash
-cd pours/deployment
-docker compose up -d                        # Compose
-docker stack deploy -c compose.yaml signoz  # Swarm
-```
-
-## Verify
-
-- All SigNoz containers are running.
-- The UI is reachable on `http://localhost:8080`, and OTLP on `4317` (gRPC)
-  and `4318` (HTTP), so already-instrumented apps and saved bookmarks keep
-  working.
-- Your existing data is present in the UI, and new data is being ingested.
-- ClickHouse and ZooKeeper logs show no errors.
-
-## Roll back
-
-Step 5 left your volumes untouched, so your data is intact. To return to the
-previous setup:
-
-1. Bring down the Foundry deployment (`docker compose down` or
-   `docker stack rm signoz`, again without `-v`).
-2. Confirm the containers are gone with `docker ps -a`.
-3. Re-apply your backed-up stack: `docker compose up -d` (Compose) or
-   `docker stack deploy -c docker-compose.yaml signoz` (Swarm). It reattaches
-   the same volumes and restores your prior state.
+- Stop and remove the containers created by Foundry (`docker compose down`, again without `-v`).
+- Confirm the containers are gone with `docker ps -a` so nothing else is bound to the volumes.
+- Reapply your original docker compose file (`docker compose up -d`). It will reattach to the
+  existing volumes and restore your prior state.
 
 ## Troubleshooting
-
-If the migration runs into trouble, reach out on [Slack][slack] or open a
-[Foundry issue][foundry-issues].
+- Please reach out to our community on [Slack](https://signoz.io/slack).
 
 ## References
-
-- [Foundry][foundry]
-- [Casting file reference][casting-ref]
-- [Custom config files][custom-config]
-- [Patches][patches]
-- [SigNoz documentation][signoz-docs]
-
-[foundry]: https://github.com/SigNoz/foundry
-[install-docs]: https://signoz.io/docs/install/
-[compose-example]: https://github.com/SigNoz/foundry/tree/main/docs/examples/docker/compose
-[patches]: https://github.com/SigNoz/foundry/blob/main/docs/concepts/patches.md
-[custom-config]: https://github.com/SigNoz/foundry/blob/main/docs/concepts/moldings.md#custom-config-files
-[env-vars]: https://github.com/SigNoz/foundry/blob/main/docs/reference/casting-file.md#molding-spec
-[casting-ref]: https://github.com/SigNoz/foundry/blob/main/docs/reference/casting-file.md
-[ch-config]: https://clickhouse.com/docs/operations/configuration-files
-[upgrade-path]: https://signoz.io/docs/operate/upgrade/
-[slack]: https://signoz.io/slack
-[foundry-issues]: https://github.com/SigNoz/foundry/issues
-[signoz-docs]: https://signoz.io/docs
+- [SigNoz Docker installation docs](https://signoz.io/docs/install/docker/)
+- [SigNoz documentation](https://signoz.io/docs)
+- [Foundry](https://github.com/SigNoz/foundry)

docs/config/web-settings.json

@@ -1,5 +1,4 @@
 {
-  "title": "WebSettings",
   "required": [
     "posthog",
     "appcues",

docs/contributing/go/errors.md

@@ -36,55 +36,6 @@ var (
 
 > 💡 **Note**: Error codes must match the regex `^[a-z_]+$` otherwise the code will panic.
 
-### Message
-The primary, human-readable summary of what went wrong, set when the error is created via `errors.New` / `errors.Newf`. Note there are two distinct `message` fields in the response: this top-level one states the overall failure, while each entry under [Additional](#additional) carries its own [message](#message-1) explaining one specific facet of it.
-
-### Url
-An optional link to documentation that explains the error in more depth, set with `WithUrl`. It is left empty when the error has no associated doc.
-
-```go
-return errors.New(errors.TypeInvalidInput, CodeBadThing, "bad thing").
-    WithUrl("https://signoz.io/docs/...")
-```
-
-### Additional
-`errors` is a list of supplementary details that explain the top-level `message`. Each entry has its own `message` and `suggestions`, so a single error can surface several distinct problems individually. Attach details with `WithAdditional` (message only) or `WithSuggestiveAdditional` (message plus the suggestions that belong to it):
-
-#### Message
-A single, self-contained sentence describing one specific facet of the error (e.g. ``field `filed` not found``), distinct from the top-level [Message](#message). Prefer one detail per distinct problem over concatenating several into one message.
-
-#### Suggestions
-The suggestions tied to that specific detail — typically a ``did you mean: `x` `` correction for the value the detail is about. These are distinct from the error-wide [Suggestions](#suggestions) below: detail-scoped suggestions never leak into the top-level list.
-
-```go
-return errors.NewInvalidInputf(errors.CodeInvalidInput, "unknown field %q", field).
-    WithAdditional("field `field` not found")
-return errors.NewInvalidInputf(errors.CodeInvalidInput, "unknown field %q", field).
-    WithSuggestiveAdditional("field `filed` not found", "did you mean: `field`")
-```
-
-### Retry
-Carries the `delay` the client should wait before retrying, set with `WithRetryAfter`. It is `null` when the error is not retryable.
-
-```go
-return errors.NewTimeoutf(CodeSlow, "upstream timed out").
-    WithRetryAfter(5 * time.Second)
-```
-
-### Suggestions
-`WithSuggestions` sets the error-wide `suggestions` list — hints about the error as a whole (e.g. "narrow the time range window"), as opposed to suggestions tied to a single detail. Prefer the builders in [pkg/errors/suggestions.go](/pkg/errors/suggestions.go) over hand-writing the strings so the phrasing stays consistent:
-
-- `NewSuggestionsOnLevenshteinDistance(invalidInput, noun, validInputs)` — returns a ``did you mean: `x` `` correction (when a close typo match exists) followed by the valid-references list.
-- `NewValidReferences(noun, values...)` — formats a capped list as ``valid <noun> are `a`, `b` `` (e.g. `"valid fields are"`, `"valid keys are"`). Returns `""` for an empty set.
-- `NewSuggestionsFromFunc(produce)` — wraps a caller-computed correction string as a one-element ``did you mean: `x` `` slice (or nil when it returns `""`), for callers with their own matching strategy.
-
-`noun` names the kind of value being suggested. Use one of the exported `Noun*` constants (`errors.NounFields`, `errors.NounKeys`, `errors.NounServices`, …) so the wording stays uniform across the codebase.
-
-```go
-return errors.NewInvalidInputf(errors.CodeInvalidInput, "unknown field %q", field).
-    WithSuggestions(errors.NewSuggestionsOnLevenshteinDistance(field, errors.NounFields, validFields)...)
-```
-
 ## Show me some examples
 
 ### Using the error

ee/authz/openfgaauthz/provider.go

@@ -143,10 +143,6 @@ func (provider *provider) List(ctx context.Context, orgID valuer.UUID) ([]*autht
 	return provider.pkgAuthzService.List(ctx, orgID)
 }
 
-func (provider *provider) Collect(ctx context.Context, orgID valuer.UUID) (map[string]any, error) {
-	return provider.pkgAuthzService.Collect(ctx, orgID)
-}
-
 func (provider *provider) ListByOrgIDAndNames(ctx context.Context, orgID valuer.UUID, names []string) ([]*authtypes.Role, error) {
 	return provider.pkgAuthzService.ListByOrgIDAndNames(ctx, orgID, names)
 }
@@ -374,7 +370,7 @@ func (provider *provider) Delete(ctx context.Context, orgID valuer.UUID, id valu
 	}
 
 	for _, cb := range provider.onBeforeRoleDelete {
-		if err := cb(ctx, orgID, id, role.Name); err != nil {
+		if err := cb(ctx, orgID, id); err != nil {
 			return err
 		}
 	}

ee/modules/dashboard/impldashboard/module.go

@@ -290,10 +290,6 @@ func (module *module) GetByMetricNames(ctx context.Context, orgID valuer.UUID, m
 	return module.pkgDashboardModule.GetByMetricNames(ctx, orgID, metricNames)
 }
 
-func (module *module) GetByMetricNamesV2(ctx context.Context, orgID valuer.UUID, metricNames []string) (map[string][]dashboardtypes.DashboardPanelRef, error) {
-	return module.pkgDashboardModule.GetByMetricNamesV2(ctx, orgID, metricNames)
-}
-
 func (module *module) List(ctx context.Context, orgID valuer.UUID) ([]*dashboardtypes.Dashboard, error) {
 	return module.pkgDashboardModule.List(ctx, orgID)
 }

ee/modules/metricreductionrule/implmetricreductionrule/clickhouse.go

@@ -12,16 +12,15 @@ import (
 	"github.com/SigNoz/signoz/pkg/telemetrystore"
 	"github.com/SigNoz/signoz/pkg/types/ctxtypes"
 	"github.com/SigNoz/signoz/pkg/types/metricreductionruletypes"
+	"github.com/SigNoz/signoz/pkg/types/metrictypes"
 )
 
 var (
 	reductionRulesTable = telemetrymetrics.DBName + "." + telemetrymetrics.ReductionRulesTableName
 	metadataTable       = telemetrymetrics.DBName + "." + telemetrymetrics.AttributesMetadataTableName
-	bufferSeriesTable   = telemetrymetrics.DBName + "." + telemetrymetrics.TimeseriesV4BufferTableName
+	timeseriesTable     = telemetrymetrics.DBName + "." + telemetrymetrics.TimeseriesV4TableName
 )
 
-const timeSeriesBucketMilli = int64(time.Hour / time.Millisecond)
-
 type volumeRow struct {
 	MetricName string
 	Ingested   uint64
@@ -47,18 +46,23 @@ func (c *clickhouse) withThreads(ctx context.Context) context.Context {
 	return ctxtypes.SetClickhouseMaxThreads(ctx, c.threads)
 }
 
+const timeSeriesBucketMilli = int64(time.Hour / time.Millisecond)
+
+// floorToTimeSeriesBucket rounds the start down to the hour, since unix_milli is hour-bucketed.
 func floorToTimeSeriesBucket(ms int64) int64 {
 	return ms - (ms % timeSeriesBucketMilli)
 }
 
-func strictEffectiveFrom(sb *sqlbuilder.SelectBuilder, metricNames []string, effectiveFrom map[string]int64) string {
+// effectiveFromGate restricts ingested rows to on/after each metric's effective_from (floored to the
+// hour) so a rule's pre-activation history isn't counted as reduced. A missing entry gates at 0.
+func effectiveFromGate(sb *sqlbuilder.SelectBuilder, metricNames []string, effectiveFrom map[string]int64) string {
 	names := make([]any, 0, len(metricNames))
-	froms := make([]any, 0, len(metricNames))
+	floors := make([]any, 0, len(metricNames))
 	for _, name := range metricNames {
 		names = append(names, name)
-		froms = append(froms, effectiveFrom[name])
+		floors = append(floors, floorToTimeSeriesBucket(effectiveFrom[name]))
 	}
-	return "unix_milli >= transform(metric_name, " + sb.Var(names) + ", " + sb.Var(froms) + ", 0)"
+	return "unix_milli >= transform(metric_name, " + sb.Var(names) + ", " + sb.Var(floors) + ", 0)"
 }
 
 func (c *clickhouse) Sync(ctx context.Context, metricName string, labels []string, matchType string, effectiveFromMs int64, deleted bool, updatedAt time.Time) error {
@@ -76,6 +80,38 @@ func (c *clickhouse) Sync(ctx context.Context, metricName string, labels []strin
 	return nil
 }
 
+func (c *clickhouse) MetricExists(ctx context.Context, metricName string) (bool, error) {
+	ctx = c.withThreads(ctx)
+
+	sb := sqlbuilder.NewSelectBuilder()
+	sb.Select("count(*) > 0")
+	sb.From(metadataTable)
+	sb.Where(sb.E("metric_name", metricName))
+
+	query, args := sb.BuildWithFlavor(sqlbuilder.ClickHouse)
+	var exists bool
+	if err := c.telemetryStore.ClickhouseDB().QueryRow(ctx, query, args...).Scan(&exists); err != nil {
+		return false, errors.WrapInternalf(err, errors.CodeInternal, "failed to check metric existence")
+	}
+	return exists, nil
+}
+
+func (c *clickhouse) IsExponentialHistogram(ctx context.Context, metricName string) (bool, error) {
+	ctx = c.withThreads(ctx)
+
+	sb := sqlbuilder.NewSelectBuilder()
+	sb.Select("count(*) > 0")
+	sb.From(timeseriesTable)
+	sb.Where(sb.E("metric_name", metricName), sb.E("type", metrictypes.ExpHistogramType.StringValue()))
+
+	query, args := sb.BuildWithFlavor(sqlbuilder.ClickHouse)
+	var isExpHist bool
+	if err := c.telemetryStore.ClickhouseDB().QueryRow(ctx, query, args...).Scan(&isExpHist); err != nil {
+		return false, errors.WrapInternalf(err, errors.CodeInternal, "failed to check metric type")
+	}
+	return isExpHist, nil
+}
+
 func (c *clickhouse) AttributeKeys(ctx context.Context, metricName string, startMs, endMs int64) ([]string, error) {
 	ctx = c.withThreads(ctx)
 
@@ -108,8 +144,25 @@ func (c *clickhouse) AttributeKeys(ctx context.Context, metricName string, start
 	return keys, rows.Err()
 }
 
+func (c *clickhouse) tableExists(ctx context.Context, distributedTableName string) bool {
+	var exists bool
+	query := "SELECT count() > 0 FROM system.tables WHERE database = ? AND name = ?"
+	if err := c.telemetryStore.ClickhouseDB().QueryRow(ctx, query, telemetrymetrics.DBName, distributedTableName).Scan(&exists); err != nil {
+		return false
+	}
+	return exists
+}
+
+func (c *clickhouse) originalSeriesSource(ctx context.Context) (table string, originalOnly bool) {
+	if c.tableExists(ctx, telemetrymetrics.TimeseriesV4BufferTableName) {
+		return telemetrymetrics.DBName + "." + telemetrymetrics.TimeseriesV4BufferTableName, true
+	}
+	return telemetrymetrics.DBName + "." + telemetrymetrics.TimeseriesV4TableName, false
+}
+
 func (c *clickhouse) EstimateCardinality(ctx context.Context, metricName string, keptLabels []string, startMs, endMs int64) (uint64, uint64, error) {
 	ctx = c.withThreads(ctx)
+	table, originalOnly := c.originalSeriesSource(ctx)
 	startMs = floorToTimeSeriesBucket(startMs)
 
 	sb := sqlbuilder.NewSelectBuilder()
@@ -127,12 +180,14 @@ func (c *clickhouse) EstimateCardinality(ctx context.Context, metricName string,
 	}
 
 	sb.Select("uniq(fingerprint)", reducedExpr)
-	sb.From(bufferSeriesTable)
+	sb.From(table)
 	conds := []string{
 		sb.E("metric_name", metricName),
 		sb.GE("unix_milli", startMs),
 		sb.LT("unix_milli", endMs),
-		sb.E("is_reduced", false),
+	}
+	if originalOnly {
+		conds = append(conds, sb.E("is_reduced", false))
 	}
 	sb.Where(conds...)
 
@@ -150,21 +205,24 @@ func (c *clickhouse) EstimateCardinality(ctx context.Context, metricName string,
 	return current, reduced, nil
 }
 
-// VolumeByMetric returns ingested vs reduced series counts per metric.
 func (c *clickhouse) VolumeByMetric(ctx context.Context, metricNames []string, effectiveFrom map[string]int64, startMs, endMs int64) (map[string]volumeRow, error) {
 	if len(metricNames) == 0 {
 		return map[string]volumeRow{}, nil
 	}
 	ctx = c.withThreads(ctx)
 
-	ingested, err := c.ingestedSeriesCount(ctx, metricNames, effectiveFrom, startMs, endMs)
+	ingestedTable, originalOnly := c.originalSeriesSource(ctx)
+	ingested, err := c.countSeries(ctx, ingestedTable, originalOnly, metricNames, effectiveFrom, startMs, endMs)
 	if err != nil {
 		return nil, err
 	}
 
-	reduced, err := c.reducedSeriesCount(ctx, metricNames, effectiveFrom, startMs, endMs)
-	if err != nil {
-		return nil, err
+	reduced := ingested
+	if c.tableExists(ctx, telemetrymetrics.TimeseriesV4ReducedTableName) {
+		reduced, err = c.countSeries(ctx, telemetrymetrics.DBName+"."+telemetrymetrics.TimeseriesV4ReducedTableName, false, metricNames, effectiveFrom, startMs, endMs)
+		if err != nil {
+			return nil, err
+		}
 	}
 
 	out := make(map[string]volumeRow, len(metricNames))
@@ -180,9 +238,8 @@ func (c *clickhouse) VolumeByMetric(ctx context.Context, metricNames []string, e
 	return out, nil
 }
 
-// ingestedSeriesCount counts distinct raw fingerprints per metric from the samples buffer over the
-// window.
-func (c *clickhouse) ingestedSeriesCount(ctx context.Context, metricNames []string, effectiveFrom map[string]int64, startMs, endMs int64) (map[string]uint64, error) {
+func (c *clickhouse) countSeries(ctx context.Context, table string, originalOnly bool, metricNames []string, effectiveFrom map[string]int64, startMs, endMs int64) (map[string]uint64, error) {
+	startMs = floorToTimeSeriesBucket(startMs)
 	names := make([]any, len(metricNames))
 	for i, name := range metricNames {
 		names[i] = name
@@ -190,71 +247,17 @@ func (c *clickhouse) ingestedSeriesCount(ctx context.Context, metricNames []stri
 
 	sb := sqlbuilder.NewSelectBuilder()
 	sb.Select("metric_name", "uniq(fingerprint)")
-	sb.From(telemetrymetrics.DBName + "." + telemetrymetrics.SamplesV4BufferTableName)
-	conds := []string{
-		sb.In("metric_name", names...),
-		sb.GE("unix_milli", startMs),
-		sb.LT("unix_milli", endMs),
-	}
-	if len(effectiveFrom) > 0 {
-		conds = append(conds, strictEffectiveFrom(sb, metricNames, effectiveFrom))
-	}
-	sb.Where(conds...)
-	sb.GroupBy("metric_name")
-
-	query, args := sb.BuildWithFlavor(sqlbuilder.ClickHouse)
-	rows, err := c.telemetryStore.ClickhouseDB().Query(ctx, query, args...)
-	if err != nil {
-		return nil, errors.WrapInternalf(err, errors.CodeInternal, "failed to count ingested series")
-	}
-	defer rows.Close()
-
-	out := make(map[string]uint64, len(metricNames))
-	for rows.Next() {
-		var (
-			metricName string
-			count      uint64
-		)
-		if err := rows.Scan(&metricName, &count); err != nil {
-			return nil, errors.WrapInternalf(err, errors.CodeInternal, "failed to scan series count")
-		}
-		out[metricName] = count
-	}
-	return out, rows.Err()
-}
-
-// reducedSeriesCount counts distinct reduced_fingerprints per metric, summed across the two 60s
-// reduced sample tables.
-func (c *clickhouse) reducedSeriesCount(ctx context.Context, metricNames []string, effectiveFrom map[string]int64, startMs, endMs int64) (map[string]uint64, error) {
-	out := make(map[string]uint64, len(metricNames))
-	for _, table := range []string{telemetrymetrics.SamplesV4ReducedLastTableName, telemetrymetrics.SamplesV4ReducedSumTableName} {
-		counts, err := c.reducedSeriesCountForTable(ctx, telemetrymetrics.DBName+"."+table, metricNames, effectiveFrom, startMs, endMs)
-		if err != nil {
-			return nil, err
-		}
-		for metricName, count := range counts {
-			out[metricName] += count
-		}
-	}
-	return out, nil
-}
-
-func (c *clickhouse) reducedSeriesCountForTable(ctx context.Context, table string, metricNames []string, effectiveFrom map[string]int64, startMs, endMs int64) (map[string]uint64, error) {
-	names := make([]any, len(metricNames))
-	for i, name := range metricNames {
-		names[i] = name
-	}
-
-	sb := sqlbuilder.NewSelectBuilder()
-	sb.Select("metric_name", "uniq(reduced_fingerprint)")
 	sb.From(table)
 	conds := []string{
 		sb.In("metric_name", names...),
 		sb.GE("unix_milli", startMs),
 		sb.LT("unix_milli", endMs),
 	}
+	if originalOnly {
+		conds = append(conds, sb.E("is_reduced", false))
+	}
 	if len(effectiveFrom) > 0 {
-		conds = append(conds, strictEffectiveFrom(sb, metricNames, effectiveFrom))
+		conds = append(conds, effectiveFromGate(sb, metricNames, effectiveFrom))
 	}
 	sb.Where(conds...)
 	sb.GroupBy("metric_name")
@@ -262,7 +265,7 @@ func (c *clickhouse) reducedSeriesCountForTable(ctx context.Context, table strin
 	query, args := sb.BuildWithFlavor(sqlbuilder.ClickHouse)
 	rows, err := c.telemetryStore.ClickhouseDB().Query(ctx, query, args...)
 	if err != nil {
-		return nil, errors.WrapInternalf(err, errors.CodeInternal, "failed to count reduced series")
+		return nil, errors.WrapInternalf(err, errors.CodeInternal, "failed to count metric series")
 	}
 	defer rows.Close()
 
@@ -280,15 +283,16 @@ func (c *clickhouse) reducedSeriesCountForTable(ctx context.Context, table strin
 	return out, rows.Err()
 }
 
-// RankByVolume ranks metrics by ingested/reduced series volume. Like VolumeByMetric, the counts read
-// the samples tables with a strict effective_from gate; the reduced count sums distinct
-// reduced_fingerprints across the two 60s reduced sample tables.
 func (c *clickhouse) RankByVolume(ctx context.Context, metricNames []string, effectiveFrom map[string]int64, orderBy metricreductionruletypes.ReductionRuleOrderBy, order metricreductionruletypes.Order, startMs, endMs int64, offset, limit int) ([]volumeRow, error) {
 	if len(metricNames) == 0 {
 		return []volumeRow{}, nil
 	}
 	ctx = c.withThreads(ctx)
 
+	ingestedTable, originalOnly := c.originalSeriesSource(ctx)
+	reducedPresent := c.tableExists(ctx, telemetrymetrics.TimeseriesV4ReducedTableName)
+	startMs = floorToTimeSeriesBucket(startMs)
+
 	orderExpr := "ingested"
 	switch orderBy {
 	case metricreductionruletypes.OrderByReducedVolume:
@@ -301,29 +305,31 @@ func (c *clickhouse) RankByVolume(ctx context.Context, metricNames []string, eff
 		direction = "DESC"
 	}
 
-	ingestedTable := telemetrymetrics.DBName + "." + telemetrymetrics.SamplesV4BufferTableName
-	reducedLast := telemetrymetrics.DBName + "." + telemetrymetrics.SamplesV4ReducedLastTableName
-	reducedSum := telemetrymetrics.DBName + "." + telemetrymetrics.SamplesV4ReducedSumTableName
+	ingestedFilter := ""
+	if originalOnly {
+		ingestedFilter = "is_reduced = false AND "
+	}
+	reducedSelect := "ifNull(i.cnt, 0) AS reduced"
+	if reducedPresent {
+		reducedSelect = "ifNull(d.cnt, 0) AS reduced"
+	}
 
 	sb := sqlbuilder.NewSelectBuilder()
-	sb.Select("base.metric_name AS metric_name", "ifNull(i.cnt, 0) AS ingested", "ifNull(d.cnt, 0) AS reduced")
+	sb.Select("base.metric_name AS metric_name", "ifNull(i.cnt, 0) AS ingested", reducedSelect)
 	sb.From("(SELECT arrayJoin(" + sb.Var(metricNames) + ") AS metric_name) AS base")
 	sb.JoinWithOption(
 		sqlbuilder.LeftJoin,
-		"(SELECT metric_name, uniq(fingerprint) AS cnt FROM "+ingestedTable+" WHERE has("+sb.Var(metricNames)+", metric_name) AND unix_milli >= "+sb.Var(startMs)+" AND unix_milli < "+sb.Var(endMs)+" AND "+strictEffectiveFrom(sb, metricNames, effectiveFrom)+" GROUP BY metric_name) AS i",
+		"(SELECT metric_name, uniq(fingerprint) AS cnt FROM "+ingestedTable+" WHERE has("+sb.Var(metricNames)+", metric_name) AND "+ingestedFilter+"unix_milli >= "+sb.Var(startMs)+" AND unix_milli < "+sb.Var(endMs)+" AND "+effectiveFromGate(sb, metricNames, effectiveFrom)+" GROUP BY metric_name) AS i",
 		"base.metric_name = i.metric_name",
 	)
-	// Reduced series are spread across two type-specific tables; union the per-table distinct
-	// reduced_fingerprints and sum per metric (a metric only lands in the table matching its type).
-	sb.JoinWithOption(
-		sqlbuilder.LeftJoin,
-		"(SELECT metric_name, sum(cnt) AS cnt FROM ("+
-			"SELECT metric_name, uniq(reduced_fingerprint) AS cnt FROM "+reducedLast+" WHERE has("+sb.Var(metricNames)+", metric_name) AND unix_milli >= "+sb.Var(startMs)+" AND unix_milli < "+sb.Var(endMs)+" AND "+strictEffectiveFrom(sb, metricNames, effectiveFrom)+" GROUP BY metric_name"+
-			" UNION ALL "+
-			"SELECT metric_name, uniq(reduced_fingerprint) AS cnt FROM "+reducedSum+" WHERE has("+sb.Var(metricNames)+", metric_name) AND unix_milli >= "+sb.Var(startMs)+" AND unix_milli < "+sb.Var(endMs)+" AND "+strictEffectiveFrom(sb, metricNames, effectiveFrom)+" GROUP BY metric_name"+
-			") GROUP BY metric_name) AS d",
-		"base.metric_name = d.metric_name",
-	)
+	if reducedPresent {
+		reducedTable := telemetrymetrics.DBName + "." + telemetrymetrics.TimeseriesV4ReducedTableName
+		sb.JoinWithOption(
+			sqlbuilder.LeftJoin,
+			"(SELECT metric_name, uniq(fingerprint) AS cnt FROM "+reducedTable+" WHERE has("+sb.Var(metricNames)+", metric_name) AND unix_milli >= "+sb.Var(startMs)+" AND unix_milli < "+sb.Var(endMs)+" AND "+effectiveFromGate(sb, metricNames, effectiveFrom)+" GROUP BY metric_name) AS d",
+			"base.metric_name = d.metric_name",
+		)
+	}
 	sb.OrderBy(orderExpr + " " + direction)
 	if limit > 0 {
 		sb.Limit(limit).Offset(offset)
@@ -351,6 +357,11 @@ func (c *clickhouse) SampleVolume(ctx context.Context, metricNames []string, eff
 	if len(metricNames) == 0 {
 		return 0, 0, nil
 	}
+	if !c.tableExists(ctx, telemetrymetrics.SamplesV4BufferTableName) ||
+		!c.tableExists(ctx, telemetrymetrics.SamplesV4ReducedLastTableName) ||
+		!c.tableExists(ctx, telemetrymetrics.SamplesV4ReducedSumTableName) {
+		return 0, 0, nil
+	}
 	ctx = c.withThreads(ctx)
 
 	ingested, err := c.countRawSamples(ctx, telemetrymetrics.DBName+"."+telemetrymetrics.SamplesV4BufferTableName, metricNames, effectiveFrom, startMs, endMs)
@@ -379,9 +390,9 @@ func (c *clickhouse) countRawSamples(ctx context.Context, table string, metricNa
 	sb := sqlbuilder.NewSelectBuilder()
 	sb.Select("count()")
 	sb.From(table)
-	conds := []string{sb.In("metric_name", names...), sb.GE("unix_milli", startMs), sb.LT("unix_milli", endMs)}
+	conds := []string{sb.In("metric_name", names...), sb.E("reduced_fingerprint", 0), sb.GE("unix_milli", startMs), sb.LT("unix_milli", endMs)}
 	if len(effectiveFrom) > 0 {
-		conds = append(conds, strictEffectiveFrom(sb, metricNames, effectiveFrom))
+		conds = append(conds, effectiveFromGate(sb, metricNames, effectiveFrom))
 	}
 	sb.Where(conds...)
 
@@ -405,7 +416,7 @@ func (c *clickhouse) countReducedSamples(ctx context.Context, table string, metr
 	sb.From(table)
 	conds := []string{sb.In("metric_name", names...), sb.GE("unix_milli", startMs), sb.LT("unix_milli", endMs)}
 	if len(effectiveFrom) > 0 {
-		conds = append(conds, strictEffectiveFrom(sb, metricNames, effectiveFrom))
+		conds = append(conds, effectiveFromGate(sb, metricNames, effectiveFrom))
 	}
 	sb.Where(conds...)
 
@@ -417,52 +428,33 @@ func (c *clickhouse) countReducedSamples(ctx context.Context, table string, metr
 	return count, nil
 }
 
-// SeriesTimeseries returns ingested vs reduced series per 60s bucket from the samples tables, gated
-// to each metric's strict effective_from (see strictEffectiveFrom).
-func (c *clickhouse) SeriesTimeseries(ctx context.Context, allMetrics, reducedMetrics []string, effectiveFrom map[string]int64, startMs, endMs int64) ([]volumePoint, error) {
-	if len(allMetrics) == 0 {
+// SeriesTimeseries returns ingested vs reduced series per hourly bucket; ingested is gated to each
+// metric's effective_from (see effectiveFromGate).
+func (c *clickhouse) SeriesTimeseries(ctx context.Context, metricNames []string, effectiveFrom map[string]int64, startMs, endMs int64) ([]volumePoint, error) {
+	if len(metricNames) == 0 {
 		return []volumePoint{}, nil
 	}
 	ctx = c.withThreads(ctx)
+	startMs = floorToTimeSeriesBucket(startMs)
 
-	ingested, err := c.ingestedSeriesByBucket(ctx, allMetrics, effectiveFrom, startMs, endMs)
+	ingestedTable, originalOnly := c.originalSeriesSource(ctx)
+	ingested, err := c.seriesByBucket(ctx, ingestedTable, originalOnly, metricNames, effectiveFrom, startMs, endMs)
 	if err != nil {
 		return nil, err
 	}
 
-	retained := make(map[int64]uint64)
-	if len(reducedMetrics) > 0 {
-		reduced, err := c.reducedSeriesByBucket(ctx, reducedMetrics, effectiveFrom, startMs, endMs)
+	reduced := ingested
+	if c.tableExists(ctx, telemetrymetrics.TimeseriesV4ReducedTableName) {
+		reduced, err = c.seriesByBucket(ctx, telemetrymetrics.DBName+"."+telemetrymetrics.TimeseriesV4ReducedTableName, false, metricNames, effectiveFrom, startMs, endMs)
 		if err != nil {
 			return nil, err
 		}
-		for ts, count := range reduced {
-			retained[ts] += count
-		}
-	}
-	reducedSet := make(map[string]struct{}, len(reducedMetrics))
-	for _, name := range reducedMetrics {
-		reducedSet[name] = struct{}{}
-	}
-	nonReduced := make([]string, 0, len(allMetrics))
-	for _, name := range allMetrics {
-		if _, ok := reducedSet[name]; !ok {
-			nonReduced = append(nonReduced, name)
-		}
-	}
-	if len(nonReduced) > 0 {
-		nonReducedIngested, err := c.ingestedSeriesByBucket(ctx, nonReduced, effectiveFrom, startMs, endMs)
-		if err != nil {
-			return nil, err
-		}
-		for ts, count := range nonReducedIngested {
-			retained[ts] += count
-		}
 	}
 
-	return mergeVolumePoints(ingested, retained), nil
+	return mergeVolumePoints(ingested, reduced), nil
 }
 
+// mergeVolumePoints unions two per-bucket maps into a single time-ordered series of points.
 func mergeVolumePoints(ingested, reduced map[int64]uint64) []volumePoint {
 	buckets := make(map[int64]struct{}, len(ingested))
 	for ts := range ingested {
@@ -488,61 +480,25 @@ func mergeVolumePoints(ingested, reduced map[int64]uint64) []volumePoint {
 	return points
 }
 
-// ingestedSeriesByBucket counts distinct raw fingerprints per hourly bucket from the samples buffer.
-func (c *clickhouse) ingestedSeriesByBucket(ctx context.Context, metricNames []string, effectiveFrom map[string]int64, startMs, endMs int64) (map[int64]uint64, error) {
+func (c *clickhouse) seriesByBucket(ctx context.Context, table string, originalOnly bool, metricNames []string, effectiveFrom map[string]int64, startMs, endMs int64) (map[int64]uint64, error) {
 	names := make([]any, len(metricNames))
 	for i, name := range metricNames {
 		names[i] = name
 	}
 
 	sb := sqlbuilder.NewSelectBuilder()
-	bucketExpr := "toInt64(toUnixTimestamp(toStartOfInterval(toDateTime(intDiv(unix_milli, 1000)), toIntervalHour(1)))) * 1000 AS bucket"
-	sb.Select(bucketExpr, "uniq(fingerprint)")
-	sb.From(telemetrymetrics.DBName + "." + telemetrymetrics.SamplesV4BufferTableName)
+	sb.Select("unix_milli", "uniq(fingerprint)")
+	sb.From(table)
 	conds := []string{sb.In("metric_name", names...), sb.GE("unix_milli", startMs), sb.LT("unix_milli", endMs)}
+	if originalOnly {
+		conds = append(conds, sb.E("is_reduced", false))
+	}
 	if len(effectiveFrom) > 0 {
-		conds = append(conds, strictEffectiveFrom(sb, metricNames, effectiveFrom))
+		conds = append(conds, effectiveFromGate(sb, metricNames, effectiveFrom))
 	}
 	sb.Where(conds...)
-	sb.GroupBy("bucket")
+	sb.GroupBy("unix_milli")
 
-	return c.scanBuckets(ctx, sb)
-}
-
-// reducedSeriesByBucket counts distinct reduced_fingerprints per hourly bucket, summed across the two
-// reduced sample tables (a metric only lands in the table matching its type, so per-bucket sums are
-// exact).
-func (c *clickhouse) reducedSeriesByBucket(ctx context.Context, metricNames []string, effectiveFrom map[string]int64, startMs, endMs int64) (map[int64]uint64, error) {
-	out := make(map[int64]uint64)
-	for _, table := range []string{telemetrymetrics.SamplesV4ReducedLastTableName, telemetrymetrics.SamplesV4ReducedSumTableName} {
-		names := make([]any, len(metricNames))
-		for i, name := range metricNames {
-			names[i] = name
-		}
-
-		sb := sqlbuilder.NewSelectBuilder()
-		bucketExpr := "toInt64(toUnixTimestamp(toStartOfInterval(toDateTime(intDiv(unix_milli, 1000)), toIntervalHour(1)))) * 1000 AS bucket"
-		sb.Select(bucketExpr, "uniq(reduced_fingerprint)")
-		sb.From(telemetrymetrics.DBName + "." + table)
-		conds := []string{sb.In("metric_name", names...), sb.GE("unix_milli", startMs), sb.LT("unix_milli", endMs)}
-		if len(effectiveFrom) > 0 {
-			conds = append(conds, strictEffectiveFrom(sb, metricNames, effectiveFrom))
-		}
-		sb.Where(conds...)
-		sb.GroupBy("bucket")
-
-		counts, err := c.scanBuckets(ctx, sb)
-		if err != nil {
-			return nil, err
-		}
-		for ts, count := range counts {
-			out[ts] += count
-		}
-	}
-	return out, nil
-}
-
-func (c *clickhouse) scanBuckets(ctx context.Context, sb *sqlbuilder.SelectBuilder) (map[int64]uint64, error) {
 	query, args := sb.BuildWithFlavor(sqlbuilder.ClickHouse)
 	rows, err := c.telemetryStore.ClickhouseDB().Query(ctx, query, args...)
 	if err != nil {

ee/modules/metricreductionrule/implmetricreductionrule/module.go

@@ -19,7 +19,6 @@ import (
 	"github.com/SigNoz/signoz/pkg/telemetrystore"
 	"github.com/SigNoz/signoz/pkg/types/featuretypes"
 	"github.com/SigNoz/signoz/pkg/types/metricreductionruletypes"
-	"github.com/SigNoz/signoz/pkg/types/metrictypes"
 	"github.com/SigNoz/signoz/pkg/types/querybuildertypes/querybuildertypesv5"
 	"github.com/SigNoz/signoz/pkg/types/ruletypes"
 	"github.com/SigNoz/signoz/pkg/types/telemetrytypes"
@@ -28,36 +27,35 @@ import (
 
 const (
 	// effectiveFromMargin delays effective_from so the collector picks up the synced rule before it
-	// goes live; it must be >= the collector's rule-refresh interval (see signoz-otel-collector#839).
+	// goes live; it must be >= the collector's rule-refresh interval (signoz-otel-collector#839).
 	effectiveFromMargin    = 5 * time.Minute
 	defaultPreviewLookback = 24 * time.Hour
 
+	// pricePerMillionSamplesUSD is the metrics list price (samples are the billed unit).
 	pricePerMillionSamplesUSD = 0.1
 	monthDuration             = 30 * 24 * time.Hour
 )
 
 type module struct {
-	store         metricreductionruletypes.Store
-	ch            *clickhouse
-	dashboard     dashboard.Module
-	ruleStore     ruletypes.RuleStore
-	licensing     licensing.Licensing
-	flagger       flagger.Flagger
-	metadataStore telemetrytypes.MetadataStore
-	logger        *slog.Logger
+	store     metricreductionruletypes.Store
+	ch        *clickhouse
+	dashboard dashboard.Module
+	ruleStore ruletypes.RuleStore
+	licensing licensing.Licensing
+	flagger   flagger.Flagger
+	logger    *slog.Logger
 }
 
-func NewModule(sqlStore sqlstore.SQLStore, telemetryStore telemetrystore.TelemetryStore, dashboardModule dashboard.Module, queryParser queryparser.QueryParser, licensing licensing.Licensing, flagger flagger.Flagger, metadataStore telemetrytypes.MetadataStore, providerSettings factory.ProviderSettings, threads int) metricreductionrule.Module {
+func NewModule(sqlStore sqlstore.SQLStore, telemetryStore telemetrystore.TelemetryStore, dashboardModule dashboard.Module, queryParser queryparser.QueryParser, licensing licensing.Licensing, flagger flagger.Flagger, providerSettings factory.ProviderSettings, threads int) metricreductionrule.Module {
 	scoped := factory.NewScopedProviderSettings(providerSettings, "github.com/SigNoz/signoz/ee/modules/metricreductionrule/implmetricreductionrule")
 	return &module{
-		store:         NewStore(sqlStore),
-		ch:            newClickhouse(telemetryStore, threads),
-		dashboard:     dashboardModule,
-		ruleStore:     sqlrulestore.NewRuleStore(sqlStore, queryParser, providerSettings),
-		licensing:     licensing,
-		flagger:       flagger,
-		metadataStore: metadataStore,
-		logger:        scoped.Logger(),
+		store:     NewStore(sqlStore),
+		ch:        newClickhouse(telemetryStore, threads),
+		dashboard: dashboardModule,
+		ruleStore: sqlrulestore.NewRuleStore(sqlStore, queryParser, providerSettings),
+		licensing: licensing,
+		flagger:   flagger,
+		logger:    scoped.Logger(),
 	}
 }
 
@@ -65,6 +63,7 @@ func (m *module) checkAccess(ctx context.Context, orgID valuer.UUID) error {
 	if !m.flagger.BooleanOrEmpty(ctx, flagger.FeatureEnableMetricsReduction, featuretypes.NewFlaggerEvaluationContext(orgID)) {
 		return errors.Newf(errors.TypeUnsupported, metricreductionruletypes.ErrCodeMetricReductionRuleUnsupported, "metric volume control is not enabled")
 	}
+	return nil
 	if _, err := m.licensing.GetActive(ctx, orgID); err != nil {
 		return errors.New(errors.TypeLicenseUnavailable, errors.CodeLicenseUnavailable, "metric volume control requires a valid license").WithAdditional(err.Error())
 	}
@@ -117,7 +116,7 @@ func (m *module) listSortedByColumn(ctx context.Context, orgID valuer.UUID, para
 }
 
 func (m *module) listSortedByVolume(ctx context.Context, orgID valuer.UUID, params *metricreductionruletypes.ListReductionRulesParams, startMs, endMs int64) (*metricreductionruletypes.GettableReductionRules, error) {
-	allRules, total, err := m.store.List(ctx, orgID, &metricreductionruletypes.ListReductionRulesParams{Search: params.Search, MetricName: params.MetricName})
+	allRules, total, err := m.store.List(ctx, orgID, &metricreductionruletypes.ListReductionRulesParams{Search: params.Search})
 	if err != nil {
 		return nil, err
 	}
@@ -127,7 +126,7 @@ func (m *module) listSortedByVolume(ctx context.Context, orgID valuer.UUID, para
 
 	metricNames := make([]string, len(allRules))
 	effectiveFrom := make(map[string]int64, len(allRules))
-	ruleByMetric := make(map[string]*metricreductionruletypes.ReductionRule, len(allRules))
+	ruleByMetric := make(map[string]*metricreductionruletypes.StorableReductionRule, len(allRules))
 	for i, rule := range allRules {
 		metricNames[i] = rule.MetricName
 		effectiveFrom[rule.MetricName] = rule.EffectiveFrom.UnixMilli()
@@ -151,21 +150,64 @@ func (m *module) listSortedByVolume(ctx context.Context, orgID valuer.UUID, para
 	return &metricreductionruletypes.GettableReductionRules{Rules: rules, Total: total}, nil
 }
 
-func (m *module) Create(ctx context.Context, orgID valuer.UUID, userEmail string, req *metricreductionruletypes.PostableReductionRule) (*metricreductionruletypes.GettableReductionRule, error) {
+func (m *module) Get(ctx context.Context, orgID valuer.UUID, metricName string) (*metricreductionruletypes.GettableReductionRule, error) {
+	if err := m.checkAccess(ctx, orgID); err != nil {
+		return nil, err
+	}
+	if metricName == "" {
+		return nil, errors.NewInvalidInputf(errors.CodeInvalidInput, "metricName is required")
+	}
+
+	rule, err := m.store.Get(ctx, orgID, metricName)
+	if err != nil {
+		return nil, err
+	}
+
+	now := time.Now()
+	current, reduced, reductionPercent, _, err := m.estimateVolume(ctx, rule.MetricName, rule.MatchType, rule.Labels, now.Add(-defaultPreviewLookback).UnixMilli(), now.UnixMilli())
+	if err != nil {
+		return nil, err
+	}
+	gettable := toGettableReductionRule(rule)
+	gettable.IngestedSeries = current
+	gettable.ReducedSeries = reduced
+	gettable.ReductionPercent = reductionPercent
+	return &gettable, nil
+}
+
+func (m *module) Upsert(ctx context.Context, orgID valuer.UUID, userEmail string, req *metricreductionruletypes.PostableReductionRule) (*metricreductionruletypes.GettableReductionRule, error) {
+	return m.writeRule(ctx, orgID, userEmail, req, false)
+}
+
+// writeRule validates, persists (create inserts, else upserts), and syncs the rule to ClickHouse.
+func (m *module) writeRule(ctx context.Context, orgID valuer.UUID, userEmail string, req *metricreductionruletypes.PostableReductionRule, create bool) (*metricreductionruletypes.GettableReductionRule, error) {
 	if err := m.checkAccess(ctx, orgID); err != nil {
 		return nil, err
 	}
 	if err := req.Validate(); err != nil {
 		return nil, err
 	}
-	if err := m.validateMetricForReduction(ctx, orgID, req.MetricName); err != nil {
-		return nil, err
+	// Reducibility is only checked when creating; an existing rule stays editable even if its metric stopped reporting.
+	needsMetricCheck := create
+	if !create {
+		if _, err := m.store.Get(ctx, orgID, req.MetricName); err != nil {
+			needsMetricCheck = true
+		}
+	}
+	if needsMetricCheck {
+		if err := m.validateMetricForReduction(ctx, req.MetricName); err != nil {
+			return nil, err
+		}
 	}
 	now := time.Now()
 	rule := metricreductionruletypes.NewReductionRule(orgID, req.MetricName, req.MatchType, req.Labels, now.Add(effectiveFromMargin), userEmail)
 
+	persist := m.store.Upsert
+	if create {
+		persist = m.store.Create
+	}
 	if err := m.store.RunInTx(ctx, func(ctx context.Context) error {
-		if err := m.store.Create(ctx, rule); err != nil {
+		if err := persist(ctx, rule); err != nil {
 			return err
 		}
 		return m.ch.Sync(ctx, rule.MetricName, rule.Labels, rule.MatchType.StringValue(), rule.EffectiveFrom.UnixMilli(), false, rule.UpdatedAt)
@@ -177,6 +219,29 @@ func (m *module) Create(ctx context.Context, orgID valuer.UUID, userEmail string
 	return &gettable, nil
 }
 
+func (m *module) Delete(ctx context.Context, orgID valuer.UUID, metricName string) error {
+	if err := m.checkAccess(ctx, orgID); err != nil {
+		return err
+	}
+	if metricName == "" {
+		return errors.NewInvalidInputf(errors.CodeInvalidInput, "metricName is required")
+	}
+
+	now := time.Now()
+	effectiveFromMs := now.Add(effectiveFromMargin).UnixMilli()
+	return m.store.RunInTx(ctx, func(ctx context.Context) error {
+		if err := m.store.Delete(ctx, orgID, metricName); err != nil {
+			return err
+		}
+		return m.ch.Sync(ctx, metricName, []string{}, metricreductionruletypes.MatchTypeDrop.StringValue(), effectiveFromMs, true, now)
+	})
+}
+
+// Create inserts a new rule (Terraform/operators), returning AlreadyExists if the metric already has one.
+func (m *module) Create(ctx context.Context, orgID valuer.UUID, userEmail string, req *metricreductionruletypes.PostableReductionRule) (*metricreductionruletypes.GettableReductionRule, error) {
+	return m.writeRule(ctx, orgID, userEmail, req, true)
+}
+
 func (m *module) GetByID(ctx context.Context, orgID valuer.UUID, id valuer.UUID) (*metricreductionruletypes.GettableReductionRule, error) {
 	if err := m.checkAccess(ctx, orgID); err != nil {
 		return nil, err
@@ -189,7 +254,7 @@ func (m *module) GetByID(ctx context.Context, orgID valuer.UUID, id valuer.UUID)
 	return &gettable, nil
 }
 
-func (m *module) UpdateByID(ctx context.Context, orgID valuer.UUID, userEmail string, id valuer.UUID, req *metricreductionruletypes.UpdatableReductionRule) (*metricreductionruletypes.GettableReductionRule, error) {
+func (m *module) UpdateByID(ctx context.Context, orgID valuer.UUID, userEmail string, id valuer.UUID, req *metricreductionruletypes.PostableReductionRule) (*metricreductionruletypes.GettableReductionRule, error) {
 	if err := m.checkAccess(ctx, orgID); err != nil {
 		return nil, err
 	}
@@ -197,10 +262,13 @@ func (m *module) UpdateByID(ctx context.Context, orgID valuer.UUID, userEmail st
 	if err != nil {
 		return nil, err
 	}
+	// metricName is immutable; an id always addresses the same metric.
+	req.MetricName = existing.MetricName
 	if err := req.Validate(); err != nil {
 		return nil, err
 	}
-
+	// Update in place to preserve the id and create-audit; the metric isn't re-validated so a rule
+	// stays editable even if its metric stopped reporting.
 	now := time.Now()
 	existing.MatchType = req.MatchType
 	existing.Labels = metricreductionruletypes.LabelList(req.Labels)
@@ -247,7 +315,7 @@ func (m *module) Preview(ctx context.Context, orgID valuer.UUID, req *metricredu
 	if err := req.Validate(); err != nil {
 		return nil, err
 	}
-	if err := m.validateMetricForReduction(ctx, orgID, req.MetricName); err != nil {
+	if err := m.validateMetricForReduction(ctx, req.MetricName); err != nil {
 		return nil, err
 	}
 	lookback := time.Duration(req.LookbackMs) * time.Millisecond
@@ -272,13 +340,13 @@ func (m *module) Preview(ctx context.Context, orgID valuer.UUID, req *metricredu
 	}
 
 	return &metricreductionruletypes.GettableReductionRulePreview{
-		IngestedSeries:        current,
-		CurrentRetainedSeries: currentReduced,
-		RetainedSeries:        reduced,
-		ReductionPercent:      reductionPercent,
-		DroppedLabels:         dropped,
-		AffectedAssets:        m.relatedAssetImpact(ctx, orgID, req.MetricName, dropped),
-		EffectiveFrom:         now.Add(effectiveFromMargin),
+		IngestedSeries:       current,
+		CurrentReducedSeries: currentReduced,
+		ReducedSeries:        reduced,
+		ReductionPercent:     reductionPercent,
+		DroppedLabels:        dropped,
+		AffectedAssets:       m.relatedAssetImpact(ctx, orgID, req.MetricName, dropped),
+		EffectiveFrom:        now.Add(effectiveFromMargin),
 	}, nil
 }
 
@@ -310,27 +378,20 @@ func (m *module) Stats(ctx context.Context, orgID valuer.UUID) (*metricreduction
 	if err != nil {
 		return nil, err
 	}
-	var ingestedSeries, retainedSeries uint64
-	reducedMetricNames := make([]string, 0, len(volumes))
-	reducedEffectiveFrom := make(map[string]int64, len(volumes))
-	for name, volume := range volumes {
+	var ingestedSeries, reducedSeries uint64
+	for _, volume := range volumes {
 		ingestedSeries += volume.Ingested
-		retained := effectiveRetained(volume.Ingested, volume.Reduced)
-		retainedSeries += retained
-		if retained < volume.Ingested {
-			reducedMetricNames = append(reducedMetricNames, name)
-			reducedEffectiveFrom[name] = effectiveFrom[name]
-		}
+		reducedSeries += volume.Reduced
 	}
 
-	ingestedSamples, reducedSamples, err := m.ch.SampleVolume(ctx, reducedMetricNames, reducedEffectiveFrom, startMs, endMs)
+	ingestedSamples, reducedSamples, err := m.ch.SampleVolume(ctx, metricNames, effectiveFrom, startMs, endMs)
 	if err != nil {
 		return nil, err
 	}
 
 	return &metricreductionruletypes.GettableReductionRuleStats{
 		IngestedSeries:             ingestedSeries,
-		RetainedSeries:             retainedSeries,
+		ReducedSeries:              reducedSeries,
 		EstimatedMonthlySavingsUsd: monthlySavingsUSD(ingestedSamples, reducedSamples, startMs, endMs),
 	}, nil
 }
@@ -366,18 +427,7 @@ func (m *module) Timeseries(ctx context.Context, orgID valuer.UUID) (*querybuild
 		effectiveFrom[rule.MetricName] = rule.EffectiveFrom.UnixMilli()
 	}
 
-	volumes, err := m.ch.VolumeByMetric(ctx, metricNames, effectiveFrom, startMs, endMs)
-	if err != nil {
-		return nil, err
-	}
-	reducedNames := make([]string, 0, len(volumes))
-	for name, volume := range volumes {
-		if effectiveRetained(volume.Ingested, volume.Reduced) < volume.Ingested {
-			reducedNames = append(reducedNames, name)
-		}
-	}
-
-	points, err := m.ch.SeriesTimeseries(ctx, metricNames, reducedNames, effectiveFrom, startMs, endMs)
+	points, err := m.ch.SeriesTimeseries(ctx, metricNames, effectiveFrom, startMs, endMs)
 	if err != nil {
 		return nil, err
 	}
@@ -403,7 +453,7 @@ func buildVolumeTimeseries(points []volumePoint) *querybuildertypesv5.QueryRange
 						{
 							Series: []*querybuildertypesv5.TimeSeries{
 								{Labels: []*querybuildertypesv5.Label{{Key: telemetrytypes.TelemetryFieldKey{Name: "series"}, Value: "ingested"}}, Values: ingested},
-								{Labels: []*querybuildertypesv5.Label{{Key: telemetrytypes.TelemetryFieldKey{Name: "series"}, Value: "retained"}}, Values: reduced},
+								{Labels: []*querybuildertypesv5.Label{{Key: telemetrytypes.TelemetryFieldKey{Name: "series"}, Value: "reduced"}}, Values: reduced},
 							},
 						},
 					},
@@ -413,23 +463,20 @@ func buildVolumeTimeseries(points []volumePoint) *querybuildertypesv5.QueryRange
 	}
 }
 
-func (m *module) validateMetricForReduction(ctx context.Context, orgID valuer.UUID, metricName string) error {
-	lastSeen, err := m.metadataStore.FetchLastSeenInfoMulti(ctx, metricName)
+func (m *module) validateMetricForReduction(ctx context.Context, metricName string) error {
+	exists, err := m.ch.MetricExists(ctx, metricName)
 	if err != nil {
 		return err
 	}
-	if lastSeen[metricName] == 0 {
+	if !exists {
 		return errors.NewNotFoundf(errors.CodeNotFound, "metric not found: %q", metricName)
 	}
 
-	now := time.Now()
-	startTs := uint64(now.Add(-defaultPreviewLookback).UnixMilli())
-	endTs := uint64(now.UnixMilli())
-	_, types, _, err := m.metadataStore.FetchTemporalityAndTypeMulti(ctx, orgID, startTs, endTs, metricName)
+	isExpHist, err := m.ch.IsExponentialHistogram(ctx, metricName)
 	if err != nil {
 		return err
 	}
-	if types[metricName] == metrictypes.ExpHistogramType {
+	if isExpHist {
 		return errors.Newf(errors.TypeInvalidInput, metricreductionruletypes.ErrCodeMetricReductionRuleUnsupportedMetricType,
 			"exponential histogram metrics cannot be reduced in v1")
 	}
@@ -452,7 +499,8 @@ func (m *module) relatedAssetImpact(ctx context.Context, orgID valuer.UUID, metr
 				Type:           metricreductionruletypes.AssetTypeDashboard,
 				ID:             item["dashboard_id"],
 				Name:           item["dashboard_name"],
-				Widget:         &metricreductionruletypes.AffectedWidget{ID: item["widget_id"], Name: item["widget_name"]},
+				Widget:         item["widget_name"],
+				WidgetID:       item["widget_id"],
 				ImpactedLabels: intersectLabels(usedLabels, droppedSet),
 			})
 		}
@@ -473,7 +521,7 @@ func (m *module) relatedAssetImpact(ctx context.Context, orgID valuer.UUID, metr
 	return affected
 }
 
-func toGettableReductionRule(rule *metricreductionruletypes.ReductionRule) metricreductionruletypes.GettableReductionRule {
+func toGettableReductionRule(rule *metricreductionruletypes.StorableReductionRule) metricreductionruletypes.GettableReductionRule {
 	return metricreductionruletypes.GettableReductionRule{
 		Identifiable:  rule.Identifiable,
 		TimeAuditable: rule.TimeAuditable,
@@ -486,18 +534,11 @@ func toGettableReductionRule(rule *metricreductionruletypes.ReductionRule) metri
 	}
 }
 
-func effectiveRetained(ingested, reduced uint64) uint64 {
-	if reduced == 0 || reduced > ingested {
-		return ingested
-	}
-	return reduced
-}
-
 func withVolume(rule metricreductionruletypes.GettableReductionRule, volume volumeRow) metricreductionruletypes.GettableReductionRule {
 	rule.IngestedSeries = volume.Ingested
-	rule.RetainedSeries = effectiveRetained(volume.Ingested, volume.Reduced)
-	if volume.Ingested > 0 {
-		rule.ReductionPercent = (1 - float64(rule.RetainedSeries)/float64(volume.Ingested)) * 100
+	rule.ReducedSeries = volume.Reduced
+	if volume.Ingested > 0 && volume.Reduced <= volume.Ingested {
+		rule.ReductionPercent = (1 - float64(volume.Reduced)/float64(volume.Ingested)) * 100
 	}
 	return rule
 }
@@ -518,6 +559,7 @@ func intersectLabels(keys []string, droppedSet map[string]struct{}) []string {
 	return out
 }
 
+// splitCSV splits a comma-joined label list, returning nil for the empty string.
 func splitCSV(s string) []string {
 	if s == "" {
 		return nil

ee/modules/metricreductionrule/implmetricreductionrule/store.go

@@ -17,7 +17,7 @@ func NewStore(sqlstore sqlstore.SQLStore) metricreductionruletypes.Store {
 	return &store{sqlstore: sqlstore}
 }
 
-func (s *store) List(ctx context.Context, orgID valuer.UUID, params *metricreductionruletypes.ListReductionRulesParams) ([]*metricreductionruletypes.ReductionRule, int, error) {
+func (s *store) List(ctx context.Context, orgID valuer.UUID, params *metricreductionruletypes.ListReductionRulesParams) ([]*metricreductionruletypes.StorableReductionRule, int, error) {
 	column := "metric_name"
 	if params.OrderBy == metricreductionruletypes.OrderByLastUpdated {
 		column = "updated_at"
@@ -27,7 +27,7 @@ func (s *store) List(ctx context.Context, orgID valuer.UUID, params *metricreduc
 		direction = "DESC"
 	}
 
-	rules := make([]*metricreductionruletypes.ReductionRule, 0)
+	rules := make([]*metricreductionruletypes.StorableReductionRule, 0)
 	query := s.sqlstore.
 		BunDBCtx(ctx).
 		NewSelect().
@@ -37,9 +37,6 @@ func (s *store) List(ctx context.Context, orgID valuer.UUID, params *metricreduc
 	if params.Search != "" {
 		query = query.Where("metric_name LIKE ?", "%"+params.Search+"%")
 	}
-	if params.MetricName != "" {
-		query = query.Where("metric_name = ?", params.MetricName)
-	}
 	if params.Limit > 0 {
 		query = query.Limit(params.Limit).Offset(params.Offset)
 	}
@@ -51,8 +48,8 @@ func (s *store) List(ctx context.Context, orgID valuer.UUID, params *metricreduc
 	return rules, total, nil
 }
 
-func (s *store) Get(ctx context.Context, orgID valuer.UUID, metricName string) (*metricreductionruletypes.ReductionRule, error) {
-	rule := new(metricreductionruletypes.ReductionRule)
+func (s *store) Get(ctx context.Context, orgID valuer.UUID, metricName string) (*metricreductionruletypes.StorableReductionRule, error) {
+	rule := new(metricreductionruletypes.StorableReductionRule)
 	err := s.sqlstore.
 		BunDBCtx(ctx).
 		NewSelect().
@@ -66,8 +63,8 @@ func (s *store) Get(ctx context.Context, orgID valuer.UUID, metricName string) (
 	return rule, nil
 }
 
-func (s *store) GetByID(ctx context.Context, orgID valuer.UUID, id valuer.UUID) (*metricreductionruletypes.ReductionRule, error) {
-	rule := new(metricreductionruletypes.ReductionRule)
+func (s *store) GetByID(ctx context.Context, orgID valuer.UUID, id valuer.UUID) (*metricreductionruletypes.StorableReductionRule, error) {
+	rule := new(metricreductionruletypes.StorableReductionRule)
 	err := s.sqlstore.
 		BunDBCtx(ctx).
 		NewSelect().
@@ -81,7 +78,7 @@ func (s *store) GetByID(ctx context.Context, orgID valuer.UUID, id valuer.UUID)
 	return rule, nil
 }
 
-func (s *store) Create(ctx context.Context, rule *metricreductionruletypes.ReductionRule) error {
+func (s *store) Create(ctx context.Context, rule *metricreductionruletypes.StorableReductionRule) error {
 	res, err := s.sqlstore.
 		BunDBCtx(ctx).
 		NewInsert().
@@ -103,7 +100,7 @@ func (s *store) Create(ctx context.Context, rule *metricreductionruletypes.Reduc
 	return nil
 }
 
-func (s *store) Upsert(ctx context.Context, rule *metricreductionruletypes.ReductionRule) error {
+func (s *store) Upsert(ctx context.Context, rule *metricreductionruletypes.StorableReductionRule) error {
 	_, err := s.sqlstore.
 		BunDBCtx(ctx).
 		NewInsert().
@@ -118,11 +115,33 @@ func (s *store) Upsert(ctx context.Context, rule *metricreductionruletypes.Reduc
 	return err
 }
 
+func (s *store) Delete(ctx context.Context, orgID valuer.UUID, metricName string) error {
+	res, err := s.sqlstore.
+		BunDBCtx(ctx).
+		NewDelete().
+		Model((*metricreductionruletypes.StorableReductionRule)(nil)).
+		Where("org_id = ?", orgID).
+		Where("metric_name = ?", metricName).
+		Exec(ctx)
+	if err != nil {
+		return err
+	}
+
+	rowsAffected, err := res.RowsAffected()
+	if err != nil {
+		return err
+	}
+	if rowsAffected == 0 {
+		return errors.Newf(errors.TypeNotFound, metricreductionruletypes.ErrCodeMetricReductionRuleNotFound, "no reduction rule found for metric %q", metricName)
+	}
+	return nil
+}
+
 func (s *store) DeleteByID(ctx context.Context, orgID valuer.UUID, id valuer.UUID) error {
 	res, err := s.sqlstore.
 		BunDBCtx(ctx).
 		NewDelete().
-		Model((*metricreductionruletypes.ReductionRule)(nil)).
+		Model((*metricreductionruletypes.StorableReductionRule)(nil)).
 		Where("org_id = ?", orgID).
 		Where("id = ?", id).
 		Exec(ctx)

ee/modules/metricreductionrule/implmetricreductionrule/store_test.go

@@ -0,0 +1,170 @@
+package implmetricreductionrule
+
+import (
+	"context"
+	"path/filepath"
+	"testing"
+	"time"
+
+	"github.com/SigNoz/signoz/pkg/factory/factorytest"
+	"github.com/SigNoz/signoz/pkg/sqlstore"
+	"github.com/SigNoz/signoz/pkg/sqlstore/sqlitesqlstore"
+	"github.com/SigNoz/signoz/pkg/types/metricreductionruletypes"
+	"github.com/SigNoz/signoz/pkg/valuer"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func newTestStore(t *testing.T) sqlstore.SQLStore {
+	t.Helper()
+	dbPath := filepath.Join(t.TempDir(), "test.db")
+	store, err := sqlitesqlstore.New(context.Background(), factorytest.NewSettings(), sqlstore.Config{
+		Provider: "sqlite",
+		Connection: sqlstore.ConnectionConfig{
+			MaxOpenConns:    1,
+			MaxConnLifetime: 0,
+		},
+		Sqlite: sqlstore.SqliteConfig{
+			Path:            dbPath,
+			Mode:            "wal",
+			BusyTimeout:     5 * time.Second,
+			TransactionMode: "deferred",
+		},
+	})
+	require.NoError(t, err)
+
+	_, err = store.BunDB().NewCreateTable().
+		Model((*metricreductionruletypes.StorableReductionRule)(nil)).
+		IfNotExists().
+		Exec(context.Background())
+	require.NoError(t, err)
+
+	_, err = store.BunDB().Exec(`CREATE UNIQUE INDEX IF NOT EXISTS uq_metric_reduction_rule_org_metric ON metric_reduction_rule (org_id, metric_name)`)
+	require.NoError(t, err)
+	return store
+}
+
+func newRule(orgID valuer.UUID, metricName string, matchType metricreductionruletypes.MatchType, labels []string, by string) *metricreductionruletypes.StorableReductionRule {
+	return metricreductionruletypes.NewReductionRule(orgID, metricName, matchType, labels, time.Now(), by)
+}
+
+func TestStore_UpsertGetListDelete(t *testing.T) {
+	ctx := context.Background()
+	s := NewStore(newTestStore(t))
+	orgID := valuer.GenerateUUID()
+
+	empty, _, err := s.List(ctx, orgID, &metricreductionruletypes.ListReductionRulesParams{})
+	require.NoError(t, err)
+	assert.Empty(t, empty)
+
+	require.NoError(t, s.Upsert(ctx, newRule(orgID, "http_requests_total", metricreductionruletypes.MatchTypeDrop, []string{"pod", "container"}, "creator@x.com")))
+
+	got, err := s.Get(ctx, orgID, "http_requests_total")
+	require.NoError(t, err)
+	assert.Equal(t, metricreductionruletypes.MatchTypeDrop, got.MatchType)
+	assert.Equal(t, []string{"pod", "container"}, []string(got.Labels))
+	assert.Equal(t, "creator@x.com", got.CreatedBy)
+
+	list, _, err := s.List(ctx, orgID, &metricreductionruletypes.ListReductionRulesParams{})
+	require.NoError(t, err)
+	require.Len(t, list, 1)
+}
+
+func TestStore_UpsertReplacesAndPreservesCreator(t *testing.T) {
+	ctx := context.Background()
+	s := NewStore(newTestStore(t))
+	orgID := valuer.GenerateUUID()
+
+	require.NoError(t, s.Upsert(ctx, newRule(orgID, "cpu_usage", metricreductionruletypes.MatchTypeDrop, []string{"pod"}, "creator@x.com")))
+	require.NoError(t, s.Upsert(ctx, newRule(orgID, "cpu_usage", metricreductionruletypes.MatchTypeKeep, []string{"le"}, "editor@x.com")))
+
+	list, _, err := s.List(ctx, orgID, &metricreductionruletypes.ListReductionRulesParams{})
+	require.NoError(t, err)
+	require.Len(t, list, 1, "upsert on the same (org, metric) replaces, it does not duplicate")
+
+	got, err := s.Get(ctx, orgID, "cpu_usage")
+	require.NoError(t, err)
+	assert.Equal(t, metricreductionruletypes.MatchTypeKeep, got.MatchType)
+	assert.Equal(t, []string{"le"}, []string(got.Labels))
+	assert.Equal(t, "creator@x.com", got.CreatedBy, "created_by is preserved on update")
+	assert.Equal(t, "editor@x.com", got.UpdatedBy, "updated_by reflects the latest editor")
+}
+
+func TestStore_DeleteMissingRuleErrors(t *testing.T) {
+	ctx := context.Background()
+	s := NewStore(newTestStore(t))
+	orgID := valuer.GenerateUUID()
+
+	require.NoError(t, s.Upsert(ctx, newRule(orgID, "mem_usage", metricreductionruletypes.MatchTypeDrop, []string{"pod"}, "creator@x.com")))
+	require.NoError(t, s.Delete(ctx, orgID, "mem_usage"))
+
+	_, err := s.Get(ctx, orgID, "mem_usage")
+	require.Error(t, err)
+
+	require.Error(t, s.Delete(ctx, orgID, "mem_usage"), "deleting a non-existent rule returns an error")
+}
+
+func TestStore_ScopedByOrg(t *testing.T) {
+	ctx := context.Background()
+	s := NewStore(newTestStore(t))
+	orgA := valuer.GenerateUUID()
+	orgB := valuer.GenerateUUID()
+
+	require.NoError(t, s.Upsert(ctx, newRule(orgA, "shared_metric", metricreductionruletypes.MatchTypeDrop, []string{"pod"}, "a@x.com")))
+
+	_, err := s.Get(ctx, orgB, "shared_metric")
+	require.Error(t, err, "a rule in org A must not be visible to org B")
+
+	list, _, err := s.List(ctx, orgB, &metricreductionruletypes.ListReductionRulesParams{})
+	require.NoError(t, err)
+	assert.Empty(t, list)
+}
+
+func TestStore_ListSortsAndPaginates(t *testing.T) {
+	ctx := context.Background()
+	s := NewStore(newTestStore(t))
+	orgID := valuer.GenerateUUID()
+
+	for _, name := range []string{"c_metric", "a_metric", "b_metric"} {
+		require.NoError(t, s.Upsert(ctx, newRule(orgID, name, metricreductionruletypes.MatchTypeDrop, []string{"pod"}, "x@x.com")))
+	}
+
+	page, total, err := s.List(ctx, orgID, &metricreductionruletypes.ListReductionRulesParams{
+		OrderBy: metricreductionruletypes.OrderByMetricName,
+		Order:   metricreductionruletypes.OrderAsc,
+		Offset:  0,
+		Limit:   2,
+	})
+	require.NoError(t, err)
+	assert.Equal(t, 3, total, "total reflects all rows, not the page size")
+	require.Len(t, page, 2)
+	assert.Equal(t, "a_metric", page[0].MetricName)
+	assert.Equal(t, "b_metric", page[1].MetricName)
+
+	page, _, err = s.List(ctx, orgID, &metricreductionruletypes.ListReductionRulesParams{
+		OrderBy: metricreductionruletypes.OrderByMetricName,
+		Order:   metricreductionruletypes.OrderDesc,
+		Offset:  2,
+		Limit:   2,
+	})
+	require.NoError(t, err)
+	require.Len(t, page, 1)
+	assert.Equal(t, "a_metric", page[0].MetricName, "desc order with offset 2 lands on the smallest name")
+}
+
+func TestStore_RunInTxRollsBackOnError(t *testing.T) {
+	ctx := context.Background()
+	s := NewStore(newTestStore(t))
+	orgID := valuer.GenerateUUID()
+
+	err := s.RunInTx(ctx, func(ctx context.Context) error {
+		if err := s.Upsert(ctx, newRule(orgID, "rolled_back", metricreductionruletypes.MatchTypeDrop, []string{"pod"}, "creator@x.com")); err != nil {
+			return err
+		}
+		return assert.AnError
+	})
+	require.ErrorIs(t, err, assert.AnError)
+
+	_, err = s.Get(ctx, orgID, "rolled_back")
+	require.Error(t, err, "the upsert must not persist when the transaction callback fails")
+}

ee/query-service/app/server.go

@@ -90,12 +90,8 @@ func NewServer(config signoz.Config, signoz *signoz.SigNoz) (*Server, error) {
 
 	// initiate agent config handler
 	agentConfMgr, err := agentConf.Initiate(&agentConf.ManagerOptions{
-		Store: signoz.SQLStore,
-		AgentFeatures: []agentConf.AgentFeature{
-			logParsingPipelineController,
-			signoz.Modules.SpanMapper,
-			signoz.Modules.LLMPricingRule,
-		},
+		Store:         signoz.SQLStore,
+		AgentFeatures: []agentConf.AgentFeature{logParsingPipelineController},
 	})
 	if err != nil {
 		return nil, err

ee/sqlstore/postgressqlstore/formatter.go

@@ -152,7 +152,3 @@ func (f *formatter) LowerExpression(expression string) []byte {
 	sql = append(sql, ')')
 	return sql
 }
-
-func (f *formatter) EscapeLikePattern(value string) string {
-	return strings.NewReplacer(`\`, `\\`, `%`, `\%`, `_`, `\_`).Replace(value)
-}

frontend/package.json

@@ -25,7 +25,7 @@
     "test": "jest",
     "test:changedsince": "jest --changedSince=main --coverage --silent",
     "generate:api": "orval --config ./orval.config.ts && sh scripts/post-types-generation.sh",
-    "generate:config:web-settings": "json2ts ./src/schemas/generated/webSettings.schema.json -o src/types/generated/webSettings.ts --style.useTabs --style.tabWidth=1 --style.singleQuote --bannerComment '/* AUTO GENERATED FILE - DO NOT EDIT - GENERATED FROM frontend/src/schemas/generated/webSettings.schema.json */'"
+    "generate:config:web-settings": "json2ts ../docs/config/web-settings.json -o src/types/generated/webSettings.ts --style.useTabs --style.tabWidth=1 --style.singleQuote --bannerComment '/* AUTO GENERATED FILE - DO NOT EDIT - GENERATED FROM docs/config/web-settings.json */'"
   },
   "engines": {
     "node": ">=22.0.0",

frontend/public/locales/en/routes.json

@@ -15,8 +15,6 @@
 	"logs_to_metrics": "Logs To Metrics",
 	"roles": "Roles",
 	"role_details": "Role Details",
-	"role_edit": "Edit Role",
-	"role_create": "Create Role",
 	"members": "Members",
 	"service_accounts": "Service Accounts",
 	"mcp_server": "MCP Server"

frontend/public/locales/en/titles.json

@@ -82,8 +82,6 @@
 	"TRACE_DETAIL_OLD": "SigNoz | Trace Detail",
 	"SERVICE_TOP_LEVEL_OPERATIONS": "SigNoz | Service Operations",
 	"ROLE_DETAILS": "SigNoz | Role Details",
-	"ROLE_CREATE": "SigNoz | Create Role",
-	"ROLE_EDIT": "SigNoz | Edit Role",
 	"TRACES_FUNNELS_DETAIL": "SigNoz | Funnel",
 	"INTEGRATIONS_DETAIL": "SigNoz | Integration",
 	"PUBLIC_DASHBOARD": "SigNoz | Dashboard"

frontend/scripts/extract-md-languages.sh

@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+# Extracts unique fenced code block language identifiers from all .md files under frontend/src/
+# Usage: bash frontend/scripts/extract-md-languages.sh
+
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+SRC_DIR="$SCRIPT_DIR/../src"
+
+grep -roh '```[a-zA-Z0-9_+-]*' "$SRC_DIR" --include='*.md' \
+  | sed 's/^```//' \
+  | grep -v '^$' \
+  | sort -u

frontend/scripts/validate-md-languages.sh

@@ -0,0 +1,41 @@
+#!/usr/bin/env bash
+# Validates that all fenced code block languages used in .md files are registered
+# in the syntax highlighter.
+# Usage: bash frontend/scripts/validate-md-languages.sh
+
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+SYNTAX_HIGHLIGHTER="$SCRIPT_DIR/../src/components/MarkdownRenderer/syntaxHighlighter.ts"
+
+# Get all languages used in .md files
+md_languages=$("$SCRIPT_DIR/extract-md-languages.sh")
+
+# Get all registered languages from syntaxHighlighter.ts
+registered_languages=$(grep -oP "registerLanguage\('\K[^']+" "$SYNTAX_HIGHLIGHTER" | sort -u)
+
+missing_languages=()
+
+for lang in $md_languages; do
+  # Skip ai-* block markers — these are custom AI block types rendered by
+  # RichCodeBlock as React components (e.g. ActionBlock, LineChartBlock),
+  # not real syntax languages, so they don't need highlighter registration.
+  if [[ "$lang" == ai-* ]]; then
+    continue
+  fi
+  if ! echo "$registered_languages" | grep -qx "$lang"; then
+    missing_languages+=("$lang")
+  fi
+done
+
+if [ ${#missing_languages[@]} -gt 0 ]; then
+  echo "Error: The following languages are used in .md files but not registered in syntaxHighlighter.ts:"
+  for lang in "${missing_languages[@]}"; do
+    echo "  - $lang"
+  done
+  echo ""
+  echo "Please add them to: frontend/src/components/MarkdownRenderer/syntaxHighlighter.ts"
+  exit 1
+fi
+
+echo "All markdown code block languages are registered in syntaxHighlighter.ts"

frontend/src/AppRoutes/Private.tsx

@@ -3,12 +3,12 @@ import { matchPath, Redirect, useLocation } from 'react-router-dom';
 import getLocalStorageApi from 'api/browser/localstorage/get';
 import setLocalStorageApi from 'api/browser/localstorage/set';
 import { useListUsers } from 'api/generated/services/users';
+import { FeatureKeys } from 'constants/features';
 import { LOCALSTORAGE } from 'constants/localStorage';
 import { ORG_PREFERENCES } from 'constants/orgPreferences';
 import ROUTES from 'constants/routes';
 import { useGetTenantLicense } from 'hooks/useGetTenantLicense';
 import { useIsAIAssistantEnabled } from 'hooks/useIsAIAssistantEnabled';
-import { useIsAIObservabilityEnabled } from 'hooks/useIsAIObservabilityEnabled';
 import { isEmpty } from 'lodash-es';
 import { useAppContext } from 'providers/App/App';
 import { LicensePlatform, LicenseState } from 'types/api/licensesV3/getActive';
@@ -37,11 +37,11 @@ function PrivateRoute({ children }: PrivateRouteProps): JSX.Element {
 		activeLicense,
 		isFetchingActiveLicense,
 		trialInfo,
+		featureFlags,
 	} = useAppContext();
 
 	const isAdmin = user.role === USER_ROLES.ADMIN;
 	const isAIAssistantEnabled = useIsAIAssistantEnabled();
-	const isAIObservabilityEnabled = useIsAIObservabilityEnabled();
 
 	const mapRoutes = useMemo(
 		() =>
@@ -133,14 +133,6 @@ function PrivateRoute({ children }: PrivateRouteProps): JSX.Element {
 		return <Redirect to={ROUTES.HOME} />;
 	}
 
-	if (
-		(pathname.startsWith(`${ROUTES.LLM_OBSERVABILITY_BASE}/`) ||
-			pathname === ROUTES.LLM_OBSERVABILITY_BASE) &&
-		!isAIObservabilityEnabled
-	) {
-		return <Redirect to={ROUTES.HOME} />;
-	}
-
 	// Check for workspace access restriction (cloud only)
 	const isCloudPlatform = activeLicense?.platform === LicensePlatform.CLOUD;
 
@@ -220,6 +212,14 @@ function PrivateRoute({ children }: PrivateRouteProps): JSX.Element {
 		}
 	}
 
+	// Check for GET_STARTED → GET_STARTED_WITH_CLOUD redirect (feature flag)
+	if (
+		currentRoute?.path === ROUTES.GET_STARTED &&
+		featureFlags?.find((e) => e.name === FeatureKeys.ONBOARDING_V3)?.active
+	) {
+		return <Redirect to={ROUTES.GET_STARTED_WITH_CLOUD} />;
+	}
+
 	// Main routing logic
 	if (currentRoute) {
 		const { isPrivate, key } = currentRoute;

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

@@ -2,6 +2,7 @@ import { ReactElement } from 'react';
 import { QueryClient, QueryClientProvider } from 'react-query';
 import { MemoryRouter, Route, Switch, useLocation } from 'react-router-dom';
 import { act, render, screen, waitFor } from '@testing-library/react';
+import { FeatureKeys } from 'constants/features';
 import { LOCALSTORAGE } from 'constants/localStorage';
 import { ORG_PREFERENCES } from 'constants/orgPreferences';
 import ROUTES from 'constants/routes';
@@ -1262,6 +1263,80 @@ describe('PrivateRoute', () => {
 		});
 	});
 
+	describe('Get Started Route Redirect', () => {
+		it('should redirect to GET_STARTED_WITH_CLOUD when on GET_STARTED and ONBOARDING_V3 feature flag is active', async () => {
+			renderPrivateRoute({
+				initialRoute: ROUTES.GET_STARTED,
+				appContext: {
+					isLoggedIn: true,
+					featureFlags: [
+						{
+							name: FeatureKeys.ONBOARDING_V3,
+							active: true,
+							usage: 0,
+							usage_limit: -1,
+							route: '',
+						},
+					],
+				},
+			});
+
+			await assertRedirectsTo(ROUTES.GET_STARTED_WITH_CLOUD);
+		});
+
+		it('should not redirect when on GET_STARTED and ONBOARDING_V3 feature flag is inactive', () => {
+			renderPrivateRoute({
+				initialRoute: ROUTES.GET_STARTED,
+				appContext: {
+					isLoggedIn: true,
+					featureFlags: [
+						{
+							name: FeatureKeys.ONBOARDING_V3,
+							active: false,
+							usage: 0,
+							usage_limit: -1,
+							route: '',
+						},
+					],
+				},
+			});
+
+			assertStaysOnRoute(ROUTES.GET_STARTED);
+		});
+
+		it('should not redirect when on GET_STARTED and ONBOARDING_V3 feature flag is not present', () => {
+			renderPrivateRoute({
+				initialRoute: ROUTES.GET_STARTED,
+				appContext: {
+					isLoggedIn: true,
+					featureFlags: [],
+				},
+			});
+
+			assertStaysOnRoute(ROUTES.GET_STARTED);
+		});
+
+		it('should not redirect when on different route even if ONBOARDING_V3 is active', () => {
+			renderPrivateRoute({
+				initialRoute: ROUTES.HOME,
+				appContext: {
+					isLoggedIn: true,
+					featureFlags: [
+						{
+							name: FeatureKeys.ONBOARDING_V3,
+							active: true,
+							usage: 0,
+							usage_limit: -1,
+							route: '',
+						},
+					],
+				},
+			});
+
+			assertStaysOnRoute(ROUTES.HOME);
+		});
+	});
+
 	describe('Loading States', () => {
 		it('should not redirect while license is still being fetched', () => {
 			renderPrivateRoute({
@@ -1421,16 +1496,16 @@ describe('PrivateRoute', () => {
 			await assertRedirectsTo(ROUTES.UN_AUTHORIZED);
 		});
 
-		it('should allow EDITOR to access /get-started-with-signoz-cloud route', () => {
+		it('should allow EDITOR to access /get-started route', () => {
 			renderPrivateRoute({
-				initialRoute: ROUTES.GET_STARTED_WITH_CLOUD,
+				initialRoute: ROUTES.GET_STARTED,
 				appContext: {
 					isLoggedIn: true,
 					user: createMockUser({ role: USER_ROLES.EDITOR as ROLES }),
 				},
 			});
 
-			assertStaysOnRoute(ROUTES.GET_STARTED_WITH_CLOUD);
+			assertStaysOnRoute(ROUTES.GET_STARTED);
 		});
 	});
 

frontend/src/AppRoutes/pageComponents.ts

@@ -57,6 +57,13 @@ export const TraceFilter = Loadable(
 	() => import(/* webpackChunkName: "Trace Filter Page" */ 'pages/Trace'),
 );
 
+export const TraceDetail = Loadable(
+	() =>
+		import(
+			/* webpackChunkName: "TraceDetail Page" */ 'pages/TraceDetailV2/index'
+		),
+);
+
 export const TraceDetailOldRedirect = Loadable(
 	() =>
 		import(
@@ -83,6 +90,14 @@ export const SettingsPage = Loadable(
 	() => import(/* webpackChunkName: "SettingsPage" */ 'pages/Settings'),
 );
 
+export const GettingStarted = Loadable(
+	() => import(/* webpackChunkName: "GettingStarted" */ 'pages/GettingStarted'),
+);
+
+export const Onboarding = Loadable(
+	() => import(/* webpackChunkName: "Onboarding" */ 'pages/OnboardingPage'),
+);
+
 export const OrgOnboarding = Loadable(
 	() => import(/* webpackChunkName: "OrgOnboarding" */ 'pages/OrgOnboarding'),
 );
@@ -322,17 +337,3 @@ export const AIAssistantPage = Loadable(
 			/* webpackChunkName: "AI Assistant Page" */ 'pages/AIAssistantPage/AIAssistantPage'
 		),
 );
-
-export const LLMObservabilityPage = Loadable(
-	() =>
-		import(
-			/* webpackChunkName: "LLM Observability Page" */ 'pages/LLMObservability'
-		),
-);
-
-export const LLMObservabilityModelPricingPage = Loadable(
-	() =>
-		import(
-			/* webpackChunkName: "LLM Observability Model Pricing Page" */ 'pages/LLMObservabilityModelPricing'
-		),
-);

frontend/src/AppRoutes/routes.ts

@@ -23,8 +23,6 @@ import {
 	IntegrationsDetailsPage,
 	LicensePage,
 	ListAllALertsPage,
-	LLMObservabilityPage,
-	LLMObservabilityModelPricingPage,
 	LiveLogs,
 	Login,
 	Logs,
@@ -35,6 +33,7 @@ import {
 	MeterExplorerPage,
 	MetricsExplorer,
 	OldLogsExplorer,
+	Onboarding,
 	OnboardingV2,
 	OrgOnboarding,
 	PasswordReset,
@@ -71,6 +70,13 @@ const routes: AppRoutes[] = [
 		isPrivate: false,
 		key: 'SIGN_UP',
 	},
+	{
+		path: ROUTES.GET_STARTED,
+		exact: false,
+		component: Onboarding,
+		isPrivate: true,
+		key: 'GET_STARTED',
+	},
 	{
 		path: ROUTES.GET_STARTED_WITH_CLOUD,
 		exact: false,
@@ -514,20 +520,6 @@ const routes: AppRoutes[] = [
 		key: 'AI_ASSISTANT',
 		isPrivate: true,
 	},
-	{
-		path: ROUTES.LLM_OBSERVABILITY_BASE,
-		exact: true,
-		component: LLMObservabilityPage,
-		key: 'LLM_OBSERVABILITY_BASE',
-		isPrivate: true,
-	},
-	{
-		path: ROUTES.LLM_OBSERVABILITY_MODEL_PRICING,
-		exact: true,
-		component: LLMObservabilityModelPricingPage,
-		key: 'LLM_OBSERVABILITY_MODEL_PRICING',
-		isPrivate: true,
-	},
 ];
 
 export const SUPPORT_ROUTE: AppRoutes = {

frontend/src/api/generated/services/inframonitoring/index.ts

@@ -4,22 +4,14 @@
  * * regenerate with 'pnpm generate:api'
  * SigNoz
  */
-import { useMutation, useQuery } from 'react-query';
+import { useMutation } from 'react-query';
 import type {
-	InvalidateOptions,
 	MutationFunction,
-	QueryClient,
-	QueryFunction,
-	QueryKey,
 	UseMutationOptions,
 	UseMutationResult,
-	UseQueryOptions,
-	UseQueryResult,
 } from 'react-query';
 
 import type {
-	GetChecks200,
-	GetChecksParams,
 	InframonitoringtypesPostableClustersDTO,
 	InframonitoringtypesPostableDaemonSetsDTO,
 	InframonitoringtypesPostableDeploymentsDTO,
@@ -47,94 +39,7 @@ import { GeneratedAPIInstance } from '../../../generatedAPIInstance';
 import type { ErrorType, BodyType } from '../../../generatedAPIInstance';
 
 /**
- * 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
- */
-export const getChecks = (params: GetChecksParams, signal?: AbortSignal) => {
-	return GeneratedAPIInstance<GetChecks200>({
-		url: `/api/v2/infra_monitoring/checks`,
-		method: 'GET',
-		params,
-		signal,
-	});
-};
-
-export const getGetChecksQueryKey = (params?: GetChecksParams) => {
-	return [
-		`/api/v2/infra_monitoring/checks`,
-		...(params ? [params] : []),
-	] as const;
-};
-
-export const getGetChecksQueryOptions = <
-	TData = Awaited<ReturnType<typeof getChecks>>,
-	TError = ErrorType<RenderErrorResponseDTO>,
->(
-	params: GetChecksParams,
-	options?: {
-		query?: UseQueryOptions<Awaited<ReturnType<typeof getChecks>>, TError, TData>;
-	},
-) => {
-	const { query: queryOptions } = options ?? {};
-
-	const queryKey = queryOptions?.queryKey ?? getGetChecksQueryKey(params);
-
-	const queryFn: QueryFunction<Awaited<ReturnType<typeof getChecks>>> = ({
-		signal,
-	}) => getChecks(params, signal);
-
-	return { queryKey, queryFn, ...queryOptions } as UseQueryOptions<
-		Awaited<ReturnType<typeof getChecks>>,
-		TError,
-		TData
-	> & { queryKey: QueryKey };
-};
-
-export type GetChecksQueryResult = NonNullable<
-	Awaited<ReturnType<typeof getChecks>>
->;
-export type GetChecksQueryError = ErrorType<RenderErrorResponseDTO>;
-
-/**
- * @summary Run Infra Monitoring Setup Checks
- */
-
-export function useGetChecks<
-	TData = Awaited<ReturnType<typeof getChecks>>,
-	TError = ErrorType<RenderErrorResponseDTO>,
->(
-	params: GetChecksParams,
-	options?: {
-		query?: UseQueryOptions<Awaited<ReturnType<typeof getChecks>>, TError, TData>;
-	},
-): UseQueryResult<TData, TError> & { queryKey: QueryKey } {
-	const queryOptions = getGetChecksQueryOptions(params, options);
-
-	const query = useQuery(queryOptions) as UseQueryResult<TData, TError> & {
-		queryKey: QueryKey;
-	};
-
-	return { ...query, queryKey: queryOptions.queryKey };
-}
-
-/**
- * @summary Run Infra Monitoring Setup Checks
- */
-export const invalidateGetChecks = async (
-	queryClient: QueryClient,
-	params: GetChecksParams,
-	options?: InvalidateOptions,
-): Promise<QueryClient> => {
-	await queryClient.invalidateQueries(
-		{ queryKey: getGetChecksQueryKey(params) },
-		options,
-	);
-
-	return queryClient;
-};
-
-/**
- * Returns a paginated list of Kubernetes clusters with key aggregated metrics derived by summing per-node values within the group: CPU usage, CPU allocatable, memory working set, memory allocatable. Each row also reports per-group nodeCountsByReadiness ({ ready, notReady } from each node's latest k8s.node.condition_ready value) and per-group podCountsByPhase ({ pending, running, succeeded, failed, unknown } from each pod's latest k8s.pod.phase value). Each cluster includes metadata attributes (k8s.cluster.name). The response type is 'list' for the default k8s.cluster.name grouping or 'grouped_list' for custom groupBy keys; in both modes every row aggregates nodes and pods in the group. Supports filtering via a filter expression, custom groupBy, ordering by cpu / cpu_allocatable / memory / memory_allocatable, and pagination via offset/limit. Also reports whether the requested time range falls before the data retention boundary. Numeric metric fields (clusterCPU, clusterCPUAllocatable, clusterMemory, clusterMemoryAllocatable) return -1 as a sentinel when no data is available for that field.
+ * Returns a paginated list of Kubernetes clusters with key aggregated metrics derived by summing per-node values within the group: CPU usage, CPU allocatable, memory working set, memory allocatable. Each row also reports per-group nodeCountsByReadiness ({ ready, notReady } from each node's latest k8s.node.condition_ready value) and per-group podCountsByPhase ({ pending, running, succeeded, failed, unknown } from each pod's latest k8s.pod.phase value). Each cluster includes metadata attributes (k8s.cluster.name). The response type is 'list' for the default k8s.cluster.name grouping or 'grouped_list' for custom groupBy keys; in both modes every row aggregates nodes and pods in the group. Supports filtering via a filter expression, custom groupBy, ordering by cpu / cpu_allocatable / memory / memory_allocatable, and pagination via offset/limit. Also reports missing required metrics and whether the requested time range falls before the data retention boundary. Numeric metric fields (clusterCPU, clusterCPUAllocatable, clusterMemory, clusterMemoryAllocatable) return -1 as a sentinel when no data is available for that field.
  * @summary List Clusters for Infra Monitoring
  */
 export const listClusters = (
@@ -217,7 +122,7 @@ export const useListClusters = <
 	return useMutation(getListClustersMutationOptions(options));
 };
 /**
- * Returns a paginated list of Kubernetes DaemonSets with key aggregated pod metrics: CPU usage and memory working set summed across pods owned by the daemonset, plus average CPU/memory request and limit utilization (daemonSetCPURequest, daemonSetCPULimit, daemonSetMemoryRequest, daemonSetMemoryLimit). Each row also reports the latest known node-level counters from kube-state-metrics: desiredNodes (k8s.daemonset.desired_scheduled_nodes, the number of nodes the daemonset wants to run on) and currentNodes (k8s.daemonset.current_scheduled_nodes, the number of nodes the daemonset currently runs on) — note these are node counts, not pod counts. It also reports per-group podCountsByPhase ({ pending, running, succeeded, failed, unknown } from each pod's latest k8s.pod.phase value). Each daemonset includes metadata attributes (k8s.daemonset.name, k8s.namespace.name, k8s.cluster.name). The response type is 'list' for the default k8s.daemonset.name grouping or 'grouped_list' for custom groupBy keys; in both modes every row aggregates pods owned by daemonsets in the group. Supports filtering via a filter expression, custom groupBy, ordering by cpu / cpu_request / cpu_limit / memory / memory_request / memory_limit / desired_nodes / current_nodes, and pagination via offset/limit. Also reports whether the requested time range falls before the data retention boundary. Numeric metric fields (daemonSetCPU, daemonSetCPURequest, daemonSetCPULimit, daemonSetMemory, daemonSetMemoryRequest, daemonSetMemoryLimit, desiredNodes, currentNodes) return -1 as a sentinel when no data is available for that field.
+ * Returns a paginated list of Kubernetes DaemonSets with key aggregated pod metrics: CPU usage and memory working set summed across pods owned by the daemonset, plus average CPU/memory request and limit utilization (daemonSetCPURequest, daemonSetCPULimit, daemonSetMemoryRequest, daemonSetMemoryLimit). Each row also reports the latest known node-level counters from kube-state-metrics: desiredNodes (k8s.daemonset.desired_scheduled_nodes, the number of nodes the daemonset wants to run on) and currentNodes (k8s.daemonset.current_scheduled_nodes, the number of nodes the daemonset currently runs on) — note these are node counts, not pod counts. It also reports per-group podCountsByPhase ({ pending, running, succeeded, failed, unknown } from each pod's latest k8s.pod.phase value). Each daemonset includes metadata attributes (k8s.daemonset.name, k8s.namespace.name, k8s.cluster.name). The response type is 'list' for the default k8s.daemonset.name grouping or 'grouped_list' for custom groupBy keys; in both modes every row aggregates pods owned by daemonsets in the group. Supports filtering via a filter expression, custom groupBy, ordering by cpu / cpu_request / cpu_limit / memory / memory_request / memory_limit / desired_nodes / current_nodes, and pagination via offset/limit. Also reports missing required metrics and whether the requested time range falls before the data retention boundary. Numeric metric fields (daemonSetCPU, daemonSetCPURequest, daemonSetCPULimit, daemonSetMemory, daemonSetMemoryRequest, daemonSetMemoryLimit, desiredNodes, currentNodes) return -1 as a sentinel when no data is available for that field.
  * @summary List DaemonSets for Infra Monitoring
  */
 export const listDaemonSets = (
@@ -300,7 +205,7 @@ export const useListDaemonSets = <
 	return useMutation(getListDaemonSetsMutationOptions(options));
 };
 /**
- * Returns a paginated list of Kubernetes Deployments with key aggregated pod metrics: CPU usage and memory working set summed across pods owned by the deployment, plus average CPU/memory request and limit utilization (deploymentCPURequest, deploymentCPULimit, deploymentMemoryRequest, deploymentMemoryLimit). Each row also reports the latest known desiredPods (k8s.deployment.desired) and availablePods (k8s.deployment.available) replica counts and per-group podCountsByPhase ({ pending, running, succeeded, failed, unknown } from each pod's latest k8s.pod.phase value). Each deployment includes metadata attributes (k8s.deployment.name, k8s.namespace.name, k8s.cluster.name). The response type is 'list' for the default k8s.deployment.name grouping or 'grouped_list' for custom groupBy keys; in both modes every row aggregates pods owned by deployments in the group. Supports filtering via a filter expression, custom groupBy, ordering by cpu / cpu_request / cpu_limit / memory / memory_request / memory_limit / desired_pods / available_pods, and pagination via offset/limit. Also reports whether the requested time range falls before the data retention boundary. Numeric metric fields (deploymentCPU, deploymentCPURequest, deploymentCPULimit, deploymentMemory, deploymentMemoryRequest, deploymentMemoryLimit, desiredPods, availablePods) return -1 as a sentinel when no data is available for that field.
+ * Returns a paginated list of Kubernetes Deployments with key aggregated pod metrics: CPU usage and memory working set summed across pods owned by the deployment, plus average CPU/memory request and limit utilization (deploymentCPURequest, deploymentCPULimit, deploymentMemoryRequest, deploymentMemoryLimit). Each row also reports the latest known desiredPods (k8s.deployment.desired) and availablePods (k8s.deployment.available) replica counts and per-group podCountsByPhase ({ pending, running, succeeded, failed, unknown } from each pod's latest k8s.pod.phase value). Each deployment includes metadata attributes (k8s.deployment.name, k8s.namespace.name, k8s.cluster.name). The response type is 'list' for the default k8s.deployment.name grouping or 'grouped_list' for custom groupBy keys; in both modes every row aggregates pods owned by deployments in the group. Supports filtering via a filter expression, custom groupBy, ordering by cpu / cpu_request / cpu_limit / memory / memory_request / memory_limit / desired_pods / available_pods, and pagination via offset/limit. Also reports missing required metrics and whether the requested time range falls before the data retention boundary. Numeric metric fields (deploymentCPU, deploymentCPURequest, deploymentCPULimit, deploymentMemory, deploymentMemoryRequest, deploymentMemoryLimit, desiredPods, availablePods) return -1 as a sentinel when no data is available for that field.
  * @summary List Deployments for Infra Monitoring
  */
 export const listDeployments = (
@@ -383,7 +288,7 @@ export const useListDeployments = <
 	return useMutation(getListDeploymentsMutationOptions(options));
 };
 /**
- * Returns a paginated list of hosts with key infrastructure metrics: CPU usage (%), memory usage (%), I/O wait (%), disk usage (%), and 15-minute load average. Each host includes its current status (active/inactive based on metrics reported in the last 10 minutes) and metadata attributes (e.g., os.type). Supports filtering via a filter expression, filtering by host status, custom groupBy to aggregate hosts by any attribute, ordering by any of the five metrics, and pagination via offset/limit. The response type is 'list' for the default host.name grouping or 'grouped_list' for custom groupBy keys. Also reports whether the requested time range falls before the data retention boundary. Numeric metric fields (cpu, memory, wait, load15, diskUsage) return -1 as a sentinel when no data is available for that field.
+ * Returns a paginated list of hosts with key infrastructure metrics: CPU usage (%), memory usage (%), I/O wait (%), disk usage (%), and 15-minute load average. Each host includes its current status (active/inactive based on metrics reported in the last 10 minutes) and metadata attributes (e.g., os.type). Supports filtering via a filter expression, filtering by host status, custom groupBy to aggregate hosts by any attribute, ordering by any of the five metrics, and pagination via offset/limit. The response type is 'list' for the default host.name grouping or 'grouped_list' for custom groupBy keys. Also reports missing required metrics and whether the requested time range falls before the data retention boundary. Numeric metric fields (cpu, memory, wait, load15, diskUsage) return -1 as a sentinel when no data is available for that field.
  * @summary List Hosts for Infra Monitoring
  */
 export const listHosts = (
@@ -466,7 +371,7 @@ export const useListHosts = <
 	return useMutation(getListHostsMutationOptions(options));
 };
 /**
- * Returns a paginated list of Kubernetes Jobs with key aggregated pod metrics: CPU usage and memory working set summed across pods owned by the job, plus average CPU/memory request and limit utilization (jobCPURequest, jobCPULimit, jobMemoryRequest, jobMemoryLimit). Each row also reports the latest known job-level counters from kube-state-metrics: desiredSuccessfulPods (k8s.job.desired_successful_pods, the target completion count), activePods (k8s.job.active_pods), failedPods (k8s.job.failed_pods, cumulative across the lifetime of the job), and successfulPods (k8s.job.successful_pods, cumulative). It also reports per-group podCountsByPhase ({ pending, running, succeeded, failed, unknown } from each pod's latest k8s.pod.phase value); note podCountsByPhase.failed (current pod-phase) is distinct from failedPods (cumulative job kube-state-metric). Each job includes metadata attributes (k8s.job.name, k8s.namespace.name, k8s.cluster.name). The response type is 'list' for the default k8s.job.name grouping or 'grouped_list' for custom groupBy keys; in both modes every row aggregates pods owned by jobs in the group. Supports filtering via a filter expression, custom groupBy, ordering by cpu / cpu_request / cpu_limit / memory / memory_request / memory_limit / desired_successful_pods / active_pods / failed_pods / successful_pods, and pagination via offset/limit. Also reports whether the requested time range falls before the data retention boundary. Numeric metric fields (jobCPU, jobCPURequest, jobCPULimit, jobMemory, jobMemoryRequest, jobMemoryLimit, desiredSuccessfulPods, activePods, failedPods, successfulPods) return -1 as a sentinel when no data is available for that field.
+ * Returns a paginated list of Kubernetes Jobs with key aggregated pod metrics: CPU usage and memory working set summed across pods owned by the job, plus average CPU/memory request and limit utilization (jobCPURequest, jobCPULimit, jobMemoryRequest, jobMemoryLimit). Each row also reports the latest known job-level counters from kube-state-metrics: desiredSuccessfulPods (k8s.job.desired_successful_pods, the target completion count), activePods (k8s.job.active_pods), failedPods (k8s.job.failed_pods, cumulative across the lifetime of the job), and successfulPods (k8s.job.successful_pods, cumulative). It also reports per-group podCountsByPhase ({ pending, running, succeeded, failed, unknown } from each pod's latest k8s.pod.phase value); note podCountsByPhase.failed (current pod-phase) is distinct from failedPods (cumulative job kube-state-metric). Each job includes metadata attributes (k8s.job.name, k8s.namespace.name, k8s.cluster.name). The response type is 'list' for the default k8s.job.name grouping or 'grouped_list' for custom groupBy keys; in both modes every row aggregates pods owned by jobs in the group. Supports filtering via a filter expression, custom groupBy, ordering by cpu / cpu_request / cpu_limit / memory / memory_request / memory_limit / desired_successful_pods / active_pods / failed_pods / successful_pods, and pagination via offset/limit. Also reports missing required metrics and whether the requested time range falls before the data retention boundary. Numeric metric fields (jobCPU, jobCPURequest, jobCPULimit, jobMemory, jobMemoryRequest, jobMemoryLimit, desiredSuccessfulPods, activePods, failedPods, successfulPods) return -1 as a sentinel when no data is available for that field.
  * @summary List Jobs for Infra Monitoring
  */
 export const listJobs = (
@@ -549,7 +454,7 @@ export const useListJobs = <
 	return useMutation(getListJobsMutationOptions(options));
 };
 /**
- * Returns a paginated list of Kubernetes namespaces with key aggregated pod metrics: CPU usage and memory working set (summed across pods in the group), plus per-group podCountsByPhase ({ pending, running, succeeded, failed, unknown } from each pod's latest k8s.pod.phase value in the window). Each namespace includes metadata attributes (k8s.namespace.name, k8s.cluster.name). The response type is 'list' for the default k8s.namespace.name grouping or 'grouped_list' for custom groupBy keys; in both modes every row aggregates pods in the group. Supports filtering via a filter expression, custom groupBy, ordering by cpu / memory, and pagination via offset/limit. Also reports whether the requested time range falls before the data retention boundary. Numeric metric fields (namespaceCPU, namespaceMemory) return -1 as a sentinel when no data is available for that field.
+ * Returns a paginated list of Kubernetes namespaces with key aggregated pod metrics: CPU usage and memory working set (summed across pods in the group), plus per-group podCountsByPhase ({ pending, running, succeeded, failed, unknown } from each pod's latest k8s.pod.phase value in the window). Each namespace includes metadata attributes (k8s.namespace.name, k8s.cluster.name). The response type is 'list' for the default k8s.namespace.name grouping or 'grouped_list' for custom groupBy keys; in both modes every row aggregates pods in the group. Supports filtering via a filter expression, custom groupBy, ordering by cpu / memory, and pagination via offset/limit. Also reports missing required metrics and whether the requested time range falls before the data retention boundary. Numeric metric fields (namespaceCPU, namespaceMemory) return -1 as a sentinel when no data is available for that field.
  * @summary List Namespaces for Infra Monitoring
  */
 export const listNamespaces = (
@@ -632,7 +537,7 @@ export const useListNamespaces = <
 	return useMutation(getListNamespacesMutationOptions(options));
 };
 /**
- * Returns a paginated list of Kubernetes nodes with key metrics: CPU usage, CPU allocatable, memory working set, memory allocatable, per-group nodeCountsByReadiness ({ ready, notReady } from each node's latest k8s.node.condition_ready in the window) and per-group podCountsByPhase ({ pending, running, succeeded, failed, unknown } for pods scheduled on the listed nodes). Each node includes metadata attributes (k8s.node.uid, k8s.cluster.name). The response type is 'list' for the default k8s.node.name grouping (each row is one node with its current condition string: ready / not_ready / no_data) or 'grouped_list' for custom groupBy keys (each row aggregates nodes in the group; condition stays no_data). Supports filtering via a filter expression, custom groupBy, ordering by cpu / cpu_allocatable / memory / memory_allocatable, and pagination via offset/limit. Also reports whether the requested time range falls before the data retention boundary. Numeric metric fields (nodeCPU, nodeCPUAllocatable, nodeMemory, nodeMemoryAllocatable) return -1 as a sentinel when no data is available for that field.
+ * Returns a paginated list of Kubernetes nodes with key metrics: CPU usage, CPU allocatable, memory working set, memory allocatable, per-group nodeCountsByReadiness ({ ready, notReady } from each node's latest k8s.node.condition_ready in the window) and per-group podCountsByPhase ({ pending, running, succeeded, failed, unknown } for pods scheduled on the listed nodes). Each node includes metadata attributes (k8s.node.uid, k8s.cluster.name). The response type is 'list' for the default k8s.node.name grouping (each row is one node with its current condition string: ready / not_ready / no_data) or 'grouped_list' for custom groupBy keys (each row aggregates nodes in the group; condition stays no_data). Supports filtering via a filter expression, custom groupBy, ordering by cpu / cpu_allocatable / memory / memory_allocatable, and pagination via offset/limit. Also reports missing required metrics and whether the requested time range falls before the data retention boundary. Numeric metric fields (nodeCPU, nodeCPUAllocatable, nodeMemory, nodeMemoryAllocatable) return -1 as a sentinel when no data is available for that field.
  * @summary List Nodes for Infra Monitoring
  */
 export const listNodes = (
@@ -715,7 +620,7 @@ export const useListNodes = <
 	return useMutation(getListNodesMutationOptions(options));
 };
 /**
- * Returns a paginated list of Kubernetes pods with key metrics: CPU usage, CPU request/limit utilization, memory working set, memory request/limit utilization, current pod phase (pending/running/succeeded/failed/unknown/no_data), and pod age (ms since start time). Each pod includes metadata attributes (namespace, node, workload owner such as deployment/statefulset/daemonset/job/cronjob, cluster). Supports filtering via a filter expression, custom groupBy to aggregate pods by any attribute, ordering by any of the six metrics (cpu, cpu_request, cpu_limit, memory, memory_request, memory_limit), and pagination via offset/limit. The response type is 'list' for the default k8s.pod.uid grouping (each row is one pod with its current phase) or 'grouped_list' for custom groupBy keys (each row aggregates pods in the group with per-phase counts under podCountsByPhase: { pending, running, succeeded, failed, unknown } derived from each pod's latest phase in the window). Also reports whether the requested time range falls before the data retention boundary. Numeric metric fields (podCPU, podCPURequest, podCPULimit, podMemory, podMemoryRequest, podMemoryLimit, podAge) return -1 as a sentinel when no data is available for that field.
+ * Returns a paginated list of Kubernetes pods with key metrics: CPU usage, CPU request/limit utilization, memory working set, memory request/limit utilization, current pod phase (pending/running/succeeded/failed/unknown/no_data), and pod age (ms since start time). Each pod includes metadata attributes (namespace, node, workload owner such as deployment/statefulset/daemonset/job/cronjob, cluster). Supports filtering via a filter expression, custom groupBy to aggregate pods by any attribute, ordering by any of the six metrics (cpu, cpu_request, cpu_limit, memory, memory_request, memory_limit), and pagination via offset/limit. The response type is 'list' for the default k8s.pod.uid grouping (each row is one pod with its current phase) or 'grouped_list' for custom groupBy keys (each row aggregates pods in the group with per-phase counts under podCountsByPhase: { pending, running, succeeded, failed, unknown } derived from each pod's latest phase in the window). Also reports missing required metrics and whether the requested time range falls before the data retention boundary. Numeric metric fields (podCPU, podCPURequest, podCPULimit, podMemory, podMemoryRequest, podMemoryLimit, podAge) return -1 as a sentinel when no data is available for that field.
  * @summary List Pods for Infra Monitoring
  */
 export const listPods = (
@@ -798,7 +703,7 @@ export const useListPods = <
 	return useMutation(getListPodsMutationOptions(options));
 };
 /**
- * Returns a paginated list of Kubernetes persistent volume claims (PVCs) with key volume metrics: available bytes, capacity bytes, usage (capacity - available), inodes, free inodes, and used inodes. Each row also includes metadata attributes (k8s.persistentvolumeclaim.name, k8s.pod.uid, k8s.pod.name, k8s.namespace.name, k8s.node.name, k8s.statefulset.name, k8s.cluster.name). Supports filtering via a filter expression, custom groupBy to aggregate volumes by any attribute, ordering by any of the six metrics (available, capacity, usage, inodes, inodes_free, inodes_used), and pagination via offset/limit. The response type is 'list' for the default k8s.persistentvolumeclaim.name grouping or 'grouped_list' for custom groupBy keys; in both modes every row aggregates volumes in the group. Also reports whether the requested time range falls before the data retention boundary. Numeric metric fields (volumeAvailable, volumeCapacity, volumeUsage, volumeInodes, volumeInodesFree, volumeInodesUsed) return -1 as a sentinel when no data is available for that field.
+ * Returns a paginated list of Kubernetes persistent volume claims (PVCs) with key volume metrics: available bytes, capacity bytes, usage (capacity - available), inodes, free inodes, and used inodes. Each row also includes metadata attributes (k8s.persistentvolumeclaim.name, k8s.pod.uid, k8s.pod.name, k8s.namespace.name, k8s.node.name, k8s.statefulset.name, k8s.cluster.name). Supports filtering via a filter expression, custom groupBy to aggregate volumes by any attribute, ordering by any of the six metrics (available, capacity, usage, inodes, inodes_free, inodes_used), and pagination via offset/limit. The response type is 'list' for the default k8s.persistentvolumeclaim.name grouping or 'grouped_list' for custom groupBy keys; in both modes every row aggregates volumes in the group. Also reports missing required metrics and whether the requested time range falls before the data retention boundary. Numeric metric fields (volumeAvailable, volumeCapacity, volumeUsage, volumeInodes, volumeInodesFree, volumeInodesUsed) return -1 as a sentinel when no data is available for that field.
  * @summary List Volumes for Infra Monitoring
  */
 export const listVolumes = (
@@ -881,7 +786,7 @@ export const useListVolumes = <
 	return useMutation(getListVolumesMutationOptions(options));
 };
 /**
- * Returns a paginated list of Kubernetes StatefulSets with key aggregated pod metrics: CPU usage and memory working set summed across pods owned by the statefulset, plus average CPU/memory request and limit utilization (statefulSetCPURequest, statefulSetCPULimit, statefulSetMemoryRequest, statefulSetMemoryLimit). Each row also reports the latest known desiredPods (k8s.statefulset.desired_pods) and currentPods (k8s.statefulset.current_pods) replica counts and per-group podCountsByPhase ({ pending, running, succeeded, failed, unknown } from each pod's latest k8s.pod.phase value). Each statefulset includes metadata attributes (k8s.statefulset.name, k8s.namespace.name, k8s.cluster.name). The response type is 'list' for the default k8s.statefulset.name grouping or 'grouped_list' for custom groupBy keys; in both modes every row aggregates pods owned by statefulsets in the group. Supports filtering via a filter expression, custom groupBy, ordering by cpu / cpu_request / cpu_limit / memory / memory_request / memory_limit / desired_pods / current_pods, and pagination via offset/limit. Also reports whether the requested time range falls before the data retention boundary. Numeric metric fields (statefulSetCPU, statefulSetCPURequest, statefulSetCPULimit, statefulSetMemory, statefulSetMemoryRequest, statefulSetMemoryLimit, desiredPods, currentPods) return -1 as a sentinel when no data is available for that field.
+ * Returns a paginated list of Kubernetes StatefulSets with key aggregated pod metrics: CPU usage and memory working set summed across pods owned by the statefulset, plus average CPU/memory request and limit utilization (statefulSetCPURequest, statefulSetCPULimit, statefulSetMemoryRequest, statefulSetMemoryLimit). Each row also reports the latest known desiredPods (k8s.statefulset.desired_pods) and currentPods (k8s.statefulset.current_pods) replica counts and per-group podCountsByPhase ({ pending, running, succeeded, failed, unknown } from each pod's latest k8s.pod.phase value). Each statefulset includes metadata attributes (k8s.statefulset.name, k8s.namespace.name, k8s.cluster.name). The response type is 'list' for the default k8s.statefulset.name grouping or 'grouped_list' for custom groupBy keys; in both modes every row aggregates pods owned by statefulsets in the group. Supports filtering via a filter expression, custom groupBy, ordering by cpu / cpu_request / cpu_limit / memory / memory_request / memory_limit / desired_pods / current_pods, and pagination via offset/limit. Also reports missing required metrics and whether the requested time range falls before the data retention boundary. Numeric metric fields (statefulSetCPU, statefulSetCPURequest, statefulSetCPULimit, statefulSetMemory, statefulSetMemoryRequest, statefulSetMemoryLimit, desiredPods, currentPods) return -1 as a sentinel when no data is available for that field.
  * @summary List StatefulSets for Infra Monitoring
  */
 export const listStatefulSets = (

frontend/src/api/trace/getTraceV2.tsx

@@ -0,0 +1,35 @@
+import { ApiV2Instance as axios } from 'api';
+import { omit } from 'lodash-es';
+import { ErrorResponse, SuccessResponse } from 'types/api';
+import {
+	GetTraceV2PayloadProps,
+	GetTraceV2SuccessResponse,
+} from 'types/api/trace/getTraceV2';
+
+const getTraceV2 = async (
+	props: GetTraceV2PayloadProps,
+): Promise<SuccessResponse<GetTraceV2SuccessResponse> | ErrorResponse> => {
+	let uncollapsedSpans = [...props.uncollapsedSpans];
+	if (!props.isSelectedSpanIDUnCollapsed) {
+		uncollapsedSpans = uncollapsedSpans.filter(
+			(node) => node !== props.selectedSpanId,
+		);
+	}
+	const postData: GetTraceV2PayloadProps = {
+		...props,
+		uncollapsedSpans,
+	};
+	const response = await axios.post<GetTraceV2SuccessResponse>(
+		`/traces/waterfall/${props.traceId}`,
+		omit(postData, 'traceId'),
+	);
+
+	return {
+		statusCode: 200,
+		error: null,
+		message: 'Success',
+		payload: response.data,
+	};
+};
+
+export default getTraceV2;

frontend/src/api/trace/getTraceV4.tsx

@@ -41,7 +41,6 @@ const getTraceV4 = async (
 	> & { spans: WireSpan[] | null };
 
 	// Derive 'service.name' from resource for convenience — only derived field
-	// todo(tech-debt): to remove use of this and to directly use service.name from resources.
 	const spans: SpanV3[] = (rawPayload.spans || []).map((span) => ({
 		...span,
 		'service.name': span.resource?.['service.name'] || '',

frontend/src/assets/TraceDetail/Flamegraph.tsx

@@ -0,0 +1,25 @@
+import { Color } from '@signozhq/design-tokens';
+import { useIsDarkMode } from 'hooks/useDarkMode';
+
+function FlamegraphImg(): JSX.Element {
+	const isDarkMode = useIsDarkMode();
+	return (
+		<svg
+			width="14"
+			height="14"
+			viewBox="0 0 24 24"
+			fill="none"
+			xmlns="http://www.w3.org/2000/svg"
+		>
+			<path
+				d="M8 3c1 3 2.5 3.5 3.5 4.5A5 5 0 0113 11a5 5 0 11-10 0c0-.3 0-.6.1-.9a2 2 0 103.3-2C4 5.5 7 3 8 3zM21 4h-8M20 14.5h-3M20 9.5h-3M21 20H4"
+				stroke={isDarkMode ? Color.BG_VANILLA_100 : Color.BG_INK_500}
+				strokeWidth="2"
+				strokeLinecap="round"
+				strokeLinejoin="round"
+			/>
+		</svg>
+	);
+}
+
+export default FlamegraphImg;

frontend/src/components/ErrorInPlace/ErrorInPlace.tsx

@@ -21,8 +21,6 @@ interface ErrorInPlaceProps {
 	width?: string | number;
 	/** Custom content instead of ErrorContent */
 	children?: ReactNode;
-	/** Test ID for testing */
-	'data-testid'?: string;
 }
 
 /**
@@ -46,7 +44,6 @@ function ErrorInPlace({
 	height = '100%',
 	width = '100%',
 	children,
-	'data-testid': dataTestId,
 }: ErrorInPlaceProps): JSX.Element {
 	const containerStyle: React.CSSProperties = {
 		display: 'flex',
@@ -62,11 +59,7 @@ function ErrorInPlace({
 	};
 
 	return (
-		<div
-			className={`error-in-place ${className}`.trim()}
-			style={containerStyle}
-			data-testid={dataTestId}
-		>
+		<div className={`error-in-place ${className}`.trim()} style={containerStyle}>
 			{children || <ErrorContent error={error} />}
 		</div>
 	);

frontend/src/components/MessagingQueueHealthCheck/AttributeCheckList.tsx

@@ -62,13 +62,13 @@ function ErrorTitleAndKey({
 
 		switch (parentTitle) {
 			case 'Consumers':
-				link = `${ROUTES.GET_STARTED_WITH_CLOUD}?${QueryParams.getStartedSource}=self-hosted-kafka&${QueryParams.getStartedSourceService}=${MessagingQueueHealthCheckService.Consumers}`;
+				link = `${ROUTES.GET_STARTED_APPLICATION_MONITORING}?${QueryParams.getStartedSource}=kafka&${QueryParams.getStartedSourceService}=${MessagingQueueHealthCheckService.Consumers}`;
 				break;
 			case 'Producers':
-				link = `${ROUTES.GET_STARTED_WITH_CLOUD}?${QueryParams.getStartedSource}=self-hosted-kafka&${QueryParams.getStartedSourceService}=${MessagingQueueHealthCheckService.Producers}`;
+				link = `${ROUTES.GET_STARTED_APPLICATION_MONITORING}?${QueryParams.getStartedSource}=kafka&${QueryParams.getStartedSourceService}=${MessagingQueueHealthCheckService.Producers}`;
 				break;
 			case 'Kafka':
-				link = `${ROUTES.GET_STARTED_WITH_CLOUD}?${QueryParams.getStartedSource}=self-hosted-kafka&${QueryParams.getStartedSourceService}=${MessagingQueueHealthCheckService.Kafka}`;
+				link = `${ROUTES.GET_STARTED_INFRASTRUCTURE_MONITORING}?${QueryParams.getStartedSource}=kafka&${QueryParams.getStartedSourceService}=${MessagingQueueHealthCheckService.Kafka}`;
 				break;
 			default:
 				link = '';

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

@@ -5,9 +5,13 @@ describe('PermissionDeniedFullPage', () => {
 	it('renders the title and subtitle with the permissionName interpolated', () => {
 		render(<PermissionDeniedFullPage permissionName="serviceaccount:list" />);
 
-		expect(screen.getByText('Uh-oh! You are not authorized')).toBeInTheDocument();
+		expect(
+			screen.getByText("Uh-oh! You don't have permission to view this page."),
+		).toBeInTheDocument();
 		expect(screen.getByText(/serviceaccount:list/)).toBeInTheDocument();
-		expect(screen.getByText(/is not authorized to perform/)).toBeInTheDocument();
+		expect(
+			screen.getByText(/Please ask your SigNoz administrator to grant access/),
+		).toBeInTheDocument();
 	});
 
 	it('renders with a different permissionName', () => {

frontend/src/components/PermissionDeniedFullPage/PermissionDeniedFullPage.tsx

@@ -2,7 +2,6 @@ import { CircleSlash2 } from '@signozhq/icons';
 
 import styles from './PermissionDeniedFullPage.module.scss';
 import { Style } from '@signozhq/design-tokens';
-import { useAppContext } from 'providers/App/App';
 
 interface PermissionDeniedFullPageProps {
 	permissionName: string;
@@ -11,18 +10,18 @@ interface PermissionDeniedFullPageProps {
 function PermissionDeniedFullPage({
 	permissionName,
 }: PermissionDeniedFullPageProps): JSX.Element {
-	const { user } = useAppContext();
-
 	return (
 		<div className={styles.container}>
 			<div className={styles.content}>
 				<span className={styles.icon}>
 					<CircleSlash2 color={Style.CALLOUT_WARNING_TITLE} size={14} />
 				</span>
-				<p className={styles.title}>Uh-oh! You are not authorized</p>
+				<p className={styles.title}>
+					Uh-oh! You don&apos;t have permission to view this page.
+				</p>
 				<p className={styles.subtitle}>
-					<code className={styles.permission}>user/{user.id}</code> is not authorized
-					to perform <code className={styles.permission}>{permissionName}</code>
+					You need <code className={styles.permission}>{permissionName}</code> to
+					view this page. Please ask your SigNoz administrator to grant access.
 				</p>
 			</div>
 		</div>

frontend/src/components/ServiceAccountDrawer/OverviewTab.tsx

@@ -1,9 +1,7 @@
-import { useCallback, useEffect, useState } from 'react';
-import { Check, Copy, LockKeyhole } from '@signozhq/icons';
+import { useCallback } from 'react';
+import { LockKeyhole } from '@signozhq/icons';
 import { Badge } from '@signozhq/ui/badge';
-import { Button } from '@signozhq/ui/button';
 import { Input } from '@signozhq/ui/input';
-import { useCopyToClipboard } from 'react-use';
 import type { AuthtypesRoleDTO } from 'api/generated/services/sigNoz.schemas';
 import AuthZTooltip from 'components/AuthZTooltip/AuthZTooltip';
 import RolesSelect from 'components/RolesSelect';
@@ -48,23 +46,6 @@ function OverviewTab({
 	saveErrors = [],
 }: OverviewTabProps): JSX.Element {
 	const { formatTimezoneAdjustedTimestamp } = useTimezone();
-	const [, copyToClipboard] = useCopyToClipboard();
-	const [hasCopiedId, setHasCopiedId] = useState(false);
-
-	const handleCopyId = useCallback((): void => {
-		if (account.id) {
-			copyToClipboard(account.id);
-			setHasCopiedId(true);
-		}
-	}, [account.id, copyToClipboard]);
-
-	useEffect(() => {
-		if (hasCopiedId) {
-			const timer = setTimeout(() => setHasCopiedId(false), 2000);
-			return (): void => clearTimeout(timer);
-		}
-		return undefined;
-	}, [hasCopiedId]);
 
 	const formatTimestamp = useCallback(
 		(ts: string | null | undefined): string => {
@@ -112,17 +93,6 @@ function OverviewTab({
 				</label>
 				<div className="sa-drawer__input-wrapper sa-drawer__input-wrapper--disabled">
 					<span className="sa-drawer__input-text">{account.id || '—'}</span>
-					{account.id && (
-						<Button
-							variant="link"
-							color="secondary"
-							onClick={handleCopyId}
-							className="sa-drawer__copy-btn"
-							data-testid="copy-id-btn"
-						>
-							{hasCopiedId ? <Check size={14} /> : <Copy size={14} />}
-						</Button>
-					)}
 					<LockKeyhole size={14} className="sa-drawer__lock-icon" />
 				</div>
 			</div>

frontend/src/components/ServiceAccountDrawer/ServiceAccountDrawer.styles.scss

@@ -203,19 +203,6 @@
 		opacity: 0.6;
 	}
 
-	&__copy-btn {
-		flex-shrink: 0;
-		padding: 0;
-		height: auto;
-		min-height: auto;
-		color: var(--foreground);
-		opacity: 0.6;
-
-		&:hover {
-			opacity: 1;
-		}
-	}
-
 	&__disabled-roles {
 		display: flex;
 		flex-wrap: wrap;

frontend/src/components/ServiceAccountDrawer/ServiceAccountDrawer.tsx

@@ -16,6 +16,7 @@ import {
 import type { RenderErrorResponseDTO } from 'api/generated/services/sigNoz.schemas';
 import { AxiosError } from 'axios';
 import ErrorInPlace from 'components/ErrorInPlace/ErrorInPlace';
+import { GuardAuthZ } from 'components/GuardAuthZ/GuardAuthZ';
 import PermissionDeniedCallout from 'components/PermissionDeniedCallout/PermissionDeniedCallout';
 import { useRoles } from 'components/RolesSelect';
 import { SA_QUERY_PARAMS } from 'container/ServiceAccountsSettings/constants';
@@ -476,9 +477,15 @@ function ServiceAccountDrawer({
 					!isAccountLoading &&
 					!isAccountError &&
 					selectedAccountId && (
-						<>
-							{activeTab === ServiceAccountDrawerTab.Overview &&
-								(canRead && account ? (
+						<GuardAuthZ
+							relation="read"
+							object={`serviceaccount:${selectedAccountId}`}
+							fallbackOnNoPermissions={(): JSX.Element => (
+								<PermissionDeniedCallout permissionName="serviceaccount:read" />
+							)}
+						>
+							<>
+								{activeTab === ServiceAccountDrawerTab.Overview && account && (
 									<OverviewTab
 										account={account}
 										localName={localName}
@@ -497,24 +504,23 @@ function ServiceAccountDrawer({
 										onRefetchRoles={refetchRoles}
 										saveErrors={saveErrors}
 									/>
-								) : (
-									<PermissionDeniedCallout permissionName="serviceaccount:read" />
-								))}
-							{activeTab === ServiceAccountDrawerTab.Keys &&
-								(canListKeys ? (
-									<KeysTab
-										keys={keys}
-										isLoading={keysLoading}
-										isDisabled={isDeleted}
-										canUpdate={canUpdate}
-										accountId={selectedAccountId}
-										currentPage={keysPage}
-										pageSize={PAGE_SIZE}
-									/>
-								) : (
-									<PermissionDeniedCallout permissionName="factor-api-key:list" />
-								))}
-						</>
+								)}
+								{activeTab === ServiceAccountDrawerTab.Keys &&
+									(canListKeys ? (
+										<KeysTab
+											keys={keys}
+											isLoading={keysLoading}
+											isDisabled={isDeleted}
+											canUpdate={canUpdate}
+											accountId={selectedAccountId}
+											currentPage={keysPage}
+											pageSize={PAGE_SIZE}
+										/>
+									) : (
+										<PermissionDeniedCallout permissionName="factor-api-key:list" />
+									))}
+							</>
+						</GuardAuthZ>
 					)}
 			</div>
 		</div>

frontend/src/components/SpanHoverCard/SpanHoverCard.styles.scss

@@ -0,0 +1,106 @@
+.span-hover-card {
+	.ant-popover-inner {
+		background: linear-gradient(
+			139deg,
+			color-mix(in srgb, var(--card) 32%, transparent) 0%,
+			color-mix(in srgb, var(--card) 36%, transparent) 98.68%
+		);
+		padding: 12px 16px;
+		border: 1px solid var(--l1-border);
+
+		&::before {
+			content: '';
+			position: absolute;
+			top: 0;
+			left: 0;
+			right: 0;
+			bottom: 0;
+			background: linear-gradient(
+				139deg,
+				color-mix(in srgb, var(--card) 32%, transparent) 0%,
+				color-mix(in srgb, var(--card) 36%, transparent) 98.68%
+			);
+			backdrop-filter: blur(20px);
+			border-radius: 4px;
+			z-index: -1;
+			will-change: background-color, backdrop-filter;
+		}
+	}
+
+	&__title {
+		display: flex;
+		flex-direction: column;
+		gap: 0.25rem;
+		margin-bottom: 0.5rem;
+	}
+
+	&__operation {
+		color: var(--l1-foreground);
+		font-size: 12px;
+		font-weight: 500;
+		line-height: 20px;
+		letter-spacing: 0.48px;
+	}
+
+	&__service {
+		font-size: 0.875rem;
+		color: var(--muted-foreground);
+		font-weight: 400;
+	}
+
+	&__error {
+		font-size: 0.75rem;
+		color: var(--danger-background);
+		font-weight: 500;
+	}
+
+	&__row {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		margin-top: 8px;
+		gap: 16px;
+	}
+
+	&__label {
+		color: var(--muted-foreground);
+		font-size: 12px;
+		font-weight: 500;
+		line-height: 20px;
+	}
+
+	&__value {
+		color: var(--l1-foreground);
+		font-size: 12px;
+		font-weight: 500;
+		line-height: 20px;
+		text-align: right;
+	}
+
+	&__relative-time {
+		display: flex;
+		align-items: center;
+		margin-top: 4px;
+		gap: 8px;
+		border-radius: 1px 0 0 1px;
+		background: linear-gradient(
+			90deg,
+			hsla(358, 75%, 59%, 0.2) 0%,
+			transparent 100%
+		);
+
+		&-icon {
+			width: 2px;
+			height: 20px;
+			flex-shrink: 0;
+			border-radius: 2px;
+			background: var(--danger-background);
+		}
+	}
+
+	&__relative-text {
+		color: var(--bg-cherry-300);
+		font-size: 12px;
+		line-height: 20px;
+	}
+}

frontend/src/components/SpanHoverCard/SpanHoverCard.tsx

@@ -0,0 +1,103 @@
+import { ReactNode } from 'react';
+import { Popover } from 'antd';
+import { Typography } from '@signozhq/ui/typography';
+import { DATE_TIME_FORMATS } from 'constants/dateTimeFormats';
+import { convertTimeToRelevantUnit } from 'container/TraceDetail/utils';
+import dayjs from 'dayjs';
+import { useTimezone } from 'providers/Timezone';
+import { Span } from 'types/api/trace/getTraceV2';
+import { toFixed } from 'utils/toFixed';
+
+import './SpanHoverCard.styles.scss';
+
+interface ITraceMetadata {
+	startTime: number;
+	endTime: number;
+}
+
+interface SpanHoverCardProps {
+	span: Span;
+	traceMetadata: ITraceMetadata;
+	children: ReactNode;
+}
+
+function SpanHoverCard({
+	span,
+	traceMetadata,
+	children,
+}: SpanHoverCardProps): JSX.Element {
+	const duration = span.durationNano / 1e6; // Convert nanoseconds to milliseconds
+	const { time: formattedDuration, timeUnitName } =
+		convertTimeToRelevantUnit(duration);
+
+	const { timezone } = useTimezone();
+
+	// Calculate relative start time from trace start
+	const relativeStartTime = span.timestamp - traceMetadata.startTime;
+	const { time: relativeTime, timeUnitName: relativeTimeUnit } =
+		convertTimeToRelevantUnit(relativeStartTime);
+
+	// Format absolute start time
+	const startTimeFormatted = dayjs(span.timestamp)
+		.tz(timezone.value)
+		.format(DATE_TIME_FORMATS.DD_MMM_YYYY_HH_MM_SS);
+
+	const getContent = (): JSX.Element => (
+		<div className="span-hover-card">
+			<div className="span-hover-card__row">
+				<Typography.Text className="span-hover-card__label">
+					Duration:
+				</Typography.Text>
+				<Typography.Text className="span-hover-card__value">
+					{toFixed(formattedDuration, 2)}
+					{timeUnitName}
+				</Typography.Text>
+			</div>
+			<div className="span-hover-card__row">
+				<Typography.Text className="span-hover-card__label">
+					Events:
+				</Typography.Text>
+				<Typography.Text className="span-hover-card__value">
+					{span.event?.length || 0}
+				</Typography.Text>
+			</div>
+			<div className="span-hover-card__row">
+				<Typography.Text className="span-hover-card__label">
+					Start time:
+				</Typography.Text>
+				<Typography.Text className="span-hover-card__value">
+					{startTimeFormatted}
+				</Typography.Text>
+			</div>
+			<div className="span-hover-card__relative-time">
+				<div className="span-hover-card__relative-time-icon" />
+				<Typography.Text className="span-hover-card__relative-text">
+					{toFixed(relativeTime, 2)}
+					{relativeTimeUnit} after trace start
+				</Typography.Text>
+			</div>
+		</div>
+	);
+
+	return (
+		<Popover
+			title={
+				<div className="span-hover-card__title">
+					<Typography.Text className="span-hover-card__operation">
+						{span.name}
+					</Typography.Text>
+				</div>
+			}
+			mouseEnterDelay={0.2}
+			content={getContent()}
+			trigger="hover"
+			rootClassName="span-hover-card"
+			autoAdjustOverflow
+			arrow={false}
+		>
+			{children}
+		</Popover>
+	);
+}
+
+export default SpanHoverCard;

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

@@ -0,0 +1,291 @@
+import { act, fireEvent, render, screen } from '@testing-library/react';
+import { TimezoneContextType } from 'providers/Timezone';
+import { Span } from 'types/api/trace/getTraceV2';
+
+import SpanHoverCard from '../SpanHoverCard';
+
+// Mock timezone provider so SpanHoverCard can use useTimezone without a real context
+jest.mock('providers/Timezone', () => ({
+	__esModule: true,
+	useTimezone: (): TimezoneContextType => ({
+		timezone: {
+			name: 'Coordinated Universal Time — UTC, GMT',
+			value: 'UTC',
+			offset: 'UTC',
+			searchIndex: 'UTC',
+		},
+		browserTimezone: {
+			name: 'Coordinated Universal Time — UTC, GMT',
+			value: 'UTC',
+			offset: 'UTC',
+			searchIndex: 'UTC',
+		},
+		updateTimezone: jest.fn(),
+		formatTimezoneAdjustedTimestamp: jest.fn(() => 'mock-date'),
+		isAdaptationEnabled: true,
+		setIsAdaptationEnabled: jest.fn(),
+	}),
+}));
+
+// Mock dayjs for testing, including timezone helpers used in timezoneUtils
+jest.mock('dayjs', () => {
+	const mockDayjsInstance: any = {};
+
+	mockDayjsInstance.format = jest.fn((formatString: string) =>
+		// Match the DD_MMM_YYYY_HH_MM_SS format: 'DD MMM YYYY, HH:mm:ss'
+		formatString === 'DD MMM YYYY, HH:mm:ss'
+			? '15 Mar 2024, 14:23:45'
+			: 'mock-date',
+	);
+
+	// Support chaining: dayjs().tz(timezone).format(...) and dayjs().tz(timezone).utcOffset()
+	mockDayjsInstance.tz = jest.fn(() => mockDayjsInstance);
+	mockDayjsInstance.utcOffset = jest.fn(() => 0);
+
+	const mockDayjs = jest.fn(() => mockDayjsInstance);
+
+	Object.assign(mockDayjs, {
+		extend: jest.fn(),
+		// Support dayjs.tz.guess()
+		tz: { guess: jest.fn(() => 'UTC') },
+	});
+
+	return mockDayjs;
+});
+
+const HOVER_ELEMENT_ID = 'hover-element';
+
+const mockSpan: Span = {
+	spanId: 'test-span-id',
+	traceId: 'test-trace-id',
+	rootSpanId: 'root-span-id',
+	parentSpanId: 'parent-span-id',
+	name: 'GET /api/users',
+	timestamp: 1679748225000000,
+	durationNano: 150000000,
+	serviceName: 'user-service',
+	kind: 1,
+	hasError: false,
+	level: 1,
+	references: [],
+	tagMap: {},
+	event: [
+		{
+			name: 'event1',
+			timeUnixNano: 1679748225100000,
+			attributeMap: {},
+			isError: false,
+		},
+		{
+			name: 'event2',
+			timeUnixNano: 1679748225200000,
+			attributeMap: {},
+			isError: false,
+		},
+	],
+	rootName: 'root-span',
+	statusMessage: '',
+	statusCodeString: 'OK',
+	spanKind: 'server',
+	hasChildren: false,
+	hasSibling: false,
+	subTreeNodeCount: 1,
+};
+
+const mockTraceMetadata = {
+	startTime: 1679748225000000,
+	endTime: 1679748226000000,
+};
+
+describe('SpanHoverCard', () => {
+	beforeEach(() => {
+		jest.useFakeTimers();
+	});
+
+	afterEach(() => {
+		jest.useRealTimers();
+	});
+
+	it('renders child element correctly', () => {
+		render(
+			<SpanHoverCard span={mockSpan} traceMetadata={mockTraceMetadata}>
+				<div data-testid="child-element">Hover me</div>
+			</SpanHoverCard>,
+		);
+
+		expect(screen.getByTestId('child-element')).toBeInTheDocument();
+		expect(screen.getByText('Hover me')).toBeInTheDocument();
+	});
+
+	it('shows popover after 0.2 second delay on hover', async () => {
+		render(
+			<SpanHoverCard span={mockSpan} traceMetadata={mockTraceMetadata}>
+				<div data-testid={HOVER_ELEMENT_ID}>Hover for details</div>
+			</SpanHoverCard>,
+		);
+
+		const hoverElement = screen.getByTestId(HOVER_ELEMENT_ID);
+
+		// Hover over the element
+		fireEvent.mouseEnter(hoverElement);
+
+		// Popover should NOT appear immediately
+		expect(screen.queryByText('Duration:')).not.toBeInTheDocument();
+
+		// Advance time by 0.5 seconds
+		act(() => {
+			jest.advanceTimersByTime(200);
+		});
+
+		// Now popover should appear
+		expect(screen.getByText('Duration:')).toBeInTheDocument();
+	});
+
+	it('does not show popover if hover is too brief', async () => {
+		render(
+			<SpanHoverCard span={mockSpan} traceMetadata={mockTraceMetadata}>
+				<div data-testid={HOVER_ELEMENT_ID}>Quick hover test</div>
+			</SpanHoverCard>,
+		);
+
+		const hoverElement = screen.getByTestId(HOVER_ELEMENT_ID);
+
+		// Quick hover and unhover (less than the 0.2s delay)
+		fireEvent.mouseEnter(hoverElement);
+		act(() => {
+			jest.advanceTimersByTime(100); // Only 0.1 seconds
+		});
+		fireEvent.mouseLeave(hoverElement);
+
+		// Advance past the full delay
+		act(() => {
+			jest.advanceTimersByTime(400);
+		});
+
+		// Popover should not appear
+		expect(screen.queryByText('Duration:')).not.toBeInTheDocument();
+	});
+
+	it('displays span information in popover content after delay', async () => {
+		render(
+			<SpanHoverCard span={mockSpan} traceMetadata={mockTraceMetadata}>
+				<div data-testid={HOVER_ELEMENT_ID}>Test span</div>
+			</SpanHoverCard>,
+		);
+
+		const hoverElement = screen.getByTestId(HOVER_ELEMENT_ID);
+
+		// Hover and wait for popover
+		fireEvent.mouseEnter(hoverElement);
+		act(() => {
+			jest.advanceTimersByTime(500);
+		});
+
+		// Check that popover shows span operation name in title
+		expect(screen.getByText('GET /api/users')).toBeInTheDocument();
+
+		// Check duration information
+		expect(screen.getByText('Duration:')).toBeInTheDocument();
+		expect(screen.getByText('150ms')).toBeInTheDocument();
+
+		// Check events count
+		expect(screen.getByText('Events:')).toBeInTheDocument();
+		expect(screen.getByText('2')).toBeInTheDocument();
+
+		// Check start time label
+		expect(screen.getByText('Start time:')).toBeInTheDocument();
+	});
+
+	it('displays date in DD MMM YYYY, HH:mm:ss format with seconds', async () => {
+		render(
+			<SpanHoverCard span={mockSpan} traceMetadata={mockTraceMetadata}>
+				<div data-testid={HOVER_ELEMENT_ID}>Date format test</div>
+			</SpanHoverCard>,
+		);
+
+		const hoverElement = screen.getByTestId(HOVER_ELEMENT_ID);
+
+		// Hover and wait for popover
+		fireEvent.mouseEnter(hoverElement);
+		act(() => {
+			jest.advanceTimersByTime(500);
+		});
+
+		// Verify the DD MMM YYYY, HH:mm:ss format is displayed
+		expect(screen.getByText('15 Mar 2024, 14:23:45')).toBeInTheDocument();
+	});
+
+	it('displays relative time information', async () => {
+		const spanWithRelativeTime: Span = {
+			...mockSpan,
+			timestamp: mockTraceMetadata.startTime + 1000000, // 1 second later
+		};
+
+		render(
+			<SpanHoverCard span={spanWithRelativeTime} traceMetadata={mockTraceMetadata}>
+				<div data-testid={HOVER_ELEMENT_ID}>Relative time test</div>
+			</SpanHoverCard>,
+		);
+
+		const hoverElement = screen.getByTestId(HOVER_ELEMENT_ID);
+
+		// Hover and wait for popover
+		fireEvent.mouseEnter(hoverElement);
+		act(() => {
+			jest.advanceTimersByTime(500);
+		});
+
+		// Check relative time display
+		expect(screen.getByText(/after trace start/)).toBeInTheDocument();
+	});
+
+	it('handles spans with no events correctly', async () => {
+		const spanWithoutEvents: Span = {
+			...mockSpan,
+			event: [],
+		};
+
+		render(
+			<SpanHoverCard span={spanWithoutEvents} traceMetadata={mockTraceMetadata}>
+				<div data-testid={HOVER_ELEMENT_ID}>No events test</div>
+			</SpanHoverCard>,
+		);
+
+		const hoverElement = screen.getByTestId(HOVER_ELEMENT_ID);
+
+		// Hover and wait for popover
+		fireEvent.mouseEnter(hoverElement);
+		act(() => {
+			jest.advanceTimersByTime(500);
+		});
+
+		expect(screen.getByText('Events:')).toBeInTheDocument();
+		expect(screen.getByText('0')).toBeInTheDocument();
+	});
+
+	it('verifies mouseEnterDelay prop is set to 0.5', () => {
+		const { container } = render(
+			<SpanHoverCard span={mockSpan} traceMetadata={mockTraceMetadata}>
+				<div data-testid={HOVER_ELEMENT_ID}>Delay test</div>
+			</SpanHoverCard>,
+		);
+
+		// The mouseEnterDelay prop should be set on the Popover component
+		// This test verifies the implementation includes the delay
+		const popover = container.querySelector('.ant-popover');
+		expect(popover).not.toBeInTheDocument(); // Initially not visible
+
+		// Hover to trigger delay mechanism
+		const hoverElement = screen.getByTestId(HOVER_ELEMENT_ID);
+		fireEvent.mouseEnter(hoverElement);
+
+		// Should not appear before delay
+		expect(screen.queryByText('Duration:')).not.toBeInTheDocument();
+
+		// Should appear after delay
+		act(() => {
+			jest.advanceTimersByTime(500);
+		});
+		expect(screen.getByText('Duration:')).toBeInTheDocument();
+	});
+});

frontend/src/constants/features.ts

@@ -7,10 +7,11 @@ export enum FeatureKeys {
 	GATEWAY = 'gateway',
 	PREMIUM_SUPPORT = 'premium_support',
 	ANOMALY_DETECTION = 'anomaly_detection',
+	ONBOARDING_V3 = 'onboarding_v3',
 	DOT_METRICS_ENABLED = 'dot_metrics_enabled',
 	USE_JSON_BODY = 'use_json_body',
 	USE_FINE_GRAINED_AUTHZ = 'use_fine_grained_authz',
 	USE_DASHBOARD_V2 = 'use_dashboard_v2',
-	ENABLE_AI_OBSERVABILITY = 'enable_ai_observability',
+	EMABLE_AI_OBSERVABILITY = 'enable_ai_observability',
 	ENABLE_METRICS_REDUCTION = 'enable_metrics_reduction',
 }

frontend/src/constants/routes.ts

@@ -11,7 +11,14 @@ const ROUTES = {
 	TRACE_DETAIL_OLD: '/trace-old/:id',
 	TRACES_EXPLORER: '/traces-explorer',
 	ONBOARDING: '/onboarding',
+	GET_STARTED: '/get-started',
 	GET_STARTED_WITH_CLOUD: '/get-started-with-signoz-cloud',
+	GET_STARTED_APPLICATION_MONITORING: '/get-started/application-monitoring',
+	GET_STARTED_LOGS_MANAGEMENT: '/get-started/logs-management',
+	GET_STARTED_INFRASTRUCTURE_MONITORING:
+		'/get-started/infrastructure-monitoring',
+	GET_STARTED_AWS_MONITORING: '/get-started/aws-monitoring',
+	GET_STARTED_AZURE_MONITORING: '/get-started/azure-monitoring',
 	USAGE_EXPLORER: '/usage-explorer',
 	APPLICATION: '/services',
 	ALL_DASHBOARD: '/dashboard',
@@ -49,9 +56,7 @@ const ROUTES = {
 	TRACE_EXPLORER: '/trace-explorer',
 	BILLING: '/settings/billing',
 	ROLES_SETTINGS: '/settings/roles',
-	ROLE_CREATE: '/settings/roles/new',
 	ROLE_DETAILS: '/settings/roles/:roleId',
-	ROLE_EDIT: '/settings/roles/:roleId/edit',
 	MEMBERS_SETTINGS: '/settings/members',
 	SUPPORT: '/support',
 	LOGS_SAVE_VIEWS: '/logs/saved-views',
@@ -89,8 +94,6 @@ const ROUTES = {
 	AI_ASSISTANT_BASE: '/ai-assistant',
 	AI_ASSISTANT_ICON_PREVIEW: '/ai-assistant-icon-preview',
 	MCP_SERVER: '/settings/mcp-server',
-	LLM_OBSERVABILITY_BASE: '/llm-observability',
-	LLM_OBSERVABILITY_MODEL_PRICING: '/llm-observability/settings/model-pricing',
 } as const;
 
 export default ROUTES;

frontend/src/container/AIAssistant/components/ChatInput/ChatInput.module.scss

@@ -377,63 +377,9 @@
 }
 
 .contextPopoverEmpty {
-	// Fill the entity panel so the state sits centred in the dead space rather
-	// than clinging to the top-left corner.
-	flex: 1;
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	justify-content: center;
-	gap: 10px;
-	padding: 24px 20px;
-	text-align: center;
 	font-size: 12px;
 	color: var(--l3-foreground);
-}
-
-.contextPopoverEmptyIcon {
-	display: inline-flex;
-	align-items: center;
-	justify-content: center;
-	width: 28px;
-	height: 28px;
-	// `--empty-accent` is set per category on the root (robin/cherry/forest).
-	color: var(--empty-accent);
-	background: color-mix(in srgb, var(--empty-accent), transparent 88%);
-	border-radius: var(--radius-2);
-}
-
-.contextPopoverEmptyTitle {
-	margin: 0;
-	max-width: 280px;
-	color: var(--l2-foreground);
-	font-size: 13px;
-	font-weight: 600;
-	line-height: 1.4;
-	// Clamp to 2 lines with an ellipsis so a long query can't blow out the
-	// popover height. The CTA below is a stock DS link button, so the query is
-	// kept readable here rather than forcing the button to wrap.
-	display: -webkit-box;
-	-webkit-box-orient: vertical;
-	-webkit-line-clamp: 2;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	overflow-wrap: anywhere;
-}
-
-.contextPopoverEmptyCta {
-	max-width: 100%;
-}
-
-.contextPopoverEmptyCtaLabel {
-	display: -webkit-box;
-	-webkit-box-orient: vertical;
-	-webkit-line-clamp: 1;
-	min-width: 0;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	overflow-wrap: anywhere;
-	text-align: center;
+	padding: 10px 8px;
 }
 
 .micBtn {

frontend/src/container/AIAssistant/components/ChatInput/ChatInput.tsx

@@ -42,22 +42,19 @@ import { useSpeechRecognition } from '../../hooks/useSpeechRecognition';
 import { MessageAttachment } from '../../types';
 import { MessageContext } from '../../../../api/ai-assistant/chat';
 import {
+	Bell,
+	LayoutDashboard,
 	Mic,
 	Plus,
 	Search,
 	Send,
+	ShieldCheck,
 	Square,
 	TriangleAlert,
 	X,
 } from '@signozhq/icons';
 
 import styles from './ChatInput.module.scss';
-import ContextPickerEmptyState from './ContextPickerEmptyState';
-import {
-	CONTEXT_CATEGORIES,
-	CONTEXT_CATEGORY_ICONS,
-	ContextCategory,
-} from './contextPicker';
 
 interface ChatInputProps {
 	onSend: (
@@ -165,6 +162,10 @@ const HOME_SERVICES_INTERVAL = 30 * 60 * 1000;
 /** sessionStorage key for the "voice input failed this tab" flag. */
 const VOICE_UNAVAILABLE_KEY = 'ai-assistant-voice-unavailable';
 
+const CONTEXT_CATEGORIES = ['Dashboards', 'Alerts', 'Services'] as const;
+
+type ContextCategory = (typeof CONTEXT_CATEGORIES)[number];
+
 interface SelectedContextItem {
 	category: ContextCategory;
 	entityId: string;
@@ -204,6 +205,12 @@ interface ContextEntityItem {
 	value: string;
 }
 
+const CONTEXT_CATEGORY_ICONS = {
+	Dashboards: LayoutDashboard,
+	Alerts: Bell,
+	Services: ShieldCheck,
+} satisfies Record<ContextCategory, unknown>;
+
 function fileToDataUrl(file: File): Promise<string> {
 	return new Promise((resolve, reject) => {
 		const reader = new FileReader();
@@ -324,30 +331,6 @@ export default function ChatInput({
 		[mentionRange, selectedContexts, text],
 	);
 
-	// Empty-state CTA: drop a starter prompt into the composer (never auto-sent)
-	// and hand the user the caret at the end so they can finish the sentence.
-	const handleContextPrefill = useCallback(
-		(prompt: string) => {
-			const next = capText(prompt);
-			setText(next);
-			committedTextRef.current = next;
-			setMentionRange(null);
-			setPickerSearchQuery('');
-			setIsContextPickerOpen(false);
-			// Defer so React commits the new value before we place the caret.
-			requestAnimationFrame(() => {
-				const el = textareaRef.current;
-				if (!el) {
-					return;
-				}
-				el.focus();
-				const end = el.value.length;
-				el.setSelectionRange(end, end);
-			});
-		},
-		[capText],
-	);
-
 	const focusCategory = useCallback((category: ContextCategory) => {
 		setActiveContextCategory(category);
 		setPickerSearchQuery('');
@@ -841,14 +824,10 @@ export default function ChatInput({
 	// Type-ahead filter against the `@<query>` typed in the textarea. When
 	// the picker was opened from the "Add Context" button there's no
 	// mention query, so fall back to the in-popover search input.
-	const rawMentionQuery = mentionRange
-		? text.slice(mentionRange.start + 1, mentionRange.end)
+	const mentionQuery = mentionRange
+		? text.slice(mentionRange.start + 1, mentionRange.end).toLowerCase()
 		: '';
-	const mentionQuery = rawMentionQuery.toLowerCase();
 	const activeQuery = mentionQuery || pickerSearchQuery.trim().toLowerCase();
-	// Original-case query for empty-state copy + prefill ("checkout", not the
-	// lowercased filter key). Mirrors `activeQuery`'s mention-then-search order.
-	const displayQuery = rawMentionQuery || pickerSearchQuery.trim();
 	const filteredContextOptions = activeQuery
 		? contextEntitiesByCategory[activeContextCategory].filter((entity) =>
 				entity.value.toLowerCase().includes(activeQuery),
@@ -1092,11 +1071,9 @@ export default function ChatInput({
 												Failed to load {activeContextCategory.toLowerCase()}.
 											</div>
 										) : filteredContextOptions.length === 0 ? (
-											<ContextPickerEmptyState
-												category={activeContextCategory}
-												query={displayQuery}
-												onPrefill={handleContextPrefill}
-											/>
+											<div className={styles.contextPopoverEmpty}>
+												No matching entities
+											</div>
 										) : (
 											filteredContextOptions.map((option, index) => {
 												const isSelected = selectedContexts.some(

frontend/src/container/AIAssistant/components/ChatInput/ContextPickerEmptyState.tsx

@@ -1,68 +0,0 @@
-import { Sparkles } from '@signozhq/icons';
-import { Button } from '@signozhq/ui/button';
-import type { CSSProperties } from 'react';
-
-import styles from './ChatInput.module.scss';
-import {
-	CONTEXT_CATEGORY_ICONS,
-	ContextCategory,
-	getContextPickerEmptyContent,
-} from './contextPicker';
-
-// Per-category accent, mapped to semantic accent tokens (robin is the brand
-// primary). Exposed to the SCSS as the `--empty-accent` custom property so the
-// icon and CTA share one colour per category.
-const CATEGORY_ACCENT: Record<ContextCategory, string> = {
-	Dashboards: 'var(--accent-primary)',
-	Alerts: 'var(--accent-cherry)',
-	Services: 'var(--accent-forest)',
-};
-
-interface ContextPickerEmptyStateProps {
-	category: ContextCategory;
-	/** The active search query (mention or in-popover search), original case. */
-	query: string;
-	/** Drops the starter prompt into the composer (never auto-sends). */
-	onPrefill: (prompt: string) => void;
-}
-
-/**
- * Empty state for the @-mention context picker. Distinguishes a brand-new user
- * with nothing to pick (onboarding) from a search that matched nothing, and in
- * both cases offers a clickable CTA that seeds the composer.
- */
-export default function ContextPickerEmptyState({
-	category,
-	query,
-	onPrefill,
-}: ContextPickerEmptyStateProps): JSX.Element {
-	const { title, ctaLabel, prefill } = getContextPickerEmptyContent(
-		category,
-		query,
-	);
-	const CategoryIcon = CONTEXT_CATEGORY_ICONS[category];
-
-	return (
-		<div
-			className={styles.contextPopoverEmpty}
-			style={{ '--empty-accent': CATEGORY_ACCENT[category] } as CSSProperties}
-		>
-			<span className={styles.contextPopoverEmptyIcon} aria-hidden="true">
-				<CategoryIcon size={16} />
-			</span>
-			<p className={styles.contextPopoverEmptyTitle}>{title}</p>
-			<Button
-				type="button"
-				variant="link"
-				size="sm"
-				color="primary"
-				className={styles.contextPopoverEmptyCta}
-				onClick={(): void => onPrefill(prefill)}
-				data-testid={`ai-context-empty-cta-${category}`}
-				prefix={<Sparkles size={14} />}
-			>
-				<span className={styles.contextPopoverEmptyCtaLabel}>{ctaLabel}</span>
-			</Button>
-		</div>
-	);
-}

frontend/src/container/AIAssistant/components/ChatInput/__tests__/ChatInput.prefill.test.tsx

@@ -1,113 +0,0 @@
-import { render, screen, userEvent, waitFor } from 'tests/test-utils';
-
-// The prefill flow only depends on the context-picker data hooks resolving to
-// empty lists (so the empty state renders) — mock them to skip real fetches.
-jest.mock('hooks/dashboard/useGetAllDashboard', () => ({
-	useGetAllDashboard: (): unknown => ({
-		data: [],
-		isLoading: false,
-		isError: false,
-	}),
-}));
-
-jest.mock('api/generated/services/rules', () => ({
-	useListRules: (): unknown => ({ data: [], isLoading: false, isError: false }),
-	getListRulesQueryKey: (): string[] => ['rules'],
-}));
-
-jest.mock('hooks/useQueryService', () => ({
-	useQueryService: (): unknown => ({
-		data: [],
-		isLoading: false,
-		isFetching: false,
-		isError: false,
-	}),
-}));
-
-// Irrelevant to the prefill flow and otherwise require browser APIs / extra
-// context providers, so stub them out.
-jest.mock('../../../hooks/useSpeechRecognition', () => ({
-	useSpeechRecognition: (): unknown => ({
-		isListening: false,
-		isSupported: false,
-		permission: 'prompt',
-		start: jest.fn(),
-		discard: jest.fn(),
-	}),
-}));
-
-jest.mock('../../../hooks/useAIAssistantAnalyticsContext', () => ({
-	useAIAssistantAnalyticsContext: (): unknown => ({
-		threadId: undefined,
-		page: '/',
-		mode: 'sidepane',
-	}),
-}));
-
-// eslint-disable-next-line import/first
-import { TooltipProvider } from '@signozhq/ui/tooltip';
-// eslint-disable-next-line import/first
-import ChatInput from '../ChatInput';
-
-function renderChatInput(): void {
-	render(
-		<TooltipProvider>
-			<ChatInput onSend={jest.fn()} />
-		</TooltipProvider>,
-	);
-}
-
-function getComposer(): HTMLTextAreaElement {
-	return screen.getByPlaceholderText(/Ask anything/i) as HTMLTextAreaElement;
-}
-
-describe('ChatInput — empty-state CTA prefill flow', () => {
-	it('full-replaces existing prose with the query-seeded prompt and closes the picker', async () => {
-		renderChatInput();
-
-		// Pre-existing prose in the composer.
-		await userEvent.type(getComposer(), 'show me something');
-
-		// Open the picker and search for an entity that does not exist.
-		await userEvent.click(screen.getByRole('button', { name: /add context/i }));
-		await userEvent.type(
-			await screen.findByPlaceholderText(/search dashboards/i),
-			'chk',
-		);
-
-		const cta = await screen.findByTestId('ai-context-empty-cta-Dashboards');
-		expect(cta).toHaveTextContent('Create a dashboard for "chk"');
-
-		await userEvent.click(cta);
-
-		// Full-replace is intentional: the prefill is a complete sentence, so the
-		// prior "show me something" prose is discarded rather than producing
-		// broken grammar (see handleContextPrefill). The query is seeded in.
-		expect(getComposer().value).toBe('Create a dashboard for chk');
-
-		// Picker closed → the empty-state CTA is gone.
-		await waitFor(() =>
-			expect(
-				screen.queryByTestId('ai-context-empty-cta-Dashboards'),
-			).not.toBeInTheDocument(),
-		);
-	});
-
-	it('seeds only the prefix (with trailing space) in the onboarding case', async () => {
-		renderChatInput();
-
-		await userEvent.click(screen.getByRole('button', { name: /add context/i }));
-
-		const cta = await screen.findByTestId('ai-context-empty-cta-Dashboards');
-		expect(cta).toHaveTextContent('Ask me to create one');
-
-		await userEvent.click(cta);
-
-		expect(getComposer().value).toBe('Create a dashboard for ');
-		await waitFor(() =>
-			expect(
-				screen.queryByTestId('ai-context-empty-cta-Dashboards'),
-			).not.toBeInTheDocument(),
-		);
-	});
-});

frontend/src/container/AIAssistant/components/ChatInput/__tests__/ContextPickerEmptyState.test.tsx

@@ -1,135 +0,0 @@
-import { render, screen, userEvent } from 'tests/test-utils';
-
-import { ContextCategory } from '../contextPicker';
-import ContextPickerEmptyState from '../ContextPickerEmptyState';
-
-function renderEmptyState(
-	category: ContextCategory,
-	query: string,
-	onPrefill = jest.fn(),
-): { onPrefill: jest.Mock; container: HTMLElement } {
-	const { container } = render(
-		<ContextPickerEmptyState
-			category={category}
-			query={query}
-			onPrefill={onPrefill}
-		/>,
-	);
-	return { onPrefill, container };
-}
-
-function ctaFor(category: ContextCategory): HTMLElement {
-	return screen.getByTestId(`ai-context-empty-cta-${category}`);
-}
-
-describe('ContextPickerEmptyState', () => {
-	describe('onboarding (no query)', () => {
-		it('renders dashboards copy and prefills the prefix only', async () => {
-			const { onPrefill } = renderEmptyState('Dashboards', '');
-
-			expect(screen.getByText('No dashboards yet.')).toBeInTheDocument();
-			const cta = ctaFor('Dashboards');
-			expect(cta).toHaveTextContent('Ask me to create one');
-
-			await userEvent.click(cta);
-			expect(onPrefill).toHaveBeenCalledTimes(1);
-			expect(onPrefill).toHaveBeenCalledWith('Create a dashboard for ');
-		});
-
-		it('renders alerts copy and prefills the prefix only', async () => {
-			const { onPrefill } = renderEmptyState('Alerts', '');
-
-			expect(screen.getByText('No alerts yet.')).toBeInTheDocument();
-			expect(ctaFor('Alerts')).toHaveTextContent('Ask me to create one');
-
-			await userEvent.click(ctaFor('Alerts'));
-			expect(onPrefill).toHaveBeenCalledWith('Create an alert for ');
-		});
-
-		it('renders instrumentation-flavoured services copy and prefill', async () => {
-			const { onPrefill } = renderEmptyState('Services', '');
-
-			expect(
-				screen.getByText('No services reporting data yet.'),
-			).toBeInTheDocument();
-			expect(ctaFor('Services')).toHaveTextContent(
-				'Ask me to help set up instrumentation',
-			);
-
-			await userEvent.click(ctaFor('Services'));
-			expect(onPrefill).toHaveBeenCalledWith(
-				'Help me set up instrumentation for ',
-			);
-		});
-
-		it('treats a whitespace-only query as onboarding', () => {
-			renderEmptyState('Dashboards', '   ');
-			expect(screen.getByText('No dashboards yet.')).toBeInTheDocument();
-		});
-	});
-
-	describe('search miss (query, no match)', () => {
-		it('seeds the query into dashboards copy and prefill', async () => {
-			const { onPrefill } = renderEmptyState('Dashboards', 'checkout');
-
-			expect(
-				screen.getByText('No dashboards match "checkout".'),
-			).toBeInTheDocument();
-			expect(ctaFor('Dashboards')).toHaveTextContent(
-				'Create a dashboard for "checkout"',
-			);
-
-			await userEvent.click(ctaFor('Dashboards'));
-			expect(onPrefill).toHaveBeenCalledWith('Create a dashboard for checkout');
-		});
-
-		it('seeds the query into alerts copy and prefill', async () => {
-			const { onPrefill } = renderEmptyState('Alerts', 'checkout');
-
-			expect(screen.getByText('No alerts match "checkout".')).toBeInTheDocument();
-			await userEvent.click(ctaFor('Alerts'));
-			expect(onPrefill).toHaveBeenCalledWith('Create an alert for checkout');
-		});
-
-		it('uses instrumentation wording for services search misses', async () => {
-			const { onPrefill } = renderEmptyState('Services', 'checkout');
-
-			expect(
-				screen.getByText('No services match "checkout".'),
-			).toBeInTheDocument();
-			await userEvent.click(ctaFor('Services'));
-			expect(onPrefill).toHaveBeenCalledWith(
-				'Help me set up instrumentation for checkout',
-			);
-		});
-
-		it('preserves the original casing of the query in copy and prefill', async () => {
-			const { onPrefill } = renderEmptyState('Dashboards', 'Checkout API');
-
-			expect(
-				screen.getByText('No dashboards match "Checkout API".'),
-			).toBeInTheDocument();
-			await userEvent.click(ctaFor('Dashboards'));
-			expect(onPrefill).toHaveBeenCalledWith(
-				'Create a dashboard for Checkout API',
-			);
-		});
-	});
-
-	describe('per-category accent token', () => {
-		it.each<[ContextCategory, string]>([
-			['Dashboards', 'var(--accent-primary)'],
-			['Alerts', 'var(--accent-cherry)'],
-			['Services', 'var(--accent-forest)'],
-		])('maps %s to the semantic accent %s', (category, accent) => {
-			const { container } = renderEmptyState(category, '');
-			const root = container.firstChild as HTMLElement;
-			expect(root.style.getPropertyValue('--empty-accent')).toBe(accent);
-		});
-	});
-
-	it('does not auto-send: nothing fires until the CTA is clicked', () => {
-		const { onPrefill } = renderEmptyState('Dashboards', 'checkout');
-		expect(onPrefill).not.toHaveBeenCalled();
-	});
-});

frontend/src/container/AIAssistant/components/ChatInput/__tests__/contextPicker.test.ts

@@ -1,100 +0,0 @@
-import {
-	CONTEXT_CATEGORIES,
-	getContextPickerEmptyContent,
-} from '../contextPicker';
-
-describe('getContextPickerEmptyContent', () => {
-	describe('onboarding (no query)', () => {
-		it('returns per-category copy and prefix-only prefill for dashboards', () => {
-			expect(getContextPickerEmptyContent('Dashboards', '')).toStrictEqual({
-				title: 'No dashboards yet.',
-				ctaLabel: 'Ask me to create one',
-				prefill: 'Create a dashboard for ',
-			});
-		});
-
-		it('returns per-category copy and prefix-only prefill for alerts', () => {
-			expect(getContextPickerEmptyContent('Alerts', '')).toStrictEqual({
-				title: 'No alerts yet.',
-				ctaLabel: 'Ask me to create one',
-				prefill: 'Create an alert for ',
-			});
-		});
-
-		it('returns instrumentation-flavoured copy for services', () => {
-			expect(getContextPickerEmptyContent('Services', '')).toStrictEqual({
-				title: 'No services reporting data yet.',
-				ctaLabel: 'Ask me to help set up instrumentation',
-				prefill: 'Help me set up instrumentation for ',
-			});
-		});
-
-		it('treats a whitespace-only query as no query', () => {
-			expect(getContextPickerEmptyContent('Dashboards', '   ')).toStrictEqual({
-				title: 'No dashboards yet.',
-				ctaLabel: 'Ask me to create one',
-				prefill: 'Create a dashboard for ',
-			});
-		});
-
-		it('leaves the prefill ending in a space so the caret sits after it', () => {
-			CONTEXT_CATEGORIES.forEach((category) => {
-				expect(getContextPickerEmptyContent(category, '').prefill).toMatch(/ $/);
-			});
-		});
-	});
-
-	describe('search miss (query, no match)', () => {
-		it('seeds the query into dashboards copy and prefill', () => {
-			expect(getContextPickerEmptyContent('Dashboards', 'checkout')).toStrictEqual(
-				{
-					title: 'No dashboards match "checkout".',
-					ctaLabel: 'Create a dashboard for "checkout"',
-					prefill: 'Create a dashboard for checkout',
-				},
-			);
-		});
-
-		it('seeds the query into alerts copy and prefill', () => {
-			expect(getContextPickerEmptyContent('Alerts', 'checkout')).toStrictEqual({
-				title: 'No alerts match "checkout".',
-				ctaLabel: 'Create an alert for "checkout"',
-				prefill: 'Create an alert for checkout',
-			});
-		});
-
-		it('uses instrumentation wording for services search misses', () => {
-			expect(getContextPickerEmptyContent('Services', 'checkout')).toStrictEqual({
-				title: 'No services match "checkout".',
-				ctaLabel: 'Set up instrumentation for "checkout"',
-				prefill: 'Help me set up instrumentation for checkout',
-			});
-		});
-
-		it('preserves the original casing of the query', () => {
-			const { title, ctaLabel, prefill } = getContextPickerEmptyContent(
-				'Dashboards',
-				'Checkout API',
-			);
-			expect(title).toBe('No dashboards match "Checkout API".');
-			expect(ctaLabel).toBe('Create a dashboard for "Checkout API"');
-			expect(prefill).toBe('Create a dashboard for Checkout API');
-		});
-
-		it('trims surrounding whitespace from the query', () => {
-			expect(
-				getContextPickerEmptyContent('Dashboards', '  checkout  ').prefill,
-			).toBe('Create a dashboard for checkout');
-		});
-	});
-
-	it('never emits an em-dash (house style)', () => {
-		CONTEXT_CATEGORIES.forEach((category) => {
-			const empty = getContextPickerEmptyContent(category, '');
-			const miss = getContextPickerEmptyContent(category, 'q');
-			[empty, miss].forEach(({ title, ctaLabel, prefill }) => {
-				expect(`${title}${ctaLabel}${prefill}`).not.toContain('—');
-			});
-		});
-	});
-});

frontend/src/container/AIAssistant/components/ChatInput/contextPicker.ts

@@ -1,103 +0,0 @@
-import { Bell, LayoutDashboard, ShieldCheck } from '@signozhq/icons';
-
-/** Ordered category tabs shown in the @-mention context picker. */
-export const CONTEXT_CATEGORIES = ['Dashboards', 'Alerts', 'Services'] as const;
-
-export type ContextCategory = (typeof CONTEXT_CATEGORIES)[number];
-
-/**
- * Icon per category, shared by the picker tablist and the empty state. `satisfies`
- * keeps the concrete component types so callers can render `<Icon size={n} />`.
- */
-export const CONTEXT_CATEGORY_ICONS = {
-	Dashboards: LayoutDashboard,
-	Alerts: Bell,
-	Services: ShieldCheck,
-} satisfies Record<ContextCategory, unknown>;
-
-/**
- * Resolved copy + composer prefill for one render of the context picker's empty
- * state. The picker is tabbed, so a user only ever views one category at a
- * time — each category gets its own onboarding and search-miss copy rather than
- * a single combined "nothing to show" line.
- */
-export interface ContextPickerEmptyContent {
-	/** Primary line explaining why the list is empty. */
-	title: string;
-	/** Clickable call to action that prefills (never auto-sends) the composer. */
-	ctaLabel: string;
-	/**
-	 * Text dropped into the composer when the CTA is clicked. When there's no
-	 * search query this is just the prefix with a trailing space, leaving the
-	 * caret at the end for the user to type the entity name.
-	 */
-	prefill: string;
-}
-
-interface CategoryCopy {
-	/** Onboarding line, e.g. "No dashboards yet." */
-	emptyTitle: string;
-	/** Onboarding CTA label, e.g. "Ask me to create one". */
-	emptyCtaLabel: string;
-	/** Search-miss line, e.g. `No dashboards match "checkout".` */
-	matchTitle: (query: string) => string;
-	/** Search-miss CTA label, e.g. `Create a dashboard for "checkout"`. */
-	matchCtaLabel: (query: string) => string;
-	/**
-	 * Composer prefill prefix (with trailing space). The prefill is always
-	 * `${prefillPrefix}${query}`, so the search-miss case seeds the query and
-	 * the onboarding case leaves only the prefix.
-	 */
-	prefillPrefix: string;
-}
-
-// Services get instrumentation-flavoured copy: the assistant can't "create" a
-// service, they come from telemetry, so the CTA points at setup instead.
-const CONTEXT_PICKER_COPY: Record<ContextCategory, CategoryCopy> = {
-	Dashboards: {
-		emptyTitle: 'No dashboards yet.',
-		emptyCtaLabel: 'Ask me to create one',
-		matchTitle: (query) => `No dashboards match "${query}".`,
-		matchCtaLabel: (query) => `Create a dashboard for "${query}"`,
-		prefillPrefix: 'Create a dashboard for ',
-	},
-	Alerts: {
-		emptyTitle: 'No alerts yet.',
-		emptyCtaLabel: 'Ask me to create one',
-		matchTitle: (query) => `No alerts match "${query}".`,
-		matchCtaLabel: (query) => `Create an alert for "${query}"`,
-		prefillPrefix: 'Create an alert for ',
-	},
-	Services: {
-		emptyTitle: 'No services reporting data yet.',
-		emptyCtaLabel: 'Ask me to help set up instrumentation',
-		matchTitle: (query) => `No services match "${query}".`,
-		matchCtaLabel: (query) => `Set up instrumentation for "${query}"`,
-		prefillPrefix: 'Help me set up instrumentation for ',
-	},
-};
-
-/**
- * Build the empty-state copy for a category. The two states are driven solely
- * by whether a search query is active: a non-empty query yields the search-miss
- * variant, an empty query the onboarding variant.
- */
-export function getContextPickerEmptyContent(
-	category: ContextCategory,
-	query: string,
-): ContextPickerEmptyContent {
-	const copy = CONTEXT_PICKER_COPY[category];
-	const trimmed = query.trim();
-	if (trimmed) {
-		return {
-			title: copy.matchTitle(trimmed),
-			ctaLabel: copy.matchCtaLabel(trimmed),
-			prefill: `${copy.prefillPrefix}${trimmed}`,
-		};
-	}
-	return {
-		title: copy.emptyTitle,
-		ctaLabel: copy.emptyCtaLabel,
-		prefill: copy.prefillPrefix,
-	};
-}

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

@@ -26,12 +26,7 @@ jest.mock('components/MarkdownRenderer/MarkdownRenderer', () => ({
 
 describe('Should check if the edit alert channel is properly displayed', () => {
 	beforeEach(() => {
-		render(
-			<EditAlertChannels
-				channelId="3"
-				initialValue={editAlertChannelInitialValue}
-			/>,
-		);
+		render(<EditAlertChannels initialValue={editAlertChannelInitialValue} />);
 	});
 	afterEach(() => {
 		jest.clearAllMocks();

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

@@ -1,81 +0,0 @@
-import EditAlertChannels from 'container/EditAlertChannels';
-import { editAlertChannelInitialValue } from 'mocks-server/__mockdata__/alerts';
-import { server } from 'mocks-server/server';
-import { rest } from 'msw';
-import { render, screen, userEvent, waitFor } from 'tests/test-utils';
-
-jest.mock('hooks/useNotifications', () => ({
-	__esModule: true,
-	useNotifications: jest.fn(() => ({
-		notifications: { success: jest.fn(), error: jest.fn() },
-	})),
-}));
-
-jest.mock('components/MarkdownRenderer/MarkdownRenderer', () => ({
-	MarkdownRenderer: jest.fn(() => <div>Mocked MarkdownRenderer</div>),
-}));
-
-interface EditRequest {
-	id: string;
-	body: { name: string; slack_configs: { send_resolved: boolean }[] };
-}
-
-// Captures the PUT /channels/:id request the edit form fires, so assertions can
-// run against the real HTTP payload instead of a hand-mocked api client.
-function mockEditChannel(): { calls: EditRequest[] } {
-	const result: { calls: EditRequest[] } = { calls: [] };
-	server.use(
-		rest.put('http://localhost/api/v1/channels/:id', async (req, res, ctx) => {
-			result.calls.push({
-				id: req.params.id as string,
-				body: await req.json(),
-			});
-			return res(
-				ctx.status(200),
-				ctx.json({ status: 'success', data: 'channel updated' }),
-			);
-		}),
-	);
-	return result;
-}
-
-describe('EditAlertChannels save', () => {
-	afterEach(() => jest.clearAllMocks());
-
-	it('sends the channelId in the edit request (regression: empty id)', async () => {
-		const edit = mockEditChannel();
-		render(
-			<EditAlertChannels
-				channelId="3"
-				initialValue={editAlertChannelInitialValue}
-			/>,
-		);
-
-		const user = userEvent.setup();
-		await user.click(screen.getByTestId('save-channel-button'));
-
-		await waitFor(() => expect(edit.calls).toHaveLength(1));
-		expect(edit.calls[0].id).toBe('3');
-	});
-
-	it('persists send_resolved toggle in the edit request', async () => {
-		const edit = mockEditChannel();
-		render(
-			<EditAlertChannels
-				channelId="3"
-				initialValue={editAlertChannelInitialValue}
-			/>,
-		);
-
-		const user = userEvent.setup();
-		const sendResolved = screen.getByTestId('field-send-resolved-checkbox');
-		expect(sendResolved).toBeChecked();
-
-		await user.click(sendResolved);
-		await user.click(screen.getByTestId('save-channel-button'));
-
-		await waitFor(() => expect(edit.calls).toHaveLength(1));
-		expect(edit.calls[0].id).toBe('3');
-		expect(edit.calls[0].body.slack_configs[0].send_resolved).toBe(false);
-	});
-});

frontend/src/container/AppLayout/index.tsx

@@ -413,8 +413,14 @@ function AppLayout(props: AppLayoutProps): JSX.Element {
 	const isPanelEditorV2 = routeKey === 'DASHBOARD_PANEL_EDITOR';
 
 	const renderFullScreen =
+		pathname === ROUTES.GET_STARTED ||
 		pathname === ROUTES.ONBOARDING ||
 		pathname === ROUTES.GET_STARTED_WITH_CLOUD ||
+		pathname === ROUTES.GET_STARTED_APPLICATION_MONITORING ||
+		pathname === ROUTES.GET_STARTED_INFRASTRUCTURE_MONITORING ||
+		pathname === ROUTES.GET_STARTED_LOGS_MANAGEMENT ||
+		pathname === ROUTES.GET_STARTED_AWS_MONITORING ||
+		pathname === ROUTES.GET_STARTED_AZURE_MONITORING ||
 		isPublicDashboard ||
 		isPanelEditorV2;
 

frontend/src/container/EditAlertChannels/index.tsx

@@ -32,7 +32,6 @@ import APIError from 'types/api/error';
 
 function EditAlertChannels({
 	initialValue,
-	channelId: id,
 }: EditAlertChannelsProps): JSX.Element {
 	// init namespace for translations
 	const { t } = useTranslation('channels');
@@ -54,6 +53,11 @@ function EditAlertChannels({
 	const [testingState, setTestingState] = useState<boolean>(false);
 	const { notifications } = useNotifications();
 
+	// Extract channelId from URL pathname since useParams doesn't work in nested routing
+	const { pathname } = window.location;
+	const channelIdMatch = pathname.match(/\/settings\/channels\/edit\/([^/]+)/);
+	const id = channelIdMatch ? channelIdMatch[1] : '';
+
 	const [type, setType] = useState<ChannelType>(
 		initialValue?.type ? (initialValue.type as ChannelType) : ChannelType.Slack,
 	);
@@ -516,7 +520,6 @@ interface EditAlertChannelsProps {
 	initialValue: {
 		[x: string]: unknown;
 	};
-	channelId: string;
 }
 
 export default EditAlertChannels;

frontend/src/container/FormAlertChannels/index.tsx

@@ -136,7 +136,6 @@ function FormAlertChannels({
 
 				<Form.Item>
 					<Button
-						data-testid="save-channel-button"
 						disabled={savingState}
 						loading={savingState}
 						type="primary"
@@ -145,7 +144,6 @@ function FormAlertChannels({
 						{t('button_save_channel')}
 					</Button>
 					<Button
-						data-testid="test-channel-button"
 						disabled={testingState}
 						loading={testingState}
 						onClick={(): void => onTestHandler(type)}
@@ -153,7 +151,6 @@ function FormAlertChannels({
 						{t('button_test_channel')}
 					</Button>
 					<Button
-						data-testid="return-button"
 						onClick={(): void => {
 							history.replace(ROUTES.ALL_CHANNELS);
 						}}

frontend/src/container/FullScreenHeader/FullScreenHeader.styles.scss

@@ -0,0 +1,29 @@
+.full-screen-header-container {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	padding: 24px 0;
+
+	.brand-logo {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		gap: 16px;
+		cursor: pointer;
+
+		img {
+			height: 32px;
+			width: 32px;
+		}
+
+		.brand-logo-name {
+			font-family: 'Work Sans', sans-serif;
+			font-size: 24px;
+			font-style: normal;
+			font-weight: 500;
+			line-height: 18px;
+
+			color: var(--l1-foreground);
+		}
+	}
+}

frontend/src/container/FullScreenHeader/FullScreenHeader.tsx

@@ -0,0 +1,28 @@
+import history from 'lib/history';
+
+import signozBrandLogoUrl from '@/assets/Logos/signoz-brand-logo.svg';
+
+import './FullScreenHeader.styles.scss';
+
+export default function FullScreenHeader({
+	overrideRoute,
+}: {
+	overrideRoute?: string;
+}): React.ReactElement {
+	const handleLogoClick = (): void => {
+		history.push(overrideRoute || '/');
+	};
+	return (
+		<div className="full-screen-header-container">
+			<div className="brand-logo" onClick={handleLogoClick}>
+				<img src={signozBrandLogoUrl} alt="SigNoz" />
+
+				<div className="brand-logo-name">SigNoz</div>
+			</div>
+		</div>
+	);
+}
+
+FullScreenHeader.defaultProps = {
+	overrideRoute: '/',
+};

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

@@ -1,27 +0,0 @@
-.llmObservability {
-	display: flex;
-	flex-direction: column;
-	gap: var(--spacing-8);
-	padding: var(--spacing-12) var(--spacing-16);
-}
-
-.pageHeader {
-	display: flex;
-	align-items: flex-start;
-	justify-content: space-between;
-	gap: var(--spacing-8);
-}
-
-.pageHeaderTitle {
-	.title {
-		margin: 0;
-		font-size: var(--font-size-xl);
-		font-weight: var(--font-weight-semibold);
-	}
-
-	.subtitle {
-		margin: var(--spacing-2) 0 0;
-		color: var(--text-vanilla-400);
-		font-size: var(--periscope-font-size-base);
-	}
-}

frontend/src/container/LLMObservability/LLMObservability.tsx

@@ -1,18 +0,0 @@
-import styles from './LLMObservability.module.scss';
-
-function LLMObservability(): JSX.Element {
-	return (
-		<div className={styles.llmObservability} data-testid="llm-observability-page">
-			<header className={styles.pageHeader}>
-				<div className={styles.pageHeaderTitle}>
-					<h1 className={styles.title}>LLM Observability</h1>
-					<p className={styles.subtitle}>
-						Monitor and analyze your LLM usage, costs, and performance
-					</p>
-				</div>
-			</header>
-		</div>
-	);
-}
-
-export default LLMObservability;

frontend/src/container/LLMObservability/Settings/ModelPricing/LLMObservabilityModelPricing.module.scss

@@ -1,27 +0,0 @@
-.llmObservabilityModelPricing {
-	display: flex;
-	flex-direction: column;
-	gap: var(--spacing-8);
-	padding: var(--spacing-12) var(--spacing-16);
-}
-
-.pageHeader {
-	display: flex;
-	align-items: flex-start;
-	justify-content: space-between;
-	gap: var(--spacing-8);
-}
-
-.pageHeaderTitle {
-	.title {
-		margin: 0;
-		font-size: var(--font-size-xl);
-		font-weight: var(--font-weight-semibold);
-	}
-
-	.subtitle {
-		margin: var(--spacing-2) 0 0;
-		color: var(--text-vanilla-400);
-		font-size: var(--periscope-font-size-base);
-	}
-}

frontend/src/container/LLMObservability/Settings/ModelPricing/LLMObservabilityModelPricing.tsx

@@ -1,21 +0,0 @@
-import styles from './LLMObservabilityModelPricing.module.scss';
-
-function LLMObservabilityModelPricing(): JSX.Element {
-	return (
-		<div
-			className={styles.llmObservabilityModelPricing}
-			data-testid="llm-observability-model-pricing-page"
-		>
-			<header className={styles.pageHeader}>
-				<div className={styles.pageHeaderTitle}>
-					<h1 className={styles.title}>Configuration</h1>
-					<p className={styles.subtitle}>
-						Model pricing and cost estimation settings
-					</p>
-				</div>
-			</header>
-		</div>
-	);
-}
-
-export default LLMObservabilityModelPricing;

frontend/src/container/MembersSettings/MembersSettings.styles.scss

@@ -1,12 +1,10 @@
-.members-settings-page {
+.members-settings {
 	display: flex;
 	flex-direction: column;
 	gap: var(--spacing-8);
 	padding: var(--padding-4) var(--padding-2) var(--padding-6) var(--padding-4);
 	height: 100%;
-}
 
-.members-settings {
 	&__header {
 		display: flex;
 		flex-direction: column;

frontend/src/container/MembersSettings/MembersSettings.tsx

@@ -9,7 +9,6 @@ import EditMemberDrawer from 'components/EditMemberDrawer/EditMemberDrawer';
 import InviteMembersModal from 'components/InviteMembersModal/InviteMembersModal';
 import MembersTable, { MemberRow } from 'components/MembersTable/MembersTable';
 import useUrlQuery from 'hooks/useUrlQuery';
-import { parseAsBoolean, useQueryState } from 'nuqs';
 import { toISOString } from 'utils/app';
 
 import { FilterMode, MemberStatus, toMemberStatus } from './utils';
@@ -27,10 +26,7 @@ function MembersSettings(): JSX.Element {
 	// TODO(nuqs): Replace with nuqs once the nuqs setup and integration is done - for search
 	const [searchQuery, setSearchQuery] = useState('');
 	const [filterMode, setFilterMode] = useState<FilterMode>(FilterMode.All);
-	const [isInviteModalOpen, setIsInviteModalOpen] = useQueryState(
-		'invite',
-		parseAsBoolean.withDefault(false),
-	);
+	const [isInviteModalOpen, setIsInviteModalOpen] = useState(false);
 	const [selectedMember, setSelectedMember] = useState<MemberRow | null>(null);
 
 	const { data: usersData, isLoading, refetch: refetchUsers } = useListUsers();
@@ -164,7 +160,7 @@ function MembersSettings(): JSX.Element {
 	}, [refetchUsers]);
 
 	return (
-		<div className="members-settings-page">
+		<>
 			<div className="members-settings">
 				<div className="members-settings__header">
 					<h1 className="members-settings__title">Members</h1>
@@ -205,7 +201,7 @@ function MembersSettings(): JSX.Element {
 					<Button
 						variant="solid"
 						color="primary"
-						onClick={(): void => void setIsInviteModalOpen(true)}
+						onClick={(): void => setIsInviteModalOpen(true)}
 					>
 						<Plus size={12} />
 						Invite member
@@ -225,7 +221,7 @@ function MembersSettings(): JSX.Element {
 
 			<InviteMembersModal
 				open={isInviteModalOpen}
-				onClose={(): void => void setIsInviteModalOpen(null)}
+				onClose={(): void => setIsInviteModalOpen(false)}
 				onComplete={handleInviteComplete}
 			/>
 
@@ -235,7 +231,7 @@ function MembersSettings(): JSX.Element {
 				onClose={handleDrawerClose}
 				onComplete={handleMemberEditComplete}
 			/>
-		</div>
+		</>
 	);
 }
 

frontend/src/container/MembersSettings/__tests__/MembersSettings.integration.test.tsx

@@ -130,14 +130,4 @@ describe('MembersSettings (integration)', () => {
 			screen.findAllByPlaceholderText('john@signoz.io'),
 		).resolves.toHaveLength(3);
 	});
-
-	it('opens InviteMembersModal when invite=true query param is present', async () => {
-		render(<MembersSettings />, undefined, {
-			initialRoute: '/settings/members?invite=true',
-		});
-
-		await expect(
-			screen.findAllByPlaceholderText('john@signoz.io'),
-		).resolves.toHaveLength(3);
-	});
 });

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

@@ -191,6 +191,9 @@ function TimeSeries({
 		if (metrics[0] && yAxisUnit) {
 			updateMetricMetadata(
 				{
+					pathParams: {
+						metricName: metricNames[0],
+					},
 					data: buildUpdateMetricYAxisUnitPayload(
 						metricNames[0],
 						metrics[0],

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

@@ -48,14 +48,18 @@ function AllAttributes({
 		isLoading: isLoadingAttributes,
 		isError: isErrorAttributes,
 		refetch: refetchAttributes,
-	} = useGetMetricAttributes({
-		metricName,
-		start: minTime ? Math.floor(minTime / 1000000) : undefined,
-		end: maxTime ? Math.floor(maxTime / 1000000) : undefined,
-	});
+	} = useGetMetricAttributes(
+		{
+			metricName,
+		},
+		{
+			start: minTime ? Math.floor(minTime / 1000000) : undefined,
+			end: maxTime ? Math.floor(maxTime / 1000000) : undefined,
+		},
+	);
 
 	const attributes = useMemo(
-		() => attributesData?.data.attributes ?? [],
+		() => attributesData?.data?.attributes ?? [],
 		[attributesData],
 	);
 

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

@@ -237,6 +237,9 @@ function Metadata({
 	const handleSave = useCallback(() => {
 		updateMetricMetadata(
 			{
+				pathParams: {
+					metricName,
+				},
 				data: transformUpdateMetricMetadataRequest(metricName, metricMetadataState),
 			},
 			{

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

@@ -516,6 +516,11 @@
 	--tooltip-z-index: 1000;
 }
 
+// Lift the volume-control config drawer above the MetricDetails drawer (z-index 1000).
+.volume-control-config-drawer {
+	z-index: 1100 !important;
+}
+
 @keyframes fade-in-out {
 	0% {
 		opacity: 0;

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

@@ -21,7 +21,7 @@ import AllAttributes from './AllAttributes';
 import DashboardsAndAlertsPopover from './DashboardsAndAlertsPopover';
 import Highlights from './Highlights';
 import Metadata from './Metadata';
-import VolumeControlSection from '../VolumeControl/components/VolumeControlSection/VolumeControlSection';
+import VolumeControlSection from './VolumeControl/VolumeControlSection';
 import { MetricDetailsProps } from './types';
 import { getMetricDetailsQuery } from './utils';
 
@@ -57,7 +57,7 @@ function MetricDetails({
 	);
 
 	const metadata = useMemo(() => {
-		if (!metricMetadataResponse) {
+		if (!metricMetadataResponse?.data) {
 			return null;
 		}
 		const { type, description, unit, temporality, isMonotonic } =

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

@@ -0,0 +1,72 @@
+import { Typography } from '@signozhq/ui/typography';
+import { Spin } from 'antd';
+import { MetricreductionruletypesGettableReductionRulePreviewDTO } from 'api/generated/services/sigNoz.schemas';
+
+import { formatCompact } from './configUtils';
+import { RuleMode } from './types';
+import styles from './VolumeControlConfig.module.scss';
+
+interface ImpactPanelProps {
+	mode: RuleMode;
+	preview?: MetricreductionruletypesGettableReductionRulePreviewDTO;
+	isLoading: boolean;
+}
+
+function ImpactPanel({
+	mode,
+	preview,
+	isLoading,
+}: ImpactPanelProps): JSX.Element {
+	if (mode === 'all') {
+		return (
+			<div className={styles.impact} data-testid="volume-control-impact">
+				<Typography.Text className={styles.impactNote}>
+					All attributes remain queryable, no reduction.
+				</Typography.Text>
+			</div>
+		);
+	}
+
+	// "Current" is what the metric keeps today (its rule, or raw if none); reduction is current -> proposed.
+	const current = preview?.currentReducedSeries ?? 0;
+	const proposed = preview?.reducedSeries ?? 0;
+	const deltaPct = current > 0 ? (1 - proposed / current) * 100 : 0;
+	const reductionLabel = `${deltaPct >= 0 ? '−' : '+'}${Math.round(
+		Math.abs(deltaPct),
+	)}%`;
+
+	return (
+		<div className={styles.impact} data-testid="volume-control-impact">
+			{isLoading && <Spin size="small" />}
+			{!isLoading && preview && (
+				<div className={styles.meters}>
+					<div className={styles.meter}>
+						<span className={styles.meterLabel}>Current series</span>
+						<span className={styles.meterValue}>{formatCompact(current)}</span>
+					</div>
+					<div className={styles.meter}>
+						<span className={styles.meterLabel}>Proposed series</span>
+						<span className={styles.meterValue}>{formatCompact(proposed)}</span>
+					</div>
+					<div className={styles.meter}>
+						<span className={styles.meterLabel}>Reduction</span>
+						<span
+							className={`${styles.meterValue} ${
+								deltaPct >= 0 ? styles.meterValueGood : ''
+							}`}
+						>
+							{reductionLabel}
+						</span>
+					</div>
+				</div>
+			)}
+			{!isLoading && !preview && (
+				<Typography.Text className={styles.impactNote}>
+					Select attributes to preview the impact.
+				</Typography.Text>
+			)}
+		</div>
+	);
+}
+
+export default ImpactPanel;

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

@@ -2,8 +2,8 @@ import { Typography } from '@signozhq/ui/typography';
 import { Select } from 'antd';
 import { popupContainer } from 'utils/selectPopupContainer';
 
-import { RuleMode } from '../../../types';
-import styles from './LabelSelector.module.scss';
+import { RuleMode } from './types';
+import styles from './VolumeControlConfig.module.scss';
 
 interface LabelSelectorProps {
 	mode: RuleMode;
@@ -26,19 +26,12 @@ function LabelSelector({
 			: 'The selected attributes will be aggregated away; all others stay queryable.';
 
 	return (
-		<div
-			className={styles.fieldGroup}
-			data-testid="volume-control-label-selector"
-		>
-			<Typography.Text size="small" weight="semibold">
-				Attributes
-			</Typography.Text>
-			<Typography.Text size="sm" color="muted">
-				{helpText}
-			</Typography.Text>
+		<div className={styles.field} data-testid="volume-control-label-selector">
+			<Typography.Text className={styles.fieldLabel}>Attributes</Typography.Text>
+			<Typography.Text className={styles.fieldHint}>{helpText}</Typography.Text>
 			<Select
 				mode="multiple"
-				className={styles.attributeSelect}
+				className={styles.labelSelect}
 				placeholder="Select attributes"
 				value={value}
 				onChange={onChange}

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

@@ -1,8 +1,7 @@
 import { Typography } from '@signozhq/ui/typography';
-import cx from 'classnames';
 
-import { RuleMode } from '../../../types';
-import styles from './ModeSelector.module.scss';
+import { RuleMode } from './types';
+import styles from './VolumeControlConfig.module.scss';
 
 interface ModeOption {
 	mode: RuleMode;
@@ -35,24 +34,21 @@ interface ModeSelectorProps {
 
 function ModeSelector({ mode, onChange }: ModeSelectorProps): JSX.Element {
 	return (
-		<div
-			className={styles.modeOptions}
-			data-testid="volume-control-mode-selector"
-		>
+		<div className={styles.modeCards} data-testid="volume-control-mode-selector">
 			{MODE_OPTIONS.map((option) => (
 				<button
 					type="button"
 					key={option.mode}
-					className={cx(styles.modeOption, {
-						[styles.modeOptionSelected]: mode === option.mode,
-					})}
+					className={`${styles.modeCard} ${
+						mode === option.mode ? styles.modeCardActive : ''
+					}`}
 					onClick={(): void => onChange(option.mode)}
 					data-testid={`volume-control-mode-${option.mode}`}
 				>
-					<Typography.Text size="small" weight="semibold">
+					<Typography.Text className={styles.modeTitle}>
 						{option.title}
 					</Typography.Text>
-					<Typography.Text size="sm" color="muted">
+					<Typography.Text className={styles.modeDesc}>
 						{option.description}
 					</Typography.Text>
 				</button>

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

@@ -1,13 +1,11 @@
 import { Info } from '@signozhq/icons';
-import { Typography } from '@signozhq/ui/typography';
 import {
 	MetricreductionruletypesAffectedAssetDTO,
 	MetricreductionruletypesAssetTypeDTO,
 } from 'api/generated/services/sigNoz.schemas';
-import { QueryParams } from 'constants/query';
 import ROUTES from 'constants/routes';
 
-import styles from './RelatedAssetsWarning.module.scss';
+import styles from './VolumeControlConfig.module.scss';
 
 const AssetType = MetricreductionruletypesAssetTypeDTO;
 
@@ -18,10 +16,8 @@ function assetHref(
 		return undefined;
 	}
 	if (asset.type === AssetType.dashboard) {
-		const base = ROUTES.DASHBOARD.replace(':dashboardId', asset.id);
-		return asset.widget?.id
-			? `${base}?${QueryParams.expandedWidgetId}=${asset.widget.id}`
-			: base;
+		const base = `/dashboard/${asset.id}`;
+		return asset.widgetId ? `${base}/${asset.widgetId}` : base;
 	}
 	if (asset.type === AssetType.alert_rule) {
 		return `${ROUTES.EDIT_ALERTS}?ruleId=${asset.id}`;
@@ -36,6 +32,8 @@ interface RelatedAssetsWarningProps {
 function RelatedAssetsWarning({
 	affectedAssets,
 }: RelatedAssetsWarningProps): JSX.Element | null {
+	// Dashboards are flagged only when they use a dropped label (group-by or filter); alerts are
+	// flagged whenever they reference the metric, since we don't yet resolve their impacted labels.
 	const impacted = (affectedAssets ?? []).filter(
 		(asset) =>
 			asset.type === AssetType.alert_rule ||
@@ -52,38 +50,29 @@ function RelatedAssetsWarning({
 	return (
 		<div className={styles.warning} data-testid="volume-control-warning">
 			<Info size={14} />
-			<div className={styles.warningBody}>
-				<Typography.Text as="div" size="small" weight="semibold" color="warning">
+			<div>
+				<div className={styles.warningTitle}>
 					This rule affects {impacted.length} related asset
 					{impacted.length > 1 ? 's' : ''}.
-				</Typography.Text>
+				</div>
 				{impactedLabels.length > 0 && (
-					<Typography.Text as="div" size="sm" color="muted">
+					<div className={styles.warningDetail}>
 						{impactedLabels.join(', ')} will no longer be queryable; affected panels
 						fall back to aggregated data once the rule applies.
-					</Typography.Text>
+					</div>
 				)}
 				<ul className={styles.assetList}>
 					{impacted.map((asset) => {
 						const href = assetHref(asset);
-						const label = `${asset.name}${
-							asset.widget ? ` · ${asset.widget.name}` : ''
-						}`;
+						const label = `${asset.name}${asset.widget ? ` · ${asset.widget}` : ''}`;
 						return (
-							<li key={`${asset.type}-${asset.id}-${asset.widget?.id ?? ''}`}>
+							<li key={`${asset.type}-${asset.id}-${asset.widgetId ?? ''}`}>
 								{href ? (
-									<Typography.Link
-										size="sm"
-										href={href}
-										target="_blank"
-										rel="noopener noreferrer"
-									>
+									<a href={href} target="_blank" rel="noopener noreferrer">
 										{label}
-									</Typography.Link>
+									</a>
 								) : (
-									<Typography.Text size="sm" color="muted">
-										{label}
-									</Typography.Text>
+									label
 								)}
 							</li>
 						);

frontend/src/container/MetricsExplorer/MetricDetails/VolumeControl/VolumeControlConfig.module.scss

@@ -0,0 +1,172 @@
+.body {
+	display: flex;
+	flex-direction: column;
+	gap: 20px;
+	padding: 4px 2px;
+}
+
+.title {
+	display: flex;
+	align-items: center;
+	gap: 10px;
+}
+
+.admin-tag {
+	font-size: 10px;
+	font-weight: 600;
+	letter-spacing: 0.03em;
+	color: var(--bg-amber-400, #ffd778);
+	border: 1px solid var(--bg-amber-500, #ffcc56);
+	border-radius: 99px;
+	padding: 1px 8px;
+}
+
+/* mode cards */
+.mode-cards {
+	display: grid;
+	grid-template-columns: repeat(3, 1fr);
+	gap: 10px;
+}
+
+.mode-card {
+	display: flex;
+	flex-direction: column;
+	gap: 4px;
+	text-align: left;
+	border: 1px solid var(--bg-slate-400, #1d212d);
+	border-radius: 6px;
+	background: var(--bg-ink-300, #16181d);
+	padding: 12px;
+	cursor: pointer;
+	transition:
+		border-color 0.12s ease,
+		background 0.12s ease;
+}
+
+.mode-card:hover {
+	border-color: var(--bg-slate-200, #2c3140);
+}
+
+.mode-card-active {
+	border-color: var(--bg-robin-500, #4e74f8);
+	background: rgba(78, 116, 248, 0.08);
+}
+
+.mode-title {
+	font-size: 12.5px;
+	font-weight: 600;
+	color: var(--bg-vanilla-100, #fff);
+}
+
+.mode-desc {
+	font-size: 11px;
+	color: var(--bg-vanilla-400, #c0c1c3);
+	line-height: 1.45;
+}
+
+/* label selector */
+.field {
+	display: flex;
+	flex-direction: column;
+	gap: 6px;
+}
+
+.field-label {
+	font-size: 12.5px;
+	font-weight: 600;
+	color: var(--bg-vanilla-100, #fff);
+}
+
+.field-hint {
+	font-size: 11px;
+	color: var(--bg-vanilla-400, #c0c1c3);
+}
+
+.label-select {
+	width: 100%;
+	margin-top: 4px;
+}
+
+/* impact panel */
+.impact {
+	border: 1px solid var(--bg-slate-400, #1d212d);
+	border-radius: 6px;
+	background: var(--bg-ink-300, #16181d);
+	padding: 14px;
+}
+
+.impact-note {
+	font-size: 12px;
+	color: var(--bg-vanilla-400, #c0c1c3);
+}
+
+.meters {
+	display: grid;
+	grid-template-columns: repeat(3, 1fr);
+	gap: 12px;
+}
+
+.meter {
+	display: flex;
+	flex-direction: column;
+	gap: 5px;
+}
+
+.meter-label {
+	font-size: 10px;
+	text-transform: uppercase;
+	letter-spacing: 0.04em;
+	color: var(--bg-vanilla-400, #c0c1c3);
+}
+
+.meter-value {
+	font-family: 'Geist Mono', monospace;
+	font-size: 18px;
+	color: var(--bg-vanilla-100, #fff);
+}
+
+.meter-value-good {
+	color: var(--bg-forest-400, #50e7a7);
+}
+
+/* related-asset warning */
+.warning {
+	display: flex;
+	gap: 10px;
+	padding: 11px 13px;
+	border-radius: 6px;
+	background: rgba(255, 204, 86, 0.07);
+	border: 1px solid rgba(255, 204, 86, 0.3);
+	color: var(--bg-amber-400, #ffd778);
+}
+
+.warning-title {
+	font-size: 12px;
+	font-weight: 600;
+	color: var(--bg-vanilla-100, #fff);
+}
+
+.warning-detail {
+	font-size: 11.5px;
+	color: var(--bg-vanilla-300, #e9e9e9);
+	margin-top: 4px;
+}
+
+.asset-list {
+	margin: 6px 0 0;
+	padding-left: 16px;
+	font-size: 11.5px;
+	color: var(--bg-vanilla-300, #e9e9e9);
+}
+
+/* footer */
+.footer {
+	display: flex;
+	align-items: center;
+	gap: 10px;
+	width: 100%;
+}
+
+.footer-spacer {
+	flex: 1;
+}

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

@@ -1,14 +1,13 @@
 import { Button } from '@signozhq/ui/button';
 import { DrawerWrapper } from '@signozhq/ui/drawer';
-import { Typography } from '@signozhq/ui/typography';
 import { MetricreductionruletypesGettableReductionRuleDTO } from 'api/generated/services/sigNoz.schemas';
 
-import { useVolumeControlConfig } from '../../hooks/useVolumeControlConfig';
-import ImpactPanel from './ImpactPanel/ImpactPanel';
-import LabelSelector from './LabelSelector/LabelSelector';
-import ModeSelector from './ModeSelector/ModeSelector';
-import RelatedAssetsWarning from './RelatedAssetsWarning/RelatedAssetsWarning';
-import styles from './VolumeControlConfigDrawer.module.scss';
+import ImpactPanel from './ImpactPanel';
+import LabelSelector from './LabelSelector';
+import ModeSelector from './ModeSelector';
+import RelatedAssetsWarning from './RelatedAssetsWarning';
+import { useVolumeControlConfig } from './useVolumeControlConfig';
+import styles from './VolumeControlConfig.module.scss';
 
 interface VolumeControlConfigDrawerProps {
 	metricName: string;
@@ -93,15 +92,8 @@ function VolumeControlConfigDrawer({
 			style={{ zIndex: 1100 }}
 		>
 			<div className={styles.body} data-testid="volume-control-config-drawer">
-				<div className={styles.adminRow}>
-					<Typography.Text
-						size="xs"
-						weight="semibold"
-						color="warning"
-						className={styles.adminOnlyTag}
-					>
-						Admin only
-					</Typography.Text>
+				<div className={styles.title}>
+					<span className={styles.adminTag}>Admin only</span>
 				</div>
 				<ModeSelector mode={mode} onChange={setMode} />
 				{mode !== 'all' && (

frontend/src/container/MetricsExplorer/MetricDetails/VolumeControl/VolumeControlSection.module.scss

@@ -0,0 +1,114 @@
+.section {
+	margin-top: 16px;
+}
+
+.header {
+	display: flex;
+	align-items: center;
+	gap: 8px;
+	margin-bottom: 10px;
+	color: var(--bg-vanilla-400, #c0c1c3);
+}
+
+.title {
+	font-size: 11px;
+	font-weight: 600;
+	text-transform: uppercase;
+	letter-spacing: 0.05em;
+}
+
+.card {
+	border: 1px solid var(--bg-slate-400, #1d212d);
+	border-radius: 6px;
+	padding: 12px 14px;
+	background: var(--bg-ink-300, #16181d);
+}
+
+.card-row {
+	display: flex;
+	align-items: center;
+	gap: 8px;
+	margin-bottom: 8px;
+}
+
+.status-dot {
+	width: 7px;
+	height: 7px;
+	border-radius: 50%;
+	flex: 0 0 auto;
+}
+
+.status-active {
+	background: var(--bg-forest-500, #25e192);
+}
+
+.status-pending {
+	background: var(--bg-amber-500, #ffcc56);
+}
+
+.card-title {
+	font-weight: 600;
+}
+
+.mode {
+	display: block;
+	font-size: 12px;
+	color: var(--bg-vanilla-400, #c0c1c3);
+	margin-bottom: 8px;
+}
+
+.chips {
+	display: flex;
+	flex-wrap: wrap;
+	gap: 6px;
+}
+
+.chip {
+	font-family: 'Geist Mono', monospace;
+	font-size: 11px;
+	padding: 2px 8px;
+	border-radius: 4px;
+	background: var(--bg-ink-200, #23262e);
+	border: 1px solid var(--bg-slate-400, #1d212d);
+	color: var(--bg-vanilla-100, #fff);
+}
+
+.empty {
+	display: flex;
+	flex-direction: column;
+	align-items: flex-start;
+	border: 1px dashed var(--bg-slate-300, #242834);
+	border-radius: 6px;
+	padding: 14px;
+}
+
+.empty-text {
+	font-size: 12px;
+	color: var(--bg-vanilla-400, #c0c1c3);
+}
+
+.setup-button {
+	margin-top: 12px;
+}
+
+.edit-button {
+	margin-left: auto;
+}
+
+.pending-banner {
+	display: flex;
+	align-items: flex-start;
+	gap: 8px;
+	padding: 9px 12px;
+	margin-bottom: 10px;
+	border-radius: 6px;
+	background: rgba(35, 196, 248, 0.07);
+	border: 1px solid rgba(35, 196, 248, 0.25);
+	color: var(--bg-aqua-400, #4bcff9);
+}
+
+.pending-text {
+	font-size: 11.5px;
+	color: var(--bg-vanilla-300, #e9e9e9);
+	line-height: 1.45;
+}

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

@@ -0,0 +1,136 @@
+import { Gauge, Info } from '@signozhq/icons';
+import { Button } from '@signozhq/ui/button';
+import { Typography } from '@signozhq/ui/typography';
+import { Skeleton } from 'antd';
+import { useGetMetricReductionRule } from 'api/generated/services/metrics';
+import { useVolumeControlFeatureGate } from 'hooks/metricsExplorer/useVolumeControlFeatureGate';
+import { useState } from 'react';
+
+import { getLabelVerb, getMatchTypeLabel } from './utils';
+import VolumeControlConfigDrawer from './VolumeControlConfigDrawer';
+import styles from './VolumeControlSection.module.scss';
+
+interface VolumeControlSectionProps {
+	metricName: string;
+}
+
+function VolumeControlSection({
+	metricName,
+}: VolumeControlSectionProps): JSX.Element | null {
+	const { isVolumeControlEnabled, canManageVolumeControl } =
+		useVolumeControlFeatureGate();
+	const [isConfigOpen, setIsConfigOpen] = useState(false);
+
+	const { data, isLoading, error } = useGetMetricReductionRule(
+		{ metricName },
+		{
+			query: {
+				enabled: isVolumeControlEnabled && !!metricName,
+				retry: false,
+			},
+		},
+	);
+
+	if (!isVolumeControlEnabled) {
+		return null;
+	}
+
+	const rule = data?.data;
+	const hasRule = !!rule && !error;
+
+	const openConfig = (): void => setIsConfigOpen(true);
+	const closeConfig = (): void => setIsConfigOpen(false);
+
+	return (
+		<div className={styles.section} data-testid="volume-control-section">
+			<div className={styles.header}>
+				<Gauge size={14} />
+				<Typography.Text className={styles.title}>Volume control</Typography.Text>
+			</div>
+
+			{isLoading && <Skeleton active title={false} paragraph={{ rows: 2 }} />}
+
+			{!isLoading && hasRule && rule && !rule.active && (
+				<div
+					className={styles.pendingBanner}
+					data-testid="volume-control-pending-banner"
+				>
+					<Info size={13} />
+					<Typography.Text className={styles.pendingText}>
+						This metric&apos;s configuration was recently updated. Reduced volumes
+						will take effect within a few minutes.
+					</Typography.Text>
+				</div>
+			)}
+
+			{!isLoading && hasRule && rule && (
+				<div className={styles.card} data-testid="volume-control-active">
+					<div className={styles.cardRow}>
+						<span
+							className={`${styles.statusDot} ${
+								rule.active ? styles.statusActive : styles.statusPending
+							}`}
+						/>
+						<Typography.Text className={styles.cardTitle}>
+							{rule.active
+								? 'Aggregation rule active'
+								: 'Aggregation rule pending activation'}
+						</Typography.Text>
+						{canManageVolumeControl && (
+							<Button
+								variant="ghost"
+								color="secondary"
+								className={styles.editButton}
+								onClick={openConfig}
+								data-testid="volume-control-edit"
+							>
+								Edit
+							</Button>
+						)}
+					</div>
+					<Typography.Text className={styles.mode}>
+						{getMatchTypeLabel(rule.matchType)}
+					</Typography.Text>
+					<div className={styles.chips}>
+						{(rule.labels ?? []).map((label) => (
+							<span className={styles.chip} key={label}>
+								{getLabelVerb(rule.matchType)} {label}
+							</span>
+						))}
+					</div>
+				</div>
+			)}
+
+			{!isLoading && !hasRule && (
+				<div className={styles.empty} data-testid="volume-control-empty">
+					<Typography.Text className={styles.emptyText}>
+						No volume control rule. All series are retained. Aggregate away
+						high-cardinality attributes to reduce cost.
+					</Typography.Text>
+					{canManageVolumeControl && (
+						<Button
+							variant="solid"
+							color="primary"
+							className={styles.setupButton}
+							onClick={openConfig}
+							data-testid="volume-control-setup"
+						>
+							Set up volume control
+						</Button>
+					)}
+				</div>
+			)}
+
+			{canManageVolumeControl && isConfigOpen && (
+				<VolumeControlConfigDrawer
+					metricName={metricName}
+					existingRule={rule ?? null}
+					open={isConfigOpen}
+					onClose={closeConfig}
+				/>
+			)}
+		</div>
+	);
+}
+
+export default VolumeControlSection;

frontend/src/container/MetricsExplorer/MetricDetails/VolumeControl/useVolumeControlConfig.ts

@@ -1,15 +1,15 @@
 import {
+	invalidateGetMetricReductionRule,
 	invalidateListMetricReductionRules,
 	invalidateListMetrics,
-	useCreateMetricReductionRule,
-	useDeleteMetricReductionRuleByID,
+	useDeleteMetricReductionRule,
 	useGetMetricAttributes,
 	usePreviewMetricReductionRule,
-	useUpdateMetricReductionRuleByID,
+	useUpsertMetricReductionRule,
 } from 'api/generated/services/metrics';
 import {
-	MetricreductionruletypesGettableReductionRuleDTO,
 	MetricreductionruletypesGettableReductionRulePreviewDTO,
+	MetricreductionruletypesGettableReductionRuleDTO,
 } from 'api/generated/services/sigNoz.schemas';
 import { useNotifications } from 'hooks/useNotifications';
 import { useCallback, useEffect, useMemo, useState } from 'react';
@@ -19,8 +19,8 @@ import { useSelector } from 'react-redux';
 import { AppState } from 'store/reducers';
 import { GlobalReducer } from 'types/reducer/globalTime';
 
-import { matchTypeForMode, modeFromRule } from '../configUtils';
-import { RuleMode } from '../types';
+import { matchTypeForMode, modeFromRule } from './configUtils';
+import { RuleMode } from './types';
 
 interface UseVolumeControlConfigParams {
 	metricName: string;
@@ -66,11 +66,9 @@ export function useVolumeControlConfig({
 	const [mode, setMode] = useState<RuleMode>(initial.mode);
 	const [labels, setLabels] = useState<string[]>(initial.labels);
 
-	const existingRuleId = existingRule?.id;
-
 	const attributesQuery = useGetMetricAttributes(
+		{ metricName },
 		{
-			metricName,
 			start: minTime ? Math.floor(minTime / 1000000) : undefined,
 			end: maxTime ? Math.floor(maxTime / 1000000) : undefined,
 		},
@@ -101,22 +99,18 @@ export function useVolumeControlConfig({
 		return (): void => clearTimeout(timer);
 	}, [open, mode, labels, metricName, previewMutate, previewReset]);
 
-	const createMutation = useCreateMetricReductionRule();
-	const updateMutation = useUpdateMetricReductionRuleByID();
-	const deleteMutation = useDeleteMetricReductionRuleByID();
+	const upsertMutation = useUpsertMetricReductionRule();
+	const deleteMutation = useDeleteMetricReductionRule();
 
 	const invalidate = useCallback((): void => {
+		void invalidateGetMetricReductionRule(queryClient, { metricName });
 		void invalidateListMetricReductionRules(queryClient);
 		void invalidateListMetrics(queryClient);
-	}, [queryClient]);
+	}, [queryClient, metricName]);
 
 	const removeRule = useCallback((): void => {
-		if (!existingRuleId) {
-			onClose();
-			return;
-		}
 		deleteMutation.mutate(
-			{ pathParams: { id: existingRuleId } },
+			{ pathParams: { metricName } },
 			{
 				onSuccess: () => {
 					notifications.success({ message: 'Volume control rule removed' });
@@ -129,47 +123,28 @@ export function useVolumeControlConfig({
 					}),
 			},
 		);
-	}, [deleteMutation, existingRuleId, notifications, invalidate, onClose]);
+	}, [deleteMutation, metricName, notifications, invalidate, onClose]);
 
 	const save = useCallback((): void => {
 		if (mode === 'all') {
-			if (!existingRuleId) {
+			if (!existingRule) {
 				onClose();
 				return;
 			}
 			removeRule();
 			return;
 		}
-
-		const onSuccess = (): void => {
-			notifications.success({ message: 'Volume control rule saved' });
-			invalidate();
-			onClose();
-		};
-
-		if (existingRuleId) {
-			updateMutation.mutate(
-				{
-					pathParams: { id: existingRuleId },
-					data: { matchType: matchTypeForMode(mode), labels },
-				},
-				{
-					onSuccess,
-					onError: (error) =>
-						notifications.error({
-							message: error.response?.data?.error?.message ?? SAVE_ERROR_MESSAGE,
-						}),
-				},
-			);
-			return;
-		}
-
-		createMutation.mutate(
+		upsertMutation.mutate(
 			{
-				data: { metricName, matchType: matchTypeForMode(mode), labels },
+				pathParams: { metricName },
+				data: { matchType: matchTypeForMode(mode), labels },
 			},
 			{
-				onSuccess,
+				onSuccess: () => {
+					notifications.success({ message: 'Volume control rule saved' });
+					invalidate();
+					onClose();
+				},
 				onError: (error) =>
 					notifications.error({
 						message: error.response?.data?.error?.message ?? SAVE_ERROR_MESSAGE,
@@ -180,9 +155,8 @@ export function useVolumeControlConfig({
 		mode,
 		labels,
 		metricName,
-		existingRuleId,
-		createMutation,
-		updateMutation,
+		existingRule,
+		upsertMutation,
 		removeRule,
 		notifications,
 		invalidate,
@@ -200,12 +174,9 @@ export function useVolumeControlConfig({
 		isPreviewLoading: isPreviewPending,
 		save,
 		remove: removeRule,
-		isSaving:
-			createMutation.isLoading ||
-			updateMutation.isLoading ||
-			deleteMutation.isLoading,
+		isSaving: upsertMutation.isLoading || deleteMutation.isLoading,
 		isRemoving: deleteMutation.isLoading,
-		hasExistingRule: !!existingRuleId,
+		hasExistingRule: !!existingRule,
 		isSaveDisabled: mode !== 'all' && labels.length === 0,
 	};
 }

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

@@ -195,12 +195,14 @@ describe('Metadata', () => {
 		expect(mockUseUpdateMetricMetadata).toHaveBeenCalledWith(
 			expect.objectContaining({
 				data: expect.objectContaining({
-					metricName: MOCK_METRIC_NAME,
 					type: MetrictypesTypeDTO.sum,
 					temporality: MetrictypesTemporalityDTO.cumulative,
 					unit: 'By',
 					isMonotonic: true,
 				}),
+				pathParams: {
+					metricName: MOCK_METRIC_NAME,
+				},
 			}),
 			expect.objectContaining({
 				onSuccess: expect.any(Function),

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

@@ -78,7 +78,7 @@ jest.mock(
 );
 
 jest.mock(
-	'container/MetricsExplorer/VolumeControl/components/VolumeControlSection/VolumeControlSection',
+	'container/MetricsExplorer/MetricDetails/VolumeControl/VolumeControlSection',
 	() =>
 		function MockVolumeControlSection(): JSX.Element {
 			return <div data-testid="volume-control-section-mock">Volume Control</div>;

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

@@ -58,7 +58,6 @@
 	}
 
 	.metrics-table-container {
-		padding-bottom: 48px;
 		.ant-table {
 			margin-left: -16px;
 			margin-right: -16px;

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

@@ -1,6 +1,5 @@
 import { Color } from '@signozhq/design-tokens';
-import { Tooltip } from 'antd';
-import { TableColumnType as ColumnType } from 'antd';
+import { TableColumnType as ColumnType, Tooltip } from 'antd';
 import {
 	MetricsexplorertypesStatDTO,
 	MetricsexplorertypesTreemapEntryDTO,

frontend/src/container/MetricsExplorer/VolumeControl/components/VolumeControlBadge.tsx

@@ -1,23 +0,0 @@
-import { Gauge } from '@signozhq/icons';
-import { MetricreductionruletypesGettableReductionRuleDTO } from 'api/generated/services/sigNoz.schemas';
-
-import { Badge } from '@signozhq/ui/badge';
-
-interface VolumeControlBadgeProps {
-	rule: MetricreductionruletypesGettableReductionRuleDTO;
-}
-
-function VolumeControlBadge({ rule }: VolumeControlBadgeProps): JSX.Element {
-	return (
-		<Badge
-			data-testid="vc-badge-active"
-			variant="outline"
-			color={!rule.active ? 'success' : 'warning'}
-		>
-			<Gauge size={12} />
-			{!rule.active ? 'Active' : 'Pending'}
-		</Badge>
-	);
-}
-
-export default VolumeControlBadge;

frontend/src/container/MetricsExplorer/VolumeControl/components/VolumeControlChart/VolumeControlChart.module.scss

@@ -1,17 +0,0 @@
-.chart {
-	display: flex;
-	flex-direction: column;
-	gap: 8px;
-	border: 1px solid var(--bg-slate-400, #1d212d);
-	border-radius: 6px;
-	padding: 12px 16px 0 16px;
-}
-
-.chartTitle {
-	text-transform: uppercase;
-	letter-spacing: 0.05em;
-}
-
-.chartBody {
-	height: 340px;
-}

frontend/src/container/MetricsExplorer/VolumeControl/components/VolumeControlConfigDrawer/ImpactPanel/ImpactPanel.module.scss

@@ -1,27 +0,0 @@
-.impactPanel {
-	border: 1px solid var(--bg-slate-400, #1d212d);
-	border-radius: 6px;
-	background: var(--bg-ink-300, #16181d);
-	padding: 14px;
-}
-
-.meterGrid {
-	display: grid;
-	grid-template-columns: repeat(3, 1fr);
-	gap: 12px;
-}
-
-.meter {
-	display: flex;
-	flex-direction: column;
-	gap: 5px;
-}
-
-.meterLabel {
-	text-transform: uppercase;
-	letter-spacing: 0.04em;
-}
-
-.meterValue {
-	font-family: 'Geist Mono', monospace;
-}

frontend/src/container/MetricsExplorer/VolumeControl/components/VolumeControlConfigDrawer/ImpactPanel/ImpactPanel.tsx

@@ -1,81 +0,0 @@
-import { Typography } from '@signozhq/ui/typography';
-import { Spin } from 'antd';
-import { MetricreductionruletypesGettableReductionRulePreviewDTO } from 'api/generated/services/sigNoz.schemas';
-
-import { formatCompact } from '../../../configUtils';
-import { RuleMode } from '../../../types';
-import styles from './ImpactPanel.module.scss';
-
-interface ImpactPanelProps {
-	mode: RuleMode;
-	preview?: MetricreductionruletypesGettableReductionRulePreviewDTO;
-	isLoading: boolean;
-}
-
-function ImpactPanel({
-	mode,
-	preview,
-	isLoading,
-}: ImpactPanelProps): JSX.Element {
-	if (mode === 'all') {
-		return (
-			<div className={styles.impactPanel} data-testid="volume-control-impact">
-				<Typography.Text size="small" color="muted">
-					All attributes remain queryable, no reduction.
-				</Typography.Text>
-			</div>
-		);
-	}
-
-	const current = preview?.currentRetainedSeries ?? 0;
-	const proposed = preview?.retainedSeries ?? 0;
-	const deltaPct = current > 0 ? (1 - proposed / current) * 100 : 0;
-	const reductionLabel = `${deltaPct >= 0 ? '−' : '+'}${Math.round(
-		Math.abs(deltaPct),
-	)}%`;
-
-	return (
-		<div className={styles.impactPanel} data-testid="volume-control-impact">
-			{isLoading && <Spin size="small" />}
-			{!isLoading && preview && (
-				<div className={styles.meterGrid}>
-					<div className={styles.meter}>
-						<Typography.Text size="xs" color="muted" className={styles.meterLabel}>
-							Current series
-						</Typography.Text>
-						<Typography.Text size="2xl" className={styles.meterValue}>
-							{formatCompact(current)}
-						</Typography.Text>
-					</div>
-					<div className={styles.meter}>
-						<Typography.Text size="xs" color="muted" className={styles.meterLabel}>
-							Proposed series
-						</Typography.Text>
-						<Typography.Text size="2xl" className={styles.meterValue}>
-							{formatCompact(proposed)}
-						</Typography.Text>
-					</div>
-					<div className={styles.meter}>
-						<Typography.Text size="xs" color="muted" className={styles.meterLabel}>
-							Reduction
-						</Typography.Text>
-						<Typography.Text
-							size="2xl"
-							color={deltaPct >= 0 ? 'success' : undefined}
-							className={styles.meterValue}
-						>
-							{reductionLabel}
-						</Typography.Text>
-					</div>
-				</div>
-			)}
-			{!isLoading && !preview && (
-				<Typography.Text size="small" color="muted">
-					Select attributes to preview the impact.
-				</Typography.Text>
-			)}
-		</div>
-	);
-}
-
-export default ImpactPanel;

frontend/src/container/MetricsExplorer/VolumeControl/components/VolumeControlConfigDrawer/LabelSelector/LabelSelector.module.scss

@@ -1,10 +0,0 @@
-.fieldGroup {
-	display: flex;
-	flex-direction: column;
-	gap: 6px;
-}
-
-.attributeSelect {
-	width: 100%;
-	margin-top: 4px;
-}

frontend/src/container/MetricsExplorer/VolumeControl/components/VolumeControlConfigDrawer/ModeSelector/ModeSelector.module.scss

@@ -1,29 +0,0 @@
-.modeOptions {
-	display: grid;
-	grid-template-columns: repeat(3, 1fr);
-	gap: 10px;
-}
-
-.modeOption {
-	display: flex;
-	flex-direction: column;
-	gap: 4px;
-	text-align: left;
-	border: 1px solid var(--bg-slate-400, #1d212d);
-	border-radius: 6px;
-	background: var(--bg-ink-300, #16181d);
-	padding: 12px;
-	cursor: pointer;
-	transition:
-		border-color 0.12s ease,
-		background 0.12s ease;
-
-	&:hover {
-		border-color: var(--bg-slate-200, #2c3140);
-	}
-}
-
-.modeOptionSelected {
-	border-color: var(--bg-robin-500, #4e74f8);
-	background: var(--callout-primary-background);
-}

frontend/src/container/MetricsExplorer/VolumeControl/components/VolumeControlConfigDrawer/RelatedAssetsWarning/RelatedAssetsWarning.module.scss

@@ -1,20 +0,0 @@
-.warning {
-	display: flex;
-	gap: 10px;
-	padding: 11px 13px;
-	border-radius: 6px;
-	background: var(--callout-warning-background);
-	border: 1px solid var(--callout-warning-border);
-	color: var(--callout-warning-icon);
-}
-
-.warningBody {
-	display: flex;
-	flex-direction: column;
-	gap: 4px;
-}
-
-.assetList {
-	margin: 2px 0 0;
-	padding-left: 16px;
-}

frontend/src/container/MetricsExplorer/VolumeControl/components/VolumeControlConfigDrawer/VolumeControlConfigDrawer.module.scss

@@ -1,30 +0,0 @@
-.body {
-	display: flex;
-	flex-direction: column;
-	gap: 20px;
-	padding: 4px 2px;
-}
-
-.adminRow {
-	display: flex;
-	align-items: center;
-	gap: 10px;
-}
-
-.adminOnlyTag {
-	border: 1px solid var(--bg-amber-500, #ffcc56);
-	border-radius: 99px;
-	padding: 1px 8px;
-	letter-spacing: 0.03em;
-}
-
-.footer {
-	display: flex;
-	align-items: center;
-	gap: 10px;
-	width: 100%;
-}
-
-.footerSpacer {
-	flex: 1;
-}

frontend/src/container/MetricsExplorer/VolumeControl/components/VolumeControlSection/NoRuleEmptyState/NoRuleEmptyState.module.scss

@@ -1,12 +0,0 @@
-.emptyState {
-	display: flex;
-	flex-direction: column;
-	align-items: flex-start;
-	border: 1px dashed var(--bg-slate-300, #242834);
-	border-radius: 6px;
-	padding: 14px;
-}
-
-.setupButton {
-	margin-top: 12px;
-}

frontend/src/container/MetricsExplorer/VolumeControl/components/VolumeControlSection/NoRuleEmptyState/NoRuleEmptyState.tsx

@@ -1,36 +0,0 @@
-import { Button } from '@signozhq/ui/button';
-import { Typography } from '@signozhq/ui/typography';
-
-import styles from './NoRuleEmptyState.module.scss';
-
-interface NoRuleEmptyStateProps {
-	canManage: boolean;
-	onSetup: () => void;
-}
-
-function NoRuleEmptyState({
-	canManage,
-	onSetup,
-}: NoRuleEmptyStateProps): JSX.Element {
-	return (
-		<div className={styles.emptyState} data-testid="volume-control-empty">
-			<Typography.Text size="small" color="muted">
-				No volume control rule. All series are retained. Aggregate away
-				high-cardinality attributes to reduce cost.
-			</Typography.Text>
-			{canManage && (
-				<Button
-					variant="solid"
-					color="primary"
-					className={styles.setupButton}
-					onClick={onSetup}
-					data-testid="volume-control-setup"
-				>
-					Set up volume control
-				</Button>
-			)}
-		</div>
-	);
-}
-
-export default NoRuleEmptyState;

frontend/src/container/MetricsExplorer/VolumeControl/components/VolumeControlSection/PendingActivationBanner/PendingActivationBanner.module.scss

@@ -1,10 +0,0 @@
-.banner {
-	display: flex;
-	align-items: flex-start;
-	gap: 8px;
-	padding: 9px 12px;
-	border-radius: 6px;
-	background: var(--callout-primary-background);
-	border: 1px solid var(--callout-primary-border);
-	color: var(--callout-primary-icon);
-}

frontend/src/container/MetricsExplorer/VolumeControl/components/VolumeControlSection/PendingActivationBanner/PendingActivationBanner.tsx

@@ -1,18 +0,0 @@
-import { Info } from '@signozhq/icons';
-import { Typography } from '@signozhq/ui/typography';
-
-import styles from './PendingActivationBanner.module.scss';
-
-function PendingActivationBanner(): JSX.Element {
-	return (
-		<div className={styles.banner} data-testid="volume-control-pending-banner">
-			<Info size={13} />
-			<Typography.Text size="sm" color="muted">
-				This metric&apos;s configuration was recently updated. Volume changes will
-				take effect within a few minutes.
-			</Typography.Text>
-		</div>
-	);
-}
-
-export default PendingActivationBanner;