Merge branch 'main' into feat/fga-rules

# Conflicts:
#	pkg/apiserver/signozapiserver/ruler.go
#	pkg/apiserver/signozapiserver/rulestatehistory.go
#	pkg/ruler/authz.go
#	pkg/ruler/authz_test.go
#	pkg/signoz/provider.go
#	tests/integration/tests/ruler/08_authz.py

.github/CODEOWNERS

@@ -194,8 +194,8 @@ go.mod @therealpandey
 /frontend/src/pages/EditRules/ @SigNoz/pulse-frontend
 /frontend/src/container/AlertHistory/ @SigNoz/pulse-frontend
 /frontend/src/container/CreateAlertRule/ @SigNoz/pulse-frontend
-/frontend/src/container/CreateAlert/ @SigNoz/pulse-frontend
-/frontend/src/container/EditAlert/ @SigNoz/pulse-frontend
+/frontend/src/container/CreateAlertV2/ @SigNoz/pulse-frontend
+/frontend/src/container/EditAlertV2/ @SigNoz/pulse-frontend
 /frontend/src/container/FormAlertRules/ @SigNoz/pulse-frontend
 /frontend/src/container/ListAlertRules/ @SigNoz/pulse-frontend
 /frontend/src/container/TriggeredAlerts/ @SigNoz/pulse-frontend
@@ -209,10 +209,6 @@ go.mod @therealpandey
 /frontend/src/types/api/alerts/ @SigNoz/pulse-frontend
 /frontend/src/providers/Alert.tsx @SigNoz/pulse-frontend
 /frontend/src/constants/alerts.ts @SigNoz/pulse-frontend
-/frontend/src/container/PlannedDowntime/ @SigNoz/pulse-frontend
-/frontend/src/hooks/alerts/ @SigNoz/pulse-frontend
-/frontend/src/container/Home/AlertRules/ @SigNoz/pulse-frontend
-/frontend/src/container/Home/__tests__/AlertRules.test.tsx @SigNoz/pulse-frontend
 
 ## Notification Channels
 /frontend/src/pages/ChannelsEdit/ @SigNoz/pulse-frontend
@@ -221,11 +217,6 @@ go.mod @therealpandey
 /frontend/src/container/FormAlertChannels/ @SigNoz/pulse-frontend
 /frontend/src/hooks/notificationChannels/ @SigNoz/pulse-frontend
 
-## List filter + views (dashboards and alerts lists)
-/frontend/src/components/ListFilter/ @SigNoz/pulse-frontend
-/frontend/src/components/ListViews/ @SigNoz/pulse-frontend
-/frontend/src/hooks/listViews/ @SigNoz/pulse-frontend
-
 ## OpenAPI Schema - Generated
 /frontend/src/api/generated/services/ @therealpandey @vikrantgupta25 @srikanthccv
 /docs/api/openapi.yml @therealpandey @vikrantgupta25 @srikanthccv

.github/workflows/build-community.yaml

@@ -63,7 +63,7 @@ jobs:
     secrets: inherit
     with:
       PRIMUS_REF: main
-      GO_VERSION: 1.25
+      GO_VERSION: 1.24
       GO_NAME: signoz-community
       GO_INPUT_ARTIFACT_CACHE_KEY: community-jsbuild-${{ github.sha }}
       GO_INPUT_ARTIFACT_PATH: frontend/build

.github/workflows/build-enterprise.yaml

@@ -89,7 +89,7 @@ jobs:
     secrets: inherit
     with:
       PRIMUS_REF: main
-      GO_VERSION: 1.25
+      GO_VERSION: 1.24
       GO_INPUT_ARTIFACT_CACHE_KEY: enterprise-jsbuild-${{ github.sha }}
       GO_INPUT_ARTIFACT_PATH: frontend/build
       GO_BUILD_CONTEXT: ./cmd/enterprise

.github/workflows/build-staging.yaml

@@ -95,7 +95,7 @@ jobs:
     secrets: inherit
     with:
       PRIMUS_REF: main
-      GO_VERSION: 1.25
+      GO_VERSION: 1.24
       GO_INPUT_ARTIFACT_CACHE_KEY: staging-jsbuild-${{ github.sha }}
       GO_INPUT_ARTIFACT_PATH: frontend/build
       GO_BUILD_CONTEXT: ./cmd/enterprise

.github/workflows/e2eci.yaml

@@ -27,7 +27,7 @@ jobs:
           PR_NUMBER: ${{ github.event.pull_request.number }}
           FORCE: ${{ contains(github.event.pull_request.labels.*.name, 'safe-to-e2e') }}
         run: |
-          CHANGED_FILES=$(gh api "repos/$GITHUB_REPOSITORY/pulls/$PR_NUMBER/files" --paginate --jq '.[].filename | select((startswith("tests/integration/") or startswith("frontend/src/api/generated/")) | not)')
+          CHANGED_FILES=$(gh api "repos/$GITHUB_REPOSITORY/pulls/$PR_NUMBER/files" --paginate --jq '.[].filename | select(startswith("tests/integration/") | not)')
           PATTERN='^(frontend/|tests/|\.github/workflows/e2eci\.yaml$|cmd/enterprise/Dockerfile\.with-web\.integration$)'
 
           if [ "$FORCE" = "true" ]; then
@@ -47,7 +47,7 @@ jobs:
       - name: node
         uses: actions/setup-node@v4
         with:
