chore(deps): bump github.com/go-viper/mapstructure/v2

Bumps [github.com/go-viper/mapstructure/v2](https://github.com/go-viper/mapstructure) from 2.3.0 to 2.4.0.
- [Release notes](https://github.com/go-viper/mapstructure/releases)
- [Changelog](https://github.com/go-viper/mapstructure/blob/main/CHANGELOG.md)
- [Commits](https://github.com/go-viper/mapstructure/compare/v2.3.0...v2.4.0)

---
updated-dependencies:
- dependency-name: github.com/go-viper/mapstructure/v2
  dependency-version: 2.4.0
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

.devenv/docker/clickhouse/compose.yaml

@@ -1,6 +1,6 @@
 services:
   clickhouse:
-    image: clickhouse/clickhouse-server:24.1.2-alpine
+    image: clickhouse/clickhouse-server:25.5.6
     container_name: clickhouse
     volumes:
       - ${PWD}/fs/etc/clickhouse-server/config.d/config.xml:/etc/clickhouse-server/config.d/config.xml
@@ -23,6 +23,8 @@ services:
       retries: 3
     depends_on:
       - zookeeper
+    environment:
+      - CLICKHOUSE_SKIP_USER_SETUP=1
   zookeeper:
     image: signoz/zookeeper:3.7.1
     container_name: zookeeper
@@ -40,7 +42,7 @@ services:
       timeout: 5s
       retries: 3
   schema-migrator-sync:
-    image: signoz/signoz-schema-migrator:v0.129.2
+    image: signoz/signoz-schema-migrator:v0.129.5
     container_name: schema-migrator-sync
     command:
       - sync
@@ -53,7 +55,7 @@ services:
         condition: service_healthy
     restart: on-failure
   schema-migrator-async:
-    image: signoz/signoz-schema-migrator:v0.129.2
+    image: signoz/signoz-schema-migrator:v0.129.5
     container_name: schema-migrator-async
     command:
       - async

.github/CODEOWNERS

@@ -5,6 +5,45 @@
 /frontend/ @SigNoz/frontend @YounixM
 /frontend/src/container/MetricsApplication @srikanthccv
 /frontend/src/container/NewWidget/RightContainer/types.ts @srikanthccv
+
+# Dashboard, Alert, Metrics, Service Map, Services
+/frontend/src/container/ListOfDashboard/ @srikanthccv
+/frontend/src/container/NewDashboard/ @srikanthccv
+/frontend/src/pages/DashboardsListPage/ @srikanthccv
+/frontend/src/pages/DashboardWidget/ @srikanthccv
+/frontend/src/pages/NewDashboard/ @srikanthccv
+/frontend/src/providers/Dashboard/ @srikanthccv
+
+# Alerts
+/frontend/src/container/AlertHistory/ @srikanthccv
+/frontend/src/container/AllAlertChannels/ @srikanthccv
+/frontend/src/container/AnomalyAlertEvaluationView/ @srikanthccv
+/frontend/src/container/CreateAlertChannels/ @srikanthccv
+/frontend/src/container/CreateAlertRule/ @srikanthccv
+/frontend/src/container/EditAlertChannels/ @srikanthccv
+/frontend/src/container/FormAlertChannels/ @srikanthccv
+/frontend/src/container/FormAlertRules/ @srikanthccv
+/frontend/src/container/ListAlertRules/ @srikanthccv
+/frontend/src/container/TriggeredAlerts/ @srikanthccv
+/frontend/src/pages/AlertChannelCreate/ @srikanthccv
+/frontend/src/pages/AlertDetails/ @srikanthccv
+/frontend/src/pages/AlertHistory/ @srikanthccv
+/frontend/src/pages/AlertList/ @srikanthccv
+/frontend/src/pages/CreateAlert/ @srikanthccv
+/frontend/src/providers/Alert.tsx @srikanthccv
+
+# Metrics
+/frontend/src/container/MetricsExplorer/ @srikanthccv
+/frontend/src/pages/MetricsApplication/ @srikanthccv
+/frontend/src/pages/MetricsExplorer/ @srikanthccv
+
+# Services and Service Map
+/frontend/src/container/ServiceApplication/ @srikanthccv
+/frontend/src/container/ServiceTable/ @srikanthccv
+/frontend/src/pages/Services/ @srikanthccv
+/frontend/src/pages/ServiceTopLevelOperations/ @srikanthccv
+/frontend/src/container/Home/Services/ @srikanthccv
+
 /deploy/ @SigNoz/devops
 .github @SigNoz/devops
 

.golangci.yml

@@ -8,6 +8,7 @@ linters:
     - depguard
     - iface
     - unparam
+    - forbidigo
 
 linters-settings:
   sloglint:
@@ -24,6 +25,10 @@ linters-settings:
         deny:
           - pkg: "go.uber.org/zap"
             desc: "Do not use zap logger. Use slog instead."
+      noerrors:
+        deny:
+          - pkg: "errors"
+            desc: "Do not use errors package. Use github.com/SigNoz/signoz/pkg/errors instead."
   iface:
     enable:
       - identical

CONTRIBUTING.md

@@ -78,4 +78,5 @@ Need assistance? Join our Slack community:
 
 - Set up your [development environment](docs/contributing/development.md)
 - Deploy and observe [SigNoz in action with OpenTelemetry Demo Application](docs/otel-demo-docs.md)
-- Explore the [SigNoz Community Advocate Program](ADVOCATE.md), which recognises contributors who support the community, share their expertise, and help shape SigNoz's future. 
+- Explore the [SigNoz Community Advocate Program](ADVOCATE.md), which recognises contributors who support the community, share their expertise, and help shape SigNoz's future.
+- Write [integration tests](docs/contributing/go/integration.md)

cmd/community/server.go

@@ -32,7 +32,7 @@ func registerServer(parentCmd *cobra.Command, logger *slog.Logger) {
 		Short:              "Run the SigNoz server",
 		FParseErrWhitelist: cobra.FParseErrWhitelist{UnknownFlags: true},
 		RunE: func(currCmd *cobra.Command, args []string) error {
-			config, err := cmd.NewSigNozConfig(currCmd.Context(), flags)
+			config, err := cmd.NewSigNozConfig(currCmd.Context(), logger, flags)
 			if err != nil {
 				return err
 			}

cmd/config.go

@@ -2,7 +2,6 @@ package cmd
 
 import (
 	"context"
-	"fmt"
 	"log/slog"
 	"os"
 
@@ -12,9 +11,10 @@ import (
 	"github.com/SigNoz/signoz/pkg/signoz"
 )
 
-func NewSigNozConfig(ctx context.Context, flags signoz.DeprecatedFlags) (signoz.Config, error) {
+func NewSigNozConfig(ctx context.Context, logger *slog.Logger, flags signoz.DeprecatedFlags) (signoz.Config, error) {
 	config, err := signoz.NewConfig(
 		ctx,
+		logger,
 		config.ResolverConfig{
 			Uris: []string{"env:"},
 			ProviderFactories: []config.ProviderFactory{
@@ -31,14 +31,10 @@ func NewSigNozConfig(ctx context.Context, flags signoz.DeprecatedFlags) (signoz.
 	return config, nil
 }
 
-func NewJWTSecret(_ context.Context, _ *slog.Logger) string {
+func NewJWTSecret(ctx context.Context, logger *slog.Logger) string {
 	jwtSecret := os.Getenv("SIGNOZ_JWT_SECRET")
 	if len(jwtSecret) == 0 {
-		fmt.Println("🚨 CRITICAL SECURITY ISSUE: No JWT secret key specified!")
-		fmt.Println("SIGNOZ_JWT_SECRET environment variable is not set. This has dire consequences for the security of the application.")
-		fmt.Println("Without a JWT secret, user sessions are vulnerable to tampering and unauthorized access.")
-		fmt.Println("Please set the SIGNOZ_JWT_SECRET environment variable immediately.")
-		fmt.Println("For more information, please refer to https://github.com/SigNoz/signoz/issues/8400.")
+		logger.ErrorContext(ctx, "🚨 CRITICAL SECURITY ISSUE: No JWT secret key specified!", "error", "SIGNOZ_JWT_SECRET environment variable is not set. This has dire consequences for the security of the application. Without a JWT secret, user sessions are vulnerable to tampering and unauthorized access. Please set the SIGNOZ_JWT_SECRET environment variable immediately. For more information, please refer to https://github.com/SigNoz/signoz/issues/8400.")
 	}
 
 	return jwtSecret

cmd/enterprise/server.go

@@ -35,7 +35,7 @@ func registerServer(parentCmd *cobra.Command, logger *slog.Logger) {
 		Short:              "Run the SigNoz server",
 		FParseErrWhitelist: cobra.FParseErrWhitelist{UnknownFlags: true},
 		RunE: func(currCmd *cobra.Command, args []string) error {
-			config, err := cmd.NewSigNozConfig(currCmd.Context(), flags)
+			config, err := cmd.NewSigNozConfig(currCmd.Context(), logger, flags)
 			if err != nil {
 				return err
 			}

conf/example.yaml

@@ -137,10 +137,7 @@ prometheus:
 ##################### Alertmanager #####################
 alertmanager:
   # Specifies the alertmanager provider to use.
-  provider: legacy
-  legacy:
-    # The API URL (with prefix) of the legacy Alertmanager instance.
-    api_url: http://localhost:9093/api
+  provider: signoz
   signoz:
     # The poll interval for periodically syncing the alertmanager with the config in the store.
     poll_interval: 1m

deploy/docker-swarm/docker-compose.ha.yaml

@@ -11,7 +11,7 @@ x-common: &common
       max-file: "3"
 x-clickhouse-defaults: &clickhouse-defaults
   !!merge <<: *common
-  image: clickhouse/clickhouse-server:24.1.2-alpine
+  image: clickhouse/clickhouse-server:25.5.6
   tty: true
   deploy:
     labels:
@@ -37,6 +37,8 @@ x-clickhouse-defaults: &clickhouse-defaults
     nofile:
       soft: 262144
       hard: 262144
+  environment:
+    - CLICKHOUSE_SKIP_USER_SETUP=1
 x-zookeeper-defaults: &zookeeper-defaults
   !!merge <<: *common
   image: signoz/zookeeper:3.7.1
@@ -63,7 +65,7 @@ x-db-depend: &db-depend
 services:
   init-clickhouse:
     !!merge <<: *common
-    image: clickhouse/clickhouse-server:24.1.2-alpine
+    image: clickhouse/clickhouse-server:25.5.6
     command:
       - bash
       - -c
@@ -174,7 +176,7 @@ services:
       # - ../common/clickhouse/storage.xml:/etc/clickhouse-server/config.d/storage.xml
   signoz:
     !!merge <<: *db-depend
-    image: signoz/signoz:v0.93.0
+    image: signoz/signoz:v0.95.0
     command:
       - --config=/root/config/prometheus.yml
     ports:
@@ -207,7 +209,7 @@ services:
       retries: 3
   otel-collector:
     !!merge <<: *db-depend
-    image: signoz/signoz-otel-collector:v0.129.2
+    image: signoz/signoz-otel-collector:v0.129.5
     command:
       - --config=/etc/otel-collector-config.yaml
       - --manager-config=/etc/manager-config.yaml
@@ -231,7 +233,7 @@ services:
       - signoz
   schema-migrator:
     !!merge <<: *common
-    image: signoz/signoz-schema-migrator:v0.129.2
+    image: signoz/signoz-schema-migrator:v0.129.5
     deploy:
       restart_policy:
         condition: on-failure

deploy/docker-swarm/docker-compose.yaml

@@ -11,7 +11,7 @@ x-common: &common
       max-file: "3"
 x-clickhouse-defaults: &clickhouse-defaults
   !!merge <<: *common
-  image: clickhouse/clickhouse-server:24.1.2-alpine
+  image: clickhouse/clickhouse-server:25.5.6
   tty: true
   deploy:
     labels:
@@ -36,6 +36,8 @@ x-clickhouse-defaults: &clickhouse-defaults
     nofile:
       soft: 262144
       hard: 262144
+  environment:
+    - CLICKHOUSE_SKIP_USER_SETUP=1
 x-zookeeper-defaults: &zookeeper-defaults
   !!merge <<: *common
   image: signoz/zookeeper:3.7.1
@@ -60,7 +62,7 @@ x-db-depend: &db-depend
 services:
   init-clickhouse:
     !!merge <<: *common
-    image: clickhouse/clickhouse-server:24.1.2-alpine
+    image: clickhouse/clickhouse-server:25.5.6
     command:
       - bash
       - -c
@@ -115,7 +117,7 @@ services:
       # - ../common/clickhouse/storage.xml:/etc/clickhouse-server/config.d/storage.xml
   signoz:
     !!merge <<: *db-depend
-    image: signoz/signoz:v0.93.0
+    image: signoz/signoz:v0.95.0
     command:
       - --config=/root/config/prometheus.yml
     ports:
@@ -148,7 +150,7 @@ services:
       retries: 3
   otel-collector:
     !!merge <<: *db-depend
-    image: signoz/signoz-otel-collector:v0.129.2
+    image: signoz/signoz-otel-collector:v0.129.5
     command:
       - --config=/etc/otel-collector-config.yaml
       - --manager-config=/etc/manager-config.yaml
@@ -174,7 +176,7 @@ services:
       - signoz
   schema-migrator:
     !!merge <<: *common
-    image: signoz/signoz-schema-migrator:v0.129.2
+    image: signoz/signoz-schema-migrator:v0.129.5
     deploy:
       restart_policy:
         condition: on-failure

deploy/docker/docker-compose.ha.yaml

@@ -10,7 +10,7 @@ x-common: &common
 x-clickhouse-defaults: &clickhouse-defaults
   !!merge <<: *common
   # addding non LTS version due to this fix https://github.com/ClickHouse/ClickHouse/commit/32caf8716352f45c1b617274c7508c86b7d1afab
-  image: clickhouse/clickhouse-server:24.1.2-alpine
+  image: clickhouse/clickhouse-server:25.5.6
   tty: true
   labels:
     signoz.io/scrape: "true"
@@ -40,6 +40,8 @@ x-clickhouse-defaults: &clickhouse-defaults
     nofile:
       soft: 262144
       hard: 262144
+  environment:
+    - CLICKHOUSE_SKIP_USER_SETUP=1
 x-zookeeper-defaults: &zookeeper-defaults
   !!merge <<: *common
   image: signoz/zookeeper:3.7.1
@@ -65,7 +67,7 @@ x-db-depend: &db-depend
 services:
   init-clickhouse:
     !!merge <<: *common
-    image: clickhouse/clickhouse-server:24.1.2-alpine
+    image: clickhouse/clickhouse-server:25.5.6
     container_name: signoz-init-clickhouse
     command:
       - bash
@@ -177,7 +179,7 @@ services:
       # - ../common/clickhouse/storage.xml:/etc/clickhouse-server/config.d/storage.xml
   signoz:
     !!merge <<: *db-depend
-    image: signoz/signoz:${VERSION:-v0.93.0}
+    image: signoz/signoz:${VERSION:-v0.95.0}
     container_name: signoz
     command:
       - --config=/root/config/prometheus.yml
@@ -211,7 +213,7 @@ services:
   # TODO: support otel-collector multiple replicas. Nginx/Traefik for loadbalancing?
   otel-collector:
     !!merge <<: *db-depend
-    image: signoz/signoz-otel-collector:${OTELCOL_TAG:-v0.129.2}
+    image: signoz/signoz-otel-collector:${OTELCOL_TAG:-v0.129.5}
     container_name: signoz-otel-collector
     command:
       - --config=/etc/otel-collector-config.yaml
@@ -237,7 +239,7 @@ services:
         condition: service_healthy
   schema-migrator-sync:
     !!merge <<: *common
-    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-v0.129.2}
+    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-v0.129.5}
     container_name: schema-migrator-sync
     command:
       - sync
@@ -248,7 +250,7 @@ services:
         condition: service_healthy
   schema-migrator-async:
     !!merge <<: *db-depend
-    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-v0.129.2}
+    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-v0.129.5}
     container_name: schema-migrator-async
     command:
       - async

deploy/docker/docker-compose.yaml

@@ -9,8 +9,7 @@ x-common: &common
       max-file: "3"
 x-clickhouse-defaults: &clickhouse-defaults
   !!merge <<: *common
-  # addding non LTS version due to this fix https://github.com/ClickHouse/ClickHouse/commit/32caf8716352f45c1b617274c7508c86b7d1afab
-  image: clickhouse/clickhouse-server:24.1.2-alpine
+  image: clickhouse/clickhouse-server:25.5.6
   tty: true
   labels:
     signoz.io/scrape: "true"
@@ -36,6 +35,8 @@ x-clickhouse-defaults: &clickhouse-defaults
     nofile:
       soft: 262144
       hard: 262144
+  environment:
+    - CLICKHOUSE_SKIP_USER_SETUP=1
 x-zookeeper-defaults: &zookeeper-defaults
   !!merge <<: *common
   image: signoz/zookeeper:3.7.1
@@ -61,7 +62,7 @@ x-db-depend: &db-depend
 services:
   init-clickhouse:
     !!merge <<: *common
-    image: clickhouse/clickhouse-server:24.1.2-alpine
+    image: clickhouse/clickhouse-server:25.5.6
     container_name: signoz-init-clickhouse
     command:
       - bash
@@ -110,7 +111,7 @@ services:
       # - ../common/clickhouse/storage.xml:/etc/clickhouse-server/config.d/storage.xml
   signoz:
     !!merge <<: *db-depend
-    image: signoz/signoz:${VERSION:-v0.93.0}
+    image: signoz/signoz:${VERSION:-v0.95.0}
     container_name: signoz
     command:
       - --config=/root/config/prometheus.yml
@@ -143,7 +144,7 @@ services:
       retries: 3
   otel-collector:
     !!merge <<: *db-depend
-    image: signoz/signoz-otel-collector:${OTELCOL_TAG:-v0.129.2}
+    image: signoz/signoz-otel-collector:${OTELCOL_TAG:-v0.129.5}
     container_name: signoz-otel-collector
     command:
       - --config=/etc/otel-collector-config.yaml
@@ -165,7 +166,7 @@ services:
         condition: service_healthy
   schema-migrator-sync:
     !!merge <<: *common
-    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-v0.129.2}
+    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-v0.129.5}
     container_name: schema-migrator-sync
     command:
       - sync
@@ -177,7 +178,7 @@ services:
     restart: on-failure
   schema-migrator-async:
     !!merge <<: *db-depend
-    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-v0.129.2}
+    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-v0.129.5}
     container_name: schema-migrator-async
     command:
       - async

docs/contributing/go/integration.md

@@ -0,0 +1,213 @@
+# Integration Tests
+
+SigNoz uses integration tests to verify that different components work together correctly in a real environment. These tests run against actual services (ClickHouse, PostgreSQL, etc.) to ensure end-to-end functionality.
+
+## How to set up the integration test environment?
+
+### Prerequisites
+
+Before running integration tests, ensure you have the following installed:
+
+- Python 3.13+
+- Poetry (for dependency management)
+- Docker (for containerized services)
+
+### Initial Setup
+
+1. Navigate to the integration tests directory:
+```bash
+cd tests/integration
+```
+
+2. Install dependencies using Poetry:
+```bash
+poetry install --no-root
+```
+
+### Starting the Test Environment
+
+To spin up all the containers necessary for writing integration tests and keep them running:
+
+```bash
+poetry run pytest --basetemp=./tmp/ -vv --reuse src/bootstrap/setup.py::test_setup
+```
+
+This command will:
+- Start all required services (ClickHouse, PostgreSQL, Zookeeper, etc.)
+- Keep containers running due to the `--reuse` flag
+- Verify that the setup is working correctly
+
+### Stopping the Test Environment
+
+When you're done writing integration tests, clean up the environment:
+
+```bash
+poetry run pytest --basetemp=./tmp/ -vv --teardown -s src/bootstrap/setup.py::test_teardown
+```
+
+This will destroy the running integration test setup and clean up resources.
+
+## Understanding the Integration Test Framework
+
+Python and pytest form the foundation of the integration testing framework. Testcontainers are used to spin up disposable integration environments. Wiremock is used to spin up **test doubles** of other services.
+
+- **Why Python/pytest?** It's expressive, low-boilerplate, and has powerful fixture capabilities that make integration testing straightforward. Extensive libraries for HTTP requests, JSON handling, and data analysis (numpy) make it easier to test APIs and verify data
+- **Why testcontainers?** They let us spin up isolated dependencies that match our production environment without complex setup.
+- **Why wiremock?** Well maintained, documented and extensible.
+
+```
+.
+├── conftest.py
+├── fixtures
+│   ├── __init__.py
+│   ├── auth.py
+│   ├── clickhouse.py
+│   ├── fs.py
+│   ├── http.py
+│   ├── migrator.py
+│   ├── network.py
+│   ├── postgres.py
+│   ├── signoz.py
+│   ├── sql.py
+│   ├── sqlite.py
+│   ├── types.py
+│   └── zookeeper.py
+├── poetry.lock
+├── pyproject.toml
+└── src
+    └── bootstrap
+        ├── __init__.py
+        ├── a_database.py
+        ├── b_register.py
+        └── c_license.py
+```
+
+Each test suite follows some important principles:
+
+1. **Organization**: Test suites live under `src/` in self-contained packages. Fixtures (a pytest concept) live inside `fixtures/`.
+2. **Execution Order**: Files are prefixed with `a_`, `b_`, `c_` to ensure sequential execution.
+3. **Time Constraints**: Each suite should complete in under 10 minutes (setup takes ~4 mins).
+
+### Test Suite Design
+
+Test suites should target functional domains or subsystems within SigNoz. When designing a test suite, consider these principles:
+
+- **Functional Cohesion**: Group tests around a specific capability or service boundary
+- **Data Flow**: Follow the path of data through related components
+- **Change Patterns**: Components frequently modified together should be tested together
+
+The exact boundaries for modules are intentionally flexible, allowing teams to define logical groupings based on their specific context and knowledge of the system.
+
+Eg: The **bootstrap** integration test suite validates core system functionality:
+
+- Database initialization
+- Version check
+
+Other test suites can be **pipelines, auth, querier.**
+
+## How to write an integration test?
+
+Now start writing an integration test. Create a new file `src/bootstrap/e_version.py` and paste the following:
+
+```python
+import requests
+
+from fixtures import types
+from fixtures.logger import setup_logger
+
+logger = setup_logger(__name__)
+
+def test_version(signoz: types.SigNoz) -> None:
+    response = requests.get(signoz.self.host_config.get("/api/v1/version"), timeout=2)
+    logger.info(response)
+```
+
+We have written a simple test which calls the `version` endpoint of the container in step 1. In **order to just run this function, run the following command:**
+
+```bash
+poetry run pytest --basetemp=./tmp/ -vv --reuse src/bootstrap/e_version.py::test_version
+```
+
+> Note: The `--reuse` flag is used to reuse the environment if it is already running. Always use this flag when writing and running integration tests. If you don't use this flag, the environment will be destroyed and recreated every time you run the test.
+
+Here's another example of how to write a more comprehensive integration test:
+
+```python
+from http import HTTPStatus
+import requests
+from fixtures import types
+from fixtures.logger import setup_logger
+
+logger = setup_logger(__name__)
+
+def test_user_registration(signoz: types.SigNoz) -> None:
+    """Test user registration functionality."""
+    response = requests.post(
+        signoz.self.host_configs["8080"].get("/api/v1/register"),
+        json={
+            "name": "testuser",
+            "orgId": "",
+            "orgName": "test.org",
+            "email": "test@example.com",
+            "password": "password123Z$",
+        },
+        timeout=2,
+    )
+    
+    assert response.status_code == HTTPStatus.OK
+    assert response.json()["setupCompleted"] is True
+```
+
+## How to run integration tests?
+
+### Running All Tests
+
+```bash
+poetry run pytest --basetemp=./tmp/ -vv --reuse src/
+```
+
+### Running Specific Test Categories
+
+```bash
+poetry run pytest --basetemp=./tmp/ -vv --reuse src/<suite>
+
+# Run querier tests
+poetry run pytest --basetemp=./tmp/ -vv --reuse src/querier/
+# Run auth tests
+poetry run pytest --basetemp=./tmp/ -vv --reuse src/auth/
+```
+
+### Running Individual Tests
+
+```bash
+poetry run pytest --basetemp=./tmp/ -vv --reuse src/<suite>/<file>.py::test_name
+
+# Run test_register in file a_register.py in auth suite
+poetry run pytest --basetemp=./tmp/ -vv --reuse src/auth/a_register.py::test_register
+```
+
+## How to configure different options for integration tests?
+
+Tests can be configured using pytest options:
+
+- `--sqlstore-provider` - Choose database provider (default: postgres)
+- `--postgres-version` - PostgreSQL version (default: 15)
+- `--clickhouse-version` - ClickHouse version (default: 24.1.2-alpine)
+- `--zookeeper-version` - Zookeeper version (default: 3.7.1)
+
+Example:
+```bash
+poetry run pytest --basetemp=./tmp/ -vv --reuse --sqlstore-provider=postgres --postgres-version=14 src/auth/
+```
+
+
+## What should I remember?
+
+- **Always use the `--reuse` flag** when setting up the environment to keep containers running
+- **Use the `--teardown` flag** when cleaning up to avoid resource leaks
+- **Follow the naming convention** with alphabetical prefixes for test execution order
+- **Use proper timeouts** in HTTP requests to avoid hanging tests
+- **Clean up test data** between tests to avoid interference
+- **Use descriptive test names** that clearly indicate what is being tested
+- **Leverage fixtures** for common setup and authentication
+- **Test both success and failure scenarios** to ensure robust functionality

ee/query-service/app/server.go

@@ -44,19 +44,6 @@ import (
 	"go.uber.org/zap"
 )
 
-type ServerOptions struct {
-	Config                     signoz.Config
-	SigNoz                     *signoz.SigNoz
-	HTTPHostPort               string
-	PrivateHostPort            string
-	PreferSpanMetrics          bool
-	FluxInterval               string
-	FluxIntervalForTraceDetail string
-	Cluster                    string
-	GatewayUrl                 string
-	Jwt                        *authtypes.JWT
-}
-
 // Server runs HTTP, Mux and a grpc server
 type Server struct {
 	config      signoz.Config
@@ -69,11 +56,6 @@ type Server struct {
 	httpServer   *http.Server
 	httpHostPort string
 
-	// private http
-	privateConn     net.Listener
-	privateHTTP     *http.Server
-	privateHostPort string
-
 	opampServer *opamp.Server
 
 	// Usage manager
@@ -183,7 +165,6 @@ func NewServer(config signoz.Config, signoz *signoz.SigNoz, jwt *authtypes.JWT)
 		jwt:                jwt,
 		ruleManager:        rm,
 		httpHostPort:       baseconst.HTTPHostPort,
-		privateHostPort:    baseconst.PrivateHostPort,
 		unavailableChannel: make(chan healthcheck.Status),
 		usageManager:       usageManager,
 	}
@@ -196,13 +177,6 @@ func NewServer(config signoz.Config, signoz *signoz.SigNoz, jwt *authtypes.JWT)
 
 	s.httpServer = httpServer
 
-	privateServer, err := s.createPrivateServer(apiHandler)
-	if err != nil {
-		return nil, err
-	}
-
-	s.privateHTTP = privateServer
-
 	s.opampServer = opamp.InitializeServer(
 		&opAmpModel.AllAgents, agentConfMgr, signoz.Instrumentation,
 	)
@@ -215,36 +189,6 @@ func (s Server) HealthCheckStatus() chan healthcheck.Status {
 	return s.unavailableChannel
 }
 
-func (s *Server) createPrivateServer(apiHandler *api.APIHandler) (*http.Server, error) {
-	r := baseapp.NewRouter()
-
-	r.Use(middleware.NewAuth(s.jwt, []string{"Authorization", "Sec-WebSocket-Protocol"}, s.signoz.Sharder, s.signoz.Instrumentation.Logger()).Wrap)
-	r.Use(middleware.NewAPIKey(s.signoz.SQLStore, []string{"SIGNOZ-API-KEY"}, s.signoz.Instrumentation.Logger(), s.signoz.Sharder).Wrap)
-	r.Use(middleware.NewTimeout(s.signoz.Instrumentation.Logger(),
-		s.config.APIServer.Timeout.ExcludedRoutes,
-		s.config.APIServer.Timeout.Default,
-		s.config.APIServer.Timeout.Max,
-	).Wrap)
-	r.Use(middleware.NewLogging(s.signoz.Instrumentation.Logger(), s.config.APIServer.Logging.ExcludedRoutes).Wrap)
-
-	apiHandler.RegisterPrivateRoutes(r)
-
-	c := cors.New(cors.Options{
-		//todo(amol): find out a way to add exact domain or
-		// ip here for alert manager
-		AllowedOrigins: []string{"*"},
-		AllowedMethods: []string{"GET", "DELETE", "POST", "PUT", "PATCH"},
-		AllowedHeaders: []string{"Accept", "Authorization", "Content-Type", "SIGNOZ-API-KEY", "X-SIGNOZ-QUERY-ID", "Sec-WebSocket-Protocol"},
-	})
-
-	handler := c.Handler(r)
-	handler = handlers.CompressHandler(handler)
-
-	return &http.Server{
-		Handler: handler,
-	}, nil
-}
-
 func (s *Server) createPublicServer(apiHandler *api.APIHandler, web web.Web) (*http.Server, error) {
 	r := baseapp.NewRouter()
 	am := middleware.NewAuthZ(s.signoz.Instrumentation.Logger())
@@ -310,19 +254,6 @@ func (s *Server) initListeners() error {
 
 	zap.L().Info(fmt.Sprintf("Query server started listening on %s...", s.httpHostPort))
 
-	// listen on private port to support internal services
-	privateHostPort := s.privateHostPort
-
-	if privateHostPort == "" {
-		return fmt.Errorf("baseconst.PrivateHostPort is required")
-	}
-
-	s.privateConn, err = net.Listen("tcp", privateHostPort)
-	if err != nil {
-		return err
-	}
-	zap.L().Info(fmt.Sprintf("Query server started listening on private port %s...", s.privateHostPort))
-
 	return nil
 }
 
@@ -361,26 +292,6 @@ func (s *Server) Start(ctx context.Context) error {
 		}
 	}()
 
-	var privatePort int
-	if port, err := utils.GetPort(s.privateConn.Addr()); err == nil {
-		privatePort = port
-	}
-
-	go func() {
-		zap.L().Info("Starting Private HTTP server", zap.Int("port", privatePort), zap.String("addr", s.privateHostPort))
-
-		switch err := s.privateHTTP.Serve(s.privateConn); err {
-		case nil, http.ErrServerClosed, cmux.ErrListenerClosed:
-			// normal exit, nothing to do
-			zap.L().Info("private http server closed")
-		default:
-			zap.L().Error("Could not start private HTTP server", zap.Error(err))
-		}
-
-		s.unavailableChannel <- healthcheck.Unavailable
-
-	}()
-
 	go func() {
 		zap.L().Info("Starting OpAmp Websocket server", zap.String("addr", baseconst.OpAmpWsEndpoint))
 		err := s.opampServer.Start(baseconst.OpAmpWsEndpoint)
@@ -400,12 +311,6 @@ func (s *Server) Stop(ctx context.Context) error {
 		}
 	}
 
-	if s.privateHTTP != nil {
-		if err := s.privateHTTP.Shutdown(ctx); err != nil {
-			return err
-		}
-	}
-
 	s.opampServer.Stop()
 
 	if s.ruleManager != nil {

ee/query-service/constants/constants.go

@@ -40,7 +40,7 @@ var IsDotMetricsEnabled = false
 var IsPreferSpanMetrics = false
 
 func init() {
-	if GetOrDefaultEnv(DotMetricsEnabled, "false") == "true" {
+	if GetOrDefaultEnv(DotMetricsEnabled, "true") == "true" {
 		IsDotMetricsEnabled = true
 	}
 

ee/query-service/rules/anomaly.go

@@ -35,7 +35,6 @@ import (
 	anomalyV2 "github.com/SigNoz/signoz/ee/anomaly"
 
 	qbtypes "github.com/SigNoz/signoz/pkg/types/querybuildertypes/querybuildertypesv5"
-	yaml "gopkg.in/yaml.v2"
 )
 
 const (
@@ -167,16 +166,9 @@ func (r *AnomalyRule) prepareQueryRange(ctx context.Context, ts time.Time) (*v3.
 		ctx, "prepare query range request v4", "ts", ts.UnixMilli(), "eval_window", r.EvalWindow().Milliseconds(), "eval_delay", r.EvalDelay().Milliseconds(),
 	)
 
-	start := ts.Add(-time.Duration(r.EvalWindow())).UnixMilli()
-	end := ts.UnixMilli()
-
-	if r.EvalDelay() > 0 {
-		start = start - int64(r.EvalDelay().Milliseconds())
-		end = end - int64(r.EvalDelay().Milliseconds())
-	}
-	// round to minute otherwise we could potentially miss data
-	start = start - (start % (60 * 1000))
-	end = end - (end % (60 * 1000))
+	st, en := r.Timestamps(ts)
+	start := st.UnixMilli()
+	end := en.UnixMilli()
 
 	compositeQuery := r.Condition().CompositeQuery
 
@@ -253,10 +245,17 @@ func (r *AnomalyRule) buildAndRunQuery(ctx context.Context, orgID valuer.UUID, t
 	r.logger.InfoContext(ctx, "anomaly scores", "scores", string(scoresJSON))
 
 	for _, series := range queryResult.AnomalyScores {
-		smpl, shouldAlert := r.ShouldAlert(*series)
-		if shouldAlert {
-			resultVector = append(resultVector, smpl)
+		if r.Condition() != nil && r.Condition().RequireMinPoints {
+			if len(series.Points) < r.Condition().RequiredNumPoints {
+				r.logger.InfoContext(ctx, "not enough data points to evaluate series, skipping", "ruleid", r.ID(), "numPoints", len(series.Points), "requiredPoints", r.Condition().RequiredNumPoints)
+				continue
+			}
 		}
+		results, err := r.Threshold.ShouldAlert(*series)
+		if err != nil {
+			return nil, err
+		}
+		resultVector = append(resultVector, results...)
 	}
 	return resultVector, nil
 }
@@ -296,10 +295,17 @@ func (r *AnomalyRule) buildAndRunQueryV5(ctx context.Context, orgID valuer.UUID,
 	r.logger.InfoContext(ctx, "anomaly scores", "scores", string(scoresJSON))
 
 	for _, series := range queryResult.AnomalyScores {
-		smpl, shouldAlert := r.ShouldAlert(*series)
-		if shouldAlert {
-			resultVector = append(resultVector, smpl)
+		if r.Condition().RequireMinPoints {
+			if len(series.Points) < r.Condition().RequiredNumPoints {
+				r.logger.InfoContext(ctx, "not enough data points to evaluate series, skipping", "ruleid", r.ID(), "numPoints", len(series.Points), "requiredPoints", r.Condition().RequiredNumPoints)
+				continue
+			}
 		}
+		results, err := r.Threshold.ShouldAlert(*series)
+		if err != nil {
+			return nil, err
+		}
+		resultVector = append(resultVector, results...)
 	}
 	return resultVector, nil
 }
@@ -499,7 +505,7 @@ func (r *AnomalyRule) String() string {
 		PreferredChannels: r.PreferredChannels(),
 	}
 
-	byt, err := yaml.Marshal(ar)
+	byt, err := json.Marshal(ar)
 	if err != nil {
 		return fmt.Sprintf("error marshaling alerting rule: %s", err.Error())
 	}

ee/query-service/rules/manager.go

@@ -3,8 +3,10 @@ package rules
 import (
 	"context"
 	"fmt"
+
 	"time"
 
+	"github.com/SigNoz/signoz/pkg/errors"
 	basemodel "github.com/SigNoz/signoz/pkg/query-service/model"
 	baserules "github.com/SigNoz/signoz/pkg/query-service/rules"
 	"github.com/SigNoz/signoz/pkg/query-service/utils/labels"
@@ -20,6 +22,10 @@ func PrepareTaskFunc(opts baserules.PrepareTaskOptions) (baserules.Task, error)
 	var task baserules.Task
 
 	ruleId := baserules.RuleIdFromTaskName(opts.TaskName)
+	evaluation, err := opts.Rule.Evaluation.GetEvaluation()
+	if err != nil {
+		return nil, errors.NewInvalidInputf(errors.CodeInvalidInput, "evaluation is invalid: %v", err)
+	}
 	if opts.Rule.RuleType == ruletypes.RuleTypeThreshold {
 		// create a threshold rule
 		tr, err := baserules.NewThresholdRule(
@@ -40,7 +46,7 @@ func PrepareTaskFunc(opts baserules.PrepareTaskOptions) (baserules.Task, error)
 		rules = append(rules, tr)
 
 		// create ch rule task for evalution
-		task = newTask(baserules.TaskTypeCh, opts.TaskName, time.Duration(opts.Rule.Frequency), rules, opts.ManagerOpts, opts.NotifyFunc, opts.MaintenanceStore, opts.OrgID)
+		task = newTask(baserules.TaskTypeCh, opts.TaskName, time.Duration(evaluation.GetFrequency()), rules, opts.ManagerOpts, opts.NotifyFunc, opts.MaintenanceStore, opts.OrgID)
 
 	} else if opts.Rule.RuleType == ruletypes.RuleTypeProm {
 
@@ -62,7 +68,7 @@ func PrepareTaskFunc(opts baserules.PrepareTaskOptions) (baserules.Task, error)
 		rules = append(rules, pr)
 
 		// create promql rule task for evalution
-		task = newTask(baserules.TaskTypeProm, opts.TaskName, time.Duration(opts.Rule.Frequency), rules, opts.ManagerOpts, opts.NotifyFunc, opts.MaintenanceStore, opts.OrgID)
+		task = newTask(baserules.TaskTypeProm, opts.TaskName, time.Duration(evaluation.GetFrequency()), rules, opts.ManagerOpts, opts.NotifyFunc, opts.MaintenanceStore, opts.OrgID)
 
 	} else if opts.Rule.RuleType == ruletypes.RuleTypeAnomaly {
 		// create anomaly rule
@@ -84,7 +90,7 @@ func PrepareTaskFunc(opts baserules.PrepareTaskOptions) (baserules.Task, error)
 		rules = append(rules, ar)
 
 		// create anomaly rule task for evalution
-		task = newTask(baserules.TaskTypeCh, opts.TaskName, time.Duration(opts.Rule.Frequency), rules, opts.ManagerOpts, opts.NotifyFunc, opts.MaintenanceStore, opts.OrgID)
+		task = newTask(baserules.TaskTypeCh, opts.TaskName, time.Duration(evaluation.GetFrequency()), rules, opts.ManagerOpts, opts.NotifyFunc, opts.MaintenanceStore, opts.OrgID)
 
 	} else {
 		return nil, fmt.Errorf("unsupported rule type %s. Supported types: %s, %s", opts.Rule.RuleType, ruletypes.RuleTypeProm, ruletypes.RuleTypeThreshold)

frontend/package.json

@@ -44,11 +44,13 @@
 		"@sentry/react": "8.41.0",
 		"@sentry/webpack-plugin": "2.22.6",
 		"@signozhq/badge": "0.0.2",
+		"@signozhq/button": "0.0.2",
 		"@signozhq/calendar": "0.0.0",
 		"@signozhq/callout": "0.0.2",
 		"@signozhq/design-tokens": "1.1.4",
 		"@signozhq/input": "0.0.2",
 		"@signozhq/popover": "0.0.0",
+		"@signozhq/resizable": "0.0.0",
 		"@signozhq/sonner": "0.1.0",
 		"@signozhq/table": "0.3.7",
 		"@signozhq/tooltip": "0.0.2",
@@ -275,6 +277,7 @@
 		"serialize-javascript": "6.0.2",
 		"prismjs": "1.30.0",
 		"got": "11.8.5",
-		"form-data": "4.0.4"
+		"form-data": "4.0.4",
+		"brace-expansion": "^2.0.2"
 	}
 }

frontend/src/api/dynamicVariables/__tests__/getFieldKeys.test.ts

@@ -0,0 +1,115 @@
+/* eslint-disable sonarjs/no-duplicate-string */
+import { ApiBaseInstance } from 'api';
+
+import { getFieldKeys } from '../getFieldKeys';
+
+// Mock the API instance
+jest.mock('api', () => ({
+	ApiBaseInstance: {
+		get: jest.fn(),
+	},
+}));
+
+describe('getFieldKeys API', () => {
+	beforeEach(() => {
+		jest.clearAllMocks();
+	});
+
+	const mockSuccessResponse = {
+		status: 200,
+		data: {
+			status: 'success',
+			data: {
+				keys: {
+					'service.name': [],
+					'http.status_code': [],
+				},
+				complete: true,
+			},
+		},
+	};
+
+	it('should call API with correct parameters when no args provided', async () => {
+		// Mock successful API response
+		(ApiBaseInstance.get as jest.Mock).mockResolvedValueOnce(mockSuccessResponse);
+
+		// Call function with no parameters
+		await getFieldKeys();
+
+		// Verify API was called correctly with empty params object
+		expect(ApiBaseInstance.get).toHaveBeenCalledWith('/fields/keys', {
+			params: {},
+		});
+	});
+
+	it('should call API with signal parameter when provided', async () => {
+		// Mock successful API response
+		(ApiBaseInstance.get as jest.Mock).mockResolvedValueOnce(mockSuccessResponse);
+
+		// Call function with signal parameter
+		await getFieldKeys('traces');
+
+		// Verify API was called with signal parameter
+		expect(ApiBaseInstance.get).toHaveBeenCalledWith('/fields/keys', {
+			params: { signal: 'traces' },
+		});
+	});
+
+	it('should call API with name parameter when provided', async () => {
+		// Mock successful API response
+		(ApiBaseInstance.get as jest.Mock).mockResolvedValueOnce({
+			status: 200,
+			data: {
+				status: 'success',
+				data: {
+					keys: { service: [] },
+					complete: false,
+				},
+			},
+		});
+
+		// Call function with name parameter
+		await getFieldKeys(undefined, 'service');
+
+		// Verify API was called with name parameter
+		expect(ApiBaseInstance.get).toHaveBeenCalledWith('/fields/keys', {
+			params: { name: 'service' },
+		});
+	});
+
+	it('should call API with both signal and name when provided', async () => {
+		// Mock successful API response
+		(ApiBaseInstance.get as jest.Mock).mockResolvedValueOnce({
+			status: 200,
+			data: {
+				status: 'success',
+				data: {
+					keys: { service: [] },
+					complete: false,
+				},
+			},
+		});
+
+		// Call function with both parameters
+		await getFieldKeys('logs', 'service');
+
+		// Verify API was called with both parameters
+		expect(ApiBaseInstance.get).toHaveBeenCalledWith('/fields/keys', {
+			params: { signal: 'logs', name: 'service' },
+		});
+	});
+
+	it('should return properly formatted response', async () => {
+		// Mock API to return our response
+		(ApiBaseInstance.get as jest.Mock).mockResolvedValueOnce(mockSuccessResponse);
+
+		// Call the function
+		const result = await getFieldKeys('traces');
+
+		// Verify the returned structure matches SuccessResponseV2 format
+		expect(result).toEqual({
+			httpStatusCode: 200,
+			data: mockSuccessResponse.data.data,
+		});
+	});
+});

frontend/src/api/dynamicVariables/__tests__/getFieldValues.test.ts

@@ -0,0 +1,214 @@
+/* eslint-disable sonarjs/no-duplicate-string */
+import { ApiBaseInstance } from 'api';
+
+import { getFieldValues } from '../getFieldValues';
+
+// Mock the API instance
+jest.mock('api', () => ({
+	ApiBaseInstance: {
+		get: jest.fn(),
+	},
+}));
+
+describe('getFieldValues API', () => {
+	beforeEach(() => {
+		jest.clearAllMocks();
+	});
+
+	it('should call the API with correct parameters (no options)', async () => {
+		// Mock API response
+		(ApiBaseInstance.get as jest.Mock).mockResolvedValueOnce({
+			status: 200,
+			data: {
+				status: 'success',
+				data: {
+					values: {
+						stringValues: ['frontend', 'backend'],
+					},
+					complete: true,
+				},
+			},
+		});
+
+		// Call function without parameters
+		await getFieldValues();
+
+		// Verify API was called correctly with empty params
+		expect(ApiBaseInstance.get).toHaveBeenCalledWith('/fields/values', {
+			params: {},
+		});
+	});
+
+	it('should call the API with signal parameter', async () => {
+		// Mock API response
+		(ApiBaseInstance.get as jest.Mock).mockResolvedValueOnce({
+			status: 200,
+			data: {
+				status: 'success',
+				data: {
+					values: {
+						stringValues: ['frontend', 'backend'],
+					},
+					complete: true,
+				},
+			},
+		});
+
+		// Call function with signal parameter
+		await getFieldValues('traces');
+
+		// Verify API was called with signal parameter
+		expect(ApiBaseInstance.get).toHaveBeenCalledWith('/fields/values', {
+			params: { signal: 'traces' },
+		});
+	});
+
+	it('should call the API with name parameter', async () => {
+		// Mock API response
+		(ApiBaseInstance.get as jest.Mock).mockResolvedValueOnce({
+			status: 200,
+			data: {
+				status: 'success',
+				data: {
+					values: {
+						stringValues: ['frontend', 'backend'],
+					},
+					complete: true,
+				},
+			},
+		});
+
+		// Call function with name parameter
+		await getFieldValues(undefined, 'service.name');
+
+		// Verify API was called with name parameter
+		expect(ApiBaseInstance.get).toHaveBeenCalledWith('/fields/values', {
+			params: { name: 'service.name' },
+		});
+	});
+
+	it('should call the API with value parameter', async () => {
+		// Mock API response
+		(ApiBaseInstance.get as jest.Mock).mockResolvedValueOnce({
+			status: 200,
+			data: {
+				status: 'success',
+				data: {
+					values: {
+						stringValues: ['frontend'],
+					},
+					complete: false,
+				},
+			},
+		});
+
+		// Call function with value parameter
+		await getFieldValues(undefined, 'service.name', 'front');
+
+		// Verify API was called with value parameter
+		expect(ApiBaseInstance.get).toHaveBeenCalledWith('/fields/values', {
+			params: { name: 'service.name', searchText: 'front' },
+		});
+	});
+
+	it('should call the API with time range parameters', async () => {
+		// Mock API response
+		(ApiBaseInstance.get as jest.Mock).mockResolvedValueOnce({
+			status: 200,
+			data: {
+				status: 'success',
+				data: {
+					values: {
+						stringValues: ['frontend', 'backend'],
+					},
+					complete: true,
+				},
+			},
+		});
+
+		// Call function with time range parameters
+		const startUnixMilli = 1625097600000000; // Note: nanoseconds
+		const endUnixMilli = 1625184000000000;
+		await getFieldValues(
+			'logs',
+			'service.name',
+			undefined,
+			startUnixMilli,
+			endUnixMilli,
+		);
+
+		// Verify API was called with time range parameters (converted to milliseconds)
+		expect(ApiBaseInstance.get).toHaveBeenCalledWith('/fields/values', {
+			params: {
+				signal: 'logs',
+				name: 'service.name',
+				startUnixMilli: '1625097600', // Should be converted to seconds (divided by 1000000)
+				endUnixMilli: '1625184000', // Should be converted to seconds (divided by 1000000)
+			},
+		});
+	});
+
+	it('should normalize the response values', async () => {
+		// Mock API response with multiple value types
+		const mockResponse = {
+			status: 200,
+			data: {
+				status: 'success',
+				data: {
+					values: {
+						stringValues: ['frontend', 'backend'],
+						numberValues: [200, 404],
+						boolValues: [true, false],
+					},
+					complete: true,
+				},
+			},
+		};
+
+		(ApiBaseInstance.get as jest.Mock).mockResolvedValueOnce(mockResponse);
+
+		// Call the function
+		const result = await getFieldValues('traces', 'mixed.values');
+
+		// Verify the response has normalized values array
+		expect(result.data?.normalizedValues).toContain('frontend');
+		expect(result.data?.normalizedValues).toContain('backend');
+		expect(result.data?.normalizedValues).toContain('200');
+		expect(result.data?.normalizedValues).toContain('404');
+		expect(result.data?.normalizedValues).toContain('true');
+		expect(result.data?.normalizedValues).toContain('false');
+		expect(result.data?.normalizedValues?.length).toBe(6);
+	});
+
+	it('should return a properly formatted success response', async () => {
+		// Create mock response
+		const mockApiResponse = {
+			status: 200,
+			data: {
+				status: 'success',
+				data: {
+					values: {
+						stringValues: ['frontend', 'backend'],
+					},
+					complete: true,
+				},
+			},
+		};
+
+		// Mock API to return our response
+		(ApiBaseInstance.get as jest.Mock).mockResolvedValueOnce(mockApiResponse);
+
+		// Call the function
+		const result = await getFieldValues('traces', 'service.name');
+
+		// Verify the returned structure matches SuccessResponseV2 format
+		expect(result).toEqual({
+			httpStatusCode: 200,
+			data: expect.objectContaining({
+				values: expect.any(Object),
+				normalizedValues: expect.any(Array),
+				complete: true,
+			}),
+		});
+	});
+});

frontend/src/api/dynamicVariables/getFieldKeys.ts

@@ -0,0 +1,38 @@
+import { ApiBaseInstance } from 'api';
+import { ErrorResponseHandlerV2 } from 'api/ErrorResponseHandlerV2';
+import { AxiosError } from 'axios';
+import { ErrorV2Resp, SuccessResponseV2 } from 'types/api';
+import { FieldKeyResponse } from 'types/api/dynamicVariables/getFieldKeys';
+
+/**
+ * Get field keys for a given signal type
+ * @param signal Type of signal (traces, logs, metrics)
+ * @param name Optional search text
+ */
+export const getFieldKeys = async (
+	signal?: 'traces' | 'logs' | 'metrics',
+	name?: string,
+): Promise<SuccessResponseV2<FieldKeyResponse>> => {
+	const params: Record<string, string> = {};
+
+	if (signal) {
+		params.signal = encodeURIComponent(signal);
+	}
+
+	if (name) {
+		params.name = encodeURIComponent(name);
+	}
+
+	try {
+		const response = await ApiBaseInstance.get('/fields/keys', { params });
+
+		return {
+			httpStatusCode: response.status,
+			data: response.data.data,
+		};
+	} catch (error) {
+		ErrorResponseHandlerV2(error as AxiosError<ErrorV2Resp>);
+	}
+};
+
+export default getFieldKeys;

frontend/src/api/dynamicVariables/getFieldValues.ts

@@ -0,0 +1,87 @@
+/* eslint-disable sonarjs/cognitive-complexity */
+import { ApiBaseInstance } from 'api';
+import { ErrorResponseHandlerV2 } from 'api/ErrorResponseHandlerV2';
+import { AxiosError } from 'axios';
+import { ErrorV2Resp, SuccessResponseV2 } from 'types/api';
+import { FieldValueResponse } from 'types/api/dynamicVariables/getFieldValues';
+
+/**
+ * Get field values for a given signal type and field name
+ * @param signal Type of signal (traces, logs, metrics)
+ * @param name Name of the attribute for which values are being fetched
+ * @param value Optional search text
+ * @param existingQuery Optional existing query - across all present dynamic variables
+ */
+export const getFieldValues = async (
+	signal?: 'traces' | 'logs' | 'metrics',
+	name?: string,
+	searchText?: string,
+	startUnixMilli?: number,
+	endUnixMilli?: number,
+	existingQuery?: string,
+): Promise<SuccessResponseV2<FieldValueResponse>> => {
+	const params: Record<string, string> = {};
+
+	if (signal) {
+		params.signal = encodeURIComponent(signal);
+	}
+
+	if (name) {
+		params.name = encodeURIComponent(name);
+	}
+
+	if (searchText) {
+		params.searchText = encodeURIComponent(searchText);
+	}
+
+	if (startUnixMilli) {
+		params.startUnixMilli = Math.floor(startUnixMilli / 1000000).toString();
+	}
+
+	if (endUnixMilli) {
+		params.endUnixMilli = Math.floor(endUnixMilli / 1000000).toString();
+	}
+
+	if (existingQuery) {
+		params.existingQuery = existingQuery;
+	}
+
+	try {
+		const response = await ApiBaseInstance.get('/fields/values', { params });
+
+		// Normalize values from different types (stringValues, boolValues, etc.)
+		if (response.data?.data?.values) {
+			const allValues: string[] = [];
+			Object.entries(response.data?.data?.values).forEach(
+				([key, valueArray]: [string, any]) => {
+					// Skip RelatedValues as they should be kept separate
+					if (key === 'relatedValues') {
+						return;
+					}
+
+					if (Array.isArray(valueArray)) {
+						allValues.push(...valueArray.map(String));
+					}
+				},
+			);
+
+			// Add a normalized values array to the response
+			response.data.data.normalizedValues = allValues;
+
+			// Add relatedValues to the response as per FieldValueResponse
+			if (response.data?.data?.values?.relatedValues) {
+				response.data.data.relatedValues =
+					response.data?.data?.values?.relatedValues;
+			}
+		}
+
+		return {
+			httpStatusCode: response.status,
+			data: response.data.data,
+		};
+	} catch (error) {
+		ErrorResponseHandlerV2(error as AxiosError<ErrorV2Resp>);
+	}
+};
+
+export default getFieldValues;

frontend/src/api/v1/download/downloadExportData.ts

@@ -0,0 +1,64 @@
+import axios from 'api';
+import { ErrorResponseHandlerV2 } from 'api/ErrorResponseHandlerV2';
+import { AxiosError } from 'axios';
+import { ErrorV2Resp } from 'types/api';
+import { ExportRawDataProps } from 'types/api/exportRawData/getExportRawData';
+
+export const downloadExportData = async (
+	props: ExportRawDataProps,
+): Promise<void> => {
+	try {
+		const queryParams = new URLSearchParams();
+
+		queryParams.append('start', String(props.start));
+		queryParams.append('end', String(props.end));
+		queryParams.append('filter', props.filter);
+		props.columns.forEach((col) => {
+			queryParams.append('columns', col);
+		});
+		queryParams.append('order_by', props.orderBy);
+		queryParams.append('limit', String(props.limit));
+		queryParams.append('format', props.format);
+
+		const response = await axios.get<Blob>(`export_raw_data?${queryParams}`, {
+			responseType: 'blob', // Important: tell axios to handle response as blob
+			decompress: true, // Enable automatic decompression
+			headers: {
+				Accept: 'application/octet-stream', // Tell server we expect binary data
+			},
+			timeout: 0,
+		});
+
+		// Only proceed if the response status is 200
+		if (response.status !== 200) {
+			throw new Error(
+				`Failed to download data: server returned status ${response.status}`,
+			);
+		}
+		// Create blob URL from response data
+		const blob = new Blob([response.data], { type: 'application/octet-stream' });
+		const url = window.URL.createObjectURL(blob);
+
+		// Create and configure download link
+		const link = document.createElement('a');
+		link.href = url;
+
+		// Get filename from Content-Disposition header or generate timestamped default
+		const filename =
+			response.headers['content-disposition']
+				?.split('filename=')[1]
+				?.replace(/["']/g, '') || `exported_data.${props.format || 'txt'}`;
+
+		link.setAttribute('download', filename);
+
+		// Trigger download
+		document.body.appendChild(link);
+		link.click();
+		link.remove();
+		URL.revokeObjectURL(url);
+	} catch (error) {
+		ErrorResponseHandlerV2(error as AxiosError<ErrorV2Resp>);
+	}
+};
+
+export default downloadExportData;

frontend/src/api/v1/login/loginPrecheck.ts

@@ -2,7 +2,7 @@ import axios from 'api';
 import { ErrorResponseHandler } from 'api/ErrorResponseHandler';
 import { AxiosError } from 'axios';
 import { ErrorResponse, SuccessResponse } from 'types/api';
-import { PayloadProps, Props } from 'types/api/user/loginPrecheck';
+import { Props, Signup as PayloadProps } from 'types/api/user/loginPrecheck';
 
 const loginPrecheck = async (
 	props: Props,

frontend/src/api/v1/register/signup.ts

@@ -1,25 +1,21 @@
 import axios from 'api';
-import { ErrorResponseHandler } from 'api/ErrorResponseHandler';
+import { ErrorResponseHandlerV2 } from 'api/ErrorResponseHandlerV2';
 import { AxiosError } from 'axios';
-import { ErrorResponse, SuccessResponse } from 'types/api';
-import { PayloadProps } from 'types/api/user/loginPrecheck';
+import { ErrorV2Resp, SuccessResponseV2 } from 'types/api';
+import { PayloadProps, Signup } from 'types/api/user/loginPrecheck';
 import { Props } from 'types/api/user/signup';
 
-const signup = async (
-	props: Props,
-): Promise<SuccessResponse<null | PayloadProps> | ErrorResponse> => {
+const signup = async (props: Props): Promise<SuccessResponseV2<Signup>> => {
 	try {
-		const response = await axios.post(`/register`, {
+		const response = await axios.post<PayloadProps>(`/register`, {
 			...props,
 		});
 		return {
-			statusCode: 200,
-			error: null,
-			message: response.data.status,
-			payload: response.data?.data,
+			httpStatusCode: response.status,
+			data: response.data.data,
 		};
 	} catch (error) {
-		return ErrorResponseHandler(error as AxiosError);
+		ErrorResponseHandlerV2(error as AxiosError<ErrorV2Resp>);
 	}
 };
 

frontend/src/api/v5/queryRange/prepareQueryRangePayloadV5.ts

@@ -28,6 +28,7 @@ import {
 	TelemetryFieldKey,
 	TraceAggregation,
 	VariableItem,
+	VariableType,
 } from 'types/api/v5/queryRange';
 import { EQueryType } from 'types/common/dashboard';
 import { DataSource } from 'types/common/queryBuilder';
@@ -346,11 +347,22 @@ function createTraceOperatorBaseSpec(
 		| TelemetryFieldKey
 	)[])?.filter((c) => ('key' in c ? c?.key : c?.name));
 
+	const {
+		stepInterval,
+		groupBy,
+		limit,
+		offset,
+		legend,
+		having,
+		orderBy,
+		pageSize,
+	} = queryData;
+
 	return {
-		stepInterval: queryData?.stepInterval || undefined,
+		stepInterval: stepInterval || undefined,
 		groupBy:
-			queryData.groupBy?.length > 0
-				? queryData.groupBy.map(
+			groupBy?.length > 0
+				? groupBy.map(
 						(item: any): GroupByKey => ({
 							name: item.key,
 							fieldDataType: item?.dataType,
@@ -364,15 +376,12 @@ function createTraceOperatorBaseSpec(
 				: undefined,
 		limit:
 			panelType === PANEL_TYPES.TABLE || panelType === PANEL_TYPES.LIST
-				? queryData.limit || queryData.pageSize || undefined
-				: queryData.limit || undefined,
-		offset:
-			requestType === 'raw' || requestType === 'trace'
-				? queryData.offset
-				: undefined,
+				? limit || pageSize || undefined
+				: limit || undefined,
+		offset: requestType === 'raw' || requestType === 'trace' ? offset : undefined,
 		order:
-			queryData.orderBy?.length > 0
-				? queryData.orderBy.map(
+			orderBy?.length > 0
+				? orderBy.map(
 						(order: any): OrderBy => ({
 							key: {
 								name: order.columnName,
@@ -381,8 +390,8 @@ function createTraceOperatorBaseSpec(
 						}),
 				  )
 				: undefined,
-		legend: isEmpty(queryData.legend) ? undefined : queryData.legend,
-		having: isEmpty(queryData.having) ? undefined : (queryData?.having as Having),
+		legend: isEmpty(legend) ? undefined : legend,
+		having: isEmpty(having) ? undefined : (having as Having),
 		selectFields: isEmpty(nonEmptySelectColumns)
 			? undefined
 			: nonEmptySelectColumns?.map(
@@ -505,6 +514,7 @@ export const prepareQueryRangePayloadV5 = ({
 	formatForWeb,
 	originalGraphType,
 	fillGaps,
+	dynamicVariables,
 }: GetQueryResultsProps): PrepareQueryRangePayloadV5Result => {
 	let legendMap: Record<string, string> = {};
 	const requestType = mapPanelTypeToRequestType(graphType);
@@ -616,7 +626,12 @@ export const prepareQueryRangePayloadV5 = ({
 			fillGaps: fillGaps || false,
 		},
 		variables: Object.entries(variables).reduce((acc, [key, value]) => {
-			acc[key] = { value };
+			acc[key] = {
+				value,
+				type: dynamicVariables
+					?.find((v) => v.name === key)
+					?.type?.toLowerCase() as VariableType,
+			};
 			return acc;
 		}, {} as Record<string, VariableItem>),
 	};

frontend/src/components/ChangelogModal/components/ChangelogRenderer.styles.scss

@@ -2,10 +2,28 @@
 	position: relative;
 	padding-left: 20px;
 
+	& :is(h1, h2, h3, h4, h5, h6, p, &-section-title) {
+		margin-bottom: 12px;
+	}
+
+	&-content {
+		display: flex;
+		flex-direction: column;
+		gap: 32px;
+	}
+
+	&-section-title {
+		font-size: 14px;
+		line-height: 20px;
+		color: var(--text-vanilla-400, #c0c1c3);
+	}
+
 	.changelog-release-date {
 		font-size: 14px;
 		line-height: 20px;
 		color: var(--text-vanilla-400, #c0c1c3);
+		display: block;
+		margin-bottom: 12px;
 	}
 
 	&-list {
@@ -81,12 +99,7 @@
 		}
 	}
 
-	h1,
-	h2,
-	h3,
-	h4,
-	h5,
-	h6 {
+	& :is(h1, h2, h3, h4, h5, h6, p, &-section-title) {
 		font-weight: 600;
 		color: var(--text-vanilla-100, #fff);
 	}
@@ -96,7 +109,8 @@
 		line-height: 32px;
 	}
 
-	h2 {
+	h2,
+	&-section-title {
 		font-size: 20px;
 		line-height: 28px;
 	}
@@ -108,6 +122,7 @@
 		overflow: hidden;
 		border-radius: 4px;
 		border: 1px solid var(--bg-slate-400, #1d212d);
+		margin-bottom: 28px;
 	}
 
 	.changelog-media-video {
@@ -124,17 +139,8 @@
 		&-line {
 			background-color: var(--bg-vanilla-300);
 		}
-		li,
-		p {
-			color: var(--text-ink-500);
-		}
 
-		h1,
-		h2,
-		h3,
-		h4,
-		h5,
-		h6 {
+		& :is(h1, h2, h3, h4, h5, h6, p, li, &-section-title) {
 			color: var(--text-ink-500);
 		}
 

frontend/src/components/ChangelogModal/components/ChangelogRenderer.tsx

@@ -55,33 +55,35 @@ function ChangelogRenderer({ changelog }: Props): JSX.Element {
 				<div className="inner-ball" />
 			</div>
 			<span className="changelog-release-date">{formattedReleaseDate}</span>
-			{changelog.features && changelog.features.length > 0 && (
-				<div className="changelog-renderer-list">
-					{changelog.features.map((feature) => (
-						<div key={feature.id}>
-							<h2>{feature.title}</h2>
-							{feature.media && renderMedia(feature.media)}
-							<ReactMarkdown>{feature.description}</ReactMarkdown>
-						</div>
-					))}
-				</div>
-			)}
-			{changelog.bug_fixes && changelog.bug_fixes.length > 0 && (
-				<div>
-					<h2>Bug Fixes</h2>
-					{changelog.bug_fixes && (
-						<ReactMarkdown>{changelog.bug_fixes}</ReactMarkdown>
-					)}
-				</div>
-			)}
-			{changelog.maintenance && changelog.maintenance.length > 0 && (
-				<div>
-					<h2>Maintenance</h2>
-					{changelog.maintenance && (
-						<ReactMarkdown>{changelog.maintenance}</ReactMarkdown>
-					)}
-				</div>
-			)}
+			<div className="changelog-renderer-content">
+				{changelog.features && changelog.features.length > 0 && (
+					<div className="changelog-renderer-list">
+						{changelog.features.map((feature) => (
+							<div key={feature.id}>
+								<div className="changelog-renderer-section-title">{feature.title}</div>
+								{feature.media && renderMedia(feature.media)}
+								<ReactMarkdown>{feature.description}</ReactMarkdown>
+							</div>
+						))}
+					</div>
+				)}
+				{changelog.bug_fixes && changelog.bug_fixes.length > 0 && (
+					<div className="changelog-renderer-bug-fixes">
+						<div className="changelog-renderer-section-title">Bug Fixes</div>
+						{changelog.bug_fixes && (
+							<ReactMarkdown>{changelog.bug_fixes}</ReactMarkdown>
+						)}
+					</div>
+				)}
+				{changelog.maintenance && changelog.maintenance.length > 0 && (
+					<div className="changelog-renderer-maintenance">
+						<div className="changelog-renderer-section-title">Maintenance</div>
+						{changelog.maintenance && (
+							<ReactMarkdown>{changelog.maintenance}</ReactMarkdown>
+						)}
+					</div>
+				)}
+			</div>
 		</div>
 	);
 }

frontend/src/components/HostMetricsDetail/HostMetricsDetail.styles.scss

@@ -169,6 +169,7 @@
 			box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.1);
 		}
 	}
+
 	.ant-drawer-close {
 		padding: 0px;
 	}

frontend/src/components/HostMetricsDetail/Metrics/Metrics.tsx

@@ -78,7 +78,7 @@ function Metrics({
 				signal,
 			}: QueryFunctionContext): Promise<
 				SuccessResponse<MetricRangePayloadProps>
-			> => GetMetricQueryRange(payload, ENTITY_VERSION_V4, signal),
+			> => GetMetricQueryRange(payload, ENTITY_VERSION_V4, undefined, signal),
 			enabled: !!payload && visibilities[index],
 			keepPreviousData: true,
 		})),

frontend/src/components/InputWithLabel/InputWithLabel.tsx

@@ -49,6 +49,7 @@ function InputWithLabel({
 				value={inputValue}
 				onChange={handleChange}
 				name={label.toLowerCase()}
+				data-testid={`input-${label}`}
 			/>
 			{labelAfter && <Typography.Text className="label">{label}</Typography.Text>}
 			{onClose && (

frontend/src/components/Logs/ListLogView/index.tsx

@@ -208,7 +208,11 @@ function ListLogView({
 				fontSize={fontSize}
 			>
 				<div className="log-line">
-					<LogStateIndicator type={logType} fontSize={fontSize} />
+					<LogStateIndicator
+						fontSize={fontSize}
+						severityText={logData.severity_text}
+						severityNumber={logData.severity_number}
+					/>
 					<div>
 						<LogContainer fontSize={fontSize}>
 							{updatedSelecedFields.some((field) => field.name === 'body') && (

frontend/src/components/Logs/LogStateIndicator/LogStateIndicator.styles.scss

@@ -7,7 +7,6 @@
 		height: 100%;
 		width: 3px;
 		border-radius: 50px;
-		background-color: transparent;
 
 		&.small {
 			min-height: 16px;
@@ -21,24 +20,107 @@
 			min-height: 24px;
 		}
 
-		&.INFO {
-			background-color: var(--bg-robin-500);
+		// Severity variant CSS classes using design tokens
+		// Trace variants -
+		&.severity-trace-0 {
+			background-color: var(--bg-forest-600);
 		}
-		&.WARNING,
-		&.WARN {
-			background-color: var(--bg-amber-500);
+		&.severity-trace-1 {
+			background-color: var(--bg-forest-500);
 		}
-		&.ERROR {
-			background-color: var(--bg-cherry-500);
-		}
-		&.TRACE {
+		&.severity-trace-2 {
 			background-color: var(--bg-forest-400);
 		}
-		&.DEBUG {
+		&.severity-trace-3 {
+			background-color: var(--bg-forest-300);
+		}
+		&.severity-trace-4 {
+			background-color: var(--bg-forest-200);
+		}
+
+		// Debug variants
+		&.severity-debug-0 {
+			background-color: var(--bg-aqua-600);
+		}
+		&.severity-debug-1 {
 			background-color: var(--bg-aqua-500);
 		}
-		&.FATAL {
+		&.severity-debug-2 {
+			background-color: var(--bg-aqua-400);
+		}
+		&.severity-debug-3 {
+			background-color: var(--bg-aqua-300);
+		}
+		&.severity-debug-4 {
+			background-color: var(--bg-aqua-200);
+		}
+
+		// Info variants
+		&.severity-info-0 {
+			background-color: var(--bg-robin-600);
+		}
+		&.severity-info-1 {
+			background-color: var(--bg-robin-500);
+		}
+		&.severity-info-2 {
+			background-color: var(--bg-robin-400);
+		}
+		&.severity-info-3 {
+			background-color: var(--bg-robin-300);
+		}
+		&.severity-info-4 {
+			background-color: var(--bg-robin-200);
+		}
+
+		// Warn variants
+		&.severity-warn-0 {
+			background-color: var(--bg-amber-600);
+		}
+		&.severity-warn-1 {
+			background-color: var(--bg-amber-500);
+		}
+		&.severity-warn-2 {
+			background-color: var(--bg-amber-400);
+		}
+		&.severity-warn-3 {
+			background-color: var(--bg-amber-300);
+		}
+		&.severity-warn-4 {
+			background-color: var(--bg-amber-200);
+		}
+
+		// Error variants
+		&.severity-error-0 {
+			background-color: var(--bg-cherry-600);
+		}
+		&.severity-error-1 {
+			background-color: var(--bg-cherry-500);
+		}
+		&.severity-error-2 {
+			background-color: var(--bg-cherry-400);
+		}
+		&.severity-error-3 {
+			background-color: var(--bg-cherry-300);
+		}
+		&.severity-error-4 {
+			background-color: var(--bg-cherry-200);
+		}
+
+		// Fatal variants
+		&.severity-fatal-0 {
+			background-color: var(--bg-sakura-600);
+		}
+		&.severity-fatal-1 {
 			background-color: var(--bg-sakura-500);
 		}
+		&.severity-fatal-2 {
+			background-color: var(--bg-sakura-400);
+		}
+		&.severity-fatal-3 {
+			background-color: var(--bg-sakura-300);
+		}
+		&.severity-fatal-4 {
+			background-color: var(--bg-sakura-200);
+		}
 	}
 }

frontend/src/components/Logs/LogStateIndicator/LogStateIndicator.test.tsx

@@ -6,37 +6,41 @@ import LogStateIndicator from './LogStateIndicator';
 describe('LogStateIndicator', () => {
 	it('renders correctly with default props', () => {
 		const { container } = render(
-			<LogStateIndicator type="INFO" fontSize={FontSize.MEDIUM} />,
+			<LogStateIndicator severityText="INFO" fontSize={FontSize.MEDIUM} />,
 		);
 		const indicator = container.firstChild as HTMLElement;
 		expect(indicator.classList.contains('log-state-indicator')).toBe(true);
 		expect(indicator.classList.contains('isActive')).toBe(false);
 		expect(container.querySelector('.line')).toBeTruthy();
-		expect(container.querySelector('.line')?.classList.contains('INFO')).toBe(
-			true,
-		);
+		expect(
+			container.querySelector('.line')?.classList.contains('severity-info-0'),
+		).toBe(true);
 	});
 
 	it('renders correctly with different types', () => {
 		const { container: containerInfo } = render(
-			<LogStateIndicator type="INFO" fontSize={FontSize.MEDIUM} />,
-		);
-		expect(containerInfo.querySelector('.line')?.classList.contains('INFO')).toBe(
-			true,
-		);
-
-		const { container: containerWarning } = render(
-			<LogStateIndicator type="WARNING" fontSize={FontSize.MEDIUM} />,
+			<LogStateIndicator severityText="INFO" fontSize={FontSize.MEDIUM} />,
 		);
 		expect(
-			containerWarning.querySelector('.line')?.classList.contains('WARNING'),
+			containerInfo.querySelector('.line')?.classList.contains('severity-info-0'),
+		).toBe(true);
+
+		const { container: containerWarning } = render(
+			<LogStateIndicator severityText="WARNING" fontSize={FontSize.MEDIUM} />,
+		);
+		expect(
+			containerWarning
+				.querySelector('.line')
+				?.classList.contains('severity-warn-0'),
 		).toBe(true);
 
 		const { container: containerError } = render(
-			<LogStateIndicator type="ERROR" fontSize={FontSize.MEDIUM} />,
+			<LogStateIndicator severityText="ERROR" fontSize={FontSize.MEDIUM} />,
 		);
 		expect(
-			containerError.querySelector('.line')?.classList.contains('ERROR'),
+			containerError
+				.querySelector('.line')
+				?.classList.contains('severity-error-0'),
 		).toBe(true);
 	});
 });

frontend/src/components/Logs/LogStateIndicator/LogStateIndicator.tsx

@@ -3,6 +3,8 @@ import './LogStateIndicator.styles.scss';
 import cx from 'classnames';
 import { FontSize } from 'container/OptionsMenu/types';
 
+import { getLogTypeBySeverityNumber } from './utils';
+
 export const SEVERITY_TEXT_TYPE = {
 	TRACE: 'TRACE',
 	TRACE2: 'TRACE2',
@@ -42,18 +44,112 @@ export const LogType = {
 	UNKNOWN: 'UNKNOWN',
 } as const;
 
+// Severity variant mapping to CSS classes
+const SEVERITY_VARIANT_CLASSES: Record<string, string> = {
+	// Trace variants - forest-600 to forest-200
+	TRACE: 'severity-trace-0',
+	Trace: 'severity-trace-1',
+	trace: 'severity-trace-2',
+	trc: 'severity-trace-3',
+	Trc: 'severity-trace-4',
+
+	// Debug variants - aqua-600 to aqua-200
+	DEBUG: 'severity-debug-0',
+	Debug: 'severity-debug-1',
+	debug: 'severity-debug-2',
+	dbg: 'severity-debug-3',
+	Dbg: 'severity-debug-4',
+
+	// Info variants - robin-600 to robin-200
+	INFO: 'severity-info-0',
+	Info: 'severity-info-1',
+	info: 'severity-info-2',
+	Information: 'severity-info-3',
+	information: 'severity-info-4',
+
+	// Warn variants - amber-600 to amber-200
+	WARN: 'severity-warn-0',
+	WARNING: 'severity-warn-0',
+	Warn: 'severity-warn-1',
+	warn: 'severity-warn-2',
+	warning: 'severity-warn-3',
+	Warning: 'severity-warn-4',
+	wrn: 'severity-warn-3',
+	Wrn: 'severity-warn-4',
+
+	// Error variants - cherry-600 to cherry-200
+	// eslint-disable-next-line sonarjs/no-duplicate-string
+	ERROR: 'severity-error-0',
+	Error: 'severity-error-1',
+	error: 'severity-error-2',
+	err: 'severity-error-3',
+	Err: 'severity-error-4',
+	ERR: 'severity-error-0',
+	fail: 'severity-error-2',
+	Fail: 'severity-error-3',
+	FAIL: 'severity-error-0',
+
+	// Fatal variants - sakura-600 to sakura-200
+	// eslint-disable-next-line sonarjs/no-duplicate-string
+	FATAL: 'severity-fatal-0',
+	Fatal: 'severity-fatal-1',
+	fatal: 'severity-fatal-2',
+	// eslint-disable-next-line sonarjs/no-duplicate-string
+	critical: 'severity-fatal-3',
+	Critical: 'severity-fatal-4',
+	CRITICAL: 'severity-fatal-0',
+	crit: 'severity-fatal-3',
+	Crit: 'severity-fatal-4',
+	CRIT: 'severity-fatal-0',
+	panic: 'severity-fatal-2',
+	Panic: 'severity-fatal-3',
+	PANIC: 'severity-fatal-0',
+};
+
+function getSeverityClass(
+	severityText?: string,
+	severityNumber?: number,
+): string {
+	// Priority 1: Use severityText for exact variant mapping
+	if (severityText) {
+		const variantClass = SEVERITY_VARIANT_CLASSES[severityText.trim()];
+		if (variantClass) {
+			return variantClass;
+		}
+	}
+
+	// Priority 2: Use severityNumber for base color (use middle shade as default)
+	if (severityNumber) {
+		const logType = getLogTypeBySeverityNumber(severityNumber);
+		if (logType !== LogType.UNKNOWN) {
+			return `severity-${logType.toLowerCase()}-0`; // Use middle shade (index 2)
+		}
+	}
+
+	return 'severity-info-0'; // Fallback to CSS classes based on type
+}
+
 function LogStateIndicator({
-	type,
 	fontSize,
+	severityText,
+	severityNumber,
 }: {
-	type: string;
 	fontSize: FontSize;
+	severityText?: string;
+	severityNumber?: number;
 }): JSX.Element {
+	const severityClass = getSeverityClass(severityText, severityNumber);
+
 	return (
 		<div className="log-state-indicator">
-			<div className={cx('line', type, fontSize)}> </div>
+			<div className={cx('line', fontSize, severityClass)} />
 		</div>
 	);
 }
 
+LogStateIndicator.defaultProps = {
+	severityText: '',
+	severityNumber: 0,
+};
+
 export default LogStateIndicator;

frontend/src/components/Logs/LogStateIndicator/utils.ts

@@ -41,7 +41,7 @@ const getLogTypeBySeverityText = (severityText: string): string => {
 };
 
 // https://opentelemetry.io/docs/specs/otel/logs/data-model/#field-severitynumber
-const getLogTypeBySeverityNumber = (severityNumber: number): string => {
+export const getLogTypeBySeverityNumber = (severityNumber: number): string => {
 	if (severityNumber < 1) {
 		return LogType.UNKNOWN;
 	}

frontend/src/components/Logs/RawLogView/index.tsx

@@ -1,6 +1,5 @@
-import './RawLogView.styles.scss';
-
-import { DrawerProps } from 'antd';
+import { Color } from '@signozhq/design-tokens';
+import { DrawerProps, Tooltip } from 'antd';
 import LogDetail from 'components/LogDetail';
 import { VIEW_TYPES, VIEWS } from 'components/LogDetail/constants';
 import { DATE_TIME_FORMATS } from 'constants/dateTimeFormats';
@@ -26,7 +25,7 @@ import LogLinesActionButtons from '../LogLinesActionButtons/LogLinesActionButton
 import LogStateIndicator from '../LogStateIndicator/LogStateIndicator';
 import { getLogIndicatorType } from '../LogStateIndicator/utils';
 // styles
-import { RawLogContent, RawLogViewContainer } from './styles';
+import { InfoIconWrapper, RawLogContent, RawLogViewContainer } from './styles';
 import { RawLogViewProps } from './types';
 
 function RawLogView({
@@ -35,12 +34,17 @@ function RawLogView({
 	data,
 	linesPerRow,
 	isTextOverflowEllipsisDisabled,
+	isHighlighted,
+	helpTooltip,
 	selectedFields = [],
 	fontSize,
+	onLogClick,
 }: RawLogViewProps): JSX.Element {
-	const { isHighlighted, isLogsExplorerPage, onLogCopy } = useCopyLogLink(
-		data.id,
-	);
+	const {
+		isHighlighted: isUrlHighlighted,
+		isLogsExplorerPage,
+		onLogCopy,
+	} = useCopyLogLink(data.id);
 	const flattenLogData = useMemo(() => FlatLogData(data), [data]);
 
 	const {
@@ -126,12 +130,20 @@ function RawLogView({
 		formatTimezoneAdjustedTimestamp,
 	]);
 
-	const handleClickExpand = useCallback(() => {
-		if (activeContextLog || isReadOnly) return;
+	const handleClickExpand = useCallback(
+		(event: MouseEvent) => {
+			if (activeContextLog || isReadOnly) return;
 
-		onSetActiveLog(data);
-		setSelectedTab(VIEW_TYPES.OVERVIEW);
-	}, [activeContextLog, isReadOnly, data, onSetActiveLog]);
+			// Use custom click handler if provided, otherwise use default behavior
+			if (onLogClick) {
+				onLogClick(data, event);
+			} else {
+				onSetActiveLog(data);
+				setSelectedTab(VIEW_TYPES.OVERVIEW);
+			}
+		},
+		[activeContextLog, isReadOnly, data, onSetActiveLog, onLogClick],
+	);
 
 	const handleCloseLogDetail: DrawerProps['onClose'] = useCallback(
 		(
@@ -183,16 +195,30 @@ function RawLogView({
 			align="middle"
 			$isDarkMode={isDarkMode}
 			$isReadOnly={isReadOnly}
-			$isHightlightedLog={isHighlighted}
+			$isHightlightedLog={isUrlHighlighted}
 			$isActiveLog={
 				activeLog?.id === data.id || activeContextLog?.id === data.id || isActiveLog
 			}
+			$isCustomHighlighted={isHighlighted}
 			$logType={logType}
 			onMouseEnter={handleMouseEnter}
 			onMouseLeave={handleMouseLeave}
 			fontSize={fontSize}
 		>
-			<LogStateIndicator type={logType} fontSize={fontSize} />
+			<LogStateIndicator
+				fontSize={fontSize}
+				severityText={data.severity_text}
+				severityNumber={data.severity_number}
+			/>
+			{helpTooltip && (
+				<Tooltip title={helpTooltip} placement="top" mouseEnterDelay={0.5}>
+					<InfoIconWrapper
+						size={14}
+						className="help-tooltip-icon"
+						color={Color.BG_VANILLA_400}
+					/>
+				</Tooltip>
+			)}
 
 			<RawLogContent
 				className="raw-log-content"
@@ -236,6 +262,7 @@ RawLogView.defaultProps = {
 	isActiveLog: false,
 	isReadOnly: false,
 	isTextOverflowEllipsisDisabled: false,
+	isHighlighted: false,
 };
 
 export default RawLogView;

frontend/src/components/Logs/RawLogView/styles.ts

@@ -3,8 +3,13 @@ import { blue } from '@ant-design/colors';
 import { Color } from '@signozhq/design-tokens';
 import { Col, Row, Space } from 'antd';
 import { FontSize } from 'container/OptionsMenu/types';
+import { Info } from 'lucide-react';
 import styled from 'styled-components';
-import { getActiveLogBackground, getDefaultLogBackground } from 'utils/logs';
+import {
+	getActiveLogBackground,
+	getCustomHighlightBackground,
+	getDefaultLogBackground,
+} from 'utils/logs';
 
 import { RawLogContentProps } from './types';
 
@@ -13,6 +18,7 @@ export const RawLogViewContainer = styled(Row)<{
 	$isReadOnly?: boolean;
 	$isActiveLog?: boolean;
 	$isHightlightedLog: boolean;
+	$isCustomHighlighted?: boolean;
 	$logType: string;
 	fontSize: FontSize;
 }>`
@@ -50,6 +56,18 @@ export const RawLogViewContainer = styled(Row)<{
 			  };
 			  transition: background-color 2s ease-in;`
 			: ''}
+
+	${({ $isCustomHighlighted, $isDarkMode, $logType }): string =>
+		getCustomHighlightBackground($isCustomHighlighted, $isDarkMode, $logType)}
+`;
+
+export const InfoIconWrapper = styled(Info)`
+	display: flex;
+	align-items: center;
+	margin-right: 4px;
+	cursor: help;
+	flex-shrink: 0;
+	height: auto;
 `;
 
 export const ExpandIconWrapper = styled(Col)`

frontend/src/components/Logs/RawLogView/types.ts

@@ -1,4 +1,5 @@
 import { FontSize } from 'container/OptionsMenu/types';
+import { MouseEvent } from 'react';
 import { IField } from 'types/api/logs/fields';
 import { ILog } from 'types/api/logs/log';
 
@@ -6,10 +7,13 @@ export interface RawLogViewProps {
 	isActiveLog?: boolean;
 	isReadOnly?: boolean;
 	isTextOverflowEllipsisDisabled?: boolean;
+	isHighlighted?: boolean;
+	helpTooltip?: string;
 	data: ILog;
 	linesPerRow: number;
 	fontSize: FontSize;
 	selectedFields?: IField[];
+	onLogClick?: (log: ILog, event: MouseEvent) => void;
 }
 
 export interface RawLogContentProps {

frontend/src/components/Logs/TableView/useTableView.tsx

@@ -11,7 +11,6 @@ import { useTimezone } from 'providers/Timezone';
 import { useMemo } from 'react';
 
 import LogStateIndicator from '../LogStateIndicator/LogStateIndicator';
-import { getLogIndicatorTypeForTable } from '../LogStateIndicator/utils';
 import {
 	defaultListViewPanelStyle,
 	defaultTableStyle,
@@ -93,8 +92,9 @@ export const useTableView = (props: UseTableViewProps): UseTableViewResult => {
 					children: (
 						<div className={cx('state-indicator', fontSize)}>
 							<LogStateIndicator
-								type={getLogIndicatorTypeForTable(item)}
 								fontSize={fontSize}
+								severityText={item.severity_text as string}
+								severityNumber={item.severity_number as number}
 							/>
 						</div>
 					),

frontend/src/components/LogsDownloadOptionsMenu/LogsDownloadOptionsMenu.styles.scss

@@ -0,0 +1,86 @@
+.logs-download-popover {
+	.ant-popover-inner {
+		border-radius: 4px;
+		border: 1px solid var(--bg-slate-400);
+		background: linear-gradient(
+			139deg,
+			var(--bg-ink-400) 0%,
+			var(--bg-ink-500) 98.68%
+		);
+		box-shadow: 4px 10px 16px 2px rgba(0, 0, 0, 0.2);
+		backdrop-filter: blur(20px);
+		padding: 0 8px 12px 8px;
+		margin: 6px 0;
+	}
+
+	.export-options-container {
+		width: 240px;
+		border-radius: 4px;
+
+		.title {
+			display: flex;
+			color: var(--bg-slate-50);
+			font-family: Inter;
+			font-size: 11px;
+			font-style: normal;
+			font-weight: 500;
+			line-height: 18px;
+			letter-spacing: 0.88px;
+			text-transform: uppercase;
+			margin-bottom: 8px;
+		}
+
+		.export-format,
+		.row-limit,
+		.columns-scope {
+			padding: 12px 4px;
+			display: flex;
+			flex-direction: column;
+
+			:global(.ant-radio-wrapper) {
+				color: var(--bg-vanilla-400);
+				font-family: Inter;
+				font-size: 13px;
+			}
+		}
+
+		.horizontal-line {
+			height: 1px;
+			background: var(--bg-slate-400);
+		}
+
+		.export-button {
+			width: 100%;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+		}
+	}
+}
+
+.lightMode {
+	.logs-download-popover {
+		.ant-popover-inner {
+			border: 1px solid var(--bg-vanilla-300);
+			background: linear-gradient(
+				139deg,
+				var(--bg-vanilla-100) 0%,
+				var(--bg-vanilla-300) 98.68%
+			);
+			box-shadow: 4px 10px 16px 2px rgba(255, 255, 255, 0.2);
+		}
+		.export-options-container {
+			.title {
+				color: var(--bg-ink-200);
+			}
+
+			:global(.ant-radio-wrapper) {
+				color: var(--bg-ink-400);
+			}
+
+			.horizontal-line {
+				background: var(--bg-vanilla-300);
+			}
+		}
+	}
+}

frontend/src/components/LogsDownloadOptionsMenu/LogsDownloadOptionsMenu.test.tsx

@@ -0,0 +1,341 @@
+import '@testing-library/jest-dom';
+
+import { fireEvent, render, screen, waitFor } from '@testing-library/react';
+import { message } from 'antd';
+import { ENVIRONMENT } from 'constants/env';
+import { server } from 'mocks-server/server';
+import { rest } from 'msw';
+import { TelemetryFieldKey } from 'types/api/v5/queryRange';
+
+import { DownloadFormats, DownloadRowCounts } from './constants';
+import LogsDownloadOptionsMenu from './LogsDownloadOptionsMenu';
+
+// Mock antd message
+jest.mock('antd', () => {
+	const actual = jest.requireActual('antd');
+	return {
+		...actual,
+		message: {
+			success: jest.fn(),
+			error: jest.fn(),
+		},
+	};
+});
+
+const TEST_IDS = {
+	DOWNLOAD_BUTTON: 'periscope-btn-download-options',
+} as const;
+
+interface TestProps {
+	startTime: number;
+	endTime: number;
+	filter: string;
+	columns: TelemetryFieldKey[];
+	orderBy: string;
+}
+
+const createTestProps = (): TestProps => ({
+	startTime: 1631234567890,
+	endTime: 1631234567999,
+	filter: 'status = 200',
+	columns: [
+		{
+			name: 'http.status',
+			fieldContext: 'attribute',
+			fieldDataType: 'int64',
+		} as TelemetryFieldKey,
+	],
+	orderBy: 'timestamp:desc',
+});
+
+const testRenderContent = (props: TestProps): void => {
+	render(
+		<LogsDownloadOptionsMenu
+			startTime={props.startTime}
+			endTime={props.endTime}
+			filter={props.filter}
+			columns={props.columns}
+			orderBy={props.orderBy}
+		/>,
+	);
+};
+
+const testSuccessResponse = (res: any, ctx: any): any =>
+	res(
+		ctx.status(200),
+		ctx.set('Content-Type', 'application/octet-stream'),
+		ctx.set('Content-Disposition', 'attachment; filename="export.csv"'),
+		ctx.body('id,value\n1,2\n'),
+	);
+
+describe('LogsDownloadOptionsMenu', () => {
+	const BASE_URL = ENVIRONMENT.baseURL;
+	const EXPORT_URL = `${BASE_URL}/api/v1/export_raw_data`;
+	let requestSpy: jest.Mock<any, any>;
+	const setupDefaultServer = (): void => {
+		server.use(
+			rest.get(EXPORT_URL, (req, res, ctx) => {
+				const params = req.url.searchParams;
+				const payload = {
+					start: Number(params.get('start')),
+					end: Number(params.get('end')),
+					filter: params.get('filter'),
+					columns: params.getAll('columns'),
+					order_by: params.get('order_by'),
+					limit: Number(params.get('limit')),
+					format: params.get('format'),
+				};
+				requestSpy(payload);
+				return testSuccessResponse(res, ctx);
+			}),
+		);
+	};
+
+	// Mock URL.createObjectURL used by download logic
+	const originalCreateObjectURL = URL.createObjectURL;
+	const originalRevokeObjectURL = URL.revokeObjectURL;
+
+	beforeEach(() => {
+		requestSpy = jest.fn();
+		setupDefaultServer();
+		(message.success as jest.Mock).mockReset();
+		(message.error as jest.Mock).mockReset();
+		// jsdom doesn't implement it by default
+		((URL as unknown) as {
+			createObjectURL: (b: Blob) => string;
+		}).createObjectURL = jest.fn(() => 'blob:mock');
+		((URL as unknown) as {
+			revokeObjectURL: (u: string) => void;
+		}).revokeObjectURL = jest.fn();
+	});
+
+	beforeAll(() => {
+		server.listen();
+	});
+
+	afterEach(() => {
+		server.resetHandlers();
+	});
+
+	afterAll(() => {
+		server.close();
+		// restore
+		URL.createObjectURL = originalCreateObjectURL;
+		URL.revokeObjectURL = originalRevokeObjectURL;
+	});
+
+	it('renders download button', () => {
+		const props = createTestProps();
+		testRenderContent(props);
+
+		const button = screen.getByTestId(TEST_IDS.DOWNLOAD_BUTTON);
+		expect(button).toBeInTheDocument();
+		expect(button).toHaveClass('periscope-btn', 'ghost');
+	});
+
+	it('shows popover with export options when download button is clicked', () => {
+		const props = createTestProps();
+		render(
+			<LogsDownloadOptionsMenu
+				startTime={props.startTime}
+				endTime={props.endTime}
+				filter={props.filter}
+				columns={props.columns}
+				orderBy={props.orderBy}
+			/>,
+		);
+
+		fireEvent.click(screen.getByTestId(TEST_IDS.DOWNLOAD_BUTTON));
+
+		expect(screen.getByRole('dialog')).toBeInTheDocument();
+		expect(screen.getByText('FORMAT')).toBeInTheDocument();
+		expect(screen.getByText('Number of Rows')).toBeInTheDocument();
+		expect(screen.getByText('Columns')).toBeInTheDocument();
+	});
+
+	it('allows changing export format', () => {
+		const props = createTestProps();
+		testRenderContent(props);
+		fireEvent.click(screen.getByTestId(TEST_IDS.DOWNLOAD_BUTTON));
+
+		const csvRadio = screen.getByRole('radio', { name: 'csv' });
+		const jsonlRadio = screen.getByRole('radio', { name: 'jsonl' });
+
+		expect(csvRadio).toBeChecked();
+		fireEvent.click(jsonlRadio);
+		expect(jsonlRadio).toBeChecked();
+		expect(csvRadio).not.toBeChecked();
+	});
+
+	it('allows changing row limit', () => {
+		const props = createTestProps();
+		testRenderContent(props);
+
+		fireEvent.click(screen.getByTestId(TEST_IDS.DOWNLOAD_BUTTON));
+
+		const tenKRadio = screen.getByRole('radio', { name: '10k' });
+		const fiftyKRadio = screen.getByRole('radio', { name: '50k' });
+
+		expect(tenKRadio).toBeChecked();
+		fireEvent.click(fiftyKRadio);
+		expect(fiftyKRadio).toBeChecked();
+		expect(tenKRadio).not.toBeChecked();
+	});
+
+	it('allows changing columns scope', () => {
+		const props = createTestProps();
+		testRenderContent(props);
+		fireEvent.click(screen.getByTestId(TEST_IDS.DOWNLOAD_BUTTON));
+
+		const allColumnsRadio = screen.getByRole('radio', { name: 'All' });
+		const selectedColumnsRadio = screen.getByRole('radio', { name: 'Selected' });
+
+		expect(allColumnsRadio).toBeChecked();
+		fireEvent.click(selectedColumnsRadio);
+		expect(selectedColumnsRadio).toBeChecked();
+		expect(allColumnsRadio).not.toBeChecked();
+	});
+
+	it('calls downloadExportData with correct parameters when export button is clicked (Selected columns)', async () => {
+		const props = createTestProps();
+		testRenderContent(props);
+		fireEvent.click(screen.getByTestId(TEST_IDS.DOWNLOAD_BUTTON));
+		fireEvent.click(screen.getByRole('radio', { name: 'Selected' }));
+		fireEvent.click(screen.getByText('Export'));
+
+		await waitFor(() => {
+			expect(requestSpy).toHaveBeenCalledWith(
+				expect.objectContaining({
+					start: props.startTime,
+					end: props.endTime,
+					columns: ['attribute.http.status:int64'],
+					filter: props.filter,
+					order_by: props.orderBy,
+					format: DownloadFormats.CSV,
+					limit: DownloadRowCounts.TEN_K,
+				}),
+			);
+		});
+	});
+
+	it('calls downloadExportData with correct parameters when export button is clicked', async () => {
+		const props = createTestProps();
+		testRenderContent(props);
+
+		fireEvent.click(screen.getByTestId(TEST_IDS.DOWNLOAD_BUTTON));
+		fireEvent.click(screen.getByRole('radio', { name: 'All' }));
+		fireEvent.click(screen.getByText('Export'));
+
+		await waitFor(() => {
+			expect(requestSpy).toHaveBeenCalledWith(
+				expect.objectContaining({
+					start: props.startTime,
+					end: props.endTime,
+					columns: [],
+					filter: props.filter,
+					order_by: props.orderBy,
+					format: DownloadFormats.CSV,
+					limit: DownloadRowCounts.TEN_K,
+				}),
+			);
+		});
+	});
+
+	it('handles successful export with success message', async () => {
+		const props = createTestProps();
+		testRenderContent(props);
+
+		fireEvent.click(screen.getByTestId(TEST_IDS.DOWNLOAD_BUTTON));
+		fireEvent.click(screen.getByText('Export'));
+
+		await waitFor(() => {
+			expect(message.success).toHaveBeenCalledWith(
+				'Export completed successfully',
+			);
+		});
+	});
+
+	it('handles export failure with error message', async () => {
+		// Override handler to return 500 for this test
+		server.use(rest.get(EXPORT_URL, (_req, res, ctx) => res(ctx.status(500))));
+		const props = createTestProps();
+		testRenderContent(props);
+
+		fireEvent.click(screen.getByTestId(TEST_IDS.DOWNLOAD_BUTTON));
+		fireEvent.click(screen.getByText('Export'));
+
+		await waitFor(() => {
+			expect(message.error).toHaveBeenCalledWith(
+				'Failed to export logs. Please try again.',
+			);
+		});
+	});
+
+	it('handles UI state correctly during export process', async () => {
+		server.use(
+			rest.get(EXPORT_URL, (_req, res, ctx) => testSuccessResponse(res, ctx)),
+		);
+		const props = createTestProps();
+		testRenderContent(props);
+
+		// Open popover
+		fireEvent.click(screen.getByTestId(TEST_IDS.DOWNLOAD_BUTTON));
+		expect(screen.getByRole('dialog')).toBeInTheDocument();
+
+		// Start export
+		fireEvent.click(screen.getByText('Export'));
+
+		// Check button is disabled during export
+		expect(screen.getByTestId(TEST_IDS.DOWNLOAD_BUTTON)).toBeDisabled();
+
+		// Check popover is closed immediately after export starts
+		expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
+
+		// Wait for export to complete and verify button is enabled again
+		await waitFor(() => {
+			expect(screen.getByTestId(TEST_IDS.DOWNLOAD_BUTTON)).not.toBeDisabled();
+		});
+	});
+
+	it('uses filename from Content-Disposition and triggers download click', async () => {
+		server.use(
+			rest.get(EXPORT_URL, (_req, res, ctx) =>
+				res(
+					ctx.status(200),
+					ctx.set('Content-Type', 'application/octet-stream'),
+					ctx.set('Content-Disposition', 'attachment; filename="report.jsonl"'),
+					ctx.body('row\n'),
+				),
+			),
+		);
+
+		const originalCreateElement = document.createElement.bind(document);
+		const anchorEl = originalCreateElement('a') as HTMLAnchorElement;
+		const setAttrSpy = jest.spyOn(anchorEl, 'setAttribute');
+		const clickSpy = jest.spyOn(anchorEl, 'click');
+		const removeSpy = jest.spyOn(anchorEl, 'remove');
+		const createElSpy = jest
+			.spyOn(document, 'createElement')
+			.mockImplementation((tagName: any): any =>
+				tagName === 'a' ? anchorEl : originalCreateElement(tagName),
+			);
+		const appendSpy = jest.spyOn(document.body, 'appendChild');
+
+		const props = createTestProps();
+		testRenderContent(props);
+
+		fireEvent.click(screen.getByTestId(TEST_IDS.DOWNLOAD_BUTTON));
+		fireEvent.click(screen.getByText('Export'));
+
+		await waitFor(() => {
+			expect(appendSpy).toHaveBeenCalledWith(anchorEl);
+			expect(setAttrSpy).toHaveBeenCalledWith('download', 'report.jsonl');
+			expect(clickSpy).toHaveBeenCalled();
+			expect(removeSpy).toHaveBeenCalled();
+		});
+		expect(anchorEl.getAttribute('download')).toBe('report.jsonl');
+
+		createElSpy.mockRestore();
+		appendSpy.mockRestore();
+	});
+});

frontend/src/components/LogsDownloadOptionsMenu/LogsDownloadOptionsMenu.tsx

@@ -0,0 +1,170 @@
+import './LogsDownloadOptionsMenu.styles.scss';
+
+import { Button, message, Popover, Radio, Tooltip, Typography } from 'antd';
+import { downloadExportData } from 'api/v1/download/downloadExportData';
+import { Download, DownloadIcon, Loader2 } from 'lucide-react';
+import { useCallback, useMemo, useState } from 'react';
+import { TelemetryFieldKey } from 'types/api/v5/queryRange';
+
+import {
+	DownloadColumnsScopes,
+	DownloadFormats,
+	DownloadRowCounts,
+} from './constants';
+
+function convertTelemetryFieldKeyToText(key: TelemetryFieldKey): string {
+	const prefix = key.fieldContext ? `${key.fieldContext}.` : '';
+	const suffix = key.fieldDataType ? `:${key.fieldDataType}` : '';
+	return `${prefix}${key.name}${suffix}`;
+}
+
+interface LogsDownloadOptionsMenuProps {
+	startTime: number;
+	endTime: number;
+	filter: string;
+	columns: TelemetryFieldKey[];
+	orderBy: string;
+}
+
+export default function LogsDownloadOptionsMenu({
+	startTime,
+	endTime,
+	filter,
+	columns,
+	orderBy,
+}: LogsDownloadOptionsMenuProps): JSX.Element {
+	const [exportFormat, setExportFormat] = useState<string>(DownloadFormats.CSV);
+	const [rowLimit, setRowLimit] = useState<number>(DownloadRowCounts.TEN_K);
+	const [columnsScope, setColumnsScope] = useState<string>(
+		DownloadColumnsScopes.ALL,
+	);
+	const [isDownloading, setIsDownloading] = useState<boolean>(false);
+	const [isPopoverOpen, setIsPopoverOpen] = useState<boolean>(false);
+
+	const handleExportRawData = useCallback(async (): Promise<void> => {
+		setIsPopoverOpen(false);
+		try {
+			setIsDownloading(true);
+			const downloadOptions = {
+				source: 'logs',
+				start: startTime,
+				end: endTime,
+				columns:
+					columnsScope === DownloadColumnsScopes.SELECTED
+						? columns.map((col) => convertTelemetryFieldKeyToText(col))
+						: [],
+				filter,
+				orderBy,
+				format: exportFormat,
+				limit: rowLimit,
+			};
+
+			await downloadExportData(downloadOptions);
+			message.success('Export completed successfully');
+		} catch (error) {
+			console.error('Error exporting logs:', error);
+			message.error('Failed to export logs. Please try again.');
+		} finally {
+			setIsDownloading(false);
+		}
+	}, [
+		startTime,
+		endTime,
+		columnsScope,
+		columns,
+		filter,
+		orderBy,
+		exportFormat,
+		rowLimit,
+		setIsDownloading,
+		setIsPopoverOpen,
+	]);
+
+	const popoverContent = useMemo(
+		() => (
+			<div
+				className="export-options-container"
+				role="dialog"
+				aria-label="Export options"
+				aria-modal="true"
+			>
+				<div className="export-format">
+					<Typography.Text className="title">FORMAT</Typography.Text>
+					<Radio.Group
+						value={exportFormat}
+						onChange={(e): void => setExportFormat(e.target.value)}
+					>
+						<Radio value={DownloadFormats.CSV}>csv</Radio>
+						<Radio value={DownloadFormats.JSONL}>jsonl</Radio>
+					</Radio.Group>
+				</div>
+
+				<div className="horizontal-line" />
+
+				<div className="row-limit">
+					<Typography.Text className="title">Number of Rows</Typography.Text>
+					<Radio.Group
+						value={rowLimit}
+						onChange={(e): void => setRowLimit(e.target.value)}
+					>
+						<Radio value={DownloadRowCounts.TEN_K}>10k</Radio>
+						<Radio value={DownloadRowCounts.THIRTY_K}>30k</Radio>
+						<Radio value={DownloadRowCounts.FIFTY_K}>50k</Radio>
+					</Radio.Group>
+				</div>
+
+				<div className="horizontal-line" />
+
+				<div className="columns-scope">
+					<Typography.Text className="title">Columns</Typography.Text>
+					<Radio.Group
+						value={columnsScope}
+						onChange={(e): void => setColumnsScope(e.target.value)}
+					>
+						<Radio value={DownloadColumnsScopes.ALL}>All</Radio>
+						<Radio value={DownloadColumnsScopes.SELECTED}>Selected</Radio>
+					</Radio.Group>
+				</div>
+
+				<Button
+					type="primary"
+					icon={<Download size={16} />}
+					onClick={handleExportRawData}
+					className="export-button"
+					disabled={isDownloading}
+					loading={isDownloading}
+				>
+					Export
+				</Button>
+			</div>
+		),
+		[exportFormat, rowLimit, columnsScope, isDownloading, handleExportRawData],
+	);
+
+	return (
+		<Popover
+			content={popoverContent}
+			trigger="click"
+			placement="bottomRight"
+			arrow={false}
+			open={isPopoverOpen}
+			onOpenChange={setIsPopoverOpen}
+			rootClassName="logs-download-popover"
+		>
+			<Tooltip title="Download" placement="top">
+				<Button
+					className="periscope-btn ghost"
+					icon={
+						isDownloading ? (
+							<Loader2 size={18} className="animate-spin" />
+						) : (
+							<DownloadIcon size={15} />
+						)
+					}
+					data-testid="periscope-btn-download-options"
+					disabled={isDownloading}
+				/>
+			</Tooltip>
+		</Popover>
+	);
+}

frontend/src/components/LogsDownloadOptionsMenu/constants.ts

@@ -0,0 +1,15 @@
+export const DownloadFormats = {
+	CSV: 'csv',
+	JSONL: 'jsonl',
+};
+
+export const DownloadColumnsScopes = {
+	ALL: 'all',
+	SELECTED: 'selected',
+};
+
+export const DownloadRowCounts = {
+	TEN_K: 10_000,
+	THIRTY_K: 30_000,
+	FIFTY_K: 50_000,
+};

frontend/src/components/LogsFormatOptionsMenu/LogsFormatOptionsMenu.tsx

@@ -3,24 +3,30 @@
 /* eslint-disable jsx-a11y/click-events-have-key-events */
 import './LogsFormatOptionsMenu.styles.scss';
 
-import { Button, Input, InputNumber, Tooltip, Typography } from 'antd';
+import { Button, Input, InputNumber, Popover, Tooltip, Typography } from 'antd';
 import { DefaultOptionType } from 'antd/es/select';
 import cx from 'classnames';
 import { LogViewMode } from 'container/LogsTable';
 import { FontSize, OptionsMenuConfig } from 'container/OptionsMenu/types';
 import useDebouncedFn from 'hooks/useDebouncedFunction';
-import { Check, ChevronLeft, ChevronRight, Minus, Plus, X } from 'lucide-react';
+import {
+	Check,
+	ChevronLeft,
+	ChevronRight,
+	Minus,
+	Plus,
+	Sliders,
+	X,
+} from 'lucide-react';
 import { useCallback, useEffect, useRef, useState } from 'react';
 
 interface LogsFormatOptionsMenuProps {
-	title: string;
 	items: any;
 	selectedOptionFormat: any;
 	config: OptionsMenuConfig;
 }
 
 export default function LogsFormatOptionsMenu({
-	title,
 	items,
 	selectedOptionFormat,
 	config,
@@ -43,6 +49,7 @@ export default function LogsFormatOptionsMenu({
 	const [selectedValue, setSelectedValue] = useState<string | null>(null);
 	const listRef = useRef<HTMLDivElement>(null);
 	const initialMouseEnterRef = useRef<boolean>(false);
+	const [isPopoverOpen, setIsPopoverOpen] = useState<boolean>(false);
 
 	const onChange = useCallback(
 		(key: LogViewMode) => {
@@ -202,7 +209,7 @@ export default function LogsFormatOptionsMenu({
 		};
 	}, [selectedValue]);
 
-	return (
+	const popoverContent = (
 		<div
 			className={cx(
 				'nested-menu-container',
@@ -344,7 +351,7 @@ export default function LogsFormatOptionsMenu({
 					</div>
 					<div className="horizontal-line" />
 					<div className="menu-container">
-						<div className="title"> {title} </div>
+						<div className="title">FORMAT</div>
 
 						<div className="menu-items">
 							{items.map(
@@ -440,4 +447,21 @@ export default function LogsFormatOptionsMenu({
 			)}
 		</div>
 	);
+	return (
+		<Popover
+			content={popoverContent}
+			trigger="click"
+			placement="bottomRight"
+			arrow={false}
+			open={isPopoverOpen}
+			onOpenChange={setIsPopoverOpen}
+			rootClassName="format-options-popover"
+		>
+			<Button
+				className="periscope-btn ghost"
+				icon={<Sliders size={14} />}
+				data-testid="periscope-btn-format-options"
+			/>
+		</Popover>
+	);
 }

frontend/src/components/NewSelect/CustomMultiSelect.tsx

@@ -1,3 +1,5 @@
+/* eslint-disable jsx-a11y/no-static-element-interactions */
+/* eslint-disable jsx-a11y/click-events-have-key-events */
 /* eslint-disable sonarjs/cognitive-complexity */
 /* eslint-disable react/jsx-props-no-spreading */
 /* eslint-disable no-nested-ternary */
@@ -12,9 +14,11 @@ import {
 import { Color } from '@signozhq/design-tokens';
 import { Button, Checkbox, Select, Typography } from 'antd';
 import cx from 'classnames';
+import TextToolTip from 'components/TextToolTip/TextToolTip';
 import { SOMETHING_WENT_WRONG } from 'constants/api';
+import { useIsDarkMode } from 'hooks/useDarkMode';
 import { capitalize, isEmpty } from 'lodash-es';
-import { ArrowDown, ArrowLeft, ArrowRight, ArrowUp } from 'lucide-react';
+import { ArrowDown, ArrowLeft, ArrowRight, ArrowUp, Info } from 'lucide-react';
 import type { BaseSelectRef } from 'rc-select';
 import React, {
 	useCallback,
@@ -23,11 +27,13 @@ import React, {
 	useRef,
 	useState,
 } from 'react';
+import { Virtuoso } from 'react-virtuoso';
 import { popupContainer } from 'utils/selectPopupContainer';
 
 import { CustomMultiSelectProps, CustomTagProps, OptionData } from './types';
 import {
 	filterOptionsBySearch,
+	handleScrollToBottom,
 	prioritizeOrAddOptionForMultiSelect,
 	SPACEKEY,
 } from './utils';
@@ -37,7 +43,7 @@ enum ToggleTagValue {
 	All = 'All',
 }
 
-const ALL_SELECTED_VALUE = '__all__'; // Constant for the special value
+const ALL_SELECTED_VALUE = '__ALL__'; // Constant for the special value
 
 const CustomMultiSelect: React.FC<CustomMultiSelectProps> = ({
 	placeholder = 'Search...',
@@ -62,6 +68,12 @@ const CustomMultiSelect: React.FC<CustomMultiSelectProps> = ({
 	allowClear = false,
 	onRetry,
 	maxTagTextLength,
+	onDropdownVisibleChange,
+	showIncompleteDataMessage = false,
+	showLabels = false,
+	enableRegexOption = false,
+	isDynamicVariable = false,
+	showRetryButton = true,
 	...rest
 }) => {
 	// ===== State & Refs =====
@@ -78,6 +90,10 @@ const CustomMultiSelect: React.FC<CustomMultiSelectProps> = ({
 	const optionRefs = useRef<Record<number, HTMLDivElement | null>>({});
 	const [visibleOptions, setVisibleOptions] = useState<OptionData[]>([]);
 	const isClickInsideDropdownRef = useRef(false);
+	const justOpenedRef = useRef<boolean>(false);
+	const [isScrolledToBottom, setIsScrolledToBottom] = useState(false);
+
+	const isDarkMode = useIsDarkMode();
 
 	// Convert single string value to array for consistency
 	const selectedValues = useMemo(
@@ -124,6 +140,12 @@ const CustomMultiSelect: React.FC<CustomMultiSelectProps> = ({
 		return allAvailableValues.every((val) => selectedValues.includes(val));
 	}, [selectedValues, allAvailableValues, enableAllSelection]);
 
+	// Define allOptionShown earlier in the code
+	const allOptionShown = useMemo(
+		() => value === ALL_SELECTED_VALUE || value === 'ALL',
+		[value],
+	);
+
 	// Value passed to the underlying Ant Select component
 	const displayValue = useMemo(
 		() => (isAllSelected ? [ALL_SELECTED_VALUE] : selectedValues),
@@ -132,10 +154,18 @@ const CustomMultiSelect: React.FC<CustomMultiSelectProps> = ({
 
 	// ===== Internal onChange Handler =====
 	const handleInternalChange = useCallback(
-		(newValue: string | string[]): void => {
+		(newValue: string | string[], directCaller?: boolean): void => {
 			// Ensure newValue is an array
 			const currentNewValue = Array.isArray(newValue) ? newValue : [];
 
+			if (
+				(allOptionShown || isAllSelected) &&
+				!directCaller &&
+				currentNewValue.length === 0
+			) {
+				return;
+			}
+
 			if (!onChange) return;
 
 			// Case 1: Cleared (empty array or undefined)
@@ -144,7 +174,7 @@ const CustomMultiSelect: React.FC<CustomMultiSelectProps> = ({
 				return;
 			}
 
-			// Case 2: "__all__" is selected (means select all actual values)
+			// Case 2: "__ALL__" is selected (means select all actual values)
 			if (currentNewValue.includes(ALL_SELECTED_VALUE)) {
 				const allActualOptions = allAvailableValues.map(
 					(v) => options.flat().find((o) => o.value === v) || { label: v, value: v },
@@ -175,7 +205,14 @@ const CustomMultiSelect: React.FC<CustomMultiSelectProps> = ({
 				}
 			}
 		},
-		[onChange, allAvailableValues, options, enableAllSelection],
+		[
+			allOptionShown,
+			isAllSelected,
+			onChange,
+			allAvailableValues,
+			options,
+			enableAllSelection,
+		],
 	);
 
 	// ===== Existing Callbacks (potentially needing adjustment later) =====
@@ -272,7 +309,8 @@ const CustomMultiSelect: React.FC<CustomMultiSelectProps> = ({
 					: filteredOptions,
 			);
 		}
-	}, [filteredOptions, searchText, options, selectedValues]);
+		// eslint-disable-next-line react-hooks/exhaustive-deps
+	}, [filteredOptions, searchText, options]);
 
 	// ===== Text Selection Utilities =====
 
@@ -510,13 +548,46 @@ const CustomMultiSelect: React.FC<CustomMultiSelectProps> = ({
 			}
 
 			// Normal single value handling
-			setSearchText(value.trim());
+			const trimmedValue = value.trim();
+			setSearchText(trimmedValue);
 			if (!isOpen) {
 				setIsOpen(true);
+				justOpenedRef.current = true;
 			}
-			if (onSearch) onSearch(value.trim());
+
+			// Reset active index when search changes if dropdown is open
+			if (isOpen && trimmedValue) {
+				setActiveIndex(-1);
+				// see if the trimmed value matched any option and set that active index
+				const matchedOption = filteredOptions.find(
+					(option) =>
+						option.label.toLowerCase() === trimmedValue.toLowerCase() ||
+						option.value?.toLowerCase() === trimmedValue.toLowerCase(),
+				);
+				if (matchedOption) {
+					setActiveIndex(1);
+				} else {
+					// check if the trimmed value is a regex pattern and set that active index
+					const isRegex =
+						trimmedValue.startsWith('.*') && trimmedValue.endsWith('.*');
+					if (isRegex && enableRegexOption) {
+						setActiveIndex(0);
+					} else {
+						setActiveIndex(enableRegexOption ? 1 : 0);
+					}
+				}
+			}
+
+			if (onSearch) onSearch(trimmedValue);
 		},
-		[onSearch, isOpen, selectedValues, onChange],
+		[
+			onSearch,
+			isOpen,
+			selectedValues,
+			onChange,
+			filteredOptions,
+			enableRegexOption,
+		],
 	);
 
 	// ===== UI & Rendering Functions =====
@@ -528,28 +599,34 @@ const CustomMultiSelect: React.FC<CustomMultiSelectProps> = ({
 		(text: string, searchQuery: string): React.ReactNode => {
 			if (!searchQuery || !highlightSearch) return text;
 
-			const parts = text.split(
-				new RegExp(
-					`(${searchQuery.replace(/[.*+?^${}()|[\\]\\]/g, '\\$&')})`,
-					'gi',
-				),
-			);
-			return (
-				<>
-					{parts.map((part, i) => {
-						// Create a unique key that doesn't rely on array index
-						const uniqueKey = `${text.substring(0, 3)}-${part.substring(0, 3)}-${i}`;
+			try {
+				const parts = text.split(
+					new RegExp(
+						`(${searchQuery.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&')})`,
+						'gi',
+					),
+				);
+				return (
+					<>
+						{parts.map((part, i) => {
+							// Create a unique key that doesn't rely on array index
+							const uniqueKey = `${text.substring(0, 3)}-${part.substring(0, 3)}-${i}`;
 
-						return part.toLowerCase() === searchQuery.toLowerCase() ? (
-							<span key={uniqueKey} className="highlight-text">
-								{part}
-							</span>
-						) : (
-							part
-						);
-					})}
-				</>
-			);
+							return part.toLowerCase() === searchQuery.toLowerCase() ? (
+								<span key={uniqueKey} className="highlight-text">
+									{part}
+								</span>
+							) : (
+								part
+							);
+						})}
+					</>
+				);
+			} catch (error) {
+				// If regex fails, return the original text without highlighting
+				console.error('Error in text highlighting:', error);
+				return text;
+			}
 		},
 		[highlightSearch],
 	);
@@ -560,10 +637,10 @@ const CustomMultiSelect: React.FC<CustomMultiSelectProps> = ({
 
 		if (isAllSelected) {
 			// If all are selected, deselect all
-			handleInternalChange([]);
+			handleInternalChange([], true);
 		} else {
 			// Otherwise, select all
-			handleInternalChange([ALL_SELECTED_VALUE]);
+			handleInternalChange([ALL_SELECTED_VALUE], true);
 		}
 	}, [options, isAllSelected, handleInternalChange]);
 
@@ -738,6 +815,26 @@ const CustomMultiSelect: React.FC<CustomMultiSelectProps> = ({
 	// Enhanced keyboard navigation with support for maxTagCount
 	const handleKeyDown = useCallback(
 		(e: React.KeyboardEvent<HTMLElement>): void => {
+			// Simple early return if ALL is selected - block all possible keyboard interactions
+			// that could remove the ALL tag, but still allow dropdown navigation and search
+			if (
+				(allOptionShown || isAllSelected) &&
+				(e.key === 'Backspace' || e.key === 'Delete')
+			) {
+				// Only prevent default if the input is empty or cursor is at start position
+				const activeElement = document.activeElement as HTMLInputElement;
+				const isInputActive = activeElement?.tagName === 'INPUT';
+				const isInputEmpty = isInputActive && !activeElement?.value;
+				const isCursorAtStart =
+					isInputActive && activeElement?.selectionStart === 0;
+
+				if (isInputEmpty || isCursorAtStart) {
+					e.preventDefault();
+					e.stopPropagation();
+					return;
+				}
+			}
+
 			// Get flattened list of all selectable options
 			const getFlatOptions = (): OptionData[] => {
 				if (!visibleOptions) return [];
@@ -752,13 +849,13 @@ const CustomMultiSelect: React.FC<CustomMultiSelectProps> = ({
 				if (hasAll) {
 					flatList.push({
 						label: 'ALL',
-						value: '__all__', // Special value for the ALL option
+						value: ALL_SELECTED_VALUE, // Special value for the ALL option
 						type: 'defined',
 					});
 				}
 
 				// Add Regex to flat list
-				if (!isEmpty(searchText)) {
+				if (!isEmpty(searchText) && enableRegexOption) {
 					// Only add regex wrapper if it doesn't already look like a regex pattern
 					const isAlreadyRegex =
 						searchText.startsWith('.*') && searchText.endsWith('.*');
@@ -784,6 +881,17 @@ const CustomMultiSelect: React.FC<CustomMultiSelectProps> = ({
 
 			const flatOptions = getFlatOptions();
 
+			// If we just opened the dropdown and have options, set first option as active
+			if (justOpenedRef.current && flatOptions.length > 0) {
+				setActiveIndex(0);
+				justOpenedRef.current = false;
+			}
+
+			// If no option is active but we have options and dropdown is open, activate the first one
+			if (isOpen && activeIndex === -1 && flatOptions.length > 0) {
+				setActiveIndex(0);
+			}
+
 			// Get the active input element to check cursor position
 			const activeElement = document.activeElement as HTMLInputElement;
 			const isInputActive = activeElement?.tagName === 'INPUT';
@@ -1129,7 +1237,7 @@ const CustomMultiSelect: React.FC<CustomMultiSelectProps> = ({
 						// If there's an active option in the dropdown, prioritize selecting it
 						if (activeIndex >= 0 && activeIndex < flatOptions.length) {
 							const selectedOption = flatOptions[activeIndex];
-							if (selectedOption.value === '__all__') {
+							if (selectedOption.value === ALL_SELECTED_VALUE) {
 								handleSelectAll();
 							} else if (selectedOption.value && onChange) {
 								const newValues = selectedValues.includes(selectedOption.value)
@@ -1159,6 +1267,10 @@ const CustomMultiSelect: React.FC<CustomMultiSelectProps> = ({
 						e.preventDefault();
 						setIsOpen(false);
 						setActiveIndex(-1);
+						// Call onDropdownVisibleChange when Escape is pressed to close dropdown
+						if (onDropdownVisibleChange) {
+							onDropdownVisibleChange(false);
+						}
 						break;
 
 					case SPACEKEY:
@@ -1168,7 +1280,7 @@ const CustomMultiSelect: React.FC<CustomMultiSelectProps> = ({
 							const selectedOption = flatOptions[activeIndex];
 
 							// Check if it's the ALL option
-							if (selectedOption.value === '__all__') {
+							if (selectedOption.value === ALL_SELECTED_VALUE) {
 								handleSelectAll();
 							} else if (selectedOption.value && onChange) {
 								const newValues = selectedValues.includes(selectedOption.value)
@@ -1214,7 +1326,7 @@ const CustomMultiSelect: React.FC<CustomMultiSelectProps> = ({
 						e.stopPropagation();
 						e.preventDefault();
 						setIsOpen(true);
-						setActiveIndex(0);
+						justOpenedRef.current = true; // Set flag to initialize active option on next render
 						setActiveChipIndex(-1);
 						break;
 
@@ -1260,9 +1372,14 @@ const CustomMultiSelect: React.FC<CustomMultiSelectProps> = ({
 			}
 		},
 		[
+			allOptionShown,
+			isAllSelected,
+			isOpen,
+			activeIndex,
+			getVisibleChipIndices,
+			getLastVisibleChipIndex,
 			selectedChips,
 			isSelectionMode,
-			isOpen,
 			activeChipIndex,
 			selectedValues,
 			visibleOptions,
@@ -1278,10 +1395,9 @@ const CustomMultiSelect: React.FC<CustomMultiSelectProps> = ({
 			startSelection,
 			selectionEnd,
 			extendSelection,
-			activeIndex,
+			onDropdownVisibleChange,
 			handleSelectAll,
-			getVisibleChipIndices,
-			getLastVisibleChipIndex,
+			enableRegexOption,
 		],
 	);
 
@@ -1306,6 +1422,14 @@ const CustomMultiSelect: React.FC<CustomMultiSelectProps> = ({
 		setIsOpen(false);
 	}, []);
 
+	// Add a scroll handler for the dropdown
+	const handleDropdownScroll = useCallback(
+		(e: React.UIEvent<HTMLDivElement>): void => {
+			setIsScrolledToBottom(handleScrollToBottom(e));
+		},
+		[],
+	);
+
 	// Custom dropdown render with sections support
 	const customDropdownRender = useCallback((): React.ReactElement => {
 		// Process options based on current search
@@ -1324,7 +1448,7 @@ const CustomMultiSelect: React.FC<CustomMultiSelectProps> = ({
 		const customOptions: OptionData[] = [];
 
 		// add regex options first since they appear first in the UI
-		if (!isEmpty(searchText)) {
+		if (!isEmpty(searchText) && enableRegexOption) {
 			// Only add regex wrapper if it doesn't already look like a regex pattern
 			const isAlreadyRegex =
 				searchText.startsWith('.*') && searchText.endsWith('.*');
@@ -1347,8 +1471,17 @@ const CustomMultiSelect: React.FC<CustomMultiSelectProps> = ({
 			});
 		}
 
-		// Now add all custom options at the beginning
-		const enhancedNonSectionOptions = [...customOptions, ...nonSectionOptions];
+		// Now add all custom options at the beginning, removing duplicates based on value
+		const allOptions = [...customOptions, ...nonSectionOptions];
+		const seenValues = new Set<string>();
+		const enhancedNonSectionOptions = allOptions.filter((option) => {
+			const value = option.value || '';
+			if (seenValues.has(value)) {
+				return false;
+			}
+			seenValues.add(value);
+			return true;
+		});
 
 		const allOptionValues = getAllAvailableValues(processedOptions);
 		const allOptionsSelected =
@@ -1382,6 +1515,7 @@ const CustomMultiSelect: React.FC<CustomMultiSelectProps> = ({
 				onMouseDown={handleDropdownMouseDown}
 				onClick={handleDropdownClick}
 				onKeyDown={handleKeyDown}
+				onScroll={handleDropdownScroll}
 				onBlur={handleBlur}
 				role="listbox"
 				aria-multiselectable="true"
@@ -1423,14 +1557,39 @@ const CustomMultiSelect: React.FC<CustomMultiSelectProps> = ({
 								}
 							}}
 						>
-							<Checkbox
-								checked={allOptionsSelected}
-								style={{ width: '100%', height: '100%' }}
-							>
-								<div className="option-content">
-									<div>ALL</div>
+							<div style={{ display: 'flex', alignItems: 'center', width: '100%' }}>
+								<Checkbox checked={allOptionsSelected} className="option-checkbox">
+									<div className="option-content">
+										<div className="all-option-text">ALL</div>
+									</div>
+								</Checkbox>
+								<div
+									onClick={(e): void => {
+										e.stopPropagation();
+									}}
+									onMouseDown={(e): void => {
+										e.stopPropagation();
+									}}
+								>
+									{isDynamicVariable && (
+										<TextToolTip
+											text="ALL in dynamic variable = No filter applied (unlike other variable types where ALL sends all selected values). Learn more"
+											url="https://signoz.io/docs/userguide/manage-variables/#note-about-all"
+											urlText="here"
+											useFilledIcon={false}
+											outlinedIcon={
+												<Info
+													size={14}
+													style={{
+														color: isDarkMode ? Color.BG_VANILLA_100 : Color.BG_INK_500,
+														marginLeft: 5,
+													}}
+												/>
+											}
+										/>
+									)}
 								</div>
-							</Checkbox>
+							</div>
 						</div>
 						<div className="divider" />
 					</>
@@ -1439,7 +1598,19 @@ const CustomMultiSelect: React.FC<CustomMultiSelectProps> = ({
 				{/* Non-section options when not searching */}
 				{enhancedNonSectionOptions.length > 0 && (
 					<div className="no-section-options">
-						{mapOptions(enhancedNonSectionOptions)}
+						<Virtuoso
+							style={{
+								minHeight: Math.min(300, enhancedNonSectionOptions.length * 40),
+								maxHeight: enhancedNonSectionOptions.length * 40,
+							}}
+							data={enhancedNonSectionOptions}
+							itemContent={(index, item): React.ReactNode =>
+								(mapOptions([item]) as unknown) as React.ReactElement
+							}
+							totalCount={enhancedNonSectionOptions.length}
+							itemSize={(): number => 40}
+							overscan={5}
+						/>
 					</div>
 				)}
 
@@ -1450,31 +1621,65 @@ const CustomMultiSelect: React.FC<CustomMultiSelectProps> = ({
 							<div className="select-group" key={section.label}>
 								<div className="group-label" role="heading" aria-level={2}>
 									{section.label}
+									{isDynamicVariable && (
+										<TextToolTip
+											text="Related values: Filtered by other variable selections. All values: Unfiltered complete list. Learn more"
+											url="https://signoz.io/docs/userguide/manage-variables/#dynamic-variable-dropdowns-display-values-in-two-sections"
+											urlText="here"
+											useFilledIcon={false}
+											outlinedIcon={
+												<Info
+													size={14}
+													style={{
+														color: isDarkMode ? Color.BG_VANILLA_100 : Color.BG_INK_500,
+														marginTop: 1,
+													}}
+												/>
+											}
+										/>
+									)}
 								</div>
 								<div role="group" aria-label={`${section.label} options`}>
-									{section.options && mapOptions(section.options)}
+									<Virtuoso
+										style={{
+											minHeight: Math.min(300, (section.options?.length || 0) * 40),
+											maxHeight: (section.options?.length || 0) * 40,
+										}}
+										data={section.options || []}
+										itemContent={(index, item): React.ReactNode =>
+											(mapOptions([item]) as unknown) as React.ReactElement
+										}
+										totalCount={section.options?.length || 0}
+										itemSize={(): number => 40}
+										overscan={5}
+									/>
 								</div>
 							</div>
-						) : null,
+						) : (
+							<div key={section.label} />
+						),
 					)}
 
 				{/* Navigation help footer */}
 				<div className="navigation-footer" role="note">
-					{!loading && !errorMessage && !noDataMessage && (
-						<section className="navigate">
-							<ArrowDown size={8} className="icons" />
-							<ArrowUp size={8} className="icons" />
-							<ArrowLeft size={8} className="icons" />
-							<ArrowRight size={8} className="icons" />
-							<span className="keyboard-text">to navigate</span>
-						</section>
-					)}
+					{!loading &&
+						!errorMessage &&
+						!noDataMessage &&
+						!(showIncompleteDataMessage && isScrolledToBottom) && (
+							<section className="navigate">
+								<ArrowDown size={8} className="icons" />
+								<ArrowUp size={8} className="icons" />
+								<ArrowLeft size={8} className="icons" />
+								<ArrowRight size={8} className="icons" />
+								<span className="keyboard-text">to navigate</span>
+							</section>
+						)}
 					{loading && (
 						<div className="navigation-loading">
 							<div className="navigation-icons">
 								<LoadingOutlined />
 							</div>
-							<div className="navigation-text">We are updating the values...</div>
+							<div className="navigation-text">Refreshing values...</div>
 						</div>
 					)}
 					{errorMessage && !loading && (
@@ -1482,21 +1687,33 @@ const CustomMultiSelect: React.FC<CustomMultiSelectProps> = ({
 							<div className="navigation-text">
 								{errorMessage || SOMETHING_WENT_WRONG}
 							</div>
-							<div className="navigation-icons">
-								<ReloadOutlined
-									twoToneColor={Color.BG_CHERRY_400}
-									onClick={(e): void => {
-										e.stopPropagation();
-										if (onRetry) onRetry();
-									}}
-								/>
-							</div>
+							{onRetry && showRetryButton && (
+								<div className="navigation-icons">
+									<ReloadOutlined
+										twoToneColor={Color.BG_CHERRY_400}
+										onClick={(e): void => {
+											e.stopPropagation();
+											onRetry();
+										}}
+									/>
+								</div>
+							)}
 						</div>
 					)}
 
-					{noDataMessage && !loading && (
-						<div className="navigation-text">{noDataMessage}</div>
-					)}
+					{showIncompleteDataMessage &&
+						isScrolledToBottom &&
+						!loading &&
+						!errorMessage && (
+							<div className="navigation-text-incomplete">
+								Don&apos;t see the value? Use search
+							</div>
+						)}
+
+					{noDataMessage &&
+						!loading &&
+						!(showIncompleteDataMessage && isScrolledToBottom) &&
+						!errorMessage && <div className="navigation-text">{noDataMessage}</div>}
 				</div>
 			</div>
 		);
@@ -1513,6 +1730,7 @@ const CustomMultiSelect: React.FC<CustomMultiSelectProps> = ({
 		handleDropdownMouseDown,
 		handleDropdownClick,
 		handleKeyDown,
+		handleDropdownScroll,
 		handleBlur,
 		activeIndex,
 		loading,
@@ -1522,8 +1740,35 @@ const CustomMultiSelect: React.FC<CustomMultiSelectProps> = ({
 		renderOptionWithIndex,
 		handleSelectAll,
 		onRetry,
+		showIncompleteDataMessage,
+		isScrolledToBottom,
+		enableRegexOption,
+		isDarkMode,
+		isDynamicVariable,
+		showRetryButton,
 	]);
 
+	// Custom handler for dropdown visibility changes
+	const handleDropdownVisibleChange = useCallback(
+		(visible: boolean): void => {
+			setIsOpen(visible);
+			if (visible) {
+				justOpenedRef.current = true;
+				setActiveIndex(0);
+				setActiveChipIndex(-1);
+			} else {
+				setSearchText('');
+				setActiveIndex(-1);
+				// Don't clear activeChipIndex when dropdown closes to maintain tag focus
+			}
+			// Pass through to the parent component's handler if provided
+			if (onDropdownVisibleChange) {
+				onDropdownVisibleChange(visible);
+			}
+		},
+		[onDropdownVisibleChange],
+	);
+
 	// ===== Side Effects =====
 
 	// Clear search when dropdown closes
@@ -1585,55 +1830,16 @@ const CustomMultiSelect: React.FC<CustomMultiSelectProps> = ({
 	// Custom Tag Render (needs significant updates)
 	const tagRender = useCallback(
 		(props: CustomTagProps): React.ReactElement => {
-			const { label, value, closable, onClose } = props;
+			const { label: labelProp, value, closable, onClose } = props;
+
+			const label = showLabels
+				? options.find((option) => option.value === value)?.label || labelProp
+				: labelProp;
 
 			// If the display value is the special ALL value, render the ALL tag
-			if (value === ALL_SELECTED_VALUE && isAllSelected) {
-				const handleAllTagClose = (
-					e: React.MouseEvent | React.KeyboardEvent,
-				): void => {
-					e.stopPropagation();
-					e.preventDefault();
-					handleInternalChange([]); // Clear selection when ALL tag is closed
-				};
-
-				const handleAllTagKeyDown = (e: React.KeyboardEvent): void => {
-					if (e.key === 'Enter' || e.key === SPACEKEY) {
-						handleAllTagClose(e);
-					}
-					// Prevent Backspace/Delete propagation if needed, handle in main keydown handler
-				};
-
-				return (
-					<div
-						className={cx('ant-select-selection-item', {
-							'ant-select-selection-item-active': activeChipIndex === 0, // Treat ALL tag as index 0 when active
-							'ant-select-selection-item-selected': selectedChips.includes(0),
-						})}
-						style={
-							activeChipIndex === 0 || selectedChips.includes(0)
-								? {
-										borderColor: Color.BG_ROBIN_500,
-										backgroundColor: Color.BG_SLATE_400,
-								  }
-								: undefined
-						}
-					>
-						<span className="ant-select-selection-item-content">ALL</span>
-						{closable && (
-							<span
-								className="ant-select-selection-item-remove"
-								onClick={handleAllTagClose}
-								onKeyDown={handleAllTagKeyDown}
-								role="button"
-								tabIndex={0}
-								aria-label="Remove ALL tag (deselect all)"
-							>
-								×
-							</span>
-						)}
-					</div>
-				);
+			if (allOptionShown) {
+				// Don't render a visible tag - will be shown as placeholder
+				return <div style={{ display: 'none' }} />;
 			}
 
 			// If not isAllSelected, render individual tags using previous logic
@@ -1713,52 +1919,69 @@ const CustomMultiSelect: React.FC<CustomMultiSelectProps> = ({
 			// Fallback for safety, should not be reached
 			return <div />;
 		},
-		[
-			isAllSelected,
-			handleInternalChange,
-			activeChipIndex,
-			selectedChips,
-			selectedValues,
-			maxTagCount,
-		],
+		// eslint-disable-next-line react-hooks/exhaustive-deps
+		[isAllSelected, activeChipIndex, selectedChips, selectedValues, maxTagCount],
 	);
 
+	// Simple onClear handler to prevent clearing ALL
+	const onClearHandler = useCallback((): void => {
+		// Skip clearing if ALL is selected
+		if (allOptionShown || isAllSelected) {
+			return;
+		}
+
+		// Normal clear behavior
+		handleInternalChange([], true);
+		if (onClear) onClear();
+	}, [onClear, handleInternalChange, allOptionShown, isAllSelected]);
+
 	// ===== Component Rendering =====
 	return (
-		<Select
-			ref={selectRef}
-			className={cx('custom-multiselect', className, {
-				'has-selection': selectedChips.length > 0 && !isAllSelected,
-				'is-all-selected': isAllSelected,
+		<div
+			className={cx('custom-multiselect-wrapper', {
+				'all-selected': allOptionShown || isAllSelected,
 			})}
-			placeholder={placeholder}
-			mode="multiple"
-			showSearch
-			filterOption={false}
-			onSearch={handleSearch}
-			value={displayValue}
-			onChange={handleInternalChange}
-			onClear={(): void => handleInternalChange([])}
-			onDropdownVisibleChange={setIsOpen}
-			open={isOpen}
-			defaultActiveFirstOption={defaultActiveFirstOption}
-			popupMatchSelectWidth={dropdownMatchSelectWidth}
-			allowClear={allowClear}
-			getPopupContainer={getPopupContainer ?? popupContainer}
-			suffixIcon={<DownOutlined style={{ cursor: 'default' }} />}
-			dropdownRender={customDropdownRender}
-			menuItemSelectedIcon={null}
-			popupClassName={cx('custom-multiselect-dropdown-container', popupClassName)}
-			notFoundContent={<div className="empty-message">{noDataMessage}</div>}
-			onKeyDown={handleKeyDown}
-			tagRender={tagRender as any}
-			placement={placement}
-			listHeight={300}
-			searchValue={searchText}
-			maxTagTextLength={maxTagTextLength}
-			maxTagCount={isAllSelected ? 1 : maxTagCount}
-			{...rest}
-		/>
+		>
+			{(allOptionShown || isAllSelected) && !searchText && (
+				<div className="all-text">ALL</div>
+			)}
+			<Select
+				ref={selectRef}
+				className={cx('custom-multiselect', className, {
+					'has-selection': selectedChips.length > 0 && !isAllSelected,
+					'is-all-selected': isAllSelected,
+				})}
+				placeholder={placeholder}
+				mode="multiple"
+				showSearch
+				filterOption={false}
+				onSearch={handleSearch}
+				value={displayValue}
+				onChange={(newValue): void => {
+					handleInternalChange(newValue, false);
+				}}
+				onClear={onClearHandler}
+				onDropdownVisibleChange={handleDropdownVisibleChange}
+				open={isOpen}
+				defaultActiveFirstOption={defaultActiveFirstOption}
+				popupMatchSelectWidth={dropdownMatchSelectWidth}
+				allowClear={allowClear}
+				getPopupContainer={getPopupContainer ?? popupContainer}
+				suffixIcon={<DownOutlined style={{ cursor: 'default' }} />}
+				dropdownRender={customDropdownRender}
+				menuItemSelectedIcon={null}
+				popupClassName={cx('custom-multiselect-dropdown-container', popupClassName)}
+				notFoundContent={<div className="empty-message">{noDataMessage}</div>}
+				onKeyDown={handleKeyDown}
+				tagRender={tagRender as any}
+				placement={placement}
+				listHeight={300}
+				searchValue={searchText}
+				maxTagTextLength={maxTagTextLength}
+				maxTagCount={isAllSelected ? undefined : maxTagCount}
+				{...rest}
+			/>
+		</div>
 	);
 };
 

frontend/src/components/NewSelect/CustomSelect.tsx

@@ -13,9 +13,11 @@ import {
 import { Color } from '@signozhq/design-tokens';
 import { Select } from 'antd';
 import cx from 'classnames';
+import TextToolTip from 'components/TextToolTip';
 import { SOMETHING_WENT_WRONG } from 'constants/api';
+import { useIsDarkMode } from 'hooks/useDarkMode';
 import { capitalize, isEmpty } from 'lodash-es';
-import { ArrowDown, ArrowUp } from 'lucide-react';
+import { ArrowDown, ArrowUp, Info } from 'lucide-react';
 import type { BaseSelectRef } from 'rc-select';
 import React, {
 	useCallback,
@@ -29,6 +31,7 @@ import { popupContainer } from 'utils/selectPopupContainer';
 import { CustomSelectProps, OptionData } from './types';
 import {
 	filterOptionsBySearch,
+	handleScrollToBottom,
 	prioritizeOrAddOptionForSingleSelect,
 	SPACEKEY,
 } from './utils';
@@ -57,17 +60,33 @@ const CustomSelect: React.FC<CustomSelectProps> = ({
 	errorMessage,
 	allowClear = false,
 	onRetry,
+	showIncompleteDataMessage = false,
+	showRetryButton = true,
+	isDynamicVariable = false,
 	...rest
 }) => {
 	// ===== State & Refs =====
 	const [isOpen, setIsOpen] = useState(false);
 	const [searchText, setSearchText] = useState('');
 	const [activeOptionIndex, setActiveOptionIndex] = useState<number>(-1);
+	const [isScrolledToBottom, setIsScrolledToBottom] = useState(false);
+
+	const isDarkMode = useIsDarkMode();
 
 	// Refs for element access and scroll behavior
 	const selectRef = useRef<BaseSelectRef>(null);
 	const dropdownRef = useRef<HTMLDivElement>(null);
 	const optionRefs = useRef<Record<number, HTMLDivElement | null>>({});
+	// Flag to track if dropdown just opened
+	const justOpenedRef = useRef<boolean>(false);
+
+	// Add a scroll handler for the dropdown
+	const handleDropdownScroll = useCallback(
+		(e: React.UIEvent<HTMLDivElement>): void => {
+			setIsScrolledToBottom(handleScrollToBottom(e));
+		},
+		[],
+	);
 
 	// ===== Option Filtering & Processing Utilities =====
 
@@ -130,23 +149,33 @@ const CustomSelect: React.FC<CustomSelectProps> = ({
 		(text: string, searchQuery: string): React.ReactNode => {
 			if (!searchQuery || !highlightSearch) return text;
 
-			const parts = text.split(new RegExp(`(${searchQuery})`, 'gi'));
-			return (
-				<>
-					{parts.map((part, i) => {
-						// Create a deterministic but unique key
-						const uniqueKey = `${text.substring(0, 3)}-${part.substring(0, 3)}-${i}`;
+			try {
+				const parts = text.split(
+					new RegExp(
+						`(${searchQuery.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&')})`,
+						'gi',
+					),
+				);
+				return (
+					<>
+						{parts.map((part, i) => {
+							// Create a deterministic but unique key
+							const uniqueKey = `${text.substring(0, 3)}-${part.substring(0, 3)}-${i}`;
 
-						return part.toLowerCase() === searchQuery.toLowerCase() ? (
-							<span key={uniqueKey} className="highlight-text">
-								{part}
-							</span>
-						) : (
-							part
-						);
-					})}
-				</>
-			);
+							return part.toLowerCase() === searchQuery.toLowerCase() ? (
+								<span key={uniqueKey} className="highlight-text">
+									{part}
+								</span>
+							) : (
+								part
+							);
+						})}
+					</>
+				);
+			} catch (error) {
+				console.error('Error in text highlighting:', error);
+				return text;
+			}
 		},
 		[highlightSearch],
 	);
@@ -246,9 +275,14 @@ const CustomSelect: React.FC<CustomSelectProps> = ({
 			const trimmedValue = value.trim();
 			setSearchText(trimmedValue);
 
+			// Reset active option index when search changes
+			if (isOpen) {
+				setActiveOptionIndex(0);
+			}
+
 			if (onSearch) onSearch(trimmedValue);
 		},
-		[onSearch],
+		[onSearch, isOpen],
 	);
 
 	/**
@@ -272,14 +306,23 @@ const CustomSelect: React.FC<CustomSelectProps> = ({
 					const flatList: OptionData[] = [];
 
 					// Process options
+					let processedOptions = isEmpty(value)
+						? filteredOptions
+						: prioritizeOrAddOptionForSingleSelect(filteredOptions, value);
+
+					if (!isEmpty(searchText)) {
+						processedOptions = filterOptionsBySearch(processedOptions, searchText);
+					}
+
 					const { sectionOptions, nonSectionOptions } = splitOptions(
-						isEmpty(value)
-							? filteredOptions
-							: prioritizeOrAddOptionForSingleSelect(filteredOptions, value),
+						processedOptions,
 					);
 
 					// Add custom option if needed
-					if (!isEmpty(searchText) && !isLabelPresent(filteredOptions, searchText)) {
+					if (
+						!isEmpty(searchText) &&
+						!isLabelPresent(processedOptions, searchText)
+					) {
 						flatList.push({
 							label: searchText,
 							value: searchText,
@@ -300,33 +343,52 @@ const CustomSelect: React.FC<CustomSelectProps> = ({
 
 				const options = getFlatOptions();
 
+				// If we just opened the dropdown and have options, set first option as active
+				if (justOpenedRef.current && options.length > 0) {
+					setActiveOptionIndex(0);
+					justOpenedRef.current = false;
+				}
+
+				// If no option is active but we have options, activate the first one
+				if (activeOptionIndex === -1 && options.length > 0) {
+					setActiveOptionIndex(0);
+				}
+
 				switch (e.key) {
 					case 'ArrowDown':
 						e.preventDefault();
-						setActiveOptionIndex((prev) =>
-							prev < options.length - 1 ? prev + 1 : 0,
-						);
+						if (options.length > 0) {
+							setActiveOptionIndex((prev) =>
+								prev < options.length - 1 ? prev + 1 : 0,
+							);
+						}
 						break;
 
 					case 'ArrowUp':
 						e.preventDefault();
-						setActiveOptionIndex((prev) =>
-							prev > 0 ? prev - 1 : options.length - 1,
-						);
+						if (options.length > 0) {
+							setActiveOptionIndex((prev) =>
+								prev > 0 ? prev - 1 : options.length - 1,
+							);
+						}
 						break;
 
 					case 'Tab':
 						// Tab navigation with Shift key support
 						if (e.shiftKey) {
 							e.preventDefault();
-							setActiveOptionIndex((prev) =>
-								prev > 0 ? prev - 1 : options.length - 1,
-							);
+							if (options.length > 0) {
+								setActiveOptionIndex((prev) =>
+									prev > 0 ? prev - 1 : options.length - 1,
+								);
+							}
 						} else {
 							e.preventDefault();
-							setActiveOptionIndex((prev) =>
-								prev < options.length - 1 ? prev + 1 : 0,
-							);
+							if (options.length > 0) {
+								setActiveOptionIndex((prev) =>
+									prev < options.length - 1 ? prev + 1 : 0,
+								);
+							}
 						}
 						break;
 
@@ -339,6 +401,7 @@ const CustomSelect: React.FC<CustomSelectProps> = ({
 								onChange(selectedOption.value, selectedOption);
 								setIsOpen(false);
 								setActiveOptionIndex(-1);
+								setSearchText('');
 							}
 						} else if (!isEmpty(searchText)) {
 							// Add custom value when no option is focused
@@ -351,6 +414,7 @@ const CustomSelect: React.FC<CustomSelectProps> = ({
 								onChange(customOption.value, customOption);
 								setIsOpen(false);
 								setActiveOptionIndex(-1);
+								setSearchText('');
 							}
 						}
 						break;
@@ -359,6 +423,7 @@ const CustomSelect: React.FC<CustomSelectProps> = ({
 						e.preventDefault();
 						setIsOpen(false);
 						setActiveOptionIndex(-1);
+						setSearchText('');
 						break;
 
 					case ' ': // Space key
@@ -369,6 +434,7 @@ const CustomSelect: React.FC<CustomSelectProps> = ({
 								onChange(selectedOption.value, selectedOption);
 								setIsOpen(false);
 								setActiveOptionIndex(-1);
+								setSearchText('');
 							}
 						}
 						break;
@@ -379,7 +445,7 @@ const CustomSelect: React.FC<CustomSelectProps> = ({
 				// Open dropdown when Down or Tab is pressed while closed
 				e.preventDefault();
 				setIsOpen(true);
-				setActiveOptionIndex(0);
+				justOpenedRef.current = true; // Set flag to initialize active option on next render
 			}
 		},
 		[
@@ -444,6 +510,7 @@ const CustomSelect: React.FC<CustomSelectProps> = ({
 				className="custom-select-dropdown"
 				onClick={handleDropdownClick}
 				onKeyDown={handleKeyDown}
+				onScroll={handleDropdownScroll}
 				role="listbox"
 				tabIndex={-1}
 				aria-activedescendant={
@@ -454,7 +521,6 @@ const CustomSelect: React.FC<CustomSelectProps> = ({
 				<div className="no-section-options">
 					{nonSectionOptions.length > 0 && mapOptions(nonSectionOptions)}
 				</div>
-
 				{/* Section options */}
 				{sectionOptions.length > 0 &&
 					sectionOptions.map((section) =>
@@ -462,6 +528,23 @@ const CustomSelect: React.FC<CustomSelectProps> = ({
 							<div className="select-group" key={section.label}>
 								<div className="group-label" role="heading" aria-level={2}>
 									{section.label}
+									{isDynamicVariable && (
+										<TextToolTip
+											text="Related values: Filtered by other variable selections. All values: Unfiltered complete list. Learn more"
+											url="https://signoz.io/docs/userguide/manage-variables/#dynamic-variable-dropdowns-display-values-in-two-sections"
+											urlText="here"
+											useFilledIcon={false}
+											outlinedIcon={
+												<Info
+													size={14}
+													style={{
+														color: isDarkMode ? Color.BG_VANILLA_100 : Color.BG_INK_500,
+														marginTop: 1,
+													}}
+												/>
+											}
+										/>
+									)}
 								</div>
 								<div role="group" aria-label={`${section.label} options`}>
 									{section.options && mapOptions(section.options)}
@@ -472,19 +555,22 @@ const CustomSelect: React.FC<CustomSelectProps> = ({
 
 				{/* Navigation help footer */}
 				<div className="navigation-footer" role="note">
-					{!loading && !errorMessage && !noDataMessage && (
-						<section className="navigate">
-							<ArrowDown size={8} className="icons" />
-							<ArrowUp size={8} className="icons" />
-							<span className="keyboard-text">to navigate</span>
-						</section>
-					)}
+					{!loading &&
+						!errorMessage &&
+						!noDataMessage &&
+						!(showIncompleteDataMessage && isScrolledToBottom) && (
+							<section className="navigate">
+								<ArrowDown size={8} className="icons" />
+								<ArrowUp size={8} className="icons" />
+								<span className="keyboard-text">to navigate</span>
+							</section>
+						)}
 					{loading && (
 						<div className="navigation-loading">
 							<div className="navigation-icons">
 								<LoadingOutlined />
 							</div>
-							<div className="navigation-text">We are updating the values...</div>
+							<div className="navigation-text">Refreshing values...</div>
 						</div>
 					)}
 					{errorMessage && !loading && (
@@ -492,21 +578,33 @@ const CustomSelect: React.FC<CustomSelectProps> = ({
 							<div className="navigation-text">
 								{errorMessage || SOMETHING_WENT_WRONG}
 							</div>
-							<div className="navigation-icons">
-								<ReloadOutlined
-									twoToneColor={Color.BG_CHERRY_400}
-									onClick={(e): void => {
-										e.stopPropagation();
-										if (onRetry) onRetry();
-									}}
-								/>
-							</div>
+							{onRetry && showRetryButton && (
+								<div className="navigation-icons">
+									<ReloadOutlined
+										twoToneColor={Color.BG_CHERRY_400}
+										onClick={(e): void => {
+											e.stopPropagation();
+											onRetry();
+										}}
+									/>
+								</div>
+							)}
 						</div>
 					)}
 
-					{noDataMessage && !loading && (
-						<div className="navigation-text">{noDataMessage}</div>
-					)}
+					{showIncompleteDataMessage &&
+						isScrolledToBottom &&
+						!loading &&
+						!errorMessage && (
+							<div className="navigation-text-incomplete">
+								Don&apos;t see the value? Use search
+							</div>
+						)}
+
+					{noDataMessage &&
+						!loading &&
+						!(showIncompleteDataMessage && isScrolledToBottom) &&
+						!errorMessage && <div className="navigation-text">{noDataMessage}</div>}
 				</div>
 			</div>
 		);
@@ -520,6 +618,7 @@ const CustomSelect: React.FC<CustomSelectProps> = ({
 		isLabelPresent,
 		handleDropdownClick,
 		handleKeyDown,
+		handleDropdownScroll,
 		activeOptionIndex,
 		loading,
 		errorMessage,
@@ -527,8 +626,25 @@ const CustomSelect: React.FC<CustomSelectProps> = ({
 		dropdownRender,
 		renderOptionWithIndex,
 		onRetry,
+		showIncompleteDataMessage,
+		isScrolledToBottom,
+		showRetryButton,
+		isDarkMode,
+		isDynamicVariable,
 	]);
 
+	// Handle dropdown visibility changes
+	const handleDropdownVisibleChange = useCallback((visible: boolean): void => {
+		setIsOpen(visible);
+		if (visible) {
+			justOpenedRef.current = true;
+			setActiveOptionIndex(0);
+		} else {
+			setSearchText('');
+			setActiveOptionIndex(-1);
+		}
+	}, []);
+
 	// ===== Side Effects =====
 
 	// Clear search text when dropdown closes
@@ -582,7 +698,7 @@ const CustomSelect: React.FC<CustomSelectProps> = ({
 			onSearch={handleSearch}
 			value={value}
 			onChange={onChange}
-			onDropdownVisibleChange={setIsOpen}
+			onDropdownVisibleChange={handleDropdownVisibleChange}
 			open={isOpen}
 			options={optionsWithHighlight}
 			defaultActiveFirstOption={defaultActiveFirstOption}

frontend/src/components/NewSelect/__test__/CustomMultiSelect.retry.test.tsx

@@ -0,0 +1,127 @@
+import {
+	fireEvent,
+	render,
+	RenderResult,
+	screen,
+	waitFor,
+} from '@testing-library/react';
+import { VirtuosoMockContext } from 'react-virtuoso';
+
+import CustomMultiSelect from '../CustomMultiSelect';
+
+// Mock scrollIntoView which isn't available in JSDOM
+window.HTMLElement.prototype.scrollIntoView = jest.fn();
+
+// Helper function to render with VirtuosoMockContext
+const renderWithVirtuoso = (component: React.ReactElement): RenderResult =>
+	render(
+		<VirtuosoMockContext.Provider
+			value={{ viewportHeight: 300, itemHeight: 100 }}
+		>
+			{component}
+		</VirtuosoMockContext.Provider>,
+	);
+
+// Mock options data
+const mockOptions = [
+	{ label: 'Option 1', value: 'option1' },
+	{ label: 'Option 2', value: 'option2' },
+	{ label: 'Option 3', value: 'option3' },
+];
+
+// CSS selector for retry button
+const RETRY_BUTTON_SELECTOR = '.navigation-icons .anticon-reload';
+
+describe('CustomMultiSelect - Retry Functionality', () => {
+	beforeEach(() => {
+		jest.clearAllMocks();
+	});
+
+	it('should show retry button when 5xx error occurs and error message is displayed', async () => {
+		const mockOnRetry = jest.fn();
+		const errorMessage = 'Internal Server Error (500)';
+
+		renderWithVirtuoso(
+			<CustomMultiSelect
+				options={mockOptions}
+				errorMessage={errorMessage}
+				onRetry={mockOnRetry}
+				showRetryButton
+				loading={false}
+			/>,
+		);
+
+		// Open dropdown to see error state
+		const selectElement = screen.getByRole('combobox');
+		fireEvent.mouseDown(selectElement);
+
+		// Wait for dropdown to appear with error message
+		await waitFor(() => {
+			expect(screen.getByText(errorMessage)).toBeInTheDocument();
+		});
+
+		// Check that retry button (ReloadOutlined icon) is present
+		const retryButton = document.querySelector(RETRY_BUTTON_SELECTOR);
+		expect(retryButton).toBeInTheDocument();
+	});
+
+	it('should show retry button when 4xx error occurs and error message is displayed (current behavior)', async () => {
+		const mockOnRetry = jest.fn();
+		const errorMessage = 'Bad Request (400)';
+
+		renderWithVirtuoso(
+			<CustomMultiSelect
+				options={mockOptions}
+				errorMessage={errorMessage}
+				onRetry={mockOnRetry}
+				showRetryButton={false}
+				loading={false}
+			/>,
+		);
+
+		// Open dropdown
+		const selectElement = screen.getByRole('combobox');
+		fireEvent.mouseDown(selectElement);
+
+		// Wait for dropdown to appear with error message
+		await waitFor(() => {
+			expect(screen.getByText(errorMessage)).toBeInTheDocument();
+		});
+
+		const retryButton = document.querySelector(RETRY_BUTTON_SELECTOR);
+		expect(retryButton).not.toBeInTheDocument();
+	});
+
+	it('should call onRetry function when retry button is clicked', async () => {
+		const mockOnRetry = jest.fn();
+		const errorMessage = 'Internal Server Error (500)';
+
+		renderWithVirtuoso(
+			<CustomMultiSelect
+				options={mockOptions}
+				errorMessage={errorMessage}
+				onRetry={mockOnRetry}
+				showRetryButton
+				loading={false}
+			/>,
+		);
+
+		// Open dropdown
+		const selectElement = screen.getByRole('combobox');
+		fireEvent.mouseDown(selectElement);
+
+		// Wait for dropdown to appear
+		await waitFor(() => {
+			expect(screen.getByText(errorMessage)).toBeInTheDocument();
+		});
+
+		// Find and click the retry button
+		const retryButton = document.querySelector(RETRY_BUTTON_SELECTOR);
+		expect(retryButton).toBeInTheDocument();
+
+		fireEvent.click(retryButton as Element);
+
+		// Verify onRetry was called
+		expect(mockOnRetry).toHaveBeenCalledTimes(1);
+	});
+});

frontend/src/components/NewSelect/__test__/CustomMultiSelect.test.tsx

@@ -1,10 +1,27 @@
-import { fireEvent, render, screen, waitFor } from '@testing-library/react';
+import {
+	fireEvent,
+	render,
+	RenderResult,
+	screen,
+	waitFor,
+} from '@testing-library/react';
+import { VirtuosoMockContext } from 'react-virtuoso';
 
 import CustomMultiSelect from '../CustomMultiSelect';
 
 // Mock scrollIntoView which isn't available in JSDOM
 window.HTMLElement.prototype.scrollIntoView = jest.fn();
 
+// Helper function to render with VirtuosoMockContext
+const renderWithVirtuoso = (component: React.ReactElement): RenderResult =>
+	render(
+		<VirtuosoMockContext.Provider
+			value={{ viewportHeight: 300, itemHeight: 100 }}
+		>
+			{component}
+		</VirtuosoMockContext.Provider>,
+	);
+
 // Mock options data
 const mockOptions = [
 	{ label: 'Option 1', value: 'option1' },
@@ -32,7 +49,7 @@ const mockGroupedOptions = [
 describe('CustomMultiSelect Component', () => {
 	it('renders with placeholder', () => {
 		const handleChange = jest.fn();
-		render(
+		renderWithVirtuoso(
 			<CustomMultiSelect
 				placeholder="Select multiple options"
 				options={mockOptions}
@@ -47,7 +64,9 @@ describe('CustomMultiSelect Component', () => {
 
 	it('opens dropdown when clicked', async () => {
 		const handleChange = jest.fn();
-		render(<CustomMultiSelect options={mockOptions} onChange={handleChange} />);
+		renderWithVirtuoso(
+			<CustomMultiSelect options={mockOptions} onChange={handleChange} />,
+		);
 
 		// Click to open the dropdown
 		const selectElement = screen.getByRole('combobox');
@@ -66,7 +85,7 @@ describe('CustomMultiSelect Component', () => {
 		const handleChange = jest.fn();
 
 		// Start with option1 already selected
-		render(
+		renderWithVirtuoso(
 			<CustomMultiSelect
 				options={mockOptions}
 				onChange={handleChange}
@@ -93,7 +112,7 @@ describe('CustomMultiSelect Component', () => {
 
 	it('selects ALL options when ALL is clicked', async () => {
 		const handleChange = jest.fn();
-		render(
+		renderWithVirtuoso(
 			<CustomMultiSelect
 				options={mockOptions}
 				onChange={handleChange}
@@ -126,7 +145,7 @@ describe('CustomMultiSelect Component', () => {
 	});
 
 	it('displays selected options as tags', async () => {
-		render(
+		renderWithVirtuoso(
 			<CustomMultiSelect options={mockOptions} value={['option1', 'option2']} />,
 		);
 
@@ -137,7 +156,7 @@ describe('CustomMultiSelect Component', () => {
 
 	it('removes a tag when clicked', async () => {
 		const handleChange = jest.fn();
-		render(
+		renderWithVirtuoso(
 			<CustomMultiSelect
 				options={mockOptions}
 				value={['option1', 'option2']}
@@ -159,7 +178,7 @@ describe('CustomMultiSelect Component', () => {
 	});
 
 	it('filters options when searching', async () => {
-		render(<CustomMultiSelect options={mockOptions} />);
+		renderWithVirtuoso(<CustomMultiSelect options={mockOptions} />);
 
 		// Open dropdown
 		const selectElement = screen.getByRole('combobox');
@@ -193,7 +212,7 @@ describe('CustomMultiSelect Component', () => {
 	});
 
 	it('renders grouped options correctly', async () => {
-		render(<CustomMultiSelect options={mockGroupedOptions} />);
+		renderWithVirtuoso(<CustomMultiSelect options={mockGroupedOptions} />);
 
 		// Open dropdown
 		const selectElement = screen.getByRole('combobox');
@@ -211,18 +230,18 @@ describe('CustomMultiSelect Component', () => {
 	});
 
 	it('shows loading state', () => {
-		render(<CustomMultiSelect options={mockOptions} loading />);
+		renderWithVirtuoso(<CustomMultiSelect options={mockOptions} loading />);
 
 		// Open dropdown
 		const selectElement = screen.getByRole('combobox');
 		fireEvent.mouseDown(selectElement);
 
 		// Check loading text is displayed
-		expect(screen.getByText('We are updating the values...')).toBeInTheDocument();
+		expect(screen.getByText('Refreshing values...')).toBeInTheDocument();
 	});
 
 	it('shows error message', () => {
-		render(
+		renderWithVirtuoso(
 			<CustomMultiSelect
 				options={mockOptions}
 				errorMessage="Test error message"
@@ -238,7 +257,9 @@ describe('CustomMultiSelect Component', () => {
 	});
 
 	it('shows no data message', () => {
-		render(<CustomMultiSelect options={[]} noDataMessage="No data available" />);
+		renderWithVirtuoso(
+			<CustomMultiSelect options={[]} noDataMessage="No data available" />,
+		);
 
 		// Open dropdown
 		const selectElement = screen.getByRole('combobox');
@@ -249,7 +270,7 @@ describe('CustomMultiSelect Component', () => {
 	});
 
 	it('shows "ALL" tag when all options are selected', () => {
-		render(
+		renderWithVirtuoso(
 			<CustomMultiSelect
 				options={mockOptions}
 				value={['option1', 'option2', 'option3']}

frontend/src/components/NewSelect/__test__/CustomSelect.test.tsx

@@ -140,7 +140,7 @@ describe('CustomSelect Component', () => {
 		fireEvent.mouseDown(selectElement);
 
 		// Check loading text is displayed
-		expect(screen.getByText('We are updating the values...')).toBeInTheDocument();
+		expect(screen.getByText('Refreshing values...')).toBeInTheDocument();
 	});
 
 	it('shows error message', () => {

frontend/src/components/NewSelect/__test__/VariableItem.integration.test.tsx

@@ -0,0 +1,624 @@
+/* eslint-disable sonarjs/no-duplicate-string */
+import { render, screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { QueryClient, QueryClientProvider } from 'react-query';
+import { Provider } from 'react-redux';
+import { VirtuosoMockContext } from 'react-virtuoso';
+import configureStore from 'redux-mock-store';
+import { IDashboardVariable } from 'types/api/dashboard/getAll';
+
+import VariableItem from '../../../container/NewDashboard/DashboardVariablesSelection/VariableItem';
+
+// Mock the dashboard variables query
+jest.mock('api/dashboard/variables/dashboardVariablesQuery', () => ({
+	__esModule: true,
+	default: jest.fn(() =>
+		Promise.resolve({
+			payload: {
+				variableValues: ['option1', 'option2', 'option3', 'option4'],
+			},
+		}),
+	),
+}));
+
+// Mock scrollIntoView which isn't available in JSDOM
+window.HTMLElement.prototype.scrollIntoView = jest.fn();
+
+// Constants
+const TEST_VARIABLE_NAME = 'test_variable';
+const TEST_VARIABLE_ID = 'test-var-id';
+
+// Create a mock store
+const mockStore = configureStore([])({
+	globalTime: {
+		minTime: Date.now() - 3600000, // 1 hour ago
+		maxTime: Date.now(),
+	},
+});
+
+// Test data
+const createMockVariable = (
+	overrides: Partial<IDashboardVariable> = {},
+): IDashboardVariable => ({
+	id: TEST_VARIABLE_ID,
+	name: TEST_VARIABLE_NAME,
+	description: 'Test variable description',
+	type: 'QUERY',
+	queryValue: 'SELECT DISTINCT value FROM table',
+	customValue: '',
+	sort: 'ASC',
+	multiSelect: false,
+	showALLOption: true,
+	selectedValue: [],
+	allSelected: false,
+	...overrides,
+});
+
+function TestWrapper({ children }: { children: React.ReactNode }): JSX.Element {
+	const queryClient = new QueryClient({
+		defaultOptions: {
+			queries: { retry: false },
+		},
+	});
+
+	return (
+		<Provider store={mockStore}>
+			<QueryClientProvider client={queryClient}>
+				<VirtuosoMockContext.Provider
+					// eslint-disable-next-line react/jsx-no-constructed-context-values
+					value={{ viewportHeight: 300, itemHeight: 40 }}
+				>
+					{children}
+				</VirtuosoMockContext.Provider>
+			</QueryClientProvider>
+		</Provider>
+	);
+}
+
+describe('VariableItem Integration Tests', () => {
+	let user: ReturnType<typeof userEvent.setup>;
+	let mockOnValueUpdate: jest.Mock;
+	let mockSetVariablesToGetUpdated: jest.Mock;
+
+	beforeEach(() => {
+		user = userEvent.setup();
+		mockOnValueUpdate = jest.fn();
+		mockSetVariablesToGetUpdated = jest.fn();
+		jest.clearAllMocks();
+	});
+
+	// ===== 1. INTEGRATION WITH CUSTOMSELECT =====
+	describe('CustomSelect Integration (VI)', () => {
+		test('VI-01: Single select variable integration', async () => {
+			const variable = createMockVariable({
+				multiSelect: false,
+				type: 'CUSTOM',
+				customValue: 'option1,option2,option3',
+			});
+
+			render(
+				<TestWrapper>
+					<VariableItem
+						variableData={variable}
+						existingVariables={{}}
+						onValueUpdate={mockOnValueUpdate}
+						variablesToGetUpdated={[]}
+						setVariablesToGetUpdated={mockSetVariablesToGetUpdated}
+						dependencyData={null}
+					/>
+				</TestWrapper>,
+			);
+
+			// Should render with CustomSelect
+			const combobox = screen.getByRole('combobox');
+			expect(combobox).toBeInTheDocument();
+
+			await user.click(combobox);
+
+			await waitFor(() => {
+				expect(screen.getByText('option1')).toBeInTheDocument();
+				expect(screen.getByText('option2')).toBeInTheDocument();
+				expect(screen.getByText('option3')).toBeInTheDocument();
+			});
+
+			// Select an option
+			const option1 = screen.getByText('option1');
+			await user.click(option1);
+
+			expect(mockOnValueUpdate).toHaveBeenCalledWith(
+				TEST_VARIABLE_NAME,
+				TEST_VARIABLE_ID,
+				'option1',
+				false,
+			);
+		});
+	});
+
+	// ===== 2. INTEGRATION WITH CUSTOMMULTISELECT =====
+	describe('CustomMultiSelect Integration (VI)', () => {
+		test('VI-02: Multi select variable integration', async () => {
+			const variable = createMockVariable({
+				multiSelect: true,
+				type: 'CUSTOM',
+				customValue: 'option1,option2,option3,option4',
+				showALLOption: true,
+			});
+
+			render(
+				<TestWrapper>
+					<VariableItem
+						variableData={variable}
+						existingVariables={{}}
+						onValueUpdate={mockOnValueUpdate}
+						variablesToGetUpdated={[]}
+						setVariablesToGetUpdated={mockSetVariablesToGetUpdated}
+						dependencyData={null}
+					/>
+				</TestWrapper>,
+			);
+
+			// Should render with CustomMultiSelect
+			const combobox = screen.getByRole('combobox');
+			expect(combobox).toBeInTheDocument();
+
+			await user.click(combobox);
+
+			await waitFor(() => {
+				// Should show ALL option
+				expect(screen.getByText('ALL')).toBeInTheDocument();
+			});
+
+			// Wait for Virtuoso to render the custom options
+			await waitFor(
+				() => {
+					expect(screen.getByText('option1')).toBeInTheDocument();
+					expect(screen.getByText('option2')).toBeInTheDocument();
+					expect(screen.getByText('option3')).toBeInTheDocument();
+					expect(screen.getByText('option4')).toBeInTheDocument();
+				},
+				{ timeout: 5000 },
+			);
+		});
+	});
+
+	// ===== 3. TEXTBOX VARIABLE TYPE =====
+	describe('Textbox Variable Integration', () => {
+		test('VI-03: Textbox variable handling', async () => {
+			const variable = createMockVariable({
+				type: 'TEXTBOX',
+				selectedValue: 'initial-value',
+			});
+
+			render(
+				<TestWrapper>
+					<VariableItem
+						variableData={variable}
+						existingVariables={{}}
+						onValueUpdate={mockOnValueUpdate}
+						variablesToGetUpdated={[]}
+						setVariablesToGetUpdated={mockSetVariablesToGetUpdated}
+						dependencyData={null}
+					/>
+				</TestWrapper>,
+			);
+
+			// Should render a regular input
+			const textInput = screen.getByDisplayValue('initial-value');
+			expect(textInput).toBeInTheDocument();
+			expect(textInput.tagName).toBe('INPUT');
+
+			// Clear and type new value
+			await user.clear(textInput);
+			await user.type(textInput, 'new-text-value');
+
+			// Should call onValueUpdate after debounce
+			await waitFor(
+				() => {
+					expect(mockOnValueUpdate).toHaveBeenCalledWith(
+						TEST_VARIABLE_NAME,
+						TEST_VARIABLE_ID,
+						'new-text-value',
+						false,
+					);
+				},
+				{ timeout: 1000 },
+			);
+		});
+	});
+
+	// ===== 4. VALUE PERSISTENCE AND STATE MANAGEMENT =====
+	describe('Value Persistence and State Management', () => {
+		test('VI-04: All selected state handling', () => {
+			const variable = createMockVariable({
+				multiSelect: true,
+				type: 'CUSTOM',
+				customValue: 'service1,service2,service3',
+				selectedValue: ['service1', 'service2', 'service3'],
+				allSelected: true,
+				showALLOption: true,
+			});
+
+			render(
+				<TestWrapper>
+					<VariableItem
+						variableData={variable}
+						existingVariables={{}}
+						onValueUpdate={mockOnValueUpdate}
+						variablesToGetUpdated={[]}
+						setVariablesToGetUpdated={mockSetVariablesToGetUpdated}
+						dependencyData={null}
+					/>
+				</TestWrapper>,
+			);
+
+			// Should show "ALL" instead of individual values
+			expect(screen.getByText('ALL')).toBeInTheDocument();
+		});
+
+		test('VI-05: Dropdown behavior with temporary selections', async () => {
+			const variable = createMockVariable({
+				multiSelect: true,
+				type: 'CUSTOM',
+				customValue: 'item1,item2,item3',
+				selectedValue: ['item1'],
+			});
+
+			render(
+				<TestWrapper>
+					<VariableItem
+						variableData={variable}
+						existingVariables={{}}
+						onValueUpdate={mockOnValueUpdate}
+						variablesToGetUpdated={[]}
+						setVariablesToGetUpdated={mockSetVariablesToGetUpdated}
+						dependencyData={null}
+					/>
+				</TestWrapper>,
+			);
+
+			const combobox = screen.getByRole('combobox');
+			await user.click(combobox);
+
+			// Wait for dropdown to open
+			await waitFor(() => {
+				const dropdown = document.querySelector('.ant-select-dropdown');
+				expect(dropdown).toBeInTheDocument();
+			});
+
+			// Verify the component renders without crashing
+			expect(combobox).toBeInTheDocument();
+		});
+	});
+
+	// ===== 6. ACCESSIBILITY AND USER EXPERIENCE =====
+	describe('Accessibility and User Experience', () => {
+		test('VI-06: Variable description tooltip', async () => {
+			const variable = createMockVariable({
+				description: 'This variable controls the service selection',
+				type: 'CUSTOM',
+				customValue: 'service1,service2',
+			});
+
+			render(
+				<TestWrapper>
+					<VariableItem
+						variableData={variable}
+						existingVariables={{}}
+						onValueUpdate={mockOnValueUpdate}
+						variablesToGetUpdated={[]}
+						setVariablesToGetUpdated={mockSetVariablesToGetUpdated}
+						dependencyData={null}
+					/>
+				</TestWrapper>,
+			);
+
+			// Should show info icon
+			const infoIcon = document.querySelector('.info-icon');
+			expect(infoIcon).toBeInTheDocument();
+
+			// Hover to show tooltip
+			if (infoIcon) {
+				await user.hover(infoIcon);
+			}
+
+			await waitFor(() => {
+				expect(
+					screen.getByText('This variable controls the service selection'),
+				).toBeInTheDocument();
+			});
+		});
+
+		test('VI-07: Variable name display', () => {
+			const variable = createMockVariable({
+				name: 'service_name',
+				type: 'CUSTOM',
+				customValue: 'service1,service2',
+			});
+
+			render(
+				<TestWrapper>
+					<VariableItem
+						variableData={variable}
+						existingVariables={{}}
+						onValueUpdate={mockOnValueUpdate}
+						variablesToGetUpdated={[]}
+						setVariablesToGetUpdated={mockSetVariablesToGetUpdated}
+						dependencyData={null}
+					/>
+				</TestWrapper>,
+			);
+
+			// Should show variable name with $ prefix
+			expect(screen.getByText('$service_name')).toBeInTheDocument();
+		});
+
+		test('VI-08: Max tag count behavior', async () => {
+			const variable = createMockVariable({
+				multiSelect: true,
+				type: 'CUSTOM',
+				customValue: 'tag1,tag2,tag3,tag4,tag5,tag6,tag7',
+				selectedValue: ['tag1', 'tag2', 'tag3', 'tag4', 'tag5', 'tag6', 'tag7'],
+			});
+
+			render(
+				<TestWrapper>
+					<VariableItem
+						variableData={variable}
+						existingVariables={{}}
+						onValueUpdate={mockOnValueUpdate}
+						variablesToGetUpdated={[]}
+						setVariablesToGetUpdated={mockSetVariablesToGetUpdated}
+						dependencyData={null}
+					/>
+				</TestWrapper>,
+			);
+
+			// Wait for component to render
+			await waitFor(() => {
+				const combobox = screen.getByRole('combobox');
+				expect(combobox).toBeInTheDocument();
+			});
+
+			// Should show limited number of tags with "+ X more"
+			const tags = document.querySelectorAll('.ant-select-selection-item');
+
+			// The component should render without crashing
+			expect(tags.length).toBeGreaterThanOrEqual(0);
+		});
+	});
+
+	// ===== 8. SEARCH INTERACTION TESTS =====
+	describe('Search Interaction Tests', () => {
+		test('VI-14: Search persistence across dropdown open/close', async () => {
+			const variable = createMockVariable({
+				type: 'CUSTOM',
+				customValue: 'option1,option2,option3',
+				multiSelect: true,
+			});
+
+			render(
+				<TestWrapper>
+					<VariableItem
+						variableData={variable}
+						existingVariables={{}}
+						onValueUpdate={mockOnValueUpdate}
+						variablesToGetUpdated={[]}
+						setVariablesToGetUpdated={mockSetVariablesToGetUpdated}
+						dependencyData={null}
+					/>
+				</TestWrapper>,
+			);
+
+			const combobox = screen.getByRole('combobox');
+			await user.click(combobox);
+
+			await waitFor(() => {
+				expect(screen.getByText('ALL')).toBeInTheDocument();
+			});
+
+			const searchInput = document.querySelector(
+				'.ant-select-selection-search-input',
+			);
+			expect(searchInput).toBeInTheDocument();
+
+			if (searchInput) {
+				await user.type(searchInput, 'search-text');
+			}
+
+			// Verify search text is in input
+			await waitFor(() => {
+				expect(searchInput).toHaveValue('search-text');
+			});
+
+			// Press Escape to close dropdown
+			await user.keyboard('{Escape}');
+
+			// Dropdown should close and search text should be cleared
+			await waitFor(() => {
+				const dropdown = document.querySelector('.ant-select-dropdown');
+				expect(dropdown).toHaveClass('ant-select-dropdown-hidden');
+				expect(searchInput).toHaveValue('');
+			});
+		});
+	});
+
+	// ===== 9. ADVANCED KEYBOARD NAVIGATION =====
+	describe('Advanced Keyboard Navigation (VI)', () => {
+		test('VI-15: Shift + Arrow + Del chip deletion in multiselect', async () => {
+			const variable = createMockVariable({
+				type: 'CUSTOM',
+				customValue: 'option1,option2,option3',
+				multiSelect: true,
+				selectedValue: ['option1', 'option2', 'option3'],
+			});
+
+			render(
+				<TestWrapper>
+					<VariableItem
+						variableData={variable}
+						existingVariables={{}}
+						onValueUpdate={mockOnValueUpdate}
+						variablesToGetUpdated={[]}
+						setVariablesToGetUpdated={mockSetVariablesToGetUpdated}
+						dependencyData={null}
+					/>
+				</TestWrapper>,
+			);
+
+			const combobox = screen.getByRole('combobox');
+			await user.click(combobox);
+
+			// Navigate to chips using arrow keys
+			await user.keyboard('{ArrowLeft}');
+
+			// Use Shift + Arrow to navigate between chips
+			await user.keyboard('{Shift>}{ArrowLeft}{/Shift}');
+
+			// Use Del to delete the active chip
+			await user.keyboard('{Delete}');
+
+			// Note: The component may not immediately call onValueUpdate
+			// This test verifies the chip deletion behavior
+			await waitFor(() => {
+				// Check if a chip was removed from the selection
+				const selectionItems = document.querySelectorAll(
+					'.ant-select-selection-item',
+				);
+				expect(selectionItems.length).toBeLessThan(3);
+			});
+		});
+	});
+
+	// ===== 11. ADVANCED UI STATES =====
+	describe('Advanced UI States (VI)', () => {
+		test('VI-19: No data with previous value selected in variable', async () => {
+			const variable = createMockVariable({
+				type: 'CUSTOM',
+				customValue: '',
+				multiSelect: true,
+				selectedValue: ['previous-value'],
+			});
+
+			render(
+				<TestWrapper>
+					<VariableItem
+						variableData={variable}
+						existingVariables={{}}
+						onValueUpdate={mockOnValueUpdate}
+						variablesToGetUpdated={[]}
+						setVariablesToGetUpdated={mockSetVariablesToGetUpdated}
+						dependencyData={null}
+					/>
+				</TestWrapper>,
+			);
+
+			// Wait for component to initialize
+			await waitFor(() => {
+				const combobox = screen.getByRole('combobox');
+				expect(combobox).toBeInTheDocument();
+			});
+
+			const combobox = screen.getByRole('combobox');
+			await user.click(combobox);
+
+			// Should show no data message (the component may not show this exact text)
+			await waitFor(() => {
+				// Check if dropdown is empty or shows no data indication
+				const dropdown = document.querySelector('.ant-select-dropdown');
+				expect(dropdown).toBeInTheDocument();
+			});
+
+			// Verify the component renders without crashing
+			expect(combobox).toBeInTheDocument();
+		});
+
+		test('VI-20: Always editable accessibility in variable', async () => {
+			const variable = createMockVariable({
+				type: 'CUSTOM',
+				customValue: 'option1,option2',
+				multiSelect: true,
+			});
+
+			render(
+				<TestWrapper>
+					<VariableItem
+						variableData={variable}
+						existingVariables={{}}
+						onValueUpdate={mockOnValueUpdate}
+						variablesToGetUpdated={[]}
+						setVariablesToGetUpdated={mockSetVariablesToGetUpdated}
+						dependencyData={null}
+					/>
+				</TestWrapper>,
+			);
+
+			const combobox = screen.getByRole('combobox');
+
+			// Should be editable
+			expect(combobox).not.toBeDisabled();
+			await user.click(combobox);
+			expect(combobox).toHaveFocus();
+
+			// Should still be interactive
+			expect(combobox).not.toBeDisabled();
+		});
+	});
+
+	// ===== 13. DROPDOWN PERSISTENCE =====
+	describe('Dropdown Persistence (VI)', () => {
+		test('VI-24: Dropdown stays open for non-save actions in variable', async () => {
+			const variable = createMockVariable({
+				type: 'CUSTOM',
+				customValue: 'option1,option2,option3',
+				multiSelect: true,
+			});
+
+			render(
+				<TestWrapper>
+					<VariableItem
+						variableData={variable}
+						existingVariables={{}}
+						onValueUpdate={mockOnValueUpdate}
+						variablesToGetUpdated={[]}
+						setVariablesToGetUpdated={mockSetVariablesToGetUpdated}
+						dependencyData={null}
+					/>
+				</TestWrapper>,
+			);
+
+			// Wait for component to initialize
+			await waitFor(() => {
+				const combobox = screen.getByRole('combobox');
+				expect(combobox).toBeInTheDocument();
+			});
+
+			const combobox = screen.getByRole('combobox');
+			await user.click(combobox);
+
+			await waitFor(() => {
+				expect(screen.getByText('ALL')).toBeInTheDocument();
+			});
+
+			// Navigate with arrow keys (non-save action)
+			await user.keyboard('{ArrowDown}');
+			await user.keyboard('{ArrowDown}');
+
+			// Dropdown should still be open
+			await waitFor(() => {
+				const dropdown = document.querySelector('.ant-select-dropdown');
+				expect(dropdown).toBeInTheDocument();
+			});
+
+			// Verify the component renders without crashing
+			expect(combobox).toBeInTheDocument();
+
+			// Only ESC should close the dropdown
+			await user.keyboard('{Escape}');
+
+			await waitFor(() => {
+				const dropdown = document.querySelector('.ant-select-dropdown');
+				expect(dropdown).toHaveClass('ant-select-dropdown-hidden');
+			});
+		});
+	});
+});

frontend/src/components/NewSelect/styles.scss

@@ -35,12 +35,50 @@ $custom-border-color: #2c3044;
 	width: 100%;
 	position: relative;
 
+	&.is-all-selected {
+		.ant-select-selection-search-input {
+			caret-color: transparent;
+		}
+
+		.ant-select-selection-placeholder {
+			opacity: 1 !important;
+			color: var(--bg-vanilla-400) !important;
+			font-weight: 500;
+			visibility: visible !important;
+			pointer-events: none;
+			z-index: 2;
+
+			.lightMode & {
+				color: rgba(0, 0, 0, 0.85) !important;
+			}
+		}
+
+		&.ant-select-focused .ant-select-selection-placeholder {
+			opacity: 0.45 !important;
+		}
+	}
+
+	.all-selected-text {
+		position: absolute;
+		left: 12px;
+		top: 50%;
+		transform: translateY(-50%);
+		color: var(--bg-vanilla-400);
+		z-index: 1;
+		pointer-events: none;
+
+		.lightMode & {
+			color: rgba(0, 0, 0, 0.85);
+		}
+	}
+
 	.ant-select-selector {
 		max-height: 200px;
 		overflow: auto;
 		scrollbar-width: thin;
 		background-color: var(--bg-ink-400);
 		border-color: var(--bg-slate-400);
+		cursor: text;
 
 		&::-webkit-scrollbar {
 			width: 6px;
@@ -56,6 +94,16 @@ $custom-border-color: #2c3044;
 		}
 	}
 
+	// Ensure adequate space for input area
+	.ant-select-selection-search {
+		min-width: 60px !important;
+		flex: 1 1 auto;
+		.ant-select-selection-search-input {
+			min-width: 60px !important;
+			cursor: text;
+		}
+	}
+
 	&.ant-select-focused {
 		.ant-select-selector {
 			border-color: var(--bg-robin-500);
@@ -158,7 +206,7 @@ $custom-border-color: #2c3044;
 // Custom dropdown styles for single select
 .custom-select-dropdown {
 	padding: 8px 0 0 0;
-	max-height: 500px;
+	max-height: 300px;
 	overflow-y: auto;
 	overflow-x: hidden;
 	scrollbar-width: thin;
@@ -276,6 +324,10 @@ $custom-border-color: #2c3044;
 		font-size: 12px;
 	}
 
+	.navigation-text-incomplete {
+		color: var(--bg-amber-600) !important;
+	}
+
 	.navigation-error {
 		.navigation-text,
 		.navigation-icons {
@@ -322,7 +374,7 @@ $custom-border-color: #2c3044;
 // Custom dropdown styles for multi-select
 .custom-multiselect-dropdown {
 	padding: 8px 0 0 0;
-	max-height: 500px;
+	max-height: 350px;
 	overflow-y: auto;
 	overflow-x: hidden;
 	scrollbar-width: thin;
@@ -355,8 +407,13 @@ $custom-border-color: #2c3044;
 	.select-group {
 		margin-bottom: 12px;
 		overflow: hidden;
+		margin-top: 4px;
 
 		.group-label {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+
 			font-weight: 500;
 			padding: 4px 12px;
 			font-size: 13px;
@@ -404,6 +461,13 @@ $custom-border-color: #2c3044;
 				width: 100%;
 			}
 
+			.all-option-text {
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				width: 100%;
+			}
+
 			.option-content {
 				display: flex;
 				justify-content: space-between;
@@ -637,6 +701,7 @@ $custom-border-color: #2c3044;
 		.ant-select-selector {
 			background-color: var(--bg-vanilla-100);
 			border-color: #e9e9e9;
+			cursor: text; // Make entire selector clickable for input focus
 
 			&::-webkit-scrollbar-thumb {
 				background-color: #ccc;
@@ -647,6 +712,20 @@ $custom-border-color: #2c3044;
 			}
 		}
 
+		.ant-select-selection-search {
+			min-width: 60px !important;
+			flex: 1 1 auto;
+
+			.ant-select-selection-search-input {
+				min-width: 60px !important;
+				cursor: text;
+			}
+		}
+
+		.ant-select-selector {
+			cursor: text;
+		}
+
 		.ant-select-selection-placeholder {
 			color: rgba(0, 0, 0, 0.45);
 		}
@@ -656,6 +735,10 @@ $custom-border-color: #2c3044;
 			border: 1px solid #e8e8e8;
 			color: rgba(0, 0, 0, 0.85);
 
+			font-size: 12px !important;
+			height: 20px;
+			line-height: 18px;
+
 			.ant-select-selection-item-content {
 				color: rgba(0, 0, 0, 0.85);
 			}
@@ -718,6 +801,10 @@ $custom-border-color: #2c3044;
 
 		.select-group {
 			.group-label {
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+
 				color: rgba(0, 0, 0, 0.85);
 				background-color: #fafafa;
 				border-bottom: 1px solid #f0f0f0;
@@ -836,3 +923,38 @@ $custom-border-color: #2c3044;
 		}
 	}
 }
+
+.custom-multiselect-wrapper {
+	position: relative;
+	width: 100%;
+
+	&.all-selected {
+		.all-text {
+			position: absolute;
+			left: 12px;
+			top: 50%;
+			transform: translateY(-50%);
+			color: var(--bg-vanilla-400);
+			font-weight: 500;
+			z-index: 2;
+			pointer-events: none;
+			transition: opacity 0.2s ease, visibility 0.2s ease;
+
+			.lightMode & {
+				color: rgba(0, 0, 0, 0.85);
+			}
+		}
+
+		&:focus-within .all-text {
+			opacity: 0.45;
+		}
+
+		.ant-select-selection-search-input {
+			caret-color: auto;
+		}
+
+		.ant-select-selection-placeholder {
+			display: none;
+		}
+	}
+}

frontend/src/components/NewSelect/types.ts

@@ -24,9 +24,12 @@ export interface CustomSelectProps extends Omit<SelectProps, 'options'> {
 	highlightSearch?: boolean;
 	placement?: 'topLeft' | 'topRight' | 'bottomLeft' | 'bottomRight';
 	popupMatchSelectWidth?: boolean;
-	errorMessage?: string;
+	errorMessage?: string | null;
 	allowClear?: SelectProps['allowClear'];
 	onRetry?: () => void;
+	showIncompleteDataMessage?: boolean;
+	showRetryButton?: boolean;
+	isDynamicVariable?: boolean;
 }
 
 export interface CustomTagProps {
@@ -51,10 +54,16 @@ export interface CustomMultiSelectProps
 	getPopupContainer?: (triggerNode: HTMLElement) => HTMLElement;
 	dropdownRender?: (menu: React.ReactElement) => React.ReactElement;
 	highlightSearch?: boolean;
-	errorMessage?: string;
+	errorMessage?: string | null;
 	popupClassName?: string;
 	placement?: 'topLeft' | 'topRight' | 'bottomLeft' | 'bottomRight';
 	maxTagCount?: number;
 	allowClear?: SelectProps['allowClear'];
 	onRetry?: () => void;
+	maxTagTextLength?: number;
+	showIncompleteDataMessage?: boolean;
+	showLabels?: boolean;
+	enableRegexOption?: boolean;
+	isDynamicVariable?: boolean;
+	showRetryButton?: boolean;
 }

frontend/src/components/NewSelect/utils.ts

@@ -1,4 +1,6 @@
 /* eslint-disable sonarjs/cognitive-complexity */
+import { uniqueOptions } from 'container/NewDashboard/DashboardVariablesSelection/util';
+
 import { OptionData } from './types';
 
 export const SPACEKEY = ' ';
@@ -98,8 +100,10 @@ export const prioritizeOrAddOptionForMultiSelect = (
 		label: labels?.[value] ?? value, // Use provided label or default to value
 	}));
 
+	const flatOutSelectedOptions = uniqueOptions([...newOptions, ...foundOptions]);
+
 	// Add found & new options to the top
-	return [...newOptions, ...foundOptions, ...filteredOptions];
+	return [...flatOutSelectedOptions, ...filteredOptions];
 };
 
 /**
@@ -133,3 +137,15 @@ export const filterOptionsBySearch = (
 		})
 		.filter(Boolean) as OptionData[];
 };
+
+/**
+ * Utility function to handle dropdown scroll and detect when scrolled to bottom
+ * Returns true when scrolled to within 20px of the bottom
+ */
+export const handleScrollToBottom = (
+	e: React.UIEvent<HTMLDivElement>,
+): boolean => {
+	const { scrollTop, scrollHeight, clientHeight } = e.currentTarget;
+	// Consider "scrolled to bottom" when within 20px of the bottom or at the bottom
+	return scrollHeight - scrollTop - clientHeight < 20;
+};

frontend/src/components/OrderBy/ListViewOrderBy.tsx

@@ -102,7 +102,7 @@ function ListViewOrderBy({
 			onChange={onChange}
 			onSearch={handleSearch}
 			notFoundContent={<Loader isLoading={isLoading} />}
-			placeholder="Select an attribute"
+			placeholder="Select a field"
 			style={{ width: 200 }}
 			options={selectOptions}
 			filterOption={(input, option): boolean =>

frontend/src/components/QueryBuilderV2/QueryBuilderV2.styles.scss

@@ -404,6 +404,7 @@
 	}
 
 	.qb-search-filter-container {
+		flex: 1;
 		display: flex;
 		flex-direction: row;
 		align-items: flex-start;

frontend/src/components/QueryBuilderV2/QueryV2/QueryAddOns/QueryAddOns.tsx

@@ -9,7 +9,7 @@ import { OrderByFilter } from 'container/QueryBuilder/filters/OrderByFilter/Orde
 import { ReduceToFilter } from 'container/QueryBuilder/filters/ReduceToFilter/ReduceToFilter';
 import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
 import { useQueryOperations } from 'hooks/queryBuilder/useQueryBuilderOperations';
-import { isEmpty } from 'lodash-es';
+import { get, isEmpty } from 'lodash-es';
 import { BarChart2, ChevronUp, ExternalLink, ScrollText } from 'lucide-react';
 import { useCallback, useEffect, useState } from 'react';
 import { IBuilderQuery } from 'types/api/queryBuilder/queryBuilderData';
@@ -34,6 +34,14 @@ const ADD_ONS_KEYS = {
 	LEGEND_FORMAT: 'legend_format',
 };
 
+const ADD_ONS_KEYS_TO_QUERY_PATH = {
+	[ADD_ONS_KEYS.GROUP_BY]: 'groupBy',
+	[ADD_ONS_KEYS.HAVING]: 'having.expression',
+	[ADD_ONS_KEYS.ORDER_BY]: 'orderBy',
+	[ADD_ONS_KEYS.LIMIT]: 'limit',
+	[ADD_ONS_KEYS.LEGEND_FORMAT]: 'legend',
+};
+
 const ADD_ONS = [
 	{
 		icon: <BarChart2 size={14} />,
@@ -91,6 +99,9 @@ const REDUCE_TO = {
 		'https://signoz.io/docs/userguide/query-builder-v5/#reduce-operations',
 };
 
+const hasValue = (value: unknown): boolean =>
+	value != null && value !== '' && !(Array.isArray(value) && value.length === 0);
+
 // Custom tooltip content component
 function TooltipContent({
 	label,
@@ -195,21 +206,29 @@ function QueryAddOns({
 			}
 		}
 
-		// add reduce to if showReduceTo is true
 		if (showReduceTo) {
 			filteredAddOns = [...filteredAddOns, REDUCE_TO];
 		}
-
 		setAddOns(filteredAddOns);
 
-		// Filter selectedViews to only include add-ons present in filteredAddOns
-		setSelectedViews((prevSelectedViews) =>
-			prevSelectedViews.filter((view) =>
-				filteredAddOns.some((addOn) => addOn.key === view.key),
+		const activeAddOnKeys = new Set(
+			Object.entries(ADD_ONS_KEYS_TO_QUERY_PATH)
+				.filter(([, path]) => hasValue(get(query, path)))
+				.map(([key]) => key),
+		);
+
+		const availableAddOnKeys = new Set(filteredAddOns.map((addOn) => addOn.key));
+
+		// Filter and set selected views: add-ons that are both active and available
+		setSelectedViews(
+			ADD_ONS.filter(
+				(addOn) =>
+					activeAddOnKeys.has(addOn.key) && availableAddOnKeys.has(addOn.key),
 			),
 		);
+
 		// eslint-disable-next-line react-hooks/exhaustive-deps
-	}, [panelType, isListViewPanel, query.dataSource]);
+	}, [panelType, isListViewPanel, query]);
 
 	const handleOptionClick = (e: RadioChangeEvent): void => {
 		if (selectedViews.find((view) => view.key === e.target.value.key)) {
@@ -285,7 +304,7 @@ function QueryAddOns({
 			{selectedViews.length > 0 && (
 				<div className="selected-add-ons-content">
 					{selectedViews.find((view) => view.key === 'group_by') && (
-						<div className="add-on-content">
+						<div className="add-on-content" data-testid="group-by-content">
 							<div className="periscope-input-with-label">
 								<Tooltip
 									title={
@@ -321,7 +340,7 @@ function QueryAddOns({
 						</div>
 					)}
 					{selectedViews.find((view) => view.key === 'having') && (
-						<div className="add-on-content">
+						<div className="add-on-content" data-testid="having-content">
 							<div className="periscope-input-with-label">
 								<Tooltip
 									title={
@@ -353,7 +372,7 @@ function QueryAddOns({
 						</div>
 					)}
 					{selectedViews.find((view) => view.key === 'limit') && (
-						<div className="add-on-content">
+						<div className="add-on-content" data-testid="limit-content">
 							<InputWithLabel
 								label="Limit"
 								onChange={handleChangeLimit}
@@ -367,7 +386,7 @@ function QueryAddOns({
 						</div>
 					)}
 					{selectedViews.find((view) => view.key === 'order_by') && (
-						<div className="add-on-content">
+						<div className="add-on-content" data-testid="order-by-content">
 							<div className="periscope-input-with-label">
 								<Tooltip
 									title={
@@ -405,7 +424,7 @@ function QueryAddOns({
 					)}
 
 					{selectedViews.find((view) => view.key === 'reduce_to') && showReduceTo && (
-						<div className="add-on-content">
+						<div className="add-on-content" data-testid="reduce-to-content">
 							<div className="periscope-input-with-label">
 								<Tooltip
 									title={
@@ -436,7 +455,7 @@ function QueryAddOns({
 					)}
 
 					{selectedViews.find((view) => view.key === 'legend_format') && (
-						<div className="add-on-content">
+						<div className="add-on-content" data-testid="legend-format-content">
 							<InputWithLabel
 								label="Legend format"
 								placeholder="Write legend format"

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

@@ -686,7 +686,10 @@ function QueryAggregationSelect({
 				>
 					<Info
 						size={14}
-						style={{ opacity: 0.9, color: isDarkMode ? '#ffffff' : '#000000' }}
+						style={{
+							opacity: 0.9,
+							color: isDarkMode ? Color.BG_VANILLA_100 : Color.BG_INK_500,
+						}}
 					/>
 				</div>
 			</Tooltip>

frontend/src/components/QueryBuilderV2/QueryV2/QuerySearch/QuerySearch.tsx

@@ -23,6 +23,7 @@ import cx from 'classnames';
 import {
 	negationQueryOperatorSuggestions,
 	OPERATORS,
+	QUERY_BUILDER_FUNCTIONS,
 	QUERY_BUILDER_KEY_TYPES,
 	QUERY_BUILDER_OPERATORS_BY_KEY_TYPE,
 	queryOperatorSuggestions,
@@ -32,12 +33,14 @@ import { useIsDarkMode } from 'hooks/useDarkMode';
 import useDebounce from 'hooks/useDebounce';
 import { debounce, isNull } from 'lodash-es';
 import { Info, TriangleAlert } from 'lucide-react';
+import { useDashboard } from 'providers/Dashboard/Dashboard';
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import {
 	IDetailedError,
 	IQueryContext,
 	IValidationResult,
 } from 'types/antlrQueryTypes';
+import { IDashboardVariable } from 'types/api/dashboard/getAll';
 import { IBuilderQuery } from 'types/api/queryBuilder/queryBuilderData';
 import { QueryKeyDataSuggestionsProps } from 'types/api/querySuggestions/types';
 import { DataSource } from 'types/common/queryBuilder';
@@ -161,13 +164,15 @@ function QuerySearch({
 
 	const { handleRunQuery } = useQueryBuilder();
 
-	// const {
-	// 	data: queryKeySuggestions,
-	// 	refetch: refetchQueryKeySuggestions,
-	// } = useGetQueryKeySuggestions({
-	// 	signal: dataSource,
-	// 	name: searchText || '',
-	// });
+	const { selectedDashboard } = useDashboard();
+
+	const dynamicVariables = useMemo(
+		() =>
+			Object.values(selectedDashboard?.data?.variables || {})?.filter(
+				(variable: IDashboardVariable) => variable.type === 'DYNAMIC',
+			),
+		[selectedDashboard],
+	);
 
 	// Add back the generateOptions function and useEffect
 	const generateOptions = (keys: {
@@ -982,6 +987,25 @@ function QuerySearch({
 				option.label.toLowerCase().includes(searchText),
 			);
 
+			// Add dynamic variables suggestions for the current key
+			const variableName = dynamicVariables?.find(
+				(variable) => variable?.dynamicVariablesAttribute === keyName,
+			)?.name;
+
+			if (variableName) {
+				const variableValue = `$${variableName}`;
+				const variableOption = {
+					label: variableValue,
+					type: 'variable',
+					apply: variableValue,
+				};
+
+				// Add variable suggestion at the beginning if it matches the search text
+				if (variableValue.toLowerCase().includes(searchText.toLowerCase())) {
+					options = [variableOption, ...options];
+				}
+			}
+
 			// Trigger fetch only if needed
 			const shouldFetch =
 				// Fetch only if key is available
@@ -1034,6 +1058,9 @@ function QuerySearch({
 				} else if (option.type === 'array') {
 					// Arrays are already formatted as arrays
 					processedOption.apply = option.label;
+				} else if (option.type === 'variable') {
+					// Variables should be used as-is (they already have the $ prefix)
+					processedOption.apply = option.label;
 				}
 
 				return processedOption;
@@ -1050,11 +1077,11 @@ function QuerySearch({
 		}
 
 		if (queryContext.isInFunction) {
-			options = [
-				{ label: 'HAS', type: 'function' },
-				{ label: 'HASANY', type: 'function' },
-				{ label: 'HASALL', type: 'function' },
-			];
+			options = Object.values(QUERY_BUILDER_FUNCTIONS).map((option) => ({
+				label: option,
+				apply: `${option}()`,
+				type: 'function',
+			}));
 
 			// Add space after selection for functions
 			const optionsWithSpace = addSpaceToOptions(options);
@@ -1243,7 +1270,10 @@ function QuerySearch({
 					>
 						<Info
 							size={14}
-							style={{ opacity: 0.9, color: isDarkMode ? '#ffffff' : '#000000' }}
+							style={{
+								opacity: 0.9,
+								color: isDarkMode ? Color.BG_VANILLA_100 : Color.BG_INK_500,
+							}}
 						/>
 					</a>
 				</Tooltip>

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

@@ -155,7 +155,7 @@ export const QueryV2 = memo(function QueryV2({
 							</div>
 
 							{!isCollapsed && showInlineQuerySearch && (
-								<div className="qb-search-filter-container" style={{ flex: 1 }}>
+								<div className="qb-search-filter-container">
 									<div className="query-search-container">
 										<QuerySearch
 											key={`query-search-${query.queryName}-${query.dataSource}`}

frontend/src/components/QueryBuilderV2/QueryV2/TraceOperator/TraceOperator.styles.scss

@@ -16,40 +16,14 @@
 			width: 1px;
 			background: repeating-linear-gradient(
 				to bottom,
-				#1d212d,
-				#1d212d 4px,
+				var(--bg-slate-400),
+				var(--bg-slate-400) 4px,
 				transparent 4px,
 				transparent 8px
 			);
 		}
 	}
 
-	&-span-source-label {
-		display: flex;
-		align-items: center;
-		gap: 8px;
-		height: 24px;
-
-		&-query {
-			font-size: 14px;
-			font-weight: 400;
-			color: var(--bg-vanilla-100);
-		}
-		&-query-name {
-			width: 18px;
-			height: 18px;
-			display: grid;
-			place-content: center;
-			padding: 2px;
-
-			border-radius: 2px;
-			border: 1px solid rgba(242, 71, 105, 0.2);
-			background: rgba(242, 71, 105, 0.1);
-			color: var(--Sakura-400, #f56c87);
-			font-size: 12px;
-		}
-	}
-
 	&-arrow {
 		position: relative;
 		&::before {
@@ -62,8 +36,8 @@
 			width: 20px;
 			background: repeating-linear-gradient(
 				to right,
-				#1d212d,
-				#1d212d 4px,
+				var(--bg-slate-400),
+				var(--bg-slate-400) 4px,
 				transparent 4px,
 				transparent 8px
 			);

frontend/src/components/QueryBuilderV2/__tests__/QueryAddOns.test.tsx

@@ -0,0 +1,186 @@
+/* eslint-disable */
+import { fireEvent, render, screen } from '@testing-library/react';
+import React from 'react';
+
+import QueryAddOns from '../QueryV2/QueryAddOns/QueryAddOns';
+import { PANEL_TYPES } from 'constants/queryBuilder';
+import { DataSource } from 'types/common/queryBuilder';
+
+// Mocks: only what is required for this component to render and for us to assert handler calls
+const mockHandleChangeQueryData = jest.fn();
+const mockHandleSetQueryData = jest.fn();
+
+jest.mock('hooks/queryBuilder/useQueryBuilderOperations', () => ({
+	useQueryOperations: () => ({
+		handleChangeQueryData: mockHandleChangeQueryData,
+	}),
+}));
+
+jest.mock('hooks/queryBuilder/useQueryBuilder', () => ({
+	useQueryBuilder: () => ({
+		handleSetQueryData: mockHandleSetQueryData,
+	}),
+}));
+
+jest.mock('container/QueryBuilder/filters/GroupByFilter/GroupByFilter', () => ({
+	GroupByFilter: ({ onChange }: any) => (
+		<button data-testid="groupby" onClick={() => onChange(['service.name'])}>
+			GroupByFilter
+		</button>
+	),
+}));
+
+jest.mock('container/QueryBuilder/filters/OrderByFilter/OrderByFilter', () => ({
+	OrderByFilter: ({ onChange }: any) => (
+		<button
+			data-testid="orderby"
+			onClick={() => onChange([{ columnName: 'duration', order: 'desc' }])}
+		>
+			OrderByFilter
+		</button>
+	),
+}));
+
+jest.mock('../QueryV2/QueryAddOns/HavingFilter/HavingFilter', () => ({
+	__esModule: true,
+	default: ({ onChange, onClose }: any) => (
+		<div>
+			<button data-testid="having-change" onClick={() => onChange('p99 > 500')}>
+				HavingFilter
+			</button>
+			<button data-testid="having-close" onClick={onClose}>
+				close
+			</button>
+		</div>
+	),
+}));
+
+jest.mock(
+	'container/QueryBuilder/filters/ReduceToFilter/ReduceToFilter',
+	() => ({
+		ReduceToFilter: ({ onChange }: any) => (
+			<button data-testid="reduce-to" onClick={() => onChange('sum')}>
+				ReduceToFilter
+			</button>
+		),
+	}),
+);
+
+function baseQuery(overrides: Partial<any> = {}): any {
+	return {
+		dataSource: DataSource.TRACES,
+		aggregations: [{ id: 'a', operator: 'count' }],
+		groupBy: [],
+		orderBy: [],
+		legend: '',
+		limit: null,
+		having: { expression: '' },
+		...overrides,
+	};
+}
+
+describe('QueryAddOns', () => {
+	beforeEach(() => {
+		jest.clearAllMocks();
+	});
+
+	it('VALUE panel: no sections auto-open when query has no active add-ons', () => {
+		render(
+			<QueryAddOns
+				query={baseQuery()}
+				version="v5"
+				isListViewPanel={false}
+				showReduceTo
+				panelType={PANEL_TYPES.VALUE}
+				index={0}
+				isForTraceOperator={false}
+			/>,
+		);
+
+		expect(screen.queryByTestId('legend-format-content')).not.toBeInTheDocument();
+		expect(screen.queryByTestId('reduce-to-content')).not.toBeInTheDocument();
+		expect(screen.queryByTestId('order-by-content')).not.toBeInTheDocument();
+		expect(screen.queryByTestId('limit-content')).not.toBeInTheDocument();
+		expect(screen.queryByTestId('group-by-content')).not.toBeInTheDocument();
+		expect(screen.queryByTestId('having-content')).not.toBeInTheDocument();
+	});
+
+	it('hides group-by section for METRICS even if groupBy is set in query', () => {
+		render(
+			<QueryAddOns
+				query={baseQuery({
+					dataSource: DataSource.METRICS,
+					groupBy: ['service.name'],
+				})}
+				version="v5"
+				isListViewPanel={false}
+				showReduceTo={false}
+				panelType={PANEL_TYPES.TIME_SERIES}
+				index={0}
+				isForTraceOperator={false}
+			/>,
+		);
+
+		expect(screen.queryByTestId('group-by-content')).not.toBeInTheDocument();
+	});
+
+	it('defaults to Order By open in list view panel', () => {
+		render(
+			<QueryAddOns
+				query={baseQuery()}
+				version="v5"
+				isListViewPanel
+				showReduceTo={false}
+				panelType={PANEL_TYPES.LIST}
+				index={0}
+				isForTraceOperator={false}
+			/>,
+		);
+
+		expect(screen.getByTestId('order-by-content')).toBeInTheDocument();
+	});
+
+	it('limit input auto-opens when limit is set and changing it calls handler', () => {
+		render(
+			<QueryAddOns
+				query={baseQuery({ limit: 5 })}
+				version="v5"
+				isListViewPanel={false}
+				showReduceTo={false}
+				panelType={PANEL_TYPES.TIME_SERIES}
+				index={0}
+				isForTraceOperator={false}
+			/>,
+		);
+
+		const input = screen.getByTestId('input-Limit') as HTMLInputElement;
+		expect(screen.getByTestId('limit-content')).toBeInTheDocument();
+		expect(input.value).toBe('5');
+
+		fireEvent.change(input, { target: { value: '10' } });
+		expect(mockHandleChangeQueryData).toHaveBeenCalledWith('limit', 10);
+	});
+
+	it('auto-opens Order By and Limit when present in query', () => {
+		const query = baseQuery({
+			orderBy: [{ columnName: 'duration', order: 'desc' }],
+			limit: 7,
+		});
+		render(
+			<QueryAddOns
+				query={query}
+				version="v5"
+				isListViewPanel={false}
+				showReduceTo={false}
+				panelType={PANEL_TYPES.TIME_SERIES}
+				index={0}
+				isForTraceOperator={false}
+			/>,
+		);
+
+		expect(screen.getByTestId('order-by-content')).toBeInTheDocument();
+		const limitInput = screen.getByTestId('input-Limit') as HTMLInputElement;
+		expect(screen.getByTestId('limit-content')).toBeInTheDocument();
+		expect(limitInput.value).toBe('7');
+	});
+});

frontend/src/components/QueryBuilderV2/__tests__/utils.test.ts

@@ -13,6 +13,7 @@ import {
 	convertAggregationToExpression,
 	convertFiltersToExpression,
 	convertFiltersToExpressionWithExistingQuery,
+	removeKeysFromExpression,
 } from '../utils';
 
 describe('convertFiltersToExpression', () => {
@@ -972,3 +973,223 @@ describe('convertAggregationToExpression', () => {
 		]);
 	});
 });
+
+describe('removeKeysFromExpression', () => {
+	beforeEach(() => {
+		jest.clearAllMocks();
+	});
+
+	describe('Backward compatibility (removeOnlyVariableExpressions = false)', () => {
+		it('should remove simple key-value pair from expression', () => {
+			const expression = "service.name = 'api-gateway' AND status = 'success'";
+			const result = removeKeysFromExpression(expression, ['service.name']);
+
+			expect(result).toBe("status = 'success'");
+		});
+
+		it('should remove multiple keys from expression', () => {
+			const expression =
+				"service.name = 'api-gateway' AND status = 'success' AND region = 'us-east-1'";
+			const result = removeKeysFromExpression(expression, [
+				'service.name',
+				'status',
+			]);
+
+			expect(result).toBe("region = 'us-east-1'");
+		});
+
+		it('should handle empty expression', () => {
+			const result = removeKeysFromExpression('', ['service.name']);
+			expect(result).toBe('');
+		});
+
+		it('should handle empty keys array', () => {
+			const expression = "service.name = 'api-gateway'";
+			const result = removeKeysFromExpression(expression, []);
+			expect(result).toBe(expression);
+		});
+
+		it('should handle key not found in expression', () => {
+			const expression = "service.name = 'api-gateway'";
+			const result = removeKeysFromExpression(expression, ['nonexistent.key']);
+			expect(result).toBe(expression);
+		});
+
+		// todo: Sagar check this - this is expected or not
+		// it('should remove last occurrence when multiple occurrences exist', () => {
+		// 	// This tests the original behavior - should remove the last occurrence
+		// 	const expression =
+		// 		"deployment.environment = $deployment.environment deployment.environment = 'default'";
+		// 	const result = removeKeysFromExpression(
+		// 		expression,
+		// 		['deployment.environment'],
+		// 		false,
+		// 	);
+
+		// 	// Should remove the literal value (last occurrence), leaving the variable
+		// 	expect(result).toBe('deployment.environment = $deployment.environment');
+		// });
+	});
+
+	describe('Variable expression targeting (removeOnlyVariableExpressions = true)', () => {
+		it('should remove only variable expressions (values starting with $)', () => {
+			const expression =
+				"deployment.environment = $deployment.environment deployment.environment = 'default'";
+			const result = removeKeysFromExpression(
+				expression,
+				['deployment.environment'],
+				true,
+			);
+
+			// Should remove the variable expression, leaving the literal value
+			expect(result).toBe("deployment.environment = 'default'");
+		});
+
+		it('should not remove literal values when targeting variable expressions', () => {
+			const expression = "service.name = 'api-gateway' AND status = 'success'";
+			const result = removeKeysFromExpression(expression, ['service.name'], true);
+
+			// Should not remove anything since no variable expressions exist
+			expect(result).toBe("service.name = 'api-gateway' AND status = 'success'");
+		});
+
+		it('should remove multiple variable expressions', () => {
+			const expression =
+				"deployment.environment = $deployment.environment service.name = $service.name status = 'success'";
+			const result = removeKeysFromExpression(
+				expression,
+				['deployment.environment', 'service.name'],
+				true,
+			);
+
+			expect(result).toBe("status = 'success'");
+		});
+
+		it('should handle mixed variable and literal expressions correctly', () => {
+			const expression =
+				"deployment.environment = $deployment.environment service.name = 'api-gateway' region = $region";
+			const result = removeKeysFromExpression(
+				expression,
+				['deployment.environment', 'region'],
+				true,
+			);
+
+			// Should only remove variable expressions, leaving literal value
+			expect(result).toBe("service.name = 'api-gateway'");
+		});
+
+		it('should handle complex expressions with operators', () => {
+			const expression =
+				"deployment.environment IN [$env1, $env2] AND service.name = 'api-gateway'";
+			const result = removeKeysFromExpression(
+				expression,
+				['deployment.environment'],
+				true,
+			);
+
+			expect(result).toBe("service.name = 'api-gateway'");
+		});
+	});
+
+	describe('Edge cases and robustness', () => {
+		it('should handle case insensitive key matching', () => {
+			const expression = 'Service.Name = $Service.Name';
+			const result = removeKeysFromExpression(expression, ['service.name'], true);
+
+			expect(result).toBe('');
+		});
+
+		it('should clean up trailing AND/OR operators', () => {
+			const expression =
+				"deployment.environment = $deployment.environment AND service.name = 'api-gateway'";
+			const result = removeKeysFromExpression(
+				expression,
+				['deployment.environment'],
+				true,
+			);
+
+			expect(result).toBe("service.name = 'api-gateway'");
+		});
+
+		it('should clean up leading AND/OR operators', () => {
+			const expression =
+				"service.name = 'api-gateway' AND deployment.environment = $deployment.environment";
+			const result = removeKeysFromExpression(
+				expression,
+				['deployment.environment'],
+				true,
+			);
+
+			expect(result).toBe("service.name = 'api-gateway'");
+		});
+
+		it('should handle expressions with only variable assignments', () => {
+			const expression = 'deployment.environment = $deployment.environment';
+			const result = removeKeysFromExpression(
+				expression,
+				['deployment.environment'],
+				true,
+			);
+
+			expect(result).toBe('');
+		});
+
+		it('should handle whitespace around operators', () => {
+			const expression =
+				"deployment.environment  =  $deployment.environment  AND  service.name  =  'api-gateway'";
+			const result = removeKeysFromExpression(
+				expression,
+				['deployment.environment'],
+				true,
+			);
+
+			expect(result.trim()).toBe("service.name  =  'api-gateway'");
+		});
+	});
+
+	describe('Real-world scenarios', () => {
+		it('should handle multiple variable instances of same key', () => {
+			const expression =
+				"deployment.environment = $env1 deployment.environment = $env2 deployment.environment = 'default'";
+			const result = removeKeysFromExpression(
+				expression,
+				['deployment.environment'],
+				true,
+			);
+
+			// Should remove one occurence as this case in itself is invalid to have multiple variable expressions for the same key
+			expect(result).toBe(
+				"deployment.environment = $env1 deployment.environment = 'default'",
+			);
+		});
+
+		it('should handle OR operators in expressions', () => {
+			const expression =
+				"deployment.environment = $deployment.environment OR service.name = 'api-gateway'";
+			const result = removeKeysFromExpression(
+				expression,
+				['deployment.environment'],
+				true,
+			);
+
+			expect(result).toBe("service.name = 'api-gateway'");
+		});
+
+		it('should maintain expression validity after removal', () => {
+			const expression =
+				"deployment.environment = $deployment.environment AND service.name = 'api-gateway' AND status = 'success'";
+			const result = removeKeysFromExpression(
+				expression,
+				['deployment.environment'],
+				true,
+			);
+
+			// Should maintain valid AND structure
+			expect(result).toBe("service.name = 'api-gateway' AND status = 'success'");
+
+			// Verify the result can be parsed by extractQueryPairs
+			const pairs = extractQueryPairs(result);
+			expect(pairs).toHaveLength(2);
+		});
+	});
+});

frontend/src/components/QueryBuilderV2/utils.ts

@@ -38,6 +38,13 @@ const isArrayOperator = (operator: string): boolean => {
 	return arrayOperators.includes(operator);
 };
 
+const isVariable = (value: string | string[] | number | boolean): boolean => {
+	if (Array.isArray(value)) {
+		return value.some((v) => typeof v === 'string' && v.trim().startsWith('$'));
+	}
+	return typeof value === 'string' && value.trim().startsWith('$');
+};
+
 /**
  * Format a value for the expression string
  * @param value - The value to format
@@ -48,6 +55,10 @@ const formatValueForExpression = (
 	value: string[] | string | number | boolean,
 	operator?: string,
 ): string => {
+	if (isVariable(value)) {
+		return String(value);
+	}
+
 	// For IN operators, ensure value is always an array
 	if (isArrayOperator(operator || '')) {
 		const arrayValue = Array.isArray(value) ? value : [value];
@@ -466,11 +477,13 @@ export const convertFiltersToExpressionWithExistingQuery = (
  *
  * @param expression - The full query string.
  * @param keysToRemove - An array of keys (case-insensitive) that should be removed from the expression.
+ * @param removeOnlyVariableExpressions - When true, only removes key-value pairs where the value is a variable (starts with $). When false, uses the original behavior.
  * @returns A new expression string with the specified keys and their associated clauses removed.
  */
 export const removeKeysFromExpression = (
 	expression: string,
 	keysToRemove: string[],
+	removeOnlyVariableExpressions = false,
 ): string => {
 	if (!keysToRemove || keysToRemove.length === 0) {
 		return expression;
@@ -486,9 +499,20 @@ export const removeKeysFromExpression = (
 			let queryPairsMap: Map<string, IQueryPair>;
 
 			if (existingQueryPairs.length > 0) {
+				// Filter query pairs based on the removeOnlyVariableExpressions flag
+				const filteredQueryPairs = removeOnlyVariableExpressions
+					? existingQueryPairs.filter((pair) => {
+							const pairKey = pair.key?.trim().toLowerCase();
+							const matchesKey = pairKey === `${key}`.trim().toLowerCase();
+							if (!matchesKey) return false;
+							const value = pair.value?.toString().trim();
+							return value && value.includes('$');
+					  })
+					: existingQueryPairs;
+
 				// Build a map for quick lookup of query pairs by their lowercase trimmed keys
 				queryPairsMap = new Map(
-					existingQueryPairs.map((pair) => {
+					filteredQueryPairs.map((pair) => {
 						const key = pair.key.trim().toLowerCase();
 						return [key, pair];
 					}),
@@ -524,6 +548,12 @@ export const removeKeysFromExpression = (
 				}
 			}
 		});
+
+		// Clean up any remaining trailing AND/OR operators and extra whitespace
+		updatedExpression = updatedExpression
+			.replace(/\s+(AND|OR)\s*$/i, '') // Remove trailing AND/OR
+			.replace(/^(AND|OR)\s+/i, '') // Remove leading AND/OR
+			.trim();
 	}
 
 	return updatedExpression;

frontend/src/components/SignozRadioGroup/SignozRadioGroup.tsx

@@ -5,7 +5,7 @@ import { RadioChangeEvent } from 'antd/es/radio';
 
 interface Option {
 	value: string;
-	label: string;
+	label: string | React.ReactNode;
 	icon?: React.ReactNode;
 }
 

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

@@ -0,0 +1,108 @@
+.span-hover-card {
+	width: 206px;
+
+	.ant-popover-inner {
+		background: linear-gradient(
+			139deg,
+			rgba(18, 19, 23, 0.32) 0%,
+			rgba(18, 19, 23, 0.36) 98.68%
+		);
+		padding: 12px 16px;
+		border: 1px solid var(--bg-slate-500);
+
+		&::before {
+			content: '';
+			position: absolute;
+			top: 0;
+			left: 0;
+			right: 0;
+			bottom: 0;
+			background: linear-gradient(
+				139deg,
+				rgba(18, 19, 23, 0.32) 0%,
+				rgba(18, 19, 23, 0.36) 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(--bg-vanilla-100);
+		font-size: 12px;
+		font-weight: 500;
+		line-height: 20px;
+		letter-spacing: 0.48px;
+	}
+
+	&__service {
+		font-size: 0.875rem;
+		color: var(--bg-vanilla-400);
+		font-weight: 400;
+	}
+
+	&__error {
+		font-size: 0.75rem;
+		color: var(--bg-cherry-500);
+		font-weight: 500;
+	}
+
+	&__row {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		max-width: 174px;
+		margin-top: 8px;
+	}
+
+	&__label {
+		color: var(--bg-vanilla-400);
+		font-size: 12px;
+		font-weight: 500;
+		line-height: 20px;
+	}
+
+	&__value {
+		color: var(--bg-vanilla-100);
+		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%,
+			rgba(229, 72, 77, 0) 100%
+		);
+
+		&-icon {
+			width: 2px;
+			height: 20px;
+			flex-shrink: 0;
+			border-radius: 2px;
+			background: var(--bg-cherry-500);
+		}
+	}
+
+	&__relative-text {
+		color: var(--bg-cherry-300);
+		font-size: 12px;
+		line-height: 20px;
+	}
+}

frontend/src/components/SpanHoverCard/SpanHoverCard.tsx

@@ -0,0 +1,101 @@
+import './SpanHoverCard.styles.scss';
+
+import { Popover, Typography } from 'antd';
+import { DATE_TIME_FORMATS } from 'constants/dateTimeFormats';
+import { convertTimeToRelevantUnit } from 'container/TraceDetail/utils';
+import dayjs from 'dayjs';
+import { ReactNode } from 'react';
+import { Span } from 'types/api/trace/getTraceV2';
+import { toFixed } from 'utils/toFixed';
+
+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,
+	);
+
+	// 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).format(
+		DATE_TIME_FORMATS.SPAN_POPOVER_DATE,
+	);
+
+	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>
+			}
+			content={getContent()}
+			trigger="hover"
+			rootClassName="span-hover-card"
+			autoAdjustOverflow
+			arrow={false}
+		>
+			{children}
+		</Popover>
+	);
+}
+
+export default SpanHoverCard;

frontend/src/components/TextToolTip/TextToolTip.tsx

@@ -8,7 +8,7 @@ import {
 import { Tooltip } from 'antd';
 import { themeColors } from 'constants/theme';
 import { useIsDarkMode } from 'hooks/useDarkMode';
-import { useMemo } from 'react';
+import { ReactNode, useMemo } from 'react';
 
 import { style } from './constant';
 
@@ -17,6 +17,8 @@ function TextToolTip({
 	url,
 	useFilledIcon = true,
 	urlText,
+	filledIcon,
+	outlinedIcon,
 }: TextToolTipProps): JSX.Element {
 	const isDarkMode = useIsDarkMode();
 
@@ -62,27 +64,44 @@ function TextToolTip({
 		[isDarkMode],
 	);
 
-	return (
-		<Tooltip overlay={overlay}>
-			{useFilledIcon ? (
-				<QuestionCircleFilled style={iconStyle} />
-			) : (
-				<QuestionCircleOutlined style={iconOutlinedStyle} />
-			)}
-		</Tooltip>
+	// Use provided icons or fallback to default icons
+	const defaultFilledIcon = <QuestionCircleFilled style={iconStyle} />;
+	const defaultOutlinedIcon = (
+		<QuestionCircleOutlined style={iconOutlinedStyle} />
 	);
+
+	const renderIcon = (): ReactNode => {
+		if (useFilledIcon) {
+			return filledIcon ? (
+				<div style={{ color: iconStyle.color }}>{filledIcon}</div>
+			) : (
+				defaultFilledIcon
+			);
+		}
+		return outlinedIcon ? (
+			<div style={{ color: iconOutlinedStyle.color }}>{outlinedIcon}</div>
+		) : (
+			defaultOutlinedIcon
+		);
+	};
+
+	return <Tooltip overlay={overlay}>{renderIcon()}</Tooltip>;
 }
 
 TextToolTip.defaultProps = {
 	url: '',
 	urlText: '',
 	useFilledIcon: true,
+	filledIcon: undefined,
+	outlinedIcon: undefined,
 };
 interface TextToolTipProps {
 	url?: string;
 	text: string;
 	useFilledIcon?: boolean;
 	urlText?: string;
+	filledIcon?: ReactNode;
+	outlinedIcon?: ReactNode;
 }
 
 export default TextToolTip;

frontend/src/components/Uplot/Uplot.tsx

@@ -62,7 +62,7 @@ const Uplot = forwardRef<ToggleGraphProps | undefined, UplotProps>(
 		useEffect(() => {
 			onCreateRef.current = onCreate;
 			onDeleteRef.current = onDelete;
-		});
+		}, [onCreate, onDelete]);
 
 		const destroy = useCallback((chart: uPlot | null) => {
 			if (chart) {
@@ -71,12 +71,25 @@ const Uplot = forwardRef<ToggleGraphProps | undefined, UplotProps>(
 				chartRef.current = null;
 			}
 
-			// remove chart tooltip on cleanup
+			// Clean up tooltip overlay that might be detached
 			const overlay = document.getElementById('overlay');
-
 			if (overlay) {
+				// Remove all child elements from overlay
+				while (overlay.firstChild) {
+					overlay.removeChild(overlay.firstChild);
+				}
 				overlay.style.display = 'none';
 			}
+
+			// Clean up any remaining tooltips that might be detached
+			const tooltips = document.querySelectorAll(
+				'.uplot-tooltip, .tooltip-container',
+			);
+			tooltips.forEach((tooltip) => {
+				if (tooltip && tooltip.parentNode) {
+					tooltip.parentNode.removeChild(tooltip);
+				}
+			});
 		}, []);
 
 		const create = useCallback(() => {

frontend/src/constants/antlrQueryConstants.ts

@@ -42,6 +42,7 @@ export const QUERY_BUILDER_FUNCTIONS = {
 	HAS: 'has',
 	HASANY: 'hasAny',
 	HASALL: 'hasAll',
+	HASTOKEN: 'hasToken',
 };
 
 export function negateOperator(operatorOrFunction: string): string {

frontend/src/constants/dateTimeFormats.ts

@@ -29,6 +29,7 @@ export const DATE_TIME_FORMATS = {
 	DATE_SHORT: 'MM/DD',
 	YEAR_SHORT: 'YY',
 	YEAR_MONTH: 'YY-MM',
+	SPAN_POPOVER_DATE: 'M/D/YY - HH:mm',
 
 	// Month name formats
 	MONTH_DATE_FULL: 'MMMM DD, YYYY',

frontend/src/constants/query.ts

@@ -46,6 +46,7 @@ export enum QueryParams {
 	msgSystem = 'msgSystem',
 	destination = 'destination',
 	kindString = 'kindString',
+	summaryFilters = 'summaryFilters',
 	tab = 'tab',
 	thresholds = 'thresholds',
 	selectedExplorerView = 'selectedExplorerView',

frontend/src/constants/reactQueryKeys.ts

@@ -83,4 +83,7 @@ export const REACT_QUERY_KEY = {
 	// Quick Filters Query Keys
 	GET_CUSTOM_FILTERS: 'GET_CUSTOM_FILTERS',
 	GET_OTHER_FILTERS: 'GET_OTHER_FILTERS',
+	SPAN_LOGS: 'SPAN_LOGS',
+	SPAN_BEFORE_LOGS: 'SPAN_BEFORE_LOGS',
+	SPAN_AFTER_LOGS: 'SPAN_AFTER_LOGS',
 } as const;

frontend/src/container/ApiMonitoring/utils.tsx

@@ -3168,7 +3168,6 @@ export const getStatusCodeBarChartWidgetData = (
 	},
 	description: '',
 	id: '315b15fa-ff0c-442f-89f8-2bf4fb1af2f2',
-	isStacked: false,
 	panelTypes: PANEL_TYPES.BAR,
 	title: '',
 	opacity: '',

frontend/src/container/CreateAlertV2/AlertCondition/AlertCondition.tsx

@@ -0,0 +1,82 @@
+import './styles.scss';
+
+import { Button, Tooltip } from 'antd';
+import classNames from 'classnames';
+import { Activity, ChartLine } from 'lucide-react';
+import { AlertTypes } from 'types/api/alerts/alertTypes';
+
+import { useCreateAlertState } from '../context';
+import Stepper from '../Stepper';
+import AlertThreshold from './AlertThreshold';
+import AnomalyThreshold from './AnomalyThreshold';
+import { ANOMALY_TAB_TOOLTIP, THRESHOLD_TAB_TOOLTIP } from './constants';
+
+function AlertCondition(): JSX.Element {
+	const { alertType, setAlertType } = useCreateAlertState();
+
+	const showMultipleTabs =
+		alertType === AlertTypes.ANOMALY_BASED_ALERT ||
+		alertType === AlertTypes.METRICS_BASED_ALERT;
+
+	const tabs = [
+		{
+			label: 'Threshold',
+			icon: <ChartLine size={14} data-testid="threshold-view" />,
+			value: AlertTypes.METRICS_BASED_ALERT,
+		},
+		...(showMultipleTabs
+			? [
+					{
+						label: 'Anomaly',
+						icon: <Activity size={14} data-testid="anomaly-view" />,
+						value: AlertTypes.ANOMALY_BASED_ALERT,
+					},
+			  ]
+			: []),
+	];
+
+	const handleAlertTypeChange = (value: AlertTypes): void => {
+		if (!showMultipleTabs) {
+			return;
+		}
+		setAlertType(value);
+	};
+
+	const getTabTooltip = (tab: { value: AlertTypes }): string => {
+		if (tab.value === AlertTypes.ANOMALY_BASED_ALERT) {
+			return ANOMALY_TAB_TOOLTIP;
+		}
+		return THRESHOLD_TAB_TOOLTIP;
+	};
+
+	return (
+		<div className="alert-condition-container">
+			<Stepper stepNumber={2} label="Set alert conditions" />
+			<div className="alert-condition">
+				<div className="alert-condition-tabs">
+					{tabs.map((tab) => (
+						<Tooltip key={tab.value} title={getTabTooltip(tab)}>
+							<Button
+								className={classNames('list-view-tab', 'explorer-view-option', {
+									'active-tab': alertType === tab.value,
+								})}
+								onClick={(): void => {
+									if (alertType !== tab.value) {
+										handleAlertTypeChange(tab.value as AlertTypes);
+									}
+								}}
+							>
+								{tab.icon}
+								{tab.label}
+							</Button>
+						</Tooltip>
+					))}
+				</div>
+			</div>
+			{alertType !== AlertTypes.ANOMALY_BASED_ALERT && <AlertThreshold />}
+			{alertType === AlertTypes.ANOMALY_BASED_ALERT && <AnomalyThreshold />}
+		</div>
+	);
+}
+
+export default AlertCondition;

frontend/src/container/CreateAlertV2/AlertCondition/AlertThreshold.tsx

@@ -0,0 +1,162 @@
+import './styles.scss';
+
+import { Button, Select, Typography } from 'antd';
+import getAllChannels from 'api/channels/getAll';
+import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
+import { Plus } from 'lucide-react';
+import { useQuery } from 'react-query';
+import { SuccessResponseV2 } from 'types/api';
+import { Channels } from 'types/api/channels/getAll';
+import APIError from 'types/api/error';
+
+import { useCreateAlertState } from '../context';
+import {
+	INITIAL_INFO_THRESHOLD,
+	INITIAL_RANDOM_THRESHOLD,
+	INITIAL_WARNING_THRESHOLD,
+	THRESHOLD_MATCH_TYPE_OPTIONS,
+	THRESHOLD_OPERATOR_OPTIONS,
+} from '../context/constants';
+import ThresholdItem from './ThresholdItem';
+import { UpdateThreshold } from './types';
+import {
+	getCategoryByOptionId,
+	getCategorySelectOptionByName,
+	getQueryNames,
+} from './utils';
+
+function AlertThreshold(): JSX.Element {
+	const {
+		alertState,
+		thresholdState,
+		setThresholdState,
+	} = useCreateAlertState();
+	const { data, isLoading: isLoadingChannels } = useQuery<
+		SuccessResponseV2<Channels[]>,
+		APIError
+	>(['getChannels'], {
+		queryFn: () => getAllChannels(),
+	});
+	const channels = data?.data || [];
+
+	const { currentQuery } = useQueryBuilder();
+
+	const queryNames = getQueryNames(currentQuery);
+
+	const selectedCategory = getCategoryByOptionId(alertState.yAxisUnit || '');
+	const categorySelectOptions = getCategorySelectOptionByName(
+		selectedCategory || '',
+	);
+
+	const addThreshold = (): void => {
+		let newThreshold;
+		if (thresholdState.thresholds.length === 1) {
+			newThreshold = INITIAL_WARNING_THRESHOLD;
+		} else if (thresholdState.thresholds.length === 2) {
+			newThreshold = INITIAL_INFO_THRESHOLD;
+		} else {
+			newThreshold = INITIAL_RANDOM_THRESHOLD;
+		}
+		setThresholdState({
+			type: 'SET_THRESHOLDS',
+			payload: [...thresholdState.thresholds, newThreshold],
+		});
+	};
+
+	const removeThreshold = (id: string): void => {
+		if (thresholdState.thresholds.length > 1) {
+			setThresholdState({
+				type: 'SET_THRESHOLDS',
+				payload: thresholdState.thresholds.filter((t) => t.id !== id),
+			});
+		}
+	};
+
+	const updateThreshold: UpdateThreshold = (id, field, value) => {
+		setThresholdState({
+			type: 'SET_THRESHOLDS',
+			payload: thresholdState.thresholds.map((t) =>
+				t.id === id ? { ...t, [field]: value } : t,
+			),
+		});
+	};
+
+	return (
+		<div className="alert-threshold-container">
+			{/* Main condition sentence */}
+			<div className="alert-condition-sentences">
+				<div className="alert-condition-sentence">
+					<Typography.Text className="sentence-text">
+						Send a notification when
+					</Typography.Text>
+					<Select
+						value={thresholdState.selectedQuery}
+						onChange={(value): void => {
+							setThresholdState({
+								type: 'SET_SELECTED_QUERY',
+								payload: value,
+							});
+						}}
+						style={{ width: 80 }}
+						options={queryNames}
+					/>
+				</div>
+				<div className="alert-condition-sentence">
+					<Select
+						value={thresholdState.operator}
+						onChange={(value): void => {
+							setThresholdState({
+								type: 'SET_OPERATOR',
+								payload: value,
+							});
+						}}
+						style={{ width: 120 }}
+						options={THRESHOLD_OPERATOR_OPTIONS}
+					/>
+					<Typography.Text className="sentence-text">
+						the threshold(s)
+					</Typography.Text>
+					<Select
+						value={thresholdState.matchType}
+						onChange={(value): void => {
+							setThresholdState({
+								type: 'SET_MATCH_TYPE',
+								payload: value,
+							});
+						}}
+						style={{ width: 140 }}
+						options={THRESHOLD_MATCH_TYPE_OPTIONS}
+					/>
+					<Typography.Text className="sentence-text">
+						during the <strong>Evaluation Window.</strong>
+					</Typography.Text>
+				</div>
+			</div>
+
+			<div className="thresholds-section">
+				{thresholdState.thresholds.map((threshold, index) => (
+					<ThresholdItem
+						key={threshold.id}
+						threshold={threshold}
+						updateThreshold={updateThreshold}
+						removeThreshold={removeThreshold}
+						showRemoveButton={index !== 0 && thresholdState.thresholds.length > 1}
+						channels={channels}
+						isLoadingChannels={isLoadingChannels}
+						units={categorySelectOptions}
+					/>
+				))}
+				<Button
+					type="dashed"
+					icon={<Plus size={16} />}
+					onClick={addThreshold}
+					className="add-threshold-btn"
+				>
+					Add Threshold
+				</Button>
+			</div>
+		</div>
+	);
+}
+
+export default AlertThreshold;

frontend/src/container/CreateAlertV2/AlertCondition/AnomalyThreshold.tsx

@@ -0,0 +1,174 @@
+import { Select, Typography } from 'antd';
+import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
+import { useMemo } from 'react';
+
+import { useCreateAlertState } from '../context';
+import {
+	ANOMALY_ALGORITHM_OPTIONS,
+	ANOMALY_SEASONALITY_OPTIONS,
+	ANOMALY_THRESHOLD_MATCH_TYPE_OPTIONS,
+	ANOMALY_THRESHOLD_OPERATOR_OPTIONS,
+	ANOMALY_TIME_DURATION_OPTIONS,
+} from '../context/constants';
+import { getQueryNames } from './utils';
+
+function AnomalyThreshold(): JSX.Element {
+	const { thresholdState, setThresholdState } = useCreateAlertState();
+
+	const { currentQuery } = useQueryBuilder();
+
+	const queryNames = getQueryNames(currentQuery);
+
+	const deviationOptions = useMemo(() => {
+		const options = [];
+		for (let i = 1; i <= 7; i++) {
+			options.push({ label: i.toString(), value: i });
+		}
+		return options;
+	}, []);
+
+	const updateThreshold = (id: string, field: string, value: string): void => {
+		setThresholdState({
+			type: 'SET_THRESHOLDS',
+			payload: thresholdState.thresholds.map((t) =>
+				t.id === id ? { ...t, [field]: value } : t,
+			),
+		});
+	};
+
+	return (
+		<div className="anomaly-threshold-container">
+			<div className="alert-condition-sentences">
+				{/* Sentence 1 */}
+				<div className="alert-condition-sentence">
+					<Typography.Text data-testid="notification-text" className="sentence-text">
+						Send notification when the observed value for
+					</Typography.Text>
+					<Select
+						value={thresholdState.selectedQuery}
+						data-testid="query-select"
+						onChange={(value): void => {
+							setThresholdState({
+								type: 'SET_SELECTED_QUERY',
+								payload: value,
+							});
+						}}
+						style={{ width: 80 }}
+						options={queryNames}
+					/>
+					<Typography.Text
+						data-testid="evaluation-window-text"
+						className="sentence-text"
+					>
+						during the last
+					</Typography.Text>
+					<Select
+						value={thresholdState.evaluationWindow}
+						data-testid="evaluation-window-select"
+						onChange={(value): void => {
+							setThresholdState({
+								type: 'SET_EVALUATION_WINDOW',
+								payload: value,
+							});
+						}}
+						style={{ width: 80 }}
+						options={ANOMALY_TIME_DURATION_OPTIONS}
+					/>
+				</div>
+				{/* Sentence 2 */}
+				<div className="alert-condition-sentence">
+					<Typography.Text data-testid="threshold-text" className="sentence-text">
+						is
+					</Typography.Text>
+					<Select
+						value={thresholdState.thresholds[0].thresholdValue}
+						data-testid="threshold-value-select"
+						onChange={(value): void => {
+							updateThreshold(
+								thresholdState.thresholds[0].id,
+								'thresholdValue',
+								value.toString(),
+							);
+						}}
+						style={{ width: 80 }}
+						options={deviationOptions}
+					/>
+					<Typography.Text data-testid="deviations-text" className="sentence-text">
+						deviations
+					</Typography.Text>
+					<Select
+						value={thresholdState.operator}
+						data-testid="operator-select"
+						onChange={(value): void => {
+							setThresholdState({
+								type: 'SET_OPERATOR',
+								payload: value,
+							});
+						}}
+						style={{ width: 80 }}
+						options={ANOMALY_THRESHOLD_OPERATOR_OPTIONS}
+					/>
+					<Typography.Text
+						data-testid="predicted-data-text"
+						className="sentence-text"
+					>
+						the predicted data
+					</Typography.Text>
+					<Select
+						value={thresholdState.matchType}
+						data-testid="match-type-select"
+						onChange={(value): void => {
+							setThresholdState({
+								type: 'SET_MATCH_TYPE',
+								payload: value,
+							});
+						}}
+						style={{ width: 80 }}
+						options={ANOMALY_THRESHOLD_MATCH_TYPE_OPTIONS}
+					/>
+				</div>
+				{/* Sentence 3 */}
+				<div className="alert-condition-sentence">
+					<Typography.Text data-testid="using-the-text" className="sentence-text">
+						using the
+					</Typography.Text>
+					<Select
+						value={thresholdState.algorithm}
+						data-testid="algorithm-select"
+						onChange={(value): void => {
+							setThresholdState({
+								type: 'SET_ALGORITHM',
+								payload: value,
+							});
+						}}
+						style={{ width: 80 }}
+						options={ANOMALY_ALGORITHM_OPTIONS}
+					/>
+					<Typography.Text
+						data-testid="algorithm-with-text"
+						className="sentence-text"
+					>
+						algorithm with
+					</Typography.Text>
+					<Select
+						value={thresholdState.seasonality}
+						data-testid="seasonality-select"
+						onChange={(value): void => {
+							setThresholdState({
+								type: 'SET_SEASONALITY',
+								payload: value,
+							});
+						}}
+						style={{ width: 80 }}
+						options={ANOMALY_SEASONALITY_OPTIONS}
+					/>
+					<Typography.Text data-testid="seasonality-text" className="sentence-text">
+						seasonality
+					</Typography.Text>
+				</div>
+			</div>
+		</div>
+	);
+}
+
+export default AnomalyThreshold;

frontend/src/container/CreateAlertV2/AlertCondition/ThresholdItem.tsx

@@ -0,0 +1,135 @@
+import { Button, Input, Select, Space, Tooltip, Typography } from 'antd';
+import { ChartLine, CircleX } from 'lucide-react';
+import { useMemo, useState } from 'react';
+
+import { ThresholdItemProps } from './types';
+
+function ThresholdItem({
+	threshold,
+	updateThreshold,
+	removeThreshold,
+	showRemoveButton,
+	channels,
+	units,
+}: ThresholdItemProps): JSX.Element {
+	const [showRecoveryThreshold, setShowRecoveryThreshold] = useState(false);
+
+	const yAxisUnitSelect = useMemo(() => {
+		let component = (
+			<Select
+				placeholder="Unit"
+				value={threshold.unit ? threshold.unit : null}
+				onChange={(value): void => updateThreshold(threshold.id, 'unit', value)}
+				style={{ width: 150 }}
+				options={units}
+				disabled={units.length === 0}
+			/>
+		);
+		if (units.length === 0) {
+			component = (
+				<Tooltip
+					trigger="hover"
+					title="Please select a Y-axis unit for the query first"
+				>
+					<Select
+						placeholder="Unit"
+						value={threshold.unit ? threshold.unit : null}
+						onChange={(value): void => updateThreshold(threshold.id, 'unit', value)}
+						style={{ width: 150 }}
+						options={units}
+						disabled={units.length === 0}
+					/>
+				</Tooltip>
+			);
+		}
+		return component;
+	}, [units, threshold.unit, updateThreshold, threshold.id]);
+
+	return (
+		<div key={threshold.id} className="threshold-item">
+			<div className="threshold-row">
+				<div className="threshold-indicator">
+					<div
+						className="threshold-dot"
+						style={{ backgroundColor: threshold.color }}
+					/>
+				</div>
+				<Space className="threshold-controls">
+					<div className="threshold-inputs">
+						<Input.Group>
+							<Input
+								placeholder="Enter threshold name"
+								value={threshold.label}
+								onChange={(e): void =>
+									updateThreshold(threshold.id, 'label', e.target.value)
+								}
+								style={{ width: 260 }}
+							/>
+							<Input
+								placeholder="Enter threshold value"
+								value={threshold.thresholdValue}
+								onChange={(e): void =>
+									updateThreshold(threshold.id, 'thresholdValue', e.target.value)
+								}
+								style={{ width: 210 }}
+							/>
+							{yAxisUnitSelect}
+						</Input.Group>
+					</div>
+					<Typography.Text className="sentence-text">to</Typography.Text>
+					<Select
+						value={threshold.channels}
+						onChange={(value): void =>
+							updateThreshold(threshold.id, 'channels', value)
+						}
+						style={{ width: 260 }}
+						options={channels.map((channel) => ({
+							value: channel.id,
+							label: channel.name,
+						}))}
+						mode="multiple"
+						placeholder="Select notification channels"
+					/>
+					<Button.Group>
+						{!showRecoveryThreshold && (
+							<Button
+								type="default"
+								icon={<ChartLine size={16} />}
+								className="icon-btn"
+								onClick={(): void => setShowRecoveryThreshold(true)}
+							/>
+						)}
+						{showRemoveButton && (
+							<Button
+								type="default"
+								icon={<CircleX size={16} />}
+								onClick={(): void => removeThreshold(threshold.id)}
+								className="icon-btn"
+							/>
+						)}
+					</Button.Group>
+				</Space>
+			</div>
+			{showRecoveryThreshold && (
+				<Input.Group className="recovery-threshold-input-group">
+					<Input
+						placeholder="Recovery threshold"
+						disabled
+						style={{ width: 260 }}
+						className="recovery-threshold-label"
+					/>
+					<Input
+						placeholder="Enter recovery threshold value"
+						value={threshold.recoveryThresholdValue}
+						onChange={(e): void =>
+							updateThreshold(threshold.id, 'recoveryThresholdValue', e.target.value)
+						}
+						style={{ width: 210 }}
+					/>
+				</Input.Group>
+			)}
+		</div>
+	);
+}
+
+export default ThresholdItem;

frontend/src/container/CreateAlertV2/AlertCondition/__tests__/AlertCondition.test.tsx

@@ -0,0 +1,271 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable react/jsx-props-no-spreading */
+import { fireEvent, render, screen } from '@testing-library/react';
+import { QueryClient, QueryClientProvider } from 'react-query';
+import { MemoryRouter } from 'react-router-dom';
+
+import { CreateAlertProvider } from '../../context';
+import AlertCondition from '../AlertCondition';
+
+jest.mock('uplot', () => {
+	const paths = {
+		spline: jest.fn(),
+		bars: jest.fn(),
+	};
+	const uplotMock: any = jest.fn(() => ({
+		paths,
+	}));
+	uplotMock.paths = paths;
+	return uplotMock;
+});
+
+const STEPPER_TEST_ID = 'stepper';
+const ALERT_THRESHOLD_TEST_ID = 'alert-threshold';
+const ANOMALY_THRESHOLD_TEST_ID = 'anomaly-threshold';
+const THRESHOLD_VIEW_TEST_ID = 'threshold-view';
+const ANOMALY_VIEW_TEST_ID = 'anomaly-view';
+const ANOMALY_TAB_TEXT = 'Anomaly';
+const THRESHOLD_TAB_TEXT = 'Threshold';
+const ACTIVE_TAB_CLASS = '.active-tab';
+
+// Mock the Stepper component
+jest.mock('../../Stepper', () => ({
+	__esModule: true,
+	default: function MockStepper({
+		stepNumber,
+		label,
+	}: {
+		stepNumber: number;
+		label: string;
+	}): JSX.Element {
+		return (
+			<div data-testid={STEPPER_TEST_ID}>{`Step ${stepNumber}: ${label}`}</div>
+		);
+	},
+}));
+
+// Mock the AlertThreshold component
+jest.mock('../AlertThreshold', () => ({
+	__esModule: true,
+	default: function MockAlertThreshold(): JSX.Element {
+		return (
+			<div data-testid={ALERT_THRESHOLD_TEST_ID}>Alert Threshold Component</div>
+		);
+	},
+}));
+
+// Mock the AnomalyThreshold component
+jest.mock('../AnomalyThreshold', () => ({
+	__esModule: true,
+	default: function MockAnomalyThreshold(): JSX.Element {
+		return (
+			<div data-testid={ANOMALY_THRESHOLD_TEST_ID}>
+				Anomaly Threshold Component
+			</div>
+		);
+	},
+}));
+
+// Mock useQueryBuilder hook
+jest.mock('hooks/queryBuilder/useQueryBuilder', () => ({
+	useQueryBuilder: (): {
+		currentQuery: {
+			builder: { queryData: unknown[]; queryFormulas: unknown[] };
+			dataSource: string;
+			queryName: string;
+		};
+		redirectWithQueryBuilderData: () => void;
+	} => ({
+		currentQuery: {
+			dataSource: 'METRICS',
+			queryName: 'A',
+			builder: {
+				queryData: [{ dataSource: 'METRICS' }],
+				queryFormulas: [],
+			},
+		},
+		redirectWithQueryBuilderData: jest.fn(),
+	}),
+}));
+
+const createTestQueryClient = (): QueryClient =>
+	new QueryClient({
+		defaultOptions: {
+			queries: {
+				retry: false,
+			},
+		},
+	});
+
+const renderAlertCondition = (
+	alertType?: string,
+): ReturnType<typeof render> => {
+	const queryClient = createTestQueryClient();
+	const initialEntries = alertType ? [`/?alertType=${alertType}`] : undefined;
+	return render(
+		<MemoryRouter initialEntries={initialEntries}>
+			<QueryClientProvider client={queryClient}>
+				<CreateAlertProvider>
+					<AlertCondition />
+				</CreateAlertProvider>
+			</QueryClientProvider>
+		</MemoryRouter>,
+	);
+};
+
+describe('AlertCondition', () => {
+	it('renders the stepper with correct step number and label', () => {
+		renderAlertCondition();
+		expect(screen.getByTestId(STEPPER_TEST_ID)).toHaveTextContent(
+			'Step 2: Set alert conditions',
+		);
+	});
+
+	it('verifies default props and initial state', () => {
+		renderAlertCondition();
+
+		// Verify default alertType is METRICS_BASED_ALERT (shows AlertThreshold component)
+		expect(screen.getByTestId(ALERT_THRESHOLD_TEST_ID)).toBeInTheDocument();
+		expect(
+			screen.queryByTestId(ANOMALY_THRESHOLD_TEST_ID),
+		).not.toBeInTheDocument();
+
+		// Verify threshold tab is active by default
+		const thresholdTab = screen.getByText(THRESHOLD_TAB_TEXT);
+		expect(thresholdTab.closest(ACTIVE_TAB_CLASS)).toBeInTheDocument();
+
+		// Verify both tabs are visible (METRICS_BASED_ALERT supports multiple tabs)
+		expect(screen.getByText(THRESHOLD_TAB_TEXT)).toBeInTheDocument();
+		expect(screen.getByText(ANOMALY_TAB_TEXT)).toBeInTheDocument();
+	});
+
+	it('renders threshold tab by default', () => {
+		renderAlertCondition();
+		expect(screen.getByText(THRESHOLD_TAB_TEXT)).toBeInTheDocument();
+		expect(screen.getByTestId(THRESHOLD_VIEW_TEST_ID)).toBeInTheDocument();
+
+		// Verify default props
+		expect(screen.getByTestId(ALERT_THRESHOLD_TEST_ID)).toBeInTheDocument();
+		expect(
+			screen.queryByTestId(ANOMALY_THRESHOLD_TEST_ID),
+		).not.toBeInTheDocument();
+	});
+
+	it('renders anomaly tab when alert type supports multiple tabs', () => {
+		renderAlertCondition();
+		expect(screen.getByText(ANOMALY_TAB_TEXT)).toBeInTheDocument();
+		expect(screen.getByTestId(ANOMALY_VIEW_TEST_ID)).toBeInTheDocument();
+	});
+
+	it('shows AlertThreshold component when alert type is not anomaly based', () => {
+		renderAlertCondition();
+		expect(screen.getByTestId(ALERT_THRESHOLD_TEST_ID)).toBeInTheDocument();
+		expect(
+			screen.queryByTestId(ANOMALY_THRESHOLD_TEST_ID),
+		).not.toBeInTheDocument();
+	});
+
+	it('shows AnomalyThreshold component when alert type is anomaly based', () => {
+		renderAlertCondition();
+
+		// Click on anomaly tab to switch to anomaly-based alert
+		const anomalyTab = screen.getByText(ANOMALY_TAB_TEXT);
+		fireEvent.click(anomalyTab);
+
+		expect(screen.getByTestId(ANOMALY_THRESHOLD_TEST_ID)).toBeInTheDocument();
+		expect(screen.queryByTestId(ALERT_THRESHOLD_TEST_ID)).not.toBeInTheDocument();
+	});
+
+	it('switches between threshold and anomaly tabs', () => {
+		renderAlertCondition();
+
+		// Initially shows threshold component
+		expect(screen.getByTestId(ALERT_THRESHOLD_TEST_ID)).toBeInTheDocument();
+
+		// Click anomaly tab
+		const anomalyTab = screen.getByText(ANOMALY_TAB_TEXT);
+		fireEvent.click(anomalyTab);
+
+		// Should show anomaly component
+		expect(screen.getByTestId(ANOMALY_THRESHOLD_TEST_ID)).toBeInTheDocument();
+		expect(screen.queryByTestId(ALERT_THRESHOLD_TEST_ID)).not.toBeInTheDocument();
+
+		// Click threshold tab
+		const thresholdTab = screen.getByText(THRESHOLD_TAB_TEXT);
+		fireEvent.click(thresholdTab);
+
+		// Should show threshold component again
+		expect(screen.getByTestId(ALERT_THRESHOLD_TEST_ID)).toBeInTheDocument();
+		expect(
+			screen.queryByTestId(ANOMALY_THRESHOLD_TEST_ID),
+		).not.toBeInTheDocument();
+	});
+
+	it('applies active tab styling correctly', () => {
+		renderAlertCondition();
+
+		const thresholdTab = screen.getByText(THRESHOLD_TAB_TEXT);
+		const anomalyTab = screen.getByText(ANOMALY_TAB_TEXT);
+
+		// Threshold tab should be active by default
+		expect(thresholdTab.closest(ACTIVE_TAB_CLASS)).toBeInTheDocument();
+		expect(anomalyTab.closest(ACTIVE_TAB_CLASS)).not.toBeInTheDocument();
+
+		// Click anomaly tab
+		fireEvent.click(anomalyTab);
+
+		// Anomaly tab should be active now
+		expect(anomalyTab.closest(ACTIVE_TAB_CLASS)).toBeInTheDocument();
+		expect(thresholdTab.closest(ACTIVE_TAB_CLASS)).not.toBeInTheDocument();
+	});
+
+	it('shows multiple tabs for METRICS_BASED_ALERT', () => {
+		renderAlertCondition('METRIC_BASED_ALERT');
+
+		// Both tabs should be visible
+		expect(screen.getByText(THRESHOLD_TAB_TEXT)).toBeInTheDocument();
+		expect(screen.getByText(ANOMALY_TAB_TEXT)).toBeInTheDocument();
+		expect(screen.getByTestId(THRESHOLD_VIEW_TEST_ID)).toBeInTheDocument();
+		expect(screen.getByTestId(ANOMALY_VIEW_TEST_ID)).toBeInTheDocument();
+	});
+
+	it('shows multiple tabs for ANOMALY_BASED_ALERT', () => {
+		renderAlertCondition('ANOMALY_BASED_ALERT');
+
+		// Both tabs should be visible
+		expect(screen.getByText(THRESHOLD_TAB_TEXT)).toBeInTheDocument();
+		expect(screen.getByText(ANOMALY_TAB_TEXT)).toBeInTheDocument();
+		expect(screen.getByTestId(THRESHOLD_VIEW_TEST_ID)).toBeInTheDocument();
+		expect(screen.getByTestId(ANOMALY_VIEW_TEST_ID)).toBeInTheDocument();
+	});
+
+	it('shows only threshold tab for LOGS_BASED_ALERT', () => {
+		renderAlertCondition('LOGS_BASED_ALERT');
+
+		// Only threshold tab should be visible
+		expect(screen.getByText(THRESHOLD_TAB_TEXT)).toBeInTheDocument();
+		expect(screen.queryByText(ANOMALY_TAB_TEXT)).not.toBeInTheDocument();
+		expect(screen.getByTestId(THRESHOLD_VIEW_TEST_ID)).toBeInTheDocument();
+		expect(screen.queryByTestId(ANOMALY_VIEW_TEST_ID)).not.toBeInTheDocument();
+	});
+
+	it('shows only threshold tab for TRACES_BASED_ALERT', () => {
+		renderAlertCondition('TRACES_BASED_ALERT');
+
+		// Only threshold tab should be visible
+		expect(screen.getByText(THRESHOLD_TAB_TEXT)).toBeInTheDocument();
+		expect(screen.queryByText(ANOMALY_TAB_TEXT)).not.toBeInTheDocument();
+		expect(screen.getByTestId(THRESHOLD_VIEW_TEST_ID)).toBeInTheDocument();
+		expect(screen.queryByTestId(ANOMALY_VIEW_TEST_ID)).not.toBeInTheDocument();
+	});
+
+	it('shows only threshold tab for EXCEPTIONS_BASED_ALERT', () => {
+		renderAlertCondition('EXCEPTIONS_BASED_ALERT');
+
+		// Only threshold tab should be visible
+		expect(screen.getByText(THRESHOLD_TAB_TEXT)).toBeInTheDocument();
+		expect(screen.queryByText(ANOMALY_TAB_TEXT)).not.toBeInTheDocument();
+		expect(screen.getByTestId(THRESHOLD_VIEW_TEST_ID)).toBeInTheDocument();
+		expect(screen.queryByTestId(ANOMALY_VIEW_TEST_ID)).not.toBeInTheDocument();
+	});
+});

frontend/src/container/CreateAlertV2/AlertCondition/__tests__/AlertThreshold.test.tsx

@@ -0,0 +1,272 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable react/jsx-props-no-spreading */
+import { fireEvent, render, screen, waitFor } from '@testing-library/react';
+import { QueryClient, QueryClientProvider } from 'react-query';
+import { MemoryRouter } from 'react-router-dom';
+import { Channels } from 'types/api/channels/getAll';
+
+import { CreateAlertProvider } from '../../context';
+import AlertThreshold from '../AlertThreshold';
+
+jest.mock('uplot', () => {
+	const paths = {
+		spline: jest.fn(),
+		bars: jest.fn(),
+	};
+	const uplotMock: any = jest.fn(() => ({
+		paths,
+	}));
+	uplotMock.paths = paths;
+	return uplotMock;
+});
+
+// Mock the ThresholdItem component
+jest.mock('../ThresholdItem', () => ({
+	__esModule: true,
+	default: function MockThresholdItem({
+		threshold,
+		removeThreshold,
+		showRemoveButton,
+	}: {
+		threshold: Record<string, unknown>;
+		removeThreshold: (id: string) => void;
+		showRemoveButton: boolean;
+	}): JSX.Element {
+		return (
+			<div data-testid={`threshold-item-${threshold.id}`}>
+				<span>{threshold.label as string}</span>
+				{showRemoveButton && (
+					<button
+						type="button"
+						data-testid={`remove-threshold-${threshold.id}`}
+						onClick={(): void => removeThreshold(threshold.id as string)}
+					>
+						Remove
+					</button>
+				)}
+			</div>
+		);
+	},
+}));
+
+// Mock useQueryBuilder hook
+jest.mock('hooks/queryBuilder/useQueryBuilder', () => ({
+	useQueryBuilder: (): {
+		currentQuery: {
+			dataSource: string;
+			queryName: string;
+			builder: {
+				queryData: Array<{ queryName: string }>;
+				queryFormulas: Array<{ queryName: string }>;
+			};
+			unit: string;
+		};
+	} => ({
+		currentQuery: {
+			dataSource: 'METRICS',
+			queryName: 'A',
+			builder: {
+				queryData: [{ queryName: 'Query A' }, { queryName: 'Query B' }],
+				queryFormulas: [{ queryName: 'Formula 1' }],
+			},
+			unit: 'bytes',
+		},
+	}),
+}));
+
+// Mock getAllChannels API
+jest.mock('api/channels/getAll', () => ({
+	__esModule: true,
+	default: jest.fn(() =>
+		Promise.resolve({
+			data: [
+				{ id: '1', name: 'Email Channel' },
+				{ id: '2', name: 'Slack Channel' },
+			] as Channels[],
+		}),
+	),
+}));
+
+// Mock alert format categories
+jest.mock('container/NewWidget/RightContainer/alertFomatCategories', () => ({
+	getCategoryByOptionId: jest.fn(() => ({ name: 'bytes' })),
+	getCategorySelectOptionByName: jest.fn(() => [
+		{ label: 'Bytes', value: 'bytes' },
+		{ label: 'KB', value: 'kb' },
+	]),
+}));
+
+const TEST_STRINGS = {
+	ADD_THRESHOLD: 'Add Threshold',
+	AT_LEAST_ONCE: 'AT LEAST ONCE',
+	IS_ABOVE: 'IS ABOVE',
+} as const;
+
+const createTestQueryClient = (): QueryClient =>
+	new QueryClient({
+		defaultOptions: {
+			queries: {
+				retry: false,
+			},
+		},
+	});
+
+const renderAlertThreshold = (): ReturnType<typeof render> => {
+	const queryClient = createTestQueryClient();
+	return render(
+		<MemoryRouter>
+			<QueryClientProvider client={queryClient}>
+				<CreateAlertProvider>
+					<AlertThreshold />
+				</CreateAlertProvider>
+			</QueryClientProvider>
+		</MemoryRouter>,
+	);
+};
+
+const verifySelectRenders = (title: string): void => {
+	const select = screen.getByTitle(title);
+	expect(select).toBeInTheDocument();
+};
+
+describe('AlertThreshold', () => {
+	beforeEach(() => {
+		jest.clearAllMocks();
+	});
+
+	it('renders the main condition sentence', () => {
+		renderAlertThreshold();
+		expect(screen.getByText('Send a notification when')).toBeInTheDocument();
+		expect(screen.getByText('the threshold(s)')).toBeInTheDocument();
+		expect(screen.getByText('during the')).toBeInTheDocument();
+		expect(screen.getByText('Evaluation Window.')).toBeInTheDocument();
+	});
+
+	it('renders query selection dropdown', async () => {
+		renderAlertThreshold();
+
+		await waitFor(() => {
+			const querySelect = screen.getByTitle('A');
+			expect(querySelect).toBeInTheDocument();
+		});
+	});
+
+	it('renders operator selection dropdown', () => {
+		renderAlertThreshold();
+		verifySelectRenders(TEST_STRINGS.IS_ABOVE);
+	});
+
+	it('renders match type selection dropdown', () => {
+		renderAlertThreshold();
+		verifySelectRenders(TEST_STRINGS.AT_LEAST_ONCE);
+	});
+
+	it('renders threshold items', () => {
+		renderAlertThreshold();
+		expect(screen.getByTestId(/threshold-item-/)).toBeInTheDocument();
+	});
+
+	it('renders add threshold button', () => {
+		renderAlertThreshold();
+		expect(screen.getByText(TEST_STRINGS.ADD_THRESHOLD)).toBeInTheDocument();
+	});
+
+	it('adds a new threshold when add button is clicked', () => {
+		renderAlertThreshold();
+
+		const addButton = screen.getByText(TEST_STRINGS.ADD_THRESHOLD);
+		fireEvent.click(addButton);
+
+		// Should now have multiple threshold items
+		const thresholdItems = screen.getAllByTestId(/threshold-item-/);
+		expect(thresholdItems).toHaveLength(2);
+	});
+
+	it('adds correct threshold types based on count', () => {
+		renderAlertThreshold();
+
+		const addButton = screen.getByText(TEST_STRINGS.ADD_THRESHOLD);
+
+		// First addition should add WARNING threshold
+		fireEvent.click(addButton);
+		expect(screen.getByText('WARNING')).toBeInTheDocument();
+
+		// Second addition should add INFO threshold
+		fireEvent.click(addButton);
+		expect(screen.getByText('INFO')).toBeInTheDocument();
+
+		// Third addition should add random threshold
+		fireEvent.click(addButton);
+		expect(screen.getAllByTestId(/threshold-item-/)).toHaveLength(4);
+	});
+
+	it('updates operator when operator dropdown changes', () => {
+		renderAlertThreshold();
+		verifySelectRenders(TEST_STRINGS.IS_ABOVE);
+	});
+
+	it('updates match type when match type dropdown changes', () => {
+		renderAlertThreshold();
+		verifySelectRenders(TEST_STRINGS.AT_LEAST_ONCE);
+	});
+
+	it('shows remove button for non-first thresholds', () => {
+		renderAlertThreshold();
+
+		// Add a threshold
+		const addButton = screen.getByText(TEST_STRINGS.ADD_THRESHOLD);
+		fireEvent.click(addButton);
+
+		// Second threshold should have remove button
+		expect(screen.getByTestId(/remove-threshold-/)).toBeInTheDocument();
+	});
+
+	it('does not show remove button for first threshold', () => {
+		renderAlertThreshold();
+
+		// First threshold should not have remove button
+		expect(screen.queryByTestId(/remove-threshold-/)).not.toBeInTheDocument();
+	});
+
+	it('removes threshold when remove button is clicked', () => {
+		renderAlertThreshold();
+
+		// Add a threshold first
+		const addButton = screen.getByText(TEST_STRINGS.ADD_THRESHOLD);
+		fireEvent.click(addButton);
+
+		// Get the remove button and click it
+		const removeButton = screen.getByTestId(/remove-threshold-/);
+		fireEvent.click(removeButton);
+
+		// Should be back to one threshold
+		expect(screen.getAllByTestId(/threshold-item-/)).toHaveLength(1);
+	});
+
+	it('does not remove threshold if only one remains', () => {
+		renderAlertThreshold();
+
+		// Should only have one threshold initially
+		expect(screen.getAllByTestId(/threshold-item-/)).toHaveLength(1);
+
+		// Try to remove (should not work)
+		const thresholdItems = screen.getAllByTestId(/threshold-item-/);
+		expect(thresholdItems).toHaveLength(1);
+	});
+
+	it('handles loading state for channels', () => {
+		renderAlertThreshold();
+
+		// Component should render even while channels are loading
+		expect(screen.getByText('Send a notification when')).toBeInTheDocument();
+	});
+
+	it('renders with correct initial state', () => {
+		renderAlertThreshold();
+
+		// Should have initial critical threshold
+		expect(screen.getByText('CRITICAL')).toBeInTheDocument();
+		verifySelectRenders(TEST_STRINGS.IS_ABOVE);
+		verifySelectRenders(TEST_STRINGS.AT_LEAST_ONCE);
+	});
+});

frontend/src/container/CreateAlertV2/AlertCondition/__tests__/AnomalyThreshold.test.tsx

@@ -0,0 +1,89 @@
+/* eslint-disable react/jsx-props-no-spreading */
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import { render, screen } from '@testing-library/react';
+import {
+	INITIAL_ALERT_STATE,
+	INITIAL_ALERT_THRESHOLD_STATE,
+} from 'container/CreateAlertV2/context/constants';
+
+import * as context from '../../context';
+import AnomalyThreshold from '../AnomalyThreshold';
+
+jest.mock('uplot', () => {
+	const paths = {
+		spline: jest.fn(),
+		bars: jest.fn(),
+	};
+	const uplotMock: any = jest.fn(() => ({
+		paths,
+	}));
+	uplotMock.paths = paths;
+	return uplotMock;
+});
+
+const mockSetAlertState = jest.fn();
+const mockSetThresholdState = jest.fn();
+jest.spyOn(context, 'useCreateAlertState').mockReturnValue({
+	alertState: INITIAL_ALERT_STATE,
+	setAlertState: mockSetAlertState,
+	thresholdState: INITIAL_ALERT_THRESHOLD_STATE,
+	setThresholdState: mockSetThresholdState,
+} as any);
+
+// Mock useQueryBuilder hook
+jest.mock('hooks/queryBuilder/useQueryBuilder', () => ({
+	useQueryBuilder: (): {
+		currentQuery: {
+			dataSource: string;
+			queryName: string;
+			builder: {
+				queryData: Array<{ queryName: string }>;
+				queryFormulas: Array<{ queryName: string }>;
+			};
+		};
+	} => ({
+		currentQuery: {
+			dataSource: 'METRICS',
+			queryName: 'A',
+			builder: {
+				queryData: [{ queryName: 'Query A' }, { queryName: 'Query B' }],
+				queryFormulas: [{ queryName: 'Formula 1' }],
+			},
+		},
+	}),
+}));
+
+const renderAnomalyThreshold = (): ReturnType<typeof render> =>
+	render(<AnomalyThreshold />);
+
+describe('AnomalyThreshold', () => {
+	beforeEach(() => {
+		jest.clearAllMocks();
+	});
+
+	it('renders the first condition sentence', () => {
+		renderAnomalyThreshold();
+		expect(screen.getByTestId('notification-text')).toBeInTheDocument();
+		expect(screen.getByTestId('evaluation-window-text')).toBeInTheDocument();
+		expect(screen.getByTestId('evaluation-window-select')).toBeInTheDocument();
+	});
+
+	it('renders the second condition sentence', () => {
+		renderAnomalyThreshold();
+		expect(screen.getByTestId('threshold-text')).toBeInTheDocument();
+		expect(screen.getByTestId('threshold-value-select')).toBeInTheDocument();
+		expect(screen.getByTestId('deviations-text')).toBeInTheDocument();
+		expect(screen.getByTestId('operator-select')).toBeInTheDocument();
+		expect(screen.getByTestId('predicted-data-text')).toBeInTheDocument();
+		expect(screen.getByTestId('match-type-select')).toBeInTheDocument();
+	});
+
+	it('renders the third condition sentence', () => {
+		renderAnomalyThreshold();
+		expect(screen.getByTestId('using-the-text')).toBeInTheDocument();
+		expect(screen.getByTestId('algorithm-select')).toBeInTheDocument();
+		expect(screen.getByTestId('algorithm-with-text')).toBeInTheDocument();
+		expect(screen.getByTestId('seasonality-select')).toBeInTheDocument();
+		expect(screen.getByTestId('seasonality-text')).toBeInTheDocument();
+	});
+});

frontend/src/container/CreateAlertV2/AlertCondition/__tests__/ThresholdItem.test.tsx

@@ -0,0 +1,398 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable react/jsx-props-no-spreading */
+import { fireEvent, render, screen } from '@testing-library/react';
+import { DefaultOptionType } from 'antd/es/select';
+import { Channels } from 'types/api/channels/getAll';
+
+import ThresholdItem from '../ThresholdItem';
+import { ThresholdItemProps } from '../types';
+
+// Mock the enableRecoveryThreshold utility
+jest.mock('../../utils', () => ({
+	enableRecoveryThreshold: jest.fn(() => true),
+}));
+
+const TEST_CONSTANTS = {
+	THRESHOLD_ID: 'test-threshold-1',
+	CRITICAL_LABEL: 'CRITICAL',
+	WARNING_LABEL: 'WARNING',
+	INFO_LABEL: 'INFO',
+	CHANNEL_1: 'channel-1',
+	CHANNEL_2: 'channel-2',
+	CHANNEL_3: 'channel-3',
+	EMAIL_CHANNEL_NAME: 'Email Channel',
+	ENTER_THRESHOLD_NAME: 'Enter threshold name',
+	ENTER_THRESHOLD_VALUE: 'Enter threshold value',
+	ENTER_RECOVERY_THRESHOLD_VALUE: 'Enter recovery threshold value',
+} as const;
+
+const mockThreshold = {
+	id: TEST_CONSTANTS.THRESHOLD_ID,
+	label: TEST_CONSTANTS.CRITICAL_LABEL,
+	thresholdValue: 100,
+	recoveryThresholdValue: 80,
+	unit: 'bytes',
+	channels: [TEST_CONSTANTS.CHANNEL_1],
+	color: '#ff0000',
+};
+
+const mockChannels: Channels[] = [
+	{
+		id: TEST_CONSTANTS.CHANNEL_1,
+		name: TEST_CONSTANTS.EMAIL_CHANNEL_NAME,
+	} as any,
+	{ id: TEST_CONSTANTS.CHANNEL_2, name: 'Slack Channel' } as any,
+	{ id: TEST_CONSTANTS.CHANNEL_3, name: 'PagerDuty Channel' } as any,
+];
+
+const mockUnits: DefaultOptionType[] = [
+	{ label: 'Bytes', value: 'bytes' },
+	{ label: 'KB', value: 'kb' },
+	{ label: 'MB', value: 'mb' },
+];
+
+const defaultProps: ThresholdItemProps = {
+	threshold: mockThreshold,
+	updateThreshold: jest.fn(),
+	removeThreshold: jest.fn(),
+	showRemoveButton: false,
+	channels: mockChannels,
+	isLoadingChannels: false,
+	units: mockUnits,
+};
+
+const renderThresholdItem = (
+	props: Partial<ThresholdItemProps> = {},
+): ReturnType<typeof render> => {
+	const mergedProps = { ...defaultProps, ...props };
+	return render(<ThresholdItem {...mergedProps} />);
+};
+
+const verifySelectorWidth = (
+	selectorIndex: number,
+	expectedWidth: string,
+): void => {
+	const selectors = screen.getAllByRole('combobox');
+	const selector = selectors[selectorIndex];
+	expect(selector.closest('.ant-select')).toHaveStyle(`width: ${expectedWidth}`);
+};
+
+const showRecoveryThreshold = (): void => {
+	const recoveryButton = screen.getByRole('button', { name: '' });
+	fireEvent.click(recoveryButton);
+};
+
+const verifyComponentRendersWithLoading = (): void => {
+	expect(
+		screen.getByPlaceholderText(TEST_CONSTANTS.ENTER_THRESHOLD_NAME),
+	).toBeInTheDocument();
+};
+
+const verifyUnitSelectorDisabled = (): void => {
+	const unitSelectors = screen.getAllByRole('combobox');
+	const unitSelector = unitSelectors[0]; // First combobox is the unit selector
+	expect(unitSelector).toBeDisabled();
+};
+
+describe('ThresholdItem', () => {
+	beforeEach(() => {
+		jest.clearAllMocks();
+	});
+
+	it('renders threshold indicator with correct color', () => {
+		renderThresholdItem();
+
+		// Find the threshold dot by its class
+		const thresholdDot = document.querySelector('.threshold-dot');
+		expect(thresholdDot).toHaveStyle('background-color: #ff0000');
+	});
+
+	it('renders threshold label input with correct value', () => {
+		renderThresholdItem();
+
+		const labelInput = screen.getByPlaceholderText(
+			TEST_CONSTANTS.ENTER_THRESHOLD_NAME,
+		);
+		expect(labelInput).toHaveValue(TEST_CONSTANTS.CRITICAL_LABEL);
+	});
+
+	it('renders threshold value input with correct value', () => {
+		renderThresholdItem();
+
+		const valueInput = screen.getByPlaceholderText(
+			TEST_CONSTANTS.ENTER_THRESHOLD_VALUE,
+		);
+		expect(valueInput).toHaveValue('100');
+	});
+
+	it('renders unit selector with correct value', () => {
+		renderThresholdItem();
+
+		// Check for the unit selector by looking for the displayed text
+		expect(screen.getByText('Bytes')).toBeInTheDocument();
+	});
+
+	it('renders channels selector with correct value', () => {
+		renderThresholdItem();
+
+		// Check for the channels selector by looking for the displayed text
+		expect(
+			screen.getByText(TEST_CONSTANTS.EMAIL_CHANNEL_NAME),
+		).toBeInTheDocument();
+	});
+
+	it('updates threshold label when label input changes', () => {
+		const updateThreshold = jest.fn();
+		renderThresholdItem({ updateThreshold });
+
+		const labelInput = screen.getByPlaceholderText(
+			TEST_CONSTANTS.ENTER_THRESHOLD_NAME,
+		);
+		fireEvent.change(labelInput, {
+			target: { value: TEST_CONSTANTS.WARNING_LABEL },
+		});
+
+		expect(updateThreshold).toHaveBeenCalledWith(
+			TEST_CONSTANTS.THRESHOLD_ID,
+			'label',
+			TEST_CONSTANTS.WARNING_LABEL,
+		);
+	});
+
+	it('updates threshold value when value input changes', () => {
+		const updateThreshold = jest.fn();
+		renderThresholdItem({ updateThreshold });
+
+		const valueInput = screen.getByPlaceholderText(
+			TEST_CONSTANTS.ENTER_THRESHOLD_VALUE,
+		);
+		fireEvent.change(valueInput, { target: { value: '200' } });
+
+		expect(updateThreshold).toHaveBeenCalledWith(
+			TEST_CONSTANTS.THRESHOLD_ID,
+			'thresholdValue',
+			'200',
+		);
+	});
+
+	it('updates threshold unit when unit selector changes', () => {
+		const updateThreshold = jest.fn();
+		renderThresholdItem({ updateThreshold });
+
+		// Find the unit selector by its role and simulate change
+		const unitSelectors = screen.getAllByRole('combobox');
+		const unitSelector = unitSelectors[0]; // First combobox is the unit selector
+
+		// Simulate clicking to open the dropdown and selecting a value
+		fireEvent.click(unitSelector);
+
+		// The actual change event might not work the same way with Ant Design Select
+		// So we'll just verify the selector is present and can be interacted with
+		expect(unitSelector).toBeInTheDocument();
+	});
+
+	it('updates threshold channels when channels selector changes', () => {
+		const updateThreshold = jest.fn();
+		renderThresholdItem({ updateThreshold });
+
+		// Find the channels selector by its role and simulate change
+		const channelSelectors = screen.getAllByRole('combobox');
+		const channelSelector = channelSelectors[1]; // Second combobox is the channels selector
+
+		// Simulate clicking to open the dropdown
+		fireEvent.click(channelSelector);
+
+		// The actual change event might not work the same way with Ant Design Select
+		// So we'll just verify the selector is present and can be interacted with
+		expect(channelSelector).toBeInTheDocument();
+	});
+
+	it('shows remove button when showRemoveButton is true', () => {
+		renderThresholdItem({ showRemoveButton: true });
+
+		// The remove button is the second button (with circle-x icon)
+		const buttons = screen.getAllByRole('button');
+		expect(buttons).toHaveLength(2); // Recovery button + remove button
+	});
+
+	it('does not show remove button when showRemoveButton is false', () => {
+		renderThresholdItem({ showRemoveButton: false });
+
+		// Only the recovery button should be present
+		const buttons = screen.getAllByRole('button');
+		expect(buttons).toHaveLength(1); // Only recovery button
+	});
+
+	it('calls removeThreshold when remove button is clicked', () => {
+		const removeThreshold = jest.fn();
+		renderThresholdItem({ showRemoveButton: true, removeThreshold });
+
+		// The remove button is the second button (with circle-x icon)
+		const buttons = screen.getAllByRole('button');
+		const removeButton = buttons[1]; // Second button is the remove button
+		fireEvent.click(removeButton);
+
+		expect(removeThreshold).toHaveBeenCalledWith(TEST_CONSTANTS.THRESHOLD_ID);
+	});
+
+	it('shows recovery threshold button when recovery threshold is enabled', () => {
+		renderThresholdItem();
+
+		// The recovery button is the first button (with chart-line icon)
+		const buttons = screen.getAllByRole('button');
+		expect(buttons).toHaveLength(1); // Recovery button
+	});
+
+	it('shows recovery threshold inputs when recovery button is clicked', () => {
+		renderThresholdItem();
+
+		// The recovery button is the first button (with chart-line icon)
+		const buttons = screen.getAllByRole('button');
+		const recoveryButton = buttons[0]; // First button is the recovery button
+		fireEvent.click(recoveryButton);
+
+		expect(screen.getByPlaceholderText('Recovery threshold')).toBeInTheDocument();
+		expect(
+			screen.getByPlaceholderText(TEST_CONSTANTS.ENTER_RECOVERY_THRESHOLD_VALUE),
+		).toBeInTheDocument();
+	});
+
+	it('updates recovery threshold value when input changes', () => {
+		const updateThreshold = jest.fn();
+		renderThresholdItem({ updateThreshold });
+
+		// Show recovery threshold first
+		const buttons = screen.getAllByRole('button');
+		const recoveryButton = buttons[0]; // First button is the recovery button
+		fireEvent.click(recoveryButton);
+
+		const recoveryValueInput = screen.getByPlaceholderText(
+			TEST_CONSTANTS.ENTER_RECOVERY_THRESHOLD_VALUE,
+		);
+		fireEvent.change(recoveryValueInput, { target: { value: '90' } });
+
+		expect(updateThreshold).toHaveBeenCalledWith(
+			TEST_CONSTANTS.THRESHOLD_ID,
+			'recoveryThresholdValue',
+			'90',
+		);
+	});
+
+	it('disables unit selector when no units are available', () => {
+		renderThresholdItem({ units: [] });
+		verifyUnitSelectorDisabled();
+	});
+
+	it('shows tooltip when no units are available', () => {
+		renderThresholdItem({ units: [] });
+
+		// The tooltip should be present when hovering over disabled unit selector
+		verifyUnitSelectorDisabled();
+	});
+
+	it('renders channels as multiple select options', () => {
+		renderThresholdItem();
+
+		// Check that channels are rendered as multiple select
+		expect(
+			screen.getByText(TEST_CONSTANTS.EMAIL_CHANNEL_NAME),
+		).toBeInTheDocument();
+
+		// Should be able to select multiple channels
+		const channelSelectors = screen.getAllByRole('combobox');
+		const channelSelector = channelSelectors[1]; // Second combobox is the channels selector
+		fireEvent.change(channelSelector, {
+			target: { value: [TEST_CONSTANTS.CHANNEL_1, TEST_CONSTANTS.CHANNEL_2] },
+		});
+	});
+
+	it('handles empty threshold values correctly', () => {
+		const emptyThreshold = {
+			...mockThreshold,
+			label: '',
+			thresholdValue: 0,
+			unit: '',
+			channels: [],
+		};
+
+		renderThresholdItem({ threshold: emptyThreshold });
+
+		expect(screen.getByPlaceholderText('Enter threshold name')).toHaveValue('');
+		expect(screen.getByPlaceholderText('Enter threshold value')).toHaveValue('0');
+	});
+
+	it('renders with correct input widths', () => {
+		renderThresholdItem();
+
+		const labelInput = screen.getByPlaceholderText(
+			TEST_CONSTANTS.ENTER_THRESHOLD_NAME,
+		);
+		const valueInput = screen.getByPlaceholderText(
+			TEST_CONSTANTS.ENTER_THRESHOLD_VALUE,
+		);
+
+		expect(labelInput).toHaveStyle('width: 260px');
+		expect(valueInput).toHaveStyle('width: 210px');
+	});
+
+	it('renders channels selector with correct width', () => {
+		renderThresholdItem();
+		verifySelectorWidth(1, '260px');
+	});
+
+	it('renders unit selector with correct width', () => {
+		renderThresholdItem();
+		verifySelectorWidth(0, '150px');
+	});
+
+	it('handles loading channels state', () => {
+		renderThresholdItem({ isLoadingChannels: true });
+		verifyComponentRendersWithLoading();
+	});
+
+	it('renders recovery threshold with correct initial value', () => {
+		renderThresholdItem();
+		showRecoveryThreshold();
+
+		const recoveryValueInput = screen.getByPlaceholderText(
+			TEST_CONSTANTS.ENTER_RECOVERY_THRESHOLD_VALUE,
+		);
+		expect(recoveryValueInput).toHaveValue('80');
+	});
+
+	it('renders recovery threshold label as disabled', () => {
+		renderThresholdItem();
+		showRecoveryThreshold();
+
+		const recoveryLabelInput = screen.getByPlaceholderText('Recovery threshold');
+		expect(recoveryLabelInput).toBeDisabled();
+	});
+
+	it('renders correct channel options', () => {
+		renderThresholdItem();
+
+		// Check that channels are rendered
+		expect(
+			screen.getByText(TEST_CONSTANTS.EMAIL_CHANNEL_NAME),
+		).toBeInTheDocument();
+
+		// Should be able to select different channels
+		const channelSelectors = screen.getAllByRole('combobox');
+		const channelSelector = channelSelectors[1]; // Second combobox is the channels selector
+		fireEvent.change(channelSelector, { target: { value: 'channel-2' } });
+		expect(screen.getByText('Slack Channel')).toBeInTheDocument();
+	});
+
+	it('handles threshold without channels', () => {
+		const thresholdWithoutChannels = {
+			...mockThreshold,
+			channels: [],
+		};
+
+		renderThresholdItem({ threshold: thresholdWithoutChannels });
+
+		// Should render channels selector without selected values
+		const channelSelectors = screen.getAllByRole('combobox');
+		expect(channelSelectors).toHaveLength(2); // Should have both unit and channel selectors
+	});
+});

frontend/src/container/CreateAlertV2/AlertCondition/constants.ts

@@ -0,0 +1,5 @@
+export const THRESHOLD_TAB_TOOLTIP =
+	'An alert is triggered when the metric crosses a threshold.';
+
+export const ANOMALY_TAB_TOOLTIP =
+	'An alert is triggered whenever the metric deviates from an expected pattern.';

frontend/src/container/CreateAlertV2/AlertCondition/index.tsx

@@ -0,0 +1,3 @@
+import AlertCondition from './AlertCondition';
+
+export default AlertCondition;

frontend/src/container/CreateAlertV2/AlertCondition/styles.scss

@@ -0,0 +1,277 @@
+.alert-condition-container {
+	margin: 0 16px;
+	margin-top: 24px;
+
+	.alert-condition {
+		display: flex;
+		align-items: center;
+		margin-left: 12px;
+		margin-top: 24px;
+
+		.alert-condition-tabs {
+			display: flex;
+			border-radius: 2px;
+			border: 1px solid var(--bg-slate-400);
+			background: var(--bg-ink-300);
+			flex-direction: row;
+			border-bottom: none;
+			margin-bottom: -1px;
+
+			.explorer-view-option {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				flex-direction: row;
+				border: none;
+				padding: 9px;
+				box-shadow: none;
+				border-radius: 0px;
+				border-left: 0.5px solid var(--bg-slate-400);
+				border-bottom: 0.5px solid var(--bg-slate-400);
+				width: 120px;
+				height: 36px;
+
+				gap: 8px;
+
+				&.active-tab {
+					background-color: var(--bg-ink-500);
+					border-bottom: none;
+
+					&:hover {
+						background-color: var(--bg-ink-500) !important;
+					}
+				}
+
+				&:disabled {
+					background-color: var(--bg-ink-300);
+					opacity: 0.6;
+				}
+
+				&:first-child {
+					border-left: 1px solid transparent;
+				}
+
+				&:hover {
+					background-color: transparent !important;
+					border-left: 1px solid transparent !important;
+					color: var(--bg-vanilla-100);
+				}
+			}
+		}
+	}
+}
+
+.alert-threshold-container,
+.anomaly-threshold-container {
+	padding: 24px;
+	padding-right: 72px;
+	background-color: var(--bg-ink-500);
+	border: 1px solid var(--bg-slate-400);
+	width: fit-content;
+
+	.alert-condition-sentences {
+		display: flex;
+		flex-direction: column;
+		gap: 12px;
+
+		.alert-condition-sentence {
+			display: flex;
+			align-items: center;
+			gap: 16px;
+			flex-wrap: wrap;
+
+			.sentence-text {
+				color: var(--text-vanilla-400);
+				font-size: 14px;
+				line-height: 1.5;
+			}
+
+			.ant-select {
+				width: 240px !important;
+
+				.ant-select-selector {
+					background-color: var(--bg-ink-300);
+					border: 1px solid var(--bg-slate-400);
+					color: var(--text-vanilla-400);
+					font-family: 'Space Mono';
+
+					&:hover {
+						border-color: var(--bg-vanilla-300);
+					}
+
+					&:focus {
+						border-color: var(--bg-vanilla-300);
+						box-shadow: 0 0 0 2px rgba(255, 255, 255, 0.1);
+					}
+				}
+
+				.ant-select-selection-item {
+					color: var(--bg-vanilla-100);
+				}
+
+				.ant-select-arrow {
+					color: var(--bg-vanilla-400);
+				}
+			}
+		}
+	}
+
+	.thresholds-section {
+		margin-top: 16px;
+		margin-left: 24px;
+
+		.threshold-item {
+			display: flex;
+			flex-direction: column;
+			gap: 0;
+			margin-bottom: 16px;
+
+			.threshold-row {
+				display: flex;
+				align-items: center;
+				gap: 16px;
+				margin-bottom: 2px;
+
+				.threshold-indicator {
+					.threshold-dot {
+						width: 12px;
+						height: 12px;
+						border-radius: 50%;
+						flex-shrink: 0;
+					}
+				}
+
+				.threshold-controls {
+					display: flex;
+					align-items: center;
+					gap: 8px;
+
+					.ant-input {
+						background-color: var(--bg-ink-400);
+						border: 1px solid var(--bg-slate-400);
+						color: var(--bg-vanilla-100);
+						height: 32px;
+
+						&::placeholder {
+							font-family: 'Space Mono';
+						}
+
+						&:hover {
+							border-color: var(--bg-vanilla-300);
+						}
+
+						&:focus {
+							border-color: var(--bg-vanilla-300);
+							box-shadow: 0 0 0 2px rgba(255, 255, 255, 0.1);
+						}
+					}
+
+					.ant-select {
+						.ant-select-selector {
+							background-color: var(--bg-ink-400);
+							border: 1px solid var(--bg-slate-400);
+							color: var(--bg-vanilla-100);
+							height: 32px;
+
+							&:hover {
+								border-color: var(--bg-vanilla-300);
+							}
+
+							&:focus {
+								border-color: var(--bg-vanilla-300);
+								box-shadow: 0 0 0 2px rgba(255, 255, 255, 0.1);
+							}
+
+							.ant-select-selection-placeholder {
+								font-family: 'Space Mono';
+							}
+						}
+
+						.ant-select-selection-item {
+							color: var(--bg-vanilla-100);
+						}
+
+						.ant-select-arrow {
+							color: var(--bg-vanilla-400);
+						}
+					}
+
+					.icon-btn {
+						color: var(--bg-vanilla-400);
+						border: 1px solid var(--bg-slate-400);
+						border-radius: 4px;
+						display: flex;
+						align-items: center;
+						justify-content: center;
+					}
+				}
+			}
+
+			.recovery-threshold-input-group {
+				display: flex;
+				align-items: center;
+				gap: 0;
+				margin-left: 28px;
+
+				.recovery-threshold-label {
+					pointer-events: none;
+					cursor: default;
+				}
+
+				.recovery-threshold-btn {
+					pointer-events: none;
+					cursor: default;
+					color: var(--bg-vanilla-400);
+					background-color: var(--bg-ink-400) !important;
+					border: 1px solid var(--bg-slate-400);
+					border-radius: 4px;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+				}
+
+				.ant-input {
+					background-color: var(--bg-ink-400);
+					border: 1px solid var(--bg-slate-400);
+					color: var(--bg-vanilla-100);
+					height: 32px;
+
+					&::placeholder {
+						font-family: 'Space Mono';
+					}
+
+					&:hover {
+						border-color: var(--bg-vanilla-300);
+					}
+
+					&:focus {
+						border-color: var(--bg-vanilla-300);
+						box-shadow: 0 0 0 2px rgba(255, 255, 255, 0.1);
+					}
+				}
+			}
+		}
+
+		.add-threshold-btn {
+			margin-top: 8px;
+			border: 1px dashed var(--bg-slate-400);
+			color: var(--bg-vanilla-300);
+			background-color: transparent;
+			border-radius: 4px;
+			height: 32px;
+			padding: 0 16px;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+
+			&:hover {
+				border-color: var(--bg-vanilla-300);
+				color: var(--bg-vanilla-100);
+			}
+
+			.anticon {
+				margin-right: 8px;
+			}
+		}
+	}
+}

frontend/src/container/CreateAlertV2/AlertCondition/types.ts

@@ -0,0 +1,23 @@
+import { DefaultOptionType } from 'antd/es/select';
+import { Channels } from 'types/api/channels/getAll';
+
+import { Threshold } from '../context/types';
+
+export type UpdateThreshold = {
+	(thresholdId: string, field: 'channels', value: string[]): void;
+	(
+		thresholdId: string,
+		field: Exclude<keyof Threshold, 'channels'>,
+		value: string,
+	): void;
+};
+
+export interface ThresholdItemProps {
+	threshold: Threshold;
+	updateThreshold: UpdateThreshold;
+	removeThreshold: (thresholdId: string) => void;
+	showRemoveButton: boolean;
+	channels: Channels[];
+	isLoadingChannels: boolean;
+	units: DefaultOptionType[];
+}

frontend/src/container/CreateAlertV2/AlertCondition/utils.tsx

@@ -0,0 +1,46 @@
+import { BaseOptionType, DefaultOptionType, SelectProps } from 'antd/es/select';
+import { getInvolvedQueriesInTraceOperator } from 'components/QueryBuilderV2/QueryV2/TraceOperator/utils/utils';
+import { Y_AXIS_CATEGORIES } from 'components/YAxisUnitSelector/constants';
+import { getSelectedQueryOptions } from 'container/FormAlertRules/utils';
+import { Query } from 'types/api/queryBuilder/queryBuilderData';
+import { EQueryType } from 'types/common/dashboard';
+
+export function getQueryNames(currentQuery: Query): BaseOptionType[] {
+	const involvedQueriesInTraceOperator = getInvolvedQueriesInTraceOperator(
+		currentQuery.builder.queryTraceOperator,
+	);
+	const queryConfig: Record<EQueryType, () => SelectProps['options']> = {
+		[EQueryType.QUERY_BUILDER]: () => [
+			...(getSelectedQueryOptions(currentQuery.builder.queryData)?.filter(
+				(option) =>
+					!involvedQueriesInTraceOperator.includes(option.value as string),
+			) || []),
+			...(getSelectedQueryOptions(currentQuery.builder.queryFormulas) || []),
+			...(getSelectedQueryOptions(currentQuery.builder.queryTraceOperator) || []),
+		],
+		[EQueryType.PROM]: () => getSelectedQueryOptions(currentQuery.promql),
+		[EQueryType.CLICKHOUSE]: () =>
+			getSelectedQueryOptions(currentQuery.clickhouse_sql),
+	};
+
+	return queryConfig[currentQuery.queryType]?.() || [];
+}
+
+export function getCategoryByOptionId(id: string): string | undefined {
+	return Y_AXIS_CATEGORIES.find((category) =>
+		category.units.some((unit) => unit.id === id),
+	)?.name;
+}
+
+export function getCategorySelectOptionByName(
+	name: string,
+): DefaultOptionType[] {
+	return (
+		Y_AXIS_CATEGORIES.find((category) => category.name === name)?.units.map(
+			(unit) => ({
+				label: unit.name,
+				value: unit.id,
+			}),
+		) || []
+	);
+}

frontend/src/container/CreateAlertV2/CreateAlertHeader/CreateAlertHeader.tsx

@@ -0,0 +1,73 @@
+import './styles.scss';
+
+import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
+import { useCallback, useMemo } from 'react';
+import { Labels } from 'types/api/alerts/def';
+
+import { useCreateAlertState } from '../context';
+import LabelsInput from './LabelsInput';
+
+function CreateAlertHeader(): JSX.Element {
+	const { alertState, setAlertState } = useCreateAlertState();
+
+	const { currentQuery } = useQueryBuilder();
+
+	const groupByLabels = useMemo(() => {
+		const labels = new Array<string>();
+		currentQuery.builder.queryData.forEach((query) => {
+			query.groupBy.forEach((groupBy) => {
+				labels.push(groupBy.key);
+			});
+		});
+		return labels;
+	}, [currentQuery]);
+
+	// If the label key is a group by label, then it is not allowed to be used as a label key
+	const validateLabelsKey = useCallback(
+		(key: string): string | null => {
+			if (groupByLabels.includes(key)) {
+				return `Cannot use ${key} as a key`;
+			}
+			return null;
+		},
+		[groupByLabels],
+	);
+
+	return (
+		<div className="alert-header">
+			<div className="alert-header__tab-bar">
+				<div className="alert-header__tab">New Alert Rule</div>
+			</div>
+
+			<div className="alert-header__content">
+				<input
+					type="text"
+					value={alertState.name}
+					onChange={(e): void =>
+						setAlertState({ type: 'SET_ALERT_NAME', payload: e.target.value })
+					}
+					className="alert-header__input title"
+					placeholder="Enter alert rule name"
+				/>
+				<input
+					type="text"
+					value={alertState.description}
+					onChange={(e): void =>
+						setAlertState({ type: 'SET_ALERT_DESCRIPTION', payload: e.target.value })
+					}
+					className="alert-header__input description"
+					placeholder="Click to add description..."
+				/>
+				<LabelsInput
+					labels={alertState.labels}
+					onLabelsChange={(labels: Labels): void =>
+						setAlertState({ type: 'SET_ALERT_LABELS', payload: labels })
+					}
+					validateLabelsKey={validateLabelsKey}
+				/>
+			</div>
+		</div>
+	);
+}
+
+export default CreateAlertHeader;

frontend/src/container/CreateAlertV2/CreateAlertHeader/LabelsInput.tsx

@@ -0,0 +1,168 @@
+import { CloseOutlined } from '@ant-design/icons';
+import { useNotifications } from 'hooks/useNotifications';
+import React, { useCallback, useState } from 'react';
+
+import { LabelInputState, LabelsInputProps } from './types';
+
+function LabelsInput({
+	labels,
+	onLabelsChange,
+	validateLabelsKey,
+}: LabelsInputProps): JSX.Element {
+	const { notifications } = useNotifications();
+	const [inputState, setInputState] = useState<LabelInputState>({
+		key: '',
+		value: '',
+		isKeyInput: true,
+	});
+	const [isAdding, setIsAdding] = useState(false);
+
+	const handleAddLabelsClick = useCallback(() => {
+		setIsAdding(true);
+		setInputState({ key: '', value: '', isKeyInput: true });
+	}, []);
+
+	const handleKeyDown = useCallback(
+		// eslint-disable-next-line sonarjs/cognitive-complexity
+		(e: React.KeyboardEvent<HTMLInputElement>) => {
+			if (e.key === 'Enter') {
+				if (inputState.isKeyInput) {
+					// Check if input contains a colon (key:value format)
+					if (inputState.key.includes(':')) {
+						const [key, ...valueParts] = inputState.key.split(':');
+						const value = valueParts.join(':'); // Rejoin in case value contains colons
+
+						if (key.trim() && value.trim()) {
+							if (labels[key.trim()]) {
+								notifications.error({
+									message: 'Label with this key already exists',
+								});
+								return;
+							}
+							const error = validateLabelsKey(key.trim());
+							if (error) {
+								notifications.error({
+									message: error,
+								});
+								return;
+							}
+							// Add the label immediately
+							const newLabels = {
+								...labels,
+								[key.trim()]: value.trim(),
+							};
+							onLabelsChange(newLabels);
+
+							// Reset input state
+							setInputState({ key: '', value: '', isKeyInput: true });
+						}
+					} else if (inputState.key.trim()) {
+						if (labels[inputState.key.trim()]) {
+							notifications.error({
+								message: 'Label with this key already exists',
+							});
+							return;
+						}
+						const error = validateLabelsKey(inputState.key.trim());
+						if (error) {
+							notifications.error({
+								message: error,
+							});
+							return;
+						}
+						setInputState((prev) => ({ ...prev, isKeyInput: false }));
+					}
+				} else if (inputState.value.trim()) {
+					// Add the label
+					const newLabels = {
+						...labels,
+						[inputState.key.trim()]: inputState.value.trim(),
+					};
+					onLabelsChange(newLabels);
+
+					// Reset and continue adding
+					setInputState({ key: '', value: '', isKeyInput: true });
+				}
+			} else if (e.key === 'Escape') {
+				// Cancel adding
+				setIsAdding(false);
+				setInputState({ key: '', value: '', isKeyInput: true });
+			}
+		},
+		[inputState, labels, notifications, onLabelsChange, validateLabelsKey],
+	);
+
+	const handleInputChange = useCallback(
+		(e: React.ChangeEvent<HTMLInputElement>) => {
+			if (inputState.isKeyInput) {
+				setInputState((prev) => ({ ...prev, key: e.target.value }));
+			} else {
+				setInputState((prev) => ({ ...prev, value: e.target.value }));
+			}
+		},
+		[inputState.isKeyInput],
+	);
+
+	const handleRemoveLabel = useCallback(
+		(key: string) => {
+			const newLabels = { ...labels };
+			delete newLabels[key];
+			onLabelsChange(newLabels);
+		},
+		[labels, onLabelsChange],
+	);
+
+	const handleBlur = useCallback(() => {
+		if (!inputState.key && !inputState.value) {
+			setIsAdding(false);
+			setInputState({ key: '', value: '', isKeyInput: true });
+		}
+	}, [inputState]);
+
+	return (
+		<div className="labels-input">
+			{Object.keys(labels).length > 0 && (
+				<div className="labels-input__existing-labels">
+					{Object.entries(labels).map(([key, value]) => (
+						<span key={key} className="labels-input__label-pill">
+							{key}: {value}
+							<button
+								type="button"
+								className="labels-input__remove-button"
+								onClick={(): void => handleRemoveLabel(key)}
+							>
+								<CloseOutlined />
+							</button>
+						</span>
+					))}
+				</div>
+			)}
+
+			{!isAdding ? (
+				<button
+					className="labels-input__add-button"
+					type="button"
+					onClick={handleAddLabelsClick}
+				>
+					+ Add labels
+				</button>
+			) : (
+				<div className="labels-input__input-container">
+					<input
+						type="text"
+						value={inputState.isKeyInput ? inputState.key : inputState.value}
+						onChange={handleInputChange}
+						onKeyDown={handleKeyDown}
+						onBlur={handleBlur}
+						className="labels-input__input"
+						placeholder={inputState.isKeyInput ? 'Enter key' : 'Enter value'}
+						// eslint-disable-next-line jsx-a11y/no-autofocus
+						autoFocus
+					/>
+				</div>
+			)}
+		</div>
+	);
+}
+
+export default LabelsInput;

frontend/src/container/CreateAlertV2/CreateAlertHeader/__tests__/CreateAlertHeader.test.tsx

@@ -0,0 +1,77 @@
+/* eslint-disable react/jsx-props-no-spreading */
+import { fireEvent, render, screen } from '@testing-library/react';
+
+import { CreateAlertProvider } from '../../context';
+import CreateAlertHeader from '../CreateAlertHeader';
+
+jest.mock('uplot', () => {
+	const paths = {
+		spline: jest.fn(),
+		bars: jest.fn(),
+	};
+	const uplotMock = jest.fn(() => ({
+		paths,
+	}));
+	return {
+		paths,
+		default: uplotMock,
+	};
+});
+
+jest.mock('react-router-dom', () => ({
+	...jest.requireActual('react-router-dom'),
+	useLocation: (): { search: string } => ({
+		search: '',
+	}),
+}));
+
+const renderCreateAlertHeader = (): ReturnType<typeof render> =>
+	render(
+		<CreateAlertProvider>
+			<CreateAlertHeader />
+		</CreateAlertProvider>,
+	);
+
+describe('CreateAlertHeader', () => {
+	it('renders the header with title', () => {
+		renderCreateAlertHeader();
+		expect(screen.getByText('New Alert Rule')).toBeInTheDocument();
+	});
+
+	it('renders name input with placeholder', () => {
+		renderCreateAlertHeader();
+		const nameInput = screen.getByPlaceholderText('Enter alert rule name');
+		expect(nameInput).toBeInTheDocument();
+	});
+
+	it('renders description input with placeholder', () => {
+		renderCreateAlertHeader();
+		const descriptionInput = screen.getByPlaceholderText(
+			'Click to add description...',
+		);
+		expect(descriptionInput).toBeInTheDocument();
+	});
+
+	it('renders LabelsInput component', () => {
+		renderCreateAlertHeader();
+		expect(screen.getByText('+ Add labels')).toBeInTheDocument();
+	});
+
+	it('updates name when typing in name input', () => {
+		renderCreateAlertHeader();
+		const nameInput = screen.getByPlaceholderText('Enter alert rule name');
+
+		fireEvent.change(nameInput, { target: { value: 'Test Alert' } });
+
+		expect(nameInput).toHaveValue('Test Alert');
+	});
+
+	it('updates description when typing in description input', () => {
+		renderCreateAlertHeader();
+		const descriptionInput = screen.getByPlaceholderText(
+			'Click to add description...',
+		);
+		fireEvent.change(descriptionInput, { target: { value: 'Test Description' } });
+		expect(descriptionInput).toHaveValue('Test Description');
+	});
+});

frontend/src/container/CreateAlertV2/CreateAlertHeader/__tests__/LabelsInput.test.tsx

@@ -0,0 +1,510 @@
+/* eslint-disable react/jsx-props-no-spreading */
+import { fireEvent, render, screen } from '@testing-library/react';
+
+import LabelsInput from '../LabelsInput';
+import { LabelsInputProps } from '../types';
+
+// Mock the CloseOutlined icon
+jest.mock('@ant-design/icons', () => ({
+	CloseOutlined: (): JSX.Element => <span data-testid="close-icon">×</span>,
+}));
+
+const mockOnLabelsChange = jest.fn();
+const mockValidateLabelsKey = jest.fn().mockReturnValue(null);
+
+const defaultProps: LabelsInputProps = {
+	labels: {},
+	onLabelsChange: mockOnLabelsChange,
+	validateLabelsKey: mockValidateLabelsKey,
+};
+
+const ADD_LABELS_TEXT = '+ Add labels';
+const ENTER_KEY_PLACEHOLDER = 'Enter key';
+const ENTER_VALUE_PLACEHOLDER = 'Enter value';
+
+const CLOSE_ICON_TEST_ID = 'close-icon';
+const SEVERITY_HIGH_TEXT = 'severity: high';
+const ENVIRONMENT_PRODUCTION_TEXT = 'environment: production';
+const SEVERITY_HIGH_KEY_VALUE = 'severity:high';
+
+const renderLabelsInput = (
+	props: Partial<LabelsInputProps> = {},
+): ReturnType<typeof render> =>
+	render(<LabelsInput {...defaultProps} {...props} />);
+
+describe('LabelsInput', () => {
+	beforeEach(() => {
+		jest.clearAllMocks();
+		mockValidateLabelsKey.mockReturnValue(null); // Reset validation to always pass
+	});
+
+	describe('Initial Rendering', () => {
+		it('renders add button when no labels exist', () => {
+			renderLabelsInput();
+			expect(screen.getByText(ADD_LABELS_TEXT)).toBeInTheDocument();
+			expect(screen.queryByTestId(CLOSE_ICON_TEST_ID)).not.toBeInTheDocument();
+		});
+
+		it('renders existing labels when provided', () => {
+			const labels = { severity: 'high', environment: 'production' };
+			renderLabelsInput({ labels });
+
+			expect(screen.getByText(SEVERITY_HIGH_TEXT)).toBeInTheDocument();
+			expect(screen.getByText(ENVIRONMENT_PRODUCTION_TEXT)).toBeInTheDocument();
+			expect(screen.getAllByTestId(CLOSE_ICON_TEST_ID)).toHaveLength(2);
+		});
+
+		it('does not render existing labels section when no labels', () => {
+			renderLabelsInput();
+			expect(screen.queryByText(SEVERITY_HIGH_TEXT)).not.toBeInTheDocument();
+		});
+	});
+
+	describe('Adding Labels', () => {
+		it('shows input field when add button is clicked', () => {
+			renderLabelsInput();
+
+			fireEvent.click(screen.getByText(ADD_LABELS_TEXT));
+
+			expect(
+				screen.getByPlaceholderText(ENTER_KEY_PLACEHOLDER),
+			).toBeInTheDocument();
+			expect(screen.queryByText(ADD_LABELS_TEXT)).not.toBeInTheDocument();
+		});
+
+		it('switches from key input to value input on Enter', () => {
+			renderLabelsInput();
+
+			fireEvent.click(screen.getByText(ADD_LABELS_TEXT));
+			const input = screen.getByPlaceholderText(ENTER_KEY_PLACEHOLDER);
+
+			fireEvent.change(input, { target: { value: 'severity' } });
+			fireEvent.keyDown(input, { key: 'Enter' });
+
+			expect(
+				screen.getByPlaceholderText(ENTER_VALUE_PLACEHOLDER),
+			).toBeInTheDocument();
+			expect(
+				screen.queryByPlaceholderText(ENTER_KEY_PLACEHOLDER),
+			).not.toBeInTheDocument();
+		});
+
+		it('adds label when both key and value are provided', () => {
+			renderLabelsInput();
+
+			fireEvent.click(screen.getByText(ADD_LABELS_TEXT));
+			const input = screen.getByPlaceholderText(ENTER_KEY_PLACEHOLDER);
+
+			// Enter key
+			fireEvent.change(input, { target: { value: 'severity' } });
+			fireEvent.keyDown(input, { key: 'Enter' });
+
+			// Enter value
+			const valueInput = screen.getByPlaceholderText(ENTER_VALUE_PLACEHOLDER);
+			fireEvent.change(valueInput, { target: { value: 'high' } });
+			fireEvent.keyDown(valueInput, { key: 'Enter' });
+
+			expect(mockOnLabelsChange).toHaveBeenCalledWith({ severity: 'high' });
+		});
+
+		it('does not switch to value input if key is empty', () => {
+			renderLabelsInput();
+
+			fireEvent.click(screen.getByText(ADD_LABELS_TEXT));
+			const input = screen.getByPlaceholderText(ENTER_KEY_PLACEHOLDER);
+
+			fireEvent.keyDown(input, { key: 'Enter' });
+
+			expect(
+				screen.getByPlaceholderText(ENTER_KEY_PLACEHOLDER),
+			).toBeInTheDocument();
+			expect(
+				screen.queryByPlaceholderText(ENTER_VALUE_PLACEHOLDER),
+			).not.toBeInTheDocument();
+		});
+
+		it('does not add label if value is empty', () => {
+			renderLabelsInput();
+
+			fireEvent.click(screen.getByText(ADD_LABELS_TEXT));
+			const input = screen.getByPlaceholderText(ENTER_KEY_PLACEHOLDER);
+
+			// Enter key
+			fireEvent.change(input, { target: { value: 'severity' } });
+			fireEvent.keyDown(input, { key: 'Enter' });
+
+			// Try to add with empty value
+			const valueInput = screen.getByPlaceholderText(ENTER_VALUE_PLACEHOLDER);
+			fireEvent.keyDown(valueInput, { key: 'Enter' });
+
+			expect(mockOnLabelsChange).not.toHaveBeenCalled();
+		});
+
+		it('trims whitespace from key and value', () => {
+			renderLabelsInput();
+
+			fireEvent.click(screen.getByText(ADD_LABELS_TEXT));
+			const input = screen.getByPlaceholderText(ENTER_KEY_PLACEHOLDER);
+
+			// Enter key with whitespace
+			fireEvent.change(input, { target: { value: '  severity  ' } });
+			fireEvent.keyDown(input, { key: 'Enter' });
+
+			// Enter value with whitespace
+			const valueInput = screen.getByPlaceholderText(ENTER_VALUE_PLACEHOLDER);
+			fireEvent.change(valueInput, { target: { value: '  high  ' } });
+			fireEvent.keyDown(valueInput, { key: 'Enter' });
+
+			expect(mockOnLabelsChange).toHaveBeenCalledWith({ severity: 'high' });
+		});
+
+		it('resets input state after adding label', () => {
+			renderLabelsInput();
+
+			fireEvent.click(screen.getByText(ADD_LABELS_TEXT));
+			const input = screen.getByPlaceholderText(ENTER_KEY_PLACEHOLDER);
+
+			// Add a label
+			fireEvent.change(input, { target: { value: 'severity' } });
+			fireEvent.keyDown(input, { key: 'Enter' });
+
+			const valueInput = screen.getByPlaceholderText(ENTER_VALUE_PLACEHOLDER);
+			fireEvent.change(valueInput, { target: { value: 'high' } });
+			fireEvent.keyDown(valueInput, { key: 'Enter' });
+
+			// Should be back to key input
+			expect(
+				screen.getByPlaceholderText(ENTER_KEY_PLACEHOLDER),
+			).toBeInTheDocument();
+			expect(
+				screen.queryByPlaceholderText(ENTER_VALUE_PLACEHOLDER),
+			).not.toBeInTheDocument();
+		});
+	});
+
+	describe('Removing Labels', () => {
+		it('removes label when close button is clicked', () => {
+			const labels = { severity: 'high', environment: 'production' };
+			renderLabelsInput({ labels });
+
+			const removeButtons = screen.getAllByTestId(CLOSE_ICON_TEST_ID);
+			fireEvent.click(removeButtons[0]);
+
+			expect(mockOnLabelsChange).toHaveBeenCalledWith({
+				environment: 'production',
+			});
+		});
+
+		it('calls onLabelsChange with empty object when last label is removed', () => {
+			const labels = { severity: 'high' };
+			renderLabelsInput({ labels });
+
+			const removeButton = screen.getByTestId('close-icon');
+			fireEvent.click(removeButton);
+
+			expect(mockOnLabelsChange).toHaveBeenCalledWith({});
+		});
+	});
+
+	describe('Keyboard Interactions', () => {
+		it('cancels adding label on Escape key', () => {
+			renderLabelsInput();
+
+			fireEvent.click(screen.getByText(ADD_LABELS_TEXT));
+			const input = screen.getByPlaceholderText(ENTER_KEY_PLACEHOLDER);
+
+			fireEvent.keyDown(input, { key: 'Escape' });
+
+			expect(screen.getByText(ADD_LABELS_TEXT)).toBeInTheDocument();
+			expect(
+				screen.queryByPlaceholderText(ENTER_KEY_PLACEHOLDER),
+			).not.toBeInTheDocument();
+		});
+
+		it('cancels adding label on Escape key in value input', () => {
+			renderLabelsInput();
+
+			fireEvent.click(screen.getByText(ADD_LABELS_TEXT));
+			const input = screen.getByPlaceholderText(ENTER_KEY_PLACEHOLDER);
+
+			// Enter key
+			fireEvent.change(input, { target: { value: 'severity' } });
+			fireEvent.keyDown(input, { key: 'Enter' });
+
+			// Cancel in value input
+			const valueInput = screen.getByPlaceholderText(ENTER_VALUE_PLACEHOLDER);
+			fireEvent.keyDown(valueInput, { key: 'Escape' });
+
+			expect(screen.getByText(ADD_LABELS_TEXT)).toBeInTheDocument();
+			expect(
+				screen.queryByPlaceholderText(ENTER_VALUE_PLACEHOLDER),
+			).not.toBeInTheDocument();
+		});
+	});
+
+	describe('Blur Behavior', () => {
+		it('closes input immediately when both key and value are empty', () => {
+			renderLabelsInput();
+
+			fireEvent.click(screen.getByText(ADD_LABELS_TEXT));
+			const input = screen.getByPlaceholderText(ENTER_KEY_PLACEHOLDER);
+
+			fireEvent.blur(input);
+
+			// The input should close immediately when both key and value are empty
+			expect(screen.getByText(ADD_LABELS_TEXT)).toBeInTheDocument();
+			expect(
+				screen.queryByPlaceholderText(ENTER_KEY_PLACEHOLDER),
+			).not.toBeInTheDocument();
+		});
+
+		it('does not close input immediately when key has value', () => {
+			jest.useFakeTimers();
+			renderLabelsInput();
+
+			fireEvent.click(screen.getByText(ADD_LABELS_TEXT));
+			const input = screen.getByPlaceholderText(ENTER_KEY_PLACEHOLDER);
+
+			fireEvent.change(input, { target: { value: 'severity' } });
+			fireEvent.blur(input);
+
+			jest.advanceTimersByTime(200);
+
+			expect(
+				screen.getByPlaceholderText(ENTER_KEY_PLACEHOLDER),
+			).toBeInTheDocument();
+			expect(screen.queryByText(ADD_LABELS_TEXT)).not.toBeInTheDocument();
+
+			jest.useRealTimers();
+		});
+	});
+
+	describe('Input Change Handling', () => {
+		it('updates key input value correctly', () => {
+			renderLabelsInput();
+
+			fireEvent.click(screen.getByText(ADD_LABELS_TEXT));
+			const input = screen.getByPlaceholderText(ENTER_KEY_PLACEHOLDER);
+
+			fireEvent.change(input, { target: { value: 'severity' } });
+
+			expect(input).toHaveValue('severity');
+		});
+
+		it('updates value input correctly', () => {
+			renderLabelsInput();
+
+			fireEvent.click(screen.getByText(ADD_LABELS_TEXT));
+			const input = screen.getByPlaceholderText(ENTER_KEY_PLACEHOLDER);
+
+			// Enter key
+			fireEvent.change(input, { target: { value: 'severity' } });
+			fireEvent.keyDown(input, { key: 'Enter' });
+
+			// Update value
+			const valueInput = screen.getByPlaceholderText(ENTER_VALUE_PLACEHOLDER);
+			fireEvent.change(valueInput, { target: { value: 'high' } });
+
+			expect(valueInput).toHaveValue('high');
+		});
+	});
+
+	describe('Edge Cases', () => {
+		it('handles multiple labels correctly', () => {
+			const labels = {
+				severity: 'high',
+				environment: 'production',
+				service: 'api-gateway',
+			};
+			renderLabelsInput({ labels });
+
+			expect(screen.getByText(SEVERITY_HIGH_TEXT)).toBeInTheDocument();
+			expect(screen.getByText(ENVIRONMENT_PRODUCTION_TEXT)).toBeInTheDocument();
+			expect(screen.getByText('service: api-gateway')).toBeInTheDocument();
+			expect(screen.getAllByTestId(CLOSE_ICON_TEST_ID)).toHaveLength(3);
+		});
+
+		it('handles empty string values', () => {
+			const labels = { severity: '' };
+			renderLabelsInput({ labels });
+
+			expect(screen.getByText(/severity/)).toBeInTheDocument();
+		});
+
+		it('handles special characters in labels', () => {
+			const labels = { 'service-name': 'api-gateway-v1' };
+			renderLabelsInput({ labels });
+
+			expect(screen.getByText('service-name: api-gateway-v1')).toBeInTheDocument();
+		});
+
+		it('maintains focus on input after adding label', () => {
+			renderLabelsInput();
+
+			fireEvent.click(screen.getByText(ADD_LABELS_TEXT));
+			const input = screen.getByPlaceholderText(ENTER_KEY_PLACEHOLDER);
+
+			// Add a label
+			fireEvent.change(input, { target: { value: 'severity' } });
+			fireEvent.keyDown(input, { key: 'Enter' });
+
+			const valueInput = screen.getByPlaceholderText(ENTER_VALUE_PLACEHOLDER);
+			fireEvent.change(valueInput, { target: { value: 'high' } });
+			fireEvent.keyDown(valueInput, { key: 'Enter' });
+
+			// Should be focused on new key input
+			const newInput = screen.getByPlaceholderText(ENTER_KEY_PLACEHOLDER);
+			expect(newInput).toHaveFocus();
+		});
+	});
+
+	describe('Key:Value Format Support', () => {
+		it('adds label when key:value format is entered and Enter is pressed', () => {
+			renderLabelsInput();
+
+			fireEvent.click(screen.getByText(ADD_LABELS_TEXT));
+			const input = screen.getByPlaceholderText(ENTER_KEY_PLACEHOLDER);
+
+			// Enter key:value format
+			fireEvent.change(input, { target: { value: SEVERITY_HIGH_KEY_VALUE } });
+			fireEvent.keyDown(input, { key: 'Enter' });
+
+			expect(mockOnLabelsChange).toHaveBeenCalledWith({ severity: 'high' });
+		});
+
+		it('trims whitespace from key and value in key:value format', () => {
+			renderLabelsInput();
+
+			fireEvent.click(screen.getByText(ADD_LABELS_TEXT));
+			const input = screen.getByPlaceholderText(ENTER_KEY_PLACEHOLDER);
+
+			// Enter key:value format with whitespace
+			fireEvent.change(input, { target: { value: '  severity  :  high  ' } });
+			fireEvent.keyDown(input, { key: 'Enter' });
+
+			expect(mockOnLabelsChange).toHaveBeenCalledWith({ severity: 'high' });
+		});
+
+		it('handles values with colons correctly', () => {
+			renderLabelsInput();
+
+			fireEvent.click(screen.getByText(ADD_LABELS_TEXT));
+			const input = screen.getByPlaceholderText(ENTER_KEY_PLACEHOLDER);
+
+			// Enter key:value format where value contains colons
+			fireEvent.change(input, {
+				target: { value: 'url:https://example.com:8080' },
+			});
+			fireEvent.keyDown(input, { key: 'Enter' });
+
+			expect(mockOnLabelsChange).toHaveBeenCalledWith({
+				url: 'https://example.com:8080',
+			});
+		});
+
+		it('does not add label if key is empty in key:value format', () => {
+			renderLabelsInput();
+
+			fireEvent.click(screen.getByText(ADD_LABELS_TEXT));
+			const input = screen.getByPlaceholderText(ENTER_KEY_PLACEHOLDER);
+
+			// Enter key:value format with empty key
+			fireEvent.change(input, { target: { value: ':high' } });
+			fireEvent.keyDown(input, { key: 'Enter' });
+
+			expect(mockOnLabelsChange).not.toHaveBeenCalled();
+		});
+
+		it('does not add label if value is empty in key:value format', () => {
+			renderLabelsInput();
+
+			fireEvent.click(screen.getByText(ADD_LABELS_TEXT));
+			const input = screen.getByPlaceholderText(ENTER_KEY_PLACEHOLDER);
+
+			// Enter key:value format with empty value
+			fireEvent.change(input, { target: { value: 'severity:' } });
+			fireEvent.keyDown(input, { key: 'Enter' });
+
+			expect(mockOnLabelsChange).not.toHaveBeenCalled();
+		});
+
+		it('does not add label if only colon is entered', () => {
+			renderLabelsInput();
+
+			fireEvent.click(screen.getByText(ADD_LABELS_TEXT));
+			const input = screen.getByPlaceholderText(ENTER_KEY_PLACEHOLDER);
+
+			// Enter only colon
+			fireEvent.change(input, { target: { value: ':' } });
+			fireEvent.keyDown(input, { key: 'Enter' });
+
+			expect(mockOnLabelsChange).not.toHaveBeenCalled();
+		});
+
+		it('resets input state after adding label with key:value format', () => {
+			renderLabelsInput();
+
+			fireEvent.click(screen.getByText(ADD_LABELS_TEXT));
+			const input = screen.getByPlaceholderText(ENTER_KEY_PLACEHOLDER);
+
+			// Add label with key:value format
+			fireEvent.change(input, { target: { value: 'severity:high' } });
+			fireEvent.keyDown(input, { key: 'Enter' });
+
+			// Should be back to key input for next label
+			expect(
+				screen.getByPlaceholderText(ENTER_KEY_PLACEHOLDER),
+			).toBeInTheDocument();
+			expect(
+				screen.queryByPlaceholderText(ENTER_VALUE_PLACEHOLDER),
+			).not.toBeInTheDocument();
+		});
+
+		it('does not auto-save when typing key:value without pressing Enter', () => {
+			renderLabelsInput();
+
+			fireEvent.click(screen.getByText(ADD_LABELS_TEXT));
+			const input = screen.getByPlaceholderText(ENTER_KEY_PLACEHOLDER);
+
+			// Type key:value format but don't press Enter
+			fireEvent.change(input, { target: { value: SEVERITY_HIGH_KEY_VALUE } });
+
+			// Should not have called onLabelsChange yet
+			expect(mockOnLabelsChange).not.toHaveBeenCalled();
+		});
+
+		it('handles multiple key:value entries correctly', () => {
+			const { rerender } = renderLabelsInput();
+
+			fireEvent.click(screen.getByText(ADD_LABELS_TEXT));
+			const input = screen.getByPlaceholderText(ENTER_KEY_PLACEHOLDER);
+
+			// Add first label
+			fireEvent.change(input, { target: { value: SEVERITY_HIGH_KEY_VALUE } });
+			fireEvent.keyDown(input, { key: 'Enter' });
+
+			// Simulate parent component updating labels
+			const firstLabels = { severity: 'high' };
+			rerender(
+				<LabelsInput
+					labels={firstLabels}
+					onLabelsChange={mockOnLabelsChange}
+					validateLabelsKey={mockValidateLabelsKey}
+				/>,
+			);
+
+			// Add second label
+			const newInput = screen.getByPlaceholderText(ENTER_KEY_PLACEHOLDER);
+			fireEvent.change(newInput, { target: { value: 'environment:production' } });
+			fireEvent.keyDown(newInput, { key: 'Enter' });
+
+			// Check that we made two calls and the last one includes both labels
+			expect(mockOnLabelsChange).toHaveBeenCalledTimes(2);
+			expect(mockOnLabelsChange).toHaveBeenNthCalledWith(1, { severity: 'high' });
+			expect(mockOnLabelsChange).toHaveBeenNthCalledWith(2, {
+				severity: 'high',
+				environment: 'production',
+			});
+		});
+	});
+});

frontend/src/container/CreateAlertV2/CreateAlertHeader/index.ts

@@ -0,0 +1,3 @@
+import CreateAlertHeader from './CreateAlertHeader';
+
+export default CreateAlertHeader;

frontend/src/container/CreateAlertV2/CreateAlertHeader/styles.scss

@@ -0,0 +1,151 @@
+.alert-header {
+	background-color: var(--bg-ink-500);
+	font-family: inherit;
+	color: var(--text-vanilla-100);
+
+	/* Top bar with diagonal stripes */
+	&__tab-bar {
+		height: 32px;
+		display: flex;
+		align-items: center;
+		background: repeating-linear-gradient(
+			-45deg,
+			#0f0f0f,
+			#0f0f0f 10px,
+			#101010 10px,
+			#101010 20px
+		);
+		padding-left: 0;
+	}
+
+	/* Tab block visuals */
+	&__tab {
+		display: flex;
+		align-items: center;
+		background-color: var(--bg-ink-500);
+		padding: 0 12px;
+		height: 32px;
+		font-size: 13px;
+		color: var(--text-vanilla-100);
+		margin-left: 12px;
+		margin-top: 12px;
+	}
+
+	&__tab::before {
+		content: '•';
+		margin-right: 6px;
+		font-size: 14px;
+		color: var(--bg-slate-100);
+	}
+
+	&__content {
+		padding: 16px;
+		background: var(--bg-ink-500);
+		display: flex;
+		flex-direction: column;
+		gap: 8px;
+	}
+
+	&__input.title {
+		font-size: 18px;
+		font-weight: 500;
+		background-color: transparent;
+		color: var(--text-vanilla-100);
+	}
+
+	&__input:focus,
+	&__input:active {
+		border: none;
+		outline: none;
+	}
+
+	&__input.description {
+		font-size: 14px;
+		background-color: transparent;
+		color: var(--text-vanilla-300);
+	}
+}
+
+.labels-input {
+	display: flex;
+	flex-direction: column;
+	gap: 8px;
+
+	&__add-button {
+		width: fit-content;
+		font-size: 13px;
+		color: #ccc;
+		border: 1px solid #333;
+		background-color: transparent;
+		cursor: pointer;
+		padding: 4px 8px;
+		border-radius: 4px;
+
+		&:hover {
+			border-color: #555;
+			color: #fff;
+		}
+	}
+
+	&__existing-labels {
+		display: flex;
+		flex-wrap: wrap;
+		gap: 8px;
+	}
+
+	&__label-pill {
+		display: inline-flex;
+		align-items: center;
+		gap: 6px;
+		background-color: #ad7f581a;
+		color: var(--bg-sienna-400);
+		padding: 4px 8px;
+		border-radius: 16px;
+		font-size: 12px;
+		border: 1px solid var(--bg-sienna-500);
+		font-family: 'Geist Mono';
+	}
+
+	&__remove-button {
+		background: none;
+		border: none;
+		color: var(--bg-sienna-400);
+		cursor: pointer;
+		padding: 0;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		font-size: 10px;
+
+		&:hover {
+			color: var(--text-vanilla-100);
+		}
+	}
+
+	&__input-container {
+		display: flex;
+		align-items: center;
+		background-color: transparent;
+		border: none;
+	}
+
+	&__input {
+		flex: 1;
+		background-color: transparent;
+		border: none;
+		outline: none;
+		padding: 6px 8px;
+		color: #fff;
+		font-size: 13px;
+
+		&::placeholder {
+			color: #888;
+		}
+
+		&:focus,
+		&:active {
+			border: none;
+			outline: none;
+		}
+	}
+}

frontend/src/container/CreateAlertV2/CreateAlertHeader/types.ts

@@ -0,0 +1,13 @@
+import { Labels } from 'types/api/alerts/def';
+
+export interface LabelsInputProps {
+	labels: Labels;
+	onLabelsChange: (labels: Labels) => void;
+	validateLabelsKey: (key: string) => string | null;
+}
+
+export interface LabelInputState {
+	key: string;
+	value: string;
+	isKeyInput: boolean;
+}

frontend/src/container/CreateAlertV2/CreateAlertV2.styles.scss

@@ -0,0 +1,17 @@
+$top-nav-background-1: #0f0f0f;
+$top-nav-background-2: #101010;
+
+.create-alert-v2-container {
+	background-color: var(--bg-ink-500);
+}
+
+.top-nav-container {
+	background: repeating-linear-gradient(
+		-45deg,
+		$top-nav-background-1,
+		$top-nav-background-1 10px,
+		$top-nav-background-2 10px,
+		$top-nav-background-2 20px
+	);
+	margin-bottom: 0;
+}

frontend/src/container/CreateAlertV2/CreateAlertV2.tsx

@@ -0,0 +1,34 @@
+import './CreateAlertV2.styles.scss';
+
+import { initialQueriesMap } from 'constants/queryBuilder';
+import { useShareBuilderUrl } from 'hooks/queryBuilder/useShareBuilderUrl';
+import { Query } from 'types/api/queryBuilder/queryBuilderData';
+
+import AlertCondition from './AlertCondition';
+import { CreateAlertProvider } from './context';
+import CreateAlertHeader from './CreateAlertHeader';
+import QuerySection from './QuerySection';
+
+function CreateAlertV2({
+	initialQuery = initialQueriesMap.metrics,
+}: {
+	initialQuery?: Query;
+}): JSX.Element {
+	useShareBuilderUrl({ defaultValue: initialQuery });
+
+	return (
+		<div className="create-alert-v2-container">
+			<CreateAlertProvider>
+				<CreateAlertHeader />
+				<QuerySection />
+				<AlertCondition />
+			</CreateAlertProvider>
+		</div>
+	);
+}
+
+CreateAlertV2.defaultProps = {
+	initialQuery: initialQueriesMap.metrics,
+};
+
+export default CreateAlertV2;