feat: panel markers with dummy data

.devenv/docker/clickhouse/compose.yaml

@@ -42,7 +42,7 @@ services:
       timeout: 5s
       retries: 3
   schema-migrator-sync:
-    image: signoz/signoz-schema-migrator:v0.129.8
+    image: signoz/signoz-schema-migrator:v0.129.7
     container_name: schema-migrator-sync
     command:
       - sync
@@ -55,7 +55,7 @@ services:
         condition: service_healthy
     restart: on-failure
   schema-migrator-async:
-    image: signoz/signoz-schema-migrator:v0.129.8
+    image: signoz/signoz-schema-migrator:v0.129.7
     container_name: schema-migrator-async
     command:
       - async

.github/CODEOWNERS

@@ -2,7 +2,7 @@
 # Owners are automatically requested for review for PRs that changes code
 # that they own.
 
-/frontend/ @YounixM @aks07
+/frontend/ @SigNoz/frontend @YounixM
 /frontend/src/container/MetricsApplication @srikanthccv
 /frontend/src/container/NewWidget/RightContainer/types.ts @srikanthccv
 

.github/workflows/build-enterprise.yaml

@@ -107,6 +107,7 @@ jobs:
         -X github.com/SigNoz/signoz/pkg/version.branch=${{ needs.prepare.outputs.branch }}
         -X github.com/SigNoz/signoz/ee/zeus.url=https://api.signoz.cloud
         -X github.com/SigNoz/signoz/ee/zeus.deprecatedURL=https://license.signoz.io
+        -X github.com/SigNoz/signoz/ee/query-service/constants.ZeusURL=https://api.signoz.cloud
         -X github.com/SigNoz/signoz/ee/query-service/constants.LicenseSignozIo=https://license.signoz.io/api/v1
         -X github.com/SigNoz/signoz/pkg/analytics.key=9kRrJ7oPCGPEJLF6QjMPLt5bljFhRQBr'
       DOCKER_BASE_IMAGES: '{"alpine": "alpine:3.20.3"}'

.github/workflows/build-staging.yaml

@@ -106,6 +106,7 @@ jobs:
         -X github.com/SigNoz/signoz/pkg/version.branch=${{ needs.prepare.outputs.branch }}
         -X github.com/SigNoz/signoz/ee/zeus.url=https://api.staging.signoz.cloud
         -X github.com/SigNoz/signoz/ee/zeus.deprecatedURL=https://license.staging.signoz.cloud
+        -X github.com/SigNoz/signoz/ee/query-service/constants.ZeusURL=https://api.staging.signoz.cloud
         -X github.com/SigNoz/signoz/ee/query-service/constants.LicenseSignozIo=https://license.staging.signoz.cloud/api/v1
         -X github.com/SigNoz/signoz/pkg/analytics.key=9kRrJ7oPCGPEJLF6QjMPLt5bljFhRQBr'
       DOCKER_BASE_IMAGES: '{"alpine": "alpine:3.20.3"}'

.github/workflows/integrationci.yaml

@@ -17,7 +17,6 @@ jobs:
           - bootstrap
           - passwordauthn
           - callbackauthn
-          - cloudintegrations
           - querier
           - ttl
         sqlstore-provider:

.golangci.yml

@@ -1,63 +1,39 @@
-version: "2"
 linters:
-  default: none
+  default: standard
   enable:
     - bodyclose
-    - depguard
-    - errcheck
-    - forbidigo
-    - govet
-    - iface
-    - ineffassign
     - misspell
     - nilnil
     - sloglint
+    - depguard
+    - iface
     - unparam
-    - unused
-  settings:
-    depguard:
-      rules:
-        noerrors:
-          deny:
-            - pkg: errors
-              desc: Do not use errors package. Use github.com/SigNoz/signoz/pkg/errors instead.
-        nozap:
-          deny:
-            - pkg: go.uber.org/zap
-              desc: Do not use zap logger. Use slog instead.
-    forbidigo:
-      forbid:
-        - pattern: fmt.Errorf
-        - pattern: ^(fmt\.Print.*|print|println)$
-    iface:
-      enable:
-        - identical
-    sloglint:
-      no-mixed-args: true
-      kv-only: true
-      no-global: all
-      context: all
-      static-msg: true
-      key-naming-case: snake
-  exclusions:
-    generated: lax
-    presets:
-      - comments
-      - common-false-positives
-      - legacy
-      - std-error-handling
-    paths:
-      - pkg/query-service
-      - ee/query-service
-      - scripts/
-      - tmp/
-      - third_party$
-      - builtin$
-      - examples$
-formatters:
-  exclusions:
-    generated: lax
-    paths:
-      - third_party$
-      - builtin$
-      - examples$
+    - forbidigo
+
+linters-settings:
+  sloglint:
+    no-mixed-args: true
+    kv-only: true
+    no-global: all
+    context: all
+    static-msg: true
+    msg-style: lowercased
+    key-naming-case: snake
+  depguard:
+    rules:
+      nozap:
+        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
+issues:
+  exclude-dirs:
+    - "pkg/query-service"
+    - "ee/query-service"
+    - "scripts/"

cmd/enterprise/.goreleaser.yaml

@@ -31,6 +31,7 @@ builds:
       - -X github.com/SigNoz/signoz/pkg/version.branch={{ .Branch }}
       - -X github.com/SigNoz/signoz/ee/zeus.url=https://api.signoz.cloud
       - -X github.com/SigNoz/signoz/ee/zeus.deprecatedURL=https://license.signoz.io
+      - -X github.com/SigNoz/signoz/ee/query-service/constants.ZeusURL=https://api.signoz.cloud
       - -X github.com/SigNoz/signoz/ee/query-service/constants.LicenseSignozIo=https://license.signoz.io/api/v1
       - -X github.com/SigNoz/signoz/pkg/analytics.key=9kRrJ7oPCGPEJLF6QjMPLt5bljFhRQBr
     mod_timestamp: "{{ .CommitTimestamp }}"

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

@@ -176,7 +176,7 @@ services:
       # - ../common/clickhouse/storage.xml:/etc/clickhouse-server/config.d/storage.xml
   signoz:
     !!merge <<: *db-depend
-    image: signoz/signoz:v0.100.1
+    image: signoz/signoz:v0.98.0
     command:
       - --config=/root/config/prometheus.yml
     ports:
@@ -209,7 +209,7 @@ services:
       retries: 3
   otel-collector:
     !!merge <<: *db-depend
-    image: signoz/signoz-otel-collector:v0.129.8
+    image: signoz/signoz-otel-collector:v0.129.7
     command:
       - --config=/etc/otel-collector-config.yaml
       - --manager-config=/etc/manager-config.yaml
@@ -233,7 +233,7 @@ services:
       - signoz
   schema-migrator:
     !!merge <<: *common
-    image: signoz/signoz-schema-migrator:v0.129.8
+    image: signoz/signoz-schema-migrator:v0.129.7
     deploy:
       restart_policy:
         condition: on-failure

deploy/docker-swarm/docker-compose.yaml

@@ -117,7 +117,7 @@ services:
       # - ../common/clickhouse/storage.xml:/etc/clickhouse-server/config.d/storage.xml
   signoz:
     !!merge <<: *db-depend
-    image: signoz/signoz:v0.100.1
+    image: signoz/signoz:v0.98.0
     command:
       - --config=/root/config/prometheus.yml
     ports:
@@ -150,7 +150,7 @@ services:
       retries: 3
   otel-collector:
     !!merge <<: *db-depend
-    image: signoz/signoz-otel-collector:v0.129.8
+    image: signoz/signoz-otel-collector:v0.129.7
     command:
       - --config=/etc/otel-collector-config.yaml
       - --manager-config=/etc/manager-config.yaml
@@ -176,7 +176,7 @@ services:
       - signoz
   schema-migrator:
     !!merge <<: *common
-    image: signoz/signoz-schema-migrator:v0.129.8
+    image: signoz/signoz-schema-migrator:v0.129.7
     deploy:
       restart_policy:
         condition: on-failure

deploy/docker-swarm/otel-collector-config.yaml

@@ -1,10 +1,3 @@
-connectors:
-  signozmeter:
-    metrics_flush_interval: 1h
-    dimensions:
-      - name: service.name
-      - name: deployment.environment
-      - name: host.name
 receivers:
   otlp:
     protocols:
@@ -28,10 +21,6 @@ processors:
     send_batch_size: 10000
     send_batch_max_size: 11000
     timeout: 10s
-  batch/meter:
-    send_batch_max_size: 25000
-    send_batch_size: 20000
-    timeout: 1s
   resourcedetection:
     # Using OTEL_RESOURCE_ATTRIBUTES envvar, env detector adds custom labels.
     detectors: [env, system]
@@ -77,11 +66,6 @@ exporters:
     dsn: tcp://clickhouse:9000/signoz_logs
     timeout: 10s
     use_new_schema: true
-  signozclickhousemeter:
-    dsn: tcp://clickhouse:9000/signoz_meter
-    timeout: 45s
-    sending_queue:
-      enabled: false
 service:
   telemetry:
     logs:
@@ -93,20 +77,16 @@ service:
     traces:
       receivers: [otlp]
       processors: [signozspanmetrics/delta, batch]
-      exporters: [clickhousetraces, signozmeter]
+      exporters: [clickhousetraces]
     metrics:
       receivers: [otlp]
       processors: [batch]
-      exporters: [signozclickhousemetrics, signozmeter]
+      exporters: [signozclickhousemetrics]
     metrics/prometheus:
       receivers: [prometheus]
       processors: [batch]
-      exporters: [signozclickhousemetrics, signozmeter]
+      exporters: [signozclickhousemetrics]
     logs:
       receivers: [otlp]
       processors: [batch]
-      exporters: [clickhouselogsexporter, signozmeter]
-    metrics/meter:
-      receivers: [signozmeter]
-      processors: [batch/meter]
-      exporters: [signozclickhousemeter]
+      exporters: [clickhouselogsexporter]

deploy/docker/docker-compose.ha.yaml

@@ -179,7 +179,7 @@ services:
       # - ../common/clickhouse/storage.xml:/etc/clickhouse-server/config.d/storage.xml
   signoz:
     !!merge <<: *db-depend
-    image: signoz/signoz:${VERSION:-v0.100.1}
+    image: signoz/signoz:${VERSION:-v0.98.0}
     container_name: signoz
     command:
       - --config=/root/config/prometheus.yml
@@ -213,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.8}
+    image: signoz/signoz-otel-collector:${OTELCOL_TAG:-v0.129.7}
     container_name: signoz-otel-collector
     command:
       - --config=/etc/otel-collector-config.yaml
@@ -239,7 +239,7 @@ services:
         condition: service_healthy
   schema-migrator-sync:
     !!merge <<: *common
-    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-v0.129.8}
+    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-v0.129.7}
     container_name: schema-migrator-sync
     command:
       - sync
@@ -250,7 +250,7 @@ services:
         condition: service_healthy
   schema-migrator-async:
     !!merge <<: *db-depend
-    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-v0.129.8}
+    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-v0.129.7}
     container_name: schema-migrator-async
     command:
       - async

deploy/docker/docker-compose.yaml

@@ -111,7 +111,7 @@ services:
       # - ../common/clickhouse/storage.xml:/etc/clickhouse-server/config.d/storage.xml
   signoz:
     !!merge <<: *db-depend
-    image: signoz/signoz:${VERSION:-v0.100.1}
+    image: signoz/signoz:${VERSION:-v0.98.0}
     container_name: signoz
     command:
       - --config=/root/config/prometheus.yml
@@ -144,7 +144,7 @@ services:
       retries: 3
   otel-collector:
     !!merge <<: *db-depend
-    image: signoz/signoz-otel-collector:${OTELCOL_TAG:-v0.129.8}
+    image: signoz/signoz-otel-collector:${OTELCOL_TAG:-v0.129.7}
     container_name: signoz-otel-collector
     command:
       - --config=/etc/otel-collector-config.yaml
@@ -166,7 +166,7 @@ services:
         condition: service_healthy
   schema-migrator-sync:
     !!merge <<: *common
-    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-v0.129.8}
+    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-v0.129.7}
     container_name: schema-migrator-sync
     command:
       - sync
@@ -178,7 +178,7 @@ services:
     restart: on-failure
   schema-migrator-async:
     !!merge <<: *db-depend
-    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-v0.129.8}
+    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-v0.129.7}
     container_name: schema-migrator-async
     command:
       - async

deploy/docker/otel-collector-config.yaml

@@ -1,10 +1,3 @@
-connectors:
-  signozmeter:
-    metrics_flush_interval: 1h
-    dimensions:
-      - name: service.name
-      - name: deployment.environment
-      - name: host.name
 receivers:
   otlp:
     protocols:
@@ -28,10 +21,6 @@ processors:
     send_batch_size: 10000
     send_batch_max_size: 11000
     timeout: 10s
-  batch/meter:
-    send_batch_max_size: 25000
-    send_batch_size: 20000
-    timeout: 1s
   resourcedetection:
     # Using OTEL_RESOURCE_ATTRIBUTES envvar, env detector adds custom labels.
     detectors: [env, system]
@@ -77,11 +66,6 @@ exporters:
     dsn: tcp://clickhouse:9000/signoz_logs
     timeout: 10s
     use_new_schema: true
-  signozclickhousemeter:
-    dsn: tcp://clickhouse:9000/signoz_meter
-    timeout: 45s
-    sending_queue:
-      enabled: false
 service:
   telemetry:
     logs:
@@ -93,20 +77,16 @@ service:
     traces:
       receivers: [otlp]
       processors: [signozspanmetrics/delta, batch]
-      exporters: [clickhousetraces, signozmeter]
+      exporters: [clickhousetraces]
     metrics:
       receivers: [otlp]
       processors: [batch]
-      exporters: [signozclickhousemetrics, signozmeter]
+      exporters: [signozclickhousemetrics]
     metrics/prometheus:
       receivers: [prometheus]
       processors: [batch]
-      exporters: [signozclickhousemetrics, signozmeter]
+      exporters: [signozclickhousemetrics]
     logs:
       receivers: [otlp]
       processors: [batch]
-      exporters: [clickhouselogsexporter, signozmeter]
-    metrics/meter:
-      receivers: [signozmeter]
-      processors: [batch/meter]
-      exporters: [signozclickhousemeter]
+      exporters: [clickhouselogsexporter]

ee/licensing/config.go

@@ -1,10 +1,10 @@
 package licensing
 
 import (
+	"fmt"
 	"sync"
 	"time"
 
-	"github.com/SigNoz/signoz/pkg/errors"
 	"github.com/SigNoz/signoz/pkg/licensing"
 )
 
@@ -18,7 +18,7 @@ func Config(pollInterval time.Duration, failureThreshold int) licensing.Config {
 	once.Do(func() {
 		config = licensing.Config{PollInterval: pollInterval, FailureThreshold: failureThreshold}
 		if err := config.Validate(); err != nil {
-			panic(errors.WrapInternalf(err, errors.CodeInternal, "invalid licensing config"))
+			panic(fmt.Errorf("invalid licensing config: %w", err))
 		}
 	})
 

ee/query-service/app/api/cloudIntegrations.go

@@ -10,6 +10,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/SigNoz/signoz/ee/query-service/constants"
 	"github.com/SigNoz/signoz/pkg/errors"
 	"github.com/SigNoz/signoz/pkg/http/render"
 	"github.com/SigNoz/signoz/pkg/modules/user"
@@ -76,7 +77,7 @@ func (ah *APIHandler) CloudIntegrationsGenerateConnectionParams(w http.ResponseW
 		return
 	}
 
-	ingestionUrl, signozApiUrl, apiErr := ah.getIngestionUrlAndSigNozAPIUrl(r.Context(), license.Key)
+	ingestionUrl, signozApiUrl, apiErr := getIngestionUrlAndSigNozAPIUrl(r.Context(), license.Key)
 	if apiErr != nil {
 		RespondError(w, basemodel.WrapApiError(
 			apiErr, "couldn't deduce ingestion url and signoz api url",
@@ -185,37 +186,48 @@ func (ah *APIHandler) getOrCreateCloudIntegrationUser(
 	return cloudIntegrationUser, nil
 }
 
-func (ah *APIHandler) getIngestionUrlAndSigNozAPIUrl(ctx context.Context, licenseKey string) (
+func getIngestionUrlAndSigNozAPIUrl(ctx context.Context, licenseKey string) (
 	string, string, *basemodel.ApiError,
 ) {
-	// TODO: remove this struct from here
+	url := fmt.Sprintf(
+		"%s%s",
+		strings.TrimSuffix(constants.ZeusURL, "/"),
+		"/v2/deployments/me",
+	)
+
 	type deploymentResponse struct {
-		Name        string `json:"name"`
-		ClusterInfo struct {
-			Region struct {
-				DNS string `json:"dns"`
-			} `json:"region"`
-		} `json:"cluster"`
+		Status string `json:"status"`
+		Error  string `json:"error"`
+		Data   struct {
+			Name string `json:"name"`
+
+			ClusterInfo struct {
+				Region struct {
+					DNS string `json:"dns"`
+				} `json:"region"`
+			} `json:"cluster"`
+		} `json:"data"`
 	}
 
-	respBytes, err := ah.Signoz.Zeus.GetDeployment(ctx, licenseKey)
-	if err != nil {
+	resp, apiErr := requestAndParseResponse[deploymentResponse](
+		ctx, url, map[string]string{"X-Signoz-Cloud-Api-Key": licenseKey}, nil,
+	)
+
+	if apiErr != nil {
+		return "", "", basemodel.WrapApiError(
+			apiErr, "couldn't query for deployment info",
+		)
+	}
+
+	if resp.Status != "success" {
 		return "", "", basemodel.InternalError(fmt.Errorf(
-			"couldn't query for deployment info: error: %w", err,
+			"couldn't query for deployment info: status: %s, error: %s",
+			resp.Status, resp.Error,
 		))
 	}
 
-	resp := new(deploymentResponse)
-
-	err = json.Unmarshal(respBytes, resp)
-	if err != nil {
-		return "", "", basemodel.InternalError(fmt.Errorf(
-			"couldn't unmarshal deployment info response: error: %w", err,
-		))
-	}
-
-	regionDns := resp.ClusterInfo.Region.DNS
-	deploymentName := resp.Name
+	regionDns := resp.Data.ClusterInfo.Region.DNS
+	deploymentName := resp.Data.Name
 
 	if len(regionDns) < 1 || len(deploymentName) < 1 {
 		// Fail early if actual response structure and expectation here ever diverge

ee/query-service/constants/constants.go

@@ -10,6 +10,9 @@ var SaasSegmentKey = GetOrDefaultEnv("SIGNOZ_SAAS_SEGMENT_KEY", "")
 var FetchFeatures = GetOrDefaultEnv("FETCH_FEATURES", "false")
 var ZeusFeaturesURL = GetOrDefaultEnv("ZEUS_FEATURES_URL", "ZeusFeaturesURL")
 
+// this is set via build time variable
+var ZeusURL = "https://api.signoz.cloud"
+
 func GetOrDefaultEnv(key string, fallback string) string {
 	v := os.Getenv(key)
 	if len(v) == 0 {

ee/sqlstore/postgressqlstore/formatter.go

@@ -1,153 +0,0 @@
-package postgressqlstore
-
-import (
-	"strings"
-
-	"github.com/SigNoz/signoz/pkg/sqlstore"
-	"github.com/uptrace/bun/schema"
-)
-
-type formatter struct {
-	bunf schema.Formatter
-}
-
-func newFormatter(dialect schema.Dialect) sqlstore.SQLFormatter {
-	return &formatter{bunf: schema.NewFormatter(dialect)}
-}
-
-func (f *formatter) JSONExtractString(column, path string) []byte {
-	var sql []byte
-	sql = f.bunf.AppendIdent(sql, column)
-	sql = append(sql, f.convertJSONPathToPostgres(path)...)
-	return sql
-}
-
-func (f *formatter) JSONType(column, path string) []byte {
-	var sql []byte
-	sql = append(sql, "jsonb_typeof("...)
-	sql = f.bunf.AppendIdent(sql, column)
-	sql = append(sql, f.convertJSONPathToPostgresWithMode(path, false)...)
-	sql = append(sql, ')')
-	return sql
-}
-
-func (f *formatter) JSONIsArray(column, path string) []byte {
-	var sql []byte
-	sql = append(sql, f.JSONType(column, path)...)
-	sql = append(sql, " = "...)
-	sql = schema.Append(f.bunf, sql, "array")
-	return sql
-}
-
-func (f *formatter) JSONArrayElements(column, path, alias string) ([]byte, []byte) {
-	var sql []byte
-	sql = append(sql, "jsonb_array_elements("...)
-	sql = f.bunf.AppendIdent(sql, column)
-	sql = append(sql, f.convertJSONPathToPostgresWithMode(path, false)...)
-	sql = append(sql, ") AS "...)
-	sql = f.bunf.AppendIdent(sql, alias)
-
-	return sql, []byte(alias)
-}
-
-func (f *formatter) JSONArrayOfStrings(column, path, alias string) ([]byte, []byte) {
-	var sql []byte
-	sql = append(sql, "jsonb_array_elements_text("...)
-	sql = f.bunf.AppendIdent(sql, column)
-	sql = append(sql, f.convertJSONPathToPostgresWithMode(path, false)...)
-	sql = append(sql, ") AS "...)
-	sql = f.bunf.AppendIdent(sql, alias)
-
-	return sql, append([]byte(alias), "::text"...)
-}
-
-func (f *formatter) JSONKeys(column, path, alias string) ([]byte, []byte) {
-	var sql []byte
-	sql = append(sql, "jsonb_each("...)
-	sql = f.bunf.AppendIdent(sql, column)
-	sql = append(sql, f.convertJSONPathToPostgresWithMode(path, false)...)
-	sql = append(sql, ") AS "...)
-	sql = f.bunf.AppendIdent(sql, alias)
-
-	return sql, append([]byte(alias), ".key"...)
-}
-
-func (f *formatter) JSONArrayAgg(expression string) []byte {
-	var sql []byte
-	sql = append(sql, "jsonb_agg("...)
-	sql = append(sql, expression...)
-	sql = append(sql, ')')
-	return sql
-}
-
-func (f *formatter) JSONArrayLiteral(values ...string) []byte {
-	var sql []byte
-	sql = append(sql, "jsonb_build_array("...)
-	for idx, value := range values {
-		if idx > 0 {
-			sql = append(sql, ", "...)
-		}
-		sql = schema.Append(f.bunf, sql, value)
-	}
-	sql = append(sql, ')')
-	return sql
-}
-
-func (f *formatter) TextToJsonColumn(column string) []byte {
-	var sql []byte
-	sql = f.bunf.AppendIdent(sql, column)
-	sql = append(sql, "::jsonb"...)
-	return sql
-}
-
-func (f *formatter) convertJSONPathToPostgres(jsonPath string) []byte {
-	return f.convertJSONPathToPostgresWithMode(jsonPath, true)
-}
-
-func (f *formatter) convertJSONPathToPostgresWithMode(jsonPath string, asText bool) []byte {
-	path := strings.TrimPrefix(strings.TrimPrefix(jsonPath, "$"), ".")
-
-	if path == "" {
-		return nil
-	}
-
-	parts := strings.Split(path, ".")
-
-	var validParts []string
-	for _, part := range parts {
-		if part != "" {
-			validParts = append(validParts, part)
-		}
-	}
-
-	if len(validParts) == 0 {
-		return nil
-	}
-
-	var result []byte
-
-	for idx, part := range validParts {
-		if idx == len(validParts)-1 {
-			if asText {
-				result = append(result, "->>"...)
-			} else {
-				result = append(result, "->"...)
-			}
-			result = schema.Append(f.bunf, result, part)
-			return result
-		}
-
-		result = append(result, "->"...)
-		result = schema.Append(f.bunf, result, part)
-	}
-
-	return result
-}
-
-func (f *formatter) LowerExpression(expression string) []byte {
-	var sql []byte
-	sql = append(sql, "lower("...)
-	sql = append(sql, expression...)
-	sql = append(sql, ')')
-	return sql
-}

ee/sqlstore/postgressqlstore/formatter_test.go

@@ -1,500 +0,0 @@
-package postgressqlstore
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/uptrace/bun/dialect/pgdialect"
-)
-
-func TestJSONExtractString(t *testing.T) {
-	tests := []struct {
-		name     string
-		column   string
-		path     string
-		expected string
-	}{
-		{
-			name:     "simple path",
-			column:   "data",
-			path:     "$.field",
-			expected: `"data"->>'field'`,
-		},
-		{
-			name:     "nested path",
-			column:   "metadata",
-			path:     "$.user.name",
-			expected: `"metadata"->'user'->>'name'`,
-		},
-		{
-			name:     "deeply nested path",
-			column:   "json_col",
-			path:     "$.level1.level2.level3",
-			expected: `"json_col"->'level1'->'level2'->>'level3'`,
-		},
-		{
-			name:     "root path",
-			column:   "json_col",
-			path:     "$",
-			expected: `"json_col"`,
-		},
-		{
-			name:     "empty path",
-			column:   "data",
-			path:     "",
-			expected: `"data"`,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			f := newFormatter(pgdialect.New())
-			got := string(f.JSONExtractString(tt.column, tt.path))
-			assert.Equal(t, tt.expected, got)
-		})
-	}
-}
-
-func TestJSONType(t *testing.T) {
-	tests := []struct {
-		name     string
-		column   string
-		path     string
-		expected string
-	}{
-		{
-			name:     "simple path",
-			column:   "data",
-			path:     "$.field",
-			expected: `jsonb_typeof("data"->'field')`,
-		},
-		{
-			name:     "nested path",
-			column:   "metadata",
-			path:     "$.user.age",
-			expected: `jsonb_typeof("metadata"->'user'->'age')`,
-		},
-		{
-			name:     "root path",
-			column:   "json_col",
-			path:     "$",
-			expected: `jsonb_typeof("json_col")`,
-		},
-		{
-			name:     "empty path",
-			column:   "data",
-			path:     "",
-			expected: `jsonb_typeof("data")`,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			f := newFormatter(pgdialect.New())
-			got := string(f.JSONType(tt.column, tt.path))
-			assert.Equal(t, tt.expected, got)
-		})
-	}
-}
-
-func TestJSONIsArray(t *testing.T) {
-	tests := []struct {
-		name     string
-		column   string
-		path     string
-		expected string
-	}{
-		{
-			name:     "simple path",
-			column:   "data",
-			path:     "$.items",
-			expected: `jsonb_typeof("data"->'items') = 'array'`,
-		},
-		{
-			name:     "nested path",
-			column:   "metadata",
-			path:     "$.user.tags",
-			expected: `jsonb_typeof("metadata"->'user'->'tags') = 'array'`,
-		},
-		{
-			name:     "root path",
-			column:   "json_col",
-			path:     "$",
-			expected: `jsonb_typeof("json_col") = 'array'`,
-		},
-		{
-			name:     "empty path",
-			column:   "data",
-			path:     "",
-			expected: `jsonb_typeof("data") = 'array'`,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			f := newFormatter(pgdialect.New())
-			got := string(f.JSONIsArray(tt.column, tt.path))
-			assert.Equal(t, tt.expected, got)
-		})
-	}
-}
-
-func TestJSONArrayElements(t *testing.T) {
-	tests := []struct {
-		name     string
-		column   string
-		path     string
-		alias    string
-		expected string
-	}{
-		{
-			name:     "root path with dollar sign",
-			column:   "data",
-			path:     "$",
-			alias:    "elem",
-			expected: `jsonb_array_elements("data") AS "elem"`,
-		},
-		{
-			name:     "root path empty",
-			column:   "data",
-			path:     "",
-			alias:    "elem",
-			expected: `jsonb_array_elements("data") AS "elem"`,
-		},
-		{
-			name:     "nested path",
-			column:   "metadata",
-			path:     "$.items",
-			alias:    "item",
-			expected: `jsonb_array_elements("metadata"->'items') AS "item"`,
-		},
-		{
-			name:     "deeply nested path",
-			column:   "json_col",
-			path:     "$.user.tags",
-			alias:    "tag",
-			expected: `jsonb_array_elements("json_col"->'user'->'tags') AS "tag"`,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			f := newFormatter(pgdialect.New())
-			got, _ := f.JSONArrayElements(tt.column, tt.path, tt.alias)
-			assert.Equal(t, tt.expected, string(got))
-		})
-	}
-}
-
-func TestJSONArrayOfStrings(t *testing.T) {
-	tests := []struct {
-		name     string
-		column   string
-		path     string
-		alias    string
-		expected string
-	}{
-		{
-			name:     "root path with dollar sign",
-			column:   "data",
-			path:     "$",
-			alias:    "str",
-			expected: `jsonb_array_elements_text("data") AS "str"`,
-		},
-		{
-			name:     "root path empty",
-			column:   "data",
-			path:     "",
-			alias:    "str",
-			expected: `jsonb_array_elements_text("data") AS "str"`,
-		},
-		{
-			name:     "nested path",
-			column:   "metadata",
-			path:     "$.strings",
-			alias:    "s",
-			expected: `jsonb_array_elements_text("metadata"->'strings') AS "s"`,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			f := newFormatter(pgdialect.New())
-			got, _ := f.JSONArrayOfStrings(tt.column, tt.path, tt.alias)
-			assert.Equal(t, tt.expected, string(got))
-		})
-	}
-}
-
-func TestJSONKeys(t *testing.T) {
-	tests := []struct {
-		name     string
-		column   string
-		path     string
-		alias    string
-		expected string
-	}{
-		{
-			name:     "root path with dollar sign",
-			column:   "data",
-			path:     "$",
-			alias:    "k",
-			expected: `jsonb_each("data") AS "k"`,
-		},
-		{
-			name:     "root path empty",
-			column:   "data",
-			path:     "",
-			alias:    "k",
-			expected: `jsonb_each("data") AS "k"`,
-		},
-		{
-			name:     "nested path",
-			column:   "metadata",
-			path:     "$.object",
-			alias:    "key",
-			expected: `jsonb_each("metadata"->'object') AS "key"`,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			f := newFormatter(pgdialect.New())
-			got, _ := f.JSONKeys(tt.column, tt.path, tt.alias)
-			assert.Equal(t, tt.expected, string(got))
-		})
-	}
-}
-
-func TestJSONArrayAgg(t *testing.T) {
-	tests := []struct {
-		name       string
-		expression string
-		expected   string
-	}{
-		{
-			name:       "simple column",
-			expression: "id",
-			expected:   "jsonb_agg(id)",
-		},
-		{
-			name:       "expression with function",
-			expression: "DISTINCT name",
-			expected:   "jsonb_agg(DISTINCT name)",
-		},
-		{
-			name:       "complex expression",
-			expression: "data->>'field'",
-			expected:   "jsonb_agg(data->>'field')",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			f := newFormatter(pgdialect.New())
-			got := string(f.JSONArrayAgg(tt.expression))
-			assert.Equal(t, tt.expected, got)
-		})
-	}
-}
-
-func TestJSONArrayLiteral(t *testing.T) {
-	tests := []struct {
-		name     string
-		values   []string
-		expected string
-	}{
-		{
-			name:     "empty array",
-			values:   []string{},
-			expected: "jsonb_build_array()",
-		},
-		{
-			name:     "single value",
-			values:   []string{"value1"},
-			expected: "jsonb_build_array('value1')",
-		},
-		{
-			name:     "multiple values",
-			values:   []string{"value1", "value2", "value3"},
-			expected: "jsonb_build_array('value1', 'value2', 'value3')",
-		},
-		{
-			name:     "values with special characters",
-			values:   []string{"test", "with space", "with-dash"},
-			expected: "jsonb_build_array('test', 'with space', 'with-dash')",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			f := newFormatter(pgdialect.New())
-			got := string(f.JSONArrayLiteral(tt.values...))
-			assert.Equal(t, tt.expected, got)
-		})
-	}
-}
-
-func TestConvertJSONPathToPostgresWithMode(t *testing.T) {
-	tests := []struct {
-		name     string
-		jsonPath string
-		asText   bool
-		expected string
-	}{
-		{
-			name:     "simple path as text",
-			jsonPath: "$.field",
-			asText:   true,
-			expected: "->>'field'",
-		},
-		{
-			name:     "simple path as json",
-			jsonPath: "$.field",
-			asText:   false,
-			expected: "->'field'",
-		},
-		{
-			name:     "nested path as text",
-			jsonPath: "$.user.name",
-			asText:   true,
-			expected: "->'user'->>'name'",
-		},
-		{
-			name:     "nested path as json",
-			jsonPath: "$.user.name",
-			asText:   false,
-			expected: "->'user'->'name'",
-		},
-		{
-			name:     "deeply nested as text",
-			jsonPath: "$.a.b.c.d",
-			asText:   true,
-			expected: "->'a'->'b'->'c'->>'d'",
-		},
-		{
-			name:     "root path",
-			jsonPath: "$",
-			asText:   true,
-			expected: "",
-		},
-		{
-			name:     "empty path",
-			jsonPath: "",
-			asText:   true,
-			expected: "",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			f := newFormatter(pgdialect.New()).(*formatter)
-			got := string(f.convertJSONPathToPostgresWithMode(tt.jsonPath, tt.asText))
-			assert.Equal(t, tt.expected, got)
-		})
-	}
-}
-
-func TestTextToJsonColumn(t *testing.T) {
-	tests := []struct {
-		name     string
-		column   string
-		expected string
-	}{
-		{
-			name:     "simple column name",
-			column:   "data",
-			expected: `"data"::jsonb`,
-		},
-		{
-			name:     "column with underscore",
-			column:   "user_data",
-			expected: `"user_data"::jsonb`,
-		},
-		{
-			name:     "column with special characters",
-			column:   "json-col",
-			expected: `"json-col"::jsonb`,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			f := newFormatter(pgdialect.New())
-			got := string(f.TextToJsonColumn(tt.column))
-			assert.Equal(t, tt.expected, got)
-		})
-	}
-}
-
-func TestLowerExpression(t *testing.T) {
-	tests := []struct {
-		name     string
-		expr     string
-		expected string
-	}{
-		{
-			name:     "simple column name",
-			expr:     "name",
-			expected: "lower(name)",
-		},
-		{
-			name:     "quoted column identifier",
-			expr:     `"column_name"`,
-			expected: `lower("column_name")`,
-		},
-		{
-			name:     "jsonb text extraction",
-			expr:     "data->>'field'",
-			expected: "lower(data->>'field')",
-		},
-		{
-			name:     "nested jsonb extraction",
-			expr:     "metadata->'user'->>'name'",
-			expected: "lower(metadata->'user'->>'name')",
-		},
-		{
-			name:     "jsonb_typeof expression",
-			expr:     "jsonb_typeof(data->'field')",
-			expected: "lower(jsonb_typeof(data->'field'))",
-		},
-		{
-			name:     "string concatenation",
-			expr:     "first_name || ' ' || last_name",
-			expected: "lower(first_name || ' ' || last_name)",
-		},
-		{
-			name:     "CAST expression",
-			expr:     "CAST(value AS TEXT)",
-			expected: "lower(CAST(value AS TEXT))",
-		},
-		{
-			name:     "COALESCE expression",
-			expr:     "COALESCE(name, 'default')",
-			expected: "lower(COALESCE(name, 'default'))",
-		},
-		{
-			name:     "subquery column",
-			expr:     "users.email",
-			expected: "lower(users.email)",
-		},
-		{
-			name:     "quoted identifier with special chars",
-			expr:     `"user-name"`,
-			expected: `lower("user-name")`,
-		},
-		{
-			name:     "jsonb to text cast",
-			expr:     "data::text",
-			expected: "lower(data::text)",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			f := newFormatter(pgdialect.New())
-			got := string(f.LowerExpression(tt.expr))
-			assert.Equal(t, tt.expected, got)
-		})
-	}
-}