-          node-version: "22"
+          node-version: lts/*
       - name: install-pnpm
         uses: pnpm/action-setup@v6
         with:
@@ -88,7 +88,7 @@ jobs:
             postgres:15 \
             clickhouse/clickhouse-server:25.12.5 \
             clickhouse/clickhouse-keeper:25.12.5 \
-            signoz/signoz-otel-collector:v0.144.16-rc.1 \
+            signoz/signoz-schema-migrator:v0.144.9 \
             wiremock/wiremock:2.35.1-1 \
             | xargs -P 0 -n 1 docker pull -q
       - name: python
@@ -105,7 +105,7 @@ jobs:
       - name: node
         uses: actions/setup-node@v4
         with:
-          node-version: "22"
+          node-version: lts/*
       - name: install-pnpm
         uses: pnpm/action-setup@v6
         with:

.github/workflows/goci.yaml

@@ -22,7 +22,7 @@ jobs:
     with:
       PRIMUS_REF: main
       GO_TEST_CONTEXT: ./...
-      GO_VERSION: 1.25
+      GO_VERSION: 1.24
   fmt:
     if: |
       github.event_name == 'merge_group' ||
@@ -32,7 +32,7 @@ jobs:
     secrets: inherit
     with:
       PRIMUS_REF: main
-      GO_VERSION: 1.25
+      GO_VERSION: 1.24
   lint:
     if: |
       github.event_name == 'merge_group' ||
@@ -42,7 +42,7 @@ jobs:
     secrets: inherit
     with:
       PRIMUS_REF: main
-      GO_VERSION: 1.25
+      GO_VERSION: 1.24
   deps:
     if: |
       github.event_name == 'merge_group' ||
@@ -52,7 +52,7 @@ jobs:
     secrets: inherit
     with:
       PRIMUS_REF: main
-      GO_VERSION: 1.25
+      GO_VERSION: 1.24
   semconv-generated:
     if: |
       github.event_name == 'merge_group' ||
@@ -65,7 +65,7 @@ jobs:
       - name: go-install
         uses: actions/setup-go@v5
         with:
-          go-version: "1.25"
+          go-version: "1.24"
       - name: check-semconv-generated-files
         run: make semconv-check
   build:
@@ -80,7 +80,7 @@ jobs:
       - name: go-install
         uses: actions/setup-go@v5
         with:
-          go-version: "1.25"
+          go-version: "1.24"
       - name: qemu-install
         uses: docker/setup-qemu-action@v3
       - name: aarch64-install
@@ -116,7 +116,7 @@ jobs:
       - name: go-install
         uses: actions/setup-go@v5
         with:
-          go-version: "1.25"
+          go-version: "1.24"
       - name: generate-openapi
         run: |
           go run cmd/enterprise/*.go generate openapi
@@ -133,7 +133,7 @@ jobs:
       - name: go-install
         uses: actions/setup-go@v5
         with:
-          go-version: "1.25"
+          go-version: "1.24"
       - name: generate-authz
         run: |
           go run cmd/enterprise/*.go generate authz
@@ -150,7 +150,7 @@ jobs:
       - name: go-install
         uses: actions/setup-go@v5
         with:
-          go-version: "1.25"
+          go-version: "1.24"
       - name: generate-web-settings
         run: |
           go run cmd/enterprise/*.go generate config web-settings
@@ -167,7 +167,7 @@ jobs:
       - name: go-install
         uses: actions/setup-go@v5
         with:
-          go-version: "1.25"
+          go-version: "1.24"
       - name: generate-transaction-groups
         run: |
           go run cmd/enterprise/*.go generate config transaction-groups

.github/workflows/gor-signoz-community.yaml

@@ -66,7 +66,7 @@ jobs:
       - name: setup-go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.25"
+          go-version: "1.24"
       - name: cross-compilation-tools
         if: matrix.os == 'ubuntu-latest'
         run: |
@@ -130,7 +130,7 @@ jobs:
       - name: setup-go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.25"
+          go-version: "1.24"
 
       # copy the caches from build
       - name: get-sha

.github/workflows/gor-signoz.yaml

@@ -75,7 +75,7 @@ jobs:
       - name: setup-go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.25"
+          go-version: "1.24"
       - name: cross-compilation-tools
         if: matrix.os == 'ubuntu-latest'
         run: |
@@ -138,7 +138,7 @@ jobs:
       - name: setup-go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.25"
+          go-version: "1.24"
 
       # copy the caches from build
       - name: get-sha

.github/workflows/integrationci.yaml

@@ -40,7 +40,6 @@ jobs:
         suite:
           - alertmanager
           - alertmanagerrotation
-          - auditquerier
           - basepath
           - callbackauthn
           - cloudintegrations
@@ -84,8 +83,8 @@ jobs:
           - wal
         clickhouse-version:
           - 25.12.5
-        signoz-otel-collector-version:
-          - v0.144.16-rc.1
+        schema-migrator-version:
+          - v0.144.6
         postgres-version:
           - 15
     if: |
@@ -156,4 +155,4 @@ jobs:
             --sqlite-mode ${{matrix.sqlite-mode}} \
             --postgres-version ${{matrix.postgres-version}} \
             --clickhouse-version ${{matrix.clickhouse-version}} \
-            --signoz-otel-collector-version ${{matrix.signoz-otel-collector-version}}
+            --schema-migrator-version ${{matrix.schema-migrator-version}}

cmd/enterprise/server.go

@@ -9,7 +9,6 @@ import (
 
 	"github.com/SigNoz/signoz/cmd"
 	"github.com/SigNoz/signoz/ee/auditor/fileauditor"
-	"github.com/SigNoz/signoz/ee/auditor/kafkaauditor"
 	"github.com/SigNoz/signoz/ee/auditor/otlphttpauditor"
 	"github.com/SigNoz/signoz/ee/authn/callbackauthn/oidccallbackauthn"
 	"github.com/SigNoz/signoz/ee/authn/callbackauthn/samlcallbackauthn"
@@ -157,9 +156,6 @@ func runServer(ctx context.Context, config signoz.Config, logger *slog.Logger) e
 			if err := factories.Add(fileauditor.NewFactory(licensing, version.Info)); err != nil {
 				panic(err)
 			}
-			if err := factories.Add(kafkaauditor.NewFactory(licensing, version.Info)); err != nil {
-				panic(err)
-			}
 			return factories
 		},
 		func(ctx context.Context, providerSettings factory.ProviderSettings, flagger pkgflagger.Flagger, licensing licensing.Licensing, telemetryStore telemetrystore.TelemetryStore, retentionGetter retention.Getter, orgGetter organization.Getter, zeus zeus.Zeus) (factory.NamedMap[factory.ProviderFactory[meterreporter.Reporter, meterreporter.Config]], string) {

conf/example.yaml

@@ -436,7 +436,6 @@ auditor:
   # Specifies the auditor provider to use.
   # noop: discards all audit events (community default).
   # otlphttp: exports audit events via OTLP HTTP (enterprise).
-  # kafka: exports audit events to a Kafka topic as OTLP protobuf (enterprise).
   provider: noop
   # The async channel capacity for audit events. Events are dropped when full (fail-open).
   buffer_size: 1000
@@ -462,18 +461,6 @@ auditor:
       max_interval: 30s
       # The total maximum time spent retrying.
       max_elapsed_time: 60s
-  kafka:
-    # The seed broker addresses (host:port) used to discover the cluster.
-    brokers:
-      - localhost:9092
-    # The topic audit events are written to. It must already exist.
-    topic: ""
-    # The client id the producer reports to the brokers.
-    client_id: signoz
-    # The compression codec for produced batches: none, gzip, snappy, lz4 or zstd.
-    compression: lz4
-    # The maximum time to drain buffered events on shutdown. Undelivered events are dropped after it.
-    shutdown_timeout: 30s
 
 ##################### Cloud Integration #####################
 cloudintegration:

docs/contributing/tests/integration.md

@@ -256,7 +256,7 @@ Tests can be configured using pytest options:
 - `--sqlite-mode` — SQLite journal mode: `delete` or `wal` (default: `delete`). Only relevant when `--sqlstore-provider=sqlite`.
 - `--postgres-version` — PostgreSQL version (default: `15`)
 - `--clickhouse-version` — ClickHouse version, also used for ClickHouse Keeper (default: `25.12.5`)
-- `--signoz-otel-collector-version`: SigNoz OTel collector version, used to run the ClickHouse migrations (default: `v0.144.16-rc.1`)
+- `--schema-migrator-version` — SigNoz schema migrator version (default: `v0.144.9`)
 - `--with-web` — Build the frontend into the SigNoz image (required for e2e)
 
 Example:

ee/auditor/kafkaauditor/export.go

@@ -1,31 +0,0 @@
-package kafkaauditor
-
-import (
-	"context"
-	"log/slog"
-
-	"github.com/twmb/franz-go/pkg/kgo"
-
-	"github.com/SigNoz/signoz/pkg/auditor"
-	"github.com/SigNoz/signoz/pkg/errors"
-	"github.com/SigNoz/signoz/pkg/types/audittypes"
-)
-
-// Produces the whole batch as a single record so the collector's otlp_proto unmarshaler reads it as one ExportLogsServiceRequest.
-func (provider *provider) export(ctx context.Context, events []audittypes.AuditEvent) error {
-	logs := audittypes.NewPLogsFromAuditEvents(events, "signoz", provider.build.Version(), "signoz.audit")
-
-	value, err := provider.marshaler.MarshalLogs(logs)
-	if err != nil {
-		return errors.Wrapf(err, errors.TypeInternal, auditor.ErrCodeAuditExportFailed, "failed to marshal audit logs")
-	}
-
-	record := &kgo.Record{Topic: provider.config.Kafka.Topic, Value: value}
-	if err := provider.client.ProduceSync(ctx, record).FirstErr(); err != nil {
-		provider.settings.Logger().ErrorContext(ctx, "audit export failed", errors.Attr(err), slog.Int("dropped_log_records", len(events)))
-
-		return errors.Wrapf(err, errors.TypeInternal, auditor.ErrCodeAuditExportFailed, "failed to produce audit logs to topic %q", provider.config.Kafka.Topic)
-	}
-
-	return nil
-}

ee/auditor/kafkaauditor/provider.go

@@ -1,132 +0,0 @@
-package kafkaauditor
-
-import (
-	"context"
-	"log/slog"
-
-	"github.com/twmb/franz-go/pkg/kgo"
-	"github.com/twmb/franz-go/plugin/kslog"
-	"go.opentelemetry.io/collector/pdata/plog"
-
-	"github.com/SigNoz/signoz/pkg/auditor"
-	"github.com/SigNoz/signoz/pkg/auditor/auditorserver"
-	"github.com/SigNoz/signoz/pkg/factory"
-	"github.com/SigNoz/signoz/pkg/licensing"
-	"github.com/SigNoz/signoz/pkg/types/audittypes"
-	"github.com/SigNoz/signoz/pkg/version"
-)
-
-var _ auditor.Auditor = (*provider)(nil)
-
-type provider struct {
-	settings  factory.ScopedProviderSettings
-	config    auditor.Config
-	licensing licensing.Licensing
-	build     version.Build
-	server    *auditorserver.Server
-	marshaler plog.ProtoMarshaler
-	client    *kgo.Client
-}
-
-func NewFactory(licensing licensing.Licensing, build version.Build) factory.ProviderFactory[auditor.Auditor, auditor.Config] {
-	return factory.NewProviderFactory(factory.MustNewName("kafka"), func(ctx context.Context, providerSettings factory.ProviderSettings, config auditor.Config) (auditor.Auditor, error) {
-		return newProvider(ctx, providerSettings, config, licensing, build)
-	})
-}
-
-func newProvider(_ context.Context, providerSettings factory.ProviderSettings, config auditor.Config, licensing licensing.Licensing, build version.Build) (auditor.Auditor, error) {
-	settings := factory.NewScopedProviderSettings(providerSettings, "github.com/SigNoz/signoz/ee/auditor/kafkaauditor")
-
-	// Acks from all in-sync replicas, idempotent writes and unbounded record retries are franz-go defaults and are kept as is.
-	// A delivery timeout or retry limit lets franz-go < v1.22.2 ack a record that was never written (twmb/franz-go#1484).
-	client, err := kgo.NewClient(
-		kgo.SeedBrokers(config.Kafka.Brokers...),
-		kgo.ClientID(config.Kafka.ClientID),
-		kgo.ProducerBatchCompression(compressionCodec(config.Kafka.Compression)),
-		kgo.ProducerLinger(0),
-		kgo.WithLogger(kslog.New(settings.Logger())),
-	)
-	if err != nil {
-		return nil, err
-	}
-
-	provider := &provider{
-		settings:  settings,
-		config:    config,
-		licensing: licensing,
-		build:     build,
-		marshaler: plog.ProtoMarshaler{},
-		client:    client,
-	}
-
-	server, err := auditorserver.New(settings,
-		auditorserver.Config{
-			BufferSize:    config.BufferSize,
-			BatchSize:     config.BatchSize,
-			FlushInterval: config.FlushInterval,
-		},
-		provider.export,
-	)
-	if err != nil {
-		client.Close()
-		return nil, err
-	}
-
-	provider.server = server
-	return provider, nil
-}
-
-func (provider *provider) Start(ctx context.Context) error {
-	return provider.server.Start(ctx)
-}
-
-func (provider *provider) Audit(ctx context.Context, event audittypes.AuditEvent) {
-	if event.PrincipalAttributes.PrincipalOrgID.IsZero() {
-		provider.settings.Logger().WarnContext(ctx, "audit event dropped as org_id is zero")
-		return
-	}
-
-	if _, err := provider.licensing.GetActive(ctx, event.PrincipalAttributes.PrincipalOrgID); err != nil {
-		return
-	}
-
-	provider.server.Add(ctx, event)
-}
-
-func (provider *provider) Healthy() <-chan struct{} {
-	return provider.server.Healthy()
-}
-
-func (provider *provider) Stop(ctx context.Context) error {
-	ctx, cancel := context.WithTimeout(ctx, provider.config.Kafka.ShutdownTimeout)
-	defer cancel()
-
-	stoppedC := make(chan error, 1)
-	go func() { stoppedC <- provider.server.Stop(ctx) }()
-
-	select {
-	case err := <-stoppedC:
-		provider.client.Close()
-		return err
-	case <-ctx.Done():
-		provider.settings.Logger().WarnContext(ctx, "audit drain timed out, closing kafka client", slog.Duration("shutdown_timeout", provider.config.Kafka.ShutdownTimeout))
-		// Closing fails buffered and in-flight records, so the blocked export and the rest of the drain return immediately.
-		provider.client.Close()
-		return <-stoppedC
-	}
-}
-
-func compressionCodec(name string) kgo.CompressionCodec {
-	switch name {
-	case "gzip":
-		return kgo.GzipCompression()
-	case "snappy":
-		return kgo.SnappyCompression()
-	case "lz4":
-		return kgo.Lz4Compression()
-	case "zstd":
-		return kgo.ZstdCompression()
-	default:
-		return kgo.NoCompression()
-	}
-}

ee/auditor/kafkaauditor/provider_test.go

@@ -1,227 +0,0 @@
-package kafkaauditor
-
-import (
-	"context"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"github.com/twmb/franz-go/pkg/kerr"
-	"github.com/twmb/franz-go/pkg/kfake"
-	"github.com/twmb/franz-go/pkg/kgo"
-	"go.opentelemetry.io/collector/pdata/plog"
-
-	"github.com/SigNoz/signoz/pkg/auditor"
-	"github.com/SigNoz/signoz/pkg/errors"
-	"github.com/SigNoz/signoz/pkg/instrumentation/instrumentationtest"
-	"github.com/SigNoz/signoz/pkg/types/audittypes"
-	"github.com/SigNoz/signoz/pkg/types/coretypes"
-	"github.com/SigNoz/signoz/pkg/version"
-)
-
-func newTestCluster(t *testing.T, topics ...string) *kfake.Cluster {
-	t.Helper()
-
-	cluster, err := kfake.NewCluster(kfake.NumBrokers(1), kfake.SeedTopics(1, topics...))
-	require.NoError(t, err)
-	t.Cleanup(cluster.Close)
-
-	return cluster
-}
-
-func newTestProvider(t *testing.T, brokers []string, topic string, compression string) *provider {
-	t.Helper()
-
-	config := auditor.Config{
-		Provider:      "kafka",
-		BufferSize:    10,
-		BatchSize:     5,
-		FlushInterval: 50 * time.Millisecond,
-		Kafka: auditor.KafkaConfig{
-			Brokers:         brokers,
-			Topic:           topic,
-			ClientID:        "signoz-test",
-			Compression:     compression,
-			ShutdownTimeout: 30 * time.Second,
-		},
-	}
-
-	auditor, err := newProvider(context.Background(), instrumentationtest.New().ToProviderSettings(), config, nil, version.Info)
-	require.NoError(t, err)
-
-	return auditor.(*provider)
-}
-
-func newTestEvent(resource coretypes.Resource, action coretypes.Verb, body string) audittypes.AuditEvent {
-	return audittypes.AuditEvent{
-		Timestamp: time.Now(),
-		Body:      body,
-		EventName: audittypes.NewEventName(action),
-		AuditAttributes: audittypes.AuditAttributes{
-			Action:  action,
-			Outcome: audittypes.OutcomeSuccess,
-		},
-		ResourceAttributes: audittypes.ResourceAttributes{
-			Resource: resource,
-		},
-	}
-}
-
-// Polls the topic until the consumed records hold wantLogRecords audit log records in total.
-func consumeRecords(t *testing.T, brokers []string, topic string, wantLogRecords int) []*kgo.Record {
-	t.Helper()
-
-	client, err := kgo.NewClient(
-		kgo.SeedBrokers(brokers...),
-		kgo.ConsumeTopics(topic),
-		kgo.ConsumeResetOffset(kgo.NewOffset().AtStart()),
-	)
-	require.NoError(t, err)
-	defer client.Close()
-
-	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
-	defer cancel()
-
-	var records []*kgo.Record
-	gotLogRecords := 0
-	for gotLogRecords < wantLogRecords {
-		fetches := client.PollFetches(ctx)
-		require.NoError(t, ctx.Err(), "timed out waiting for %d log records, got %d", wantLogRecords, gotLogRecords)
-		require.Empty(t, fetches.Errors())
-
-		for _, record := range fetches.Records() {
-			logs, err := (&plog.ProtoUnmarshaler{}).UnmarshalLogs(record.Value)
-			require.NoError(t, err)
-			gotLogRecords += logs.LogRecordCount()
-			records = append(records, record)
-		}
-	}
-
-	return records
-}
-
-func TestExport(t *testing.T) {
-	testCases := []struct {
-		name            string
-		compression     string
-		compressionType uint8
-	}{
-		{name: "CompressionNone", compression: "none", compressionType: 0},
-		{name: "CompressionGzip", compression: "gzip", compressionType: 1},
-		{name: "CompressionSnappy", compression: "snappy", compressionType: 2},
-		{name: "CompressionLz4", compression: "lz4", compressionType: 3},
-		{name: "CompressionZstd", compression: "zstd", compressionType: 4},
-	}
-
-	for _, testCase := range testCases {
-		t.Run(testCase.name, func(t *testing.T) {
-			cluster := newTestCluster(t, "tenant_audit")
-			provider := newTestProvider(t, cluster.ListenAddrs(), "tenant_audit", testCase.compression)
-			defer provider.client.Close()
-
-			events := []audittypes.AuditEvent{
-				newTestEvent(coretypes.ResourceUser, coretypes.VerbUpdate, "user updated"),
-				newTestEvent(coretypes.ResourceMetaResourceDashboard, coretypes.VerbCreate, "dashboard created"),
-				newTestEvent(coretypes.ResourceMetaResourceDashboard, coretypes.VerbDelete, "dashboard deleted"),
-			}
-			require.NoError(t, provider.export(context.Background(), events))
-
-			records := consumeRecords(t, cluster.ListenAddrs(), "tenant_audit", len(events))
-			require.Len(t, records, 1)
-			assert.Equal(t, "tenant_audit", records[0].Topic)
-			assert.Equal(t, testCase.compressionType, records[0].Attrs.CompressionType())
-
-			logs, err := (&plog.ProtoUnmarshaler{}).UnmarshalLogs(records[0].Value)
-			require.NoError(t, err)
-			assert.Equal(t, len(events), logs.LogRecordCount())
-
-			serviceName, ok := logs.ResourceLogs().At(0).Resource().Attributes().Get("service.name")
-			require.True(t, ok)
-			assert.Equal(t, "signoz", serviceName.Str())
-		})
-	}
-}
-
-func TestExport_RecordTooLarge(t *testing.T) {
-	cluster := newTestCluster(t, "large_audit")
-	provider := newTestProvider(t, cluster.ListenAddrs(), "large_audit", "none")
-	defer provider.client.Close()
-
-	event := newTestEvent(coretypes.ResourceUser, coretypes.VerbCreate, strings.Repeat("a", 2<<20))
-
-	err := provider.export(context.Background(), []audittypes.AuditEvent{event})
-	require.Error(t, err)
-	assert.True(t, errors.Is(err, kerr.MessageTooLarge))
-}
-
-func TestExport_UnknownTopic(t *testing.T) {
-	cluster := newTestCluster(t)
-	provider := newTestProvider(t, cluster.ListenAddrs(), "missing_audit", "lz4")
-	defer provider.client.Close()
-
-	err := provider.export(context.Background(), []audittypes.AuditEvent{newTestEvent(coretypes.ResourceUser, coretypes.VerbCreate, "user created")})
-	require.Error(t, err)
-	assert.True(t, errors.Is(err, kerr.UnknownTopicOrPartition))
-}
-
-func TestExport_BrokerDown_RetriesUntilContextDone(t *testing.T) {
-	cluster := newTestCluster(t, "down_audit")
-	brokers := cluster.ListenAddrs()
-	cluster.Close()
-
-	provider := newTestProvider(t, brokers, "down_audit", "lz4")
-	defer provider.client.Close()
-
-	ctx, cancel := context.WithTimeout(context.Background(), 500*time.Millisecond)
-	defer cancel()
-
-	start := time.Now()
-	err := provider.export(ctx, []audittypes.AuditEvent{newTestEvent(coretypes.ResourceUser, coretypes.VerbCreate, "user created")})
-	require.Error(t, err)
-	assert.True(t, errors.Is(err, context.DeadlineExceeded))
-	assert.GreaterOrEqual(t, time.Since(start), 500*time.Millisecond)
-}
-
-func TestStop_DrainsQueuedEvents(t *testing.T) {
-	cluster := newTestCluster(t, "drain_audit")
-	provider := newTestProvider(t, cluster.ListenAddrs(), "drain_audit", "lz4")
-
-	done := make(chan error, 1)
-	go func() { done <- provider.Start(context.Background()) }()
-	<-provider.Healthy()
-
-	for range 7 {
-		provider.server.Add(context.Background(), newTestEvent(coretypes.ResourceUser, coretypes.VerbUpdate, "user updated"))
-	}
-
-	require.NoError(t, provider.Stop(context.Background()))
-	require.NoError(t, <-done)
-
-	records := consumeRecords(t, cluster.ListenAddrs(), "drain_audit", 7)
-	assert.NotEmpty(t, records)
-}
-
-func TestStop_BrokerDown_ClosesAfterShutdownTimeout(t *testing.T) {
-	cluster := newTestCluster(t, "stuck_audit")
-	brokers := cluster.ListenAddrs()
-	cluster.Close()
-
-	provider := newTestProvider(t, brokers, "stuck_audit", "lz4")
-	provider.config.Kafka.ShutdownTimeout = 500 * time.Millisecond
-
-	done := make(chan error, 1)
-	go func() { done <- provider.Start(context.Background()) }()
-	<-provider.Healthy()
-
-	for range 7 {
-		provider.server.Add(context.Background(), newTestEvent(coretypes.ResourceUser, coretypes.VerbUpdate, "user updated"))
-	}
-
-	start := time.Now()
-	require.NoError(t, provider.Stop(context.Background()))
-	require.NoError(t, <-done)
-	assert.GreaterOrEqual(t, time.Since(start), 500*time.Millisecond)
-	assert.Less(t, time.Since(start), 5*time.Second)
-}

ee/query-service/rules/anomaly.go

@@ -34,7 +34,8 @@ type AnomalyRule struct {
 
 	provider anomaly.Provider
 
-	logger *slog.Logger
+	version string
+	logger  *slog.Logger
 
 	seasonality anomaly.Seasonality
 }
@@ -62,6 +63,7 @@ func NewAnomalyRule(
 	r := AnomalyRule{
 		BaseRule: baseRule,
 		querier:  querier,
+		version:  p.Version,
 		logger:   logger.With(slog.String("rule.id", id)),
 	}
 
@@ -103,15 +105,15 @@ func (r *AnomalyRule) Type() ruletypes.RuleType {
 }
 
 func (r *AnomalyRule) prepareQueryRange(ctx context.Context, ts time.Time) *qbtypes.QueryRangeRequest {
-	startTs, endTs := r.Timestamps(ts)
-	start, end := startTs.UnixMilli(), endTs.UnixMilli()
-
 	r.logger.InfoContext(
 		ctx, "prepare query range request", slog.Int64("ts", ts.UnixMilli()),
-		slog.Int64("eval.window_ms", end-start),
+		slog.Int64("eval.window_ms", r.EvalWindow().Milliseconds()),
 		slog.Int64("eval.delay_ms", r.EvalDelay().Milliseconds()),
 	)
 
+	startTs, endTs := r.Timestamps(ts)
+	start, end := startTs.UnixMilli(), endTs.UnixMilli()
+
 	req := &qbtypes.QueryRangeRequest{
 		Start:       uint64(start),
 		End:         uint64(end),
@@ -418,10 +420,12 @@ func (r *AnomalyRule) Eval(ctx context.Context, ts time.Time) (int, error) {
 func (r *AnomalyRule) String() string {
 
 	ar := ruletypes.PostableRule{
-		AlertName:     valuer.NewDisplayName(r.Name()),
-		RuleCondition: r.Condition(),
-		Labels:        r.Labels().Map(),
-		Annotations:   r.Annotations().Map(),
+		AlertName:         valuer.NewDisplayName(r.Name()),
+		RuleCondition:     r.Condition(),
+		EvalWindow:        r.EvalWindow(),
+		Labels:            r.Labels().Map(),
+		Annotations:       r.Annotations().Map(),
+		PreferredChannels: r.PreferredChannels(),
 	}
 
 	byt, err := json.Marshal(ar)

ee/query-service/rules/anomaly_test.go

@@ -54,6 +54,9 @@ func TestAnomalyRule_NoData_AlertOnAbsent(t *testing.T) {
 			Frequency:  valuer.MustParseTextDuration("1m"),
 		}},
 		RuleCondition: &ruletypes.RuleCondition{
+			CompareOperator: ruletypes.ValueIsAbove,
+			MatchType:       ruletypes.AtleastOnce,
+			Target:          &target,
 			CompositeQuery: &ruletypes.AlertCompositeQuery{
 				QueryType: ruletypes.QueryTypeBuilder,
 				Queries: []qbtypes.QueryEnvelope{{
@@ -154,7 +157,10 @@ func TestAnomalyRule_NoData_AbsentFor(t *testing.T) {
 			Frequency:  valuer.MustParseTextDuration("1m"),
 		}},
 		RuleCondition: &ruletypes.RuleCondition{
-			AlertOnAbsent: true,
+			CompareOperator: ruletypes.ValueIsAbove,
+			MatchType:       ruletypes.AtleastOnce,
+			AlertOnAbsent:   true,
+			Target:          &target,
 			CompositeQuery: &ruletypes.AlertCompositeQuery{
 				QueryType: ruletypes.QueryTypeBuilder,
 				Queries: []qbtypes.QueryEnvelope{{

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

@@ -18,25 +18,15 @@
   "tooltip_email_to": "Enter email addresses separated by commas.",
   "tooltip_ms_teams_url": "The URL of the Microsoft Teams [webhook](https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498) to send alerts to. Learn more about Microsoft Teams integration in the docs [here](https://signoz.io/docs/alerts-management/notification-channel/ms-teams/).",
   "tooltip_google_chat_url": "The URL of the Google Chat space [incoming webhook](https://developers.google.com/workspace/chat/quickstart/webhooks) to send alerts to.",
-  "field_jira_deployment": "Jira deployment",
-  "option_jira_deployment_cloud": "Jira Cloud",
-  "option_jira_deployment_selfhosted": "Self-hosted Jira",
-  "jira_selfhosted_tip": "Works with Jira Data Center 8.14 and newer. Create the personal access token from a dedicated service user so issues aren't reported under a personal name.",
-  "jira_selfhosted_tip_link": "Learn how",
   "field_jira_site": "Site URL",
   "tooltip_jira_site": "Your Jira Cloud base URL, e.g. https://your-domain.atlassian.net, or a proxy in front of it.",
-  "tooltip_jira_site_selfhosted": "Your self-hosted Jira base URL, e.g. https://jira.your-company.com, or a proxy in front of it.",
-  "jira_required_fields": "Site URL, project and issue type are required",
-  "jira_cloud_credentials_required": "Email and API token are required for Jira Cloud",
-  "jira_pat_required": "A personal access token is required for self-hosted Jira",
+  "jira_required_fields": "Site URL, email, API token, project and issue type are required",
   "jira_service_account_tip": "Recommended: use a Jira service account so alerts aren't reported under a personal name and the channel keeps working when someone leaves.",
   "jira_service_account_tip_link": "Learn how",
   "field_jira_email": "Email",
   "help_jira_email": "The Atlassian account email used for authentication.",
   "field_jira_api_token": "API token",
   "help_jira_api_token": "Create one at id.atlassian.com under Security → API tokens.",
-  "field_jira_pat": "Personal access token",
-  "help_jira_pat": "Create one in Jira under your profile, Personal Access Tokens. Sent as a Bearer header.",
   "field_jira_project": "Project key",
   "field_jira_issue_type": "Issue type",
   "help_jira_issue_type": "An issue type that exists in the project, e.g. Task, Bug or Incident.",
@@ -44,7 +34,6 @@
   "help_jira_summary": "Template for the Jira issue title.",
   "field_jira_description": "Description",
   "help_jira_description": "Template for the issue description. Rendered as rich text with a status panel and links back to SigNoz.",
-  "help_jira_description_selfhosted": "Template for the issue description. Rendered as Jira wiki markup with a status panel and links back to SigNoz.",
   "jira_advanced_section": "Advanced Options",
   "field_jira_priority": "Priority",
   "placeholder_jira_priority": "Leave empty to use the project default",

frontend/public/locales/en/channels.json

@@ -26,25 +26,15 @@
   "tooltip_email_to": "Enter email addresses separated by commas.",
   "tooltip_ms_teams_url": "The URL of the Microsoft Teams [webhook](https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498) to send alerts to. Learn more about Microsoft Teams integration in the docs [here](https://signoz.io/docs/alerts-management/notification-channel/ms-teams/).",
   "tooltip_google_chat_url": "The URL of the Google Chat space [incoming webhook](https://developers.google.com/workspace/chat/quickstart/webhooks) to send alerts to.",
-  "field_jira_deployment": "Jira deployment",
-  "option_jira_deployment_cloud": "Jira Cloud",
-  "option_jira_deployment_selfhosted": "Self-hosted Jira",
-  "jira_selfhosted_tip": "Works with Jira Data Center 8.14 and newer. Create the personal access token from a dedicated service user so issues aren't reported under a personal name.",
-  "jira_selfhosted_tip_link": "Learn how",
   "field_jira_site": "Site URL",
   "tooltip_jira_site": "Your Jira Cloud base URL, e.g. https://your-domain.atlassian.net, or a proxy in front of it.",
-  "tooltip_jira_site_selfhosted": "Your self-hosted Jira base URL, e.g. https://jira.your-company.com, or a proxy in front of it.",
-  "jira_required_fields": "Site URL, project and issue type are required",
-  "jira_cloud_credentials_required": "Email and API token are required for Jira Cloud",
-  "jira_pat_required": "A personal access token is required for self-hosted Jira",
+  "jira_required_fields": "Site URL, email, API token, project and issue type are required",
   "jira_service_account_tip": "Recommended: use a Jira service account so alerts aren't reported under a personal name and the channel keeps working when someone leaves.",
   "jira_service_account_tip_link": "Learn how",
   "field_jira_email": "Email",
   "help_jira_email": "The Atlassian account email used for authentication.",
   "field_jira_api_token": "API token",
   "help_jira_api_token": "Create one at id.atlassian.com under Security → API tokens.",
-  "field_jira_pat": "Personal access token",
-  "help_jira_pat": "Create one in Jira under your profile, Personal Access Tokens. Sent as a Bearer header.",
   "field_jira_project": "Project key",
   "field_jira_issue_type": "Issue type",
   "help_jira_issue_type": "An issue type that exists in the project, e.g. Task, Bug or Incident.",
@@ -52,7 +42,6 @@
   "help_jira_summary": "Template for the Jira issue title.",
   "field_jira_description": "Description",
   "help_jira_description": "Template for the issue description. Rendered as rich text with a status panel and links back to SigNoz.",
-  "help_jira_description_selfhosted": "Template for the issue description. Rendered as Jira wiki markup with a status panel and links back to SigNoz.",
   "jira_advanced_section": "Advanced Options",
   "field_jira_priority": "Priority",
   "placeholder_jira_priority": "Leave empty to use the project default",

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

@@ -45,6 +45,7 @@ import type {
 	GetRuleHistoryTopContributorsParams,
 	GetRuleHistoryTopContributorsPathParameters,
 	ListRuleViews200,
+	ListRules200,
 	ListRulesV3200,
 	ListRulesV3Params,
 	PatchRuleByID200,
@@ -426,6 +427,85 @@ export const useUpdateRuleView = <
 > => {
 	return useMutation(getUpdateRuleViewMutationOptions(options));
 };
+/**
+ * This endpoint lists all alert rules with their current evaluation state. Deprecated: use ListRulesV3, which supports filtering, sorting and pagination.
+ * @deprecated
+ * @summary List alert rules
+ */
+export const listRules = (signal?: AbortSignal) => {
+	return GeneratedAPIInstance<ListRules200>({
+		url: `/api/v2/rules`,
+		method: 'GET',
+		signal,
+	});
+};
+
+export const getListRulesQueryKey = () => {
+	return [`/api/v2/rules`] as const;
+};
+
+export const getListRulesQueryOptions = <
+	TData = Awaited<ReturnType<typeof listRules>>,
+	TError = ErrorType<RenderErrorResponseDTO>,
+>(options?: {
+	query?: UseQueryOptions<Awaited<ReturnType<typeof listRules>>, TError, TData>;
+}) => {
+	const { query: queryOptions } = options ?? {};
+
+	const queryKey = queryOptions?.queryKey ?? getListRulesQueryKey();
+
+	const queryFn: QueryFunction<Awaited<ReturnType<typeof listRules>>> = ({
+		signal,
+	}) => listRules(signal);
+
+	return { queryKey, queryFn, ...queryOptions } as UseQueryOptions<
+		Awaited<ReturnType<typeof listRules>>,
+		TError,
+		TData
+	> & { queryKey: QueryKey };
+};
+
+export type ListRulesQueryResult = NonNullable<
+	Awaited<ReturnType<typeof listRules>>
+>;
+export type ListRulesQueryError = ErrorType<RenderErrorResponseDTO>;
+
+/**
+ * @deprecated
+ * @summary List alert rules
+ */
+
+export function useListRules<
+	TData = Awaited<ReturnType<typeof listRules>>,
+	TError = ErrorType<RenderErrorResponseDTO>,
+>(options?: {
+	query?: UseQueryOptions<Awaited<ReturnType<typeof listRules>>, TError, TData>;
+}): UseQueryResult<TData, TError> & { queryKey: QueryKey } {
+	const queryOptions = getListRulesQueryOptions(options);
+
+	const query = useQuery(queryOptions) as UseQueryResult<TData, TError> & {
+		queryKey: QueryKey;
+	};
+
+	return withQueryKey(query, queryOptions.queryKey);
+}
+
+/**
+ * @deprecated
+ * @summary List alert rules
+ */
+export const invalidateListRules = async (
+	queryClient: QueryClient,
+	options?: InvalidateOptions,
+): Promise<QueryClient> => {
+	await queryClient.invalidateQueries(
+		{ queryKey: getListRulesQueryKey() },
+		options,
+	);
+
+	return queryClient;
+};
+
 /**
  * This endpoint creates a new alert rule
  * @summary Create alert rule

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

@@ -829,37 +829,6 @@ export interface AlertmanagertypesChannelConfigVariantGithubComSigNozSignozPkgTy
 export enum AlertmanagertypesChannelConfigVariantGithubComSigNozSignozPkgTypesAlertmanagertypesChannelJiraConfigDTOKind {
 	jira = 'jira',
 }
-export interface AlertmanagertypesChannelJiraCloudAuthDTO {
-	/**
-	 * @type string
-	 * @format password
-	 * @description The Atlassian API token paired with email. A secret; returned by create, update and fetch by ID, never by list.
-	 */
-	apiToken: string;
-	/**
-	 * @type string
-	 * @description The Atlassian account email used for basic auth.
-	 */
-	email: string;
-}
-
-export interface AlertmanagertypesChannelJiraSelfHostedAuthDTO {
-	/**
-	 * @type string
-	 * @format password
-	 * @description The Jira personal access token, sent as a Bearer header. A secret; returned by create, update and fetch by ID, never by list.
-	 */
-	pat: string;
-}
-
-export type AlertmanagertypesChannelJiraAuthDTO =
-	| AlertmanagertypesChannelJiraCloudAuthDTO
-	| AlertmanagertypesChannelJiraSelfHostedAuthDTO;
-
-export enum AlertmanagertypesJiraDeploymentDTO {
-	cloud = 'cloud',
-	selfhosted = 'selfhosted',
-}
 /**
  * Extra issue fields keyed by Jira field ID. Stored, but not currently included in the issue Jira receives.
  */
@@ -875,23 +844,26 @@ export type AlertmanagertypesChannelJiraConfigDTOCustomFields = Alertmanagertype
 
 export interface AlertmanagertypesChannelJiraConfigDTO {
 	/**
-	 * @description The credentials: email and apiToken when deployment is cloud, pat when deployment is selfhosted.
+	 * @type string
+	 * @format password
+	 * @description The Atlassian API token paired with email. A secret; returned by create, update and fetch by ID, never by list.
 	 */
-	auth: AlertmanagertypesChannelJiraAuthDTO;
+	apiToken: string;
 	/**
 	 * @type object,null
 	 * @description Extra issue fields keyed by Jira field ID. Stored, but not currently included in the issue Jira receives.
 	 */
 	customFields?: AlertmanagertypesChannelJiraConfigDTOCustomFields;
-	/**
-	 * @description The Jira edition: cloud for an Atlassian-hosted site, selfhosted for Jira Server or Data Center.
-	 */
-	deployment: AlertmanagertypesJiraDeploymentDTO;
 	/**
 	 * @type string
 	 * @description Alertmanager template for the issue description, rendered as markdown; defaults to the SigNoz Jira default.
 	 */
 	description?: string;
+	/**
+	 * @type string
+	 * @description The Atlassian account email used for basic auth.
+	 */
+	email: string;
 	/**
 	 * @type string
 	 * @description The issue type name, such as Bug.
@@ -934,7 +906,7 @@ export interface AlertmanagertypesChannelJiraConfigDTO {
 	sendResolved?: boolean | null;
 	/**
 	 * @type string
-	 * @description The base URL of the Jira site, for example https://example.atlassian.net or https://jira.example.com.
+	 * @description The base URL of the Jira Cloud site, for example https://example.atlassian.net. Only Jira Cloud is supported.
 	 */
 	site: string;
 	/**
@@ -1744,17 +1716,13 @@ export interface AlertmanagertypesJiraReceiverConfigDTO {
 	 * @description Extra issue fields keyed by Jira field ID. Stored, but not currently included in the issue Jira receives.
 	 */
 	custom_fields?: AlertmanagertypesJiraReceiverConfigDTOCustomFields;
-	/**
-	 * @description The Jira edition, cloud or selfhosted; defaults to cloud.
-	 */
-	deployment?: AlertmanagertypesJiraDeploymentDTO;
 	/**
 	 * @type string
 	 * @description Alertmanager template for the issue description.
 	 */
 	description?: string;
 	/**
-	 * @description HTTP client settings; basic auth carries the account email and API token on cloud, authorization carries the Bearer personal access token on self-hosted.
+	 * @description HTTP client settings; basic auth carries the account email and API token.
 	 */
 	http_config?: ConfigHTTPClientConfigDTO;
 	/**
@@ -1797,7 +1765,7 @@ export interface AlertmanagertypesJiraReceiverConfigDTO {
 	send_resolved?: boolean;
 	/**
 	 * @type string
-	 * @description The Jira base URL.
+	 * @description The Jira Cloud base URL.
 	 */
 	site?: string;
 	/**
@@ -5305,7 +5273,7 @@ export interface DashboardtypesAIBuilderQuerySpecDTO {
 	bucketOptions?: Querybuildertypesv5BucketOptionsDTO;
 	/**
 	 * @type string
-	 * @description The opaque nextCursor value from a previous raw result, used to fetch the next page. Honored only by raw requests whose order starts with timestamp, for logs followed by id in the same direction; every other request ignores it.
+	 * @description The opaque nextCursor value from a previous raw result, used to fetch the next page.
 	 */
 	cursor?: string;
 	/**
@@ -5338,7 +5306,7 @@ export interface DashboardtypesAIBuilderQuerySpecDTO {
 	legend?: string;
 	/**
 	 * @type integer
-	 * @description The maximum number of rows for raw and trace requests, or of series or rows for grouped scalar and time_series requests, keeping the top entries by order. When 0, scalar and time_series requests are unlimited, raw requests ordered by timestamp return a page of 10000 rows to continue with nextCursor, and other raw and trace requests return 100 rows.
+	 * @description The maximum number of rows for raw requests, or of series or rows for grouped aggregations, keeping the top entries by order. When 0, aggregations are unlimited while raw requests ordered by timestamp return a page of 10000 rows; follow nextCursor for the rest.
 	 */
 	limit?: number;
 	/**
@@ -5352,7 +5320,7 @@ export interface DashboardtypesAIBuilderQuerySpecDTO {
 	name?: string;
 	/**
 	 * @type integer
-	 * @description The number of rows for raw and trace requests, or of ordered series or rows for scalar and time_series requests, to skip before the page starts. Requires limit. On raw requests the skip counts from where a cursor resumes, and the skipped rows are still read, so prefer cursor for paging.
+	 * @description The number of rows to skip before returning results. Prefer cursor for raw requests.
 	 */
 	offset?: number;
 	/**
@@ -5697,7 +5665,7 @@ export interface Querybuildertypesv5QueryBuilderQueryGithubComSigNozSignozPkgTyp
 	bucketOptions?: Querybuildertypesv5BucketOptionsDTO;
 	/**
 	 * @type string
-	 * @description The opaque nextCursor value from a previous raw result, used to fetch the next page. Honored only by raw requests whose order starts with timestamp, for logs followed by id in the same direction; every other request ignores it.
+	 * @description The opaque nextCursor value from a previous raw result, used to fetch the next page.
 	 */
 	cursor?: string;
 	/**
@@ -5730,7 +5698,7 @@ export interface Querybuildertypesv5QueryBuilderQueryGithubComSigNozSignozPkgTyp
 	legend?: string;
 	/**
 	 * @type integer
-	 * @description The maximum number of rows for raw and trace requests, or of series or rows for grouped scalar and time_series requests, keeping the top entries by order. When 0, scalar and time_series requests are unlimited, raw requests ordered by timestamp return a page of 10000 rows to continue with nextCursor, and other raw and trace requests return 100 rows.
+	 * @description The maximum number of rows for raw requests, or of series or rows for grouped aggregations, keeping the top entries by order. When 0, aggregations are unlimited while raw requests ordered by timestamp return a page of 10000 rows; follow nextCursor for the rest.
 	 */
 	limit?: number;
 	/**
@@ -5744,7 +5712,7 @@ export interface Querybuildertypesv5QueryBuilderQueryGithubComSigNozSignozPkgTyp
 	name?: string;
 	/**
 	 * @type integer
-	 * @description The number of rows for raw and trace requests, or of ordered series or rows for scalar and time_series requests, to skip before the page starts. Requires limit. On raw requests the skip counts from where a cursor resumes, and the skipped rows are still read, so prefer cursor for paging.
+	 * @description The number of rows to skip before returning results. Prefer cursor for raw requests.
 	 */
 	offset?: number;
 	/**
@@ -5877,7 +5845,7 @@ export interface Querybuildertypesv5QueryBuilderQueryGithubComSigNozSignozPkgTyp
 	bucketOptions?: Querybuildertypesv5BucketOptionsDTO;
 	/**
 	 * @type string
-	 * @description The opaque nextCursor value from a previous raw result, used to fetch the next page. Honored only by raw requests whose order starts with timestamp, for logs followed by id in the same direction; every other request ignores it.
+	 * @description The opaque nextCursor value from a previous raw result, used to fetch the next page.
 	 */
 	cursor?: string;
 	/**
@@ -5910,7 +5878,7 @@ export interface Querybuildertypesv5QueryBuilderQueryGithubComSigNozSignozPkgTyp
 	legend?: string;
 	/**
 	 * @type integer
-	 * @description The maximum number of rows for raw and trace requests, or of series or rows for grouped scalar and time_series requests, keeping the top entries by order. When 0, scalar and time_series requests are unlimited, raw requests ordered by timestamp return a page of 10000 rows to continue with nextCursor, and other raw and trace requests return 100 rows.
+	 * @description The maximum number of rows for raw requests, or of series or rows for grouped aggregations, keeping the top entries by order. When 0, aggregations are unlimited while raw requests ordered by timestamp return a page of 10000 rows; follow nextCursor for the rest.
 	 */
 	limit?: number;
 	/**
@@ -5924,7 +5892,7 @@ export interface Querybuildertypesv5QueryBuilderQueryGithubComSigNozSignozPkgTyp
 	name?: string;
 	/**
 	 * @type integer
-	 * @description The number of rows for raw and trace requests, or of ordered series or rows for scalar and time_series requests, to skip before the page starts. Requires limit. On raw requests the skip counts from where a cursor resumes, and the skipped rows are still read, so prefer cursor for paging.
+	 * @description The number of rows to skip before returning results. Prefer cursor for raw requests.
 	 */
 	offset?: number;
 	/**
@@ -5976,7 +5944,7 @@ export interface Querybuildertypesv5QueryBuilderQueryGithubComSigNozSignozPkgTyp
 	bucketOptions?: Querybuildertypesv5BucketOptionsDTO;
 	/**
 	 * @type string
-	 * @description The opaque nextCursor value from a previous raw result, used to fetch the next page. Honored only by raw requests whose order starts with timestamp, for logs followed by id in the same direction; every other request ignores it.
+	 * @description The opaque nextCursor value from a previous raw result, used to fetch the next page.
 	 */
 	cursor?: string;
 	/**
@@ -6009,7 +5977,7 @@ export interface Querybuildertypesv5QueryBuilderQueryGithubComSigNozSignozPkgTyp
 	legend?: string;
 	/**
 	 * @type integer
-	 * @description The maximum number of rows for raw and trace requests, or of series or rows for grouped scalar and time_series requests, keeping the top entries by order. When 0, scalar and time_series requests are unlimited, raw requests ordered by timestamp return a page of 10000 rows to continue with nextCursor, and other raw and trace requests return 100 rows.
+	 * @description The maximum number of rows for raw requests, or of series or rows for grouped aggregations, keeping the top entries by order. When 0, aggregations are unlimited while raw requests ordered by timestamp return a page of 10000 rows; follow nextCursor for the rest.
 	 */
 	limit?: number;
 	/**
@@ -6023,7 +5991,7 @@ export interface Querybuildertypesv5QueryBuilderQueryGithubComSigNozSignozPkgTyp
 	name?: string;
 	/**
 	 * @type integer
-	 * @description The number of rows for raw and trace requests, or of ordered series or rows for scalar and time_series requests, to skip before the page starts. Requires limit. On raw requests the skip counts from where a cursor resumes, and the skipped rows are still read, so prefer cursor for paging.
+	 * @description The number of rows to skip before returning results. Prefer cursor for raw requests.
 	 */
 	offset?: number;
 	/**
@@ -6969,7 +6937,6 @@ export enum Querybuildertypesv5RequestTypeDTO {
 	raw_stream = 'raw_stream',
 	trace = 'trace',
 	heatmap = 'heatmap',
-	distribution = 'distribution',
 }
 /**
  * The query kind.
@@ -7079,7 +7046,7 @@ export interface Querybuildertypesv5QueryBuilderFormulaDTO {
 	 */
 	functions?: Querybuildertypesv5FunctionDTO[] | null;
 	/**
-	 * @description A filter on the formula values, referencing the formula by its name or as __result, for example F1 > 0. A time series keeps only the points that match and drops a series with none left; a scalar result keeps only the rows that match.
+	 * @description Accepted but currently ignored; the computed values are returned unfiltered.
 	 */
 	having?: Querybuildertypesv5HavingDTO;
 	/**
@@ -7097,11 +7064,6 @@ export interface Querybuildertypesv5QueryBuilderFormulaDTO {
 	 * @description The unique name of the formula, such as F1, used by selectedQueryName and by panels. Referencing a formula from another formula is not reliable.
 	 */
 	name?: string;
-	/**
-	 * @type integer
-	 * @description The number of ordered series or rows to skip before the page starts. Requires limit.
-	 */
-	offset?: number;
 	/**
 	 * @type array,null
 	 * @description The sort order of the formula result.
@@ -7184,7 +7146,7 @@ export interface Querybuildertypesv5QueryBuilderTraceOperatorDTO {
 	name?: string;
 	/**
 	 * @type integer
-	 * @description The number of raw or trace rows, or of ordered series or rows for time_series and scalar requests, to skip before the page starts. Requires limit.
+	 * @description The number of raw results to skip before returning. Aggregation requests ignore it.
 	 */
 	offset?: number;
 	/**
@@ -11011,7 +10973,7 @@ export interface Querybuildertypesv5TimeSeriesValueDTO {
 	value?: number;
 	/**
 	 * @type array
-	 * @description The per-bucket counts for heatmap results, in the order of meta.buckets plus a trailing overflow count.
+	 * @description The per-band counts for heatmap results, in the order of meta.buckets plus a trailing overflow count.
 	 */
 	values?: number[];
 }