ee/sqlstore/postgressqlstore/provider.go

@@ -15,11 +15,10 @@ import (
 )
 
 type provider struct {
-	settings  factory.ScopedProviderSettings
-	sqldb     *sql.DB
-	bundb     *sqlstore.BunDB
-	dialect   *dialect
-	formatter sqlstore.SQLFormatter
+	settings factory.ScopedProviderSettings
+	sqldb    *sql.DB
+	bundb    *sqlstore.BunDB
+	dialect  *dialect
 }
 
 func NewFactory(hookFactories ...factory.ProviderFactory[sqlstore.SQLStoreHook, sqlstore.Config]) factory.ProviderFactory[sqlstore.SQLStore, sqlstore.Config] {
@@ -56,14 +55,11 @@ func New(ctx context.Context, providerSettings factory.ProviderSettings, config
 
 	sqldb := stdlib.OpenDBFromPool(pool)
 
-	pgDialect := pgdialect.New()
-	bunDB := sqlstore.NewBunDB(settings, sqldb, pgDialect, hooks)
 	return &provider{
-		settings:  settings,
-		sqldb:     sqldb,
-		bundb:     bunDB,
-		dialect:   new(dialect),
-		formatter: newFormatter(bunDB.Dialect()),
+		settings: settings,
+		sqldb:    sqldb,
+		bundb:    sqlstore.NewBunDB(settings, sqldb, pgdialect.New(), hooks),
+		dialect:  new(dialect),
 	}, nil
 }
 
@@ -79,10 +75,6 @@ func (provider *provider) Dialect() sqlstore.SQLDialect {
 	return provider.dialect
 }
 
-func (provider *provider) Formatter() sqlstore.SQLFormatter {
-	return provider.formatter
-}
-
 func (provider *provider) BunDBCtx(ctx context.Context) bun.IDB {
 	return provider.bundb.BunDBCtx(ctx)
 }

ee/zeus/config.go

@@ -1,10 +1,10 @@
 package zeus
 
 import (
+	"fmt"
 	neturl "net/url"
 	"sync"
 
-	"github.com/SigNoz/signoz/pkg/errors"
 	"github.com/SigNoz/signoz/pkg/zeus"
 )
 
@@ -24,17 +24,17 @@ func Config() zeus.Config {
 	once.Do(func() {
 		parsedURL, err := neturl.Parse(url)
 		if err != nil {
-			panic(errors.WrapInternalf(err, errors.CodeInternal, "invalid zeus URL"))
+			panic(fmt.Errorf("invalid zeus URL: %w", err))
 		}
 
 		deprecatedParsedURL, err := neturl.Parse(deprecatedURL)
 		if err != nil {
-			panic(errors.WrapInternalf(err, errors.CodeInternal, "invalid zeus deprecated URL"))
+			panic(fmt.Errorf("invalid zeus deprecated URL: %w", err))
 		}
 
 		config = zeus.Config{URL: parsedURL, DeprecatedURL: deprecatedParsedURL}
 		if err := config.Validate(); err != nil {
-			panic(errors.WrapInternalf(err, errors.CodeInternal, "invalid zeus config"))
+			panic(fmt.Errorf("invalid zeus config: %w", err))
 		}
 	})
 

frontend/package.json

@@ -69,7 +69,7 @@
 		"antd": "5.11.0",
 		"antd-table-saveas-excel": "2.2.1",
 		"antlr4": "4.13.2",
-		"axios": "1.12.0",
+		"axios": "1.8.2",
 		"babel-eslint": "^10.1.0",
 		"babel-jest": "^29.6.4",
 		"babel-loader": "9.1.3",

frontend/src/AppRoutes/index.tsx

@@ -27,6 +27,7 @@ import { IUser } from 'providers/App/types';
 import { DashboardProvider } from 'providers/Dashboard/Dashboard';
 import { ErrorModalProvider } from 'providers/ErrorModalProvider';
 import { KBarCommandPaletteProvider } from 'providers/KBarCommandPaletteProvider';
+import { MarkersProvider } from 'providers/Markers/Markers';
 import { PreferenceContextProvider } from 'providers/preferences/context/PreferenceContextProvider';
 import { QueryBuilderProvider } from 'providers/QueryBuilder';
 import { Suspense, useCallback, useEffect, useState } from 'react';
@@ -379,30 +380,34 @@ function App(): JSX.Element {
 									<PrivateRoute>
 										<ResourceProvider>
 											<QueryBuilderProvider>
-												<DashboardProvider>
-													<KeyboardHotkeysProvider>
-														<AlertRuleProvider>
-															<AppLayout>
-																<PreferenceContextProvider>
-																	<Suspense fallback={<Spinner size="large" tip="Loading..." />}>
-																		<Switch>
-																			{routes.map(({ path, component, exact }) => (
-																				<Route
-																					key={`${path}`}
-																					exact={exact}
-																					path={path}
-																					component={component}
-																				/>
-																			))}
-																			<Route exact path="/" component={Home} />
-																			<Route path="*" component={NotFound} />
-																		</Switch>
-																	</Suspense>
-																</PreferenceContextProvider>
-															</AppLayout>
-														</AlertRuleProvider>
-													</KeyboardHotkeysProvider>
-												</DashboardProvider>
+												<MarkersProvider>
+													<DashboardProvider>
+														<KeyboardHotkeysProvider>
+															<AlertRuleProvider>
+																<AppLayout>
+																	<PreferenceContextProvider>
+																		<Suspense
+																			fallback={<Spinner size="large" tip="Loading..." />}
+																		>
+																			<Switch>
+																				{routes.map(({ path, component, exact }) => (
+																					<Route
+																						key={`${path}`}
+																						exact={exact}
+																						path={path}
+																						component={component}
+																					/>
+																				))}
+																				<Route exact path="/" component={Home} />
+																				<Route path="*" component={NotFound} />
+																			</Switch>
+																		</Suspense>
+																	</PreferenceContextProvider>
+																</AppLayout>
+															</AlertRuleProvider>
+														</KeyboardHotkeysProvider>
+													</DashboardProvider>
+												</MarkersProvider>
 											</QueryBuilderProvider>
 										</ResourceProvider>
 									</PrivateRoute>

frontend/src/api/metricsExplorer/updateMetricMetadata.ts

@@ -9,7 +9,6 @@ export interface UpdateMetricMetadataProps {
 	metricType: MetricType;
 	temporality?: Temporality;
 	isMonotonic?: boolean;
-	unit?: string;
 }
 
 export interface UpdateMetricMetadataResponse {

frontend/src/api/settings/setRetentionV2.ts

@@ -8,7 +8,7 @@ const setRetentionV2 = async ({
 	type,
 	defaultTTLDays,
 	coldStorageVolume,
-	coldStorageDurationDays,
+	coldStorageDuration,
 	ttlConditions,
 }: PropsV2): Promise<SuccessResponseV2<PayloadPropsV2>> => {
 	try {
@@ -16,7 +16,7 @@ const setRetentionV2 = async ({
 			type,
 			defaultTTLDays,
 			coldStorageVolume,
-			coldStorageDurationDays,
+			coldStorageDuration,
 			ttlConditions,
 		});
 

frontend/src/api/trace/getSpanPercentiles.ts

@@ -1,28 +0,0 @@
-import { ApiBaseInstance } from 'api';
-import { ErrorResponseHandlerV2 } from 'api/ErrorResponseHandlerV2';
-import { AxiosError } from 'axios';
-import { ErrorV2Resp, SuccessResponseV2 } from 'types/api';
-import {
-	GetSpanPercentilesProps,
-	GetSpanPercentilesResponseDataProps,
-} from 'types/api/trace/getSpanPercentiles';
-
-const getSpanPercentiles = async (
-	props: GetSpanPercentilesProps,
-): Promise<SuccessResponseV2<GetSpanPercentilesResponseDataProps>> => {
-	try {
-		const response = await ApiBaseInstance.post('/span_percentile', {
-			...props,
-		});
-
-		return {
-			httpStatusCode: response.status,
-			data: response.data.data,
-		};
-	} catch (error) {
-		ErrorResponseHandlerV2(error as AxiosError<ErrorV2Resp>);
-		throw error;
-	}
-};
-
-export default getSpanPercentiles;

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

@@ -11,7 +11,7 @@ import {
 export const getQueryRangeV5 = async (
 	props: QueryRangePayloadV5,
 	version: string,
-	signal?: AbortSignal,
+	signal: AbortSignal,
 	headers?: Record<string, string>,
 ): Promise<SuccessResponseV2<MetricRangePayloadV5>> => {
 	try {

frontend/src/components/Graph/__tests__/yAxisConfig.test.ts

@@ -1,371 +0,0 @@
-/* eslint-disable sonarjs/no-duplicate-string */
-import { getYAxisFormattedValue, PrecisionOptionsEnum } from '../yAxisConfig';
-
-const testFullPrecisionGetYAxisFormattedValue = (
-	value: string,
-	format: string,
-): string => getYAxisFormattedValue(value, format, PrecisionOptionsEnum.FULL);
-
-describe('getYAxisFormattedValue - none (full precision legacy assertions)', () => {
-	test('large integers and decimals', () => {
-		expect(testFullPrecisionGetYAxisFormattedValue('250034', 'none')).toBe(
-			'250034',
-		);
-		expect(
-			testFullPrecisionGetYAxisFormattedValue('250034897.12345', 'none'),
-		).toBe('250034897.12345');
-		expect(
-			testFullPrecisionGetYAxisFormattedValue('250034897.02354', 'none'),
-		).toBe('250034897.02354');
-		expect(testFullPrecisionGetYAxisFormattedValue('9999999.9999', 'none')).toBe(
-			'9999999.9999',
-		);
-	});
-
-	test('preserves leading zeros after decimal until first non-zero', () => {
-		expect(testFullPrecisionGetYAxisFormattedValue('1.0000234', 'none')).toBe(
-			'1.0000234',
-		);
-		expect(testFullPrecisionGetYAxisFormattedValue('0.00003', 'none')).toBe(
-			'0.00003',
-		);
-	});
-
-	test('trims to three significant decimals and removes trailing zeros', () => {
-		expect(
-			testFullPrecisionGetYAxisFormattedValue('0.000000250034', 'none'),
-		).toBe('0.000000250034');
-		expect(testFullPrecisionGetYAxisFormattedValue('0.00000025', 'none')).toBe(
-			'0.00000025',
-		);
-
-		// Big precision, limiting the javascript precision (~16 digits)
-		expect(
-			testFullPrecisionGetYAxisFormattedValue('1.0000000000000001', 'none'),
-		).toBe('1');
-		expect(
-			testFullPrecisionGetYAxisFormattedValue('1.00555555559595876', 'none'),
-		).toBe('1.005555555595958');
-
-		expect(testFullPrecisionGetYAxisFormattedValue('0.000000001', 'none')).toBe(
-			'0.000000001',
-		);
-		expect(
-			testFullPrecisionGetYAxisFormattedValue('0.000000250000', 'none'),
-		).toBe('0.00000025');
-	});
-
-	test('whole numbers normalize', () => {
-		expect(testFullPrecisionGetYAxisFormattedValue('1000', 'none')).toBe('1000');
-		expect(testFullPrecisionGetYAxisFormattedValue('99.5458', 'none')).toBe(
-			'99.5458',
-		);
-		expect(testFullPrecisionGetYAxisFormattedValue('1.234567', 'none')).toBe(
-			'1.234567',
-		);
-		expect(testFullPrecisionGetYAxisFormattedValue('99.998', 'none')).toBe(
-			'99.998',
-		);
-	});
-
-	test('strip redundant decimal zeros', () => {
-		expect(testFullPrecisionGetYAxisFormattedValue('1000.000', 'none')).toBe(
-			'1000',
-		);
-		expect(testFullPrecisionGetYAxisFormattedValue('99.500', 'none')).toBe(
-			'99.5',
-		);
-		expect(testFullPrecisionGetYAxisFormattedValue('1.000', 'none')).toBe('1');
-	});
-
-	test('edge values', () => {
-		expect(testFullPrecisionGetYAxisFormattedValue('0', 'none')).toBe('0');
-		expect(testFullPrecisionGetYAxisFormattedValue('-0', 'none')).toBe('0');
-		expect(testFullPrecisionGetYAxisFormattedValue('Infinity', 'none')).toBe('∞');
-		expect(testFullPrecisionGetYAxisFormattedValue('-Infinity', 'none')).toBe(
-			'-∞',
-		);
-		expect(testFullPrecisionGetYAxisFormattedValue('invalid', 'none')).toBe(
-			'NaN',
-		);
-		expect(testFullPrecisionGetYAxisFormattedValue('', 'none')).toBe('NaN');
-		expect(testFullPrecisionGetYAxisFormattedValue('abc123', 'none')).toBe('NaN');
-	});
-
-	test('small decimals keep precision as-is', () => {
-		expect(testFullPrecisionGetYAxisFormattedValue('0.0001', 'none')).toBe(
-			'0.0001',
-		);
-		expect(testFullPrecisionGetYAxisFormattedValue('-0.0001', 'none')).toBe(
-			'-0.0001',
-		);
-		expect(testFullPrecisionGetYAxisFormattedValue('0.000000001', 'none')).toBe(
-			'0.000000001',
-		);
-	});
-
-	test('simple decimals preserved', () => {
-		expect(testFullPrecisionGetYAxisFormattedValue('0.1', 'none')).toBe('0.1');
-		expect(testFullPrecisionGetYAxisFormattedValue('0.2', 'none')).toBe('0.2');
-		expect(testFullPrecisionGetYAxisFormattedValue('0.3', 'none')).toBe('0.3');
-		expect(testFullPrecisionGetYAxisFormattedValue('1.0000000001', 'none')).toBe(
-			'1.0000000001',
-		);
-	});
-});
-
-describe('getYAxisFormattedValue - units (full precision legacy assertions)', () => {
-	test('ms', () => {
-		expect(testFullPrecisionGetYAxisFormattedValue('1500', 'ms')).toBe('1.5 s');
-		expect(testFullPrecisionGetYAxisFormattedValue('500', 'ms')).toBe('500 ms');
-		expect(testFullPrecisionGetYAxisFormattedValue('60000', 'ms')).toBe('1 min');
-		expect(testFullPrecisionGetYAxisFormattedValue('295.429', 'ms')).toBe(
-			'295.429 ms',
-		);
-		expect(testFullPrecisionGetYAxisFormattedValue('4353.81', 'ms')).toBe(
-			'4.35381 s',
-		);
-	});
-
-	test('s', () => {
-		expect(testFullPrecisionGetYAxisFormattedValue('90', 's')).toBe('1.5 mins');
-		expect(testFullPrecisionGetYAxisFormattedValue('30', 's')).toBe('30 s');
-		expect(testFullPrecisionGetYAxisFormattedValue('3600', 's')).toBe('1 hour');
-	});
-
-	test('m', () => {
-		expect(testFullPrecisionGetYAxisFormattedValue('90', 'm')).toBe('1.5 hours');
-		expect(testFullPrecisionGetYAxisFormattedValue('30', 'm')).toBe('30 min');
-		expect(testFullPrecisionGetYAxisFormattedValue('1440', 'm')).toBe('1 day');
-	});
-
-	test('bytes', () => {
-		expect(testFullPrecisionGetYAxisFormattedValue('1024', 'bytes')).toBe(
-			'1 KiB',
-		);
-		expect(testFullPrecisionGetYAxisFormattedValue('512', 'bytes')).toBe('512 B');
-		expect(testFullPrecisionGetYAxisFormattedValue('1536', 'bytes')).toBe(
-			'1.5 KiB',
-		);
-	});
-
-	test('mbytes', () => {
-		expect(testFullPrecisionGetYAxisFormattedValue('1024', 'mbytes')).toBe(
-			'1 GiB',
-		);
-		expect(testFullPrecisionGetYAxisFormattedValue('512', 'mbytes')).toBe(
-			'512 MiB',
-		);
-		expect(testFullPrecisionGetYAxisFormattedValue('1536', 'mbytes')).toBe(
-			'1.5 GiB',
-		);
-	});
-
-	test('kbytes', () => {
-		expect(testFullPrecisionGetYAxisFormattedValue('1024', 'kbytes')).toBe(
-			'1 MiB',
-		);
-		expect(testFullPrecisionGetYAxisFormattedValue('512', 'kbytes')).toBe(
-			'512 KiB',
-		);
-		expect(testFullPrecisionGetYAxisFormattedValue('1536', 'kbytes')).toBe(
-			'1.5 MiB',
-		);
-	});
-
-	test('short', () => {
-		expect(testFullPrecisionGetYAxisFormattedValue('1000', 'short')).toBe('1 K');
-		expect(testFullPrecisionGetYAxisFormattedValue('1500', 'short')).toBe(
-			'1.5 K',
-		);
-		expect(testFullPrecisionGetYAxisFormattedValue('999', 'short')).toBe('999');
-
-		expect(testFullPrecisionGetYAxisFormattedValue('1000000', 'short')).toBe(
-			'1 Mil',
-		);
-		expect(testFullPrecisionGetYAxisFormattedValue('1555600', 'short')).toBe(
-			'1.5556 Mil',
-		);
-		expect(testFullPrecisionGetYAxisFormattedValue('999999', 'short')).toBe(
-			'999.999 K',
-		);
-
-		expect(testFullPrecisionGetYAxisFormattedValue('1000000000', 'short')).toBe(
-			'1 Bil',
-		);
-		expect(testFullPrecisionGetYAxisFormattedValue('1500000000', 'short')).toBe(
-			'1.5 Bil',
-		);
-		expect(testFullPrecisionGetYAxisFormattedValue('999999999', 'short')).toBe(
-			'999.999999 Mil',
-		);
-	});
-
-	test('percent', () => {
-		expect(testFullPrecisionGetYAxisFormattedValue('0.15', 'percent')).toBe(
-			'0.15%',
-		);
-		expect(testFullPrecisionGetYAxisFormattedValue('0.1234', 'percent')).toBe(
-			'0.1234%',
-		);
-		expect(testFullPrecisionGetYAxisFormattedValue('0.123499', 'percent')).toBe(
-			'0.123499%',
-		);
-		expect(testFullPrecisionGetYAxisFormattedValue('1.5', 'percent')).toBe(
-			'1.5%',
-		);
-		expect(testFullPrecisionGetYAxisFormattedValue('0.0001', 'percent')).toBe(
-			'0.0001%',
-		);
-		expect(
-			testFullPrecisionGetYAxisFormattedValue('0.000000001', 'percent'),
-		).toBe('1e-9%');
-		expect(
-			testFullPrecisionGetYAxisFormattedValue('0.000000250034', 'percent'),
-		).toBe('0.000000250034%');
-		expect(testFullPrecisionGetYAxisFormattedValue('0.00000025', 'percent')).toBe(
-			'0.00000025%',
-		);
-		// Big precision, limiting the javascript precision (~16 digits)
-		expect(
-			testFullPrecisionGetYAxisFormattedValue('1.0000000000000001', 'percent'),
-		).toBe('1%');
-		expect(
-			testFullPrecisionGetYAxisFormattedValue('1.00555555559595876', 'percent'),
-		).toBe('1.005555555595958%');
-	});
-
-	test('ratio', () => {
-		expect(testFullPrecisionGetYAxisFormattedValue('0.5', 'ratio')).toBe(
-			'0.5 ratio',
-		);
-		expect(testFullPrecisionGetYAxisFormattedValue('1.25', 'ratio')).toBe(
-			'1.25 ratio',
-		);
-		expect(testFullPrecisionGetYAxisFormattedValue('2.0', 'ratio')).toBe(
-			'2 ratio',
-		);
-	});
-
-	test('temperature units', () => {
-		expect(testFullPrecisionGetYAxisFormattedValue('25', 'celsius')).toBe(
-			'25 °C',
-		);
-		expect(testFullPrecisionGetYAxisFormattedValue('0', 'celsius')).toBe('0 °C');
-		expect(testFullPrecisionGetYAxisFormattedValue('-10', 'celsius')).toBe(
-			'-10 °C',
-		);
-
-		expect(testFullPrecisionGetYAxisFormattedValue('77', 'fahrenheit')).toBe(
-			'77 °F',
-		);
-		expect(testFullPrecisionGetYAxisFormattedValue('32', 'fahrenheit')).toBe(
-			'32 °F',
-		);
-		expect(testFullPrecisionGetYAxisFormattedValue('14', 'fahrenheit')).toBe(
-			'14 °F',
-		);
-	});
-
-	test('ms edge cases', () => {
-		expect(testFullPrecisionGetYAxisFormattedValue('0', 'ms')).toBe('0 ms');
-		expect(testFullPrecisionGetYAxisFormattedValue('-1500', 'ms')).toBe('-1.5 s');
-		expect(testFullPrecisionGetYAxisFormattedValue('Infinity', 'ms')).toBe('∞');
-	});
-
-	test('bytes edge cases', () => {
-		expect(testFullPrecisionGetYAxisFormattedValue('0', 'bytes')).toBe('0 B');
-		expect(testFullPrecisionGetYAxisFormattedValue('-1024', 'bytes')).toBe(
-			'-1 KiB',
-		);
-	});
-});
-
-describe('getYAxisFormattedValue - precision option tests', () => {
-	test('precision 0 drops decimal part', () => {
-		expect(getYAxisFormattedValue('1.2345', 'none', 0)).toBe('1');
-		expect(getYAxisFormattedValue('0.9999', 'none', 0)).toBe('0');
-		expect(getYAxisFormattedValue('12345.6789', 'none', 0)).toBe('12345');
-		expect(getYAxisFormattedValue('0.0000123456', 'none', 0)).toBe('0');
-		expect(getYAxisFormattedValue('1000.000', 'none', 0)).toBe('1000');
-		expect(getYAxisFormattedValue('0.000000250034', 'none', 0)).toBe('0');
-		expect(getYAxisFormattedValue('1.00555555559595876', 'none', 0)).toBe('1');
-
-		// with unit
-		expect(getYAxisFormattedValue('4353.81', 'ms', 0)).toBe('4 s');
-	});
-	test('precision 1,2,3,4 decimals', () => {
-		expect(getYAxisFormattedValue('1.2345', 'none', 1)).toBe('1.2');
-		expect(getYAxisFormattedValue('1.2345', 'none', 2)).toBe('1.23');
-		expect(getYAxisFormattedValue('1.2345', 'none', 3)).toBe('1.234');
-		expect(getYAxisFormattedValue('1.2345', 'none', 4)).toBe('1.2345');
-
-		expect(getYAxisFormattedValue('0.0000123456', 'none', 1)).toBe('0.00001');
-		expect(getYAxisFormattedValue('0.0000123456', 'none', 2)).toBe('0.000012');
-		expect(getYAxisFormattedValue('0.0000123456', 'none', 3)).toBe('0.0000123');
-		expect(getYAxisFormattedValue('0.0000123456', 'none', 4)).toBe('0.00001234');
-
-		expect(getYAxisFormattedValue('1000.000', 'none', 1)).toBe('1000');
-		expect(getYAxisFormattedValue('1000.000', 'none', 2)).toBe('1000');
-		expect(getYAxisFormattedValue('1000.000', 'none', 3)).toBe('1000');
-		expect(getYAxisFormattedValue('1000.000', 'none', 4)).toBe('1000');
-
-		expect(getYAxisFormattedValue('0.000000250034', 'none', 1)).toBe('0.0000002');
-		expect(getYAxisFormattedValue('0.000000250034', 'none', 2)).toBe(
-			'0.00000025',
-		); // leading zeros + 2 significant => same trimmed
-		expect(getYAxisFormattedValue('0.000000250034', 'none', 3)).toBe(
-			'0.00000025',
-		);
-		expect(getYAxisFormattedValue('0.000000250304', 'none', 4)).toBe(
-			'0.0000002503',
-		);
-
-		expect(getYAxisFormattedValue('1.00555555559595876', 'none', 1)).toBe(
-			'1.005',
-		);
-		expect(getYAxisFormattedValue('1.00555555559595876', 'none', 2)).toBe(
-			'1.0055',
-		);
-		expect(getYAxisFormattedValue('1.00555555559595876', 'none', 3)).toBe(
-			'1.00555',
-		);
-		expect(getYAxisFormattedValue('1.00555555559595876', 'none', 4)).toBe(
-			'1.005555',
-		);
-
-		// with unit
-		expect(getYAxisFormattedValue('4353.81', 'ms', 1)).toBe('4.4 s');
-		expect(getYAxisFormattedValue('4353.81', 'ms', 2)).toBe('4.35 s');
-		expect(getYAxisFormattedValue('4353.81', 'ms', 3)).toBe('4.354 s');
-		expect(getYAxisFormattedValue('4353.81', 'ms', 4)).toBe('4.3538 s');
-
-		// Percentages
-		expect(getYAxisFormattedValue('0.123456', 'percent', 2)).toBe('0.12%');
-		expect(getYAxisFormattedValue('0.123456', 'percent', 4)).toBe('0.1235%'); // approximation
-	});
-
-	test('precision full uses up to DEFAULT_SIGNIFICANT_DIGITS significant digits', () => {
-		expect(
-			getYAxisFormattedValue(
-				'0.00002625429914148441',
-				'none',
-				PrecisionOptionsEnum.FULL,
-			),
-		).toBe('0.000026254299141');
-		expect(
-			getYAxisFormattedValue(
-				'0.000026254299141484417',
-				's',
-				PrecisionOptionsEnum.FULL,
-			),
-		).toBe('26254299141484417000000 µs');
-
-		expect(
-			getYAxisFormattedValue('4353.81', 'ms', PrecisionOptionsEnum.FULL),
-		).toBe('4.35381 s');
-		expect(getYAxisFormattedValue('500', 'ms', PrecisionOptionsEnum.FULL)).toBe(
-			'500 ms',
-		);
-	});
-});

frontend/src/components/Graph/yAxisConfig.ts

@@ -1,158 +1,58 @@
-/* eslint-disable sonarjs/cognitive-complexity */
 import { formattedValueToString, getValueFormat } from '@grafana/data';
-import * as Sentry from '@sentry/react';
-import { isNaN } from 'lodash-es';
 
-const DEFAULT_SIGNIFICANT_DIGITS = 15;
-// max decimals to keep should not exceed 15 decimal places to avoid floating point precision issues
-const MAX_DECIMALS = 15;
-
-export enum PrecisionOptionsEnum {
-	ZERO = 0,
-	ONE = 1,
-	TWO = 2,
-	THREE = 3,
-	FOUR = 4,
-	FULL = 'full',
-}
-export type PrecisionOption = 0 | 1 | 2 | 3 | 4 | PrecisionOptionsEnum.FULL;
-
-/**
- * Formats a number for display, preserving leading zeros after the decimal point
- * and showing up to DEFAULT_SIGNIFICANT_DIGITS digits after the first non-zero decimal digit.
- * It avoids scientific notation and removes unnecessary trailing zeros.
- *
- * @example
- * formatDecimalWithLeadingZeros(1.2345); // "1.2345"
- * formatDecimalWithLeadingZeros(0.0012345); // "0.0012345"
- * formatDecimalWithLeadingZeros(5.0); // "5"
- *
- * @param value The number to format.
- * @returns The formatted string.
- */
-const formatDecimalWithLeadingZeros = (
-	value: number,
-	precision: PrecisionOption,
-): string => {
-	if (value === 0) {
-		return '0';
-	}
-
-	// Use toLocaleString to get a full decimal representation without scientific notation.
-	const numStr = value.toLocaleString('en-US', {
-		useGrouping: false,
-		maximumFractionDigits: 20,
-	});
-
-	const [integerPart, decimalPart = ''] = numStr.split('.');
-
-	// If there's no decimal part, the integer part is the result.
-	if (!decimalPart) {
-		return integerPart;
-	}
-
-	// Find the index of the first non-zero digit in the decimal part.
-	const firstNonZeroIndex = decimalPart.search(/[^0]/);
-
-	// If the decimal part consists only of zeros, return just the integer part.
-	if (firstNonZeroIndex === -1) {
-		return integerPart;
-	}
-
-	// Determine the number of decimals to keep: leading zeros + up to N significant digits.
-	const significantDigits =
-		precision === PrecisionOptionsEnum.FULL
-			? DEFAULT_SIGNIFICANT_DIGITS
-			: precision;
-	const decimalsToKeep = firstNonZeroIndex + (significantDigits || 0);
-
-	// max decimals to keep should not exceed 15 decimal places to avoid floating point precision issues
-	const finalDecimalsToKeep = Math.min(decimalsToKeep, MAX_DECIMALS);
-	const trimmedDecimalPart = decimalPart.substring(0, finalDecimalsToKeep);
-
-	// If precision is 0, we drop the decimal part entirely.
-	if (precision === 0) {
-		return integerPart;
-	}
-
-	// Remove any trailing zeros from the result to keep it clean.
-	const finalDecimalPart = trimmedDecimalPart.replace(/0+$/, '');
-
-	// Return the integer part, or the integer and decimal parts combined.
-	return finalDecimalPart ? `${integerPart}.${finalDecimalPart}` : integerPart;
-};
-
-/**
- * Formats a Y-axis value based on a given format string.
- *
- * @param value The string value from the axis.
- * @param format The format identifier (e.g. 'none', 'ms', 'bytes', 'short').
- * @returns A formatted string ready for display.
- */
 export const getYAxisFormattedValue = (
 	value: string,
 	format: string,
-	precision: PrecisionOption = 2, // default precision requested
 ): string => {
-	const numValue = parseFloat(value);
-
-	// Handle non-numeric or special values first.
-	if (isNaN(numValue)) return 'NaN';
-	if (numValue === Infinity) return '∞';
-	if (numValue === -Infinity) return '-∞';
-
-	const decimalPlaces = value.split('.')[1]?.length || undefined;
-
-	// Use custom formatter for the 'none' format honoring precision
-	if (format === 'none') {
-		return formatDecimalWithLeadingZeros(numValue, precision);
-	}
-
-	// For all other standard formats, delegate to grafana/data's built-in formatter.
-	const computeDecimals = (): number | undefined => {
-		if (precision === PrecisionOptionsEnum.FULL) {
-			return decimalPlaces && decimalPlaces >= DEFAULT_SIGNIFICANT_DIGITS
-				? decimalPlaces
-				: DEFAULT_SIGNIFICANT_DIGITS;
-		}
-		return precision;
-	};
-
-	const fallbackFormat = (): string => {
-		if (precision === PrecisionOptionsEnum.FULL) return numValue.toString();
-		if (precision === 0) return Math.round(numValue).toString();
-		return precision !== undefined
-			? numValue
-					.toFixed(precision)
-					.replace(/(\.[0-9]*[1-9])0+$/, '$1') // trimming zeros
-					.replace(/\.$/, '')
-			: numValue.toString();
-	};
-
+	let decimalPrecision: number | undefined;
+	const parsedValue = getValueFormat(format)(
+		parseFloat(value),
+		undefined,
+		undefined,
+		undefined,
+	);
 	try {
-		const formatter = getValueFormat(format);
-		const formattedValue = formatter(numValue, computeDecimals(), undefined);
-		if (formattedValue.text && formattedValue.text.includes('.')) {
-			formattedValue.text = formatDecimalWithLeadingZeros(
-				parseFloat(formattedValue.text),
-				precision,
-			);
+		const decimalSplitted = parsedValue.text.split('.');
+		if (decimalSplitted.length === 1) {
+			decimalPrecision = 0;
+		} else {
+			const decimalDigits = decimalSplitted[1].split('');
+			decimalPrecision = decimalDigits.length;
+			let nonZeroCtr = 0;
+			for (let idx = 0; idx < decimalDigits.length; idx += 1) {
+				if (decimalDigits[idx] !== '0') {
+					nonZeroCtr += 1;
+					if (nonZeroCtr >= 2) {
+						decimalPrecision = idx + 1;
+					}
+				} else if (nonZeroCtr) {
+					decimalPrecision = idx;
+					break;
+				}
+			}
 		}
-		return formattedValueToString(formattedValue);
+
+		return formattedValueToString(
+			getValueFormat(format)(
+				parseFloat(value),
+				decimalPrecision,
+				undefined,
+				undefined,
+			),
+		);
 	} catch (error) {
-		Sentry.captureEvent({
-			message: `Error applying formatter: ${
-				error instanceof Error ? error.message : 'Unknown error'
-			}`,
-			level: 'error',
-		});
-		return fallbackFormat();
+		console.error(error);
 	}
+	return `${parseFloat(value)}`;
 };
 
-export const getToolTipValue = (
-	value: string | number,
-	format?: string,
-	precision?: PrecisionOption,
-): string =>
-	getYAxisFormattedValue(value?.toString(), format || 'none', precision);
+export const getToolTipValue = (value: string, format?: string): string => {
+	try {
+		return formattedValueToString(
+			getValueFormat(format)(parseFloat(value), undefined, undefined, undefined),
+		);
+	} catch (error) {
+		console.error(error);
+	}
+	return `${value}`;
+};

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

@@ -60,14 +60,6 @@ function Metrics({
 		setElement,
 	} = useMultiIntersectionObserver(hostWidgetInfo.length, { threshold: 0.1 });
 
-	const legendScrollPositionRef = useRef<{
-		scrollTop: number;
-		scrollLeft: number;
-	}>({
-		scrollTop: 0,
-		scrollLeft: 0,
-	});
-
 	const queryPayloads = useMemo(
 		() =>
 			getHostQueryPayload(
@@ -155,13 +147,6 @@ function Metrics({
 					maxTimeScale: graphTimeIntervals[idx].end,
 					onDragSelect: (start, end) => onDragSelect(start, end, idx),
 					query: currentQuery,
-					legendScrollPosition: legendScrollPositionRef.current,
-					setLegendScrollPosition: (position: {
-						scrollTop: number;
-						scrollLeft: number;
-					}) => {
-						legendScrollPositionRef.current = position;
-					},
 				}),
 			),
 		[

frontend/src/components/LogDetail/LogDetails.styles.scss

@@ -132,9 +132,9 @@
 			justify-content: center;
 		}
 
-		.log-detail-drawer__actions {
+		.json-action-btn {
 			display: flex;
-			gap: 4px;
+			gap: 8px;
 		}
 	}
 

frontend/src/components/LogDetail/index.tsx

@@ -319,35 +319,31 @@ function LogDetailInner({
 					</Radio.Button>
 				</Radio.Group>
 
-				<div className="log-detail-drawer__actions">
-					{selectedView === VIEW_TYPES.CONTEXT && (
-						<Tooltip
-							title="Show Filters"
-							placement="topLeft"
-							aria-label="Show Filters"
-						>
-							<Button
-								className="action-btn"
-								icon={<Filter size={16} />}
-								onClick={handleFilterVisible}
-							/>
-						</Tooltip>
-					)}
-
-					<Tooltip
-						title={selectedView === VIEW_TYPES.JSON ? 'Copy JSON' : 'Copy Log Link'}
-						placement="topLeft"
-						aria-label={
-							selectedView === VIEW_TYPES.JSON ? 'Copy JSON' : 'Copy Log Link'
-						}
-					>
+				{selectedView === VIEW_TYPES.JSON && (
+					<div className="json-action-btn">
 						<Button
 							className="action-btn"
 							icon={<Copy size={16} />}
-							onClick={selectedView === VIEW_TYPES.JSON ? handleJSONCopy : onLogCopy}
+							onClick={handleJSONCopy}
 						/>
-					</Tooltip>
-				</div>
+					</div>
+				)}
+
+				{selectedView === VIEW_TYPES.CONTEXT && (
+					<Button
+						className="action-btn"
+						icon={<Filter size={16} />}
+						onClick={handleFilterVisible}
+					/>
+				)}
+
+				<Tooltip title="Copy Log Link" placement="left" aria-label="Copy Log Link">
+					<Button
+						className="action-btn"
+						icon={<Copy size={16} />}
+						onClick={onLogCopy}
+					/>
+				</Tooltip>
 			</div>
 			{isFilterVisible && contextQuery?.builder.queryData[0] && (
 				<div className="log-detail-drawer-query-container">
@@ -387,8 +383,7 @@ function LogDetailInner({
 					podName={log.resources_string?.[RESOURCE_KEYS.POD_NAME] || ''}
 					nodeName={log.resources_string?.[RESOURCE_KEYS.NODE_NAME] || ''}
 					hostName={log.resources_string?.[RESOURCE_KEYS.HOST_NAME] || ''}
-					timestamp={log.timestamp.toString()}
-					dataSource={DataSource.LOGS}
+					logLineTimestamp={log.timestamp.toString()}
 				/>
 			)}
 		</Drawer>

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

@@ -57,8 +57,8 @@ export const RawLogViewContainer = styled(Row)<{
 			  transition: background-color 2s ease-in;`
 			: ''}
 
-	${({ $isCustomHighlighted }): string =>
-		getCustomHighlightBackground($isCustomHighlighted)}
+	${({ $isCustomHighlighted, $isDarkMode, $logType }): string =>
+		getCustomHighlightBackground($isCustomHighlighted, $isDarkMode, $logType)}
 `;
 
 export const InfoIconWrapper = styled(Info)`

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

@@ -153,9 +153,7 @@ export const useTableView = (props: UseTableViewProps): UseTableViewResult => {
 								children: (
 									<TableBodyContent
 										dangerouslySetInnerHTML={{
-											__html: getSanitizedLogBody(field as string, {
-												shouldEscapeHtml: true,
-											}),
+											__html: getSanitizedLogBody(field as string),
 										}}
 										fontSize={fontSize}
 										linesPerRow={linesPerRow}

frontend/src/components/NewSelect/CustomMultiSelect.tsx

@@ -32,7 +32,6 @@ import { popupContainer } from 'utils/selectPopupContainer';
 
 import { CustomMultiSelectProps, CustomTagProps, OptionData } from './types';
 import {
-	ALL_SELECTED_VALUE,
 	filterOptionsBySearch,
 	handleScrollToBottom,
 	prioritizeOrAddOptionForMultiSelect,
@@ -44,6 +43,8 @@ enum ToggleTagValue {
 	All = 'All',
 }
 
+const ALL_SELECTED_VALUE = '__ALL__'; // Constant for the special value
+
 const CustomMultiSelect: React.FC<CustomMultiSelectProps> = ({
 	placeholder = 'Search...',
 	className,

frontend/src/components/NewSelect/utils.ts

@@ -5,8 +5,6 @@ import { OptionData } from './types';
 
 export const SPACEKEY = ' ';
 
-export const ALL_SELECTED_VALUE = '__ALL__'; // Constant for the special value
-
 export const prioritizeOrAddOptionForSingleSelect = (
 	options: OptionData[],
 	value: string,

frontend/src/components/PanelMarkersControl/PanelMarkersControl.scss

@@ -0,0 +1,58 @@
+.panel-markers-control {
+	padding: 16px;
+	.panel-markers-view-controller {
+		display: flex;
+		align-items: center;
+		gap: 8px;
+		margin-bottom: 16px;
+	}
+
+	.markers-control-skeleton {
+		display: flex;
+		align-items: center;
+		gap: 24px;
+		margin-top: 8px;
+		.ant-skeleton-input{
+			width: 230px;
+		}
+	}
+
+	.panel-markers-inputs-section {
+		display: flex;
+		align-items: center;
+		gap: 24px;
+		margin-top: 8px;
+		.panel-markers-select-container {
+			display: flex;
+			align-items: center;
+			margin-bottom: 8px;
+            .custom-multiselect-wrapper {
+                width: fit-content;
+				min-width: 230px;
+            }
+		}
+	}
+}
+
+.variable-name {
+	display: flex;
+	min-width: 56px;
+	height: 32px;
+	padding: 6px 6px 6px 8px;
+	align-items: center;
+	gap: 4px;
+	border-radius: 2px 0px 0px 2px;
+	border: 1px solid var(--bg-slate-400);
+	background: var(--bg-ink-300);
+	color: var(--bg-robin-300);
+	font-family: Inter;
+	font-size: 12px;
+	font-style: normal;
+	font-weight: 400;
+	line-height: 16px;
+
+	.info-icon {
+		margin-left: 4px;
+		color: var(--bg-vanilla-400);
+	}
+}

frontend/src/components/PanelMarkersControl/constants.ts

@@ -0,0 +1,3 @@
+export const MARKER_TYPES = {
+	DEPLOYMENT: 'deployment',
+};

frontend/src/components/PanelMarkersControl/hooks/useMarkerControlState.ts

@@ -0,0 +1,70 @@
+import type { Dispatch } from 'react';
+import { useReducer } from 'react';
+
+import type { MarkerControlState, MarkerQueryState } from '../types';
+
+export const MARKER_ACTIONS = {
+	TOGGLE_SHOW_MARKERS: 'toggleShowMarkers',
+	SET_MARKER_SERVICES: 'setMarkerServices',
+	SET_MARKER_TYPES: 'setMarkerTypes',
+	SET_DEFAULTS_ON: 'setDefaultsOn',
+	RESET: 'reset',
+} as const;
+
+export type MarkerActionType = typeof MARKER_ACTIONS[keyof typeof MARKER_ACTIONS];
+
+export type MarkerControlAction =
+	| { type: typeof MARKER_ACTIONS.TOGGLE_SHOW_MARKERS; payload: boolean }
+	| { type: typeof MARKER_ACTIONS.SET_MARKER_SERVICES; payload: string[] }
+	| { type: typeof MARKER_ACTIONS.SET_MARKER_TYPES; payload: string[] }
+	| {
+			type: typeof MARKER_ACTIONS.SET_DEFAULTS_ON;
+			payload: { markerServices: string[]; markerTypes: string[] };
+	  }
+	| { type: typeof MARKER_ACTIONS.RESET };
+
+function normalizeInitialState(
+	state: MarkerQueryState | null,
+): MarkerControlState {
+	return {
+		showMarkers: state?.showMarkers ? 1 : 0,
+		markerServices: state?.markerServices || [],
+		markerTypes: state?.markerTypes || [],
+	};
+}
+
+function reducer(
+	state: MarkerControlState,
+	action: MarkerControlAction,
+): MarkerControlState {
+	switch (action.type) {
+		case MARKER_ACTIONS.TOGGLE_SHOW_MARKERS:
+			return { ...state, showMarkers: action.payload ? 1 : 0 };
+		case MARKER_ACTIONS.SET_MARKER_SERVICES:
+			return { ...state, markerServices: action.payload };
+		case MARKER_ACTIONS.SET_MARKER_TYPES:
+			return { ...state, markerTypes: action.payload };
+		case MARKER_ACTIONS.SET_DEFAULTS_ON:
+			return {
+				...state,
+				showMarkers: 1,
+				markerServices: action.payload.markerServices,
+				markerTypes: action.payload.markerTypes,
+			};
+		case MARKER_ACTIONS.RESET:
+			return { showMarkers: 0, markerServices: [], markerTypes: [] };
+		default:
+			return state;
+	}
+}
+
+export default function useMarkerControlState(
+	initialQueryState: MarkerQueryState | null,
+): {
+	store: MarkerControlState;
+	dispatch: Dispatch<MarkerControlAction>;
+} {
+	const initial = normalizeInitialState(initialQueryState);
+	const [store, dispatch] = useReducer(reducer, initial);
+	return { store, dispatch };
+}

frontend/src/components/PanelMarkersControl/hooks/useMarkerHandlers.tsx

@@ -0,0 +1,57 @@
+import {
+	clearLocalStorageState,
+	getLocalStorageState,
+	getMarkerStateFromQuery,
+	getQueryParamsFromState,
+	setLocalStorageState,
+} from 'components/PanelMarkersControl/utils';
+import useUrlQuery from 'hooks/useUrlQuery';
+import { useCallback, useEffect } from 'react';
+import { useHistory, useLocation } from 'react-router-dom';
+
+type MarkerHandlers = {
+	onMarkerToggleOn: () => void;
+	onMarkerToggleOff: () => void;
+};
+
+const useMarkerHandlers = ({ key }: { key: string }): MarkerHandlers => {
+	const urlQuery = useUrlQuery();
+	const { search } = useLocation();
+	const history = useHistory();
+
+	// useEffect to sync url query with local storage
+	useEffect(() => {
+		const queryState = getMarkerStateFromQuery(urlQuery);
+		const localStorageState = getLocalStorageState(key);
+
+		if (queryState === null && localStorageState?.showMarkers) {
+			const params = new URLSearchParams(search);
+			const queryParams = getQueryParamsFromState(params, localStorageState);
+			history.replace({ search: queryParams.toString() });
+		} else {
+			setLocalStorageState(key, queryState);
+		}
+	}, [urlQuery, key, search, history]);
+
+	const onMarkerToggleOn = useCallback(() => {
+		// set defaults for service and marker type
+		const params = new URLSearchParams(search);
+		params.set('showMarkers', '1');
+		history.replace({ search: params.toString() });
+	}, [search, history]);
+
+	const onMarkerToggleOff = useCallback(() => {
+		// important to clear both  url query and local storage here. Else url local storage sync useEffect will not work as expected.
+		clearLocalStorageState(key);
+
+		const params = new URLSearchParams(search);
+		params.delete('showMarkers');
+		params.delete('markerServices');
+		params.delete('markerTypes');
+		history.replace({ search: params.toString() });
+	}, [key, search, history]);
+
+	return { onMarkerToggleOn, onMarkerToggleOff };
+};
+
+export default useMarkerHandlers;

frontend/src/components/PanelMarkersControl/index.tsx

@@ -0,0 +1,234 @@
+import './PanelMarkersControl.scss';
+
+import { Skeleton, Switch, Typography } from 'antd';
+import CustomMultiSelect from 'components/NewSelect/CustomMultiSelect';
+import { MARKER_TYPES } from 'components/PanelMarkersControl/constants';
+import useMarkerControlState, {
+	MARKER_ACTIONS,
+} from 'components/PanelMarkersControl/hooks/useMarkerControlState';
+import useMarkerHandlers from 'components/PanelMarkersControl/hooks/useMarkerHandlers';
+import {
+	getInitialStateForControls,
+	getQueryParamsFromState,
+} from 'components/PanelMarkersControl/utils';
+import useUrlQuery from 'hooks/useUrlQuery';
+import { useDashboard } from 'providers/Dashboard/Dashboard';
+import { useFetchMarkersData, useMarkers } from 'providers/Markers/Markers';
+import { useCallback, useEffect, useMemo } from 'react';
+import { useHistory, useLocation } from 'react-router-dom';
+
+function PanelMarkersControl(): JSX.Element {
+	const urlQuery = useUrlQuery();
+	const { search } = useLocation();
+	const history = useHistory();
+
+	const { selectedDashboard } = useDashboard();
+
+	const { store: markerControlState, dispatch } = useMarkerControlState(
+		getInitialStateForControls(selectedDashboard?.id || '', urlQuery),
+	);
+
+	const { markersData, setMarkersData } = useMarkers();
+
+	const { loadingMarkers } = useFetchMarkersData({
+		isFetchEnabled: markerControlState.showMarkers === 1,
+	});
+
+	const { onMarkerToggleOn, onMarkerToggleOff } = useMarkerHandlers({
+		key: selectedDashboard?.id || '',
+	});
+
+	// API integration: check if this is correct
+	const markerTypeOptions = useMemo(() => {
+		const uniqueTypes = Array.from(
+			new Set((markersData || []).map((m: any) => m?.type).filter(Boolean)),
+		);
+		return uniqueTypes.map((t: string) => ({
+			label: t.charAt(0).toUpperCase() + t.slice(1),
+			value: t,
+		}));
+	}, [markersData]);
+
+	// API integration: check if this is correct
+	const serviceNameOptions = useMemo(() => {
+		const uniqueServices = Array.from(
+			new Set(
+				(markersData || [])
+					.map((m: any) => m?.attr?.['service.name'])
+					.filter(Boolean),
+			),
+		);
+		return uniqueServices.map((s: string) => ({ label: s, value: s }));
+	}, [markersData]);
+
+	const handleServiceChange = useCallback(
+		(serviceOrServices: string | string[] | undefined): void => {
+			let servicesArray: string[] = [];
+			if (Array.isArray(serviceOrServices)) {
+				servicesArray = serviceOrServices;
+			} else if (serviceOrServices) {
+				servicesArray = [serviceOrServices];
+			}
+			dispatch({
+				type: MARKER_ACTIONS.SET_MARKER_SERVICES,
+				payload: servicesArray,
+			});
+
+			// sync URL param
+			const params = new URLSearchParams(search);
+			if (servicesArray.length > 0) {
+				params.set('markerServices', servicesArray.join(','));
+			} else {
+				params.delete('markerServices');
+			}
+			history.replace({ search: params.toString() });
+		},
+		[history, search, dispatch],
+	);
+
+	const handleMarkerTypesChange = useCallback(
+		(typesOrArray: string | string[] | undefined): void => {
+			let typesArray: string[] = [];
+			if (Array.isArray(typesOrArray)) {
+				typesArray = typesOrArray;
+			} else if (typesOrArray) {
+				typesArray = [typesOrArray];
+			}
+			dispatch({ type: MARKER_ACTIONS.SET_MARKER_TYPES, payload: typesArray });
+
+			const params = new URLSearchParams(search);
+			if (typesArray.length > 0) {
+				params.set('markerTypes', typesArray.join(','));
+			} else {
+				params.delete('markerTypes');
+			}
+			history.replace({ search: params.toString() });
+		},
+		[history, search, dispatch],
+	);
+
+	const handleToggleShowMarkers = useCallback(
+		(checked: boolean): void => {
+			dispatch({ type: MARKER_ACTIONS.TOGGLE_SHOW_MARKERS, payload: checked });
+			if (checked) {
+				// get default services and marker types from markersData
+				onMarkerToggleOn();
+			} else {
+				// consider using useReducer to reset the state
+				setMarkersData([]);
+				dispatch({ type: MARKER_ACTIONS.RESET });
+				onMarkerToggleOff();
+			}
+		},
+		[onMarkerToggleOn, onMarkerToggleOff, dispatch, setMarkersData],
+	);
+
+	useEffect(() => {
+		if (markersData.length < 1) return;
+		/**
+		 * On markers data change, derive defaults (or use query selections if present)
+		 * and set them in a single reducer dispatch.
+		 */
+		const queryMarkerServicesRaw = urlQuery.get('markerServices') || '';
+		const queryMarkerTypesRaw = urlQuery.get('markerTypes') || '';
+
+		const defMarkerServices = ['cart-service'];
+		const defMarkerTypes = [MARKER_TYPES.DEPLOYMENT];
+
+		const servicesArray = queryMarkerServicesRaw
+			? queryMarkerServicesRaw
+					.split(',')
+					.map((s) => s.trim())
+					.filter((s) => s.length > 0)
+			: defMarkerServices;
+		const typesArray = queryMarkerTypesRaw
+			? queryMarkerTypesRaw
+					.split(',')
+					.map((t) => t.trim())
+					.filter((t) => t.length > 0)
+			: defMarkerTypes;
+
+		dispatch({
+			type: MARKER_ACTIONS.SET_DEFAULTS_ON,
+			payload: { markerServices: servicesArray, markerTypes: typesArray },
+		});
+
+		// reflect in URL params as well
+		const params = new URLSearchParams(search);
+		const queryParams = getQueryParamsFromState(params, {
+			showMarkers: 1,
+			markerServices: servicesArray,
+			markerTypes: typesArray,
+		});
+		history.replace({ search: queryParams.toString() });
+
+		console.log('>>> markersData', markersData);
+		// urlQuery removed from dependencies as not able to unset markerTypes. But works with markerServices. [CHECK THIS]
+
+		// eslint-disable-next-line react-hooks/exhaustive-deps
+	}, [markersData]);
+
+	// ADD INITIAL STATE FOR SELECTED SERVICES AND MARKER TYPES
+
+	return (
+		<div className="panel-markers-control">
+			<div className="panel-markers-view-controller">
+				<Typography>Show Markers</Typography>
+				<Switch
+					size="small"
+					checked={markerControlState.showMarkers === 1}
+					onChange={handleToggleShowMarkers}
+				/>
+			</div>
+
+			{markerControlState.showMarkers === 1 && (
+				<div className="panel-markers-inputs-section">
+					{loadingMarkers ? (
+						<div className="markers-control-skeleton">
+							<Skeleton.Input active size="small" />
+							<Skeleton.Input active size="small" />
+						</div>
+					) : (
+						<>
+							<div className="panel-markers-select-container">
+								<Typography.Text className="variable-name" ellipsis>
+									Marker type
+								</Typography.Text>
+								<CustomMultiSelect
+									className="panel-markers-select"
+									placeholder="Select one or more marker types"
+									enableAllSelection={false}
+									options={markerTypeOptions}
+									maxTagCount={3}
+									value={markerControlState.markerTypes}
+									onChange={handleMarkerTypesChange}
+								/>
+							</div>
+							<div className="panel-markers-select-container">
+								<Typography.Text className="variable-name" ellipsis>
+									Service name
+								</Typography.Text>
+								<CustomMultiSelect
+									className="panel-markers-select"
+									placeholder="Select one or more service names"
+									maxTagCount={3}
+									enableAllSelection={false}
+									options={serviceNameOptions}
+									value={markerControlState.markerServices}
+									onChange={handleServiceChange}
+								/>
+							</div>
+						</>
+					)}
+				</div>
+			)}
+		</div>
+	);
+}
+
+// select bright color for the markers
+// convert panel marker state to useReducer
+// removed urlQuery from dependencies.
+// filters on markersData should work properly. If no markers selected. Show no markers.
+
+export default PanelMarkersControl;

frontend/src/components/PanelMarkersControl/types.ts

@@ -0,0 +1,7 @@
+export interface MarkerControlState {
+	showMarkers: number;
+	markerServices: string[];
+	markerTypes: string[];
+}
+
+export type MarkerQueryState = MarkerControlState | null;

frontend/src/components/PanelMarkersControl/utils.ts

@@ -0,0 +1,108 @@
+import type { MarkerQueryState } from 'components/PanelMarkersControl/types';
+import { LOCALSTORAGE } from 'constants/localStorage';
+
+// CHECK LOGIC AND CREATE UTIL
+export function getMarkerStateFromQuery(
+	urlQuery: URLSearchParams,
+): MarkerQueryState | null {
+	const showMarkers = urlQuery.get('showMarkers') === '1';
+	const servicesRaw = urlQuery.get('markerServices') || '';
+
+	if (!showMarkers) {
+		return null;
+	}
+
+	const markerTypesParam = urlQuery.get('markerTypes') || '';
+
+	const markerTypes = markerTypesParam
+		.split(',')
+		.map((t) => t.trim())
+		.filter((t) => t.length > 0);
+
+	const markerServices = servicesRaw
+		.split(',')
+		.map((s) => s.trim())
+		.filter((s) => s.length > 0);
+
+	return {
+		showMarkers: 1,
+		markerServices,
+		markerTypes,
+	};
+}
+
+export const getLocalStorageState = (key: string): MarkerQueryState | null => {
+	const raw = localStorage.getItem(LOCALSTORAGE.MARKERS_OVERLAY_STATE);
+	try {
+		const parsed = raw ? JSON.parse(raw) : null;
+		return parsed?.[key] ?? null;
+	} catch (_) {
+		return null;
+	}
+};
+
+export const getQueryParamsFromState = (
+	params: URLSearchParams,
+	state: MarkerQueryState,
+): URLSearchParams => {
+	if (!state) {
+		return params;
+	}
+	if (state.showMarkers) {
+		params.set('showMarkers', String(state.showMarkers) || '0');
+	}
+	if (Array.isArray(state.markerServices) && state.markerServices.length > 0) {
+		params.set('markerServices', state.markerServices.join(','));
+	}
+	if (Array.isArray(state.markerTypes) && state.markerTypes.length > 0) {
+		params.set('markerTypes', state.markerTypes.join(','));
+	}
+	return params;
+};
+
+export const setLocalStorageState = (
+	key: string,
+	state: MarkerQueryState | null,
+): void => {
+	if (!key || key.trim().length === 0) {
+		return;
+	}
+
+	try {
+		const raw = localStorage.getItem(LOCALSTORAGE.MARKERS_OVERLAY_STATE);
+		let obj: Record<string, unknown> = {};
+		try {
+			obj = raw ? JSON.parse(raw) : {};
+		} catch (_) {
+			obj = {};
+		}
+		obj[key] = state;
+		localStorage.setItem(LOCALSTORAGE.MARKERS_OVERLAY_STATE, JSON.stringify(obj));
+	} catch (_) {
+		// ignore storage errors
+	}
+};
+
+export const getInitialStateForControls = (
+	key: string,
+	urlQuery: URLSearchParams,
+): MarkerQueryState | null => {
+	const queryState = getMarkerStateFromQuery(urlQuery);
+	const localStorageState = getLocalStorageState(key);
+	return queryState ?? localStorageState;
+};
+
+export const clearLocalStorageState = (key: string): void => {
+	if (!key || key.trim().length === 0) {
+		return;
+	}
+	const raw = localStorage.getItem(LOCALSTORAGE.MARKERS_OVERLAY_STATE);
+	let obj: Record<string, unknown> = {};
+	try {
+		obj = raw ? JSON.parse(raw) : {};
+	} catch (_) {
+		obj = {};
+	}
+	delete obj[key];
+	localStorage.setItem(LOCALSTORAGE.MARKERS_OVERLAY_STATE, JSON.stringify(obj));
+};

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

@@ -398,7 +398,7 @@
 	}
 
 	.qb-search-container {
-		.metrics-container {
+		.metrics-select-container {
 			margin-bottom: 12px;
 		}
 	}

frontend/src/components/QueryBuilderV2/QueryBuilderV2.tsx

@@ -22,8 +22,6 @@ export const QueryBuilderV2 = memo(function QueryBuilderV2({
 	showOnlyWhereClause = false,
 	showTraceOperator = false,
 	version,
-	onSignalSourceChange,
-	signalSourceChangeEnabled = false,
 }: QueryBuilderProps): JSX.Element {
 	const {
 		currentQuery,
@@ -177,8 +175,6 @@ export const QueryBuilderV2 = memo(function QueryBuilderV2({
 							queryVariant={config?.queryVariant || 'dropdown'}
 							showOnlyWhereClause={showOnlyWhereClause}
 							isListViewPanel={isListViewPanel}
-							onSignalSourceChange={onSignalSourceChange || ((): void => {})}
-							signalSourceChangeEnabled={signalSourceChangeEnabled}
 						/>
 					) : (
 						currentQuery.builder.queryData.map((query, index) => (
@@ -197,9 +193,7 @@ export const QueryBuilderV2 = memo(function QueryBuilderV2({
 								queryVariant={config?.queryVariant || 'dropdown'}
 								showOnlyWhereClause={showOnlyWhereClause}
 								isListViewPanel={isListViewPanel}
-								signalSource={query.source as 'meter' | ''}
-								onSignalSourceChange={onSignalSourceChange || ((): void => {})}
-								signalSourceChangeEnabled={signalSourceChangeEnabled}
+								signalSource={config?.signalSource || ''}
 							/>
 						))
 					)}

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

@@ -1,14 +1,5 @@
-.metrics-source-select-container {
+.metrics-select-container {
 	margin-bottom: 8px;
-	display: flex;
-	flex-direction: row;
-	align-items: flex-start;
-	gap: 8px;
-	width: 100%;
-
-	.source-selector {
-		width: 120px;
-	}
 
 	.ant-select-selector {
 		width: 100%;
@@ -51,7 +42,7 @@
 }
 
 .lightMode {
-	.metrics-source-select-container {
+	.metrics-select-container {
 		.ant-select-selector {
 			border: 1px solid var(--bg-vanilla-300) !important;
 			background: var(--bg-vanilla-100);

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

@@ -1,121 +1,34 @@
 import './MetricsSelect.styles.scss';
 
-import { Select } from 'antd';
-import {
-	initialQueriesMap,
-	initialQueryMeterWithType,
-	PANEL_TYPES,
-} from 'constants/queryBuilder';
 import { AggregatorFilter } from 'container/QueryBuilder/filters';
-import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
 import { useQueryOperations } from 'hooks/queryBuilder/useQueryBuilderOperations';
-import { memo, useCallback, useMemo, useState } from 'react';
-import { BaseAutocompleteData } from 'types/api/queryBuilder/queryAutocompleteResponse';
+import { memo } from 'react';
 import { IBuilderQuery } from 'types/api/queryBuilder/queryBuilderData';
-import { DataSource } from 'types/common/queryBuilder';
-import { SelectOption } from 'types/common/select';
-
-export const SOURCE_OPTIONS: SelectOption<string, string>[] = [
-	{ value: 'metrics', label: 'Metrics' },
-	{ value: 'meter', label: 'Meter' },
-];
 
 export const MetricsSelect = memo(function MetricsSelect({
 	query,
 	index,
 	version,
 	signalSource,
-	onSignalSourceChange,
-	signalSourceChangeEnabled = false,
 }: {
 	query: IBuilderQuery;
 	index: number;
 	version: string;
 	signalSource: 'meter' | '';
-	onSignalSourceChange: (value: string) => void;
-	signalSourceChangeEnabled: boolean;
 }): JSX.Element {
-	const [attributeKeys, setAttributeKeys] = useState<BaseAutocompleteData[]>([]);
-
 	const { handleChangeAggregatorAttribute } = useQueryOperations({
 		index,
 		query,
 		entityVersion: version,
 	});
 
-	const handleAggregatorAttributeChange = useCallback(
-		(value: BaseAutocompleteData, isEditMode?: boolean) => {
-			handleChangeAggregatorAttribute(value, isEditMode, attributeKeys || []);
-		},
-		[handleChangeAggregatorAttribute, attributeKeys],
-	);
-
-	const { updateAllQueriesOperators, handleSetQueryData } = useQueryBuilder();
-
-	const source = useMemo(
-		() => (signalSource === 'meter' ? 'meter' : 'metrics'),
-		[signalSource],
-	);
-
-	const defaultMeterQuery = useMemo(
-		() =>
-			updateAllQueriesOperators(
-				initialQueryMeterWithType,
-				PANEL_TYPES.BAR,
-				DataSource.METRICS,
-				'meter' as 'meter' | '',
-			),
-		[updateAllQueriesOperators],
-	);
-
-	const defaultMetricsQuery = useMemo(
-		() =>
-			updateAllQueriesOperators(
-				initialQueriesMap.metrics,
-				PANEL_TYPES.BAR,
-				DataSource.METRICS,
-				'',
-			),
-		[updateAllQueriesOperators],
-	);
-
-	const handleSignalSourceChange = (value: string): void => {
-		onSignalSourceChange(value);
-		handleSetQueryData(
-			index,
-			value === 'meter'
-				? {
-						...defaultMeterQuery.builder.queryData[0],
-						source: 'meter',
-						queryName: query.queryName,
-				  }
-				: {
-						...defaultMetricsQuery.builder.queryData[0],
-						source: '',
-						queryName: query.queryName,
-				  },
-		);
-	};
-
 	return (
-		<div className="metrics-source-select-container">
-			{signalSourceChangeEnabled && (
-				<Select
-					className="source-selector"
-					placeholder="Source"
-					options={SOURCE_OPTIONS}
-					value={source}
-					defaultValue="metrics"
-					onChange={handleSignalSourceChange}
-				/>
-			)}
-
+		<div className="metrics-select-container">
 			<AggregatorFilter
-				onChange={handleAggregatorAttributeChange}
+				onChange={handleChangeAggregatorAttribute}
 				query={query}
 				index={index}
 				signalSource={signalSource || ''}
-				setAttributeKeys={setAttributeKeys}
 			/>
 		</div>
 	);

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

@@ -500,10 +500,7 @@ function QueryAddOns({
 								}
 								value={addOn}
 							>
-								<div
-									className="add-on-tab-title"
-									data-testid={`query-add-on-${addOn.key}`}
-								>
+								<div className="add-on-tab-title">
 									{addOn.icon}
 									{addOn.label}
 								</div>

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

@@ -33,13 +33,7 @@ export const QueryV2 = memo(function QueryV2({
 	showOnlyWhereClause = false,
 	signalSource = '',
 	isMultiQueryAllowed = false,
-	onSignalSourceChange,
-	signalSourceChangeEnabled = false,
-}: QueryProps & {
-	ref: React.RefObject<HTMLDivElement>;
-	onSignalSourceChange: (value: string) => void;
-	signalSourceChangeEnabled: boolean;
-}): JSX.Element {
+}: QueryProps & { ref: React.RefObject<HTMLDivElement> }): JSX.Element {
 	const { cloneQuery, panelType } = useQueryBuilder();
 
 	const showFunctions = query?.functions?.length > 0;
@@ -213,14 +207,12 @@ export const QueryV2 = memo(function QueryV2({
 					<div className="qb-elements-container">
 						<div className="qb-search-container">
 							{dataSource === DataSource.METRICS && (
-								<div className="metrics-container">
+								<div className="metrics-select-container">
 									<MetricsSelect
 										query={query}
 										index={index}
 										version={ENTITY_VERSION_V5}
 										signalSource={signalSource as 'meter' | ''}
-										onSignalSourceChange={onSignalSourceChange}
-										signalSourceChangeEnabled={signalSourceChangeEnabled}
 									/>
 								</div>
 							)}
@@ -266,7 +258,7 @@ export const QueryV2 = memo(function QueryV2({
 								panelType={panelType}
 								query={query}
 								index={index}
-								key={`metrics-aggregate-section-${query.queryName}-${query.dataSource}-${signalSource}`}
+								key={`metrics-aggregate-section-${query.queryName}-${query.dataSource}`}
 								version="v4"
 								signalSource={signalSource as 'meter' | ''}
 							/>

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

@@ -45,12 +45,6 @@
 		flex-direction: column;
 		gap: 8px;
 
-		.filter-separator {
-			height: 1px;
-			background-color: var(--bg-slate-400);
-			margin: 4px 0;
-		}
-
 		.value {
 			display: flex;
 			align-items: center;
@@ -183,12 +177,6 @@
 				}
 			}
 		}
-
-		.values {
-			.filter-separator {
-				background-color: var(--bg-vanilla-300);
-			}
-		}
 	}
 }
 

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

@@ -1,191 +0,0 @@
-import { FiltersType, QuickFiltersSource } from 'components/QuickFilters/types';
-import { useGetAggregateValues } from 'hooks/queryBuilder/useGetAggregateValues';
-import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
-import { useGetQueryKeyValueSuggestions } from 'hooks/querySuggestions/useGetQueryKeyValueSuggestions';
-import { quickFiltersAttributeValuesResponse } from 'mocks-server/__mockdata__/customQuickFilters';
-import { rest, server } from 'mocks-server/server';
-import { UseQueryResult } from 'react-query';
-import { render, screen, userEvent, waitFor } from 'tests/test-utils';
-import { SuccessResponse } from 'types/api';
-import { IAttributeValuesResponse } from 'types/api/queryBuilder/getAttributesValues';
-import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse';
-import { DataSource } from 'types/common/queryBuilder';
-
-import CheckboxFilter from './Checkbox';
-
-// Mock the query builder hook
-jest.mock('hooks/queryBuilder/useQueryBuilder');
-const mockUseQueryBuilder = jest.mocked(useQueryBuilder);
-
-// Mock the aggregate values hook
-jest.mock('hooks/queryBuilder/useGetAggregateValues');
-
-const mockUseGetAggregateValues = jest.mocked(useGetAggregateValues);
-
-// Mock the key value suggestions hook
-jest.mock('hooks/querySuggestions/useGetQueryKeyValueSuggestions');
-
-const mockUseGetQueryKeyValueSuggestions = jest.mocked(
-	useGetQueryKeyValueSuggestions,
-);
-
-interface MockFilterConfig {
-	title: string;
-	attributeKey: {
-		key: string;
-		dataType: DataTypes;
-		type: string;
-	};
-	dataSource: DataSource;
-	defaultOpen: boolean;
-	type: FiltersType;
-}
-
-const createMockFilter = (
-	overrides: Partial<MockFilterConfig> = {},
-): MockFilterConfig => ({
-	// eslint-disable-next-line sonarjs/no-duplicate-string
-	title: 'Service Name',
-	attributeKey: {
-		key: 'service.name',
-		dataType: DataTypes.String,
-		type: 'resource',
-	},
-	dataSource: DataSource.LOGS,
-	defaultOpen: false,
-	type: FiltersType.CHECKBOX,
-	...overrides,
-});
-
-const createMockQueryBuilderData = (hasActiveFilters = false): any => ({
-	lastUsedQuery: 0,
-	currentQuery: {
-		builder: {
-			queryData: [
-				{
-					filters: {
-						items: hasActiveFilters
-							? [
-									{
-										key: {
-											key: 'service.name',
-											dataType: DataTypes.String,
-											type: 'resource',
-										},
-										op: 'in',
-										value: ['otel-demo', 'sample-flask'],
-									},
-							  ]
-							: [],
-					},
-				},
-			],
-		},
-	},
-	redirectWithQueryBuilderData: jest.fn(),
-});
-
-describe('CheckboxFilter - User Flows', () => {
-	beforeEach(() => {
-		// Reset all mocks
-		jest.clearAllMocks();
-
-		// Default mock implementations using the same structure as existing tests
-		mockUseGetAggregateValues.mockReturnValue({
-			data: {
-				payload: {
-					stringAttributeValues: [
-						'mq-kafka',
-						'otel-demo',
-						'otlp-python',
-						'sample-flask',
-					],
-				},
-			},
-			isLoading: false,
-		} as UseQueryResult<SuccessResponse<IAttributeValuesResponse>>);
-
-		mockUseGetQueryKeyValueSuggestions.mockReturnValue({
-			data: null,
-			isLoading: false,
-		} as any);
-
-		// Setup MSW server for API calls
-		server.use(
-			rest.get('*/api/v3/autocomplete/attribute_values', (_req, res, ctx) =>
-				res(ctx.status(200), ctx.json(quickFiltersAttributeValuesResponse)),
-			),
-		);
-	});
-
-	it('should auto-open filter and prioritize checked items with visual separator when user opens page with active filters', async () => {
-		// Mock query builder with active filters
-		mockUseQueryBuilder.mockReturnValue(createMockQueryBuilderData(true) as any);
-
-		const mockFilter = createMockFilter({ defaultOpen: false });
-
-		render(
-			<CheckboxFilter
-				filter={mockFilter}
-				source={QuickFiltersSource.LOGS_EXPLORER}
-			/>,
-		);
-
-		// User should see the filter is automatically opened (not collapsed)
-		expect(screen.getByText('Service Name')).toBeInTheDocument();
-		await waitFor(() => {
-			// eslint-disable-next-line sonarjs/no-duplicate-string
-			expect(screen.getByPlaceholderText('Filter values')).toBeInTheDocument();
-		});
-
-		// User should see visual separator between checked and unchecked items
-		expect(screen.getByTestId('filter-separator')).toBeInTheDocument();
-
-		// User should see checked items at the top
-		await waitFor(() => {
-			const checkboxes = screen.getAllByRole('checkbox');
-			expect(checkboxes).toHaveLength(4); // Ensure we have exactly 4 checkboxes
-			expect(checkboxes[0]).toBeChecked(); // otel-demo should be first and checked
-			expect(checkboxes[1]).toBeChecked(); // sample-flask should be second and checked
-			expect(checkboxes[2]).not.toBeChecked(); // mq-kafka should be unchecked
-			expect(checkboxes[3]).not.toBeChecked(); // otlp-python should be unchecked
-		});
-	});
-
-	it('should respect user preference when user manually toggles filter over auto-open behavior', async () => {
-		const user = userEvent.setup({ pointerEventsCheck: 0 });
-
-		// Mock query builder with active filters
-		mockUseQueryBuilder.mockReturnValue(createMockQueryBuilderData(true) as any);
-
-		const mockFilter = createMockFilter({ defaultOpen: false });
-
-		render(
-			<CheckboxFilter
-				filter={mockFilter}
-				source={QuickFiltersSource.LOGS_EXPLORER}
-			/>,
-		);
-
-		// Initially auto-opened due to active filters
-		await waitFor(() => {
-			expect(screen.getByPlaceholderText('Filter values')).toBeInTheDocument();
-		});
-
-		// User manually closes the filter
-		await user.click(screen.getByText('Service Name'));
-
-		// User should see filter is now closed (respecting user preference)
-		expect(
-			screen.queryByPlaceholderText('Filter values'),
-		).not.toBeInTheDocument();
-
-		// User manually opens the filter again
-		await user.click(screen.getByText('Service Name'));
-
-		// User should see filter is now open (respecting user preference)
-		await waitFor(() => {
-			expect(screen.getByPlaceholderText('Filter values')).toBeInTheDocument();
-		});
-	});
-});

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

@@ -21,7 +21,7 @@ import { useGetQueryKeyValueSuggestions } from 'hooks/querySuggestions/useGetQue
 import useDebouncedFn from 'hooks/useDebouncedFunction';
 import { cloneDeep, isArray, isEqual, isFunction } from 'lodash-es';
 import { ChevronDown, ChevronRight } from 'lucide-react';
-import { Fragment, useMemo, useState } from 'react';
+import { useMemo, useState } from 'react';
 import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse';
 import { Query, TagFilterItem } from 'types/api/queryBuilder/queryBuilderData';
 import { DataSource } from 'types/common/queryBuilder';
@@ -54,8 +54,7 @@ interface ICheckboxProps {
 export default function CheckboxFilter(props: ICheckboxProps): JSX.Element {
 	const { source, filter, onFilterChange } = props;
 	const [searchText, setSearchText] = useState<string>('');
-	// null = no user action, true = user opened, false = user closed
-	const [userToggleState, setUserToggleState] = useState<boolean | null>(null);
+	const [isOpen, setIsOpen] = useState<boolean>(filter.defaultOpen);
 	const [visibleItemsCount, setVisibleItemsCount] = useState<number>(10);
 
 	const {
@@ -64,33 +63,6 @@ export default function CheckboxFilter(props: ICheckboxProps): JSX.Element {
 		redirectWithQueryBuilderData,
 	} = useQueryBuilder();
 
-	// Check if this filter has active filters in the query
-	const isSomeFilterPresentForCurrentAttribute = useMemo(
-		() =>
-			currentQuery.builder.queryData?.[
-				lastUsedQuery || 0
-			]?.filters?.items?.some((item) =>
-				isEqual(item.key?.key, filter.attributeKey.key),
-			),
-		[currentQuery.builder.queryData, lastUsedQuery, filter.attributeKey.key],
-	);
-
-	// Derive isOpen from filter state + user action
-	const isOpen = useMemo(() => {
-		// If user explicitly toggled, respect that
-		if (userToggleState !== null) return userToggleState;
-
-		// Auto-open if this filter has active filters in the query
-		if (isSomeFilterPresentForCurrentAttribute) return true;
-
-		// Otherwise use default behavior (first 2 filters open)
-		return filter.defaultOpen;
-	}, [
-		userToggleState,
-		isSomeFilterPresentForCurrentAttribute,
-		filter.defaultOpen,
-	]);
-
 	const { data, isLoading } = useGetAggregateValues(
 		{
 			aggregateOperator: filter.aggregateOperator || 'noop',
@@ -156,6 +128,8 @@ export default function CheckboxFilter(props: ICheckboxProps): JSX.Element {
 		);
 	}, [data?.payload, filter.attributeKey.dataType, keyValueSuggestions, source]);
 
+	const currentAttributeKeys = attributeValues.slice(0, visibleItemsCount);
+
 	const setSearchTextDebounced = useDebouncedFn((...args) => {
 		setSearchText(args[0] as string);
 	}, DEBOUNCE_DELAY);
@@ -228,23 +202,6 @@ export default function CheckboxFilter(props: ICheckboxProps): JSX.Element {
 	const isMultipleValuesTrueForTheKey =
 		Object.values(currentFilterState).filter((val) => val).length > 1;
 
-	// Sort checked items to the top, then unchecked items
-	const currentAttributeKeys = useMemo(() => {
-		const checkedValues = attributeValues.filter(
-			(val) => currentFilterState[val],
-		);
-		const uncheckedValues = attributeValues.filter(
-			(val) => !currentFilterState[val],
-		);
-		return [...checkedValues, ...uncheckedValues].slice(0, visibleItemsCount);
-	}, [attributeValues, currentFilterState, visibleItemsCount]);
-
-	// Count of checked values in the currently visible items
-	const checkedValuesCount = useMemo(
-		() => currentAttributeKeys.filter((val) => currentFilterState[val]).length,
-		[currentAttributeKeys, currentFilterState],
-	);
-
 	const handleClearFilterAttribute = (): void => {
 		const preparedQuery: Query = {
 			...currentQuery,
@@ -278,6 +235,12 @@ export default function CheckboxFilter(props: ICheckboxProps): JSX.Element {
 		}
 	};
 
+	const isSomeFilterPresentForCurrentAttribute = currentQuery.builder.queryData?.[
+		lastUsedQuery || 0
+	]?.filters?.items?.some((item) =>
+		isEqual(item.key?.key, filter.attributeKey.key),
+	);
+
 	const onChange = (
 		value: string,
 		checked: boolean,
@@ -527,10 +490,10 @@ export default function CheckboxFilter(props: ICheckboxProps): JSX.Element {
 				className="filter-header-checkbox"
 				onClick={(): void => {
 					if (isOpen) {
-						setUserToggleState(false);
+						setIsOpen(false);
 						setVisibleItemsCount(10);
 					} else {
-						setUserToggleState(true);
+						setIsOpen(true);
 					}
 				}}
 			>
@@ -577,59 +540,50 @@ export default function CheckboxFilter(props: ICheckboxProps): JSX.Element {
 					)}
 					{attributeValues.length > 0 ? (
 						<section className="values">
-							{currentAttributeKeys.map((value: string, index: number) => (
-								<Fragment key={value}>
-									{index === checkedValuesCount && checkedValuesCount > 0 && (
-										<div
-											key="separator"
-											className="filter-separator"
-											data-testid="filter-separator"
-										/>
-									)}
-									<div className="value">
-										<Checkbox
-											onChange={(e): void => onChange(value, e.target.checked, false)}
-											checked={currentFilterState[value]}
-											disabled={isFilterDisabled}
-											rootClassName="check-box"
-										/>
+							{currentAttributeKeys.map((value: string) => (
+								<div key={value} className="value">
+									<Checkbox
+										onChange={(e): void => onChange(value, e.target.checked, false)}
+										checked={currentFilterState[value]}
+										disabled={isFilterDisabled}
+										rootClassName="check-box"
+									/>
 
-										<div
-											className={cx(
-												'checkbox-value-section',
-												isFilterDisabled ? 'filter-disabled' : '',
-											)}
-											onClick={(): void => {
-												if (isFilterDisabled) {
-													return;
-												}
-												onChange(value, currentFilterState[value], true);
-											}}
-										>
-											<div className={`${filter.title} label-${value}`} />
-											{filter.customRendererForValue ? (
-												filter.customRendererForValue(value)
-											) : (
-												<Typography.Text
-													className="value-string"
-													ellipsis={{ tooltip: { placement: 'right' } }}
-												>
-													{String(value)}
-												</Typography.Text>
-											)}
-											<Button type="text" className="only-btn">
-												{isSomeFilterPresentForCurrentAttribute
-													? currentFilterState[value] && !isMultipleValuesTrueForTheKey
-														? 'All'
-														: 'Only'
-													: 'Only'}
-											</Button>
-											<Button type="text" className="toggle-btn">
-												Toggle
-											</Button>
-										</div>
+									<div
+										className={cx(
+											'checkbox-value-section',
+											isFilterDisabled ? 'filter-disabled' : '',
+										)}
+										onClick={(): void => {
+											if (isFilterDisabled) {
+												return;
+											}
+											onChange(value, currentFilterState[value], true);
+										}}
+									>
+										<div className={`${filter.title} label-${value}`} />
+										{filter.customRendererForValue ? (
+											filter.customRendererForValue(value)
+										) : (
+											<Typography.Text
+												className="value-string"
+												ellipsis={{ tooltip: { placement: 'right' } }}
+											>
+												{String(value)}
+											</Typography.Text>
+										)}
+										<Button type="text" className="only-btn">
+											{isSomeFilterPresentForCurrentAttribute
+												? currentFilterState[value] && !isMultipleValuesTrueForTheKey
+													? 'All'
+													: 'Only'
+												: 'Only'}
+										</Button>
+										<Button type="text" className="toggle-btn">
+											Toggle
+										</Button>
 									</div>
-								</Fragment>
+								</div>
 							))}
 						</section>
 					) : isEmptyStateWithDocsEnabled ? (

frontend/src/components/Uplot/plugins/verticalMarkersPlugin.ts

@@ -0,0 +1,177 @@
+/* eslint-disable sonarjs/cognitive-complexity */
+/* eslint-disable sonarjs/no-duplicate-string */
+
+import uPlot from 'uplot';
+
+type MarkersData = { id: string | number; val: number; stroke?: string };
+
+export function verticalMarkersPlugin({
+	markersData = [],
+	lineType = [5, 3],
+	width = 1,
+}: {
+	markersData?: MarkersData[];
+	lineType?: number[];
+	width?: number;
+} = {}): uPlot.Plugin {
+	const DEFAULT_STROKE = 'rgba(0, 102, 255, 0.95)';
+	let removeListeners: (() => void) | null = null;
+	let tooltipEl: HTMLDivElement | null = null;
+	const renderAxisMarkers = (uu: uPlot): void => {
+		const axes = uu.root.querySelectorAll('.u-axis');
+		const xAxis = (axes && (axes[0] as HTMLElement)) || null;
+		if (!xAxis) return;
+
+		// attach delegated hover/mouseout listeners once on the x-axis container
+		if (!(xAxis as HTMLElement).dataset?.vlineHoverAttached) {
+			const onMouseOver = (e: MouseEvent): void => {
+				const target = e.target as HTMLElement;
+				if (!target?.classList?.contains('vline-triangle-marker')) return;
+
+				const { id } = target.dataset;
+				const valStr = target.dataset.val;
+				const val = valStr ? Number(valStr) : undefined;
+				// const mData = markersData.find((d) => String(d.id) === String(id));
+				// create tooltip
+				if (!tooltipEl) {
+					tooltipEl = document.createElement('div');
+					tooltipEl.className = 'vline-marker-tooltip';
+					Object.assign(tooltipEl.style, {
+						position: 'fixed',
+						padding: '6px 8px',
+						borderRadius: '4px',
+						fontSize: '12px',
+						zIndex: '10000',
+						pointerEvents: 'none',
+						background: '#111827',
+						color: '#e5e7eb',
+						border: '1px solid #374151',
+					});
+					document.body.appendChild(tooltipEl);
+				}
+				tooltipEl.textContent = `id: ${id ?? ''} • ts: ${val ?? ''}`;
+				// position near cursor
+				tooltipEl.style.left = `${e.clientX + 10}px`;
+				tooltipEl.style.top = `${e.clientY - 28}px`;
+			};
+			const onMouseOut = (e: MouseEvent): void => {
+				const target = e.target as HTMLElement;
+				if (!target?.classList?.contains('vline-triangle-marker')) return;
+				if (tooltipEl) {
+					tooltipEl.remove();
+					tooltipEl = null;
+				}
+			};
+			xAxis.addEventListener('mouseover', onMouseOver);
+			xAxis.addEventListener('mouseout', onMouseOut);
+			removeListeners = (): void => {
+				xAxis.removeEventListener('mouseover', onMouseOver);
+				xAxis.removeEventListener('mouseout', onMouseOut);
+			};
+			(xAxis as HTMLElement).dataset.vlineHoverAttached = '1';
+		}
+
+		// cleanup markers to avoid duplicates on rerender/resize
+		xAxis.querySelectorAll('.vline-triangle-marker').forEach((el) => el.remove());
+
+		const plotLeft = uu.bbox.left;
+		const plotRight = plotLeft + uu.bbox.width;
+
+		for (let i = 0; i < markersData.length; i++) {
+			const mData = markersData[i];
+			const xAbs = uu.valToPos(mData.val, 'x', true);
+			if (xAbs >= plotLeft && xAbs <= plotRight) {
+				const xPx = (xAbs - plotLeft) / window.devicePixelRatio;
+
+				const marker = document.createElement('div');
+				marker.className = 'vline-triangle-marker';
+				marker.dataset.id = String(mData.id); // may change later after BE discussion
+				marker.dataset.val = String(mData.val); // TODO: remove this later
+				Object.assign(marker.style, {
+					position: 'absolute',
+					width: '0px',
+					height: '0px',
+					borderLeft: '5px solid transparent',
+					borderRight: '5px solid transparent',
+					borderBottomWidth: '5px',
+					borderBottomStyle: 'solid',
+					borderBottomColor: mData.stroke || DEFAULT_STROKE,
+					transform: 'translateX(-50%)',
+					cursor: 'pointer',
+					zIndex: '1',
+					left: `${xPx}px`,
+				});
+
+				xAxis.appendChild(marker);
+			}
+		}
+	};
+
+	return {
+		hooks: {
+			destroy: [
+				(): void => {
+					if (tooltipEl) {
+						tooltipEl.remove();
+						tooltipEl = null;
+					}
+					if (removeListeners) {
+						removeListeners();
+						removeListeners = null;
+					}
+				},
+			],
+			drawAxes: [
+				(uu: uPlot): void => {
+					renderAxisMarkers(uu);
+				},
+			],
+			draw: [
+				(uu: uPlot): void => {
+					const { ctx } = uu;
+					const { top } = uu.bbox;
+					const bottom = top + uu.bbox.height;
+					const plotLeft = uu.bbox.left;
+					const plotRight = plotLeft + uu.bbox.width;
+
+					ctx.save();
+					for (let i = 0; i < markersData.length; i++) {
+						const mData = markersData[i];
+						const x = uu.valToPos(mData.val, 'x', true);
+						// only draw if within plot bounds
+						if (x >= plotLeft && x <= plotRight) {
+							ctx.beginPath();
+							ctx.strokeStyle = mData.stroke || DEFAULT_STROKE;
+							ctx.lineWidth = width;
+							ctx.setLineDash(lineType || []);
+							ctx.moveTo(x, top);
+							ctx.lineTo(x, bottom);
+							ctx.stroke();
+						}
+					}
+					ctx.restore();
+				},
+			],
+		},
+	};
+}
+
+// MOVE TO REACT. or use portal for tooltip.
+// correct the format should work with expected data from BE
+// Remove cognitive complexity rule.
+
+// logic to get marker plugin to be added to context
+// depending on type of marker parse the data to choose color. example deployment should be red etc.
+// pass such data with multple colors to check render.
+// PERF CHECK.
+
+// drive data passing from the context for markers. data in this is enriched only when we
+// use <ShowMarkers /> component. else it will be empty.
+// plugins. and pass marker hooks using this
+// should only pass marker hook if data is present(shouldRenderMarker memo)
+// depending on type of marker parse the data to choose color. example deployment should be red etc.
+// pass such data with multple colors to check render.
+// PERF CHECK.
+
+// drive data passing from the context for markers. data in this is enriched only when we
+// use <ShowMarkers /> component. else it will be empty.

frontend/src/components/YAxisUnitSelector/YAxisUnitSelector.tsx

@@ -12,7 +12,6 @@ function YAxisUnitSelector({
 	onChange,
 	placeholder = 'Please select a unit',
 	loading = false,
-	'data-testid': dataTestId,
 }: YAxisUnitSelectorProps): JSX.Element {
 	const universalUnit = mapMetricUnitToUniversalUnit(value);
 
@@ -46,7 +45,6 @@ function YAxisUnitSelector({
 				placeholder={placeholder}
 				filterOption={(input, option): boolean => handleSearch(input, option)}
 				loading={loading}
-				data-testid={dataTestId}
 			>
 				{Y_AXIS_CATEGORIES.map((category) => (
 					<Select.OptGroup key={category.name} label={category.name}>

frontend/src/components/YAxisUnitSelector/types.ts

@@ -4,7 +4,6 @@ export interface YAxisUnitSelectorProps {
 	placeholder?: string;
 	loading?: boolean;
 	disabled?: boolean;
-	'data-testid'?: string;
 }
 
 export enum UniversalYAxisUnit {

frontend/src/constants/dateTimeFormats.ts

@@ -24,7 +24,6 @@ export const DATE_TIME_FORMATS = {
 	TIME_SECONDS: 'HH:mm:ss',
 	TIME_UTC: 'HH:mm:ss (UTC Z)',
 	TIME_UTC_MS: 'HH:mm:ss.SSS (UTC Z)',
-	TIME_SPAN_PERCENTILE: 'HH:mm:ss MMM DD',
 
 	// Short date formats
 	DATE_SHORT: 'MM/DD',

frontend/src/constants/localStorage.ts

@@ -36,4 +36,5 @@ export enum LOCALSTORAGE {
 	LAST_USED_CUSTOM_TIME_RANGES = 'LAST_USED_CUSTOM_TIME_RANGES',
 	SHOW_FREQUENCY_CHART = 'SHOW_FREQUENCY_CHART',
 	DISSMISSED_COST_METER_INFO = 'DISMISSED_COST_METER_INFO',
+	MARKERS_OVERLAY_STATE = 'MARKERS_OVERLAY_STATE',
 }

frontend/src/constants/query.ts

@@ -50,5 +50,4 @@ export enum QueryParams {
 	tab = 'tab',
 	thresholds = 'thresholds',
 	selectedExplorerView = 'selectedExplorerView',
-	variables = 'variables',
 }

frontend/src/constants/reactQueryKeys.ts

@@ -86,11 +86,7 @@ export const REACT_QUERY_KEY = {
 	SPAN_LOGS: 'SPAN_LOGS',
 	SPAN_BEFORE_LOGS: 'SPAN_BEFORE_LOGS',
 	SPAN_AFTER_LOGS: 'SPAN_AFTER_LOGS',
-	TRACE_ONLY_LOGS: 'TRACE_ONLY_LOGS',
 
 	// Routing Policies Query Keys
 	GET_ROUTING_POLICIES: 'GET_ROUTING_POLICIES',
-
-	// Span Percentiles Query Keys
-	GET_SPAN_PERCENTILES: 'GET_SPAN_PERCENTILES',
 } as const;

frontend/src/constants/userPreferences.ts

@@ -3,5 +3,4 @@ export const USER_PREFERENCES = {
 	NAV_SHORTCUTS: 'nav_shortcuts',
 	LAST_SEEN_CHANGELOG_VERSION: 'last_seen_changelog_version',
 	SPAN_DETAILS_PINNED_ATTRIBUTES: 'span_details_pinned_attributes',
-	SPAN_PERCENTILE_RESOURCE_ATTRIBUTES: 'span_percentile_resource_attributes',
 };

frontend/src/container/ApiMonitoring/Explorer/Domains/DomainDetails/TopErrors.tsx

@@ -1,10 +1,8 @@
 import { LoadingOutlined } from '@ant-design/icons';
 import { Spin, Switch, Table, Tooltip, Typography } from 'antd';
-import { getQueryRangeV5 } from 'api/v5/queryRange/getQueryRange';
-import { MetricRangePayloadV5, ScalarData } from 'api/v5/v5';
 import { useNavigateToExplorer } from 'components/CeleryTask/useNavigateToExplorer';
 import { withErrorBoundary } from 'components/ErrorBoundaryHOC';
-import { ENTITY_VERSION_V4, ENTITY_VERSION_V5 } from 'constants/app';
+import { DEFAULT_ENTITY_VERSION, ENTITY_VERSION_V4 } from 'constants/app';
 import { REACT_QUERY_KEY } from 'constants/reactQueryKeys';
 import {
 	END_POINT_DETAILS_QUERY_KEYS_ARRAY,
@@ -13,12 +11,13 @@ import {
 	getTopErrorsColumnsConfig,
 	getTopErrorsCoRelationQueryFilters,
 	getTopErrorsQueryPayload,
+	TopErrorsResponseRow,
 } from 'container/ApiMonitoring/utils';
 import { GetMetricQueryRange } from 'lib/dashboard/getQueryResults';
 import { Info } from 'lucide-react';
 import { useMemo, useState } from 'react';
-import { QueryFunctionContext, useQueries, useQuery } from 'react-query';
-import { SuccessResponse, SuccessResponseV2 } from 'types/api';
+import { useQueries } from 'react-query';
+import { SuccessResponse } from 'types/api';
 import { MetricRangePayloadProps } from 'types/api/metrics/getQueryRange';
 import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse';
 import { IBuilderQuery } from 'types/api/queryBuilder/queryBuilderData';
@@ -47,7 +46,7 @@ function TopErrors({
 		true,
 	);
 
-	const queryPayload = useMemo(
+	const queryPayloads = useMemo(
 		() =>
 			getTopErrorsQueryPayload(
 				domainName,
@@ -83,34 +82,37 @@ function TopErrors({
 		],
 	);
 
+	const topErrorsDataQueries = useQueries(
+		queryPayloads.map((payload) => ({
+			queryKey: [
+				REACT_QUERY_KEY.GET_TOP_ERRORS_BY_DOMAIN,
+				payload,
+				DEFAULT_ENTITY_VERSION,
+				showStatusCodeErrors,
+			],
+			queryFn: (): Promise<SuccessResponse<MetricRangePayloadProps>> =>
+				GetMetricQueryRange(payload, DEFAULT_ENTITY_VERSION),
+			enabled: !!payload,
+			staleTime: 0,
+			cacheTime: 0,
+		})),
+	);
+
+	const topErrorsDataQuery = topErrorsDataQueries[0];
 	const {
 		data: topErrorsData,
 		isLoading,
 		isRefetching,
 		isError,
 		refetch,
-	} = useQuery({
-		queryKey: [
-			REACT_QUERY_KEY.GET_TOP_ERRORS_BY_DOMAIN,
-			queryPayload,
-			ENTITY_VERSION_V5,
-			showStatusCodeErrors,
-		],
-		queryFn: ({
-			signal,
-		}: QueryFunctionContext): Promise<SuccessResponseV2<MetricRangePayloadV5>> =>
-			getQueryRangeV5(queryPayload, ENTITY_VERSION_V5, signal),
-		enabled: !!queryPayload,
-		staleTime: 0,
-		cacheTime: 0,
-	});
+	} = topErrorsDataQuery;
 
 	const topErrorsColumnsConfig = useMemo(() => getTopErrorsColumnsConfig(), []);
 
 	const formattedTopErrorsData = useMemo(
 		() =>
 			formatTopErrorsDataForTable(
-				topErrorsData?.data?.data?.data?.results[0] as ScalarData,
+				topErrorsData?.payload?.data?.result as TopErrorsResponseRow[],
 			),
 		[topErrorsData],
 	);

frontend/src/container/ApiMonitoring/Explorer/Domains/DomainDetails/components/StatusCodeBarCharts.tsx

@@ -69,13 +69,6 @@ function StatusCodeBarCharts({
 	} = endPointStatusCodeLatencyBarChartsDataQuery;
 
 	const { startTime: minTime, endTime: maxTime } = timeRange;
-	const legendScrollPositionRef = useRef<{
-		scrollTop: number;
-		scrollLeft: number;
-	}>({
-		scrollTop: 0,
-		scrollLeft: 0,
-	});
 
 	const graphRef = useRef<HTMLDivElement>(null);
 	const dimensions = useResizeObserver(graphRef);
@@ -214,13 +207,6 @@ function StatusCodeBarCharts({
 				onDragSelect,
 				colorMapping,
 				query: currentQuery,
-				legendScrollPosition: legendScrollPositionRef.current,
-				setLegendScrollPosition: (position: {
-					scrollTop: number;
-					scrollLeft: number;
-				}) => {
-					legendScrollPositionRef.current = position;
-				},
 			}),
 		[
 			minTime,

frontend/src/container/ApiMonitoring/__tests__/APIMonitoringUtils.test.tsx

@@ -8,6 +8,7 @@ import {
 	endPointStatusCodeColumns,
 	extractPortAndEndpoint,
 	formatDataForTable,
+	formatTopErrorsDataForTable,
 	getAllEndpointsWidgetData,
 	getCustomFiltersForBarChart,
 	getEndPointDetailsQueryPayload,
@@ -22,6 +23,8 @@ import {
 	getStatusCodeBarChartWidgetData,
 	getTopErrorsColumnsConfig,
 	getTopErrorsCoRelationQueryFilters,
+	getTopErrorsQueryPayload,
+	TopErrorsResponseRow,
 } from '../utils';
 import { APIMonitoringColumnsMock } from './mock';
 
@@ -341,6 +344,49 @@ describe('API Monitoring Utils', () => {
 		});
 	});
 
+	describe('formatTopErrorsDataForTable', () => {
+		it('should format top errors data correctly', () => {
+			// Arrange
+			const inputData = [
+				{
+					metric: {
+						[SPAN_ATTRIBUTES.URL_PATH]: '/api/test',
+						[SPAN_ATTRIBUTES.RESPONSE_STATUS_CODE]: '500',
+						status_message: 'Internal Server Error',
+					},
+					values: [[1000000100, '10']],
+					queryName: 'A',
+					legend: 'Test Legend',
+				},
+			];
+
+			// Act
+			const result = formatTopErrorsDataForTable(
+				inputData as TopErrorsResponseRow[],
+			);
+
+			// Assert
+			expect(result).toBeDefined();
+			expect(result.length).toBe(1);
+
+			// Check first item is formatted correctly
+			expect(result[0].endpointName).toBe('/api/test');
+			expect(result[0].statusCode).toBe('500');
+			expect(result[0].statusMessage).toBe('Internal Server Error');
+			expect(result[0].count).toBe('10');
+			expect(result[0].key).toBeDefined();
+		});
+
+		it('should handle empty input', () => {
+			// Act
+			const result = formatTopErrorsDataForTable(undefined);
+
+			// Assert
+			expect(result).toBeDefined();
+			expect(result).toEqual([]);
+		});
+	});
+
 	describe('getTopErrorsColumnsConfig', () => {
 		it('should return column configuration with expected fields', () => {
 			// Act
@@ -407,6 +453,72 @@ describe('API Monitoring Utils', () => {
 		});
 	});
 
+	describe('getTopErrorsQueryPayload', () => {
+		it('should create correct query payload with filters', () => {
+			// Arrange
+			const domainName = 'test-domain';
+			const start = 1000000000;
+			const end = 1000010000;
+			const filters = {
+				items: [
+					{
+						id: 'test-filter',
+						key: {
+							dataType: DataTypes.String,
+							key: 'test-key',
+							type: '',
+						},
+						op: '=',
+						value: 'test-value',
+					},
+				],
+				op: 'AND',
+			};
+
+			// Act
+			const result = getTopErrorsQueryPayload(
+				domainName,
+				start,
+				end,
+				filters as IBuilderQuery['filters'],
+			);
+
+			// Assert
+			expect(result).toBeDefined();
+			expect(result.length).toBeGreaterThan(0);
+
+			// Verify query params
+			expect(result[0].start).toBe(start);
+			expect(result[0].end).toBe(end);
+
+			// Verify correct structure
+			expect(result[0].graphType).toBeDefined();
+			expect(result[0].query).toBeDefined();
+			expect(result[0].query.builder).toBeDefined();
+			expect(result[0].query.builder.queryData).toBeDefined();
+
+			// Verify domain filter is included
+			const queryData = result[0].query.builder.queryData[0];
+			expect(queryData.filters).toBeDefined();
+
+			// Check for domain filter
+			const domainFilter = queryData.filters?.items?.find(
+				// eslint-disable-next-line sonarjs/no-identical-functions
+				(item) =>
+					item.key &&
+					item.key.key === SPAN_ATTRIBUTES.SERVER_NAME &&
+					item.value === domainName,
+			);
+			expect(domainFilter).toBeDefined();
+
+			// Check that custom filters were included
+			const testFilter = queryData.filters?.items?.find(
+				(item) => item.id === 'test-filter',
+			);
+			expect(testFilter).toBeDefined();
+		});
+	});
+
 	// Add new tests for EndPointDetails utility functions
 	describe('extractPortAndEndpoint', () => {
 		it('should extract port and endpoint from a valid URL', () => {

frontend/src/container/ApiMonitoring/__tests__/TopErrors.test.tsx

@@ -1,6 +1,14 @@
+import { fireEvent, render, screen, within } from '@testing-library/react';
 import { useNavigateToExplorer } from 'components/CeleryTask/useNavigateToExplorer';
-import { rest, server } from 'mocks-server/server';
-import { fireEvent, render, screen, waitFor, within } from 'tests/test-utils';
+import { REACT_QUERY_KEY } from 'constants/reactQueryKeys';
+import {
+	formatTopErrorsDataForTable,
+	getEndPointDetailsQueryPayload,
+	getTopErrorsColumnsConfig,
+	getTopErrorsCoRelationQueryFilters,
+	getTopErrorsQueryPayload,
+} from 'container/ApiMonitoring/utils';
+import { useQueries } from 'react-query';
 import { DataSource } from 'types/common/queryBuilder';
 
 import TopErrors from '../Explorer/Domains/DomainDetails/TopErrors';
@@ -27,15 +35,28 @@ jest.mock(
 	}),
 );
 
+// Mock dependencies
+jest.mock('react-query', () => ({
+	...jest.requireActual('react-query'),
+	useQueries: jest.fn(),
+}));
+
 jest.mock('components/CeleryTask/useNavigateToExplorer', () => ({
 	useNavigateToExplorer: jest.fn(),
 }));
 
-describe('TopErrors', () => {
-	const TABLE_BODY_SELECTOR = '.ant-table-tbody';
-	const V5_QUERY_RANGE_API_PATH = '*/api/v5/query_range';
+jest.mock('container/ApiMonitoring/utils', () => ({
+	END_POINT_DETAILS_QUERY_KEYS_ARRAY: ['key1', 'key2', 'key3', 'key4', 'key5'],
+	formatTopErrorsDataForTable: jest.fn(),
+	getEndPointDetailsQueryPayload: jest.fn(),
+	getTopErrorsColumnsConfig: jest.fn(),
+	getTopErrorsCoRelationQueryFilters: jest.fn(),
+	getTopErrorsQueryPayload: jest.fn(),
+}));
 
+describe('TopErrors', () => {
 	const mockProps = {
+		// eslint-disable-next-line sonarjs/no-duplicate-string
 		domainName: 'test-domain',
 		timeRange: {
 			startTime: 1000000000,
@@ -47,72 +68,75 @@ describe('TopErrors', () => {
 		},
 	};
 
-	// Helper function to wait for table data to load
-	const waitForTableDataToLoad = async (
-		container: HTMLElement,
-	): Promise<void> => {
-		await waitFor(() => {
-			const tableBody = container.querySelector(TABLE_BODY_SELECTOR);
-			expect(tableBody).not.toBeNull();
-			if (tableBody) {
-				expect(
-					within(tableBody as HTMLElement).queryByText('/api/test'),
-				).toBeInTheDocument();
-			}
-		});
-	};
-
+	// Setup basic mocks
 	beforeEach(() => {
 		jest.clearAllMocks();
 
-		// Mock useNavigateToExplorer
-		(useNavigateToExplorer as jest.Mock).mockReturnValue(jest.fn());
+		// Mock getTopErrorsColumnsConfig
+		(getTopErrorsColumnsConfig as jest.Mock).mockReturnValue([
+			{
+				title: 'Endpoint',
+				dataIndex: 'endpointName',
+				key: 'endpointName',
+			},
+			{
+				title: 'Status Code',
+				dataIndex: 'statusCode',
+				key: 'statusCode',
+			},
+			{
+				title: 'Status Message',
+				dataIndex: 'statusMessage',
+				key: 'statusMessage',
+			},
+			{
+				title: 'Count',
+				dataIndex: 'count',
+				key: 'count',
+			},
+		]);
 
-		// Mock V5 API endpoint for top errors
-		server.use(
-			rest.post(V5_QUERY_RANGE_API_PATH, (_req, res, ctx) =>
-				res(
-					ctx.status(200),
-					ctx.json({
+		// Mock useQueries
+		(useQueries as jest.Mock).mockImplementation((queryConfigs) => {
+			// For topErrorsDataQueries
+			if (
+				queryConfigs.length === 1 &&
+				queryConfigs[0].queryKey &&
+				queryConfigs[0].queryKey[0] === REACT_QUERY_KEY.GET_TOP_ERRORS_BY_DOMAIN
+			) {
+				return [
+					{
 						data: {
-							data: {
-								results: [
-									{
-										columns: [
-											{
-												name: 'http.url',
-												fieldDataType: 'string',
-												fieldContext: 'attribute',
+							payload: {
+								data: {
+									result: [
+										{
+											metric: {
+												'http.url': '/api/test',
+												status_code: '500',
+												// eslint-disable-next-line sonarjs/no-duplicate-string
+												status_message: 'Internal Server Error',
 											},
-											{
-												name: 'response_status_code',
-												fieldDataType: 'string',
-												fieldContext: 'span',
-											},
-											{
-												name: 'status_message',
-												fieldDataType: 'string',
-												fieldContext: 'span',
-											},
-											{ name: 'count()', fieldDataType: 'int64', fieldContext: '' },
-										],
-										// eslint-disable-next-line sonarjs/no-duplicate-string
-										data: [['/api/test', '500', 'Internal Server Error', 10]],
-									},
-								],
+											values: [[1000000100, '10']],
+											queryName: 'A',
+											legend: 'Test Legend',
+										},
+									],
+								},
 							},
 						},
-					}),
-				),
-			),
-		);
+						isLoading: false,
+						isRefetching: false,
+						isError: false,
+						refetch: jest.fn(),
+					},
+				];
+			}
 
-		// Mock V4 API endpoint for dropdown data
-		server.use(
-			rest.post('*/api/v1/query_range', (_req, res, ctx) =>
-				res(
-					ctx.status(200),
-					ctx.json({
+			// For endPointDropDownDataQueries
+			return [
+				{
+					data: {
 						payload: {
 							data: {
 								result: [
@@ -129,13 +153,62 @@ describe('TopErrors', () => {
 								],
 							},
 						},
-					}),
-				),
-			),
-		);
+					},
+					isLoading: false,
+					isRefetching: false,
+					isError: false,
+				},
+			];
+		});
+
+		// Mock formatTopErrorsDataForTable
+		(formatTopErrorsDataForTable as jest.Mock).mockReturnValue([
+			{
+				key: '1',
+				endpointName: '/api/test',
+				statusCode: '500',
+				statusMessage: 'Internal Server Error',
+				count: 10,
+			},
+		]);
+
+		// Mock getTopErrorsQueryPayload
+		(getTopErrorsQueryPayload as jest.Mock).mockReturnValue([
+			{
+				queryName: 'TopErrorsQuery',
+				start: mockProps.timeRange.startTime,
+				end: mockProps.timeRange.endTime,
+				step: 60,
+			},
+		]);
+
+		// Mock getEndPointDetailsQueryPayload
+		(getEndPointDetailsQueryPayload as jest.Mock).mockReturnValue([
+			{},
+			{},
+			{
+				queryName: 'EndpointDropdownQuery',
+				start: mockProps.timeRange.startTime,
+				end: mockProps.timeRange.endTime,
+				step: 60,
+			},
+		]);
+
+		// Mock useNavigateToExplorer
+		(useNavigateToExplorer as jest.Mock).mockReturnValue(jest.fn());
+
+		// Mock getTopErrorsCoRelationQueryFilters
+		(getTopErrorsCoRelationQueryFilters as jest.Mock).mockReturnValue({
+			items: [
+				{ id: 'test1', key: { key: 'domain' }, op: '=', value: 'test-domain' },
+				{ id: 'test2', key: { key: 'endpoint' }, op: '=', value: '/api/test' },
+				{ id: 'test3', key: { key: 'status' }, op: '=', value: '500' },
+			],
+			op: 'AND',
+		});
 	});
 
-	it('renders component correctly', async () => {
+	it('renders component correctly', () => {
 		// eslint-disable-next-line react/jsx-props-no-spreading
 		const { container } = render(<TopErrors {...mockProps} />);
 
@@ -143,11 +216,10 @@ describe('TopErrors', () => {
 		expect(screen.getByText('Errors with Status Message')).toBeInTheDocument();
 		expect(screen.getByText('Status Message Exists')).toBeInTheDocument();
 
-		// Wait for data to load
-		await waitForTableDataToLoad(container);
-
 		// Find the table row and verify content
-		const tableBody = container.querySelector(TABLE_BODY_SELECTOR);
+		const tableBody = container.querySelector('.ant-table-tbody');
+		expect(tableBody).not.toBeNull();
+
 		if (tableBody) {
 			const row = within(tableBody as HTMLElement).getByRole('row');
 			expect(within(row).getByText('/api/test')).toBeInTheDocument();
@@ -156,40 +228,35 @@ describe('TopErrors', () => {
 		}
 	});
 
-	it('renders error state when API fails', async () => {
-		// Mock API to return error
-		server.use(
-			rest.post(V5_QUERY_RANGE_API_PATH, (_req, res, ctx) =>
-				res(ctx.status(500), ctx.json({ error: 'Internal Server Error' })),
-			),
-		);
+	it('renders error state when isError is true', () => {
+		// Mock useQueries to return isError: true
+		(useQueries as jest.Mock).mockImplementationOnce(() => [
+			{
+				isError: true,
+				refetch: jest.fn(),
+			},
+		]);
 
 		// eslint-disable-next-line react/jsx-props-no-spreading
 		render(<TopErrors {...mockProps} />);
 
-		// Wait for error state
-		await waitFor(() => {
-			expect(
-				screen.getByText('Uh-oh :/ We ran into an error.'),
-			).toBeInTheDocument();
-		});
-
+		// Error state should be shown with the actual text displayed in the UI
+		expect(
+			screen.getByText('Uh-oh :/ We ran into an error.'),
+		).toBeInTheDocument();
 		expect(screen.getByText('Please refresh this panel.')).toBeInTheDocument();
 		expect(screen.getByText('Refresh this panel')).toBeInTheDocument();
 	});
 
-	it('handles row click correctly', async () => {
+	it('handles row click correctly', () => {
 		const navigateMock = jest.fn();
 		(useNavigateToExplorer as jest.Mock).mockReturnValue(navigateMock);
 
 		// eslint-disable-next-line react/jsx-props-no-spreading
 		const { container } = render(<TopErrors {...mockProps} />);
 
-		// Wait for data to load
-		await waitForTableDataToLoad(container);
-
 		// Find and click on the table cell containing the endpoint
-		const tableBody = container.querySelector(TABLE_BODY_SELECTOR);
+		const tableBody = container.querySelector('.ant-table-tbody');
 		expect(tableBody).not.toBeNull();
 
 		if (tableBody) {
@@ -200,28 +267,11 @@ describe('TopErrors', () => {
 
 		// Check if navigateToExplorer was called with correct params
 		expect(navigateMock).toHaveBeenCalledWith({
-			filters: expect.arrayContaining([
-				expect.objectContaining({
-					key: expect.objectContaining({ key: 'http.url' }),
-					op: '=',
-					value: '/api/test',
-				}),
-				expect.objectContaining({
-					key: expect.objectContaining({ key: 'has_error' }),
-					op: '=',
-					value: 'true',
-				}),
-				expect.objectContaining({
-					key: expect.objectContaining({ key: 'net.peer.name' }),
-					op: '=',
-					value: 'test-domain',
-				}),
-				expect.objectContaining({
-					key: expect.objectContaining({ key: 'response_status_code' }),
-					op: '=',
-					value: '500',
-				}),
-			]),
+			filters: [
+				{ id: 'test1', key: { key: 'domain' }, op: '=', value: 'test-domain' },
+				{ id: 'test2', key: { key: 'endpoint' }, op: '=', value: '/api/test' },
+				{ id: 'test3', key: { key: 'status' }, op: '=', value: '500' },
+			],
 			dataSource: DataSource.TRACES,
 			startTime: mockProps.timeRange.startTime,
 			endTime: mockProps.timeRange.endTime,
@@ -229,34 +279,24 @@ describe('TopErrors', () => {
 		});
 	});
 
-	it('updates endpoint filter when dropdown value changes', async () => {
+	it('updates endpoint filter when dropdown value changes', () => {
 		// eslint-disable-next-line react/jsx-props-no-spreading
 		render(<TopErrors {...mockProps} />);
 
-		// Wait for initial load
-		await waitFor(() => {
-			expect(screen.getByRole('combobox')).toBeInTheDocument();
-		});
-
 		// Find the dropdown
 		const dropdown = screen.getByRole('combobox');
 
 		// Mock the change
 		fireEvent.change(dropdown, { target: { value: '/api/new-endpoint' } });
 
-		// Component should re-render with new filter
-		expect(dropdown).toBeInTheDocument();
+		// Check if getTopErrorsQueryPayload was called with updated parameters
+		expect(getTopErrorsQueryPayload).toHaveBeenCalled();
 	});
 
-	it('handles status message toggle correctly', async () => {
+	it('handles status message toggle correctly', () => {
 		// eslint-disable-next-line react/jsx-props-no-spreading
 		render(<TopErrors {...mockProps} />);
 
-		// Wait for initial load
-		await waitFor(() => {
-			expect(screen.getByRole('switch')).toBeInTheDocument();
-		});
-
 		// Find the toggle switch
 		const toggle = screen.getByRole('switch');
 		expect(toggle).toBeInTheDocument();
@@ -267,104 +307,69 @@ describe('TopErrors', () => {
 		// Click the toggle to turn it off
 		fireEvent.click(toggle);
 
+		// Check if getTopErrorsQueryPayload was called with showStatusCodeErrors=false
+		expect(getTopErrorsQueryPayload).toHaveBeenCalledWith(
+			mockProps.domainName,
+			mockProps.timeRange.startTime,
+			mockProps.timeRange.endTime,
+			expect.any(Object),
+			false,
+		);
+
 		// Title should change
-		await waitFor(() => {
-			expect(screen.getByText('All Errors')).toBeInTheDocument();
-		});
+		expect(screen.getByText('All Errors')).toBeInTheDocument();
 
 		// Click the toggle to turn it back on
 		fireEvent.click(toggle);
 
+		// Check if getTopErrorsQueryPayload was called with showStatusCodeErrors=true
+		expect(getTopErrorsQueryPayload).toHaveBeenCalledWith(
+			mockProps.domainName,
+			mockProps.timeRange.startTime,
+			mockProps.timeRange.endTime,
+			expect.any(Object),
+			true,
+		);
+
 		// Title should change back
-		await waitFor(() => {
-			expect(screen.getByText('Errors with Status Message')).toBeInTheDocument();
-		});
+		expect(screen.getByText('Errors with Status Message')).toBeInTheDocument();
 	});
 
-	it('includes toggle state in query key for cache busting', async () => {
+	it('includes toggle state in query key for cache busting', () => {
 		// eslint-disable-next-line react/jsx-props-no-spreading
 		render(<TopErrors {...mockProps} />);
 
-		// Wait for initial load
-		await waitFor(() => {
-			expect(screen.getByRole('switch')).toBeInTheDocument();
-		});
-
 		const toggle = screen.getByRole('switch');
 
+		// Initial query should include showStatusCodeErrors=true
+		expect(useQueries).toHaveBeenCalledWith(
+			expect.arrayContaining([
+				expect.objectContaining({
+					queryKey: expect.arrayContaining([
+						REACT_QUERY_KEY.GET_TOP_ERRORS_BY_DOMAIN,
+						expect.any(Object),
+						expect.any(String),
+						true,
+					]),
+				}),
+			]),
+		);
+
 		// Click toggle
 		fireEvent.click(toggle);
 
-		// Wait for title to change, indicating query was refetched with new key
-		await waitFor(() => {
-			expect(screen.getByText('All Errors')).toBeInTheDocument();
-		});
-
-		// The fact that data refetches when toggle changes proves the query key includes the toggle state
-		expect(toggle).toBeInTheDocument();
-	});
-
-	it('sends query_range v5 API call with required filters including has_error', async () => {
-		let capturedRequest: any;
-
-		// Override the v5 API mock to capture the request
-		server.use(
-			rest.post(V5_QUERY_RANGE_API_PATH, async (req, res, ctx) => {
-				capturedRequest = await req.json();
-				return res(
-					ctx.status(200),
-					ctx.json({
-						data: {
-							data: {
-								results: [
-									{
-										columns: [
-											{
-												name: 'http.url',
-												fieldDataType: 'string',
-												fieldContext: 'attribute',
-											},
-											{
-												name: 'response_status_code',
-												fieldDataType: 'string',
-												fieldContext: 'span',
-											},
-											{
-												name: 'status_message',
-												fieldDataType: 'string',
-												fieldContext: 'span',
-											},
-											{ name: 'count()', fieldDataType: 'int64', fieldContext: '' },
-										],
-										data: [['/api/test', '500', 'Internal Server Error', 10]],
-									},
-								],
-							},
-						},
-					}),
-				);
-			}),
+		// Query should be called with showStatusCodeErrors=false in key
+		expect(useQueries).toHaveBeenCalledWith(
+			expect.arrayContaining([
+				expect.objectContaining({
+					queryKey: expect.arrayContaining([
+						REACT_QUERY_KEY.GET_TOP_ERRORS_BY_DOMAIN,
+						expect.any(Object),
+						expect.any(String),
+						false,
+					]),
+				}),
+			]),
 		);
-
-		// eslint-disable-next-line react/jsx-props-no-spreading
-		render(<TopErrors {...mockProps} />);
-
-		// Wait for the API call to be made
-		await waitFor(() => {
-			expect(capturedRequest).toBeDefined();
-		});
-
-		// Extract the filter expression from the captured request
-		const filterExpression =
-			capturedRequest.compositeQuery.queries[0].spec.filter.expression;
-
-		// Verify all required filters are present
-		expect(filterExpression).toContain(`kind_string = 'Client'`);
-		expect(filterExpression).toContain(`(http.url EXISTS OR url.full EXISTS)`);
-		expect(filterExpression).toContain(
-			`(net.peer.name = 'test-domain' OR server.address = 'test-domain')`,
-		);
-		expect(filterExpression).toContain(`has_error = true`);
-		expect(filterExpression).toContain(`status_message EXISTS`); // toggle is on by default
 	});
 });

frontend/src/container/ApiMonitoring/utils.tsx

@@ -2,7 +2,6 @@
 import { Color } from '@signozhq/design-tokens';
 import { Progress, Tag, Tooltip } from 'antd';
 import { ColumnType } from 'antd/es/table';
-import { convertFiltersToExpressionWithExistingQuery } from 'components/QueryBuilderV2/utils';
 import {
 	FiltersType,
 	IQuickFiltersConfig,
@@ -28,11 +27,6 @@ import {
 	OrderByPayload,
 	TagFilterItem,
 } from 'types/api/queryBuilder/queryBuilderData';
-import {
-	ColumnDescriptor,
-	QueryRangePayloadV5,
-	ScalarData,
-} from 'types/api/v5/queryRange';
 import { QueryData } from 'types/api/widgets/getQuery';
 import { EQueryType } from 'types/common/dashboard';
 import { DataSource } from 'types/common/queryBuilder';
@@ -46,9 +40,6 @@ import {
 	EndPointsResponseRow,
 } from './types';
 
-export const isEmptyFilterValue = (value: unknown): boolean =>
-	value === '' || value === null || value === undefined || value === 'n/a';
-
 export const ApiMonitoringQuickFiltersConfig: IQuickFiltersConfig[] = [
 	{
 		type: FiltersType.CHECKBOX,
@@ -825,100 +816,153 @@ export const getEndPointsQueryPayload = (
 	];
 };
 
-// eslint-disable-next-line sonarjs/cognitive-complexity
-function buildFilterExpression(
-	domainName: string,
-	filters: IBuilderQuery['filters'],
-	showStatusCodeErrors: boolean,
-): string {
-	const baseFilterParts = [
-		`kind_string = 'Client'`,
-		`(http.url EXISTS OR url.full EXISTS)`,
-		`(net.peer.name = '${domainName}' OR server.address = '${domainName}')`,
-		`has_error = true`,
-	];
-	if (showStatusCodeErrors) {
-		baseFilterParts.push('status_message EXISTS');
-	}
-	const filterExpression = baseFilterParts.join(' AND ');
-	if (!filters) {
-		return filterExpression;
-	}
-	const { filter } = convertFiltersToExpressionWithExistingQuery(
-		filters,
-		filterExpression,
-	);
-	return filter.expression;
-}
-
 export const getTopErrorsQueryPayload = (
 	domainName: string,
 	start: number,
 	end: number,
 	filters: IBuilderQuery['filters'],
 	showStatusCodeErrors = true,
-): QueryRangePayloadV5 => {
-	const filterExpression = buildFilterExpression(
-		domainName,
-		filters,
-		showStatusCodeErrors,
-	);
-
-	return {
-		schemaVersion: 'v1',
-		start,
-		end,
-		requestType: 'scalar',
-		compositeQuery: {
-			queries: [
-				{
-					type: 'builder_query',
-					spec: {
-						name: 'A',
-						signal: 'traces',
-						stepInterval: 60,
+): GetQueryResultsProps[] => [
+	{
+		selectedTime: 'GLOBAL_TIME',
+		graphType: PANEL_TYPES.TABLE,
+		query: {
+			builder: {
+				queryData: [
+					{
+						dataSource: DataSource.TRACES,
+						queryName: 'A',
+						aggregateOperator: 'count',
+						aggregateAttribute: {
+							id: '------false',
+							dataType: DataTypes.String,
+							key: '',
+							type: '',
+						},
+						timeAggregation: 'rate',
+						spaceAggregation: 'sum',
+						functions: [],
+						filters: {
+							op: 'AND',
+							items: [
+								{
+									id: '04da97bd',
+									key: {
+										key: 'kind_string',
+										dataType: DataTypes.String,
+										type: '',
+									},
+									op: '=',
+									value: 'Client',
+								},
+								{
+									id: 'b1af6bdb',
+									key: {
+										key: SPAN_ATTRIBUTES.URL_PATH,
+										dataType: DataTypes.String,
+										type: 'tag',
+									},
+									op: 'exists',
+									value: '',
+								},
+								...(showStatusCodeErrors
+									? [
+											{
+												id: '75d65388',
+												key: {
+													key: 'status_message',
+													dataType: DataTypes.String,
+													type: '',
+												},
+												op: 'exists',
+												value: '',
+											},
+									  ]
+									: []),
+								{
+									id: '4872bf91',
+									key: {
+										key: SPAN_ATTRIBUTES.SERVER_NAME,
+										dataType: DataTypes.String,
+										type: 'tag',
+									},
+									op: '=',
+									value: domainName,
+								},
+								{
+									id: 'ab4c885d',
+									key: {
+										key: 'has_error',
+										dataType: DataTypes.bool,
+										type: '',
+									},
+									op: '=',
+									value: true,
+								},
+								...(filters?.items || []),
+							],
+						},
+						expression: 'A',
 						disabled: false,
-						aggregations: [{ expression: 'count()' }],
-						filter: { expression: filterExpression },
+						stepInterval: 60,
+						having: [],
+						limit: 10,
+						orderBy: [
+							{
+								columnName: 'timestamp',
+								order: 'desc',
+							},
+						],
 						groupBy: [
 							{
-								name: 'http.url',
-								fieldDataType: 'string',
-								fieldContext: 'attribute',
+								key: SPAN_ATTRIBUTES.URL_PATH,
+								dataType: DataTypes.String,
+								type: 'tag',
 							},
 							{
-								name: 'url.full',
-								fieldDataType: 'string',
-								fieldContext: 'attribute',
+								dataType: DataTypes.String,
+								key: 'response_status_code',
+								type: '',
+								id: 'response_status_code--string----true',
 							},
 							{
-								name: 'response_status_code',
-								fieldDataType: 'string',
-								fieldContext: 'span',
-							},
-							{
-								name: 'status_message',
-								fieldDataType: 'string',
-								fieldContext: 'span',
-							},
-						],
-						limit: 10,
-						order: [
-							{
-								key: {
-									name: 'count()',
-								},
-								direction: 'desc',
+								key: 'status_message',
+								dataType: DataTypes.String,
+								type: '',
 							},
 						],
+						legend: '',
+						reduceTo: 'avg',
 					},
+				],
+				queryFormulas: [],
+				queryTraceOperator: [],
+			},
+			clickhouse_sql: [
+				{
+					disabled: false,
+					legend: '',
+					name: 'A',
+					query: '',
 				},
 			],
+			id: '315b15fa-ff0c-442f-89f8-2bf4fb1af2f2',
+			promql: [
+				{
+					disabled: false,
+					legend: '',
+					name: 'A',
+					query: '',
+				},
+			],
+			queryType: EQueryType.QUERY_BUILDER,
 		},
-		formatOptions: { formatTableResultForUI: true, fillGaps: false },
 		variables: {},
-	};
-};
+		start,
+		end,
+		step: 240,
+	},
+];
 
 export interface EndPointsTableRowData {
 	key: string;
@@ -1198,55 +1242,63 @@ export const formatEndPointsDataForTable = (
 	return formattedData;
 };
 
-export type TopErrorsResponseRow = ScalarData;
+export interface TopErrorsResponseRow {
+	metric: {
+		[SPAN_ATTRIBUTES.URL_PATH]: string;
+		[SPAN_ATTRIBUTES.RESPONSE_STATUS_CODE]: string;
+		status_message: string;
+	};
+	values: [number, string][];
+	queryName: string;
+	legend: string;
+}
 
 export interface TopErrorsTableRowData {
 	key: string;
 	endpointName: string;
 	statusCode: string;
 	statusMessage: string;
-	count: string;
-}
-
-/**
- * Returns '-' if value is empty, otherwise returns value as string
- */
-export function getDisplayValue(value: unknown): string {
-	return isEmptyFilterValue(value) ? '-' : String(value);
+	count: number | string;
 }
 
 export const formatTopErrorsDataForTable = (
-	scalarResult: TopErrorsResponseRow | undefined,
+	data: TopErrorsResponseRow[] | undefined,
 ): TopErrorsTableRowData[] => {
-	if (!scalarResult?.data) return [];
+	if (!data) return [];
 
-	const columns = scalarResult.columns || [];
-	const rows = scalarResult.data || [];
-
-	return rows.map((rowData: unknown[]) => {
-		const rowObj: Record<string, unknown> = {};
-		columns.forEach((col: ColumnDescriptor, index: number) => {
-			rowObj[col.name] = rowData[index];
-		});
-
-		return {
-			key: v4(),
-			endpointName: getDisplayValue(
-				rowObj[SPAN_ATTRIBUTES.URL_PATH] || rowObj['url.full'],
-			),
-			statusCode: getDisplayValue(rowObj[SPAN_ATTRIBUTES.RESPONSE_STATUS_CODE]),
-			statusMessage: getDisplayValue(rowObj.status_message),
-			count: getDisplayValue(rowObj.__result_0),
-		};
-	});
+	return data.map((row) => ({
+		key: v4(),
+		endpointName:
+			row.metric[SPAN_ATTRIBUTES.URL_PATH] === 'n/a' ||
+			row.metric[SPAN_ATTRIBUTES.URL_PATH] === undefined
+				? '-'
+				: row.metric[SPAN_ATTRIBUTES.URL_PATH],
+		statusCode:
+			row.metric[SPAN_ATTRIBUTES.RESPONSE_STATUS_CODE] === 'n/a' ||
+			row.metric[SPAN_ATTRIBUTES.RESPONSE_STATUS_CODE] === undefined
+				? '-'
+				: row.metric[SPAN_ATTRIBUTES.RESPONSE_STATUS_CODE],
+		statusMessage:
+			row.metric.status_message === 'n/a' ||
+			row.metric.status_message === undefined
+				? '-'
+				: row.metric.status_message,
+		count:
+			row.values &&
+			row.values[0] &&
+			row.values[0][1] !== undefined &&
+			row.values[0][1] !== 'n/a'
+				? row.values[0][1]
+				: '-',
+	}));
 };
 
 export const getTopErrorsCoRelationQueryFilters = (
 	domainName: string,
 	endPointName: string,
 	statusCode: string,
-): IBuilderQuery['filters'] => {
-	const items: TagFilterItem[] = [
+): IBuilderQuery['filters'] => ({
+	items: [
 		{
 			id: 'ea16470b',
 			key: {
@@ -1278,10 +1330,7 @@ export const getTopErrorsCoRelationQueryFilters = (
 			op: '=',
 			value: domainName,
 		},
-	];
-
-	if (statusCode !== '-') {
-		items.push({
+		{
 			id: 'f6891e27',
 			key: {
 				key: 'response_status_code',
@@ -1291,14 +1340,10 @@ export const getTopErrorsCoRelationQueryFilters = (
 			},
 			op: '=',
 			value: statusCode,
-		});
-	}
-
-	return {
-		items,
-		op: 'AND',
-	};
-};
+		},
+	],
+	op: 'AND',
+});
 
 export const getTopErrorsColumnsConfig = (): ColumnType<TopErrorsTableRowData>[] => [
 	{

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

@@ -11,14 +11,12 @@ import { v4 } from 'uuid';
 
 import { useCreateAlertState } from '../context';
 import {
-	INITIAL_EVALUATION_WINDOW_STATE,
 	INITIAL_INFO_THRESHOLD,
 	INITIAL_RANDOM_THRESHOLD,
 	INITIAL_WARNING_THRESHOLD,
 	THRESHOLD_MATCH_TYPE_OPTIONS,
 	THRESHOLD_OPERATOR_OPTIONS,
 } from '../context/constants';
-import { AlertThresholdMatchType } from '../context/types';
 import EvaluationSettings from '../EvaluationSettings/EvaluationSettings';
 import ThresholdItem from './ThresholdItem';
 import { AnomalyAndThresholdProps, UpdateThreshold } from './types';
@@ -40,12 +38,12 @@ function AlertThreshold({
 		alertState,
 		thresholdState,
 		setThresholdState,
-		setEvaluationWindow,
 		notificationSettings,
 		setNotificationSettings,
 	} = useCreateAlertState();
 
 	const { currentQuery } = useQueryBuilder();
+
 	const queryNames = getQueryNames(currentQuery);
 
 	useEffect(() => {
@@ -162,54 +160,6 @@ function AlertThreshold({
 		}),
 	);
 
-	const handleSetEvaluationDetailsForMeter = (): void => {
-		setEvaluationWindow({
-			type: 'SET_INITIAL_STATE_FOR_METER',
-		});
-
-		setThresholdState({
-			type: 'SET_MATCH_TYPE',
-			payload: AlertThresholdMatchType.IN_TOTAL,
-		});
-	};
-
-	const handleSelectedQueryChange = (value: string): void => {
-		// loop through currenttQuery and find the query that matches the selected query
-		const query = currentQuery?.builder?.queryData.find(
-			(query) => query.queryName === value,
-		);
-
-		const currentSelectedQuery = currentQuery?.builder?.queryData.find(
-			(query) => query.queryName === thresholdState.selectedQuery,
-		);
-
-		const newSelectedQuerySource = query?.source || '';
-		const currentSelectedQuerySource = currentSelectedQuery?.source || '';
-
-		if (newSelectedQuerySource === currentSelectedQuerySource) {
-			setThresholdState({
-				type: 'SET_SELECTED_QUERY',
-				payload: value,
-			});
-
-			return;
-		}
-
-		if (newSelectedQuerySource === 'meter') {
-			handleSetEvaluationDetailsForMeter();
-		} else {
-			setEvaluationWindow({
-				type: 'SET_INITIAL_STATE',
-				payload: INITIAL_EVALUATION_WINDOW_STATE,
-			});
-		}
-
-		setThresholdState({
-			type: 'SET_SELECTED_QUERY',
-			payload: value,
-		});
-	};
-
 	return (
 		<div
 			className={classNames(
@@ -225,10 +175,14 @@ function AlertThreshold({
 					</Typography.Text>
 					<Select
 						value={thresholdState.selectedQuery}
-						onChange={handleSelectedQueryChange}
+						onChange={(value): void => {
+							setThresholdState({
+								type: 'SET_SELECTED_QUERY',
+								payload: value,
+							});
+						}}
 						style={{ width: 80 }}
 						options={queryNames}
-						data-testid="alert-threshold-query-select"
 					/>
 					<Typography.Text className="sentence-text">is</Typography.Text>
 					<Select
@@ -241,7 +195,6 @@ function AlertThreshold({
 						}}
 						style={{ width: 180 }}
 						options={THRESHOLD_OPERATOR_OPTIONS}
-						data-testid="alert-threshold-operator-select"
 					/>
 					<Typography.Text className="sentence-text">
 						the threshold(s)
@@ -256,7 +209,6 @@ function AlertThreshold({
 						}}
 						style={{ width: 180 }}
 						options={matchTypeOptionsWithTooltips}
-						data-testid="alert-threshold-match-type-select"
 					/>
 					<Typography.Text className="sentence-text">
 						during the <EvaluationSettings />
@@ -284,7 +236,6 @@ function AlertThreshold({
 					icon={<Plus size={16} />}
 					onClick={addThreshold}
 					className="add-threshold-btn"
-					data-testid="add-threshold-button"
 				>
 					Add Threshold
 				</Button>

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

@@ -32,7 +32,6 @@ function ThresholdItem({
 				style={{ width: 150 }}
 				options={units}
 				disabled={units.length === 0}
-				data-testid="threshold-unit-select"
 			/>
 		);
 		if (units.length === 0) {
@@ -48,7 +47,6 @@ function ThresholdItem({
 						style={{ width: 150 }}
 						options={units}
 						disabled={units.length === 0}
-						data-testid="threshold-unit-select"
 					/>
 				</Tooltip>
 			);
@@ -98,7 +96,6 @@ function ThresholdItem({
 							updateThreshold(threshold.id, 'label', e.target.value)
 						}
 						style={{ width: 200 }}
-						data-testid="threshold-name-input"
 					/>
 					<Typography.Text className="sentence-text">on value</Typography.Text>
 					<Typography.Text className="sentence-text highlighted-text">
@@ -112,7 +109,6 @@ function ThresholdItem({
 						}
 						style={{ width: 100 }}
 						type="number"
-						data-testid="threshold-value-input"
 					/>
 					{yAxisUnitSelect}
 					{!notificationSettings.routingPolicies && (
@@ -123,12 +119,10 @@ function ThresholdItem({
 								onChange={(value): void =>
 									updateThreshold(threshold.id, 'channels', value)
 								}
-								data-testid="threshold-notification-channel-select"
 								style={{ width: 350 }}
 								options={channels.map((channel) => ({
 									value: channel.name,
 									label: channel.name,
-									'data-testid': `threshold-notification-channel-option-${threshold.label}`,
 								}))}
 								mode="multiple"
 								placeholder="Select notification channels"
@@ -163,7 +157,6 @@ function ThresholdItem({
 								}
 								style={{ width: 100 }}
 								type="number"
-								data-testid="recovery-threshold-value-input"
 							/>
 							<Tooltip title="Remove recovery threshold">
 								<Button
@@ -171,7 +164,6 @@ function ThresholdItem({
 									icon={<Trash size={16} />}
 									onClick={removeRecoveryThreshold}
 									className="icon-btn"
-									data-testid="remove-recovery-threshold-button"
 								/>
 							</Tooltip>
 						</>
@@ -195,7 +187,6 @@ function ThresholdItem({
 									icon={<CircleX size={16} />}
 									onClick={(): void => removeThreshold(threshold.id)}
 									className="icon-btn"
-									data-testid="remove-threshold-button"
 								/>
 							</Tooltip>
 						)}

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

@@ -50,7 +50,6 @@ export function getCategorySelectOptionByName(
 			(unit) => ({
 				label: unit.name,
 				value: unit.id,
-				'data-testid': `threshold-unit-select-option-${unit.id}`,
 			}),
 		) || []
 	);
@@ -402,7 +401,6 @@ export function RoutingPolicyBanner({
 			</Typography.Text>
 			<Switch
 				checked={notificationSettings.routingPolicies}
-				data-testid="routing-policies-switch"
 				onChange={(value): void => {
 					setNotificationSettings({
 						type: 'SET_ROUTING_POLICIES',

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

@@ -52,7 +52,6 @@ function CreateAlertHeader(): JSX.Element {
 					}
 					className="alert-header__input title"
 					placeholder="Enter alert rule name"
-					data-testid="alert-name-input"
 				/>
 				<LabelsInput
 					labels={alertState.labels}

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

@@ -124,11 +124,7 @@ function LabelsInput({
 			{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"
-							data-testid={`label-pill-${key}-${value}`}
-						>
+						<span key={key} className="labels-input__label-pill">
 							{key}: {value}
 							<button
 								type="button"
@@ -147,7 +143,6 @@ function LabelsInput({
 					className="labels-input__add-button"
 					type="button"
 					onClick={handleAddLabelsClick}
-					data-testid="alert-add-label-button"
 				>
 					+ Add labels
 				</button>
@@ -163,7 +158,6 @@ function LabelsInput({
 						placeholder={inputState.isKeyInput ? 'Enter key' : 'Enter value'}
 						// eslint-disable-next-line jsx-a11y/no-autofocus
 						autoFocus
-						data-testid="alert-add-label-input"
 					/>
 				</div>
 			)}

frontend/src/container/CreateAlertV2/EvaluationSettings/AdvancedOptionItem/AdvancedOptionItem.tsx

@@ -13,7 +13,6 @@ function AdvancedOptionItem({
 	tooltipText,
 	onToggle,
 	defaultShowInput,
-	'data-testid': dataTestId,
 }: IAdvancedOptionItemProps): JSX.Element {
 	const [showInput, setShowInput] = useState<boolean>(false);
 
@@ -27,7 +26,7 @@ function AdvancedOptionItem({
 	};
 
 	return (
-		<div className="advanced-option-item" data-testid={dataTestId}>
+		<div className="advanced-option-item">
 			<div className="advanced-option-item-left-content">
 				<Typography.Text className="advanced-option-item-title">
 					{title}

frontend/src/container/CreateAlertV2/EvaluationSettings/AdvancedOptions.tsx

@@ -43,7 +43,6 @@ function AdvancedOptions(): JSX.Element {
 							})
 						}
 						defaultShowInput={advancedOptions.sendNotificationIfDataIsMissing.enabled}
-						data-testid="send-notification-if-data-is-missing-container"
 					/>
 					<AdvancedOptionItem
 						title="Minimum data required"
@@ -75,7 +74,6 @@ function AdvancedOptions(): JSX.Element {
 							})
 						}
 						defaultShowInput={advancedOptions.enforceMinimumDatapoints.enabled}
-						data-testid="enforce-minimum-datapoints-container"
 					/>
 					{/* TODO: Add back when the functionality is implemented */}
 					{/* <AdvancedOptionItem

frontend/src/container/CreateAlertV2/EvaluationSettings/EvaluationCadence/EvaluationCadence.tsx

@@ -78,7 +78,6 @@ function EvaluationCadence(): JSX.Element {
 										},
 									})
 								}
-								data-testid="evaluation-cadence-duration-input"
 							/>
 							<Select
 								options={ADVANCED_OPTIONS_TIME_UNIT_OPTIONS}
@@ -97,7 +96,6 @@ function EvaluationCadence(): JSX.Element {
 										},
 									})
 								}
-								data-testid="evaluation-cadence-unit-select"
 							/>
 						</Input.Group>
 						{/* TODO: Add custom schedule back once the functionality is implemented */}

frontend/src/container/CreateAlertV2/EvaluationSettings/EvaluationSettings.tsx

@@ -10,7 +10,6 @@ import { getEvaluationWindowTypeText, getTimeframeText } from './utils';
 
 function EvaluationSettings(): JSX.Element {
 	const { evaluationWindow, setEvaluationWindow } = useCreateAlertState();
-
 	const [
 		isEvaluationWindowPopoverOpen,
 		setIsEvaluationWindowPopoverOpen,
@@ -31,7 +30,7 @@ function EvaluationSettings(): JSX.Element {
 			trigger="click"
 			showArrow={false}
 		>
-			<Button data-testid="evaluation-settings-button">
+			<Button>
 				<div className="evaluate-alert-conditions-button-left">
 					{getTimeframeText(evaluationWindow)}
 				</div>

frontend/src/container/CreateAlertV2/EvaluationSettings/EvaluationWindowPopover/EvaluationWindowDetails.tsx

@@ -127,7 +127,6 @@ function EvaluationWindowDetails({
 						value={evaluationWindow.startingAt.number || null}
 						onChange={handleNumberChange}
 						placeholder="Select starting at"
-						data-testid="evaluation-window-details-starting-at-select"
 					/>
 				</div>
 			</div>
@@ -155,7 +154,6 @@ function EvaluationWindowDetails({
 						value={evaluationWindow.startingAt.timezone || null}
 						onChange={handleTimezoneChange}
 						placeholder="Select timezone"
-						data-testid="evaluation-window-details-timezone-select"
 					/>
 				</div>
 			</div>
@@ -176,7 +174,6 @@ function EvaluationWindowDetails({
 						value={evaluationWindow.startingAt.number || null}
 						onChange={handleNumberChange}
 						placeholder="Select starting at"
-						data-testid="evaluation-window-details-starting-at-select"
 					/>
 				</div>
 				<div className="select-group time-select-group">
@@ -193,7 +190,6 @@ function EvaluationWindowDetails({
 						value={evaluationWindow.startingAt.timezone || null}
 						onChange={handleTimezoneChange}
 						placeholder="Select timezone"
-						data-testid="evaluation-window-details-timezone-select"
 					/>
 				</div>
 			</div>
@@ -215,7 +211,6 @@ function EvaluationWindowDetails({
 					value={evaluationWindow.startingAt.number}
 					onChange={(e): void => handleNumberChange(e.target.value)}
 					placeholder="Enter value"
-					data-testid="evaluation-window-details-custom-rolling-window-duration-input"
 				/>
 			</div>
 			<div className="select-group time-select-group">
@@ -225,7 +220,6 @@ function EvaluationWindowDetails({
 					value={evaluationWindow.startingAt.unit || null}
 					onChange={handleUnitChange}
 					placeholder="Select unit"
-					data-testid="evaluation-window-details-custom-rolling-window-unit-select"
 				/>
 			</div>
 		</div>

frontend/src/container/CreateAlertV2/EvaluationSettings/TimeInput/TimeInput.tsx

@@ -145,7 +145,7 @@ function TimeInput({
 	};
 
 	return (
-		<div data-testid="time-input" className={`time-input-container ${className}`}>
+		<div className={`time-input-container ${className}`}>
 			<Input
 				data-field="hours"
 				value={hours}
@@ -156,7 +156,6 @@ function TimeInput({
 				maxLength={2}
 				className="time-input-field"
 				placeholder="00"
-				data-testid="time-input-hours"
 			/>
 			<span className="time-input-separator">:</span>
 			<Input
@@ -169,7 +168,6 @@ function TimeInput({
 				maxLength={2}
 				className="time-input-field"
 				placeholder="00"
-				data-testid="time-input-minutes"
 			/>
 			<span className="time-input-separator">:</span>
 			<Input
@@ -182,7 +180,6 @@ function TimeInput({
 				maxLength={2}
 				className="time-input-field"
 				placeholder="00"
-				data-testid="time-input-seconds"
 			/>
 		</div>
 	);

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

@@ -12,7 +12,6 @@ export interface IAdvancedOptionItemProps {
 	tooltipText?: string;
 	onToggle?: () => void;
 	defaultShowInput: boolean;
-	'data-testid'?: string;
 }
 
 export enum RollingWindowTimeframes {

frontend/src/container/CreateAlertV2/NotificationSettings/MultipleNotifications.tsx

@@ -24,7 +24,6 @@ function MultipleNotifications(): JSX.Element {
 		return uniqueGroupBys.map((key) => ({
 			label: key,
 			value: key,
-			'data-testid': 'multiple-notifications-select-option',
 		}));
 	}, [currentQuery.builder.queryData]);
 
@@ -50,7 +49,6 @@ function MultipleNotifications(): JSX.Element {
 					disabled={!isMultipleNotificationsEnabled}
 					aria-disabled={!isMultipleNotificationsEnabled}
 					maxTagCount={3}
-					data-testid="multiple-notifications-select"
 				/>
 				{isMultipleNotificationsEnabled && (
 					<Typography.Paragraph className="multiple-notifications-select-description">

frontend/src/container/CreateAlertV2/NotificationSettings/NotificationSettings.tsx

@@ -37,7 +37,6 @@ function NotificationSettings(): JSX.Element {
 						},
 					});
 				}}
-				data-testid="repeat-notifications-time-input"
 			/>
 			<Select
 				value={notificationSettings.reNotification.unit || null}
@@ -55,7 +54,6 @@ function NotificationSettings(): JSX.Element {
 						},
 					});
 				}}
-				data-testid="repeat-notifications-unit-select"
 			/>
 			<Typography.Text>while</Typography.Text>
 			<Select
@@ -75,7 +73,6 @@ function NotificationSettings(): JSX.Element {
 						},
 					});
 				}}
-				data-testid="repeat-notifications-conditions-select"
 			/>
 		</div>
 	);
@@ -101,7 +98,6 @@ function NotificationSettings(): JSX.Element {
 						});
 					}}
 					defaultShowInput={notificationSettings.reNotification.enabled}
-					data-testid="repeat-notifications-container"
 				/>
 			</div>
 		</div>

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

@@ -24,11 +24,7 @@ import {
 	INITIAL_EVALUATION_WINDOW_STATE,
 	INITIAL_NOTIFICATION_SETTINGS_STATE,
 } from './constants';
-import {
-	AlertThresholdMatchType,
-	ICreateAlertContextProps,
-	ICreateAlertProviderProps,
-} from './types';
+import { ICreateAlertContextProps, ICreateAlertProviderProps } from './types';
 import {
 	advancedOptionsReducer,
 	alertCreationReducer,
@@ -71,7 +67,6 @@ export function CreateAlertProvider(
 	const { currentQuery, redirectWithQueryBuilderData } = useQueryBuilder();
 	const location = useLocation();
 	const queryParams = new URLSearchParams(location.search);
-	const thresholdsFromURL = queryParams.get(QueryParams.thresholds);
 
 	const [alertType, setAlertType] = useState<AlertTypes>(() => {
 		if (isEditMode) {
@@ -127,28 +122,7 @@ export function CreateAlertProvider(
 		setThresholdState({
 			type: 'RESET',
 		});
-
-		if (thresholdsFromURL) {
-			try {
-				const thresholds = JSON.parse(thresholdsFromURL);
-				setThresholdState({
-					type: 'SET_THRESHOLDS',
-					payload: thresholds,
-				});
-			} catch (error) {
-				console.error('Error parsing thresholds from URL:', error);
-			}
-
-			setEvaluationWindow({
-				type: 'SET_INITIAL_STATE_FOR_METER',
-			});
-
-			setThresholdState({
-				type: 'SET_MATCH_TYPE',
-				payload: AlertThresholdMatchType.IN_TOTAL,
-			});
-		}
-	}, [alertType, thresholdsFromURL]);
+	}, [alertType]);
 
 	useEffect(() => {
 		if (isEditMode && initialAlertState) {

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

@@ -237,7 +237,6 @@ export type EvaluationWindowAction =
 	  }
 	| { type: 'SET_EVALUATION_CADENCE_MODE'; payload: EvaluationCadenceMode }
 	| { type: 'SET_INITIAL_STATE'; payload: EvaluationWindowState }
-	| { type: 'SET_INITIAL_STATE_FOR_METER' }
 	| { type: 'RESET' };
 
 export type EvaluationCadenceMode = 'default' | 'custom' | 'rrule';

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

@@ -1,5 +1,3 @@
-import { UTC_TIMEZONE } from 'components/CustomTimePicker/timezoneUtils';
-import { UniversalYAxisUnit } from 'components/YAxisUnitSelector/types';
 import { QueryParams } from 'constants/query';
 import {
 	alertDefaults,
@@ -13,7 +11,6 @@ import { AlertDef } from 'types/api/alerts/def';
 import { Query } from 'types/api/queryBuilder/queryBuilderData';
 import { DataSource } from 'types/common/queryBuilder';
 
-import { CumulativeWindowTimeframes } from '../EvaluationSettings/types';
 import {
 	INITIAL_ADVANCED_OPTIONS_STATE,
 	INITIAL_ALERT_STATE,
@@ -213,18 +210,6 @@ export const evaluationWindowReducer = (
 			return INITIAL_EVALUATION_WINDOW_STATE;
 		case 'SET_INITIAL_STATE':
 			return action.payload;
-		case 'SET_INITIAL_STATE_FOR_METER':
-			return {
-				...state,
-				windowType: 'cumulative',
-				timeframe: CumulativeWindowTimeframes.CURRENT_DAY,
-				startingAt: {
-					time: '00:00:00',
-					number: '0',
-					timezone: UTC_TIMEZONE.value,
-					unit: UniversalYAxisUnit.MINUTES,
-				},
-			};
 		default:
 			return state;
 	}

frontend/src/container/EmptyLogsSearch/EmptyLogsSearch.styles.scss

@@ -171,30 +171,3 @@
 		}
 	}
 }
-.lightMode {
-	.empty-logs-search {
-		&__resources-card {
-			background: var(--bg-vanilla-100);
-			border: 1px solid var(--bg-vanilla-300);
-		}
-
-		&__resources-title {
-			color: var(--bg-ink-400);
-		}
-
-		&__resources-description,
-		&__description-list,
-		&__subtitle {
-			color: var(--bg-ink-300);
-		}
-
-		&__title {
-			color: var(--bg-ink-500);
-		}
-
-		&__clear-filters-btn {
-			border: 1px dashed var(--bg-vanilla-300);
-			color: var(--bg-ink-400);
-		}
-	}
-}

frontend/src/container/ExplorerOptions/__tests__/ExplorerOptionWrapper.test.tsx

@@ -1,363 +0,0 @@
-import { PANEL_TYPES } from 'constants/queryBuilder';
-import { MOCK_QUERY } from 'container/QueryTable/Drilldown/__tests__/mockTableData';
-import { useUpdateDashboard } from 'hooks/dashboard/useUpdateDashboard';
-import { rest, server } from 'mocks-server/server';
-import { render, screen, userEvent, waitFor } from 'tests/test-utils';
-import { Dashboard } from 'types/api/dashboard/getAll';
-import { Query } from 'types/api/queryBuilder/queryBuilderData';
-import { DataSource } from 'types/common/queryBuilder';
-import { generateExportToDashboardLink } from 'utils/dashboard/generateExportToDashboardLink';
-import { v4 } from 'uuid';
-
-import ExplorerOptionWrapper from '../ExplorerOptionWrapper';
-import { getExplorerToolBarVisibility } from '../utils';
-
-// Mock dependencies
-jest.mock('hooks/dashboard/useUpdateDashboard');
-
-jest.mock('../utils', () => ({
-	getExplorerToolBarVisibility: jest.fn(),
-	generateRGBAFromHex: jest.fn(() => 'rgba(0, 0, 0, 0.08)'),
-	getRandomColor: jest.fn(() => '#000000'),
-	saveNewViewHandler: jest.fn(),
-	setExplorerToolBarVisibility: jest.fn(),
-	DATASOURCE_VS_ROUTES: {},
-}));
-
-const mockGetExplorerToolBarVisibility = jest.mocked(
-	getExplorerToolBarVisibility,
-);
-
-const mockUseUpdateDashboard = jest.mocked(useUpdateDashboard);
-
-// Mock data
-const TEST_QUERY_ID = 'test-query-id';
-const TEST_DASHBOARD_ID = 'test-dashboard-id';
-const TEST_DASHBOARD_TITLE = 'Test Dashboard';
-const TEST_DASHBOARD_DESCRIPTION = 'Test Description';
-const TEST_TIMESTAMP = '2023-01-01T00:00:00Z';
-const TEST_DASHBOARD_TITLE_2 = 'Test Dashboard for Export';
-const NEW_DASHBOARD_ID = 'new-dashboard-id';
-const DASHBOARDS_API_ENDPOINT = '*/api/v1/dashboards';
-
-// Use the existing mock query from the codebase
-const mockQuery: Query = {
-	...MOCK_QUERY,
-	id: TEST_QUERY_ID, // Override with our test ID
-} as Query;
-
-const createMockDashboard = (id: string = TEST_DASHBOARD_ID): Dashboard => ({
-	id,
-	data: {
-		title: TEST_DASHBOARD_TITLE,
-		description: TEST_DASHBOARD_DESCRIPTION,
-		tags: [],
-		layout: [],
-		variables: {},
-	},
-	createdAt: TEST_TIMESTAMP,
-	updatedAt: TEST_TIMESTAMP,
-	createdBy: 'test-user',
-	updatedBy: 'test-user',
-});
-
-const ADD_TO_DASHBOARD_BUTTON_NAME = /add to dashboard/i;
-
-// Helper function to render component with props
-const renderExplorerOptionWrapper = (
-	overrides = {},
-): ReturnType<typeof render> => {
-	const props = {
-		disabled: false,
-		query: mockQuery,
-		isLoading: false,
-		onExport: jest.fn() as jest.MockedFunction<
-			(
-				dashboard: Dashboard | null,
-				isNewDashboard?: boolean,
-				queryToExport?: Query,
-			) => void
-		>,
-		sourcepage: DataSource.LOGS,
-		isOneChartPerQuery: false,
-		splitedQueries: [],
-		signalSource: 'test-signal',
-		...overrides,
-	};
-
-	return render(
-		<ExplorerOptionWrapper
-			disabled={props.disabled}
-			query={props.query}
-			isLoading={props.isLoading}
-			onExport={props.onExport}
-			sourcepage={props.sourcepage}
-			isOneChartPerQuery={props.isOneChartPerQuery}
-			splitedQueries={props.splitedQueries}
-			signalSource={props.signalSource}
-		/>,
-	);
-};
-
-describe('ExplorerOptionWrapper', () => {
-	beforeEach(() => {
-		jest.clearAllMocks();
-		mockGetExplorerToolBarVisibility.mockReturnValue(true);
-
-		// Mock useUpdateDashboard to return a mutation object
-		mockUseUpdateDashboard.mockReturnValue(({
-			mutate: jest.fn(),
-			mutateAsync: jest.fn(),
-			isLoading: false,
-			isError: false,
-			isSuccess: false,
-			data: undefined,
-			error: null,
-			reset: jest.fn(),
-		} as unknown) as ReturnType<typeof useUpdateDashboard>);
-	});
-
-	describe('onExport functionality', () => {
-		it('should call onExport when New Dashboard button is clicked in export modal', async () => {
-			const user = userEvent.setup({ pointerEventsCheck: 0 });
-			const testOnExport = jest.fn() as jest.MockedFunction<
-				(
-					dashboard: Dashboard | null,
-					isNewDashboard?: boolean,
-					queryToExport?: Query,
-				) => void
-			>;
-
-			// Mock the dashboard creation API
-			const mockNewDashboard = createMockDashboard(NEW_DASHBOARD_ID);
-			server.use(
-				rest.post(DASHBOARDS_API_ENDPOINT, (_req, res, ctx) =>
-					res(ctx.status(200), ctx.json({ data: mockNewDashboard })),
-				),
-			);
-
-			renderExplorerOptionWrapper({
-				onExport: testOnExport,
-			});
-
-			// Find and click the "Add to Dashboard" button
-			const addToDashboardButton = screen.getByRole('button', {
-				name: ADD_TO_DASHBOARD_BUTTON_NAME,
-			});
-			await user.click(addToDashboardButton);
-
-			// Wait for the export modal to appear
-			await waitFor(() => {
-				expect(screen.getByRole('dialog')).toBeInTheDocument();
-			});
-
-			// Click the "New Dashboard" button
-			const newDashboardButton = screen.getByRole('button', {
-				name: /new dashboard/i,
-			});
-			await user.click(newDashboardButton);
-
-			// Wait for the API call to complete and onExport to be called
-			await waitFor(() => {
-				expect(testOnExport).toHaveBeenCalledWith(mockNewDashboard, true);
-			});
-		});
-
-		it('should call onExport when selecting existing dashboard and clicking Export button', async () => {
-			const user = userEvent.setup({ pointerEventsCheck: 0 });
-			const testOnExport = jest.fn() as jest.MockedFunction<
-				(
-					dashboard: Dashboard | null,
-					isNewDashboard?: boolean,
-					queryToExport?: Query,
-				) => void
-			>;
-
-			// Mock existing dashboards with unique titles
-			const mockDashboard1 = createMockDashboard('dashboard-1');
-			mockDashboard1.data.title = 'Dashboard 1';
-			const mockDashboard2 = createMockDashboard('dashboard-2');
-			mockDashboard2.data.title = 'Dashboard 2';
-			const mockDashboards = [mockDashboard1, mockDashboard2];
-
-			server.use(
-				rest.get(DASHBOARDS_API_ENDPOINT, (_req, res, ctx) =>
-					res(ctx.status(200), ctx.json({ data: mockDashboards })),
-				),
-			);
-
-			renderExplorerOptionWrapper({
-				onExport: testOnExport,
-			});
-
-			// Find and click the "Add to Dashboard" button
-			const addToDashboardButton = screen.getByRole('button', {
-				name: ADD_TO_DASHBOARD_BUTTON_NAME,
-			});
-			await user.click(addToDashboardButton);
-
-			// Wait for the export modal to appear
-			await waitFor(() => {
-				expect(screen.getByRole('dialog')).toBeInTheDocument();
-			});
-
-			// Wait for dashboards to load and then click on the dashboard select dropdown
-			await waitFor(() => {
-				expect(screen.getByText('Select Dashboard')).toBeInTheDocument();
-			});
-
-			// Get the modal and find the dashboard select dropdown within it
-			const modal = screen.getByRole('dialog');
-			const dashboardSelect = modal.querySelector(
-				'[role="combobox"]',
-			) as HTMLElement;
-			expect(dashboardSelect).toBeInTheDocument();
-			await user.click(dashboardSelect);
-
-			// Wait for the dropdown options to appear and select the first dashboard
-			await waitFor(() => {
-				expect(screen.getByText(mockDashboard1.data.title)).toBeInTheDocument();
-			});
-
-			// Click on the first dashboard option
-			const dashboardOption = screen.getByText(mockDashboard1.data.title);
-			await user.click(dashboardOption);
-
-			// Wait for the selection to be made and the Export button to be enabled
-			await waitFor(() => {
-				const exportButton = screen.getByRole('button', { name: /export/i });
-				expect(exportButton).not.toBeDisabled();
-			});
-
-			// Click the Export button
-			const exportButton = screen.getByRole('button', { name: /export/i });
-			await user.click(exportButton);
-
-			// Wait for onExport to be called with the selected dashboard
-			await waitFor(() => {
-				expect(testOnExport).toHaveBeenCalledWith(mockDashboard1, false);
-			});
-		});
-
-		it('should test actual handleExport function with generateExportToDashboardLink and verify useUpdateDashboard is NOT called', async () => {
-			const user = userEvent.setup({ pointerEventsCheck: 0 });
-
-			// Mock the safeNavigate function
-			const mockSafeNavigate = jest.fn();
-
-			// Get the mock mutate function to track calls
-			const mockMutate = mockUseUpdateDashboard().mutate as jest.MockedFunction<
-				(...args: unknown[]) => void
-			>;
-
-			const panelTypeParam = PANEL_TYPES.TIME_SERIES;
-			const widgetId = v4();
-			const query = mockQuery;
-
-			// Create a real handleExport function similar to LogsExplorerViews
-			// This should NOT call useUpdateDashboard (as per PR #8029)
-			const handleExport = (dashboard: Dashboard | null): void => {
-				if (!dashboard) return;
-
-				// Call the actual generateExportToDashboardLink function (not mocked)
-				const dashboardEditView = generateExportToDashboardLink({
-					query,
-					panelType: panelTypeParam,
-					dashboardId: dashboard.id,
-					widgetId,
-				});
-
-				// Simulate navigation
-				mockSafeNavigate(dashboardEditView);
-			};
-
-			// Mock existing dashboards
-			const mockDashboard = createMockDashboard('test-dashboard-id');
-			mockDashboard.data.title = TEST_DASHBOARD_TITLE_2;
-
-			server.use(
-				rest.get(DASHBOARDS_API_ENDPOINT, (_req, res, ctx) =>
-					res(ctx.status(200), ctx.json({ data: [mockDashboard] })),
-				),
-			);
-
-			renderExplorerOptionWrapper({
-				onExport: handleExport,
-			});
-
-			// Find and click the "Add to Dashboard" button
-			const addToDashboardButton = screen.getByRole('button', {
-				name: ADD_TO_DASHBOARD_BUTTON_NAME,
-			});
-			await user.click(addToDashboardButton);
-
-			// Wait for the export modal to appear
-			await waitFor(() => {
-				expect(screen.getByRole('dialog')).toBeInTheDocument();
-			});
-
-			// Wait for dashboards to load and then click on the dashboard select dropdown
-			await waitFor(() => {
-				expect(screen.getByText('Select Dashboard')).toBeInTheDocument();
-			});
-
-			// Get the modal and find the dashboard select dropdown within it
-			const modal = screen.getByRole('dialog');
-			const dashboardSelect = modal.querySelector(
-				'[role="combobox"]',
-			) as HTMLElement;
-			expect(dashboardSelect).toBeInTheDocument();
-			await user.click(dashboardSelect);
-
-			// Wait for the dropdown options to appear and select the dashboard
-			await waitFor(() => {
-				expect(screen.getByText(mockDashboard.data.title)).toBeInTheDocument();
-			});
-
-			// Click on the dashboard option
-			const dashboardOption = screen.getByText(mockDashboard.data.title);
-			await user.click(dashboardOption);
-
-			// Wait for the selection to be made and the Export button to be enabled
-			await waitFor(() => {
-				const exportButton = screen.getByRole('button', { name: /export/i });
-				expect(exportButton).not.toBeDisabled();
-			});
-
-			// Click the Export button
-			const exportButton = screen.getByRole('button', { name: /export/i });
-			await user.click(exportButton);
-
-			// Wait for the handleExport function to be called and navigation to occur
-			await waitFor(() => {
-				expect(mockSafeNavigate).toHaveBeenCalledTimes(1);
-				expect(mockSafeNavigate).toHaveBeenCalledWith(
-					`/dashboard/test-dashboard-id/new?graphType=${panelTypeParam}&widgetId=${widgetId}&compositeQuery=${encodeURIComponent(
-						JSON.stringify(query),
-					)}`,
-				);
-			});
-
-			// Assert that useUpdateDashboard was NOT called (as per PR #8029)
-			expect(mockMutate).not.toHaveBeenCalled();
-		});
-
-		it('should not show export buttons when component is disabled', () => {
-			const testOnExport = jest.fn() as jest.MockedFunction<
-				(
-					dashboard: Dashboard | null,
-					isNewDashboard?: boolean,
-					queryToExport?: Query,
-				) => void
-			>;
-
-			renderExplorerOptionWrapper({ disabled: true, onExport: testOnExport });
-
-			// The "Add to Dashboard" button should be disabled
-			const addToDashboardButton = screen.getByRole('button', {
-				name: ADD_TO_DASHBOARD_BUTTON_NAME,
-			});
-			expect(addToDashboardButton).toBeDisabled();
-		});
-	});
-});

frontend/src/container/FormAlertRules/ChartPreview/index.tsx

@@ -108,13 +108,6 @@ function ChartPreview({
 	const [minTimeScale, setMinTimeScale] = useState<number>();
 	const [maxTimeScale, setMaxTimeScale] = useState<number>();
 	const [graphVisibility, setGraphVisibility] = useState<boolean[]>([]);
-	const legendScrollPositionRef = useRef<{
-		scrollTop: number;
-		scrollLeft: number;
-	}>({
-		scrollTop: 0,
-		scrollLeft: 0,
-	});
 	const { currentQuery } = useQueryBuilder();
 
 	const { minTime, maxTime, selectedTime: globalSelectedInterval } = useSelector<
@@ -303,13 +296,6 @@ function ChartPreview({
 				setGraphsVisibilityStates: setGraphVisibility,
 				enhancedLegend: true,
 				legendPosition,
-				legendScrollPosition: legendScrollPositionRef.current,
-				setLegendScrollPosition: (position: {
-					scrollTop: number;
-					scrollLeft: number;
-				}) => {
-					legendScrollPositionRef.current = position;
-				},
 			}),
 		[
 			yAxisUnit,

frontend/src/container/FormAlertRules/QuerySection.tsx

@@ -36,7 +36,6 @@ function QuerySection({
 	// init namespace for translations
 	const { t } = useTranslation('alerts');
 	const [currentTab, setCurrentTab] = useState(queryCategory);
-	const [signalSource, setSignalSource] = useState<string>('metrics');
 
 	const handleQueryCategoryChange = (queryType: string): void => {
 		setQueryCategory(queryType as EQueryType);
@@ -49,17 +48,12 @@ function QuerySection({
 
 	const isDarkMode = useIsDarkMode();
 
-	const handleSignalSourceChange = (value: string): void => {
-		setSignalSource(value);
-	};
-
 	const renderMetricUI = (): JSX.Element => (
 		<QueryBuilderV2
 			panelType={panelType}
 			config={{
 				queryVariant: 'static',
 				initialDataSource: ALERTS_DATA_SOURCE_MAP[alertType],
-				signalSource: signalSource === 'meter' ? 'meter' : '',
 			}}
 			showTraceOperator={alertType === AlertTypes.TRACES_BASED_ALERT}
 			showFunctions={
@@ -68,8 +62,6 @@ function QuerySection({
 				alertType === AlertTypes.LOGS_BASED_ALERT
 			}
 			version={alertDef.version || 'v3'}
-			onSignalSourceChange={handleSignalSourceChange}
-			signalSourceChangeEnabled
 		/>
 	);
 

frontend/src/container/GeneralSettings/GeneralSettings.tsx

@@ -137,8 +137,8 @@ function GeneralSettings({
 		if (logsCurrentTTLValues) {
 			setLogsTotalRetentionPeriod(logsCurrentTTLValues.default_ttl_days * 24);
 			setLogsS3RetentionPeriod(
-				logsCurrentTTLValues.cold_storage_ttl_days
-					? logsCurrentTTLValues.cold_storage_ttl_days * 24
+				logsCurrentTTLValues.logs_move_ttl_duration_hrs
+					? logsCurrentTTLValues.logs_move_ttl_duration_hrs
 					: null,
 			);
 		}
@@ -198,12 +198,7 @@ function GeneralSettings({
 	);
 
 	const s3Enabled = useMemo(
-		() =>
-			!!find(
-				availableDisks,
-				(disks: IDiskType) =>
-					disks?.type === 's3' || disks?.type === 'ObjectStorage',
-			),
+		() => !!find(availableDisks, (disks: IDiskType) => disks?.type === 's3'),
 		[availableDisks],
 	);
 
@@ -294,9 +289,8 @@ function GeneralSettings({
 			isTracesSaveDisabled = true;
 
 		if (
-			logsCurrentTTLValues.default_ttl_days * 24 === logsTotalRetentionPeriod &&
-			logsCurrentTTLValues.cold_storage_ttl_days &&
-			logsCurrentTTLValues.cold_storage_ttl_days * 24 === logsS3RetentionPeriod
+			logsCurrentTTLValues.logs_ttl_duration_hrs === logsTotalRetentionPeriod &&
+			logsCurrentTTLValues.logs_move_ttl_duration_hrs === logsS3RetentionPeriod
 		)
 			isLogsSaveDisabled = true;
 
@@ -307,8 +301,8 @@ function GeneralSettings({
 			errorText,
 		];
 	}, [
-		logsCurrentTTLValues.cold_storage_ttl_days,
-		logsCurrentTTLValues.default_ttl_days,
+		logsCurrentTTLValues.logs_move_ttl_duration_hrs,
+		logsCurrentTTLValues.logs_ttl_duration_hrs,
 		logsS3RetentionPeriod,
 		logsTotalRetentionPeriod,
 		metricsCurrentTTLValues.metrics_move_ttl_duration_hrs,
@@ -354,17 +348,11 @@ function GeneralSettings({
 
 			try {
 				if (type === 'logs') {
-					// Only send S3 values if user has specified a duration
-					const s3RetentionDays =
-						apiCallS3Retention && apiCallS3Retention > 0
-							? apiCallS3Retention / 24
-							: 0;
-
 					await setRetentionApiV2({
 						type,
 						defaultTTLDays: apiCallTotalRetention ? apiCallTotalRetention / 24 : -1, // convert Hours to days
-						coldStorageVolume: s3RetentionDays > 0 ? 's3' : '',
-						coldStorageDurationDays: s3RetentionDays,
+						coldStorageVolume: '',
+						coldStorageDuration: 0,
 						ttlConditions: [],
 					});
 				} else {
@@ -418,9 +406,8 @@ function GeneralSettings({
 					// Updates the currentTTL Values in order to avoid pushing the same values.
 					setLogsCurrentTTLValues((prev) => ({
 						...prev,
-						cold_storage_ttl_days: logsS3RetentionPeriod
-							? logsS3RetentionPeriod / 24
-							: -1,
+						logs_ttl_duration_hrs: logsTotalRetentionPeriod || -1,
+						logs_move_ttl_duration_hrs: logsS3RetentionPeriod || -1,
 						default_ttl_days: logsTotalRetentionPeriod
 							? logsTotalRetentionPeriod / 24 // convert Hours to days
 							: -1,
@@ -537,7 +524,6 @@ function GeneralSettings({
 					value: logsS3RetentionPeriod,
 					setValue: setLogsS3RetentionPeriod,
 					hide: !s3Enabled,
-					isS3Field: true,
 				},
 			],
 			save: {
@@ -591,7 +577,6 @@ function GeneralSettings({
 									retentionValue={retentionField.value}
 									setRetentionValue={retentionField.setValue}
 									hide={!!retentionField.hide}
-									isS3Field={'isS3Field' in retentionField && retentionField.isS3Field}
 								/>
 							))}
 

frontend/src/container/GeneralSettings/Retention.tsx

@@ -6,7 +6,6 @@ import {
 	Dispatch,
 	SetStateAction,
 	useEffect,
-	useMemo,
 	useRef,
 	useState,
 } from 'react';
@@ -33,31 +32,11 @@ function Retention({
 	setRetentionValue,
 	text,
 	hide,
-	isS3Field = false,
 }: RetentionProps): JSX.Element | null {
-	// Filter available units based on type and field
-	const availableUnits = useMemo(
-		() =>
-			TimeUnits.filter((option) => {
-				if (type === 'logs') {
-					// For S3 cold storage fields: only allow Days
-					if (isS3Field) {
-						return option.value === TimeUnitsValues.day;
-					}
-					// For total retention: allow Days and Months (not Hours)
-					return option.value !== TimeUnitsValues.hr;
-				}
-				return true;
-			}),
-		[type, isS3Field],
-	);
-
-	// Convert the hours value using only the available units
 	const {
 		value: initialValue,
 		timeUnitValue: initialTimeUnitValue,
-	} = convertHoursValueToRelevantUnit(Number(retentionValue), availableUnits);
-
+	} = convertHoursValueToRelevantUnit(Number(retentionValue));
 	const [selectedTimeUnit, setSelectTimeUnit] = useState(initialTimeUnitValue);
 	const [selectedValue, setSelectedValue] = useState<number | null>(
 		initialValue,
@@ -74,27 +53,29 @@ function Retention({
 		if (!interacted.current) setSelectTimeUnit(initialTimeUnitValue);
 	}, [initialTimeUnitValue]);
 
-	const menuItems = availableUnits.map((option) => (
+	const menuItems = TimeUnits.filter((option) =>
+		type === 'logs' ? option.value !== TimeUnitsValues.hr : true,
+	).map((option) => (
 		<Option key={option.value} value={option.value}>
 			{option.key}
 		</Option>
 	));
 
 	const currentSelectedOption = (option: SettingPeriod): void => {
-		const selectedValue = find(availableUnits, (e) => e.value === option)?.value;
+		const selectedValue = find(TimeUnits, (e) => e.value === option)?.value;
 		if (selectedValue) setSelectTimeUnit(selectedValue);
 	};
 
 	useEffect(() => {
 		const inverseMultiplier = find(
-			availableUnits,
+			TimeUnits,
 			(timeUnit) => timeUnit.value === selectedTimeUnit,
 		)?.multiplier;
 		if (!selectedValue) setRetentionValue(null);
 		if (selectedValue && inverseMultiplier) {
 			setRetentionValue(selectedValue * (1 / inverseMultiplier));
 		}
-	}, [selectedTimeUnit, selectedValue, setRetentionValue, availableUnits]);
+	}, [selectedTimeUnit, selectedValue, setRetentionValue]);
 
 	const onChangeHandler = (
 		e: ChangeEvent<HTMLInputElement>,
@@ -153,10 +134,6 @@ interface RetentionProps {
 	text: string;
 	setRetentionValue: Dispatch<SetStateAction<number | null>>;
 	hide: boolean;
-	isS3Field?: boolean;
 }
 
-Retention.defaultProps = {
-	isS3Field: false,
-};
 export default Retention;

frontend/src/container/GeneralSettings/__tests__/GeneralSettings.test.tsx

@@ -1,390 +0,0 @@
-import setRetentionApiV2 from 'api/settings/setRetentionV2';
-import {
-	fireEvent,
-	render,
-	screen,
-	userEvent,
-	waitFor,
-} from 'tests/test-utils';
-import { IDiskType } from 'types/api/disks/getDisks';
-import {
-	PayloadPropsLogs,
-	PayloadPropsMetrics,
-	PayloadPropsTraces,
-} from 'types/api/settings/getRetention';
-
-import GeneralSettings from '../GeneralSettings';
-
-// Mock dependencies
-jest.mock('api/settings/setRetentionV2');
-
-const mockNotifications = {
-	error: jest.fn(),
-	success: jest.fn(),
-};
-
-jest.mock('hooks/useNotifications', () => ({
-	useNotifications: (): { notifications: typeof mockNotifications } => ({
-		notifications: mockNotifications,
-	}),
-}));
-
-jest.mock('hooks/useComponentPermission', () => ({
-	__esModule: true,
-	default: jest.fn(() => [true]),
-}));
-
-jest.mock('hooks/useGetTenantLicense', () => ({
-	useGetTenantLicense: (): { isCloudUser: boolean } => ({
-		isCloudUser: false,
-	}),
-}));
-
-jest.mock('container/GeneralSettingsCloud', () => ({
-	__esModule: true,
-	default: (): null => null,
-}));
-
-// Mock data
-const mockMetricsRetention: PayloadPropsMetrics = {
-	metrics_ttl_duration_hrs: 168,
-	metrics_move_ttl_duration_hrs: -1,
-	status: '',
-};
-
-const mockTracesRetention: PayloadPropsTraces = {
-	traces_ttl_duration_hrs: 168,
-	traces_move_ttl_duration_hrs: -1,
-	status: '',
-};
-
-const mockLogsRetentionWithS3: PayloadPropsLogs = {
-	version: 'v2',
-	default_ttl_days: 30,
-	cold_storage_ttl_days: 24,
-	status: '',
-};
-
-const mockLogsRetentionWithoutS3: PayloadPropsLogs = {
-	version: 'v2',
-	default_ttl_days: 30,
-	cold_storage_ttl_days: -1,
-	status: '',
-};
-
-const mockDisksWithS3: IDiskType[] = [
-	{
-		name: 'default',
-		type: 's3',
-	},
-];
-
-const mockDisksWithObjectStorage: IDiskType[] = [
-	{
-		name: 'default',
-		type: 'ObjectStorage',
-	},
-];
-
-const mockDisksWithoutS3: IDiskType[] = [
-	{
-		name: 'default',
-		type: 'local',
-	},
-];
-
-describe('GeneralSettings - S3 Logs Retention', () => {
-	const BUTTON_SELECTOR = 'button[type="button"]';
-	const PRIMARY_BUTTON_CLASS = 'ant-btn-primary';
-
-	beforeEach(() => {
-		jest.clearAllMocks();
-		(setRetentionApiV2 as jest.Mock).mockResolvedValue({
-			httpStatusCode: 200,
-			data: { message: 'success' },
-		});
-	});
-
-	describe('Test 1: S3 Enabled - Only Days in Dropdown', () => {
-		it('should show only Days option for S3 retention and send correct API payload', async () => {
-			const user = userEvent.setup({ pointerEventsCheck: 0 });
-
-			render(
-				<GeneralSettings
-					metricsTtlValuesPayload={mockMetricsRetention}
-					tracesTtlValuesPayload={mockTracesRetention}
-					logsTtlValuesPayload={mockLogsRetentionWithS3}
-					getAvailableDiskPayload={mockDisksWithS3}
-					metricsTtlValuesRefetch={jest.fn()}
-					tracesTtlValuesRefetch={jest.fn()}
-					logsTtlValuesRefetch={jest.fn()}
-				/>,
-			);
-
-			// Find the Logs card
-			const logsCard = screen.getByText('Logs').closest('.ant-card');
-			expect(logsCard).toBeInTheDocument();
-
-			// Find all inputs in the Logs card - there should be 2 (total retention + S3)
-			// eslint-disable-next-line sonarjs/no-duplicate-string
-			const inputs = logsCard?.querySelectorAll('input[type="text"]');
-			expect(inputs).toHaveLength(2);
-
-			// The second input is the S3 retention field
-			const s3Input = inputs?.[1] as HTMLInputElement;
-
-			// Find the S3 dropdown (next sibling of the S3 input)
-			const s3Dropdown = s3Input?.nextElementSibling?.querySelector(
-				'.ant-select-selector',
-			) as HTMLElement;
-			expect(s3Dropdown).toBeInTheDocument();
-
-			// Click the S3 dropdown to open it
-			fireEvent.mouseDown(s3Dropdown);
-
-			// Wait for dropdown options to appear and verify only "Days" is available
-			await waitFor(() => {
-				// eslint-disable-next-line sonarjs/no-duplicate-string
-				const dropdownOptions = document.querySelectorAll('.ant-select-item');
-				expect(dropdownOptions).toHaveLength(1);
-				expect(dropdownOptions[0]).toHaveTextContent('Days');
-			});
-
-			// Close dropdown
-			fireEvent.click(document.body);
-
-			// Change S3 retention value to 5 days
-			await user.clear(s3Input);
-			await user.type(s3Input, '5');
-
-			// Find the save button in the Logs card
-			const buttons = logsCard?.querySelectorAll(BUTTON_SELECTOR);
-			// The primary button should be the save button
-			const saveButton = Array.from(buttons || []).find((btn) =>
-				btn.className.includes(PRIMARY_BUTTON_CLASS),
-			) as HTMLButtonElement;
-
-			expect(saveButton).toBeInTheDocument();
-
-			// Wait for button to be enabled (it should enable after value changes)
-			await waitFor(() => {
-				expect(saveButton).not.toBeDisabled();
-			});
-
-			fireEvent.click(saveButton);
-
-			// Wait for modal to appear
-			const modal = await screen.findByRole('dialog');
-			expect(modal).toBeInTheDocument();
-
-			// Click OK button
-			const okButton = await screen.findByRole('button', { name: /ok/i });
-			fireEvent.click(okButton);
-
-			// Verify API was called with correct payload
-			await waitFor(() => {
-				expect(setRetentionApiV2).toHaveBeenCalledWith({
-					type: 'logs',
-					defaultTTLDays: 30,
-					coldStorageVolume: 's3',
-					coldStorageDurationDays: 5,
-					ttlConditions: [],
-				});
-			});
-		});
-
-		it('should recognize ObjectStorage disk type as S3 enabled', async () => {
-			render(
-				<GeneralSettings
-					metricsTtlValuesPayload={mockMetricsRetention}
-					tracesTtlValuesPayload={mockTracesRetention}
-					logsTtlValuesPayload={mockLogsRetentionWithS3}
-					getAvailableDiskPayload={mockDisksWithObjectStorage}
-					metricsTtlValuesRefetch={jest.fn()}
-					tracesTtlValuesRefetch={jest.fn()}
-					logsTtlValuesRefetch={jest.fn()}
-				/>,
-			);
-
-			// Verify S3 field is visible
-			const logsCard = screen.getByText('Logs').closest('.ant-card');
-			const inputs = logsCard?.querySelectorAll('input[type="text"]');
-			expect(inputs).toHaveLength(2); // Total + S3
-		});
-	});
-
-	describe('Test 2: S3 Disabled - Field Hidden', () => {
-		it('should hide S3 retention field and send empty S3 values to API', async () => {
-			const user = userEvent.setup({ pointerEventsCheck: 0 });
-
-			render(
-				<GeneralSettings
-					metricsTtlValuesPayload={mockMetricsRetention}
-					tracesTtlValuesPayload={mockTracesRetention}
-					logsTtlValuesPayload={mockLogsRetentionWithoutS3}
-					getAvailableDiskPayload={mockDisksWithoutS3}
-					metricsTtlValuesRefetch={jest.fn()}
-					tracesTtlValuesRefetch={jest.fn()}
-					logsTtlValuesRefetch={jest.fn()}
-				/>,
-			);
-
-			// Find the Logs card
-			const logsCard = screen.getByText('Logs').closest('.ant-card');
-			expect(logsCard).toBeInTheDocument();
-
-			// Only 1 input should be visible (total retention, no S3)
-			const inputs = logsCard?.querySelectorAll('input[type="text"]');
-			expect(inputs).toHaveLength(1);
-
-			// Change total retention value
-			const totalInput = inputs?.[0] as HTMLInputElement;
-
-			// First, change the dropdown to Days (it defaults to Months)
-			const totalDropdown = totalInput?.nextElementSibling?.querySelector(
-				'.ant-select-selector',
-			) as HTMLElement;
-			await user.click(totalDropdown);
-
-			// Wait for dropdown options to appear
-			await waitFor(() => {
-				const options = document.querySelectorAll('.ant-select-item');
-				expect(options.length).toBeGreaterThan(0);
-			});
-
-			// Find and click the Days option
-			const options = document.querySelectorAll('.ant-select-item');
-			const daysOption = Array.from(options).find((opt) =>
-				opt.textContent?.includes('Days'),
-			);
-			expect(daysOption).toBeInTheDocument();
-			await user.click(daysOption as HTMLElement);
-
-			// Now change the value
-			await user.clear(totalInput);
-			await user.type(totalInput, '60');
-
-			// Find the save button
-			const buttons = logsCard?.querySelectorAll(BUTTON_SELECTOR);
-			const saveButton = Array.from(buttons || []).find((btn) =>
-				btn.className.includes(PRIMARY_BUTTON_CLASS),
-			) as HTMLButtonElement;
-
-			expect(saveButton).toBeInTheDocument();
-
-			// Wait for button to be enabled (ensures all state updates have settled)
-			await waitFor(() => {
-				expect(saveButton).not.toBeDisabled();
-			});
-
-			// Click save button
-			await user.click(saveButton);
-
-			// Wait for modal to appear
-			const okButton = await screen.findByRole('button', { name: /ok/i });
-			expect(okButton).toBeInTheDocument();
-
-			// Click OK button
-			await user.click(okButton);
-
-			// Verify API was called with empty S3 values (60 days)
-			await waitFor(() => {
-				expect(setRetentionApiV2).toHaveBeenCalledWith({
-					type: 'logs',
-					defaultTTLDays: 60,
-					coldStorageVolume: '',
-					coldStorageDurationDays: 0,
-					ttlConditions: [],
-				});
-			});
-		});
-	});
-
-	describe('Test 3: Save & Reload - Correct Display', () => {
-		it('should display retention values correctly after converting from hours', () => {
-			render(
-				<GeneralSettings
-					metricsTtlValuesPayload={mockMetricsRetention}
-					tracesTtlValuesPayload={mockTracesRetention}
-					logsTtlValuesPayload={mockLogsRetentionWithS3}
-					getAvailableDiskPayload={mockDisksWithS3}
-					metricsTtlValuesRefetch={jest.fn()}
-					tracesTtlValuesRefetch={jest.fn()}
-					logsTtlValuesRefetch={jest.fn()}
-				/>,
-			);
-
-			// Find the Logs card
-			const logsCard = screen.getByText('Logs').closest('.ant-card');
-			const inputs = logsCard?.querySelectorAll('input[type="text"]');
-
-			// Total retention: 720 hours = 30 days = 1 month (displays as 1 Month)
-			const totalInput = inputs?.[0] as HTMLInputElement;
-			expect(totalInput.value).toBe('1');
-
-			// S3 retention: 24 day
-			const s3Input = inputs?.[1] as HTMLInputElement;
-			expect(s3Input.value).toBe('24');
-
-			// Verify dropdowns: total shows Months, S3 shows Days
-			const dropdowns = logsCard?.querySelectorAll('.ant-select-selection-item');
-			expect(dropdowns?.[0]).toHaveTextContent('Months');
-			expect(dropdowns?.[1]).toHaveTextContent('Days');
-		});
-	});
-
-	describe('Test 4: Save Button State with S3 Disabled', () => {
-		it('should disable save button when cold_storage_ttl_days is -1 and no changes made', async () => {
-			const user = userEvent.setup({ pointerEventsCheck: 0 });
-
-			render(
-				<GeneralSettings
-					metricsTtlValuesPayload={mockMetricsRetention}
-					tracesTtlValuesPayload={mockTracesRetention}
-					logsTtlValuesPayload={mockLogsRetentionWithoutS3}
-					getAvailableDiskPayload={mockDisksWithS3}
-					metricsTtlValuesRefetch={jest.fn()}
-					tracesTtlValuesRefetch={jest.fn()}
-					logsTtlValuesRefetch={jest.fn()}
-				/>,
-			);
-
-			// Find the Logs card
-			const logsCard = screen.getByText('Logs').closest('.ant-card');
-			expect(logsCard).toBeInTheDocument();
-
-			// Find the save button
-			const buttons = logsCard?.querySelectorAll(BUTTON_SELECTOR);
-			const saveButton = Array.from(buttons || []).find((btn) =>
-				btn.className.includes(PRIMARY_BUTTON_CLASS),
-			) as HTMLButtonElement;
-
-			expect(saveButton).toBeInTheDocument();
-
-			// Verify save button is disabled on initial load (no changes, S3 disabled with -1)
-			expect(saveButton).toBeDisabled();
-
-			// Find the total retention input
-			const inputs = logsCard?.querySelectorAll('input[type="text"]');
-			const totalInput = inputs?.[0] as HTMLInputElement;
-
-			// Change total retention value to trigger button enable
-			await user.clear(totalInput);
-			await user.type(totalInput, '60');
-
-			// Button should now be enabled after change
-			await waitFor(() => {
-				expect(saveButton).not.toBeDisabled();
-			});
-
-			// Revert to original value (30 days displays as 1 Month)
-			await user.clear(totalInput);
-			await user.type(totalInput, '1');
-
-			// Button should be disabled again (back to original state)
-			await waitFor(() => {
-				expect(saveButton).toBeDisabled();
-			});
-		});
-	});
-});

frontend/src/container/GeneralSettings/utils.ts

@@ -34,21 +34,12 @@ interface ITimeUnitConversion {
 	value: number;
 	timeUnitValue: SettingPeriod;
 }
-
-/**
- * Converts hours value to the most relevant unit from the available units.
- * @param value - The value in hours
- * @param availableUnits - Optional array of available time units to consider. If not provided, all units are considered.
- * @returns The converted value and the selected time unit
- */
 export const convertHoursValueToRelevantUnit = (
 	value: number,
-	availableUnits?: ITimeUnit[],
 ): ITimeUnitConversion => {
-	const unitsToConsider = availableUnits?.length ? availableUnits : TimeUnits;
-	if (value >= 0) {
-		for (let idx = unitsToConsider.length - 1; idx >= 0; idx -= 1) {
-			const timeUnit = unitsToConsider[idx];
+	if (value)
+		for (let idx = TimeUnits.length - 1; idx >= 0; idx -= 1) {
+			const timeUnit = TimeUnits[idx];
 			const convertedValue = timeUnit.multiplier * value;
 
 			if (
@@ -58,10 +49,7 @@ export const convertHoursValueToRelevantUnit = (
 				return { value: convertedValue, timeUnitValue: timeUnit.value };
 			}
 		}
-	}
-
-	// Fallback to the first available unit
-	return { value: -1, timeUnitValue: unitsToConsider[0].value };
+	return { value, timeUnitValue: TimeUnits[0].value };
 };
 
 export const convertHoursValueToRelevantUnitString = (

frontend/src/container/GridCardLayout/GridCard/FullView/__tests__/PanelWrapperDragSelect.test.tsx

@@ -1,207 +0,0 @@
-/* eslint-disable sonarjs/no-duplicate-string */
-
-import { PANEL_TYPES } from 'constants/queryBuilder';
-import PanelWrapper from 'container/PanelWrapper/PanelWrapper';
-import { RowData } from 'lib/query/createTableColumnsFromQuery';
-import { MutableRefObject } from 'react';
-import { render, screen, waitFor } from 'tests/test-utils';
-import { Widgets } from 'types/api/dashboard/getAll';
-import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse';
-import { EQueryType } from 'types/common/dashboard';
-import { DataSource } from 'types/common/queryBuilder';
-
-// Mock dependencies
-jest.mock('container/PanelWrapper/constants', () => ({
-	PanelTypeVsPanelWrapper: {
-		[PANEL_TYPES.TIME_SERIES]: ({
-			onDragSelect,
-		}: {
-			onDragSelect: (start: number, end: number) => void;
-		}): JSX.Element => {
-			const handleCanvasMouseDown = (): void => {
-				// Simulate drag start
-				const handleMouseMove = (): void => {
-					// Simulate drag progress
-				};
-
-				const handleMouseUp = (): void => {
-					// Simulate drag end and call onDragSelect
-					onDragSelect(1634325650, 1634325750);
-					document.removeEventListener('mousemove', handleMouseMove);
-					document.removeEventListener('mouseup', handleMouseUp);
-				};
-
-				document.addEventListener('mousemove', handleMouseMove);
-				document.addEventListener('mouseup', handleMouseUp);
-			};
-
-			return (
-				<div data-testid="mock-time-series-panel">
-					<canvas
-						data-testid="uplot-canvas"
-						width={400}
-						height={300}
-						onMouseDown={handleCanvasMouseDown}
-					/>
-					<button
-						type="button"
-						data-testid="drag-select-trigger"
-						onClick={(): void => onDragSelect(1634325650, 1634325750)}
-					>
-						Trigger Drag Select
-					</button>
-				</div>
-			);
-		},
-	},
-}));
-
-// Mock data
-const mockWidget: Widgets = {
-	id: 'test-widget-id',
-	query: {
-		builder: {
-			queryData: [
-				{
-					dataSource: DataSource.METRICS,
-					queryName: 'A',
-					aggregateOperator: 'sum',
-					aggregateAttribute: {
-						key: 'test',
-						dataType: DataTypes.Float64,
-						type: '',
-					},
-					functions: [],
-					groupBy: [],
-					expression: 'A',
-					disabled: false,
-					having: [],
-					limit: null,
-					orderBy: [],
-					stepInterval: 60,
-					legend: '',
-					spaceAggregation: 'sum',
-					timeAggregation: 'sum',
-				},
-			],
-			queryFormulas: [],
-			queryTraceOperator: [],
-		},
-		promql: [],
-		clickhouse_sql: [],
-		id: 'test-query-id',
-		queryType: EQueryType.QUERY_BUILDER,
-	},
-	panelTypes: PANEL_TYPES.TIME_SERIES,
-	title: 'Test Widget',
-	description: '',
-	opacity: '',
-	timePreferance: 'GLOBAL_TIME',
-	nullZeroValues: '',
-	yAxisUnit: '',
-	fillSpans: false,
-	softMin: null,
-	softMax: null,
-	selectedLogFields: [],
-	selectedTracesFields: [],
-};
-
-// Mock response data
-const mockQueryResponse: any = {
-	data: {
-		payload: {
-			data: {
-				result: [
-					{
-						metric: { __name__: 'test_metric' },
-						values: [[1634325600, '42']],
-						queryName: 'A',
-					},
-				],
-				resultType: '',
-				newResult: {
-					data: {
-						resultType: '',
-						result: [
-							{
-								queryName: 'A',
-								series: null,
-								list: null,
-							},
-						],
-					},
-				},
-			},
-		},
-		statusCode: 200,
-		message: 'success',
-		error: null,
-	},
-	isLoading: false,
-	isError: false,
-	error: null,
-	isFetching: false,
-	refetch: jest.fn(),
-};
-
-describe('PanelWrapper with DragSelect', () => {
-	const tableProcessedDataRef = { current: [] } as MutableRefObject<RowData[]>;
-
-	beforeEach(() => {
-		jest.clearAllMocks();
-	});
-
-	it('simulates drag select on uPlot canvas', async () => {
-		const mockOnDragSelect = jest.fn();
-
-		render(
-			<PanelWrapper
-				widget={mockWidget}
-				queryResponse={mockQueryResponse}
-				onDragSelect={mockOnDragSelect}
-				selectedGraph={PANEL_TYPES.TIME_SERIES}
-				tableProcessedDataRef={tableProcessedDataRef}
-			/>,
-		);
-
-		// Verify the panel renders
-		expect(screen.getByTestId('mock-time-series-panel')).toBeInTheDocument();
-
-		// Find the canvas element
-		const canvas = screen.getByTestId('uplot-canvas');
-		expect(canvas).toBeInTheDocument();
-
-		// Simulate drag events on the canvas
-		// Start drag by dispatching mousedown
-		canvas.dispatchEvent(
-			new MouseEvent('mousedown', {
-				clientX: 10,
-				clientY: 10,
-				bubbles: true,
-			}),
-		);
-
-		// Simulate mouse move during drag
-		canvas.dispatchEvent(
-			new MouseEvent('mousemove', {
-				clientX: 60,
-				clientY: 60,
-				bubbles: true,
-			}),
-		);
-
-		// End drag by dispatching mouseup
-		canvas.dispatchEvent(
-			new MouseEvent('mouseup', {
-				clientX: 80,
-				clientY: 80,
-				bubbles: true,
-			}),
-		);
-
-		// Wait for the onDragSelect to be called
-		await waitFor(() => {
-			expect(mockOnDragSelect).toHaveBeenCalledWith(1634325650, 1634325750);
-		});
-	});
-});

frontend/src/container/GridCardLayout/GridCard/FullView/index.tsx

@@ -38,7 +38,9 @@ import { isEmpty } from 'lodash-es';
 import { useAppContext } from 'providers/App/App';
 import { useDashboard } from 'providers/Dashboard/Dashboard';
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import { useSelector } from 'react-redux';
+import { useDispatch, useSelector } from 'react-redux';
+import { useLocation } from 'react-router-dom';
+import { UpdateTimeInterval } from 'store/actions';
 import { AppState } from 'store/reducers';
 import { Warning } from 'types/api';
 import { GlobalReducer } from 'types/reducer/globalTime';
@@ -65,11 +67,13 @@ function FullView({
 	enableDrillDown = false,
 }: FullViewProps): JSX.Element {
 	const { safeNavigate } = useSafeNavigate();
-	const { selectedTime: globalSelectedTime, minTime, maxTime } = useSelector<
+	const { selectedTime: globalSelectedTime } = useSelector<
 		AppState,
 		GlobalReducer
 	>((state) => state.globalTime);
+	const dispatch = useDispatch();
 	const urlQuery = useUrlQuery();
+	const location = useLocation();
 
 	const fullViewRef = useRef<HTMLDivElement>(null);
 	const { handleRunQuery } = useQueryBuilder();
@@ -150,16 +154,11 @@ function FullView({
 	});
 
 	useEffect(() => {
-		const timeRange =
-			selectedTime.enum !== 'GLOBAL_TIME'
-				? { start: undefined, end: undefined }
-				: { start: Math.floor(minTime / 1e9), end: Math.floor(maxTime / 1e9) };
 		setRequestData((prev) => ({
 			...prev,
 			selectedTime: selectedTime.enum,
-			...timeRange,
 		}));
-	}, [selectedTime, minTime, maxTime]);
+	}, [selectedTime]);
 
 	// Update requestData when panel type changes
 	useEffect(() => {
@@ -182,34 +181,38 @@ function FullView({
 		});
 	}, [selectedPanelType]);
 
-	const response = useGetQueryRange(requestData, ENTITY_VERSION_V5, {
-		queryKey: [
-			widget?.query,
-			selectedPanelType,
-			requestData,
-			version,
-			minTime,
-			maxTime,
-		],
-		enabled: !isDependedDataLoaded,
-		keepPreviousData: true,
-	});
+	const response = useGetQueryRange(
+		requestData,
+		// selectedDashboard?.data?.version || version || DEFAULT_ENTITY_VERSION,
+		ENTITY_VERSION_V5,
+		{
+			queryKey: [widget?.query, selectedPanelType, requestData, version],
+			enabled: !isDependedDataLoaded,
+			keepPreviousData: true,
+		},
+	);
 
-	const onDragSelect = useCallback((start: number, end: number): void => {
-		const startTimestamp = Math.trunc(start);
-		const endTimestamp = Math.trunc(end);
+	const onDragSelect = useCallback(
+		(start: number, end: number): void => {
+			const startTimestamp = Math.trunc(start);
+			const endTimestamp = Math.trunc(end);
 
-		const { maxTime, minTime } = GetMinMax('custom', [
-			startTimestamp,
-			endTimestamp,
-		]);
+			if (startTimestamp !== endTimestamp) {
+				dispatch(UpdateTimeInterval('custom', [startTimestamp, endTimestamp]));
+			}
 
-		setRequestData((prev) => ({
-			...prev,
-			start: Math.floor(minTime / 1e9),
-			end: Math.floor(maxTime / 1e9),
-		}));
-	}, []);
+			const { maxTime, minTime } = GetMinMax('custom', [
+				startTimestamp,
+				endTimestamp,
+			]);
+
+			urlQuery.set(QueryParams.startTime, minTime.toString());
+			urlQuery.set(QueryParams.endTime, maxTime.toString());
+			const generatedUrl = `${location.pathname}?${urlQuery.toString()}`;
+			safeNavigate(generatedUrl);
+		},
+		[dispatch, location.pathname, safeNavigate, urlQuery],
+	);
 
 	const [graphsVisibilityStates, setGraphsVisibilityStates] = useState<
 		boolean[]
@@ -324,7 +327,6 @@ function FullView({
 									panelType={selectedPanelType}
 									version={selectedDashboard?.data?.version || 'v3'}
 									isListViewPanel={selectedPanelType === PANEL_TYPES.LIST}
-									signalSourceChangeEnabled
 									// filterConfigs={filterConfigs}
 									// queryComponents={queryComponents}
 								/>

frontend/src/container/GridTableComponent/index.tsx

@@ -48,7 +48,6 @@ function GridTableComponent({
 	widgetId,
 	panelType,
 	queryRangeRequest,
-	decimalPrecision,
 	...props
 }: GridTableComponentProps): JSX.Element {
 	const { t } = useTranslation(['valueGraph']);
@@ -88,15 +87,10 @@ function GridTableComponent({
 					const newValue = { ...val };
 					Object.keys(val).forEach((k) => {
 						const unit = getColumnUnit(k, columnUnits);
-
 						if (unit) {
 							// the check below takes care of not adding units for rows that have n/a or null values
 							if (val[k] !== 'n/a' && val[k] !== null) {
-								newValue[k] = getYAxisFormattedValue(
-									String(val[k]),
-									unit,
-									decimalPrecision,
-								);
+								newValue[k] = getYAxisFormattedValue(String(val[k]), unit);
 							} else if (val[k] === null) {
 								newValue[k] = 'n/a';
 							}
@@ -109,7 +103,7 @@ function GridTableComponent({
 
 			return mutateDataSource;
 		},
-		[columnUnits, decimalPrecision],
+		[columnUnits],
 	);
 
 	const dataSource = useMemo(() => applyColumnUnits(originalDataSource), [

frontend/src/container/GridTableComponent/types.ts

@@ -1,5 +1,4 @@
 import { TableProps } from 'antd';
-import { PrecisionOption } from 'components/Graph/yAxisConfig';
 import { PANEL_TYPES } from 'constants/queryBuilder';
 import { LogsExplorerTableProps } from 'container/LogsExplorerTable/LogsExplorerTable.interfaces';
 import {
@@ -16,7 +15,6 @@ export type GridTableComponentProps = {
 	query: Query;
 	thresholds?: ThresholdProps[];
 	columnUnits?: ColumnUnit;
-	decimalPrecision?: PrecisionOption;
 	tableProcessedDataRef?: React.MutableRefObject<RowData[]>;
 	sticky?: TableProps<RowData>['sticky'];
 	searchTerm?: string;

frontend/src/container/GridValueComponent/index.tsx

@@ -99,11 +99,7 @@ function GridValueComponent({
 					rawValue={value}
 					value={
 						yAxisUnit
-							? getYAxisFormattedValue(
-									String(value),
-									yAxisUnit,
-									widget?.decimalPrecision,
-							  )
+							? getYAxisFormattedValue(String(value), yAxisUnit)
 							: value.toString()
 					}
 				/>

frontend/src/container/Home/Home.styles.scss

@@ -423,7 +423,6 @@
 			display: flex;
 			flex-direction: row;
 			gap: 14px;
-			align-items: flex-start;
 
 			.section-icon {
 				display: flex;
@@ -462,6 +461,7 @@
 			flex-direction: column;
 			gap: 14px;
 
+			width: 150px;
 			justify-content: flex-end;
 
 			.ant-btn {

frontend/src/container/InfraMonitoringK8s/EntityDetailsUtils/EntityMetrics/EntityMetrics.tsx

@@ -115,13 +115,6 @@ function EntityMetrics<T>({
 	const graphRef = useRef<HTMLDivElement>(null);
 	const dimensions = useResizeObserver(graphRef);
 	const { currentQuery } = useQueryBuilder();
-	const legendScrollPositionRef = useRef<{
-		scrollTop: number;
-		scrollLeft: number;
-	}>({
-		scrollTop: 0,
-		scrollLeft: 0,
-	});
 
 	const chartData = useMemo(
 		() =>
@@ -191,13 +184,6 @@ function EntityMetrics<T>({
 					maxTimeScale: graphTimeIntervals[idx].end,
 					onDragSelect: (start, end) => onDragSelect(start, end, idx),
 					query: currentQuery,
-					legendScrollPosition: legendScrollPositionRef.current,
-					setLegendScrollPosition: (position: {
-						scrollTop: number;
-						scrollLeft: number;
-					}) => {
-						legendScrollPositionRef.current = position;
-					},
 				});
 			}),
 		[

frontend/src/container/IngestionSettings/IngestionSettings.styles.scss

@@ -418,11 +418,6 @@
 								font-size: 12px;
 								font-weight: 600;
 							}
-
-							.set-alert-btn {
-								cursor: pointer;
-								margin-left: 24px;
-							}
 						}
 					}
 

frontend/src/container/IngestionSettings/MultiIngestionSettings.tsx

@@ -19,7 +19,6 @@ import {
 	TablePaginationConfig,
 	TableProps as AntDTableProps,
 	Tag,
-	Tooltip,
 	Typography,
 } from 'antd';
 import { NotificationInstance } from 'antd/es/notification/interface';
@@ -35,20 +34,15 @@ import { getYAxisFormattedValue } from 'components/Graph/yAxisConfig';
 import Tags from 'components/Tags/Tags';
 import { SOMETHING_WENT_WRONG } from 'constants/api';
 import { DATE_TIME_FORMATS } from 'constants/dateTimeFormats';
-import { QueryParams } from 'constants/query';
-import { initialQueryMeterWithType } from 'constants/queryBuilder';
-import ROUTES from 'constants/routes';
-import { INITIAL_ALERT_THRESHOLD_STATE } from 'container/CreateAlertV2/context/constants';
 import dayjs from 'dayjs';
 import { useGetDeploymentsData } from 'hooks/CustomDomain/useGetDeploymentsData';
 import { useGetAllIngestionsKeys } from 'hooks/IngestionKeys/useGetAllIngestionKeys';
 import useDebouncedFn from 'hooks/useDebouncedFunction';
 import { useGetTenantLicense } from 'hooks/useGetTenantLicense';
 import { useNotifications } from 'hooks/useNotifications';
-import { cloneDeep, isNil, isUndefined } from 'lodash-es';
+import { isNil, isUndefined } from 'lodash-es';
 import {
 	ArrowUpRight,
-	BellPlus,
 	CalendarClock,
 	Check,
 	Copy,
@@ -66,7 +60,6 @@ import { useTimezone } from 'providers/Timezone';
 import { ChangeEvent, useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useMutation } from 'react-query';
-import { useHistory } from 'react-router-dom';
 import { useCopyToClipboard } from 'react-use';
 import { ErrorResponse } from 'types/api';
 import {
@@ -78,7 +71,6 @@ import {
 	IngestionKeyProps,
 	PaginationProps,
 } from 'types/api/ingestionKeys/types';
-import { MeterAggregateOperator } from 'types/common/queryBuilder';
 import { USER_ROLES } from 'types/roles';
 import { getDaysUntilExpiry } from 'utils/timeUtils';
 
@@ -178,8 +170,6 @@ function MultiIngestionSettings(): JSX.Element {
 
 	const { isEnterpriseSelfHostedUser } = useGetTenantLicense();
 
-	const history = useHistory();
-
 	const [
 		hasCreateLimitForIngestionKeyError,
 		setHasCreateLimitForIngestionKeyError,
@@ -704,68 +694,6 @@ function MultiIngestionSettings(): JSX.Element {
 
 	const { formatTimezoneAdjustedTimestamp } = useTimezone();
 
-	const handleCreateAlert = (
-		APIKey: IngestionKeyProps,
-		signal: LimitProps,
-	): void => {
-		let metricName = '';
-
-		switch (signal.signal) {
-			case 'metrics':
-				metricName = 'signoz.meter.metric.datapoint.count';
-				break;
-			case 'traces':
-				metricName = 'signoz.meter.span.size';
-				break;
-			case 'logs':
-				metricName = 'signoz.meter.log.size';
-				break;
-			default:
-				return;
-		}
-
-		const threshold =
-			signal.signal === 'metrics'
-				? signal.config?.day?.count || 0
-				: signal.config?.day?.size || 0;
-
-		const query = {
-			...initialQueryMeterWithType,
-			builder: {
-				...initialQueryMeterWithType.builder,
-				queryData: [
-					{
-						...initialQueryMeterWithType.builder.queryData[0],
-						aggregations: [
-							{
-								...initialQueryMeterWithType.builder.queryData[0].aggregations?.[0],
-								metricName,
-								timeAggregation: MeterAggregateOperator.INCREASE,
-								spaceAggregation: MeterAggregateOperator.SUM,
-							},
-						],
-						filter: {
-							expression: `signoz.workspace.key.id='${APIKey.id}'`,
-						},
-					},
-				],
-			},
-		};
-
-		const stringifiedQuery = JSON.stringify(query);
-
-		const thresholds = cloneDeep(INITIAL_ALERT_THRESHOLD_STATE.thresholds);
-		thresholds[0].thresholdValue = threshold;
-
-		const URL = `${ROUTES.ALERTS_NEW}?showNewCreateAlertsPage=true&${
-			QueryParams.compositeQuery
-		}=${encodeURIComponent(stringifiedQuery)}&${
-			QueryParams.thresholds
-		}=${encodeURIComponent(JSON.stringify(thresholds))}`;
-
-		history.push(URL);
-	};
-
 	const columns: AntDTableProps<IngestionKeyProps>['columns'] = [
 		{
 			title: 'Ingestion Key',
@@ -1255,27 +1183,6 @@ function MultiIngestionSettings(): JSX.Element {
 																					</>
 																				))}
 																		</div>
-
-																		{((signalCfg.usesSize &&
-																			limit?.config?.day?.size !== undefined) ||
-																			(signalCfg.usesCount &&
-																				limit?.config?.day?.count !== undefined)) && (
-																			<Tooltip
-																				title="Set alert on this limit"
-																				placement="top"
-																				arrow={false}
-																			>
-																				<Button
-																					icon={<BellPlus size={14} color={Color.BG_CHERRY_400} />}
-																					className="set-alert-btn periscope-btn ghost"
-																					type="text"
-																					data-testid={`set-alert-btn-${signalName}`}
-																					onClick={(): void =>
-																						handleCreateAlert(APIKey, limitsDict[signalName])
-																					}
-																				/>
-																			</Tooltip>
-																		)}
 																	</div>
 
 																	{/* SECOND limit usage/limit */}

frontend/src/container/IngestionSettings/__tests__/MultiIngestionSettings.test.tsx

@@ -1,60 +1,10 @@
-import { QueryParams } from 'constants/query';
-import { rest, server } from 'mocks-server/server';
-import { render, screen, userEvent, waitFor } from 'tests/test-utils';
-import { LimitProps } from 'types/api/ingestionKeys/limits/types';
-import {
-	AllIngestionKeyProps,
-	IngestionKeyProps,
-} from 'types/api/ingestionKeys/types';
+import { render, screen } from 'tests/test-utils';
 
 import MultiIngestionSettings from '../MultiIngestionSettings';
 
-// Extend the existing types to include limits with proper structure
-interface TestIngestionKeyProps extends Omit<IngestionKeyProps, 'limits'> {
-	limits?: LimitProps[];
-}
-
-interface TestAllIngestionKeyProps extends Omit<AllIngestionKeyProps, 'data'> {
-	data: TestIngestionKeyProps[];
-}
-
-// Mock useHistory.push to capture navigation URL used by MultiIngestionSettings
-const mockPush = jest.fn() as jest.MockedFunction<(path: string) => void>;
-jest.mock('react-router-dom', () => {
-	// eslint-disable-next-line @typescript-eslint/no-var-requires
-	const actual = jest.requireActual('react-router-dom');
-	return {
-		...actual,
-		useHistory: (): { push: typeof mockPush } => ({ push: mockPush }),
-	};
-});
-
-// Mock deployments data hook to avoid unrelated network calls in this page
-jest.mock(
-	'hooks/CustomDomain/useGetDeploymentsData',
-	(): Record<string, unknown> => ({
-		useGetDeploymentsData: (): {
-			data: undefined;
-			isLoading: boolean;
-			isFetching: boolean;
-			isError: boolean;
-		} => ({
-			data: undefined,
-			isLoading: false,
-			isFetching: false,
-			isError: false,
-		}),
-	}),
-);
-
-const TEST_CREATED_UPDATED = '2024-01-01T00:00:00Z';
-const TEST_EXPIRES_AT = '2030-01-01T00:00:00Z';
-const TEST_WORKSPACE_ID = 'w1';
-const INGESTION_SETTINGS_ROUTE = '/ingestion-settings';
-
 describe('MultiIngestionSettings Page', () => {
 	beforeEach(() => {
-		mockPush.mockClear();
+		render(<MultiIngestionSettings />);
 	});
 
 	afterEach(() => {
@@ -62,10 +12,6 @@ describe('MultiIngestionSettings Page', () => {
 	});
 
 	it('renders MultiIngestionSettings page without crashing', () => {
-		render(<MultiIngestionSettings />, undefined, {
-			initialRoute: INGESTION_SETTINGS_ROUTE,
-		});
-
 		expect(screen.getByText('Ingestion Keys')).toBeInTheDocument();
 
 		expect(
@@ -81,181 +27,4 @@ describe('MultiIngestionSettings Page', () => {
 		expect(aboutKeyslink).toHaveClass('learn-more');
 		expect(aboutKeyslink).toHaveAttribute('rel', 'noreferrer');
 	});
-
-	it('navigates to create alert with metrics count threshold', async () => {
-		const user = userEvent.setup({ pointerEventsCheck: 0 });
-
-		// Arrange API response with a metrics daily count limit so the alert button is visible
-		const response: TestAllIngestionKeyProps = {
-			status: 'success',
-			data: [
-				{
-					name: 'Key One',
-					expires_at: TEST_EXPIRES_AT,
-					value: 'secret',
-					workspace_id: TEST_WORKSPACE_ID,
-					id: 'k1',
-					created_at: TEST_CREATED_UPDATED,
-					updated_at: TEST_CREATED_UPDATED,
-					tags: [],
-					limits: [
-						{
-							id: 'l1',
-							signal: 'metrics',
-							config: { day: { count: 1000 } },
-						},
-					],
-				},
-			],
-			_pagination: { page: 1, per_page: 10, pages: 1, total: 1 },
-		};
-
-		server.use(
-			rest.get('*/workspaces/me/keys*', (_req, res, ctx) =>
-				res(ctx.status(200), ctx.json(response)),
-			),
-		);
-
-		// Render with initial route to test navigation
-		render(<MultiIngestionSettings />, undefined, {
-			initialRoute: INGESTION_SETTINGS_ROUTE,
-		});
-		// Wait for ingestion key to load and expand the row to show limits
-		await screen.findByText('Key One');
-		const expandButton = screen.getByRole('button', { name: /right Key One/i });
-		await user.click(expandButton);
-
-		// Wait for limits section to render and click metrics alert button by test id
-		await screen.findByText('LIMITS');
-		const metricsAlertBtn = (await screen.findByTestId(
-			'set-alert-btn-metrics',
-		)) as HTMLButtonElement;
-		await user.click(metricsAlertBtn);
-
-		// Wait for navigation to occur
-		await waitFor(() => {
-			expect(mockPush).toHaveBeenCalledTimes(1);
-		});
-
-		// Assert: navigation occurred with correct query parameters
-		const navigationCall = mockPush.mock.calls[0][0] as string;
-
-		// Check URL contains alerts/new route
-		expect(navigationCall).toContain('/alerts/new');
-		expect(navigationCall).toContain('showNewCreateAlertsPage=true');
-
-		// Parse query parameters
-		const urlParams = new URLSearchParams(navigationCall.split('?')[1]);
-
-		const thresholds = JSON.parse(urlParams.get(QueryParams.thresholds) || '{}');
-		expect(thresholds).toBeDefined();
-		expect(thresholds[0].thresholdValue).toBe(1000);
-
-		// Verify compositeQuery parameter exists and contains correct data
-		const compositeQuery = JSON.parse(
-			urlParams.get(QueryParams.compositeQuery) || '{}',
-		);
-		expect(compositeQuery.builder).toBeDefined();
-		expect(compositeQuery.builder.queryData).toBeDefined();
-
-		// Check that the query contains the correct filter expression for the key
-		const firstQueryData = compositeQuery.builder.queryData[0];
-		expect(firstQueryData.filter.expression).toContain(
-			"signoz.workspace.key.id='k1'",
-		);
-
-		// Verify metric name for metrics signal
-		expect(firstQueryData.aggregations[0].metricName).toBe(
-			'signoz.meter.metric.datapoint.count',
-		);
-	});
-
-	it('navigates to create alert for logs with size threshold', async () => {
-		const user = userEvent.setup({ pointerEventsCheck: 0 });
-
-		// Arrange API response with a logs daily size limit so the alert button is visible
-		const response: TestAllIngestionKeyProps = {
-			status: 'success',
-			data: [
-				{
-					name: 'Key Two',
-					expires_at: TEST_EXPIRES_AT,
-					value: 'secret',
-					workspace_id: TEST_WORKSPACE_ID,
-					id: 'k2',
-					created_at: TEST_CREATED_UPDATED,
-					updated_at: TEST_CREATED_UPDATED,
-					tags: [],
-					limits: [
-						{
-							id: 'l2',
-							signal: 'logs',
-							config: { day: { size: 2048 } },
-						},
-					],
-				},
-			],
-			_pagination: { page: 1, per_page: 10, pages: 1, total: 1 },
-		};
-
-		server.use(
-			rest.get('*/workspaces/me/keys*', (_req, res, ctx) =>
-				res(ctx.status(200), ctx.json(response)),
-			),
-		);
-
-		render(<MultiIngestionSettings />, undefined, {
-			initialRoute: INGESTION_SETTINGS_ROUTE,
-		});
-
-		// Wait for ingestion key to load and expand the row to show limits
-		await screen.findByText('Key Two');
-		const expandButton = screen.getByRole('button', { name: /right Key Two/i });
-		await user.click(expandButton);
-
-		// Wait for limits section to render and click logs alert button by test id
-		await screen.findByText('LIMITS');
-		const logsAlertBtn = (await screen.findByTestId(
-			'set-alert-btn-logs',
-		)) as HTMLButtonElement;
-		await user.click(logsAlertBtn);
-
-		// Wait for navigation to occur
-		await waitFor(() => {
-			expect(mockPush).toHaveBeenCalledTimes(1);
-		});
-
-		// Assert: navigation occurred with correct query parameters
-		const navigationCall = mockPush.mock.calls[0][0] as string;
-
-		// Check URL contains alerts/new route
-		expect(navigationCall).toContain('/alerts/new');
-		expect(navigationCall).toContain('showNewCreateAlertsPage=true');
-
-		// Parse query parameters
-		const urlParams = new URLSearchParams(navigationCall.split('?')[1]);
-
-		// Verify thresholds parameter
-		const thresholds = JSON.parse(urlParams.get(QueryParams.thresholds) || '{}');
-		expect(thresholds).toBeDefined();
-		expect(thresholds[0].thresholdValue).toBe(2048);
-
-		// Verify compositeQuery parameter exists and contains correct data
-		const compositeQuery = JSON.parse(
-			urlParams.get(QueryParams.compositeQuery) || '{}',
-		);
-		expect(compositeQuery.builder).toBeDefined();
-		expect(compositeQuery.builder.queryData).toBeDefined();
-
-		// Check that the query contains the correct filter expression for the key
-		const firstQueryData = compositeQuery.builder.queryData[0];
-		expect(firstQueryData.filter.expression).toContain(
-			"signoz.workspace.key.id='k2'",
-		);
-
-		// Verify metric name for logs signal
-		expect(firstQueryData.aggregations[0].metricName).toBe(
-			'signoz.meter.log.size',
-		);
-	});
 });

frontend/src/container/ListAlertRules/ListAlert.tsx

@@ -350,51 +350,47 @@ function ListAlert({ allAlertRules, refetch }: ListAlertProps): JSX.Element {
 			key: 'action',
 			width: 10,
 			render: (id: GettableAlert['id'], record): JSX.Element => (
-				<div data-testid="alert-actions">
-					<DropDown
-						onDropDownItemClick={(item): void =>
-							alertActionLogEvent(item.key, record)
-						}
-						element={[
-							<ToggleAlertState
-								key="1"
-								disabled={record.disabled}
-								setData={setData}
-								id={id}
-							/>,
-							<ColumnButton
-								key="2"
-								onClick={(): void => onEditHandler(record, false)}
-								type="link"
-								loading={editLoader}
-							>
-								Edit
-							</ColumnButton>,
-							<ColumnButton
-								key="3"
-								onClick={(): void => onEditHandler(record, true)}
-								type="link"
-								loading={editLoader}
-							>
-								Edit in New Tab
-							</ColumnButton>,
-							<ColumnButton
-								key="3"
-								onClick={onCloneHandler(record)}
-								type="link"
-								loading={cloneLoader}
-							>
-								Clone
-							</ColumnButton>,
-							<DeleteAlert
-								key="4"
-								notifications={notificationsApi}
-								setData={setData}
-								id={id}
-							/>,
-						]}
-					/>
-				</div>
+				<DropDown
+					onDropDownItemClick={(item): void => alertActionLogEvent(item.key, record)}
+					element={[
+						<ToggleAlertState
+							key="1"
+							disabled={record.disabled}
+							setData={setData}
+							id={id}
+						/>,
+						<ColumnButton
+							key="2"
+							onClick={(): void => onEditHandler(record, false)}
+							type="link"
+							loading={editLoader}
+						>
+							Edit
+						</ColumnButton>,
+						<ColumnButton
+							key="3"
+							onClick={(): void => onEditHandler(record, true)}
+							type="link"
+							loading={editLoader}
+						>
+							Edit in New Tab
+						</ColumnButton>,
+						<ColumnButton
+							key="3"
+							onClick={onCloneHandler(record)}
+							type="link"
+							loading={cloneLoader}
+						>
+							Clone
+						</ColumnButton>,
+						<DeleteAlert
+							key="4"
+							notifications={notificationsApi}
+							setData={setData}
+							id={id}
+						/>,
+					]}
+				/>
 			),
 		});
 	}