@@ -11632,7 +11594,7 @@ export interface PromotetypesPostableIndexMaterializedPathsDTO {
 export interface Querybuildertypesv5AggregationMetaDTO {
 	/**
 	 * @type array
-	 * @description The ascending upper bounds of the value buckets, set for heatmap and distribution results; each point then carries one count per bound plus a trailing overflow count in values. The first bucket starts at -Inf when its bound is at or under zero, else at zero.
+	 * @description The ascending upper bounds of the value bands, set only for heatmap results; each point then carries one count per bound plus a trailing overflow count in values.
 	 */
 	buckets?: number[];
 	/**
@@ -11753,91 +11715,6 @@ export interface Querybuildertypesv5ColumnDescriptorDTO {
 	unit?: string;
 }
 
-export interface Querybuildertypesv5DistributionDTO {
-	/**
-	 * @type array,null
-	 * @description One count per bound in meta.buckets plus a trailing overflow count, summed over every step of the requested time range.
-	 */
-	counts: number[] | null;
-	/**
-	 * @type array
-	 * @description The group-by field values that identify this distribution.
-	 */
-	labels?: Querybuildertypesv5LabelDTO[];
-}
-
-export interface Querybuildertypesv5DistributionPercentilesDTO {
-	/**
-	 * @type number
-	 * @format double
-	 * @description The 50th percentile.
-	 */
-	p50: number;
-	/**
-	 * @type number
-	 * @format double
-	 * @description The 75th percentile.
-	 */
-	p75: number;
-	/**
-	 * @type number
-	 * @format double
-	 * @description The 90th percentile.
-	 */
-	p90: number;
-	/**
-	 * @type number
-	 * @format double
-	 * @description The 95th percentile.
-	 */
-	p95: number;
-	/**
-	 * @type number
-	 * @format double
-	 * @description The 99th percentile.
-	 */
-	p99: number;
-}
-
-export interface Querybuildertypesv5DistributionAggregationDTO {
-	/**
-	 * @type string
-	 * @description The alias of the aggregation, or the internal name __result_N, with N its index, when no alias was given.
-	 */
-	alias: string;
-	/**
-	 * @type array,null
-	 * @description One distribution per group-by combination.
-	 */
-	distributions: Querybuildertypesv5DistributionDTO[] | null;
-	/**
-	 * @type integer
-	 * @description The zero-based position of the aggregation in the query.
-	 */
-	index: number;
-	/**
-	 * @description Display metadata for the aggregation, including the bucket upper bounds the counts are positional against.
-	 */
-	meta?: Querybuildertypesv5AggregationMetaDTO;
-	/**
-	 * @description Percentiles over the counts of every distribution added together, estimated the way histogram_quantile does by interpolating linearly within the bucket each rank falls in. Omitted when nothing was counted or meta.buckets is empty.
-	 */
-	percentiles?: Querybuildertypesv5DistributionPercentilesDTO;
-}
-
-export interface Querybuildertypesv5DistributionDataDTO {
-	/**
-	 * @type array,null
-	 * @description One entry per aggregation of the query. The order is not guaranteed; match entries to aggregations by index.
-	 */
-	aggregations: Querybuildertypesv5DistributionAggregationDTO[] | null;
-	/**
-	 * @type string
-	 * @description The name of the query that produced this result.
-	 */
-	queryName: string;
-}
-
 /**
  * The step interval in seconds that was used for each query, keyed by query name.
  */
@@ -12093,28 +11970,21 @@ export type Querybuildertypesv5QueryDataDTO =
 	| (Querybuildertypesv5TimeSeriesDataDTO & {
 			/**
 			 * @type array,null
-			 * @description One result per enabled query, typed by the request type: TimeSeriesData for time_series and heatmap, ScalarData for scalar, RawData for raw and DistributionData for distribution requests.
+			 * @description One result per enabled query, typed by the request type: TimeSeriesData for time_series, ScalarData for scalar and RawData for raw requests.
 			 */
 			results?: unknown[] | null;
 	  })
 	| (Querybuildertypesv5ScalarDataDTO & {
 			/**
 			 * @type array,null
-			 * @description One result per enabled query, typed by the request type: TimeSeriesData for time_series and heatmap, ScalarData for scalar, RawData for raw and DistributionData for distribution requests.
+			 * @description One result per enabled query, typed by the request type: TimeSeriesData for time_series, ScalarData for scalar and RawData for raw requests.
 			 */
 			results?: unknown[] | null;
 	  })
 	| (Querybuildertypesv5RawDataDTO & {
 			/**
 			 * @type array,null
-			 * @description One result per enabled query, typed by the request type: TimeSeriesData for time_series and heatmap, ScalarData for scalar, RawData for raw and DistributionData for distribution requests.
-			 */
-			results?: unknown[] | null;
-	  })
-	| (Querybuildertypesv5DistributionDataDTO & {
-			/**
-			 * @type array,null
-			 * @description One result per enabled query, typed by the request type: TimeSeriesData for time_series and heatmap, ScalarData for scalar, RawData for raw and DistributionData for distribution requests.
+			 * @description One result per enabled query, typed by the request type: TimeSeriesData for time_series, ScalarData for scalar and RawData for raw requests.
 			 */
 			results?: unknown[] | null;
 	  });
@@ -12248,7 +12118,7 @@ export interface Querybuildertypesv5QueryRangeRequestDTO {
 }
 
 /**
- * Response from the v5 query range endpoint. The data.results array contains typed results depending on the requestType: TimeSeriesData for time_series and heatmap, ScalarData for scalar, RawData for raw, or DistributionData for distribution requests.
+ * Response from the v5 query range endpoint. The data.results array contains typed results depending on the requestType: TimeSeriesData for time_series, ScalarData for scalar, or RawData for raw requests.
  */
 export interface Querybuildertypesv5QueryRangeResponseDTO {
 	/**
@@ -12966,10 +12836,23 @@ export interface RuletypesRuleConditionDTO {
 	 * @description Whether to fire a nodata alert when the query returns no data. Defaults to false.
 	 */
 	alertOnAbsent?: boolean;
+	/**
+	 * @type string
+	 * @description anomaly_rule only: the anomaly detection algorithm. The supported value is standard.
+	 */
+	algorithm?: string;
 	/**
 	 * @description The queries whose result is compared against the thresholds.
 	 */
 	compositeQuery: RuletypesAlertCompositeQueryDTO;
+	/**
+	 * @description schemaVersion v1 only: which points in the window must satisfy op. Accepted as at_least_once, all_the_times, on_average, in_total or last, their aliases avg and sum, or the legacy codes as strings, '1' to '5'. Required for v1; v2alpha1 sets matchType on each threshold.
+	 */
+	matchType?: RuletypesMatchTypeDTO;
+	/**
+	 * @description schemaVersion v1 only: how the value is compared with target. Accepted as above, below, equal, not_equal, above_or_equal, below_or_equal or outside_bounds, their symbols, or the legacy codes as strings, '1' to '7'. Required for v1; v2alpha1 sets op on each threshold.
+	 */
+	op?: RuletypesCompareOperatorDTO;
 	/**
 	 * @type boolean
 	 * @description Whether a series is skipped until it has at least requiredNumPoints points in the window. Defaults to false.
@@ -12989,6 +12872,17 @@ export interface RuletypesRuleConditionDTO {
 	 * @description The name of the query whose result is evaluated, such as A or F1. Must match a query in compositeQuery.
 	 */
 	selectedQueryName: string;
+	/**
+	 * @type number,null
+	 * @format double
+	 * @description schemaVersion v1 only: the value compared against, in targetUnit. Required for v1; v2alpha1 sets target on each threshold.
+	 */
+	target?: number | null;
+	/**
+	 * @type string
+	 * @description schemaVersion v1 only: the unit of target, such as percent or ms. Converted to compositeQuery.unit before comparison when the two differ.
+	 */
+	targetUnit?: string;
 	/**
 	 * @description The thresholds to evaluate, as a kind and spec.
 	 */
@@ -13024,10 +12918,20 @@ export interface RuletypesPostableRuleDTO {
 	 * @description Whether the rule is paused. A disabled rule is neither evaluated nor notifies. Defaults to false.
 	 */
 	disabled?: boolean;
+	/**
+	 * @type string
+	 * @description The lookback window as a Go duration such as 5m. Only read when schemaVersion is v1, defaulting to 5m; v2alpha1 rules set it in evaluation.spec instead.
+	 */
+	evalWindow?: string;
 	/**
 	 * @description The evaluation window, as a kind and spec.
 	 */
 	evaluation: RuletypesEvaluationEnvelopeDTO;
+	/**
+	 * @type string
+	 * @description How often the rule is evaluated, as a Go duration such as 1m. Only read when schemaVersion is v1, defaulting to 1m; v2alpha1 rules set it in evaluation.spec instead.
+	 */
+	frequency?: string;
 	/**
 	 * @type object
 	 * @description Labels attached to every alert the rule fires. Keys match [a-zA-Z_.][a-zA-Z0-9_.]*; values may use Go templates such as {{$labels.service_name}}. severity is the conventional routing label.
@@ -13037,6 +12941,11 @@ export interface RuletypesPostableRuleDTO {
 	 * @description Grouping, re-notification and routing behaviour.
 	 */
 	notificationSettings: RuletypesNotificationSettingsDTO;
+	/**
+	 * @type array
+	 * @description The displayName of each notification channel to notify, for schemaVersion v1 rules. Ignored for v2alpha1, where each threshold carries its own channels.
+	 */
+	preferredChannels?: string[];
 	/**
 	 * @description The evaluation strategy: threshold_rule compares against thresholds, promql_rule evaluates a PromQL expression, anomaly_rule scores deviation from seasonal history. Defaults to threshold_rule for builder and clickhouse_sql queries and is forced to promql_rule for promql queries.
 	 */
@@ -13121,10 +13030,20 @@ export interface RuletypesRuleDTO {
 	 * @description Whether the rule is paused. A disabled rule is neither evaluated nor notifies. Defaults to false.
 	 */
 	disabled?: boolean;
+	/**
+	 * @type string
+	 * @description The lookback window as a Go duration such as 5m. Only read when schemaVersion is v1, defaulting to 5m; v2alpha1 rules set it in evaluation.spec instead.
+	 */
+	evalWindow?: string;
 	/**
 	 * @description The evaluation window, as a kind and spec.
 	 */
 	evaluation: RuletypesEvaluationEnvelopeDTO;
+	/**
+	 * @type string
+	 * @description How often the rule is evaluated, as a Go duration such as 1m. Only read when schemaVersion is v1, defaulting to 1m; v2alpha1 rules set it in evaluation.spec instead.
+	 */
+	frequency?: string;
 	/**
 	 * @type string
 	 * @description The unique identifier of the rule.
@@ -13139,6 +13058,11 @@ export interface RuletypesRuleDTO {
 	 * @description Grouping, re-notification and routing behaviour.
 	 */
 	notificationSettings: RuletypesNotificationSettingsDTO;
+	/**
+	 * @type array
+	 * @description The displayName of each notification channel to notify, for schemaVersion v1 rules. Ignored for v2alpha1, where each threshold carries its own channels.
+	 */
+	preferredChannels?: string[];
 	/**
 	 * @description The evaluation strategy: threshold_rule compares against thresholds, promql_rule evaluates a PromQL expression, anomaly_rule scores deviation from seasonal history. Defaults to threshold_rule for builder and clickhouse_sql queries and is forced to promql_rule for promql queries.
 	 */
@@ -16729,6 +16653,17 @@ export type UpdateRuleView200 = {
 	status: string;
 };
 
+export type ListRules200 = {
+	/**
+	 * @type array
+	 */
+	data: RuletypesRuleDTO[];
+	/**
+	 * @type string
+	 */
+	status: string;
+};
+
 export type CreateRule201 = {
 	data: RuletypesRuleDTO;
 	/**

frontend/src/components/ListFilter/FilterZone/FilterChips.tsx

@@ -1,100 +0,0 @@
-import { ConfigProvider, Select } from 'antd';
-import { Checkbox } from '@signozhq/ui/checkbox';
-import cx from 'classnames';
-
-import type { UpdatedWindow } from '../dsl/types';
-import type { CreatorOption } from '../types';
-import { UPDATED_OPTIONS } from './constants';
-
-import styles from './FilterZone.module.scss';
-
-// The option checkbox already marks selection, so selected rows stay regular weight.
-const CREATOR_SELECT_THEME = {
-	components: { Select: { optionSelectedFontWeight: 400 } },
-};
-
-interface Props {
-	createdBy: string[];
-	updated: UpdatedWindow;
-	creatorOptions: CreatorOption[];
-	onCreatedByChange: (emails: string[]) => void;
-	onUpdatedChange: (window: UpdatedWindow) => void;
-	// Run the staged draft — fired when a dropdown closes.
-	onApply: () => void;
-	// Clear all Created-by selections and run immediately.
-	onClearCreatedBy: () => void;
-	// Ids: `${testIdPrefix}-filter-created-by`, `-filter-updated`.
-	testIdPrefix: string;
-	disabled?: boolean;
-}
-
-function FilterChips({
-	createdBy,
-	updated,
-	creatorOptions,
-	onCreatedByChange,
-	onUpdatedChange,
-	onApply,
-	onClearCreatedBy,
-	testIdPrefix,
-	disabled = false,
-}: Props): JSX.Element {
-	const creatorOptionsData = creatorOptions.map((o) => ({
-		value: o.email,
-		label: o.label,
-	}));
-
-	const runOnClose = (open: boolean): void => {
-		if (!open) {
-			onApply();
-		}
-	};
-
-	return (
-		<div className={styles.chips}>
-			<ConfigProvider theme={CREATOR_SELECT_THEME}>
-				<Select
-					mode="multiple"
-					showSearch
-					allowClear
-					className={cx(styles.select, styles.selectWide)}
-					placeholder="Created by"
-					value={createdBy}
-					options={creatorOptionsData}
-					optionFilterProp="label"
-					maxTagCount={1}
-					menuItemSelectedIcon={null}
-					data-testid={`${testIdPrefix}-filter-created-by`}
-					disabled={disabled}
-					onClear={onClearCreatedBy}
-					optionRender={(option): JSX.Element => (
-						<div className={styles.creatorOption}>
-							<div className={styles.creatorCheck}>
-								<Checkbox
-									color="primary"
-									value={createdBy.includes(option.value as string)}
-								/>
-							</div>
-							<span className={styles.creatorLabel}>{option.label}</span>
-						</div>
-					)}
-					onChange={(value): void => onCreatedByChange(value as string[])}
-					onDropdownVisibleChange={runOnClose}
-				/>
-			</ConfigProvider>
-			<Select
-				showSearch
-				className={cx(styles.select, styles.selectNarrow)}
-				placeholder="Updated"
-				value={updated}
-				options={UPDATED_OPTIONS}
-				optionFilterProp="label"
-				data-testid={`${testIdPrefix}-filter-updated`}
-				disabled={disabled}
-				onChange={(value): void => onUpdatedChange(value as UpdatedWindow)}
-			/>
-		</div>
-	);
-}
-
-export default FilterChips;

frontend/src/components/ListFilter/FilterZone/FilterZone.tsx

@@ -1,166 +0,0 @@
-import type { ReactElement, ReactNode } from 'react';
-import { Button } from '@signozhq/ui/button';
-import { Typography } from '@signozhq/ui/typography';
-import { X } from '@signozhq/icons';
-
-import type { DslGrammar, SuggestionSource } from '../dsl/types';
-import SearchBar from '../SearchBar/SearchBar';
-import type {
-	CreatorOption,
-	FilterAppliedPayload,
-	FilterAppliedType,
-} from '../types';
-import FilterChips from './FilterChips';
-import { useFilterZoneDraft } from './useFilterZoneDraft';
-
-import styles from './FilterZone.module.scss';
-
-interface Props {
-	// The last-run query (source of truth for fetching + the dirty baseline).
-	query: string;
-	grammar: DslGrammar;
-	// Ids: `${testIdPrefix}-search-zone`, `-list-search*`, `-filter-zone`,
-	// `-filter-clear`, `-filter-created-by`, `-filter-updated`, `-query-error`.
-	testIdPrefix: string;
-	creatorOptions: CreatorOption[];
-	source: SuggestionSource;
-	// Commit (run) the draft — the only path that triggers a fetch.
-	onQueryChange: (value: string) => void;
-	placeholder?: string;
-	// Rendered at the end of the search row (e.g. the New Dashboard action).
-	rightSlot?: ReactNode;
-	// Rendered in the filters row after the chips.
-	extraFilters?: ReactNode;
-	// Shows Clear even when the query is empty.
-	hasExtraFilters?: boolean;
-	// Called by Clear after it empties the query.
-	onClearAll?: () => void;
-	// Shown under the search row.
-	error?: string;
-	// Wraps the search box and the filter controls (e.g. in an authz tooltip).
-	wrapControl?: (node: ReactElement) => ReactElement;
-	onSubmitted?: (hasQuery: boolean) => void;
-	onFilterApplied?: (
-		filterType: FilterAppliedType,
-		payload: FilterAppliedPayload,
-	) => void;
-	onCleared?: () => void;
-	/** Filtering needs `list`: the box and chips edit a query that cannot be run. */
-	disabled?: boolean;
-}
-
-const identity = (node: ReactElement): ReactElement => node;
-
-// The filter command zone: a draft DSL query box (run with Cmd/Ctrl+Enter or the
-// Run button; a dirty dot signals unrun changes) plus Created-by / Updated chips.
-function FilterZone({
-	query,
-	grammar,
-	testIdPrefix,
-	creatorOptions,
-	source,
-	onQueryChange,
-	placeholder,
-	rightSlot,
-	extraFilters,
-	hasExtraFilters = false,
-	onClearAll,
-	error,
-	wrapControl = identity,
-	onSubmitted,
-	onFilterApplied,
-	onCleared,
-	disabled = false,
-}: Props): JSX.Element {
-	const {
-		draft,
-		setDraft,
-		reflected,
-		dirty,
-		isEmpty,
-		run,
-		handleCreatedByChange,
-		handleUpdatedChange,
-		handleClearCreatedBy,
-		handleClear,
-	} = useFilterZoneDraft({
-		query,
-		onQueryChange,
-		onFilterApplied,
-		onCleared,
-		onClearAll,
-	});
-
-	return (
-		<div className={styles.filterZone}>
-			<div className={styles.searchRow}>
-				{wrapControl(
-					<div
-						className={styles.searchInput}
-						data-testid={`${testIdPrefix}-search-zone`}
-					>
-						<SearchBar
-							value={draft}
-							grammar={grammar}
-							testIdPrefix={`${testIdPrefix}-list-search`}
-							placeholder={placeholder}
-							source={source}
-							dirty={dirty}
-							disabled={disabled}
-							onChange={setDraft}
-							onSubmit={run}
-							onSubmitted={onSubmitted}
-						/>
-					</div>,
-				)}
-				{rightSlot}
-			</div>
-			{error && (
-				<Typography.Text
-					className={styles.error}
-					testId={`${testIdPrefix}-query-error`}
-				>
-					{error}
-				</Typography.Text>
-			)}
-			<div className={styles.filtersRow}>
-				<Typography.Text className={styles.filtersLabel}>Filters</Typography.Text>
-				{wrapControl(
-					<div
-						className={styles.filterControls}
-						data-testid={`${testIdPrefix}-filter-zone`}
-					>
-						<FilterChips
-							createdBy={reflected.createdBy}
-							updated={reflected.updated}
-							creatorOptions={creatorOptions}
-							testIdPrefix={testIdPrefix}
-							onCreatedByChange={handleCreatedByChange}
-							onUpdatedChange={handleUpdatedChange}
-							onApply={run}
-							onClearCreatedBy={handleClearCreatedBy}
-							disabled={disabled}
-						/>
-						{extraFilters}
-						{(!isEmpty || hasExtraFilters) && (
-							<Button
-								disabledTooltip={undefined}
-								variant="outlined"
-								color="secondary"
-								size="md"
-								prefix={<X size={12} />}
-								disabled={disabled}
-								onClick={handleClear}
-								testId={`${testIdPrefix}-filter-clear`}
-							>
-								Clear
-							</Button>
-						)}
-					</div>,
-				)}
-			</div>
-		</div>
-	);
-}
-
-export default FilterZone;

frontend/src/components/ListFilter/FilterZone/__tests__/useFilterZoneDraft.test.ts

@@ -1,135 +0,0 @@
-import { act, renderHook } from 'tests/test-utils';
-
-import { useFilterZoneDraft } from '../useFilterZoneDraft';
-
-const BASE_QUERY = "name = 'x'";
-
-type Args = Required<Parameters<typeof useFilterZoneDraft>[0]>;
-
-function setup(query = BASE_QUERY): {
-	result: { current: ReturnType<typeof useFilterZoneDraft> };
-	rerender: (props: { query: string }) => void;
-	onQueryChange: jest.MockedFunction<Args['onQueryChange']>;
-	onFilterApplied: jest.MockedFunction<Args['onFilterApplied']>;
-	onCleared: jest.MockedFunction<Args['onCleared']>;
-	onClearAll: jest.MockedFunction<Args['onClearAll']>;
-} {
-	const onQueryChange = jest.fn() as jest.MockedFunction<Args['onQueryChange']>;
-	const onFilterApplied = jest.fn() as jest.MockedFunction<
-		Args['onFilterApplied']
-	>;
-	const onCleared = jest.fn() as jest.MockedFunction<Args['onCleared']>;
-	const onClearAll = jest.fn() as jest.MockedFunction<Args['onClearAll']>;
-	const { result, rerender } = renderHook(
-		({ query: q }: { query: string }) =>
-			useFilterZoneDraft({
-				query: q,
-				onQueryChange,
-				onFilterApplied,
-				onCleared,
-				onClearAll,
-			}),
-		{ initialProps: { query } },
-	);
-	return {
-		result,
-		rerender,
-		onQueryChange,
-		onFilterApplied,
-		onCleared,
-		onClearAll,
-	};
-}
-
-describe('useFilterZoneDraft', () => {
-	it('edits a draft without running it until run is called', () => {
-		const { result, onQueryChange } = setup();
-
-		act(() => result.current.setDraft("name = 'y'  "));
-
-		expect(result.current.dirty).toBe(true);
-		expect(onQueryChange).not.toHaveBeenCalled();
-
-		act(() => result.current.run());
-
-		expect(onQueryChange).toHaveBeenCalledWith("name = 'y'");
-	});
-
-	it('does not run a draft that matches the last-run query', () => {
-		const { result, onQueryChange } = setup();
-
-		act(() => result.current.run());
-
-		expect(result.current.dirty).toBe(false);
-		expect(onQueryChange).not.toHaveBeenCalled();
-	});
-
-	it('resyncs the draft when the query changes from outside', () => {
-		const { result, rerender } = setup();
-
-		act(() => result.current.setDraft("name = 'typing'"));
-		rerender({ query: "name = 'from-view'" });
-
-		expect(result.current.draft).toBe("name = 'from-view'");
-		expect(result.current.dirty).toBe(false);
-	});
-
-	it('stages a created-by pick into the draft without running it', () => {
-		const { result, onQueryChange, onFilterApplied } = setup();
-
-		act(() => result.current.handleCreatedByChange(['a@x.io', 'b@x.io']));
-
-		expect(result.current.draft).toBe(
-			"name = 'x' AND created_by IN ['a@x.io', 'b@x.io']",
-		);
-		expect(result.current.reflected.createdBy).toStrictEqual([
-			'a@x.io',
-			'b@x.io',
-		]);
-		expect(onFilterApplied).toHaveBeenCalledWith('createdBy', { valueCount: 2 });
-		expect(onQueryChange).not.toHaveBeenCalled();
-	});
-
-	it('runs an updated-window pick immediately', () => {
-		const { result, onQueryChange, onFilterApplied } = setup();
-
-		act(() => result.current.handleUpdatedChange('7d'));
-
-		expect(onFilterApplied).toHaveBeenCalledWith('updatedWindow', {});
-		expect(onQueryChange).toHaveBeenCalledTimes(1);
-		expect(onQueryChange.mock.calls[0][0]).toContain("name = 'x' AND updated_at");
-		expect(result.current.reflected.updated).toBe('7d');
-	});
-
-	it('drops the created-by clause and runs when created-by is cleared', () => {
-		const { result, onQueryChange } = setup(
-			"created_by = 'a@x.io' AND name = 'x'",
-		);
-
-		act(() => result.current.handleClearCreatedBy());
-
-		expect(result.current.draft).toBe("name = 'x'");
-		expect(onQueryChange).toHaveBeenCalledWith("name = 'x'");
-	});
-
-	it('empties the draft and runs the empty query on clear', () => {
-		const { result, onQueryChange, onCleared, onClearAll } = setup();
-
-		act(() => result.current.handleClear());
-
-		expect(result.current.draft).toBe('');
-		expect(result.current.isEmpty).toBe(true);
-		expect(onCleared).toHaveBeenCalledTimes(1);
-		expect(onQueryChange).toHaveBeenCalledWith('');
-		expect(onClearAll).toHaveBeenCalledTimes(1);
-	});
-
-	it('skips re-running an already-empty query on clear', () => {
-		const { result, onQueryChange, onClearAll } = setup('');
-
-		act(() => result.current.handleClear());
-
-		expect(onQueryChange).not.toHaveBeenCalled();
-		expect(onClearAll).toHaveBeenCalledTimes(1);
-	});
-});

frontend/src/components/ListFilter/FilterZone/constants.ts

@@ -1,15 +0,0 @@
-import type { UpdatedWindow } from '../dsl/types';
-
-const UPDATED_LABELS: Record<UpdatedWindow, string> = {
-	any: 'Any time',
-	today: 'Today',
-	'7d': 'Last 7 days',
-	'30d': 'Last 30 days',
-};
-
-const UPDATED_WINDOWS: UpdatedWindow[] = ['any', 'today', '7d', '30d'];
-
-export const UPDATED_OPTIONS = UPDATED_WINDOWS.map((w) => ({
-	value: w,
-	label: UPDATED_LABELS[w],
-}));

frontend/src/components/ListFilter/FilterZone/useFilterZoneDraft.ts

@@ -1,121 +0,0 @@
-import { useCallback, useEffect, useMemo, useState } from 'react';
-
-import {
-	createdByClause,
-	parseReflectedClauses,
-	type ReflectedClauses,
-	spliceClause,
-	updatedClause,
-} from '../dsl/filterQuery';
-import type { UpdatedWindow } from '../dsl/types';
-import type { FilterAppliedPayload, FilterAppliedType } from '../types';
-
-interface Args {
-	query: string;
-	onQueryChange: (value: string) => void;
-	onFilterApplied?: (
-		filterType: FilterAppliedType,
-		payload: FilterAppliedPayload,
-	) => void;
-	onCleared?: () => void;
-	onClearAll?: () => void;
-}
-
-interface FilterZoneDraft {
-	draft: string;
-	setDraft: (value: string) => void;
-	reflected: ReflectedClauses;
-	dirty: boolean;
-	isEmpty: boolean;
-	run: () => void;
-	handleCreatedByChange: (emails: string[]) => void;
-	handleUpdatedChange: (window: UpdatedWindow) => void;
-	handleClearCreatedBy: () => void;
-	handleClear: () => void;
-}
-
-// The query box is a DRAFT: typing and the Created-by / Updated dropdowns all edit
-// the draft (dropdowns splice their clause in); nothing fetches until the draft is
-// run. The draft re-syncs when the last-run query changes externally (view
-// select, back/forward).
-export function useFilterZoneDraft({
-	query,
-	onQueryChange,
-	onFilterApplied,
-	onCleared,
-	onClearAll,
-}: Args): FilterZoneDraft {
-	const [draft, setDraft] = useState(query);
-
-	useEffect(() => {
-		setDraft(query);
-	}, [query]);
-
-	const reflected = useMemo(() => parseReflectedClauses(draft), [draft]);
-	const dirty = draft.trim() !== query.trim();
-	const isEmpty = !draft.trim();
-
-	const commit = useCallback(
-		(next: string): void => {
-			const trimmed = next.trim();
-			if (trimmed !== query) {
-				onQueryChange(trimmed);
-			}
-		},
-		[query, onQueryChange],
-	);
-
-	const run = useCallback((): void => commit(draft), [commit, draft]);
-
-	// Created-by (multi-select) only STAGES its clause into the draft; the query runs
-	// when the dropdown closes (FilterChips fires onApply), not on each pick.
-	const handleCreatedByChange = useCallback(
-		(emails: string[]): void => {
-			onFilterApplied?.('createdBy', { valueCount: emails.length });
-			setDraft((d) => spliceClause(d, 'created_by', createdByClause(emails)));
-		},
-		[onFilterApplied],
-	);
-
-	// Updated (single-select) is a definitive single choice, so it splices AND runs
-	// immediately (with the fresh value, avoiding the async draft-state lag).
-	const handleUpdatedChange = useCallback(
-		(window: UpdatedWindow): void => {
-			onFilterApplied?.('updatedWindow', {});
-			const next = spliceClause(draft, 'updated_at', updatedClause(window));
-			setDraft(next);
-			commit(next);
-		},
-		[draft, commit, onFilterApplied],
-	);
-
-	// Clear-all on the Created-by select removes its clause and runs immediately.
-	const handleClearCreatedBy = useCallback((): void => {
-		const next = spliceClause(draft, 'created_by', null);
-		setDraft(next);
-		commit(next);
-	}, [draft, commit]);
-
-	// Clear resets the draft and runs immediately (empty query).
-	const handleClear = useCallback((): void => {
-		onCleared?.();
-		setDraft('');
-		if (query !== '') {
-			onQueryChange('');
-		}
-		onClearAll?.();
-	}, [query, onQueryChange, onCleared, onClearAll]);
-
-	return {
-		draft,
-		setDraft,
-		reflected,
-		dirty,
-		isEmpty,
-		run,
-		handleCreatedByChange,
-		handleUpdatedChange,
-		handleClearCreatedBy,
-		handleClear,
-	};
-}

frontend/src/components/ListFilter/SearchBar/editorConfig.ts

@@ -1,41 +0,0 @@
-import { EditorView } from '@uiw/react-codemirror';
-
-import type { SuggestionSource } from '../dsl/types';
-
-export const EMPTY_SOURCE: SuggestionSource = {
-	dynamicKeys: [],
-	valuesByKey: {},
-	creatorEmails: [],
-};
-
-// Token colours come from `.cm-dsl-*` classes (SearchBar.module.scss); this only
-// handles layout — transparent background, monospace, single line.
-export const editorTheme = EditorView.theme({
-	'&': { fontSize: '13px', backgroundColor: 'transparent' },
-	'&.cm-focused': { outline: 'none' },
-	'.cm-content': {
-		// Leave room for the overlaid lead icon (left) and Run button (right).
-		padding: '8px 120px 8px 30px',
-		fontFamily: "'Space Mono', monospace",
-		color: 'var(--l1-foreground)',
-		caretColor: 'var(--l1-foreground)',
-	},
-	'.cm-line': { padding: '0' },
-	// Whole pixels: at 19.5px the placeholder line rounds 1px taller than text.
-	'.cm-scroller': { fontFamily: 'inherit', lineHeight: '20px' },
-	'.cm-placeholder': { color: 'var(--l3-foreground)' },
-});
-
-export const BASIC_SETUP = {
-	lineNumbers: false,
-	foldGutter: false,
-	highlightActiveLine: false,
-	highlightActiveLineGutter: false,
-	highlightSelectionMatches: false,
-	bracketMatching: false,
-	closeBrackets: false,
-	autocompletion: false,
-	// Use the browser's native caret so it blinks (a CM-drawn cursor needs extra
-	// styling and doesn't blink by default).
-	drawSelection: false,
-} as const;

frontend/src/components/ListFilter/dsl/rulesDslSuggestions.test.ts

@@ -1,69 +0,0 @@
-import { RULES_DSL_GRAMMAR } from 'container/ListAlertRules/list.config';
-
-import { getSuggestions } from './dslSuggestions';
-import type { SuggestionSource } from './types';
-
-const source: SuggestionSource = {
-	reservedKeys: [
-		'alert_type',
-		'created_at',
-		'created_by',
-		'labels.<key>',
-		'name',
-		'rule_type',
-		'severity',
-		'updated_at',
-		'updated_by',
-	],
-	dynamicKeys: ['labels.team', 'labels.env'],
-	valuesByKey: { 'labels.team': ['infra'], 'labels.severity': ['critical'] },
-	creatorEmails: ['alice@x.io'],
-	currentUserEmail: 'me@x.io',
-};
-
-const suggest = (q: string): ReturnType<typeof getSuggestions>['items'] =>
-	getSuggestions(q, q.length, source, RULES_DSL_GRAMMAR).items;
-const labels = (q: string): string[] => suggest(q).map((i) => i.label);
-
-describe('getSuggestions — rules grammar', () => {
-	it('orders reserved keys, hides labels.<key> and appends label keys', () => {
-		expect(labels('')).toStrictEqual([
-			'name',
-			'severity',
-			'alert_type',
-			'rule_type',
-			'created_by',
-			'updated_by',
-			'created_at',
-			'updated_at',
-			'labels.team',
-			'labels.env',
-		]);
-		expect(suggest('labels.t').map((i) => i.detail)).toStrictEqual(['label']);
-	});
-
-	it('restricts enum keys to = != IN NOT IN and suggests their values', () => {
-		expect(labels('rule_type ')).toStrictEqual([
-			'rule_type =',
-			'rule_type !=',
-			'rule_type IN',
-			'rule_type NOT IN',
-		]);
-		expect(labels('rule_type = ')).toStrictEqual([
-			'threshold_rule',
-			'promql_rule',
-			'anomaly_rule',
-		]);
-		expect(labels("alert_type = 'LOGS")).toStrictEqual(['LOGS_BASED_ALERT']);
-	});
-
-	it('gives severity and labels.* the label operators and values', () => {
-		expect(labels('severity ')).toContain('severity EXISTS');
-		expect(labels('severity = ')).toStrictEqual(['critical']);
-		expect(labels('labels.team = ')).toStrictEqual(['infra']);
-	});
-
-	it('suggests user emails for updated_by', () => {
-		expect(labels('updated_by = ')).toStrictEqual(['me@x.io (me)', 'alice@x.io']);
-	});
-});

frontend/src/components/ListFilter/dsl/types.ts

@@ -1,61 +0,0 @@
-import type { CaretContext } from './dslTokenizer';
-
-// `dynamic` keys (tags, labels) take string ops plus EXISTS / NOT EXISTS.
-export type DslFieldType = 'string' | 'timestamp' | 'bool' | 'enum' | 'dynamic';
-
-export interface DslField {
-	key: string;
-	type: DslFieldType;
-	values?: readonly string[];
-}
-
-// A list-filter DSL grammar, mirroring a backend `list_filter.go` allow-list.
-export interface DslGrammar {
-	// Reserved fields in suggestion order. Any key not listed here is dynamic.
-	fields: readonly DslField[];
-	// `detail` labels dynamic keys in the popup. A reserved dynamic key (e.g.
-	// rules' `severity`) aliases `${prefix}${key}` for value lookups.
-	dynamicKey: { detail: string; prefix: string };
-	// Advertised by the API but not filterable (e.g. `labels.<key>`).
-	hiddenKeys?: readonly string[];
-}
-
-export type ClauseValue = string | boolean | readonly string[];
-
-export type ClauseBuilder<K extends string> = (
-	key: K,
-	op: string,
-	value: ClauseValue,
-) => string;
-
-export interface SuggestionSource {
-	// Reserved keys from the list response, falling back to the grammar's.
-	reservedKeys?: string[];
-	// Dynamic keys exactly as typed (e.g. `team`, `labels.team`).
-	dynamicKeys: string[];
-	// Known values per dynamic key (lower-cased full key -> values).
-	valuesByKey: Record<string, string[]>;
-	// Values for `created_by` / `updated_by`.
-	creatorEmails: string[];
-	currentUserEmail?: string;
-}
-
-export interface Suggestion {
-	label: string;
-	insertText: string;
-	kind: 'key' | 'operator' | 'value' | 'connector';
-	// Right-aligned hint in the popup — e.g. 'field' vs 'tag' so reserved columns
-	// are distinguishable from dynamic keys.
-	detail?: string;
-	// Chars to move the caret back from the end of `insertText` after applying.
-	// Used to land the caret inside a `[...]` list so multi-select can continue.
-	caretOffset?: number;
-}
-
-export interface SuggestionsResult {
-	items: Suggestion[];
-	ctx: CaretContext;
-}
-
-// Relative "updated within" windows offered by the Updated filter dropdown.
-export type UpdatedWindow = 'any' | 'today' | '7d' | '30d';

frontend/src/components/ListFilter/types.ts

@@ -1,9 +0,0 @@
-export interface CreatorOption {
-	email: string;
-	label: string;
-}
-
-export type FilterAppliedType = 'createdBy' | 'updatedWindow';
-
-// Analytics payload for a chip change (`valueCount` for Created by).
-export type FilterAppliedPayload = Record<string, unknown>;

frontend/src/components/ListViews/ListCommandHeader/ListCommandHeader.module.scss

@@ -1,46 +0,0 @@
-.commandHeader {
-	display: flex;
-	align-items: center;
-	gap: 12px;
-}
-
-.headingBlock {
-	display: flex;
-	align-items: center;
-	gap: 10px;
-	min-width: 0;
-}
-
-.grow {
-	flex: 1;
-}
-
-.dirtyDot {
-	width: 7px;
-	height: 7px;
-	border-radius: 50%;
-	background: var(--warning-background);
-	flex: none;
-}
-
-.countPill {
-	padding: 2px 9px;
-	border-radius: 999px;
-	background: var(--l2-background);
-	border: 1px solid var(--l2-border);
-	color: var(--l2-foreground);
-	font-size: var(--font-size-xs);
-	font-variant-numeric: tabular-nums;
-}
-
-.title {
-	color: var(--l1-foreground);
-	font-size: var(--font-size-lg);
-	font-style: normal;
-	font-weight: var(--font-weight-medium);
-	line-height: 28px;
-	letter-spacing: -0.09px;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	white-space: nowrap;
-}

frontend/src/components/ListViews/ViewsRail/ViewsRail.tsx

@@ -1,264 +0,0 @@
-import {
-	type ChangeEvent,
-	type ReactElement,
-	useCallback,
-	useState,
-} from 'react';
-import { Button } from '@signozhq/ui/button';
-import { Input } from '@signozhq/ui/input';
-import { Typography } from '@signozhq/ui/typography';
-import { Bookmark, Plus, Search } from '@signozhq/icons';
-import cx from 'classnames';
-
-import { useDeleteConfirm } from 'components/DeleteConfirmModal/useDeleteConfirm';
-import ViewNamePopover from 'components/ViewNamePopover/ViewNamePopover';
-
-import type { BuiltinListView, ViewSaveMode } from '../types';
-import ViewsRailDirtyPanel from './ViewsRailDirtyPanel';
-import ViewsRailItem from './ViewsRailItem';
-
-import styles from './ViewsRail.module.scss';
-
-interface Props {
-	activeViewId: string;
-	builtinViews: readonly BuiltinListView[];
-	customViews: { id: string; name: string }[];
-	customViewsLoading: boolean;
-	isCustomActive: boolean;
-	isModified: boolean;
-	collapsed?: boolean;
-	onSelect: (id: string) => void;
-	onSave: (name: string) => void;
-	onSaveChanges: () => void;
-	onReset: () => void;
-	onDelete: (id: string) => Promise<void>;
-	onRename: (id: string, name: string) => void;
-	/** Prefixes the rail's test ids, e.g. `<prefix>-view-<id>`. */
-	testIdPrefix: string;
-	saveTestIdPrefix?: string;
-	renameTestIdPrefix?: string;
-	customSectionLabel?: string;
-	deleteDescription?: string;
-	/** Wraps the rail body, e.g. in an authz guard. */
-	guard?: (content: ReactElement) => ReactElement;
-	onViewSaved?: (mode: ViewSaveMode) => void;
-	onViewRenamed?: () => void;
-	onViewDeleted?: () => void;
-}
-
-// Purely presentational — active view, dirty state, and handlers come from
-// `useListViews`.
-function ViewsRail({
-	activeViewId,
-	builtinViews,
-	customViews,
-	customViewsLoading,
-	isCustomActive,
-	isModified,
-	collapsed = false,
-	onSelect,
-	onSave,
-	onSaveChanges,
-	onReset,
-	onDelete,
-	onRename,
-	testIdPrefix,
-	saveTestIdPrefix = 'save-view',
-	renameTestIdPrefix = 'rename-view',
-	customSectionLabel = 'My views',
-	deleteDescription = 'This removes the saved view.',
-	guard,
-	onViewSaved,
-	onViewRenamed,
-	onViewDeleted,
-}: Props): JSX.Element {
-	const [saveOpen, setSaveOpen] = useState(false);
-	const [query, setQuery] = useState('');
-	const { contextHolder, confirmDelete } = useDeleteConfirm();
-
-	const q = query.trim().toLowerCase();
-	const matchesQuery = (label: string): boolean =>
-		!q || label.toLowerCase().includes(q);
-
-	const personal = builtinViews.filter(
-		(v) => v.section === 'personal' && matchesQuery(v.label),
-	);
-	const system = builtinViews.filter(
-		(v) => v.section === 'system' && matchesQuery(v.label),
-	);
-	const custom = customViews.filter((v) => matchesQuery(v.name));
-	const noMatches =
-		!!q && personal.length === 0 && system.length === 0 && custom.length === 0;
-
-	const onConfirmDelete = useCallback(
-		(id: string, label: string): void => {
-			confirmDelete({
-				title: (
-					<Typography.Title level={5}>
-						Delete the{' '}
-						<Typography.Text className={styles.deleteName}>{label}</Typography.Text>{' '}
-						view?
-					</Typography.Title>
-				),
-				content: deleteDescription,
-				// Return the delete promise so the modal's Delete button stays loading
-				// until the backend call settles, then closes — matching dashboard delete.
-				onConfirm: (): Promise<void> => {
-					onViewDeleted?.();
-					return onDelete(id);
-				},
-			});
-		},
-		[confirmDelete, deleteDescription, onDelete, onViewDeleted],
-	);
-
-	const handleRename = useCallback(
-		(id: string, name: string): void => {
-			onViewRenamed?.();
-			onRename(id, name);
-		},
-		[onRename, onViewRenamed],
-	);
-
-	const handleSaveAsView = (name: string): void => {
-		onViewSaved?.('new');
-		onSave(name);
-	};
-
-	const handleSaveViewChanges = (): void => {
-		onViewSaved?.('update');
-		onSaveChanges();
-	};
-
-	const renderBuiltin = (v: BuiltinListView): JSX.Element => (
-		<ViewsRailItem
-			key={v.id}
-			id={v.id}
-			label={v.label}
-			icon={v.icon}
-			active={v.id === activeViewId}
-			isModified={isModified}
-			testIdPrefix={testIdPrefix}
-			renameTestIdPrefix={renameTestIdPrefix}
-			onSelect={onSelect}
-		/>
-	);
-
-	const content = (
-		<>
-			<div className={styles.header}>
-				<h4 className={styles.headerTitle}>Views</h4>
-				<ViewNamePopover
-					open={saveOpen}
-					onOpenChange={setSaveOpen}
-					onSubmit={handleSaveAsView}
-					title="Save as view"
-					confirmLabel="Save view"
-					testIdPrefix={saveTestIdPrefix}
-					tooltip="Save current filters as a view"
-					trigger={
-						<Button
-							aria-label="Save current filters as a view"
-							variant="ghost"
-							color="secondary"
-							size="sm"
-							icon
-							testId={`${testIdPrefix}-view-save-trigger`}
-						>
-							<Plus size={14} />
-						</Button>
-					}
-				/>
-			</div>
-
-			<div className={styles.search}>
-				<Input
-					value={query}
-					placeholder="Filter views by name"
-					prefix={<Search size={12} />}
-					testId={`${testIdPrefix}-view-search`}
-					onChange={(e: ChangeEvent<HTMLInputElement>): void =>
-						setQuery(e.target.value)
-					}
-				/>
-			</div>
-
-			<div className={styles.scroll}>
-				{personal.length > 0 && (
-					<>
-						<div className={styles.groupLabel}>Personal</div>
-						{personal.map(renderBuiltin)}
-					</>
-				)}
-
-				{system.length > 0 && (
-					<>
-						<div className={cx(styles.groupLabel, styles.groupLabelSpaced)}>
-							System
-						</div>
-						{system.map(renderBuiltin)}
-					</>
-				)}
-
-				{(!q || custom.length > 0) && (
-					<>
-						<div className={cx(styles.groupLabel, styles.groupLabelSpaced)}>
-							{customSectionLabel}
-							<Typography.Text className={styles.groupCount}>
-								{customViews.length}
-							</Typography.Text>
-						</div>
-						{customViewsLoading ? (
-							<div className={styles.empty}>Loading views…</div>
-						) : customViews.length === 0 ? (
-							<div className={styles.empty}>
-								No saved views yet. Filter the list, then save it as a view.
-							</div>
-						) : (
-							custom.map((v) => (
-								<ViewsRailItem
-									key={v.id}
-									id={v.id}
-									label={v.name}
-									icon={Bookmark}
-									active={v.id === activeViewId}
-									isModified={isModified}
-									testIdPrefix={testIdPrefix}
-									renameTestIdPrefix={renameTestIdPrefix}
-									onSelect={onSelect}
-									onRename={handleRename}
-									onDelete={onConfirmDelete}
-								/>
-							))
-						)}
-					</>
-				)}
-
-				{noMatches && (
-					<div className={styles.searchEmpty}>
-						No views match &ldquo;{query}&rdquo;
-					</div>
-				)}
-			</div>
-
-			{isModified && (
-				<ViewsRailDirtyPanel
-					isCustomActive={isCustomActive}
-					testIdPrefix={testIdPrefix}
-					onSaveChanges={handleSaveViewChanges}
-					onSaveAs={(): void => setSaveOpen(true)}
-					onReset={onReset}
-				/>
-			)}
-			{contextHolder}
-		</>
-	);
-
-	return (
-		<aside className={cx(styles.rail, { [styles.collapsed]: collapsed })}>
-			{guard ? guard(content) : content}
-		</aside>
-	);
-}
-
-export default ViewsRail;

frontend/src/components/ListViews/ViewsRail/ViewsRailDirtyPanel.tsx

@@ -1,87 +0,0 @@
-import { Button } from '@signozhq/ui/button';
-import { Plus } from '@signozhq/icons';
-import cx from 'classnames';
-
-import styles from './ViewsRail.module.scss';
-
-interface Props {
-	isCustomActive: boolean;
-	testIdPrefix: string;
-	onSaveChanges: () => void;
-	onSaveAs: () => void;
-	onReset: () => void;
-}
-
-function ViewsRailDirtyPanel({
-	isCustomActive,
-	testIdPrefix,
-	onSaveChanges,
-	onSaveAs,
-	onReset,
-}: Props): JSX.Element {
-	if (isCustomActive) {
-		return (
-			<div className={styles.dirtyPanel}>
-				<div className={styles.dirtyTitle}>Unsaved changes</div>
-				<div className={styles.dirtyActions}>
-					<Button
-						variant="solid"
-						color="primary"
-						size="sm"
-						onClick={onSaveChanges}
-						testId={`${testIdPrefix}-view-save-changes`}
-					>
-						Save
-					</Button>
-					<Button
-						variant="outlined"
-						color="secondary"
-						size="sm"
-						onClick={onSaveAs}
-						testId={`${testIdPrefix}-view-save-as`}
-					>
-						Save as…
-					</Button>
-					<Button
-						variant="ghost"
-						color="secondary"
-						size="sm"
-						onClick={onReset}
-						testId={`${testIdPrefix}-view-reset`}
-					>
-						Reset
-					</Button>
-				</div>
-			</div>
-		);
-	}
-
-	return (
-		<div className={cx(styles.dirtyPanel, styles.dirtyPanelDefault)}>
-			<div className={styles.dirtyTitle}>Filters active</div>
-			<div className={styles.dirtyActions}>
-				<Button
-					variant="solid"
-					color="primary"
-					size="sm"
-					prefix={<Plus size={12} />}
-					onClick={onSaveAs}
-					testId={`${testIdPrefix}-view-save-as-new`}
-				>
-					Save as new view
-				</Button>
-				<Button
-					variant="ghost"
-					color="secondary"
-					size="sm"
-					onClick={onReset}
-					testId={`${testIdPrefix}-view-reset`}
-				>
-					Reset
-				</Button>
-			</div>
-		</div>
-	);
-}
-
-export default ViewsRailDirtyPanel;

frontend/src/components/ListViews/ViewsRail/ViewsRailItem.tsx

@@ -1,105 +0,0 @@
-import { useState } from 'react';
-import { Button } from '@signozhq/ui/button';
-import { Tooltip } from '@signozhq/ui/tooltip';
-import { PenLine, Trash2 } from '@signozhq/icons';
-import cx from 'classnames';
-import ViewNamePopover from 'components/ViewNamePopover/ViewNamePopover';
-
-import type { ListViewIcon } from '../types';
-
-import styles from './ViewsRail.module.scss';
-
-interface Props {
-	id: string;
-	label: string;
-	icon: ListViewIcon;
-	active: boolean;
-	isModified: boolean;
-	testIdPrefix: string;
-	renameTestIdPrefix: string;
-	onSelect: (id: string) => void;
-	/** Present only for custom (editable) views. */
-	onRename?: (id: string, name: string) => void;
-	onDelete?: (id: string, label: string) => void;
-}
-
-function ViewsRailItem({
-	id,
-	label,
-	icon: Icon,
-	active,
-	isModified,
-	testIdPrefix,
-	renameTestIdPrefix,
-	onSelect,
-	onRename,
-	onDelete,
-}: Props): JSX.Element {
-	const [renaming, setRenaming] = useState(false);
-
-	return (
-		<div className={cx(styles.row, { [styles.rowActive]: active })}>
-			<Button
-				size="md"
-				variant="ghost"
-				color="secondary"
-				width="100%"
-				onClick={(): void => onSelect(id)}
-				testId={`${testIdPrefix}-view-${id}`}
-				prefix={<Icon size={16} className={styles.itemIcon} />}
-				suffix={
-					active && isModified ? (
-						<div className={styles.dirtyDot} title="Unsaved changes" />
-					) : undefined
-				}
-			>
-				{label}
-			</Button>
-			{onRename && onDelete && (
-				<div className={styles.itemActions}>
-					<ViewNamePopover
-						open={renaming}
-						onOpenChange={setRenaming}
-						onSubmit={(name): void => onRename(id, name)}
-						title="Rename view"
-						confirmLabel="Rename"
-						initialName={label}
-						testIdPrefix={renameTestIdPrefix}
-						tooltip="Rename view"
-						trigger={
-							<Button
-								variant="ghost"
-								color="secondary"
-								size="sm"
-								icon
-								aria-label="Rename view"
-								testId={`${testIdPrefix}-view-rename-${id}`}
-								onClick={(e): void => e.stopPropagation()}
-							>
-								<PenLine size={12} />
-							</Button>
-						}
-					/>
-					<Tooltip title="Delete view">
-						<Button
-							variant="ghost"
-							color="secondary"
-							size="sm"
-							icon
-							aria-label="Delete view"
-							testId={`${testIdPrefix}-view-delete-${id}`}
-							onClick={(e): void => {
-								e.stopPropagation();
-								onDelete(id, label);
-							}}
-						>
-							<Trash2 size={12} />
-						</Button>
-					</Tooltip>
-				</div>
-			)}
-		</div>
-	);
-}
-
-export default ViewsRailItem;

frontend/src/components/ListViews/ViewsRail/__tests__/ViewsRail.test.tsx

@@ -1,151 +0,0 @@
-import { Bookmark, Pin } from '@signozhq/icons';
-import { render, screen, userEvent } from 'tests/test-utils';
-
-import type { BuiltinListView } from '../../types';
-import ViewsRail from '../ViewsRail';
-
-const PREFIX = 'things';
-
-const BUILTIN_VIEWS: BuiltinListView[] = [
-	{ id: 'mine', label: 'My things', icon: Pin, section: 'personal' },
-	{ id: 'all', label: 'All things', icon: Bookmark, section: 'system' },
-];
-
-const CUSTOM_VIEWS = [
-	{ id: 'view-1', name: 'Prod things' },
-	{ id: 'view-2', name: 'Staging things' },
-];
-
-type Props = React.ComponentProps<typeof ViewsRail>;
-
-function renderRail(props?: Partial<Props>): Props {
-	const allProps: Props = {
-		activeViewId: 'all',
-		builtinViews: BUILTIN_VIEWS,
-		customViews: CUSTOM_VIEWS,
-		customViewsLoading: false,
-		isCustomActive: false,
-		isModified: false,
-		onSelect: jest.fn(),
-		onSave: jest.fn(),
-		onSaveChanges: jest.fn(),
-		onReset: jest.fn(),
-		onDelete: jest.fn(),
-		onRename: jest.fn(),
-		testIdPrefix: PREFIX,
-		...props,
-	};
-	render(<ViewsRail {...allProps} />);
-	return allProps;
-}
-
-describe('ViewsRail', () => {
-	it('groups built-in views by section and custom views under their label', () => {
-		renderRail({ customSectionLabel: 'Team views' });
-
-		expect(screen.getByText('Personal')).toBeInTheDocument();
-		expect(screen.getByText('System')).toBeInTheDocument();
-		expect(screen.getByText('Team views')).toBeInTheDocument();
-		['mine', 'all', 'view-1', 'view-2'].forEach((id) =>
-			expect(screen.getByTestId(`${PREFIX}-view-${id}`)).toBeInTheDocument(),
-		);
-	});
-
-	it('selects a view by id', async () => {
-		const user = userEvent.setup({ pointerEventsCheck: 0 });
-		const props = renderRail();
-
-		await user.click(screen.getByTestId(`${PREFIX}-view-view-2`));
-
-		expect(props.onSelect).toHaveBeenCalledWith('view-2');
-	});
-
-	it('filters views by name and says when none match', async () => {
-		const user = userEvent.setup({ pointerEventsCheck: 0 });
-		renderRail();
-		const search = screen.getByTestId(`${PREFIX}-view-search`);
-
-		await user.type(search, 'prod');
-
-		expect(screen.getByTestId(`${PREFIX}-view-view-1`)).toBeInTheDocument();
-		expect(screen.queryByTestId(`${PREFIX}-view-view-2`)).not.toBeInTheDocument();
-		expect(screen.queryByTestId(`${PREFIX}-view-all`)).not.toBeInTheDocument();
-
-		await user.clear(search);
-		await user.type(search, 'nothing');
-
-		expect(screen.getByText(/No views match/)).toBeInTheDocument();
-	});
-
-	it('shows loading and empty states for custom views', () => {
-		const { unmount } = render(
-			<ViewsRail
-				activeViewId="all"
-				builtinViews={BUILTIN_VIEWS}
-				customViews={[]}
-				customViewsLoading
-				isCustomActive={false}
-				isModified={false}
-				onSelect={jest.fn()}
-				onSave={jest.fn()}
-				onSaveChanges={jest.fn()}
-				onReset={jest.fn()}
-				onDelete={jest.fn()}
-				onRename={jest.fn()}
-				testIdPrefix={PREFIX}
-			/>,
-		);
-		expect(screen.getByText('Loading views…')).toBeInTheDocument();
-		unmount();
-
-		renderRail({ customViews: [] });
-		expect(screen.getByText(/No saved views yet/)).toBeInTheDocument();
-	});
-
-	it('hides the unsaved-changes panel while filters match the view', () => {
-		renderRail();
-
-		expect(screen.queryByTestId(`${PREFIX}-view-reset`)).not.toBeInTheDocument();
-	});
-
-	it('offers save, save as and reset for a modified custom view', async () => {
-		const user = userEvent.setup({ pointerEventsCheck: 0 });
-		const onViewSaved = jest.fn();
-		const props = renderRail({
-			activeViewId: 'view-1',
-			isCustomActive: true,
-			isModified: true,
-			onViewSaved,
-		});
-
-		await user.click(screen.getByTestId(`${PREFIX}-view-save-changes`));
-		expect(onViewSaved).toHaveBeenCalledWith('update');
-		expect(props.onSaveChanges).toHaveBeenCalledTimes(1);
-
-		expect(screen.getByTestId(`${PREFIX}-view-save-as`)).toBeInTheDocument();
-
-		await user.click(screen.getByTestId(`${PREFIX}-view-reset`));
-		expect(props.onReset).toHaveBeenCalledTimes(1);
-	});
-
-	it('offers only save as new for a modified built-in view', () => {
-		renderRail({ isModified: true });
-
-		expect(screen.getByTestId(`${PREFIX}-view-save-as-new`)).toBeInTheDocument();
-		expect(
-			screen.queryByTestId(`${PREFIX}-view-save-changes`),
-		).not.toBeInTheDocument();
-	});
-
-	it('wraps its body in the guard it is given', () => {
-		renderRail({
-			guard: (content): JSX.Element => (
-				<div data-testid="rail-guard">{content}</div>
-			),
-		});
-
-		expect(screen.getByTestId('rail-guard')).toContainElement(
-			screen.getByTestId(`${PREFIX}-view-all`),
-		);
-	});
-});

frontend/src/components/ListViews/types.ts

@@ -1,43 +0,0 @@
-import type { Pin } from '@signozhq/icons';
-
-// All @signozhq icons share this component type.
-export type ListViewIcon = typeof Pin;
-
-export interface BuiltinListView {
-	id: string;
-	label: string;
-	icon: ListViewIcon;
-	section: 'personal' | 'system';
-}
-
-export interface EmptyStateCopy {
-	title: string;
-	description: string;
-}
-
-// `clientFilter` narrows the rows the server already returned.
-export interface BuiltinViewConfig<
-	F,
-	Ctx = undefined,
-	Row = never,
-> extends BuiltinListView {
-	filter: (current: F, ctx: Ctx) => F;
-	clientFilter?: (rows: Row[], ctx: Ctx) => Row[];
-	emptyState?: EmptyStateCopy;
-}
-
-export interface SavedListView<F> {
-	id: string;
-	name: string;
-	filter: F;
-}
-
-export interface SavedListViewsApi<F> {
-	views: SavedListView<F>[];
-	isLoading: boolean;
-	createView: (name: string, filter: F) => Promise<SavedListView<F> | null>;
-	updateView: (id: string, name: string, filter: F) => void;
-	deleteView: (id: string) => Promise<void>;
-}
-
-export type ViewSaveMode = 'new' | 'update';

frontend/src/components/ViewNamePopover/ViewNamePopover.module.scss

@@ -1,26 +0,0 @@
-.savePopover {
-	display: flex;
-	flex-direction: column;
-	gap: 8px;
-	width: 280px;
-	padding: 4px;
-}
-
-.saveTitle {
-	font-size: var(--font-size-sm);
-	font-weight: var(--font-weight-semibold);
-	color: var(--l1-foreground);
-}
-
-.saveLabel {
-	font-size: var(--font-size-xs);
-	color: var(--l3-foreground);
-	margin-top: 2px;
-}
-
-.saveActions {
-	display: flex;
-	justify-content: flex-end;
-	gap: 8px;
-	margin-top: 4px;
-}

frontend/src/constants/localStorage.ts

@@ -45,7 +45,6 @@ export enum LOCALSTORAGE {
 	ACTIVE_SIGNOZ_INSTANCE_URL = 'ACTIVE_SIGNOZ_INSTANCE_URL',
 	DASHBOARDS_LIST_VISIBLE_COLUMNS = 'DASHBOARDS_LIST_VISIBLE_COLUMNS',
 	DASHBOARDS_LIST_VIEWS = 'DASHBOARDS_LIST_VIEWS',
-	ALERT_RULES_LIST_VIEWS = 'ALERT_RULES_LIST_VIEWS',
 	DASHBOARD_V2_PANEL_COLUMN_WIDTHS = 'DASHBOARD_V2_PANEL_COLUMN_WIDTHS',
 	LLM_ATTRIBUTE_MAPPING_TEST_SPAN = 'LLM_ATTRIBUTE_MAPPING_TEST_SPAN',
 }

frontend/src/constants/query.ts

@@ -53,6 +53,7 @@ export enum QueryParams {
 	variables = 'variables',
 	version = 'version',
 	source = 'source',
+	showClassicCreateAlertsPage = 'showClassicCreateAlertsPage',
 	isTestAlert = 'isTestAlert',
 	yAxisUnit = 'yAxisUnit',
 	ruleName = 'ruleName',

frontend/src/constants/reactQueryKeys.ts

@@ -26,6 +26,7 @@ export const REACT_QUERY_KEY = {
 	REMOVE_ALERT_RULE: 'REMOVE_ALERT_RULE',
 	CLONE_ALERT_RULE: 'CLONE_ALERT_RULE',
 	GET_HOST_LIST: 'GET_HOST_LIST',
+	UPDATE_ALERT_RULE: 'UPDATE_ALERT_RULE',
 	GET_TRACE_V2_WATERFALL: 'GET_TRACE_V2_WATERFALL',
 	GET_TRACE_V4_WATERFALL: 'GET_TRACE_V4_WATERFALL',
 	GET_TRACE_AGGREGATIONS: 'GET_TRACE_AGGREGATIONS',

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

@@ -21,15 +21,14 @@ import {
 	useListDashboardsForUserV2,
 } from 'api/generated/services/dashboard';
 import {
-	getListRulesV3QueryKey,
-	useListRulesV3,
+	getListRulesQueryKey,
+	useListRules,
 } from 'api/generated/services/rules';
 import type {
 	DashboardtypesListedDashboardForUserV2DTO,
 	ListDashboardsForUserV2200,
 	ListDashboardsForUserV2Params,
-	ListRulesV3200,
-	ListRulesV3Params,
+	ListRules200,
 } from 'api/generated/services/sigNoz.schemas';
 import logEvent from 'api/common/logEvent';
 import { useQueryService } from 'hooks/useQueryService';
@@ -180,9 +179,6 @@ const VOICE_UNAVAILABLE_KEY = 'ai-assistant-voice-unavailable';
  */
 const DASHBOARD_LIST_PARAMS: ListDashboardsForUserV2Params = { limit: 1000 };
 
-/** Same as dashboards. 200 is the most the rules list returns per call. */
-const ALERT_RULE_LIST_PARAMS: ListRulesV3Params = { limit: 200 };
-
 function dashboardTitle(
 	dashboard: DashboardtypesListedDashboardForUserV2DTO,
 ): string {
@@ -759,7 +755,7 @@ export default function ChatInput({
 		data: alertsResponse,
 		isLoading: isAlertsLoading,
 		isError: isAlertsError,
-	} = useListRulesV3(ALERT_RULE_LIST_PARAMS, {
+	} = useListRules({
 		query: {
 			enabled: isContextPickerOpen && activeContextCategory === 'Alerts',
 			staleTime: Infinity,
@@ -808,10 +804,10 @@ export default function ChatInput({
 				}
 			}
 			if (ctx.type === 'alert' && ctx.resourceId) {
-				const cached = queryClient.getQueryData<ListRulesV3200>(
-					getListRulesV3QueryKey(ALERT_RULE_LIST_PARAMS),
+				const cached = queryClient.getQueryData<ListRules200>(
+					getListRulesQueryKey(),
 				);
-				const rule = cached?.data.rules.find((r) => r.id === ctx.resourceId);
+				const rule = cached?.data?.find((r) => r.id === ctx.resourceId);
 				if (rule?.alert) {
 					return rule.alert;
 				}
@@ -839,8 +835,8 @@ export default function ChatInput({
 					value: dashboardTitle(dashboard),
 				})) ?? [],
 			Alerts:
-				alertsResponse?.data.rules
-					.filter((alertRule) => Boolean(alertRule.alert))
+				alertsResponse?.data
+					?.filter((alertRule) => Boolean(alertRule.alert))
 					.map((alertRule) => ({
 						id: alertRule.id,
 						value: alertRule.alert,
@@ -1063,7 +1059,6 @@ export default function ChatInput({
 												color="secondary"
 												size="sm"
 												id={`ai-context-tab-${category}`}
-												testId={`ai-context-tab-${category}`}
 												// Single stable panel id shared by every tab: only the
 												// active category's tabpanel is rendered, so per-category
 												// `aria-controls` ids would point at nonexistent nodes

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

@@ -1,70 +0,0 @@
-import {
-	alertRulesFixture,
-	listRulesV3Response,
-} from 'mocks-server/__mockdata__/alert_rules';
-import { rest, server } from 'mocks-server/server';
-import { render, screen, userEvent } from 'tests/test-utils';
-
-jest.mock('api/generated/services/dashboard', () => ({
-	useListDashboardsForUserV2: (): unknown => ({
-		data: undefined,
-		isLoading: false,
-		isError: false,
-	}),
-	getListDashboardsForUserV2QueryKey: (): string[] => ['dashboards'],
-}));
-
-jest.mock('hooks/useQueryService', () => ({
-	useQueryService: (): unknown => ({
-		data: [],
-		isLoading: false,
-		isFetching: false,
-		isError: false,
-	}),
-}));
-
-jest.mock('../../../hooks/useSpeechRecognition', () => ({
-	useSpeechRecognition: (): unknown => ({
-		isListening: false,
-		isSupported: false,
-		permission: 'prompt',
-		start: jest.fn(),
-		discard: jest.fn(),
-	}),
-}));
-
-jest.mock('../../../hooks/useAIAssistantAnalyticsContext', () => ({
-	useAIAssistantAnalyticsContext: (): unknown => ({
-		threadId: undefined,
-		page: '/',
-		mode: 'sidepane',
-	}),
-}));
-
-// eslint-disable-next-line import/first
-import ChatInput from '../ChatInput';
-
-describe('ChatInput — alerts context picker', () => {
-	it('lists the rules from one v3 rules request', async () => {
-		const [first, second] = alertRulesFixture;
-		const requests: string[] = [];
-		server.use(
-			rest.get('http://localhost/api/v3/rules', (req, res, ctx) => {
-				requests.push(req.url.search);
-				return res(
-					ctx.status(200),
-					ctx.json(listRulesV3Response([first, second], req.url.searchParams)),
-				);
-			}),
-		);
-
-		render(<ChatInput onSend={jest.fn()} />);
-
-		await userEvent.click(screen.getByRole('button', { name: /add context/i }));
-		await userEvent.click(await screen.findByTestId('ai-context-tab-Alerts'));
-
-		await expect(screen.findByText(first.alert)).resolves.toBeInTheDocument();
-		expect(screen.getByText(second.alert)).toBeInTheDocument();
-		expect(requests).toStrictEqual(['?limit=200']);
-	});
-});

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

@@ -12,12 +12,8 @@ jest.mock('api/generated/services/dashboard', () => ({
 }));
 
 jest.mock('api/generated/services/rules', () => ({
-	useListRulesV3: (): unknown => ({
-		data: undefined,
-		isLoading: false,
-		isError: false,
-	}),
-	getListRulesV3QueryKey: (): string[] => ['rules'],
+	useListRules: (): unknown => ({ data: [], isLoading: false, isError: false }),
+	getListRulesQueryKey: (): string[] => ['rules'],
 }));
 
 jest.mock('hooks/useQueryService', () => ({

frontend/src/container/CreateAlert/index.ts

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

frontend/src/container/CreateAlertChannels/channelConfig.test.ts

@@ -2,12 +2,7 @@ import { AlertmanagertypesGettableNotificationChannelDTO } from 'api/generated/s
 
 import { toChannelConfig, toPostableChannel } from './channelConfig';
 import { toChannelFormState } from './channelFormValues';
-import {
-	ChannelFormValues,
-	ChannelKind,
-	JiraDeployment,
-	WebhookAuth,
-} from './types';
+import { ChannelFormValues, ChannelKind, WebhookAuth } from './types';
 
 const slackValues: ChannelFormValues = {
 	name: 'prod alerts',
@@ -150,11 +145,11 @@ describe('jira reopen duration', () => {
 	])('sends %s as %s, the only spelling the api accepts back', (typed, sent) => {
 		expect(
 			toChannelConfig(ChannelKind.jira, {
-				deployment: JiraDeployment.cloud,
 				site: 'https://acme.atlassian.net',
 				project: 'OPS',
 				issueType: 'Task',
-				auth: { email: 'a@b.c', apiToken: 'tok' },
+				email: 'a@b.c',
+				apiToken: 'tok',
 				reopenDuration: typed,
 			}).spec,
 		).toMatchObject({ reopenDuration: sent });
@@ -166,53 +161,3 @@ describe('jira reopen duration', () => {
 		).toMatchObject({ reopenDuration: 'tomorrow' });
 	});
 });
-
-describe('jira deployment', () => {
-	const base = {
-		site: 'https://jira.acme.com',
-		project: 'OPS',
-		issueType: 'Task',
-	};
-
-	it('sends cloud with email and api token under auth, never the pat', () => {
-		expect(
-			toChannelConfig(ChannelKind.jira, {
-				...base,
-				deployment: JiraDeployment.cloud,
-				auth: { email: 'a@b.c', apiToken: 'tok', pat: 'stale-pat' },
-			}).spec,
-		).toStrictEqual({
-			...base,
-			deployment: 'cloud',
-			auth: { email: 'a@b.c', apiToken: 'tok' },
-		});
-	});
-
-	it('sends selfhosted with the pat under auth, never email or api token', () => {
-		expect(
-			toChannelConfig(ChannelKind.jira, {
-				...base,
-				deployment: JiraDeployment.selfhosted,
-				auth: { email: 'stale@b.c', apiToken: 'stale', pat: 'pat-1' },
-			}).spec,
-		).toStrictEqual({
-			...base,
-			deployment: 'selfhosted',
-			auth: { pat: 'pat-1' },
-		});
-	});
-
-	it('drops blank credentials inside auth', () => {
-		expect(
-			toChannelConfig(ChannelKind.jira, {
-				...base,
-				deployment: JiraDeployment.cloud,
-				auth: { email: 'a@b.c', apiToken: '' },
-			}).spec,
-		).toStrictEqual({
-			...base,
-			deployment: 'cloud',
-			auth: { email: 'a@b.c' },
-		});
-	});
-});

frontend/src/container/CreateAlertChannels/channelConfig.ts

@@ -22,8 +22,6 @@ import {
 	ChannelFormValues,
 	ChannelKind,
 	ChannelSpecFormValues,
-	JiraDeployment,
-	KeysOfUnion,
 	WebhookAuth,
 } from './types';
 import {
@@ -97,11 +95,11 @@ const SPEC_FIELDS = {
 		'sendResolved',
 	] as const satisfies readonly (keyof AlertmanagertypesChannelGoogleChatConfigDTO)[],
 	[ChannelKind.jira]: [
-		'deployment',
 		'site',
 		'project',
 		'issueType',
-		'auth',
+		'email',
+		'apiToken',
 		'summary',
 		'description',
 		'priority',
@@ -147,7 +145,7 @@ const SPEC_FIELDS = {
  * instead, and the error names the missing field.
  */
 type MissingFrom<D, T extends readonly PropertyKey[]> = Exclude<
-	KeysOfUnion<D>,
+	keyof D,
 	T[number]
 >;
 
@@ -232,15 +230,6 @@ export function toChannelConfig(
 		}
 	}
 
-	if (kind === ChannelKind.jira) {
-		const auth = values.auth ?? {};
-		picked.auth = omitBlank(
-			values.deployment === JiraDeployment.selfhosted
-				? pick(auth, ['pat'])
-				: pick(auth, ['email', 'apiToken']),
-		);
-	}
-
 	const spec: Record<string, unknown> = omitBlank(picked);
 
 	// the API answers a read with the duration prometheus would print, and

frontend/src/container/CreateAlertChannels/channelRoundTrip.test.ts

@@ -68,11 +68,11 @@ const SPECS: Record<string, Record<string, unknown>> = {
 		sendResolved: true,
 	},
 	jira: {
-		deployment: 'cloud',
 		site: 'https://acme.atlassian.net',
 		project: 'OPS',
 		issueType: 'Task',
-		auth: { email: 'a@b.c', apiToken: 'tok' },
+		email: 'a@b.c',
+		apiToken: 'tok',
 		summary: 's',
 		description: 'd',
 		priority: 'High',

frontend/src/container/CreateAlertChannels/defaults.ts

@@ -10,7 +10,7 @@ import {
 	AlertmanagertypesChannelTelegramConfigDTO,
 } from 'api/generated/services/sigNoz.schemas';
 
-import { ChannelKind, ChannelSpecFormValues, JiraDeployment } from './types';
+import { ChannelKind, ChannelSpecFormValues } from './types';
 
 // shared by slack and ms teams, both render the same title / description boxes
 export const SlackInitialConfig: Partial<AlertmanagertypesChannelSlackConfigDTO> =
@@ -58,7 +58,6 @@ export const GoogleChatInitialConfig: Partial<AlertmanagertypesChannelGoogleChat
 // wrapped in the ADF status panel + deep-links server-side.
 export const JiraInitialConfig: Partial<AlertmanagertypesChannelJiraConfigDTO> =
 	{
-		deployment: JiraDeployment.cloud,
 		issueType: 'Task',
 		summary: `[{{ .Status | toUpper }}{{ if eq .Status "firing" }}:{{ .Alerts.Firing | len }}{{ end }}] {{ .CommonLabels.alertname }}`,
 		description: `{{ range .Alerts -}}

frontend/src/container/CreateAlertChannels/schemas/jira.ts

@@ -1,40 +1,20 @@
 import { z } from 'zod';
 
-import { JiraDeployment } from '../types';
 import { isValidJiraReopenDuration } from '../utils';
 import { requiredString } from './shared';
 
 const required = requiredString('jira_required_fields');
 
-export const jiraSchema = z
-	.object({
-		deployment: z.enum(JiraDeployment),
-		site: required,
-		auth: z
-			.object({
-				email: z.string().optional(),
-				apiToken: z.string().optional(),
-				pat: z.string().optional(),
-			})
-			.optional(),
-		project: required,
-		issueType: required,
-		reopenDuration: z
-			.string()
-			.optional()
-			.refine((v) => !v || isValidJiraReopenDuration(v), {
-				message: 'jira_reopen_duration_invalid',
-			}),
-	})
-	.refine(
-		(values) =>
-			values.deployment === JiraDeployment.selfhosted ||
-			(!!values.auth?.email?.trim() && !!values.auth?.apiToken?.trim()),
-		{ message: 'jira_cloud_credentials_required', path: ['auth', 'email'] },
-	)
-	.refine(
-		(values) =>
-			values.deployment !== JiraDeployment.selfhosted ||
-			!!values.auth?.pat?.trim(),
-		{ message: 'jira_pat_required', path: ['auth', 'pat'] },
-	);
+export const jiraSchema = z.object({
+	site: required,
+	email: required,
+	apiToken: required,
+	project: required,
+	issueType: required,
+	reopenDuration: z
+		.string()
+		.optional()
+		.refine((v) => !v || isValidJiraReopenDuration(v), {
+			message: 'jira_reopen_duration_invalid',
+		}),
+});

frontend/src/container/CreateAlertChannels/types.ts

@@ -2,7 +2,6 @@ import {
 	AlertmanagertypesChannelEmailConfigDTO,
 	AlertmanagertypesChannelGoogleChatConfigDTO,
 	AlertmanagertypesChannelIncidentIOConfigDTO,
-	AlertmanagertypesChannelJiraAuthDTO,
 	AlertmanagertypesChannelJiraConfigDTO,
 	AlertmanagertypesChannelJSMOpsConfigDTO,
 	AlertmanagertypesChannelKindDTO,
@@ -12,33 +11,11 @@ import {
 	AlertmanagertypesChannelSlackConfigDTO,
 	AlertmanagertypesChannelTelegramConfigDTO,
 	AlertmanagertypesChannelWebhookConfigDTO,
-	AlertmanagertypesJiraDeploymentDTO,
 } from 'api/generated/services/sigNoz.schemas';
 
 export const ChannelKind = AlertmanagertypesChannelKindDTO;
 export type ChannelKind = AlertmanagertypesChannelKindDTO;
 
-export const JiraDeployment = AlertmanagertypesJiraDeploymentDTO;
-export type JiraDeployment = AlertmanagertypesJiraDeploymentDTO;
-
-export type KeysOfUnion<T> = T extends unknown ? keyof T : never;
-
-/** Every key of every member, optional, so a form can hold any member's fields. */
-export type FlattenUnion<T> = {
-	[K in KeysOfUnion<T>]?: T extends unknown
-		? K extends keyof T
-			? T[K]
-			: never
-		: never;
-};
-
-export type JiraFormSpec = Omit<
-	AlertmanagertypesChannelJiraConfigDTO,
-	'auth'
-> & {
-	auth?: FlattenUnion<AlertmanagertypesChannelJiraAuthDTO>;
-};
-
 /** Merged so switching kind keeps the fields the kinds share. */
 export type ChannelSpecFormValues = Partial<
 	AlertmanagertypesChannelSlackConfigDTO &
@@ -48,7 +25,7 @@ export type ChannelSpecFormValues = Partial<
 		AlertmanagertypesChannelOpsgenieConfigDTO &
 		AlertmanagertypesChannelMSTeamsConfigDTO &
 		AlertmanagertypesChannelGoogleChatConfigDTO &
-		JiraFormSpec &
+		AlertmanagertypesChannelJiraConfigDTO &
 		AlertmanagertypesChannelJSMOpsConfigDTO &
 		AlertmanagertypesChannelIncidentIOConfigDTO &
 		AlertmanagertypesChannelTelegramConfigDTO

frontend/src/container/CreateAlertChannels/validation.test.ts

@@ -1,11 +1,6 @@
 import { TFunction } from 'i18next';
 
-import {
-	ChannelFormValues,
-	ChannelKind,
-	JiraDeployment,
-	WebhookAuth,
-} from './types';
+import { ChannelFormValues, ChannelKind, WebhookAuth } from './types';
 import { validateChannel } from './validation';
 
 const t = ((key: string) => key) as TFunction;
@@ -22,50 +17,14 @@ describe('validateChannel', () => {
 			'a jira site that is not on atlassian.net',
 			ChannelKind.jira,
 			{
-				deployment: JiraDeployment.cloud,
 				site: 'https://jira-proxy.acme.com/',
-				auth: { email: 'a@acme.com', apiToken: 't' },
+				email: 'a@acme.com',
+				apiToken: 't',
 				project: 'OPS',
 				issueType: 'Bug',
 			},
 			null,
 		],
-		[
-			'a self-hosted jira site with a personal access token',
-			ChannelKind.jira,
-			{
-				deployment: JiraDeployment.selfhosted,
-				site: 'https://jira.acme.com',
-				auth: { pat: 'pat-1' },
-				project: 'OPS',
-				issueType: 'Task',
-			},
-			null,
-		],
-		[
-			'a self-hosted jira site without a personal access token',
-			ChannelKind.jira,
-			{
-				deployment: JiraDeployment.selfhosted,
-				site: 'https://jira.acme.com',
-				auth: { email: 'a@acme.com', apiToken: 't' },
-				project: 'OPS',
-				issueType: 'Task',
-			},
-			'jira_pat_required',
-		],
-		[
-			'a jira cloud site without an api token',
-			ChannelKind.jira,
-			{
-				deployment: JiraDeployment.cloud,
-				site: 'https://acme.atlassian.net',
-				auth: { email: 'a@acme.com' },
-				project: 'OPS',
-				issueType: 'Task',
-			},
-			'jira_cloud_credentials_required',
-		],
 		[
 			'any incident.io url',
 			ChannelKind.incidentio,

frontend/src/container/CreateAlertRule/AlertRuleDocumentationRedirection.test.tsx

@@ -0,0 +1,136 @@
+import ROUTES from 'constants/routes';
+import * as usePrefillAlertConditions from 'container/FormAlertRules/usePrefillAlertConditions';
+import CreateAlertPage from 'pages/CreateAlert';
+import { act, fireEvent, render } from 'tests/test-utils';
+import { AlertTypes } from 'types/api/alerts/alertTypes';
+
+import { ALERT_TYPE_TO_TITLE, ALERT_TYPE_URL_MAP } from './constants';
+
+jest
+	.spyOn(usePrefillAlertConditions, 'usePrefillAlertConditions')
+	.mockReturnValue({
+		matchType: '3',
+		op: '1',
+		target: 100,
+		targetUnit: 'rpm',
+	});
+
+let mockWindowOpen: jest.Mock;
+
+window.ResizeObserver =
+	window.ResizeObserver ||
+	jest.fn().mockImplementation(() => ({
+		disconnect: jest.fn(),
+		observe: jest.fn(),
+		unobserve: jest.fn(),
+	}));
+
+function findLinkForAlertType(
+	links: HTMLElement[],
+	alertType: AlertTypes,
+): HTMLElement {
+	const link = links.find(
+		(el) =>
+			el.closest('[data-testid]')?.getAttribute('data-testid') ===
+			`alert-type-card-${alertType}`,
+	);
+	expect(link).toBeTruthy();
+	return link as HTMLElement;
+}
+
+function clickLinkAndVerifyRedirect(
+	link: HTMLElement,
+	expectedUrl: string,
+): void {
+	fireEvent.click(link);
+	expect(mockWindowOpen).toHaveBeenCalledWith(expectedUrl, '_blank');
+}
+describe('Alert rule documentation redirection', () => {
+	let renderResult: ReturnType<typeof render>;
+
+	beforeAll(() => {
+		mockWindowOpen = jest.fn();
+		window.open = mockWindowOpen;
+	});
+
+	beforeEach(() => {
+		act(() => {
+			renderResult = render(
+				<CreateAlertPage />,
+				{},
+				{
+					initialRoute: ROUTES.ALERTS_NEW,
+				},
+			);
+		});
+	});
+
+	it('should render alert type cards', () => {
+		const { getByText, getAllByText } = renderResult;
+
+		// Check for the heading
+		expect(getByText('choose_alert_type')).toBeInTheDocument();
+
+		// Check for alert type titles and descriptions
+		Object.values(AlertTypes).forEach((alertType) => {
+			const title = ALERT_TYPE_TO_TITLE[alertType];
+			expect(getByText(title)).toBeInTheDocument();
+			expect(getByText(`${title}_desc`)).toBeInTheDocument();
+		});
+
+		const clickHereLinks = getAllByText(
+			'Click here to see how to create a sample alert.',
+		);
+
+		expect(clickHereLinks).toHaveLength(5);
+	});
+
+	it('should redirect to correct documentation for each alert type', () => {
+		const { getAllByText } = renderResult;
+
+		const clickHereLinks = getAllByText(
+			'Click here to see how to create a sample alert.',
+		);
+		const alertTypeCount = Object.keys(AlertTypes).length;
+
+		expect(clickHereLinks).toHaveLength(alertTypeCount);
+
+		Object.values(AlertTypes).forEach((alertType) => {
+			const linkForAlertType = findLinkForAlertType(clickHereLinks, alertType);
+			const expectedUrl = ALERT_TYPE_URL_MAP[alertType];
+
+			clickLinkAndVerifyRedirect(linkForAlertType, expectedUrl.selection);
+		});
+
+		expect(mockWindowOpen).toHaveBeenCalledTimes(alertTypeCount);
+	});
+});
+
+describe('Create alert page redirection', () => {
+	Object.values(AlertTypes)
+		.filter((type) => type !== AlertTypes.ANOMALY_BASED_ALERT)
+		.forEach((alertType) => {
+			it(`should redirect to create alert page for ${alertType} and "Check an example alert" should redirect to the correct documentation`, () => {
+				const { getByRole } = render(
+					<CreateAlertPage />,
+					{},
+					{
+						initialRoute: `${ROUTES.ALERTS_NEW}?alertType=${alertType}&showClassicCreateAlertsPage=true`,
+					},
+				);
+
+				act(() => {
+					fireEvent.click(
+						getByRole('button', {
+							name: /alert setup guide/i,
+						}),
+					);
+				});
+
+				expect(mockWindowOpen).toHaveBeenCalledWith(
+					ALERT_TYPE_URL_MAP[alertType].creation,
+					'_blank',
+				);
+			});
+		});
+});

frontend/src/container/CreateAlertRule/AnomalyAlertDocumentationRedirection.test.tsx

@@ -0,0 +1,60 @@
+import ROUTES from 'constants/routes';
+import * as usePrefillAlertConditions from 'container/FormAlertRules/usePrefillAlertConditions';
+import CreateAlertPage from 'pages/CreateAlert';
+import { act, fireEvent, render } from 'tests/test-utils';
+import { AlertTypes } from 'types/api/alerts/alertTypes';
+
+import { ALERT_TYPE_URL_MAP } from './constants';
+
+window.ResizeObserver =
+	window.ResizeObserver ||
+	jest.fn().mockImplementation(() => ({
+		disconnect: jest.fn(),
+		observe: jest.fn(),
+		unobserve: jest.fn(),
+	}));
+
+jest.mock('hooks/useSafeNavigate', () => ({
+	useSafeNavigate: (): any => ({
+		safeNavigate: jest.fn(),
+	}),
+}));
+jest
+	.spyOn(usePrefillAlertConditions, 'usePrefillAlertConditions')
+	.mockReturnValue({
+		matchType: '3',
+		op: '1',
+		target: 100,
+		targetUnit: 'rpm',
+	});
+
+describe('Anomaly Alert Documentation Redirection', () => {
+	let mockWindowOpen: jest.Mock;
+
+	beforeAll(() => {
+		mockWindowOpen = jest.fn();
+		window.open = mockWindowOpen;
+	});
+
+	it('should handle anomaly alert documentation redirection correctly', () => {
+		// The setup guide button only exists in the classic form.
+		const { getByRole } = render(<CreateAlertPage />, undefined, {
+			initialRoute: `${ROUTES.ALERTS_NEW}?ruleType=anomaly_rule&showClassicCreateAlertsPage=true`,
+		});
+
+		const alertType = AlertTypes.ANOMALY_BASED_ALERT;
+
+		act(() => {
+			fireEvent.click(
+				getByRole('button', {
+					name: /alert setup guide/i,
+				}),
+			);
+		});
+
+		expect(mockWindowOpen).toHaveBeenCalledWith(
+			ALERT_TYPE_URL_MAP[alertType].creation,
+			'_blank',
+		);
+	});
+});

frontend/src/container/CreateAlertRule/SelectAlertType/index.tsx

@@ -5,7 +5,7 @@ import { Badge } from '@signozhq/ui/badge';
 import { Typography } from '@signozhq/ui/typography';
 import logEvent from 'api/common/logEvent';
 import { ALERTS_DATA_SOURCE_MAP } from 'constants/alerts';
-import { useIsAnomalyDetectionAvailable } from 'container/CreateAlert/useIsAnomalyDetectionAvailable';
+import { useIsAnomalyDetectionAvailable } from 'container/CreateAlertV2/useIsAnomalyDetectionAvailable';
 import { AlertTypes } from 'types/api/alerts/alertTypes';
 import { isModifierKeyPressed } from 'utils/app';
 import { openInNewTab } from 'utils/navigation';

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

@@ -23,9 +23,28 @@ jest.mock('container/TopNav/DateTimeSelectionV2', () => ({
 	},
 }));
 
-jest.mock('container/CreateAlert', () => ({
+jest.mock('container/FormAlertRules', () => ({
 	__esModule: true,
-	default: function MockCreateAlert({
+	default: function MockFormAlertRules({
+		alertType,
+	}: {
+		alertType: AlertTypes;
+	}): JSX.Element {
+		return (
+			<div>
+				<h1>Form Alert Rules</h1>
+				<p>{alertType}</p>
+			</div>
+		);
+	},
+	AlertDetectionTypes: {
+		THRESHOLD_ALERT: 'threshold_rule',
+		ANOMALY_DETECTION_ALERT: 'anomaly_rule',
+	},
+}));
+jest.mock('container/CreateAlertV2', () => ({
+	__esModule: true,
+	default: function MockCreateAlertV2({
 		alertType,
 	}: {
 		alertType: AlertTypes;
@@ -57,6 +76,7 @@ const mockGetUrlQuery = jest.fn();
 const mockSafeNavigate = jest.fn();
 const mockDeleteUrlQuery = jest.fn();
 
+const FORM_ALERT_RULES_TEXT = 'Form Alert Rules';
 const CREATE_ALERT_V2_TEXT = 'Create Alert V2';
 
 describe('CreateAlertRule', () => {
@@ -75,6 +95,20 @@ describe('CreateAlertRule', () => {
 		useAppContextSpy.mockReturnValue(getAppContextMockState());
 	});
 
+	it('should render classic flow when showClassicCreateAlertsPage is true', () => {
+		mockGetUrlQuery.mockImplementation((key: string) => {
+			if (key === QueryParams.showClassicCreateAlertsPage) {
+				return 'true';
+			}
+			if (key === QueryParams.alertType) {
+				return AlertTypes.METRICS_BASED_ALERT;
+			}
+			return null;
+		});
+		render(<CreateAlertRule />);
+		expect(screen.getByText(FORM_ALERT_RULES_TEXT)).toBeInTheDocument();
+	});
+
 	it('should render new flow when alertType is provided', () => {
 		mockGetUrlQuery.mockImplementation((key: string) => {
 			if (key === QueryParams.alertType) {
@@ -90,6 +124,7 @@ describe('CreateAlertRule', () => {
 		mockGetUrlQuery.mockReturnValue(null);
 		useCompositeQueryParamSpy.mockReturnValue(null);
 		render(<CreateAlertRule />);
+		expect(screen.queryByText(FORM_ALERT_RULES_TEXT)).not.toBeInTheDocument();
 		expect(screen.queryByText(CREATE_ALERT_V2_TEXT)).not.toBeInTheDocument();
 	});
 
@@ -114,6 +149,9 @@ describe('CreateAlertRule', () => {
 
 	it('should render new flow with the anomaly alert type when ruleType is anomaly_rule', () => {
 		mockGetUrlQuery.mockImplementation((key: string) => {
+			if (key === QueryParams.showClassicCreateAlertsPage) {
+				return 'false';
+			}
 			if (key === QueryParams.ruleType) {
 				return 'anomaly_rule';
 			}
@@ -122,6 +160,7 @@ describe('CreateAlertRule', () => {
 		render(<CreateAlertRule />);
 		expect(screen.getByText(CREATE_ALERT_V2_TEXT)).toBeInTheDocument();
 		expect(screen.getByText(AlertTypes.ANOMALY_BASED_ALERT)).toBeInTheDocument();
+		expect(screen.queryByText(FORM_ALERT_RULES_TEXT)).not.toBeInTheDocument();
 	});
 
 	it('should use alertType from URL when provided', () => {
@@ -245,5 +284,27 @@ describe('CreateAlertRule', () => {
 			);
 			expect(mockSafeNavigate).toHaveBeenCalled();
 		});
+
+		it('should navigate even when showClassicCreateAlertsPage flag is present', () => {
+			mockGetUrlQuery.mockImplementation((key: string) => {
+				if (key === QueryParams.showClassicCreateAlertsPage) {
+					return 'true';
+				}
+				return null;
+			});
+
+			render(<CreateAlertRule />);
+			fireEvent.click(screen.getByText('metric_based_alert'));
+
+			expect(mockSetUrlQuery).toHaveBeenCalledWith(
+				QueryParams.ruleType,
+				'threshold_rule',
+			);
+			expect(mockSetUrlQuery).toHaveBeenCalledWith(
+				QueryParams.alertType,
+				AlertTypes.METRICS_BASED_ALERT,
+			);
+			expect(mockSafeNavigate).toHaveBeenCalled();
+		});
 	});
 });

frontend/src/container/CreateAlertRule/defaults.ts

@@ -1,10 +1,10 @@
-import { RuletypesRuleTypeDTO } from 'api/generated/services/sigNoz.schemas';
 import { ENTITY_VERSION_V5 } from 'constants/app';
 import {
 	initialQueryBuilderFormValuesMap,
 	initialQueryPromQLData,
 	PANEL_TYPES,
 } from 'constants/queryBuilder';
+import { AlertDetectionTypes } from 'container/FormAlertRules';
 import { AlertTypes } from 'types/api/alerts/alertTypes';
 import {
 	AlertDef,
@@ -63,7 +63,7 @@ export const alertDefaults: AlertDef = {
 export const anamolyAlertDefaults: AlertDef = {
 	alertType: AlertTypes.METRICS_BASED_ALERT,
 	version: ENTITY_VERSION_V5,
-	ruleType: RuletypesRuleTypeDTO.anomaly_rule,
+	ruleType: AlertDetectionTypes.ANOMALY_DETECTION_ALERT,
 	condition: {
 		compositeQuery: {
 			builderQueries: {
@@ -201,6 +201,14 @@ export const exceptionAlertDefaults: AlertDef = {
 	alert: '',
 };
 
+export const ALERTS_VALUES_MAP: Record<AlertTypes, AlertDef> = {
+	[AlertTypes.ANOMALY_BASED_ALERT]: anamolyAlertDefaults,
+	[AlertTypes.METRICS_BASED_ALERT]: alertDefaults,
+	[AlertTypes.LOGS_BASED_ALERT]: logAlertDefaults,
+	[AlertTypes.TRACES_BASED_ALERT]: traceAlertDefaults,
+	[AlertTypes.EXCEPTIONS_BASED_ALERT]: exceptionAlertDefaults,
+};
+
 export const ALERT_TYPE_BREADCRUMB_TITLE: Record<AlertTypes, string> = {
 	[AlertTypes.ANOMALY_BASED_ALERT]: 'Anomaly-Based Alert',
 	[AlertTypes.METRICS_BASED_ALERT]: 'Metric-Based Alert',

frontend/src/container/CreateAlertRule/index.tsx

@@ -1,13 +1,14 @@
 import { useCallback, useEffect, useMemo } from 'react';
-import { Tabs, TabsProps } from 'antd';
+import { Form, Tabs, TabsProps } from 'antd';
 import logEvent from 'api/common/logEvent';
-import { RuletypesRuleTypeDTO } from 'api/generated/services/sigNoz.schemas';
 import ConfigureIcon from 'assets/AlertHistory/ConfigureIcon';
 import AlertBreadcrumb from 'components/AlertBreadcrumb';
 import HeaderRightSection from 'components/HeaderRightSection/HeaderRightSection';
+import { ENTITY_VERSION_V5 } from 'constants/app';
 import { QueryParams } from 'constants/query';
 import ROUTES from 'constants/routes';
-import CreateAlert from 'container/CreateAlert';
+import CreateAlertV2 from 'container/CreateAlertV2';
+import FormAlertRules, { AlertDetectionTypes } from 'container/FormAlertRules';
 import DateTimeSelector from 'container/TopNav/DateTimeSelectionV2';
 import { useGetCompositeQueryParam } from 'hooks/queryBuilder/useGetCompositeQueryParam';
 import { useSafeNavigate } from 'hooks/useSafeNavigate';
@@ -15,20 +16,25 @@ import useUrlQuery from 'hooks/useUrlQuery';
 import { AlertListTabs } from 'pages/AlertList/types';
 import { GalleryVerticalEnd, Pyramid } from '@signozhq/icons';
 import { AlertTypes } from 'types/api/alerts/alertTypes';
+import { AlertDef } from 'types/api/alerts/def';
 
 import { ALERT_TYPE_VS_SOURCE_MAPPING } from './config';
-import { ALERT_TYPE_BREADCRUMB_TITLE } from './defaults';
+import { ALERTS_VALUES_MAP, ALERT_TYPE_BREADCRUMB_TITLE } from './defaults';
 import SelectAlertType from './SelectAlertType';
 
 import './CreateAlertRule.styles.scss';
 
 function CreateRules(): JSX.Element {
+	const [formInstance] = Form.useForm();
 	const compositeQuery = useGetCompositeQueryParam();
 	const queryParams = useUrlQuery();
 	const { safeNavigate } = useSafeNavigate();
 
 	const ruleTypeFromURL = queryParams.get(QueryParams.ruleType);
 	const alertTypeFromURL = queryParams.get(QueryParams.alertType);
+	const version = queryParams.get(QueryParams.version);
+	const showClassicCreateAlertsPageFlag =
+		queryParams.get(QueryParams.showClassicCreateAlertsPage) === 'true';
 
 	const isTypeSelectionMode =
 		!alertTypeFromURL && !ruleTypeFromURL && !compositeQuery;
@@ -40,7 +46,7 @@ function CreateRules(): JSX.Element {
 	}, [isTypeSelectionMode]);
 
 	const alertType = useMemo(() => {
-		if (ruleTypeFromURL === RuletypesRuleTypeDTO.anomaly_rule) {
+		if (ruleTypeFromURL === AlertDetectionTypes.ANOMALY_DETECTION_ALERT) {
 			return AlertTypes.ANOMALY_BASED_ALERT;
 		}
 		if (!alertTypeFromURL) {
@@ -53,6 +59,14 @@ function CreateRules(): JSX.Element {
 		return alertTypeFromURL as AlertTypes;
 	}, [alertTypeFromURL, ruleTypeFromURL, compositeQuery?.builder.queryData]);
 
+	const initialAlertValue: AlertDef = useMemo(
+		() => ({
+			...ALERTS_VALUES_MAP[alertType],
+			version: version || ENTITY_VERSION_V5,
+		}),
+		[alertType, version],
+	);
+
 	const handleTabChange = useCallback(
 		(tab: string): void => {
 			queryParams.set('tab', tab);
@@ -66,10 +80,13 @@ function CreateRules(): JSX.Element {
 	const handleSelectType = useCallback(
 		(type: AlertTypes, newTab?: boolean): void => {
 			if (type === AlertTypes.ANOMALY_BASED_ALERT) {
-				queryParams.set(QueryParams.ruleType, RuletypesRuleTypeDTO.anomaly_rule);
+				queryParams.set(
+					QueryParams.ruleType,
+					AlertDetectionTypes.ANOMALY_DETECTION_ALERT,
+				);
 				queryParams.set(QueryParams.alertType, AlertTypes.METRICS_BASED_ALERT);
 			} else {
-				queryParams.set(QueryParams.ruleType, RuletypesRuleTypeDTO.threshold_rule);
+				queryParams.set(QueryParams.ruleType, AlertDetectionTypes.THRESHOLD_ALERT);
 				queryParams.set(QueryParams.alertType, type);
 			}
 
@@ -82,8 +99,26 @@ function CreateRules(): JSX.Element {
 		if (isTypeSelectionMode) {
 			return <SelectAlertType onSelect={handleSelectType} />;
 		}
-		return <CreateAlert alertType={alertType} />;
-	}, [isTypeSelectionMode, handleSelectType, alertType]);
+
+		if (showClassicCreateAlertsPageFlag) {
+			return (
+				<FormAlertRules
+					alertType={alertType}
+					formInstance={formInstance}
+					initialValue={initialAlertValue}
+					ruleId=""
+				/>
+			);
+		}
+		return <CreateAlertV2 alertType={alertType} />;
+	}, [
+		isTypeSelectionMode,
+		handleSelectType,
+		showClassicCreateAlertsPageFlag,
+		alertType,
+		formInstance,
+		initialAlertValue,
+	]);
 
 	const items: TabsProps['items'] = [
 		{

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

@@ -111,8 +111,8 @@ jest.mock('constants/formats/alertFormatCategories', () => ({
 	]),
 }));
 
-jest.mock('container/CreateAlert/utils', () => ({
-	...jest.requireActual('container/CreateAlert/utils'),
+jest.mock('container/CreateAlertV2/utils', () => ({
+	...jest.requireActual('container/CreateAlertV2/utils'),
 }));
 
 const TEST_STRINGS = {

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

@@ -1,4 +1,4 @@
-import { createMockAlertContextState } from 'container/CreateAlert/EvaluationSettings/__tests__/testUtils';
+import { createMockAlertContextState } from 'container/CreateAlertV2/EvaluationSettings/__tests__/testUtils';
 import { render, screen, userEvent, within } from 'tests/test-utils';
 import { ChannelOption } from 'hooks/notificationChannels/useChannelOptions';
 

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

@@ -1,6 +1,6 @@
 import { fireEvent, render, screen } from '@testing-library/react';
 import type { DefaultOptionType } from 'antd/es/select';
-import { createMockAlertContextState } from 'container/CreateAlert/EvaluationSettings/__tests__/testUtils';
+import { createMockAlertContextState } from 'container/CreateAlertV2/EvaluationSettings/__tests__/testUtils';
 import { getAppContextMockState } from 'container/RoutingPolicies/__tests__/testUtils';
 import * as appHooks from 'providers/App/App';
 import { ChannelOption } from 'hooks/notificationChannels/useChannelOptions';

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

@@ -9,7 +9,7 @@ import ROUTES from 'constants/routes';
 import {
 	AlertThresholdMatchType,
 	AlertThresholdOperator,
-} from 'container/CreateAlert/context/types';
+} from 'container/CreateAlertV2/context/types';
 import { getSelectedQueryOptions } from 'container/FormAlertRules/utils';
 import { useSafeNavigate } from 'hooks/useSafeNavigate';
 import { ArrowRight } from '@signozhq/icons';

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

@@ -1,7 +1,14 @@
 import { useCallback, useMemo } from 'react';
+import { Button } from '@signozhq/ui/button';
 import { Input } from '@signozhq/ui/input';
+import logEvent from 'api/common/logEvent';
 import classNames from 'classnames';
+import { QueryParams } from 'constants/query';
+import ROUTES from 'constants/routes';
 import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
+import { useSafeNavigate } from 'hooks/useSafeNavigate';
+import useUrlQuery from 'hooks/useUrlQuery';
+import { RotateCcw } from '@signozhq/icons';
 import { useAlertRuleOptional } from 'providers/Alert';
 import { Labels } from 'types/api/alerts/def';
 
@@ -15,6 +22,8 @@ function CreateAlertHeader(): JSX.Element {
 	const alertRuleContext = useAlertRuleOptional();
 
 	const { currentQuery } = useQueryBuilder();
+	const { safeNavigate } = useSafeNavigate();
+	const urlQuery = useUrlQuery();
 
 	const groupByLabels = useMemo(() => {
 		const labels = new Array<string>();
@@ -37,6 +46,14 @@ function CreateAlertHeader(): JSX.Element {
 		[groupByLabels],
 	);
 
+	const handleSwitchToClassicExperience = useCallback(() => {
+		logEvent('Alert: Switch to classic experience button clicked', {});
+
+		urlQuery.set(QueryParams.showClassicCreateAlertsPage, 'true');
+		const url = `${ROUTES.ALERTS_NEW}?${urlQuery.toString()}`;
+		safeNavigate(url, { replace: true });
+	}, [safeNavigate, urlQuery]);
+
 	return (
 		<div
 			className={classNames('alert-header', { 'edit-alert-header': isEditMode })}
@@ -44,6 +61,15 @@ function CreateAlertHeader(): JSX.Element {
 			{!isEditMode && (
 				<div className="alert-header__tab-bar">
 					<div className="alert-header__tab">New Alert Rule</div>
+					<Button
+						prefix={<RotateCcw size={12} />}
+						onClick={handleSwitchToClassicExperience}
+						variant="solid"
+						color="secondary"
+						size="sm"
+					>
+						Switch to Classic Experience
+					</Button>
 				</div>
 			)}
 			<div className="alert-header__content">

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

@@ -1,6 +1,9 @@
 import { fireEvent, render, screen } from '@testing-library/react';
-import { defaultPostableAlertRuleV2 } from 'container/CreateAlert/constants';
-import { getCreateAlertLocalStateFromAlertDef } from 'container/CreateAlert/utils';
+import { QueryParams } from 'constants/query';
+import ROUTES from 'constants/routes';
+import { defaultPostableAlertRuleV2 } from 'container/CreateAlertV2/constants';
+import { getCreateAlertLocalStateFromAlertDef } from 'container/CreateAlertV2/utils';
+import * as useSafeNavigateHook from 'hooks/useSafeNavigate';
 import { mockAppLocation } from 'tests/router-mocks';
 import { AlertTypes } from 'types/api/alerts/alertTypes';
 
@@ -8,6 +11,11 @@ import * as rulesHook from '../../../../api/generated/services/rules';
 import { CreateAlertProvider } from '../../context';
 import CreateAlertHeader from '../CreateAlertHeader';
 
+const mockSafeNavigate = jest.fn();
+jest.spyOn(useSafeNavigateHook, 'useSafeNavigate').mockReturnValue({
+	safeNavigate: mockSafeNavigate,
+});
+
 jest.spyOn(rulesHook, 'useCreateRule').mockReturnValue({
 	mutate: jest.fn(),
 	isLoading: false,
@@ -93,4 +101,37 @@ describe('CreateAlertHeader', () => {
 			screen.getByPlaceholderText(ENTER_ALERT_RULE_NAME_PLACEHOLDER),
 		).toHaveValue('TEST_ALERT');
 	});
+
+	it('should navigate to classic experience when button is clicked', () => {
+		renderCreateAlertHeader();
+		const switchToClassicExperienceButton = screen.getByText(
+			'Switch to Classic Experience',
+		);
+		expect(switchToClassicExperienceButton).toBeInTheDocument();
+		fireEvent.click(switchToClassicExperienceButton);
+
+		const params = new URLSearchParams();
+		params.set(QueryParams.showClassicCreateAlertsPage, 'true');
+		expect(mockSafeNavigate).toHaveBeenCalledWith(
+			`${ROUTES.ALERTS_NEW}?${params.toString()}`,
+			{ replace: true },
+		);
+	});
+
+	it('should not render "switch to classic experience" button when isEditMode is true', () => {
+		render(
+			<CreateAlertProvider
+				isEditMode
+				initialAlertType={AlertTypes.METRICS_BASED_ALERT}
+				initialAlertState={getCreateAlertLocalStateFromAlertDef(
+					defaultPostableAlertRuleV2,
+				)}
+			>
+				<CreateAlertHeader />
+			</CreateAlertProvider>,
+		);
+		expect(
+			screen.queryByText('Switch to Classic Experience'),
+		).not.toBeInTheDocument();
+	});
 });

frontend/src/container/CreateAlertV2/CreateAlertV2.tsx

@@ -9,12 +9,12 @@ import CreateAlertHeader from './CreateAlertHeader';
 import Footer from './Footer';
 import NotificationSettings from './NotificationSettings';
 import QuerySection from './QuerySection';
-import { CreateAlertProps } from './types';
+import { CreateAlertV2Props } from './types';
 import { Spinner } from './utils';
 
-import './CreateAlert.styles.scss';
+import './CreateAlertV2.styles.scss';
 
-function CreateAlert({ alertType }: CreateAlertProps): JSX.Element {
+function CreateAlertV2({ alertType }: CreateAlertV2Props): JSX.Element {
 	const queryToRedirect = buildInitialAlertDef(alertType);
 	const currentQueryToRedirect = mapQueryDataFromApi(
 		queryToRedirect.condition.compositeQuery,
@@ -36,8 +36,8 @@ function CreateAlert({ alertType }: CreateAlertProps): JSX.Element {
 	);
 }
 
-CreateAlert.defaultProps = {
+CreateAlertV2.defaultProps = {
 	initialQuery: initialQueriesMap.metrics,
 };
 
-export default CreateAlert;
+export default CreateAlertV2;

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

@@ -1,9 +1,9 @@
 import { useMemo } from 'react';
 import { Button } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
-import { useCreateAlertState } from 'container/CreateAlert/context';
-import { INITIAL_ADVANCED_OPTIONS_STATE } from 'container/CreateAlert/context/constants';
-import { IEditCustomScheduleProps } from 'container/CreateAlert/EvaluationSettings/types';
+import { useCreateAlertState } from 'container/CreateAlertV2/context';
+import { INITIAL_ADVANCED_OPTIONS_STATE } from 'container/CreateAlertV2/context/constants';
+import { IEditCustomScheduleProps } from 'container/CreateAlertV2/EvaluationSettings/types';
 import { Calendar1, Pencil, Trash } from '@signozhq/icons';
 
 function EditCustomSchedule({

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

@@ -2,8 +2,8 @@ import { useEffect, useMemo, useState } from 'react';
 import { Button, DatePicker, Input, Select } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
 import classNames from 'classnames';
-import { useCreateAlertState } from 'container/CreateAlert/context';
-import { AdvancedOptionsState } from 'container/CreateAlert/context/types';
+import { useCreateAlertState } from 'container/CreateAlertV2/context';
+import { AdvancedOptionsState } from 'container/CreateAlertV2/context/types';
 import dayjs from 'dayjs';
 import { Code, PencilLine } from '@signozhq/icons';