fix(settings): remove notification channels from settings nav (#13225)

#### Description

- Removed the Notification Channels entry from the settings side nav;
the channel screens are still reachable at their own route.
- Renamed the `shift+g+n` shortcut from
`NavigateToSettingsNotificationChannels` to
`NavigateToNotificationChannels`, since it no longer points into
Settings. The key binding and target route are unchanged.
- Updated the Settings nav test so it checks that the entry is gone.

Closes https://github.com/SigNoz/pulse-pod/issues/240

#### Additional Information

Resolves the TODO linked to SigNoz/engineering-pod#5323.

docs/api/openapi.yml

@@ -9656,34 +9656,35 @@ components:
           type: string
         disabled:
           type: boolean
+        evalWindow:
+          type: string
         evaluation:
           $ref: '#/components/schemas/RuletypesEvaluationEnvelope'
+        frequency:
+          type: string
         labels:
           additionalProperties:
             type: string
           type: object
         notificationSettings:
           $ref: '#/components/schemas/RuletypesNotificationSettings'
+        preferredChannels:
+          items:
+            type: string
+          type: array
         ruleType:
           $ref: '#/components/schemas/RuletypesRuleType'
         schemaVersion:
-          enum:
-          - v2alpha1
           type: string
         source:
-          deprecated: true
           type: string
         version:
-          deprecated: true
           type: string
       required:
       - alert
       - alertType
       - ruleType
       - condition
-      - evaluation
-      - schemaVersion
-      - notificationSettings
       type: object
     RuletypesPostableRuleView:
       properties:
@@ -9744,8 +9745,12 @@ components:
           type: string
         disabled:
           type: boolean
+        evalWindow:
+          type: string
         evaluation:
           $ref: '#/components/schemas/RuletypesEvaluationEnvelope'
+        frequency:
+          type: string
         id:
           type: string
         labels:
@@ -9754,14 +9759,15 @@ components:
           type: object
         notificationSettings:
           $ref: '#/components/schemas/RuletypesNotificationSettings'
+        preferredChannels:
+          items:
+            type: string
+          type: array
         ruleType:
           $ref: '#/components/schemas/RuletypesRuleType'
         schemaVersion:
-          enum:
-          - v2alpha1
           type: string
         source:
-          deprecated: true
           type: string
         state:
           $ref: '#/components/schemas/RuletypesAlertState'
@@ -9771,7 +9777,6 @@ components:
         updatedBy:
           type: string
         version:
-          deprecated: true
           type: string
       required:
       - id
@@ -9780,9 +9785,6 @@ components:
       - alertType
       - ruleType
       - condition
-      - evaluation
-      - schemaVersion
-      - notificationSettings
       type: object
     RuletypesRuleCondition:
       properties:
@@ -9791,8 +9793,14 @@ components:
           type: integer
         alertOnAbsent:
           type: boolean
+        algorithm:
+          type: string
         compositeQuery:
           $ref: '#/components/schemas/RuletypesAlertCompositeQuery'
+        matchType:
+          $ref: '#/components/schemas/RuletypesMatchType'
+        op:
+          $ref: '#/components/schemas/RuletypesCompareOperator'
         requireMinPoints:
           type: boolean
         requiredNumPoints:
@@ -9801,11 +9809,16 @@ components:
           $ref: '#/components/schemas/RuletypesSeasonality'
         selectedQueryName:
           type: string
+        target:
+          format: double
+          nullable: true
+          type: number
+        targetUnit:
+          type: string
         thresholds:
           $ref: '#/components/schemas/RuletypesRuleThresholdData'
       required:
       - compositeQuery
-      - thresholds
       type: object
     RuletypesRuleThresholdData:
       discriminator:
@@ -22430,6 +22443,56 @@ paths:
       - rules
       x-signoz-stability: alpha
   /api/v2/rules:
+    get:
+      deprecated: true
+      description: 'This endpoint lists all alert rules with their current evaluation
+        state. Deprecated: use ListRulesV3, which supports filtering, sorting and
+        pagination.'
+      operationId: ListRules
+      responses:
+        "200":
+          content:
+            application/json:
+              schema:
+                properties:
+                  data:
+                    items:
+                      $ref: '#/components/schemas/RuletypesRule'
+                    type: array
+                  status:
+                    type: string
+                required:
+                - status
+                - data
+                type: object
+          description: OK
+        "401":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RenderErrorResponse'
+          description: Unauthorized
+        "403":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RenderErrorResponse'
+          description: Forbidden
+        "500":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RenderErrorResponse'
+          description: Internal Server Error
+      security:
+      - api_key:
+        - VIEWER
+      - tokenizer:
+        - VIEWER
+      summary: List alert rules
+      tags:
+      - rules
+      x-signoz-stability: alpha
     post:
       deprecated: false
       description: This endpoint creates a new alert rule
@@ -22588,13 +22651,13 @@ paths:
                   schemaVersion: v2alpha1
                   version: v5
               metric_anomaly:
-                description: Wraps a builder query in the `anomaly` function with
-                  daily seasonality, so SigNoz compares each point against the forecast
-                  for that time of day. The threshold is compared against the signed
-                  anomaly score, so `below` with a target of -2 fires when an abrupt
-                  drop holds for the entire window; `requireMinPoints` guards against
-                  noisy intervals.
-                summary: Metric anomaly rule
+                description: Anomaly rules are not yet supported under schemaVersion
+                  v2alpha1, so this example uses the v1 shape. Wraps a builder query
+                  in the `anomaly` function with daily seasonality SigNoz compares
+                  each point against the forecast for that time of day. Fires when
+                  the anomaly score stays below the threshold for the entire window;
+                  `requireMinPoints` guards against noisy intervals.
+                summary: Metric anomaly rule (v1 only)
                 value:
                   alert: Anomalous drop in ingested spans
                   alertType: METRIC_BASED_ALERT
@@ -22629,36 +22692,22 @@ paths:
                           stepInterval: 21600
                         type: builder_query
                       queryType: builder
+                    matchType: all_the_times
+                    op: below
                     requireMinPoints: true
                     requiredNumPoints: 3
                     seasonality: daily
                     selectedQueryName: A
-                    thresholds:
-                      kind: basic
-                      spec:
-                      - channels:
-                        - slack-ingestion
-                        matchType: all_the_times
-                        name: warning
-                        op: below
-                        target: -2
+                    target: 2
                   description: Detect an abrupt drop in span ingestion using a z-score
                     anomaly function
-                  evaluation:
-                    kind: rolling
-                    spec:
-                      evalWindow: 24h
-                      frequency: 3h
+                  evalWindow: 24h
+                  frequency: 3h
                   labels:
                     severity: warning
-                  notificationSettings:
-                    renotify:
-                      alertStates:
-                      - firing
-                      enabled: true
-                      interval: 4h
+                  preferredChannels:
+                  - slack-ingestion
                   ruleType: anomaly_rule
-                  schemaVersion: v2alpha1
                   version: v5
               metric_promql:
                 description: PromQL expression instead of the builder. Dotted OTEL
@@ -23554,13 +23603,13 @@ paths:
                   schemaVersion: v2alpha1
                   version: v5
               metric_anomaly:
-                description: Wraps a builder query in the `anomaly` function with
-                  daily seasonality, so SigNoz compares each point against the forecast
-                  for that time of day. The threshold is compared against the signed
-                  anomaly score, so `below` with a target of -2 fires when an abrupt
-                  drop holds for the entire window; `requireMinPoints` guards against
-                  noisy intervals.
-                summary: Metric anomaly rule
+                description: Anomaly rules are not yet supported under schemaVersion
+                  v2alpha1, so this example uses the v1 shape. Wraps a builder query
+                  in the `anomaly` function with daily seasonality SigNoz compares
+                  each point against the forecast for that time of day. Fires when
+                  the anomaly score stays below the threshold for the entire window;
+                  `requireMinPoints` guards against noisy intervals.
+                summary: Metric anomaly rule (v1 only)
                 value:
                   alert: Anomalous drop in ingested spans
                   alertType: METRIC_BASED_ALERT
@@ -23595,36 +23644,22 @@ paths:
                           stepInterval: 21600
                         type: builder_query
                       queryType: builder
+                    matchType: all_the_times
+                    op: below
                     requireMinPoints: true
                     requiredNumPoints: 3
                     seasonality: daily
                     selectedQueryName: A
-                    thresholds:
-                      kind: basic
-                      spec:
-                      - channels:
-                        - slack-ingestion
-                        matchType: all_the_times
-                        name: warning
-                        op: below
-                        target: -2
+                    target: 2
                   description: Detect an abrupt drop in span ingestion using a z-score
                     anomaly function
-                  evaluation:
-                    kind: rolling
-                    spec:
-                      evalWindow: 24h
-                      frequency: 3h
+                  evalWindow: 24h
+                  frequency: 3h
                   labels:
                     severity: warning
-                  notificationSettings:
-                    renotify:
-                      alertStates:
-                      - firing
-                      enabled: true
-                      interval: 4h
+                  preferredChannels:
+                  - slack-ingestion
                   ruleType: anomaly_rule
-                  schemaVersion: v2alpha1
                   version: v5
               metric_promql:
                 description: PromQL expression instead of the builder. Dotted OTEL
@@ -24421,13 +24456,13 @@ paths:
                   schemaVersion: v2alpha1
                   version: v5
               metric_anomaly:
-                description: Wraps a builder query in the `anomaly` function with
-                  daily seasonality, so SigNoz compares each point against the forecast
-                  for that time of day. The threshold is compared against the signed
-                  anomaly score, so `below` with a target of -2 fires when an abrupt
-                  drop holds for the entire window; `requireMinPoints` guards against
-                  noisy intervals.
-                summary: Metric anomaly rule
+                description: Anomaly rules are not yet supported under schemaVersion
+                  v2alpha1, so this example uses the v1 shape. Wraps a builder query
+                  in the `anomaly` function with daily seasonality SigNoz compares
+                  each point against the forecast for that time of day. Fires when
+                  the anomaly score stays below the threshold for the entire window;
+                  `requireMinPoints` guards against noisy intervals.
+                summary: Metric anomaly rule (v1 only)
                 value:
                   alert: Anomalous drop in ingested spans
                   alertType: METRIC_BASED_ALERT
@@ -24462,36 +24497,22 @@ paths:
                           stepInterval: 21600
                         type: builder_query
                       queryType: builder
+                    matchType: all_the_times
+                    op: below
                     requireMinPoints: true
                     requiredNumPoints: 3
                     seasonality: daily
                     selectedQueryName: A
-                    thresholds:
-                      kind: basic
-                      spec:
-                      - channels:
-                        - slack-ingestion
-                        matchType: all_the_times
-                        name: warning
-                        op: below
-                        target: -2
+                    target: 2
                   description: Detect an abrupt drop in span ingestion using a z-score
                     anomaly function
-                  evaluation:
-                    kind: rolling
-                    spec:
-                      evalWindow: 24h
-                      frequency: 3h
+                  evalWindow: 24h
+                  frequency: 3h
                   labels:
                     severity: warning
-                  notificationSettings:
-                    renotify:
-                      alertStates:
-                      - firing
-                      enabled: true
-                      interval: 4h
+                  preferredChannels:
+                  - slack-ingestion
                   ruleType: anomaly_rule
-                  schemaVersion: v2alpha1
                   version: v5
               metric_promql:
                 description: PromQL expression instead of the builder. Dotted OTEL
@@ -25866,13 +25887,13 @@ paths:
                   schemaVersion: v2alpha1
                   version: v5
               metric_anomaly:
-                description: Wraps a builder query in the `anomaly` function with
-                  daily seasonality, so SigNoz compares each point against the forecast
-                  for that time of day. The threshold is compared against the signed
-                  anomaly score, so `below` with a target of -2 fires when an abrupt
-                  drop holds for the entire window; `requireMinPoints` guards against
-                  noisy intervals.
-                summary: Metric anomaly rule
+                description: Anomaly rules are not yet supported under schemaVersion
+                  v2alpha1, so this example uses the v1 shape. Wraps a builder query
+                  in the `anomaly` function with daily seasonality SigNoz compares
+                  each point against the forecast for that time of day. Fires when
+                  the anomaly score stays below the threshold for the entire window;
+                  `requireMinPoints` guards against noisy intervals.
+                summary: Metric anomaly rule (v1 only)
                 value:
                   alert: Anomalous drop in ingested spans
                   alertType: METRIC_BASED_ALERT
@@ -25907,36 +25928,22 @@ paths:
                           stepInterval: 21600
                         type: builder_query
                       queryType: builder
+                    matchType: all_the_times
+                    op: below
                     requireMinPoints: true
                     requiredNumPoints: 3
                     seasonality: daily
                     selectedQueryName: A
-                    thresholds:
-                      kind: basic
-                      spec:
-                      - channels:
-                        - slack-ingestion
-                        matchType: all_the_times
-                        name: warning
-                        op: below
-                        target: -2
+                    target: 2
                   description: Detect an abrupt drop in span ingestion using a z-score
                     anomaly function
-                  evaluation:
-                    kind: rolling
-                    spec:
-                      evalWindow: 24h
-                      frequency: 3h
+                  evalWindow: 24h
+                  frequency: 3h
                   labels:
                     severity: warning
-                  notificationSettings:
-                    renotify:
-                      alertStates:
-                      - firing
-                      enabled: true
-                      interval: 4h
+                  preferredChannels:
+                  - slack-ingestion
                   ruleType: anomaly_rule
-                  schemaVersion: v2alpha1
                   version: v5
               metric_promql:
                 description: PromQL expression instead of the builder. Dotted OTEL

ee/query-service/rules/anomaly.go

@@ -105,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),
@@ -420,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/src/constants/shortcuts/globalShortcuts.ts

@@ -2,6 +2,7 @@ export const GlobalShortcuts = {
 	NavigateToServices: 'shift+s',
 	NavigateToDashboards: 'shift+d',
 	NavigateToAlerts: 'shift+a',
+	NavigateToNotificationChannels: 'shift+g+n',
 	NavigateToExceptions: 'shift+e',
 	NavigateToMessagingQueues: 'shift+q',
 	ToggleSidebar: 'shift+b',
@@ -23,7 +24,6 @@ export const GlobalShortcuts = {
 	NavigateToSettings: 'shift+g',
 	NavigateToSettingsIngestion: 'shift+g+i',
 	NavigateToSettingsBilling: 'shift+g+b',
-	NavigateToSettingsNotificationChannels: 'shift+g+n',
 	NavigateToSettingsServiceAccounts: 'shift+g+k',
 	NavigateToSettingsRoles: 'shift+g+r',
 	NavigateToSettingsMembers: 'shift+g+m',
@@ -34,6 +34,7 @@ export const GlobalShortcutsName = {
 	NavigateToTraces: 'shift+t',
 	NavigateToDashboards: 'shift+d',
 	NavigateToAlerts: 'shift+a',
+	NavigateToNotificationChannels: 'shift+g+n',
 	NavigateToExceptions: 'shift+e',
 	NavigateToMessagingQueues: 'shift+q',
 	ToggleSidebar: 'shift+b',
@@ -44,7 +45,6 @@ export const GlobalShortcutsName = {
 	NavigateToSettings: 'shift+g',
 	NavigateToSettingsIngestion: 'shift+g+i',
 	NavigateToSettingsBilling: 'shift+g+b',
-	NavigateToSettingsNotificationChannels: 'shift+g+n',
 	NavigateToSettingsServiceAccounts: 'shift+g+k',
 	NavigateToSettingsRoles: 'shift+g+r',
 	NavigateToSettingsMembers: 'shift+g+m',
@@ -59,6 +59,7 @@ export const GlobalShortcutsDescription = {
 	NavigateToLogs: 'Navigate to Logs Explorer',
 	NavigateToDashboards: 'Navigate to Dashboards List',
 	NavigateToAlerts: 'Navigate to Alerts List',
+	NavigateToNotificationChannels: 'Navigate to Notification Channels',
 	NavigateToExceptions: 'Navigate to Exceptions List',
 	NavigateToMessagingQueues: 'Navigate to Messaging Queues',
 	ToggleSidebar: 'Toggle sidebar visibility',
@@ -68,8 +69,6 @@ export const GlobalShortcutsDescription = {
 	NavigateToSettings: 'Navigate to Settings',
 	NavigateToSettingsIngestion: 'Navigate to Ingestion Settings',
 	NavigateToSettingsBilling: 'Navigate to Billing Settings',
-	NavigateToSettingsNotificationChannels:
-		'Navigate to Notification Channels Settings',
 	NavigateToLogsPipelines: 'Navigate to Logs Pipelines',
 	NavigateToSettingsServiceAccounts: 'Navigate to Service Accounts Settings',
 	NavigateToSettingsRoles: 'Navigate to Roles Settings',

frontend/src/container/SideNav/SideNav.tsx

@@ -65,8 +65,7 @@ import { useAppContext } from 'providers/App/App';
 import { AppState } from 'store/reducers';
 import AppReducer from 'types/reducer/app';
 import { USER_ROLES } from 'types/roles';
-import { checkVersionState } from 'utils/app';
-import { isModifierKeyPressed } from 'utils/app';
+import { checkVersionState, isModifierKeyPressed } from 'utils/app';
 import { showErrorNotification } from 'utils/error';
 import { openInNewTab } from 'utils/navigation';
 
@@ -714,7 +713,7 @@ function SideNav({ isPinned }: { isPinned: boolean }): JSX.Element {
 		registerShortcut(GlobalShortcuts.NavigateToSettingsBilling, () =>
 			onClickHandler(ROUTES.BILLING, null),
 		);
-		registerShortcut(GlobalShortcuts.NavigateToSettingsNotificationChannels, () =>
+		registerShortcut(GlobalShortcuts.NavigateToNotificationChannels, () =>
 			onClickHandler(ROUTES.ALL_CHANNELS, null),
 		);
 		registerShortcut(GlobalShortcuts.NavigateToSettingsServiceAccounts, () =>
@@ -744,7 +743,7 @@ function SideNav({ isPinned }: { isPinned: boolean }): JSX.Element {
 			deregisterShortcut(GlobalShortcuts.NavigateToSettings);
 			deregisterShortcut(GlobalShortcuts.NavigateToSettingsIngestion);
 			deregisterShortcut(GlobalShortcuts.NavigateToSettingsBilling);
-			deregisterShortcut(GlobalShortcuts.NavigateToSettingsNotificationChannels);
+			deregisterShortcut(GlobalShortcuts.NavigateToNotificationChannels);
 			deregisterShortcut(GlobalShortcuts.NavigateToSettingsServiceAccounts);
 			deregisterShortcut(GlobalShortcuts.NavigateToSettingsRoles);
 			deregisterShortcut(GlobalShortcuts.NavigateToSettingsMembers);

frontend/src/container/SideNav/menuItems.tsx

@@ -343,14 +343,6 @@ export const settingsNavSections: SettingsNavSection[] = [
 				isEnabled: true,
 				itemKey: 'account',
 			},
-			// TODO(@SigNoz/pulse-frontend): https://github.com/SigNoz/engineering-pod/issues/5323
-			{
-				key: ROUTES.ALL_CHANNELS,
-				label: 'Notification Channels',
-				icon: <FileKey2 size={16} />,
-				isEnabled: true,
-				itemKey: 'notification-channels',
-			},
 			{
 				key: ROUTES.BILLING,
 				label: 'Billing',

frontend/src/pages/Settings/__tests__/Settings.test.tsx

@@ -44,7 +44,6 @@ describe('SettingsPage nav sections', () => {
 			'settings-page-sidenav',
 			'workspace',
 			'account',
-			'notification-channels',
 			'billing',
 			'roles',
 			'members',
@@ -56,6 +55,12 @@ describe('SettingsPage nav sections', () => {
 			expect(screen.getByTestId(id)).toBeInTheDocument();
 		});
 
+		it('does not render "notification-channels" element', () => {
+			expect(
+				screen.queryByTestId('notification-channels'),
+			).not.toBeInTheDocument();
+		});
+
 		it.each(['Identity & Access', 'Authentication'])(
 			'renders "%s" section title',
 			(text) => {

pkg/alertmanager/alertmanagerstore/sqlalertmanagerstore/config.go

@@ -9,6 +9,8 @@ import (
 	"github.com/SigNoz/signoz/pkg/sqlstore"
 	"github.com/SigNoz/signoz/pkg/types/alertmanagertypes"
 	"github.com/SigNoz/signoz/pkg/valuer"
+	"github.com/tidwall/gjson"
+	"github.com/uptrace/bun"
 )
 
 type config struct {
@@ -237,6 +239,37 @@ func (store *config) ListAllChannels(ctx context.Context) ([]*alertmanagertypes.
 	return channels, nil
 }
 
+func (store *config) GetMatchers(ctx context.Context, orgID string) (map[string][]string, error) {
+	type matcher struct {
+		bun.BaseModel `bun:"table:rule"`
+		ID            valuer.UUID `bun:"id,pk"`
+		Data          string      `bun:"data"`
+	}
+
+	matchers := []matcher{}
+
+	err := store.
+		sqlstore.
+		BunDB().
+		NewSelect().
+		Column("id", "data").
+		Model(&matchers).
+		Scan(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	matchersMap := make(map[string][]string)
+	for _, matcher := range matchers {
+		receivers := gjson.Get(matcher.Data, "preferredChannels").Array()
+		for _, receiver := range receivers {
+			matchersMap[matcher.ID.StringValue()] = append(matchersMap[matcher.ID.StringValue()], receiver.String())
+		}
+	}
+
+	return matchersMap, nil
+}
+
 func (store *config) wrap(ctx context.Context, fn func(ctx context.Context) error, opts ...alertmanagertypes.StoreOption) error {
 	storeOpts := alertmanagertypes.NewStoreOptions(opts...)
 

pkg/alertmanager/service.go

@@ -245,13 +245,25 @@ func (service *Service) compareAndSelectConfig(ctx context.Context, incomingConf
 		return nil, err
 	}
 
+	matchers, err := service.configStore.GetMatchers(ctx, incomingConfig.StoreableConfig().OrgID)
+	if err != nil {
+		return nil, err
+	}
+
 	config, err := alertmanagertypes.NewConfigFromChannels(service.config.Global, service.config.Route, channels, incomingConfig.StoreableConfig().OrgID)
 	if err != nil {
 		return nil, err
 	}
 
+	for ruleID, receivers := range matchers {
+		err = config.CreateRuleIDMatcher(ruleID, receivers)
+		if err != nil {
+			return nil, err
+		}
+	}
+
 	if incomingConfig.StoreableConfig().Hash != config.StoreableConfig().Hash {
-		service.settings.Logger().InfoContext(ctx, "mismatch found, updating config to match channels")
+		service.settings.Logger().InfoContext(ctx, "mismatch found, updating config to match channels and matchers")
 		return config, nil
 	}
 

pkg/apiserver/signozapiserver/ruler.go

@@ -11,6 +11,20 @@ import (
 )
 
 func (provider *provider) addRulerRoutes(router *mux.Router) error {
+	if err := router.Handle("/api/v2/rules", handler.New(provider.authzMiddleware.ViewAccess(provider.rulerHandler.ListRules), handler.OpenAPIDef{
+		ID:                  "ListRules",
+		Tags:                []string{"rules"},
+		Summary:             "List alert rules",
+		Description:         "This endpoint lists all alert rules with their current evaluation state. Deprecated: use ListRulesV3, which supports filtering, sorting and pagination.",
+		Response:            make([]*ruletypes.Rule, 0),
+		ResponseContentType: "application/json",
+		SuccessStatusCode:   http.StatusOK,
+		Deprecated:          true,
+		SecuritySchemes:     newSecuritySchemes(types.RoleViewer),
+	})).Methods(http.MethodGet).GetError(); err != nil {
+		return err
+	}
+
 	if err := router.Handle("/api/v3/rules", handler.New(provider.authzMiddleware.ViewAccess(provider.rulerHandler.ListRulesV3), handler.OpenAPIDef{
 		ID:                  "ListRulesV3",
 		Tags:                []string{"rules"},

pkg/apiserver/signozapiserver/ruler_examples.go

@@ -221,15 +221,16 @@ func postableRuleExamples() []handler.OpenAPIExample {
 		},
 		{
 			Name:        "metric_anomaly",
-			Summary:     "Metric anomaly rule",
-			Description: "Wraps a builder query in the `anomaly` function with daily seasonality, so SigNoz compares each point against the forecast for that time of day. The threshold is compared against the signed anomaly score, so `below` with a target of -2 fires when an abrupt drop holds for the entire window; `requireMinPoints` guards against noisy intervals.",
+			Summary:     "Metric anomaly rule (v1 only)",
+			Description: "Anomaly rules are not yet supported under schemaVersion v2alpha1, so this example uses the v1 shape. Wraps a builder query in the `anomaly` function with daily seasonality SigNoz compares each point against the forecast for that time of day. Fires when the anomaly score stays below the threshold for the entire window; `requireMinPoints` guards against noisy intervals.",
 			Value: map[string]any{
-				"alert":         "Anomalous drop in ingested spans",
-				"alertType":     "METRIC_BASED_ALERT",
-				"description":   "Detect an abrupt drop in span ingestion using a z-score anomaly function",
-				"ruleType":      "anomaly_rule",
-				"version":       "v5",
-				"schemaVersion": "v2alpha1",
+				"alert":       "Anomalous drop in ingested spans",
+				"alertType":   "METRIC_BASED_ALERT",
+				"description": "Detect an abrupt drop in span ingestion using a z-score anomaly function",
+				"ruleType":    "anomaly_rule",
+				"version":     "v5",
+				"evalWindow":  "24h",
+				"frequency":   "3h",
 				"condition": map[string]any{
 					"compositeQuery": map[string]any{
 						"queryType": "builder",
@@ -255,29 +256,17 @@ func postableRuleExamples() []handler.OpenAPIExample {
 							},
 						},
 					},
+					"op":                "below",
+					"matchType":         "all_the_times",
+					"target":            2,
 					"algorithm":         "standard",
 					"seasonality":       "daily",
 					"selectedQueryName": "A",
 					"requireMinPoints":  true,
 					"requiredNumPoints": 3,
-					"thresholds": map[string]any{
-						"kind": "basic",
-						"spec": []any{
-							map[string]any{
-								"name":      "warning",
-								"op":        "below",
-								"matchType": "all_the_times",
-								"target":    -2,
-								"channels":  []any{"slack-ingestion"},
-							},
-						},
-					},
 				},
-				"evaluation": rolling("24h", "3h"),
-				"notificationSettings": map[string]any{
-					"renotify": renotify("4h", "firing"),
-				},
-				"labels": map[string]any{"severity": "warning"},
+				"labels":            map[string]any{"severity": "warning"},
+				"preferredChannels": []any{"slack-ingestion"},
 				"annotations": map[string]any{
 					"description": "Ingestion rate for tenant {{$tenant_id}} is anomalously low (z-score {{$value}}).",
 					"summary":     "Span ingestion anomaly",

pkg/modules/rulestatehistory/implrulestatehistory/links.go

@@ -52,15 +52,21 @@ func (m *module) relatedLinkBuilderForRule(ctx context.Context, orgID valuer.UUI
 		return nil
 	}
 
-	if rule.Evaluation == nil {
-		return nil
+	builder := &relatedLinkBuilder{alertType: rule.AlertType, signal: signal, condition: rule.RuleCondition, logger: m.logger.With(slog.String("rule.id", ruleID))}
+	if rule.Evaluation != nil {
+		if evaluation, err := rule.Evaluation.GetEvaluation(); err == nil {
+			builder.evaluation = evaluation
+		}
 	}
-	evaluation, err := rule.Evaluation.GetEvaluation()
-	if err != nil {
-		return nil
+	if builder.evaluation == nil {
+		evalWindow := rule.EvalWindow
+		if evalWindow.IsZero() {
+			evalWindow = valuer.MustParseTextDuration("5m")
+		}
+		builder.evaluation = ruletypes.RollingWindow{EvalWindow: evalWindow}
 	}
 
-	return &relatedLinkBuilder{alertType: rule.AlertType, signal: signal, evaluation: evaluation, condition: rule.RuleCondition, logger: m.logger.With(slog.String("rule.id", ruleID))}
+	return builder
 }
 
 // queryWindow returns the range the rule evaluated when it recorded a state

pkg/query-service/app/http_handler.go

@@ -3,8 +3,10 @@ package app
 import (
 	"bytes"
 	"context"
+	"database/sql"
 	"encoding/json"
 	"fmt"
+	"io"
 
 	"github.com/SigNoz/signoz/pkg/clickhousesql"
 	"github.com/SigNoz/signoz/pkg/errors"
@@ -358,6 +360,14 @@ func (aH *APIHandler) RegisterRoutes(router *mux.Router, am *middleware.AuthZ) {
 	router.HandleFunc("/api/v1/query_range", am.ViewAccess(aH.queryRangeMetrics)).Methods(http.MethodGet)
 	router.HandleFunc("/api/v1/query", am.ViewAccess(aH.queryMetrics)).Methods(http.MethodGet)
 
+	router.HandleFunc("/api/v1/rules", am.ViewAccess(aH.listRules)).Methods(http.MethodGet)
+	router.HandleFunc("/api/v1/rules/{id}", am.ViewAccess(aH.getRule)).Methods(http.MethodGet)
+	router.HandleFunc("/api/v1/rules", am.EditAccess(aH.createRule)).Methods(http.MethodPost)
+	router.HandleFunc("/api/v1/rules/{id}", am.EditAccess(aH.editRule)).Methods(http.MethodPut)
+	router.HandleFunc("/api/v1/rules/{id}", am.EditAccess(aH.deleteRule)).Methods(http.MethodDelete)
+	router.HandleFunc("/api/v1/rules/{id}", am.EditAccess(aH.patchRule)).Methods(http.MethodPatch)
+	router.HandleFunc("/api/v1/testRule", am.EditAccess(aH.testRule)).Methods(http.MethodPost)
+
 	router.HandleFunc("/api/v2/variables/query", am.ViewAccess(aH.queryDashboardVarsV2)).Methods(http.MethodPost)
 
 	router.HandleFunc("/api/v1/explorer/views", am.ViewAccess(aH.Signoz.Handlers.SavedView.List)).Methods(http.MethodGet)
@@ -486,6 +496,166 @@ func (aH *APIHandler) PopulateTemporality(ctx context.Context, orgID valuer.UUID
 	return nil
 }
 
+func (aH *APIHandler) listRules(w http.ResponseWriter, r *http.Request) {
+
+	rules, err := aH.ruleManager.ListRuleStates(r.Context())
+	if err != nil {
+		RespondError(w, &model.ApiError{Typ: model.ErrorInternal, Err: err}, nil)
+		return
+	}
+
+	// todo(amol): need to add sorter
+
+	aH.Respond(w, rules)
+}
+
+func (aH *APIHandler) getRule(w http.ResponseWriter, r *http.Request) {
+	idStr := mux.Vars(r)["id"]
+	id, err := valuer.NewUUID(idStr)
+	if err != nil {
+		RespondError(w, &model.ApiError{Typ: model.ErrorBadData, Err: err}, nil)
+		return
+	}
+
+	ruleResponse, err := aH.ruleManager.GetRule(r.Context(), id)
+	if err != nil {
+		if errors.Is(err, sql.ErrNoRows) {
+			RespondError(w, &model.ApiError{Typ: model.ErrorNotFound, Err: fmt.Errorf("rule not found")}, nil)
+			return
+		}
+		RespondError(w, &model.ApiError{Typ: model.ErrorInternal, Err: err}, nil)
+		return
+	}
+	aH.Respond(w, ruleResponse)
+}
+
+func (aH *APIHandler) createRule(w http.ResponseWriter, r *http.Request) {
+	defer r.Body.Close()
+	body, err := io.ReadAll(r.Body)
+	if err != nil {
+		aH.logger.ErrorContext(r.Context(), "error reading request body for create rule", errors.Attr(err))
+		RespondError(w, &model.ApiError{Typ: model.ErrorBadData, Err: err}, nil)
+		return
+	}
+
+	rule, err := aH.ruleManager.CreateRule(r.Context(), string(body))
+	if err != nil {
+		RespondError(w, toApiError(err), nil)
+		return
+	}
+
+	aH.Respond(w, rule)
+}
+
+func (aH *APIHandler) editRule(w http.ResponseWriter, r *http.Request) {
+	idStr := mux.Vars(r)["id"]
+	id, err := valuer.NewUUID(idStr)
+	if err != nil {
+		RespondError(w, &model.ApiError{Typ: model.ErrorBadData, Err: err}, nil)
+		return
+	}
+
+	defer r.Body.Close()
+	body, err := io.ReadAll(r.Body)
+	if err != nil {
+		aH.logger.ErrorContext(r.Context(), "error reading request body for edit rule", errors.Attr(err))
+		RespondError(w, &model.ApiError{Typ: model.ErrorBadData, Err: err}, nil)
+		return
+	}
+
+	err = aH.ruleManager.EditRule(r.Context(), string(body), id)
+	if err != nil {
+		if errors.Is(err, sql.ErrNoRows) {
+			RespondError(w, &model.ApiError{Typ: model.ErrorNotFound, Err: fmt.Errorf("rule not found")}, nil)
+			return
+		}
+		RespondError(w, toApiError(err), nil)
+		return
+	}
+
+	aH.Respond(w, "rule successfully edited")
+}
+
+func (aH *APIHandler) deleteRule(w http.ResponseWriter, r *http.Request) {
+	id := mux.Vars(r)["id"]
+
+	err := aH.ruleManager.DeleteRule(r.Context(), id)
+	if err != nil {
+		if errors.Is(err, sql.ErrNoRows) {
+			RespondError(w, &model.ApiError{Typ: model.ErrorNotFound, Err: fmt.Errorf("rule not found")}, nil)
+			return
+		}
+		RespondError(w, toApiError(err), nil)
+		return
+	}
+
+	aH.Respond(w, "rule successfully deleted")
+}
+
+func (aH *APIHandler) patchRule(w http.ResponseWriter, r *http.Request) {
+	idStr := mux.Vars(r)["id"]
+	id, err := valuer.NewUUID(idStr)
+	if err != nil {
+		RespondError(w, &model.ApiError{Typ: model.ErrorBadData, Err: err}, nil)
+		return
+	}
+
+	defer r.Body.Close()
+	body, err := io.ReadAll(r.Body)
+	if err != nil {
+		aH.logger.ErrorContext(r.Context(), "error reading request body for patch rule", errors.Attr(err))
+		RespondError(w, &model.ApiError{Typ: model.ErrorBadData, Err: err}, nil)
+		return
+	}
+
+	gettableRule, err := aH.ruleManager.PatchRule(r.Context(), string(body), id)
+	if err != nil {
+		if errors.Is(err, sql.ErrNoRows) {
+			RespondError(w, &model.ApiError{Typ: model.ErrorNotFound, Err: fmt.Errorf("rule not found")}, nil)
+			return
+		}
+		RespondError(w, toApiError(err), nil)
+		return
+	}
+
+	aH.Respond(w, gettableRule)
+}
+
+func (aH *APIHandler) testRule(w http.ResponseWriter, r *http.Request) {
+	claims, err := authtypes.ClaimsFromContext(r.Context())
+	if err != nil {
+		render.Error(w, err)
+		return
+	}
+	orgID, err := valuer.NewUUID(claims.OrgID)
+	if err != nil {
+		render.Error(w, err)
+		return
+	}
+	defer r.Body.Close()
+	body, err := io.ReadAll(r.Body)
+	if err != nil {
+		aH.logger.ErrorContext(r.Context(), "error reading request body for test rule", errors.Attr(err))
+		RespondError(w, &model.ApiError{Typ: model.ErrorBadData, Err: err}, nil)
+		return
+	}
+
+	ctx, cancel := context.WithTimeout(context.Background(), 1*time.Minute)
+	defer cancel()
+
+	alertCount, err := aH.ruleManager.TestNotification(ctx, orgID, string(body))
+	if err != nil {
+		RespondError(w, toApiError(err), nil)
+		return
+	}
+
+	response := map[string]interface{}{
+		"alertCount": alertCount,
+		"message":    "notification sent",
+	}
+	aH.Respond(w, response)
+}
+
 func prepareQuery(r *http.Request) (string, error) {
 	var postData *model.DashboardVars
 

pkg/query-service/rules/base_rule.go

@@ -34,6 +34,10 @@ type BaseRule struct {
 	ruleCondition *ruletypes.RuleCondition
 
 	Threshold ruletypes.RuleThreshold
+	// evalWindow is the time window used for evaluating the rule
+	// i.e. each time we lookback from the current time, we look at data for the last
+	// evalWindow duration
+	evalWindow valuer.TextDuration
 	// holdDuration is the duration for which the alert waits before firing
 	holdDuration valuer.TextDuration
 
@@ -45,7 +49,10 @@ type BaseRule struct {
 	// these are the same for all alerts created for this rule
 	labels      ruletypes.Labels
 	annotations ruletypes.Labels
-	mtx         sync.Mutex
+	// preferredChannels is the list of channels to send the alert to
+	// if the rule is triggered
+	preferredChannels []string
+	mtx               sync.Mutex
 	// the time it took to evaluate the rule (most recent evaluation)
 	evaluationDuration time.Duration
 	// the timestamp of the last evaluation
@@ -144,27 +151,26 @@ func NewBaseRule(
 	if err != nil {
 		return nil, err
 	}
-	if err := threshold.Validate(); err != nil {
-		return nil, errors.NewInvalidInputf(errors.CodeInvalidInput, "invalid rule threshold spec: %v", err)
-	}
 	evaluation, err := p.Evaluation.GetEvaluation()
 	if err != nil {
 		return nil, errors.NewInvalidInputf(errors.CodeInvalidInput, "failed to get evaluation: %v", err)
 	}
 
 	baseRule := &BaseRule{
-		id:            id,
-		orgID:         orgID,
-		externalURL:   externalURL,
-		name:          p.AlertName.StringValue(),
-		typ:           p.AlertType,
-		ruleCondition: p.RuleCondition,
-		labels:        ruletypes.FromMap(p.Labels),
-		annotations:   ruletypes.FromMap(p.Annotations),
-		health:        ruletypes.HealthUnknown,
-		Active:        map[uint64]*ruletypes.Alert{},
-		Threshold:     threshold,
-		evaluation:    evaluation,
+		id:                id,
+		orgID:             orgID,
+		externalURL:       externalURL,
+		name:              p.AlertName.StringValue(),
+		typ:               p.AlertType,
+		ruleCondition:     p.RuleCondition,
+		evalWindow:        p.EvalWindow,
+		labels:            ruletypes.FromMap(p.Labels),
+		annotations:       ruletypes.FromMap(p.Annotations),
+		preferredChannels: p.PreferredChannels,
+		health:            ruletypes.HealthUnknown,
+		Active:            map[uint64]*ruletypes.Alert{},
+		Threshold:         threshold,
+		evaluation:        evaluation,
 	}
 
 	// Store newGroupEvalDelay and groupBy keys from NotificationSettings
@@ -172,6 +178,10 @@ func NewBaseRule(
 		baseRule.newGroupEvalDelay = p.NotificationSettings.NewGroupEvalDelay
 	}
 
+	if baseRule.evalWindow.IsZero() {
+		baseRule.evalWindow = valuer.MustParseTextDuration("5m")
+	}
+
 	for _, opt := range opts {
 		opt(baseRule)
 	}
@@ -222,6 +232,10 @@ func (r *BaseRule) EvalDelay() valuer.TextDuration {
 	return r.evalDelay
 }
 
+func (r *BaseRule) EvalWindow() valuer.TextDuration {
+	return r.evalWindow
+}
+
 func (r *BaseRule) HoldDuration() valuer.TextDuration {
 	return r.holdDuration
 }
@@ -232,6 +246,7 @@ func (r *BaseRule) Name() string                        { return r.name }
 func (r *BaseRule) Condition() *ruletypes.RuleCondition { return r.ruleCondition }
 func (r *BaseRule) Labels() ruletypes.Labels            { return r.labels }
 func (r *BaseRule) Annotations() ruletypes.Labels       { return r.annotations }
+func (r *BaseRule) PreferredChannels() []string         { return r.preferredChannels }
 
 func (r *BaseRule) GeneratorURL() string {
 	params := url.Values{}

pkg/query-service/rules/manager.go

@@ -350,15 +350,6 @@ func (m *Manager) validateChannels(ctx context.Context, orgID string, rule *rule
 	return nil
 }
 
-func decodeRule(ruleStr string, rule *ruletypes.PostableRule) error {
-	err := json.Unmarshal([]byte(ruleStr), rule)
-	if err == nil || errors.Ast(err, errors.TypeInvalidInput) {
-		return err
-	}
-	// a syntax error is raised before any UnmarshalJSON runs, so it is the one untyped error
-	return errors.NewInvalidInputf(errors.CodeInvalidInput, "failed to parse json: %v", err)
-}
-
 // EditRule writes the rule definition to the
 // datastore and also updates the rule executor
 func (m *Manager) EditRule(ctx context.Context, ruleStr string, id valuer.UUID) error {
@@ -368,7 +359,7 @@ func (m *Manager) EditRule(ctx context.Context, ruleStr string, id valuer.UUID)
 	}
 	orgID := valuer.MustNewUUID(claims.OrgID)
 	parsedRule := ruletypes.PostableRule{}
-	err = decodeRule(ruleStr, &parsedRule)
+	err = json.Unmarshal([]byte(ruleStr), &parsedRule)
 	if err != nil {
 		return err
 	}
@@ -556,7 +547,7 @@ func (m *Manager) deleteTask(taskName string) {
 // starts an executor for the rule, unless the rule is disabled
 func (m *Manager) CreateRule(ctx context.Context, ruleStr string) (*ruletypes.GettableRule, error) {
 	parsedRule := ruletypes.PostableRule{}
-	if err := decodeRule(ruleStr, &parsedRule); err != nil {
+	if err := json.Unmarshal([]byte(ruleStr), &parsedRule); err != nil {
 		return nil, err
 	}
 
@@ -1058,7 +1049,7 @@ func (m *Manager) PatchRule(ctx context.Context, ruleStr string, id valuer.UUID)
 		return nil, err
 	}
 
-	if err := decodeRule(ruleStr, &storedRule); err != nil {
+	if err := json.Unmarshal([]byte(ruleStr), &storedRule); err != nil {
 		m.logger.ErrorContext(ctx, "failed to unmarshal patched rule with given id", slog.String("rule.id", id.StringValue()), errors.Attr(err))
 		return nil, err
 	}
@@ -1114,9 +1105,9 @@ func (m *Manager) PatchRule(ctx context.Context, ruleStr string, id valuer.UUID)
 // sends a test notification. returns alert count and error (if any)
 func (m *Manager) TestNotification(ctx context.Context, orgID valuer.UUID, ruleStr string) (int, error) {
 	parsedRule := ruletypes.PostableRule{}
-	err := decodeRule(ruleStr, &parsedRule)
+	err := json.Unmarshal([]byte(ruleStr), &parsedRule)
 	if err != nil {
-		return 0, err
+		return 0, errors.WrapInvalidInputf(err, errors.CodeInvalidInput, "failed to unmarshal rule")
 	}
 	if err := parsedRule.Validate(); err != nil {
 		return 0, err

pkg/query-service/rules/manager_test_data.go

@@ -49,12 +49,13 @@ func ThresholdRuleAtLeastOnceValueAbove(target float64, recovery *float64) rulet
 		Annotations: map[string]string{
 			"value": "{{$value}}",
 		},
-		Version:       "v5",
-		SchemaVersion: valuer.MustNewUnsetOrNonEmptyString(ruletypes.SchemaVersionV2Alpha1),
+		Version: "v5",
 		RuleCondition: &ruletypes.RuleCondition{
+			MatchType:       ruletypes.AtleastOnce,
+			CompareOperator: ruletypes.ValueIsAbove,
+			Target:          &target,
 			CompositeQuery: &ruletypes.AlertCompositeQuery{
 				QueryType: ruletypes.QueryTypeBuilder,
-				PanelType: ruletypes.PanelTypeGraph,
 				Queries: []qbtypes.QueryEnvelope{
 					{
 						Type: qbtypes.QueryTypeBuilder,
@@ -107,10 +108,12 @@ func BuildPromAtLeastOnceValueAbove(target float64, recovery *float64) ruletypes
 		Annotations: map[string]string{
 			"value": "{{$value}}",
 		},
-		Version:       "v5",
-		SchemaVersion: valuer.MustNewUnsetOrNonEmptyString(ruletypes.SchemaVersionV2Alpha1),
+		Version: "v5",
 		RuleCondition: &ruletypes.RuleCondition{
-			SelectedQuery: "A",
+			MatchType:       ruletypes.AtleastOnce,
+			SelectedQuery:   "A",
+			CompareOperator: ruletypes.ValueIsAbove,
+			Target:          &target,
 			CompositeQuery: &ruletypes.AlertCompositeQuery{
 				QueryType: ruletypes.QueryTypePromQL,
 				PanelType: ruletypes.PanelTypeGraph,
@@ -135,6 +138,7 @@ func BuildPromAtLeastOnceValueAbove(target float64, recovery *float64) ruletypes
 						RecoveryTarget:  recovery,
 						MatchType:       ruletypes.AtleastOnce,
 						CompareOperator: ruletypes.ValueIsAbove,
+						Channels:        []string{"slack"},
 					},
 				},
 			},

pkg/query-service/rules/prom_rule.go

@@ -356,10 +356,12 @@ func (r *PromRule) Eval(ctx context.Context, ts time.Time) (int, error) {
 
 func (r *PromRule) String() string {
 	ar := ruletypes.PostableRule{
-		AlertName:     valuer.NewDisplayName(r.name),
-		RuleCondition: r.ruleCondition,
-		Labels:        r.labels.Map(),
-		Annotations:   r.annotations.Map(),
+		AlertName:         valuer.NewDisplayName(r.name),
+		RuleCondition:     r.ruleCondition,
+		EvalWindow:        r.evalWindow,
+		Labels:            r.labels.Map(),
+		Annotations:       r.annotations.Map(),
+		PreferredChannels: r.preferredChannels,
 	}
 
 	byt, err := json.Marshal(ar)

pkg/query-service/rules/prom_rule_test.go

@@ -690,11 +690,13 @@ func TestPromRuleEval(t *testing.T) {
 	logger := instrumentationtest.New().Logger()
 
 	for idx, c := range cases {
+		postableRule.RuleCondition.CompareOperator = c.compareOperator
+		postableRule.RuleCondition.MatchType = c.matchType
+		postableRule.RuleCondition.Target = &c.target
 		postableRule.RuleCondition.Thresholds = &ruletypes.RuleThresholdData{
 			Kind: ruletypes.BasicThresholdKind,
 			Spec: ruletypes.BasicRuleThresholds{
 				{
-					Name:            "critical",
 					TargetValue:     &c.target,
 					MatchType:       c.matchType,
 					CompareOperator: c.compareOperator,
@@ -903,7 +905,11 @@ func TestPromRuleUnitCombinations(t *testing.T) {
 
 		promProvider := prometheustest.New(context.Background(), instrumentationtest.New().ToProviderSettings(), prometheus.Config{Timeout: 2 * time.Minute}, telemetryStore)
 
+		postableRule.RuleCondition.CompareOperator = c.compareOperator
+		postableRule.RuleCondition.MatchType = ruletypes.MatchType(c.matchType)
+		postableRule.RuleCondition.Target = &c.target
 		postableRule.RuleCondition.CompositeQuery.Unit = c.yAxisUnit
+		postableRule.RuleCondition.TargetUnit = c.targetUnit
 		postableRule.RuleCondition.Thresholds = &ruletypes.RuleThresholdData{
 			Kind: ruletypes.BasicThresholdKind,
 			Spec: ruletypes.BasicRuleThresholds{
@@ -1192,7 +1198,11 @@ func TestMultipleThresholdPromRule(t *testing.T) {
 
 		promProvider := prometheustest.New(context.Background(), instrumentationtest.New().ToProviderSettings(), prometheus.Config{Timeout: 2 * time.Minute}, telemetryStore)
 
+		postableRule.RuleCondition.CompareOperator = c.compareOperator
+		postableRule.RuleCondition.MatchType = c.matchType
+		postableRule.RuleCondition.Target = &c.target
 		postableRule.RuleCondition.CompositeQuery.Unit = c.yAxisUnit
+		postableRule.RuleCondition.TargetUnit = c.targetUnit
 		postableRule.RuleCondition.Thresholds = &ruletypes.RuleThresholdData{
 			Kind: ruletypes.BasicThresholdKind,
 			Spec: ruletypes.BasicRuleThresholds{
@@ -1249,7 +1259,6 @@ func TestMultipleThresholdPromRule(t *testing.T) {
 
 func TestPromRule_NoData(t *testing.T) {
 	evalTime := time.Now()
-	target := 200.0
 
 	postableRule := ruletypes.PostableRule{
 		AlertName: valuer.NewDisplayName("Test no data"),
@@ -1260,6 +1269,8 @@ func TestPromRule_NoData(t *testing.T) {
 			Frequency:  valuer.MustParseTextDuration("1m"),
 		}},
 		RuleCondition: &ruletypes.RuleCondition{
+			CompareOperator: ruletypes.ValueIsAbove,
+			MatchType:       ruletypes.AtleastOnce,
 			CompositeQuery: &ruletypes.AlertCompositeQuery{
 				QueryType: ruletypes.QueryTypePromQL,
 				Queries: []qbtypes.QueryEnvelope{
@@ -1271,7 +1282,7 @@ func TestPromRule_NoData(t *testing.T) {
 			},
 			Thresholds: &ruletypes.RuleThresholdData{
 				Kind: ruletypes.BasicThresholdKind,
-				Spec: ruletypes.BasicRuleThresholds{{Name: "Test no data", TargetValue: &target, CompareOperator: ruletypes.ValueIsAbove, MatchType: ruletypes.AtleastOnce}},
+				Spec: ruletypes.BasicRuleThresholds{{Name: "Test no data"}},
 			},
 		},
 	}
@@ -1354,7 +1365,10 @@ func TestPromRule_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.QueryTypePromQL,
 				Queries: []qbtypes.QueryEnvelope{
@@ -1477,6 +1491,8 @@ func TestPromRuleEval_RequireMinPoints(t *testing.T) {
 			Frequency:  valuer.MustParseTextDuration("1m"),
 		}},
 		RuleCondition: &ruletypes.RuleCondition{
+			CompareOperator: ruletypes.ValueIsAbove,
+			MatchType:       ruletypes.AtleastOnce,
 			CompositeQuery: &ruletypes.AlertCompositeQuery{
 				QueryType: ruletypes.QueryTypePromQL,
 				Queries: []qbtypes.QueryEnvelope{
@@ -1546,9 +1562,9 @@ func TestPromRuleEval_RequireMinPoints(t *testing.T) {
 	for _, c := range cases {
 		rc := postableRule.RuleCondition
 
-		target := &targetForNoAlert
+		rc.Target = &targetForNoAlert
 		if c.alertCondition {
-			target = &targetForAlert
+			rc.Target = &targetForAlert
 		}
 		rc.RequireMinPoints = c.requireMinPoints
 		rc.RequiredNumPoints = c.requiredNumPoints
@@ -1557,9 +1573,9 @@ func TestPromRuleEval_RequireMinPoints(t *testing.T) {
 			Spec: ruletypes.BasicRuleThresholds{
 				{
 					Name:            postableRule.AlertName.StringValue(),
-					TargetValue:     target,
-					MatchType:       ruletypes.AtleastOnce,
-					CompareOperator: ruletypes.ValueIsAbove,
+					TargetValue:     rc.Target,
+					MatchType:       rc.MatchType,
+					CompareOperator: rc.CompareOperator,
 				},
 			},
 		}

pkg/query-service/rules/rule.go

@@ -20,12 +20,15 @@ type Rule interface {
 	Annotations() ruletypes.Labels
 	Condition() *ruletypes.RuleCondition
 	EvalDelay() valuer.TextDuration
+	EvalWindow() valuer.TextDuration
 	HoldDuration() valuer.TextDuration
 	State() ruletypes.AlertState
 	ActiveAlerts() []*ruletypes.Alert
 	// ActiveAlertsLabelFP returns a map of active alert labels fingerprint
 	ActiveAlertsLabelFP() map[uint64]struct{}
 
+	PreferredChannels() []string
+
 	// Eval evaluates the rule at the given timestamp and returns the number of active alerts.
 	Eval(context.Context, time.Time) (int, error)
 	String() string

pkg/query-service/rules/threshold_rule.go

@@ -61,16 +61,16 @@ func (r *ThresholdRule) Type() ruletypes.RuleType {
 }
 
 func (r *ThresholdRule) prepareQueryRange(ctx context.Context, ts time.Time) (*qbtypes.QueryRangeRequest, error) {
-	startTs, endTs := r.Timestamps(ts)
-	start, end := startTs.UnixMilli(), endTs.UnixMilli()
-
 	r.logger.InfoContext(
 		ctx, "prepare query range request v5",
 		slog.Int64("ts", ts.UnixMilli()),
-		slog.Int64("eval_window", end-start),
+		slog.Int64("eval_window", r.evalWindow.Milliseconds()),
 		slog.Int64("eval_delay", r.evalDelay.Milliseconds()),
 	)
 
+	startTs, endTs := r.Timestamps(ts)
+	start, end := startTs.UnixMilli(), endTs.UnixMilli()
+
 	req := &qbtypes.QueryRangeRequest{
 		Start:       uint64(start),
 		End:         uint64(end),
@@ -455,10 +455,12 @@ func (r *ThresholdRule) Eval(ctx context.Context, ts time.Time) (int, error) {
 
 func (r *ThresholdRule) String() string {
 	ar := ruletypes.PostableRule{
-		AlertName:     valuer.NewDisplayName(r.name),
-		RuleCondition: r.ruleCondition,
-		Labels:        r.labels.Map(),
-		Annotations:   r.annotations.Map(),
+		AlertName:         valuer.NewDisplayName(r.name),
+		RuleCondition:     r.ruleCondition,
+		EvalWindow:        r.evalWindow,
+		Labels:            r.labels.Map(),
+		Annotations:       r.annotations.Map(),
+		PreferredChannels: r.preferredChannels,
 	}
 
 	byt, err := json.Marshal(ar)

pkg/query-service/rules/threshold_rule_test.go

@@ -63,7 +63,6 @@ func TestThresholdRuleEvalWithoutRecoveryTarget(t *testing.T) {
 			Kind: ruletypes.BasicThresholdKind,
 			Spec: ruletypes.BasicRuleThresholds{
 				{
-					Name:            "critical",
 					TargetValue:     &c.target,
 					MatchType:       c.matchType,
 					CompareOperator: c.compareOperator,
@@ -172,7 +171,10 @@ func TestPrepareParamsForLogs(t *testing.T) {
 					},
 				},
 			},
-			SelectedQuery: "A",
+			CompareOperator: ruletypes.ValueIsNotEq,
+			MatchType:       ruletypes.AtleastOnce,
+			Target:          &[]float64{0.0}[0],
+			SelectedQuery:   "A",
 		},
 	}
 
@@ -181,10 +183,9 @@ func TestPrepareParamsForLogs(t *testing.T) {
 		Kind: ruletypes.BasicThresholdKind,
 		Spec: ruletypes.BasicRuleThresholds{
 			{
-				Name:            "critical",
-				TargetValue:     &[]float64{0.0}[0],
-				MatchType:       ruletypes.AtleastOnce,
-				CompareOperator: ruletypes.ValueIsNotEq,
+				TargetValue:     postableRule.RuleCondition.Target,
+				MatchType:       postableRule.RuleCondition.MatchType,
+				CompareOperator: postableRule.RuleCondition.CompareOperator,
 			},
 		},
 	}
@@ -238,7 +239,10 @@ func TestPrepareParamsForLogsFilterExpression(t *testing.T) {
 					},
 				},
 			},
-			SelectedQuery: "A",
+			CompareOperator: ruletypes.ValueIsNotEq,
+			MatchType:       ruletypes.AtleastOnce,
+			Target:          &[]float64{0.0}[0],
+			SelectedQuery:   "A",
 		},
 		Version: "v5",
 	}
@@ -248,10 +252,9 @@ func TestPrepareParamsForLogsFilterExpression(t *testing.T) {
 		Kind: ruletypes.BasicThresholdKind,
 		Spec: ruletypes.BasicRuleThresholds{
 			{
-				Name:            "critical",
-				TargetValue:     &[]float64{0.0}[0],
-				MatchType:       ruletypes.AtleastOnce,
-				CompareOperator: ruletypes.ValueIsNotEq,
+				TargetValue:     postableRule.RuleCondition.Target,
+				MatchType:       postableRule.RuleCondition.MatchType,
+				CompareOperator: postableRule.RuleCondition.CompareOperator,
 			},
 		},
 	}
@@ -301,7 +304,10 @@ func TestPrepareParamsForTracesFilterExpression(t *testing.T) {
 					},
 				},
 			},
-			SelectedQuery: "A",
+			CompareOperator: ruletypes.ValueIsNotEq,
+			MatchType:       ruletypes.AtleastOnce,
+			Target:          &[]float64{0.0}[0],
+			SelectedQuery:   "A",
 		},
 		Version: "v5",
 	}
@@ -311,10 +317,9 @@ func TestPrepareParamsForTracesFilterExpression(t *testing.T) {
 		Kind: ruletypes.BasicThresholdKind,
 		Spec: ruletypes.BasicRuleThresholds{
 			{
-				Name:            "critical",
-				TargetValue:     &[]float64{0.0}[0],
-				MatchType:       ruletypes.AtleastOnce,
-				CompareOperator: ruletypes.ValueIsNotEq,
+				TargetValue:     postableRule.RuleCondition.Target,
+				MatchType:       postableRule.RuleCondition.MatchType,
+				CompareOperator: postableRule.RuleCondition.CompareOperator,
 			},
 		},
 	}
@@ -361,7 +366,10 @@ func TestPrepareParamsForTraces(t *testing.T) {
 					},
 				},
 			},
-			SelectedQuery: "A",
+			CompareOperator: ruletypes.ValueIsNotEq,
+			MatchType:       ruletypes.AtleastOnce,
+			Target:          &[]float64{0.0}[0],
+			SelectedQuery:   "A",
 		},
 	}
 
@@ -370,10 +378,9 @@ func TestPrepareParamsForTraces(t *testing.T) {
 		Kind: ruletypes.BasicThresholdKind,
 		Spec: ruletypes.BasicRuleThresholds{
 			{
-				Name:            "critical",
-				TargetValue:     &[]float64{0.0}[0],
-				MatchType:       ruletypes.AtleastOnce,
-				CompareOperator: ruletypes.ValueIsNotEq,
+				TargetValue:     postableRule.RuleCondition.Target,
+				MatchType:       postableRule.RuleCondition.MatchType,
+				CompareOperator: postableRule.RuleCondition.CompareOperator,
 			},
 		},
 	}
@@ -463,7 +470,6 @@ func TestThresholdRuleLabelNormalization(t *testing.T) {
 			Kind: ruletypes.BasicThresholdKind,
 			Spec: ruletypes.BasicRuleThresholds{
 				{
-					Name:            "critical",
 					TargetValue:     &c.target,
 					MatchType:       c.matchType,
 					CompareOperator: c.compareOperator,
@@ -647,7 +653,11 @@ func TestThresholdRuleUnitCombinations(t *testing.T) {
 			ExpectQuery(queryString).
 			WithArgs(nil, nil, nil, nil, nil, nil, nil, nil).
 			WillReturnRows(rows)
+		postableRule.RuleCondition.CompareOperator = c.compareOperator
+		postableRule.RuleCondition.MatchType = c.matchType
+		postableRule.RuleCondition.Target = &c.target
 		postableRule.RuleCondition.CompositeQuery.Unit = c.yAxisUnit
+		postableRule.RuleCondition.TargetUnit = c.targetUnit
 		postableRule.RuleCondition.Thresholds = &ruletypes.RuleThresholdData{
 			Kind: ruletypes.BasicThresholdKind,
 			Spec: ruletypes.BasicRuleThresholds{
@@ -857,7 +867,11 @@ func TestThresholdRuleTracesLink(t *testing.T) {
 
 		querier := prepareQuerierForTraces(t, telemetryStore, keysMap)
 
+		postableRule.RuleCondition.CompareOperator = c.compareOperator
+		postableRule.RuleCondition.MatchType = c.matchType
+		postableRule.RuleCondition.Target = &c.target
 		postableRule.RuleCondition.CompositeQuery.Unit = c.yAxisUnit
+		postableRule.RuleCondition.TargetUnit = c.targetUnit
 		postableRule.RuleCondition.Thresholds = &ruletypes.RuleThresholdData{
 			Kind: ruletypes.BasicThresholdKind,
 			Spec: ruletypes.BasicRuleThresholds{
@@ -961,7 +975,11 @@ func TestThresholdRuleAITracesLink(t *testing.T) {
 
 		querier := prepareQuerierForAITraces(t, telemetryStore, keysMap)
 
+		postableRule.RuleCondition.CompareOperator = c.compareOperator
+		postableRule.RuleCondition.MatchType = c.matchType
+		postableRule.RuleCondition.Target = &c.target
 		postableRule.RuleCondition.CompositeQuery.Unit = c.yAxisUnit
+		postableRule.RuleCondition.TargetUnit = c.targetUnit
 		postableRule.RuleCondition.Thresholds = &ruletypes.RuleThresholdData{
 			Kind: ruletypes.BasicThresholdKind,
 			Spec: ruletypes.BasicRuleThresholds{
@@ -1065,7 +1083,11 @@ func TestThresholdRuleLogsLink(t *testing.T) {
 
 		querier := prepareQuerierForLogs(t, telemetryStore, keysMap)
 
+		postableRule.RuleCondition.CompareOperator = c.compareOperator
+		postableRule.RuleCondition.MatchType = c.matchType
+		postableRule.RuleCondition.Target = &c.target
 		postableRule.RuleCondition.CompositeQuery.Unit = c.yAxisUnit
+		postableRule.RuleCondition.TargetUnit = c.targetUnit
 		postableRule.RuleCondition.Thresholds = &ruletypes.RuleThresholdData{
 			Kind: ruletypes.BasicThresholdKind,
 			Spec: ruletypes.BasicRuleThresholds{
@@ -1234,7 +1256,11 @@ func TestMultipleThresholdRule(t *testing.T) {
 		querier, mockMetadataStore := prepareQuerierForMetrics(t, telemetryStore)
 		mockMetadataStore.TypeMap["signoz_calls_total"] = metrictypes.SumType
 
+		postableRule.RuleCondition.CompareOperator = c.compareOperator
+		postableRule.RuleCondition.MatchType = c.matchType
+		postableRule.RuleCondition.Target = &c.target
 		postableRule.RuleCondition.CompositeQuery.Unit = c.yAxisUnit
+		postableRule.RuleCondition.TargetUnit = c.targetUnit
 		postableRule.RuleCondition.Thresholds = &ruletypes.RuleThresholdData{
 			Kind: ruletypes.BasicThresholdKind,
 			Spec: ruletypes.BasicRuleThresholds{
@@ -1904,6 +1930,8 @@ func TestThresholdEval_RequireMinPoints(t *testing.T) {
 			Frequency:  valuer.MustParseTextDuration("1m"),
 		}},
 		RuleCondition: &ruletypes.RuleCondition{
+			CompareOperator: ruletypes.ValueIsAbove,
+			MatchType:       ruletypes.AtleastOnce,
 			CompositeQuery: &ruletypes.AlertCompositeQuery{
 				QueryType: ruletypes.QueryTypeBuilder,
 				Queries: []qbtypes.QueryEnvelope{{
@@ -2022,6 +2050,7 @@ func TestThresholdEval_RequireMinPoints(t *testing.T) {
 		mockMetadataStore.TypeMap["signoz_calls_total"] = metrictypes.SumType
 
 		rc := postableRule.RuleCondition
+		rc.Target = &c.target
 		rc.RequireMinPoints = c.requireMinPoints
 		rc.RequiredNumPoints = c.requiredNumPoints
 		rc.Thresholds = &ruletypes.RuleThresholdData{
@@ -2030,8 +2059,8 @@ func TestThresholdEval_RequireMinPoints(t *testing.T) {
 				{
 					Name:            postableRule.AlertName.StringValue(),
 					TargetValue:     &c.target,
-					MatchType:       ruletypes.AtleastOnce,
-					CompareOperator: ruletypes.ValueIsAbove,
+					MatchType:       rc.MatchType,
+					CompareOperator: rc.CompareOperator,
 				},
 			},
 		}

pkg/ruler/handler.go

@@ -3,6 +3,7 @@ package ruler
 import "net/http"
 
 type Handler interface {
+	ListRules(http.ResponseWriter, *http.Request)
 	ListRulesV3(http.ResponseWriter, *http.Request)
 	GetRuleByID(http.ResponseWriter, *http.Request)
 	CreateRule(http.ResponseWriter, *http.Request)

pkg/ruler/signozruler/handler.go

@@ -25,6 +25,24 @@ func NewHandler(ruler ruler.Ruler) ruler.Handler {
 	return &handler{ruler: ruler}
 }
 
+func (handler *handler) ListRules(rw http.ResponseWriter, req *http.Request) {
+	ctx, cancel := context.WithTimeout(req.Context(), 30*time.Second)
+	defer cancel()
+
+	rules, err := handler.ruler.ListRuleStates(ctx)
+	if err != nil {
+		render.Error(rw, err)
+		return
+	}
+
+	view := make([]*ruletypes.Rule, 0, len(rules.Rules))
+	for _, rule := range rules.Rules {
+		view = append(view, ruletypes.NewRule(rule))
+	}
+
+	render.Success(rw, http.StatusOK, view)
+}
+
 func (handler *handler) ListRulesV3(rw http.ResponseWriter, req *http.Request) {
 	ctx, cancel := context.WithTimeout(req.Context(), 30*time.Second)
 	defer cancel()

pkg/signoz/provider.go

@@ -264,7 +264,6 @@ func NewSQLMigrationProviderFactories(
 		sqlmigration.NewKeepRelevantLLMPricingRulesFactory(),
 		sqlmigration.NewBackfillTelegramChannelSpecFactory(),
 		sqlmigration.NewAddMetricsFieldTuplesFactory(sqlstore),
-		sqlmigration.NewMigrateRulesV1ToV2Alpha1Factory(sqlstore),
 	)
 }
 

pkg/sqlmigration/138_migrate_rules_v1_to_v2alpha1.go

@@ -1,573 +0,0 @@
-package sqlmigration
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"log/slog"
-	"slices"
-	"time"
-
-	"github.com/uptrace/bun"
-	"github.com/uptrace/bun/migrate"
-
-	"github.com/SigNoz/signoz/pkg/errors"
-	"github.com/SigNoz/signoz/pkg/factory"
-	"github.com/SigNoz/signoz/pkg/sqlstore"
-)
-
-const (
-	schemaVersionV2Alpha1  = "v2alpha1"
-	ruleTypeThreshold      = "threshold_rule"
-	ruleTypeProm           = "promql_rule"
-	ruleTypeAnomaly        = "anomaly_rule"
-	queryTypeBuilder       = "builder"
-	queryTypePromQL        = "promql"
-	queryTypeClickHouseSQL = "clickhouse_sql"
-	panelTypeGraph         = "graph"
-	alertTypeMetric        = "METRIC_BASED_ALERT"
-	alertTypeTraces        = "TRACES_BASED_ALERT"
-	alertTypeLogs          = "LOGS_BASED_ALERT"
-	signalLogs             = "logs"
-	signalTraces           = "traces"
-	compareOperatorBelow   = "2"
-	criticalThresholdName  = "critical"
-	labelSeverity          = "severity"
-)
-
-// The values the write path accepts; a migrated rule outside them is written
-// disabled, for the user to fix.
-var (
-	supportedCompareOperators = []string{"1", "above", ">", "2", "below", "<", "3", "equal", "eq", "=", "4", "not_equal", "not_eq", "!=", "5", "above_or_equal", "above_or_eq", ">=", "6", "below_or_equal", "below_or_eq", "<=", "7", "outside_bounds"}
-	supportedMatchTypes       = []string{"1", "at_least_once", "2", "all_the_times", "3", "on_average", "avg", "4", "in_total", "sum", "5", "last"}
-)
-
-// The values the write path accepts; a migrated row outside them cannot be
-// edited until the field is supplied, so the migration derives them.
-var (
-	supportedAlertTypes = []string{"METRIC_BASED_ALERT", "TRACES_BASED_ALERT", "LOGS_BASED_ALERT", "EXCEPTIONS_BASED_ALERT", "AI_TRACES_BASED_ALERT"}
-	supportedQueryTypes = []string{"builder", "clickhouse_sql", "promql"}
-	supportedPanelTypes = []string{"value", "table", "graph"}
-)
-
-type migrateRulesV1ToV2Alpha1 struct {
-	sqlstore sqlstore.SQLStore
-	logger   *slog.Logger
-}
-
-func NewMigrateRulesV1ToV2Alpha1Factory(sqlstore sqlstore.SQLStore) factory.ProviderFactory[SQLMigration, Config] {
-	return factory.NewProviderFactory(factory.MustNewName("migrate_rules_v1_to_v2alpha1"), func(ctx context.Context, ps factory.ProviderSettings, c Config) (SQLMigration, error) {
-		return &migrateRulesV1ToV2Alpha1{sqlstore: sqlstore, logger: ps.Logger}, nil
-	})
-}
-
-func (migration *migrateRulesV1ToV2Alpha1) Register(migrations *migrate.Migrations) error {
-	return migrations.Register(migration.Up, migration.Down)
-}
-
-// Up rewrites every v1 rule in every org as v2alpha1 in place. A row that does
-// not decode, or a v1 rule that cannot be rewritten, is logged and left as is;
-// a failed write aborts the run and rolls back every org.
-func (migration *migrateRulesV1ToV2Alpha1) Up(ctx context.Context, _ *bun.DB) error {
-	return migration.sqlstore.RunInTxCtx(ctx, nil, func(ctx context.Context) error {
-		var orgIDs []string
-		if err := migration.sqlstore.BunDBCtx(ctx).NewSelect().Table("organizations").Column("id").Scan(ctx, &orgIDs); err != nil {
-			return err
-		}
-
-		for _, orgID := range orgIDs {
-			if err := migration.convertOrg(ctx, orgID); err != nil {
-				return err
-			}
-		}
-
-		return nil
-	})
-}
-
-func (migration *migrateRulesV1ToV2Alpha1) convertOrg(ctx context.Context, orgID string) error {
-	db := migration.sqlstore.BunDBCtx(ctx)
-
-	rules := make([]*ruleRow, 0)
-	if err := db.NewSelect().Model(&rules).Where("org_id = ?", orgID).Scan(ctx); err != nil {
-		return err
-	}
-
-	routes := make([]*routePolicyRow, 0)
-	if err := db.NewSelect().Model(&routes).Where("org_id = ?", orgID).Scan(ctx); err != nil {
-		return err
-	}
-	routesByName := make(map[string][]*routePolicyRow)
-	for _, route := range routes {
-		routesByName[route.Name] = append(routesByName[route.Name], route)
-	}
-
-	var migrated, disabled, skipped, undecodable, unmigratable int
-	for _, stored := range rules {
-		var header struct {
-			SchemaVersion string `json:"schemaVersion"`
-		}
-		if err := json.Unmarshal([]byte(stored.Data), &header); err != nil {
-			undecodable++
-			migration.logger.WarnContext(ctx, "failed to decode stored rule", slog.String("org_id", orgID), slog.String("rule_id", stored.ID), errors.Attr(err))
-			continue
-		}
-		if header.SchemaVersion == schemaVersionV2Alpha1 {
-			skipped++
-			continue
-		}
-
-		rule := new(postableRule)
-		if err := json.Unmarshal([]byte(stored.Data), rule); err != nil {
-			undecodable++
-			migration.logger.WarnContext(ctx, "failed to decode stored rule", slog.String("org_id", orgID), slog.String("rule_id", stored.ID), errors.Attr(err))
-			continue
-		}
-
-		routes := routesByName[stored.ID]
-		if err := validateRoutes(routes, rule.PreferredChannels); err != nil {
-			unmigratable++
-			migration.logger.WarnContext(ctx, "leaving rule at v1", slog.String("org_id", orgID), slog.String("rule_id", stored.ID), errors.Attr(err))
-			continue
-		}
-		var route *routePolicyRow
-		expression := ""
-		if len(routes) == 1 {
-			route = routes[0]
-			expression = route.Expression
-		}
-
-		if err := convertRule(stored.ID, rule, route); err != nil {
-			unmigratable++
-			migration.logger.WarnContext(ctx, "leaving rule at v1", slog.String("org_id", orgID), slog.String("rule_id", stored.ID), errors.Attr(err))
-			continue
-		}
-		if reason := rule.validateThreshold(); reason != nil {
-			rule.Disabled = json.RawMessage("true")
-			disabled++
-			migration.logger.WarnContext(ctx, "migrating rule as disabled, its threshold fails the write path", slog.String("org_id", orgID), slog.String("rule_id", stored.ID), errors.Attr(reason))
-		}
-
-		data, err := marshalUnescaped(rule)
-		if err != nil {
-			return err
-		}
-		stored.Data = string(data)
-		if _, err := db.NewUpdate().Model(stored).Column("data").WherePK().Exec(ctx); err != nil {
-			return err
-		}
-		if route != nil && route.Expression != expression {
-			if _, err := db.NewUpdate().Model(route).Column("expression").WherePK().Exec(ctx); err != nil {
-				return err
-			}
-		}
-		migrated++
-	}
-
-	migration.logger.InfoContext(ctx, "migrated rules from v1 to v2alpha1", slog.String("org_id", orgID), slog.Int("total", len(rules)), slog.Int("migrated", migrated), slog.Int("disabled", disabled), slog.Int("skipped", skipped), slog.Int("undecodable", undecodable), slog.Int("unmigratable", unmigratable))
-	return nil
-}
-
-// convertRule rewrites rule in place, in the order the v1 decode derived the
-// same values. Version and source are left as stored. A nil route is a rule
-// that never had channels.
-func convertRule(ruleID string, rule *postableRule, route *routePolicyRow) error {
-	if rule.RuleCondition == nil || rule.RuleCondition.CompositeQuery == nil {
-		return errors.NewInvalidInputf(errors.CodeInvalidInput, "condition or condition.compositeQuery is null")
-	}
-	channels := []string{}
-	if route != nil {
-		channels = route.Channels
-	}
-
-	rule.fillDurationDefaults()
-	if err := rule.validateDurations(); err != nil {
-		return err
-	}
-	rule.deriveAlertType()
-	rule.deriveQueryType()
-	rule.repairPanelType()
-	rule.disableUnmetMinPoints()
-	rule.deriveRuleType()
-	rule.negateAnomalyBelowTarget()
-	rule.repairEmptySeverity(ruleID, route)
-	rule.relocateThreshold(channels)
-	rule.relocateEvaluation()
-	rule.synthesizeNotificationSettings()
-	rule.SchemaVersion = schemaVersionV2Alpha1
-	rule.clearV1Fields()
-
-	return nil
-}
-
-// validateRoutes checks the rule's route_policy rows, named after the rule. A
-// rule that never had channels got no row from migration 049 and migrates with
-// none; a rule with preferred channels but no row would lose them, so it is
-// left at v1.
-func validateRoutes(routes []*routePolicyRow, preferredChannels []string) error {
-	if len(routes) > 1 {
-		return errors.NewInvalidInputf(errors.CodeInvalidInput, "expected one route_policy row, found %d", len(routes))
-	}
-	if len(routes) == 0 && len(preferredChannels) > 0 {
-		return errors.NewInvalidInputf(errors.CodeInvalidInput, "no route_policy row for a rule with %d preferred channels", len(preferredChannels))
-	}
-	return nil
-}
-
-type ruleRow struct {
-	bun.BaseModel `bun:"table:rule"`
-
-	ID    string `bun:"id,pk"`
-	OrgID string `bun:"org_id"`
-	Data  string `bun:"data"`
-}
-
-type routePolicyRow struct {
-	bun.BaseModel `bun:"table:route_policy"`
-
-	ID         string   `bun:"id,pk"`
-	OrgID      string   `bun:"org_id"`
-	Name       string   `bun:"name"`
-	Expression string   `bun:"expression"`
-	Channels   []string `bun:"channels,type:jsonb"`
-}
-
-// postableRule mirrors PostableRule key for key, in its order. Keys the
-// crosswalk reads or writes are typed; the rest pass through as stored.
-type postableRule struct {
-	AlertName            json.RawMessage       `json:"alert,omitempty"`
-	AlertType            string                `json:"alertType"`
-	Description          json.RawMessage       `json:"description,omitempty"`
-	RuleType             string                `json:"ruleType,omitempty"`
-	EvalWindow           textDuration          `json:"evalWindow,omitzero"`
-	Frequency            textDuration          `json:"frequency,omitzero"`
-	RuleCondition        *ruleCondition        `json:"condition"`
-	Labels               map[string]string     `json:"labels,omitempty"`
-	Annotations          json.RawMessage       `json:"annotations,omitempty"`
-	Disabled             json.RawMessage       `json:"disabled,omitempty"`
-	Source               json.RawMessage       `json:"source,omitempty"`
-	PreferredChannels    []string              `json:"preferredChannels,omitempty"`
-	Version              json.RawMessage       `json:"version,omitempty"`
-	Evaluation           *evaluationEnvelope   `json:"evaluation,omitempty"`
-	SchemaVersion        string                `json:"schemaVersion,omitempty"`
-	NotificationSettings *notificationSettings `json:"notificationSettings,omitempty"`
-}
-
-type ruleCondition struct {
-	CompositeQuery    *compositeQuery `json:"compositeQuery"`
-	CompareOperator   string          `json:"op,omitempty"`
-	Target            *float64        `json:"target,omitempty"`
-	AlertOnAbsent     bool            `json:"alertOnAbsent,omitempty"`
-	AbsentFor         json.RawMessage `json:"absentFor,omitempty"`
-	MatchType         string          `json:"matchType,omitempty"`
-	TargetUnit        string          `json:"targetUnit,omitempty"`
-	Seasonality       string          `json:"seasonality,omitempty"`
-	SelectedQuery     json.RawMessage `json:"selectedQueryName,omitempty"`
-	RequireMinPoints  json.RawMessage `json:"requireMinPoints,omitempty"`
-	RequiredNumPoints json.RawMessage `json:"requiredNumPoints,omitempty"`
-	Thresholds        *ruleThresholds `json:"thresholds,omitempty"`
-}
-
-type compositeQuery struct {
-	Queries   json.RawMessage `json:"queries,omitempty"`
-	PanelType string          `json:"panelType"`
-	QueryType string          `json:"queryType"`
-	Unit      json.RawMessage `json:"unit,omitempty"`
-}
-
-// ruleQueryEnvelope reads the two envelope keys the derivations need.
-type ruleQueryEnvelope struct {
-	Type string `json:"type"`
-	Spec struct {
-		Signal string `json:"signal"`
-	} `json:"spec"`
-}
-
-type ruleThresholds struct {
-	Kind string           `json:"kind"`
-	Spec []basicThreshold `json:"spec"`
-}
-
-type basicThreshold struct {
-	Name            string   `json:"name"`
-	TargetValue     *float64 `json:"target"`
-	TargetUnit      string   `json:"targetUnit"`
-	RecoveryTarget  *float64 `json:"recoveryTarget"`
-	MatchType       string   `json:"matchType"`
-	CompareOperator string   `json:"op"`
-	Channels        []string `json:"channels"`
-}
-
-type evaluationEnvelope struct {
-	Kind string        `json:"kind"`
-	Spec rollingWindow `json:"spec"`
-}
-
-type rollingWindow struct {
-	EvalWindow textDuration `json:"evalWindow"`
-	Frequency  textDuration `json:"frequency"`
-}
-
-type notificationSettings struct {
-	Renotify  *renotify `json:"renotify,omitempty"`
-	UsePolicy bool      `json:"usePolicy"`
-}
-
-type renotify struct {
-	Enabled          bool         `json:"enabled"`
-	ReNotifyInterval textDuration `json:"interval,omitzero"`
-	AlertStates      []string     `json:"alertStates,omitzero"`
-}
-
-// validateThreshold reports what the v1 write path once let through: a missing
-// target, or an op or matchType the v2 write path rejects. It reads the
-// relocated threshold, so it runs after convertRule.
-func (rule *postableRule) validateThreshold() error {
-	threshold := rule.RuleCondition.Thresholds.Spec[0]
-	if threshold.TargetValue == nil {
-		return errors.NewInvalidInputf(errors.CodeInvalidInput, "condition.target is null")
-	}
-	if !slices.Contains(supportedCompareOperators, threshold.CompareOperator) {
-		return errors.NewInvalidInputf(errors.CodeInvalidInput, "condition.op: unsupported value %q", threshold.CompareOperator)
-	}
-	if !slices.Contains(supportedMatchTypes, threshold.MatchType) {
-		return errors.NewInvalidInputf(errors.CodeInvalidInput, "condition.matchType: unsupported value %q", threshold.MatchType)
-	}
-	return nil
-}
-
-func (rule *postableRule) fillDurationDefaults() {
-	if rule.EvalWindow.IsZero() {
-		rule.EvalWindow = mustParseTextDuration("5m")
-	}
-	if rule.Frequency.IsZero() {
-		rule.Frequency = mustParseTextDuration("1m")
-	}
-}
-
-// validateDurations rejects what the v1 write path never checked: a negative
-// evalWindow or frequency, which no read of a rolling window accepts.
-func (rule *postableRule) validateDurations() error {
-	if !rule.EvalWindow.IsPositive() || !rule.Frequency.IsPositive() {
-		return errors.NewInvalidInputf(errors.CodeInvalidInput, "evalWindow %s or frequency %s is negative", rule.EvalWindow, rule.Frequency)
-	}
-	return nil
-}
-
-func (rule *postableRule) deriveAlertType() {
-	if slices.Contains(supportedAlertTypes, rule.AlertType) {
-		return
-	}
-	// promql, clickhouse and formula queries carry no signal; they alert on metrics
-	rule.AlertType = alertTypeMetric
-	for _, envelope := range rule.decodeQueryEnvelopes() {
-		switch envelope.Spec.Signal {
-		case signalLogs:
-			rule.AlertType = alertTypeLogs
-			return
-		case signalTraces:
-			rule.AlertType = alertTypeTraces
-			return
-		}
-	}
-}
-
-func (rule *postableRule) deriveQueryType() {
-	query := rule.RuleCondition.CompositeQuery
-	if slices.Contains(supportedQueryTypes, query.QueryType) {
-		return
-	}
-	envelopes := rule.decodeQueryEnvelopes()
-	if len(envelopes) == 0 {
-		return
-	}
-	// a promql or clickhouse_sql envelope spells its type like the composite query does; every other envelope is a builder one
-	switch envelopes[0].Type {
-	case queryTypePromQL, queryTypeClickHouseSQL:
-		query.QueryType = envelopes[0].Type
-	default:
-		query.QueryType = queryTypeBuilder
-	}
-}
-
-func (rule *postableRule) repairPanelType() {
-	query := rule.RuleCondition.CompositeQuery
-	// nothing reads panelType; both alert forms write graph
-	if !slices.Contains(supportedPanelTypes, query.PanelType) {
-		query.PanelType = panelTypeGraph
-	}
-}
-
-func (rule *postableRule) disableUnmetMinPoints() {
-	condition := rule.RuleCondition
-	if string(condition.RequireMinPoints) != "true" {
-		return
-	}
-	points := 0.0
-	if len(condition.RequiredNumPoints) > 0 {
-		if err := json.Unmarshal(condition.RequiredNumPoints, &points); err != nil {
-			return
-		}
-	}
-	if points > 0 {
-		return
-	}
-	// zero required points is a check every series passes
-	condition.RequireMinPoints = json.RawMessage("false")
-}
-
-func (rule *postableRule) decodeQueryEnvelopes() []ruleQueryEnvelope {
-	var envelopes []ruleQueryEnvelope
-	if err := json.Unmarshal(rule.RuleCondition.CompositeQuery.Queries, &envelopes); err != nil {
-		return nil
-	}
-	return envelopes
-}
-
-func (rule *postableRule) deriveRuleType() {
-	switch rule.RuleCondition.CompositeQuery.QueryType {
-	case queryTypeBuilder, queryTypeClickHouseSQL:
-		if rule.RuleType == "" {
-			rule.RuleType = ruleTypeThreshold
-		}
-	case queryTypePromQL:
-		rule.RuleType = ruleTypeProm
-	}
-}
-
-// negateAnomalyBelowTarget stores "below 3" as -3, since anomaly scores are
-// signed. Only the raw "2" negates; "below" and "<" keep the sign the rule
-// evaluates with today.
-func (rule *postableRule) negateAnomalyBelowTarget() {
-	condition := rule.RuleCondition
-	if rule.RuleType != ruleTypeAnomaly || condition.CompareOperator != compareOperatorBelow || condition.Target == nil {
-		return
-	}
-	negated := -*condition.Target
-	condition.Target = &negated
-}
-
-// repairEmptySeverity rewrites a severity of "" as critical in labels and in
-// the route expression that matches alerts on it, since a threshold named ""
-// fails every later read.
-func (rule *postableRule) repairEmptySeverity(ruleID string, route *routePolicyRow) {
-	if severity, ok := rule.Labels[labelSeverity]; !ok || severity != "" {
-		return
-	}
-	rule.Labels[labelSeverity] = criticalThresholdName
-	if route != nil {
-		route.Expression = fmt.Sprintf(`threshold.name == "%s" && ruleId == "%s"`, criticalThresholdName, ruleID)
-	}
-}
-
-func (rule *postableRule) relocateThreshold(channels []string) {
-	thresholdName := criticalThresholdName
-	if severity, ok := rule.Labels[labelSeverity]; ok {
-		thresholdName = severity
-	}
-
-	condition := rule.RuleCondition
-	condition.Thresholds = &ruleThresholds{
-		Kind: "basic",
-		Spec: []basicThreshold{{
-			Name:            thresholdName,
-			TargetValue:     condition.Target,
-			TargetUnit:      condition.TargetUnit,
-			MatchType:       condition.MatchType,
-			CompareOperator: condition.CompareOperator,
-			Channels:        channels,
-		}},
-	}
-}
-
-func (rule *postableRule) relocateEvaluation() {
-	rule.Evaluation = &evaluationEnvelope{
-		Kind: "rolling",
-		Spec: rollingWindow{EvalWindow: rule.EvalWindow, Frequency: rule.Frequency},
-	}
-}
-
-func (rule *postableRule) synthesizeNotificationSettings() {
-	alertStates := []string{"firing"}
-	if rule.RuleCondition.AlertOnAbsent {
-		alertStates = append(alertStates, "nodata")
-	}
-	rule.NotificationSettings = &notificationSettings{
-		Renotify: &renotify{
-			Enabled:          true,
-			ReNotifyInterval: mustParseTextDuration("4h"),
-			AlertStates:      alertStates,
-		},
-		UsePolicy: false,
-	}
-}
-
-func (rule *postableRule) clearV1Fields() {
-	rule.EvalWindow = textDuration{}
-	rule.Frequency = textDuration{}
-	rule.PreferredChannels = nil
-	rule.RuleCondition.Target = nil
-	rule.RuleCondition.CompareOperator = ""
-	rule.RuleCondition.MatchType = ""
-	rule.RuleCondition.TargetUnit = ""
-}
-
-// textDuration decodes a duration the way the app's TextDuration does, a
-// string or a number of nanoseconds, and writes a string back in its stored
-// spelling.
-type textDuration struct {
-	text  string
-	value time.Duration
-}
-
-func mustParseTextDuration(text string) textDuration {
-	value, err := time.ParseDuration(text)
-	if err != nil {
-		panic(err)
-	}
-	return textDuration{text: text, value: value}
-}
-
-func (d textDuration) IsZero() bool {
-	return d.value == 0
-}
-
-func (d textDuration) IsPositive() bool {
-	return d.value > 0
-}
-
-func (d textDuration) String() string {
-	if d.text != "" {
-		return d.text
-	}
-	return d.value.String()
-}
-
-func (d textDuration) MarshalJSON() ([]byte, error) {
-	return json.Marshal(d.String())
-}
-
-func (d *textDuration) UnmarshalJSON(data []byte) error {
-	var raw any
-	if err := json.Unmarshal(data, &raw); err != nil {
-		return err
-	}
-	switch value := raw.(type) {
-	case float64:
-		*d = textDuration{value: time.Duration(value)}
-		return nil
-	case string:
-		parsed, err := time.ParseDuration(value)
-		if err != nil {
-			return err
-		}
-		*d = textDuration{text: value, value: parsed}
-		return nil
-	default:
-		return errors.NewInvalidInputf(errors.CodeInvalidInput, "invalid duration %s", data)
-	}
-}
-
-func (migration *migrateRulesV1ToV2Alpha1) Down(context.Context, *bun.DB) error {
-	return nil
-}

pkg/types/alertmanagertypes/config.go

@@ -619,6 +619,10 @@ type ConfigStore interface {
 
 	// ListAllChannels returns the list of channels for all organizations.
 	ListAllChannels(context.Context) ([]*Channel, error)
+
+	// GetMatchers gets a list of matchers per organization.
+	// Matchers is an array of ruleId to receiver names.
+	GetMatchers(context.Context, string) (map[string][]string, error)
 }
 
 // MarshalSecretValue if set to true will expose Secret type

pkg/types/rulestatehistorytypes/query.go

@@ -32,10 +32,5 @@ func (q *Query) Validate() error {
 	if q.Order != qbtypes.OrderDirectionAsc && q.Order != qbtypes.OrderDirectionDesc {
 		return errors.NewInvalidInputf(errors.CodeInvalidInput, "order must be asc or desc")
 	}
-	if !q.State.IsZero() {
-		if err := q.State.Validate(); err != nil {
-			return err
-		}
-	}
 	return nil
 }

pkg/types/ruletypes/alert_state.go

@@ -1,9 +1,6 @@
 package ruletypes
 
-import (
-	"github.com/SigNoz/signoz/pkg/errors"
-	"github.com/SigNoz/signoz/pkg/valuer"
-)
+import "github.com/SigNoz/signoz/pkg/valuer"
 
 type AlertState struct {
 	valuer.String
@@ -29,15 +26,6 @@ func (AlertState) Enum() []any {
 	}
 }
 
-func (a AlertState) Validate() error {
-	switch a {
-	case StateInactive, StatePending, StateRecovering, StateFiring, StateNoData, StateDisabled:
-		return nil
-	default:
-		return errors.NewInvalidInputf(errors.CodeInvalidInput, "state: unsupported value %q; must be one of inactive, pending, recovering, firing, nodata, disabled", a.StringValue())
-	}
-}
-
 var alertStateSeverity = map[AlertState]int{
 	StateInactive:   0,
 	StatePending:    1,

pkg/types/ruletypes/alerting.go

@@ -5,7 +5,6 @@ import (
 	"sort"
 	"time"
 
-	"github.com/SigNoz/signoz/pkg/errors"
 	qbtypes "github.com/SigNoz/signoz/pkg/types/querybuildertypes/querybuildertypesv5"
 	"github.com/SigNoz/signoz/pkg/valuer"
 )
@@ -78,15 +77,6 @@ func (PanelType) Enum() []any {
 	}
 }
 
-func (p PanelType) Validate() error {
-	switch p {
-	case PanelTypeValue, PanelTypeTable, PanelTypeGraph:
-		return nil
-	default:
-		return errors.NewInvalidInputf(errors.CodeInvalidInput, "condition.compositeQuery.panelType: unsupported value %q; must be one of value, table, graph", p.StringValue())
-	}
-}
-
 // Note: this is used to represent the state of the alert query
 // i.e the active tab which should be used to represent the selection
 
@@ -109,15 +99,6 @@ func (QueryType) Enum() []any {
 	}
 }
 
-func (q QueryType) Validate() error {
-	switch q {
-	case QueryTypeBuilder, QueryTypeClickHouseSQL, QueryTypePromQL:
-		return nil
-	default:
-		return errors.NewInvalidInputf(errors.CodeInvalidInput, "condition.compositeQuery.queryType: unsupported value %q; must be one of builder, clickhouse_sql, promql", q.StringValue())
-	}
-}
-
 type AlertCompositeQuery struct {
 	Queries []qbtypes.QueryEnvelope `json:"queries" required:"true"`
 
@@ -130,13 +111,18 @@ type AlertCompositeQuery struct {
 
 type RuleCondition struct {
 	CompositeQuery    *AlertCompositeQuery `json:"compositeQuery" required:"true"`
+	CompareOperator   CompareOperator      `json:"op,omitzero"`
+	Target            *float64             `json:"target,omitempty" format:"double"`
 	AlertOnAbsent     bool                 `json:"alertOnAbsent,omitempty"`
 	AbsentFor         uint64               `json:"absentFor,omitempty"`
+	MatchType         MatchType            `json:"matchType,omitzero"`
+	TargetUnit        string               `json:"targetUnit,omitempty"`
+	Algorithm         string               `json:"algorithm,omitempty"`
 	Seasonality       Seasonality          `json:"seasonality,omitzero"`
 	SelectedQuery     string               `json:"selectedQueryName,omitempty"`
 	RequireMinPoints  bool                 `json:"requireMinPoints,omitempty"`
 	RequiredNumPoints int                  `json:"requiredNumPoints,omitempty"`
-	Thresholds        *RuleThresholdData   `json:"thresholds" required:"true"`
+	Thresholds        *RuleThresholdData   `json:"thresholds,omitempty"`
 }
 
 func (rc *RuleCondition) SelectedQueryName() string {

pkg/types/ruletypes/api_params.go

@@ -9,7 +9,6 @@ import (
 	"unicode/utf8"
 
 	"github.com/prometheus/alertmanager/config"
-	"github.com/swaggest/jsonschema-go"
 
 	"github.com/SigNoz/signoz/pkg/errors"
 	"github.com/SigNoz/signoz/pkg/types"
@@ -49,6 +48,7 @@ func (t AlertType) BuilderQueryType() qbtypes.QueryType {
 }
 
 const (
+	DefaultSchemaVersion  = "v1"
 	SchemaVersionV2Alpha1 = "v2alpha1"
 )
 
@@ -60,10 +60,12 @@ const (
 
 // PostableRule is used to create alerting rule from HTTP api.
 type PostableRule struct {
-	AlertName   valuer.DisplayName `json:"alert" required:"true"`
-	AlertType   AlertType          `json:"alertType" required:"true"`
-	Description string             `json:"description,omitempty"`
-	RuleType    RuleType           `json:"ruleType" required:"true"`
+	AlertName   valuer.DisplayName  `json:"alert" required:"true"`
+	AlertType   AlertType           `json:"alertType" required:"true"`
+	Description string              `json:"description,omitempty"`
+	RuleType    RuleType            `json:"ruleType" required:"true"`
+	EvalWindow  valuer.TextDuration `json:"evalWindow,omitzero"`
+	Frequency   valuer.TextDuration `json:"frequency,omitzero"`
 
 	RuleCondition *RuleCondition    `json:"condition" required:"true"`
 	Labels        map[string]string `json:"labels,omitempty"`
@@ -74,12 +76,14 @@ type PostableRule struct {
 	// Source captures the source url where rule has been created
 	Source string `json:"source,omitempty"`
 
+	PreferredChannels []string `json:"preferredChannels,omitempty"`
+
 	Version string `json:"version"`
 
-	Evaluation    *EvaluationEnvelope          `json:"evaluation" required:"true"`
-	SchemaVersion valuer.UnsetOrNonEmptyString `json:"schemaVersion" required:"true" enum:"v2alpha1"`
+	Evaluation    *EvaluationEnvelope `json:"evaluation,omitempty"`
+	SchemaVersion string              `json:"schemaVersion,omitempty"`
 
-	NotificationSettings *NotificationSettings `json:"notificationSettings" required:"true"`
+	NotificationSettings *NotificationSettings `json:"notificationSettings,omitempty"`
 }
 
 type NotificationSettings struct {
@@ -225,20 +229,101 @@ func (ns *NotificationSettings) UnmarshalJSON(data []byte) error {
 // processRuleDefaults applies the default values
 // for the rule options that are blank or unset.
 func (r *PostableRule) processRuleDefaults() {
+	if r.SchemaVersion == "" {
+		r.SchemaVersion = DefaultSchemaVersion
+	}
+
 	// TODO(srikanthccv): remove as this is now a legacy field
 	if r.Version == "" {
 		r.Version = "v5"
 	}
 
+	// v2alpha1 uses the Evaluation envelope for window/frequency;
+	// only default top-level fields for v1.
+	if r.SchemaVersion != SchemaVersionV2Alpha1 {
+		if r.EvalWindow.IsZero() {
+			r.EvalWindow = valuer.MustParseTextDuration("5m")
+		}
+
+		if r.Frequency.IsZero() {
+			r.Frequency = valuer.MustParseTextDuration("1m")
+		}
+	}
+
 	if r.RuleCondition != nil && r.RuleCondition.CompositeQuery != nil {
 		switch r.RuleCondition.CompositeQuery.QueryType {
-		case QueryTypeBuilder, QueryTypeClickHouseSQL:
+		case QueryTypeBuilder:
 			if r.RuleType.IsZero() {
 				r.RuleType = RuleTypeThreshold
 			}
 		case QueryTypePromQL:
 			r.RuleType = RuleTypeProm
 		}
+
+		if r.SchemaVersion == DefaultSchemaVersion {
+			thresholdName := CriticalThresholdName
+			if r.Labels != nil {
+				if severity, ok := r.Labels["severity"]; ok {
+					thresholdName = severity
+				}
+			}
+
+			// For anomaly detection with ValueIsBelow, negate the target
+			targetValue := r.RuleCondition.Target
+			if r.RuleType == RuleTypeAnomaly && r.RuleCondition.CompareOperator == ValueIsBelow && targetValue != nil {
+				negated := -1 * *targetValue
+				targetValue = &negated
+			}
+
+			thresholdData := RuleThresholdData{
+				Kind: BasicThresholdKind,
+				Spec: BasicRuleThresholds{{
+					Name:            thresholdName,
+					TargetUnit:      r.RuleCondition.TargetUnit,
+					TargetValue:     targetValue,
+					MatchType:       r.RuleCondition.MatchType,
+					CompareOperator: r.RuleCondition.CompareOperator,
+					Channels:        r.PreferredChannels,
+				}},
+			}
+			r.RuleCondition.Thresholds = &thresholdData
+			r.Evaluation = &EvaluationEnvelope{RollingEvaluation, RollingWindow{EvalWindow: r.EvalWindow, Frequency: r.Frequency}}
+			r.NotificationSettings = &NotificationSettings{
+				Renotify: &Renotify{
+					Enabled:          true,
+					ReNotifyInterval: valuer.MustParseTextDuration("4h"),
+					AlertStates:      []AlertState{StateFiring},
+				},
+			}
+			if r.RuleCondition.AlertOnAbsent {
+				r.NotificationSettings.Renotify.AlertStates = append(r.NotificationSettings.Renotify.AlertStates, StateNoData)
+			}
+		}
+	}
+}
+
+func (r *PostableRule) MarshalJSON() ([]byte, error) {
+	type Alias PostableRule
+
+	switch r.SchemaVersion {
+	case DefaultSchemaVersion:
+		copyStruct := *r
+		aux := Alias(copyStruct)
+		if aux.RuleCondition != nil {
+			aux.RuleCondition.Thresholds = nil
+		}
+		aux.Evaluation = nil
+		aux.SchemaVersion = ""
+		aux.NotificationSettings = nil
+		return json.Marshal(aux)
+	case SchemaVersionV2Alpha1:
+		copyStruct := *r
+		aux := Alias(copyStruct)
+		return json.Marshal(aux)
+	default:
+		copyStruct := *r
+		aux := Alias(copyStruct)
+		return json.Marshal(aux)
 	}
 }
 
@@ -252,19 +337,6 @@ func (r *PostableRule) UnmarshalJSON(bytes []byte) error {
 	return r.validate()
 }
 
-var _ jsonschema.Preparer = PostableRule{}
-
-// PrepareJSONSchema marks version and source deprecated: nothing reads them,
-// they stay only so existing clients keep a stable schema.
-func (PostableRule) PrepareJSONSchema(schema *jsonschema.Schema) error {
-	for _, name := range []string{"version", "source"} {
-		if property, ok := schema.Properties[name]; ok && property.TypeObject != nil {
-			property.TypeObject.WithDeprecated(true)
-		}
-	}
-	return nil
-}
-
 func isValidLabelName(ln string) bool {
 	if len(ln) == 0 {
 		return false
@@ -292,6 +364,10 @@ func (r *PostableRule) validate() error {
 		return errors.NewInvalidInputf(errors.CodeInvalidInput, "condition: field is required")
 	}
 
+	if r.Version != "v5" {
+		errs = append(errs, errors.NewInvalidInputf(errors.CodeInvalidInput, "version: only v5 is supported, got %q", r.Version))
+	}
+
 	for k, v := range r.Labels {
 		if !isValidLabelName(k) {
 			errs = append(errs, errors.NewInvalidInputf(errors.CodeInvalidInput, "invalid label name: %s", k))
@@ -335,14 +411,18 @@ func (r *PostableRule) Validate() error {
 		return errors.NewInvalidInputf(errors.CodeInvalidInput, "condition: field is required")
 	}
 
-	switch r.AlertType {
-	case AlertTypeMetric, AlertTypeTraces, AlertTypeLogs, AlertTypeExceptions, AlertTypeAITraces:
-	case "":
-		errs = append(errs, errors.NewInvalidInputf(errors.CodeInvalidInput, "alertType: field is required"))
-	default:
-		errs = append(errs, errors.NewInvalidInputf(errors.CodeInvalidInput,
-			"alertType: unsupported value %q; must be one of %q, %q, %q, %q, %q",
-			r.AlertType, AlertTypeMetric, AlertTypeTraces, AlertTypeLogs, AlertTypeExceptions, AlertTypeAITraces))
+	if r.Version != "v5" {
+		errs = append(errs, errors.NewInvalidInputf(errors.CodeInvalidInput, "version: only v5 is supported, got %q", r.Version))
+	}
+
+	if r.AlertType != "" {
+		switch r.AlertType {
+		case AlertTypeMetric, AlertTypeTraces, AlertTypeLogs, AlertTypeExceptions, AlertTypeAITraces:
+		default:
+			errs = append(errs, errors.NewInvalidInputf(errors.CodeInvalidInput,
+				"alertType: unsupported value %q; must be one of %q, %q, %q, %q, %q",
+				r.AlertType, AlertTypeMetric, AlertTypeTraces, AlertTypeLogs, AlertTypeExceptions, AlertTypeAITraces))
+		}
 	}
 
 	if !r.RuleType.IsZero() {
@@ -360,12 +440,6 @@ func (r *PostableRule) Validate() error {
 	if r.RuleCondition.CompositeQuery == nil {
 		errs = append(errs, errors.NewInvalidInputf(errors.CodeInvalidInput, "condition.compositeQuery: field is required"))
 	} else {
-		if err := r.RuleCondition.CompositeQuery.QueryType.Validate(); err != nil {
-			errs = append(errs, err)
-		}
-		if err := r.RuleCondition.CompositeQuery.PanelType.Validate(); err != nil {
-			errs = append(errs, err)
-		}
 		if len(r.RuleCondition.CompositeQuery.Queries) == 0 {
 			errs = append(errs, errors.NewInvalidInputf(errors.CodeInvalidInput, "condition.compositeQuery.queries: must have at least one query"))
 		} else {
@@ -427,32 +501,70 @@ func (r *PostableRule) Validate() error {
 }
 
 func (r *PostableRule) validateSchemaVersion() []error {
-	switch r.SchemaVersion.StringValue() {
+	switch r.SchemaVersion {
+	case DefaultSchemaVersion:
+		return r.validateV1()
 	case SchemaVersionV2Alpha1:
 		return r.validateV2Alpha1()
 	default:
 		return []error{errors.NewInvalidInputf(errors.CodeInvalidInput,
-			"schemaVersion: unsupported value %q; must be %q",
-			r.SchemaVersion.StringValue(), SchemaVersionV2Alpha1)}
+			"schemaVersion: unsupported value %q; must be one of %q, %q",
+			r.SchemaVersion, DefaultSchemaVersion, SchemaVersionV2Alpha1)}
 	}
 }
 
+func (r *PostableRule) validateV1() []error {
+	var errs []error
+
+	if r.RuleCondition.Target == nil {
+		errs = append(errs, errors.NewInvalidInputf(errors.CodeInvalidInput,
+			"condition.target: field is required for schemaVersion %q", DefaultSchemaVersion))
+	}
+	if r.RuleCondition.CompareOperator.IsZero() {
+		errs = append(errs, errors.NewInvalidInputf(errors.CodeInvalidInput,
+			"condition.op: field is required for schemaVersion %q", DefaultSchemaVersion))
+	} else if err := r.RuleCondition.CompareOperator.Validate(); err != nil {
+		errs = append(errs, err)
+	}
+	if r.RuleCondition.MatchType.IsZero() {
+		errs = append(errs, errors.NewInvalidInputf(errors.CodeInvalidInput,
+			"condition.matchType: field is required for schemaVersion %q", DefaultSchemaVersion))
+	} else if err := r.RuleCondition.MatchType.Validate(); err != nil {
+		errs = append(errs, err)
+	}
+
+	return errs
+}
+
 func (r *PostableRule) validateV2Alpha1() []error {
 	var errs []error
 
+	// TODO(srikanthccv): reject v1-only fields?
+	// if r.RuleCondition.Target != nil {
+	// 	errs = append(errs, errors.NewInvalidInputf(errors.CodeInvalidInput,
+	// 		"condition.target: field is not used in schemaVersion %q; set target in condition.thresholds entries instead",
+	// 		SchemaVersionV2Alpha1))
+	// }
+	// if !r.RuleCondition.CompareOperator.IsZero() {
+	// 	errs = append(errs, errors.NewInvalidInputf(errors.CodeInvalidInput,
+	// 		"condition.op: field is not used in schemaVersion %q; set op in condition.thresholds entries instead",
+	// 		SchemaVersionV2Alpha1))
+	// }
+	// if !r.RuleCondition.MatchType.IsZero() {
+	// 	errs = append(errs, errors.NewInvalidInputf(errors.CodeInvalidInput,
+	// 		"condition.matchType: field is not used in schemaVersion %q; set matchType in condition.thresholds entries instead",
+	// 		SchemaVersionV2Alpha1))
+	// }
+	// if len(r.PreferredChannels) > 0 {
+	// 	errs = append(errs, errors.NewInvalidInputf(errors.CodeInvalidInput,
+	// 		"preferredChannels: field is not used in schemaVersion %q; set channels in condition.thresholds entries instead",
+	// 		SchemaVersionV2Alpha1))
+	// }
+
 	// Require v2alpha1-specific fields
 	if r.RuleCondition.Thresholds == nil {
 		errs = append(errs, errors.NewInvalidInputf(errors.CodeInvalidInput,
 			"condition.thresholds: field is required for schemaVersion %q", SchemaVersionV2Alpha1))
-	} else if threshold, err := r.RuleCondition.Thresholds.GetRuleThreshold(); err == nil {
-		if err := threshold.Validate(); err != nil {
-			errs = append(errs, err)
-		}
-		if thresholds, ok := threshold.(BasicRuleThresholds); ok {
-			if err := thresholds.validateUniqueNames(); err != nil {
-				errs = append(errs, err)
-			}
-		}
 	}
 
 	if r.Evaluation == nil {
@@ -532,6 +644,31 @@ type GettableRule struct {
 	UpdatedBy *string   `json:"updateBy" nullable:"true"`
 }
 
+func (g *GettableRule) MarshalJSON() ([]byte, error) {
+	type Alias GettableRule
+
+	switch g.SchemaVersion {
+	case DefaultSchemaVersion:
+		copyStruct := *g
+		aux := Alias(copyStruct)
+		if aux.RuleCondition != nil {
+			aux.RuleCondition.Thresholds = nil
+		}
+		aux.Evaluation = nil
+		aux.SchemaVersion = ""
+		aux.NotificationSettings = nil
+		return json.Marshal(aux)
+	case SchemaVersionV2Alpha1:
+		copyStruct := *g
+		aux := Alias(copyStruct)
+		return json.Marshal(aux)
+	default:
+		copyStruct := *g
+		aux := Alias(copyStruct)
+		return json.Marshal(aux)
+	}
+}
+
 // Rule is the v2 API read model for an alerting rule. It aligns audit fields
 // with the canonical types.TimeAuditable / types.UserAuditable shape used by
 // PlannedMaintenance and other entities. v1 handlers keep serializing
@@ -560,3 +697,28 @@ func NewRule(g *GettableRule) *Rule {
 	}
 	return r
 }
+
+func (r *Rule) MarshalJSON() ([]byte, error) {
+	type Alias Rule
+
+	switch r.SchemaVersion {
+	case DefaultSchemaVersion:
+		copyStruct := *r
+		aux := Alias(copyStruct)
+		if aux.RuleCondition != nil {
+			aux.RuleCondition.Thresholds = nil
+		}
+		aux.Evaluation = nil
+		aux.SchemaVersion = ""
+		aux.NotificationSettings = nil
+		return json.Marshal(aux)
+	case SchemaVersionV2Alpha1:
+		copyStruct := *r
+		aux := Alias(copyStruct)
+		return json.Marshal(aux)
+	default:
+		copyStruct := *r
+		aux := Alias(copyStruct)
+		return json.Marshal(aux)
+	}
+}

pkg/types/ruletypes/api_params_test.go

@@ -3,6 +3,7 @@ package ruletypes
 import (
 	"encoding/json"
 	"testing"
+	"time"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -28,7 +29,8 @@ func TestParseIntoRule(t *testing.T) {
 				"alertType": "METRIC_BASED_ALERT",
 				"description": "Test description",
 				"ruleType": "threshold_rule",
-				"schemaVersion": "v2alpha1",
+				"evalWindow": "5m",
+				"frequency": "1m",
 				"version": "v5",
 				"condition": {
 					"compositeQuery": {
@@ -43,11 +45,11 @@ func TestParseIntoRule(t *testing.T) {
 							}
 						}]
 					},
-					"thresholds": {"kind": "basic", "spec": [{"name": "critical", "target": 10.0, "matchType": "1", "op": "1"}]},
-					"selectedQueryName": "A"
-				},
-				"evaluation": {"kind": "rolling", "spec": {"evalWindow": "5m", "frequency": "1m"}},
-				"notificationSettings": {"renotify": {"enabled": true, "interval": "4h", "alertStates": ["firing"]}}
+					"target": 10.0,
+					"matchType": "1",
+					"op": "1",
+					"selectedQuery": "A"
+				}
 			}`),
 			kind:        RuleDataKindJson,
 			expectError: false,
@@ -61,6 +63,46 @@ func TestParseIntoRule(t *testing.T) {
 				if rule.RuleCondition.Thresholds.Kind.IsZero() {
 					t.Error("Expected thresholds to be populated")
 				}
+				if rule.RuleCondition.Target == nil {
+					t.Error("Expected target to be populated")
+				}
+			},
+		},
+		{
+			name:     "rule with default values applied",
+			initRule: PostableRule{},
+			content: []byte(`{
+				"alert": "DefaultsRule",
+				"ruleType": "threshold_rule",
+				"version": "v5",
+				"condition": {
+					"compositeQuery": {
+						"queryType": "builder",
+						"queries": [{
+							"type": "builder_query",
+							"spec": {
+								"name": "A",
+								"signal": "metrics",
+								"aggregations": [{"metricName": "test_metric", "spaceAggregation": "p50"}],
+								"stepInterval": "5m"
+							}
+						}]
+					},
+					"target": 5.0,
+					"matchType": "1",
+					"op": "1",
+					"selectedQuery": "A"
+				}
+			}`),
+			kind:        RuleDataKindJson,
+			expectError: false,
+			validate: func(t *testing.T, rule *PostableRule) {
+				if rule.EvalWindow.Duration() != 5*time.Minute {
+					t.Errorf("Expected default eval window '5m', got '%v'", rule.EvalWindow)
+				}
+				if rule.Frequency.Duration() != time.Minute {
+					t.Errorf("Expected default frequency '1m', got '%v'", rule.Frequency)
+				}
 			},
 		},
 		{
@@ -68,7 +110,6 @@ func TestParseIntoRule(t *testing.T) {
 			initRule: PostableRule{},
 			content: []byte(`{
 				"alert": "PromQLRule",
-				"schemaVersion": "v2alpha1",
 				"version": "v5",
 				"condition": {
 					"compositeQuery": {
@@ -82,11 +123,11 @@ func TestParseIntoRule(t *testing.T) {
 							}
 						}]
 					},
-					"thresholds": {"kind": "basic", "spec": [{"name": "critical", "target": 10.0, "matchType": "1", "op": "1"}]},
-					"selectedQueryName": "A"
-				},
-				"evaluation": {"kind": "rolling", "spec": {"evalWindow": "5m", "frequency": "1m"}},
-				"notificationSettings": {"renotify": {"enabled": true, "interval": "4h", "alertStates": ["firing"]}}
+					"target": 10.0,
+					"matchType": "1",
+					"op": "1",
+					"selectedQuery": "A"
+				}
 			}`),
 			kind:        RuleDataKindJson,
 			expectError: false,
@@ -97,6 +138,9 @@ func TestParseIntoRule(t *testing.T) {
 				if rule.RuleCondition.Thresholds.Kind.IsZero() {
 					t.Error("Expected thresholds to be populated")
 				}
+				if rule.RuleCondition.Target == nil {
+					t.Error("Expected target to be populated")
+				}
 			},
 		},
 	}
@@ -133,6 +177,233 @@ func TestParseIntoRuleSchemaVersioning(t *testing.T) {
 		expectValidateError bool // Validate() error (write path only)
 		validate            func(*testing.T, *PostableRule)
 	}{
+		{
+			name:     "schema v1 - threshold name from severity label",
+			initRule: PostableRule{},
+			content: []byte(`{
+				"alert": "SeverityLabelTest",
+				"schemaVersion": "v1",
+				"version": "v5",
+				"condition": {
+					"compositeQuery": {
+						"queryType": "builder",
+						"queries": [{
+							"type": "builder_query",
+							"spec": {
+								"name": "A",
+								"signal": "metrics",
+								"aggregations": [{"metricName": "cpu_usage", "spaceAggregation": "p50"}],
+								"stepInterval": "5m"
+							}
+						}],
+						"unit": "percent"
+					},
+					"target": 85.0,
+					"targetUnit": "%",
+					"matchType": "1",
+					"op": "1"
+				},
+				"labels": {
+					"severity": "warning",
+					"team": "platform"
+				}
+			}`),
+			kind:        RuleDataKindJson,
+			expectError: false,
+			validate: func(t *testing.T, rule *PostableRule) {
+				if rule.RuleCondition.Thresholds == nil {
+					t.Fatal("Expected Thresholds to be populated for v1")
+				}
+
+				threshold := rule.RuleCondition.Thresholds
+				if threshold.Kind != BasicThresholdKind {
+					t.Errorf("Expected BasicThresholdKind, got %s", threshold.Kind)
+				}
+
+				specs, ok := threshold.Spec.(BasicRuleThresholds)
+				if !ok {
+					t.Fatalf("Expected BasicRuleThresholds, got %T", threshold.Spec)
+				}
+
+				if len(specs) != 1 {
+					t.Fatalf("Expected 1 threshold spec, got %d", len(specs))
+				}
+
+				spec := specs[0]
+				if spec.Name != "warning" {
+					t.Errorf("Expected threshold name 'warning' from severity label, got '%s'", spec.Name)
+				}
+
+				if spec.TargetUnit != "%" {
+					t.Errorf("Expected TargetUnit '%%', got '%s'", spec.TargetUnit)
+				}
+				if *spec.TargetValue != 85.0 {
+					t.Errorf("Expected TargetValue 85.0, got %v", *spec.TargetValue)
+				}
+				if spec.MatchType != rule.RuleCondition.MatchType {
+					t.Error("Expected MatchType to be copied from RuleCondition")
+				}
+				if spec.CompareOperator != rule.RuleCondition.CompareOperator {
+					t.Error("Expected CompareOp to be copied from RuleCondition")
+				}
+
+				// Verify evaluation envelope is populated
+				if rule.Evaluation == nil {
+					t.Fatal("Expected Evaluation to be populated for v1")
+				}
+				if rule.Evaluation.Kind != RollingEvaluation {
+					t.Errorf("Expected RollingEvaluation, got %s", rule.Evaluation.Kind)
+				}
+
+				// Verify evaluation window matches rule settings
+				if window, ok := rule.Evaluation.Spec.(RollingWindow); ok {
+					if !window.EvalWindow.Equal(rule.EvalWindow) {
+						t.Errorf("Expected Evaluation EvalWindow %v, got %v", rule.EvalWindow, window.EvalWindow)
+					}
+					if !window.Frequency.Equal(rule.Frequency) {
+						t.Errorf("Expected Evaluation Frequency %v, got %v", rule.Frequency, window.Frequency)
+					}
+				} else {
+					t.Errorf("Expected RollingWindow spec, got %T", rule.Evaluation.Spec)
+				}
+			},
+		},
+		{
+			name:     "schema v1 - uses critical threshold when no labels",
+			initRule: PostableRule{},
+			content: []byte(`{
+				"alert": "NoLabelsTest",
+				"schemaVersion": "v1",
+				"version": "v5",
+				"condition": {
+					"compositeQuery": {
+						"queryType": "builder",
+						"queries": [{
+							"type": "builder_query",
+							"spec": {
+								"name": "A",
+								"signal": "metrics",
+								"aggregations": [{"metricName": "memory_usage", "spaceAggregation": "p50"}],
+								"stepInterval": "5m"
+							}
+						}]
+					},
+					"target": 90.0,
+					"matchType": "1",
+					"op": "1"
+				}
+			}`),
+			kind:        RuleDataKindJson,
+			expectError: false,
+			validate: func(t *testing.T, rule *PostableRule) {
+				if rule.RuleCondition.Thresholds == nil {
+					t.Fatal("Expected Thresholds to be populated")
+				}
+
+				specs, ok := rule.RuleCondition.Thresholds.Spec.(BasicRuleThresholds)
+				if !ok {
+					t.Fatalf("Expected BasicRuleThresholds, got %T", rule.RuleCondition.Thresholds.Spec)
+				}
+				spec := specs[0]
+				// Should default to CriticalThresholdName when no severity label
+				if spec.Name != CriticalThresholdName {
+					t.Errorf("Expected threshold name '%s', got '%s'", CriticalThresholdName, spec.Name)
+				}
+			},
+		},
+		{
+			name:     "schema v1 - overwrites existing thresholds and evaluation",
+			initRule: PostableRule{},
+			content: []byte(`{
+				"alert": "OverwriteTest",
+				"schemaVersion": "v1",
+				"version": "v5",
+				"condition": {
+					"compositeQuery": {
+						"queryType": "builder",
+						"queries": [{
+							"type": "builder_query",
+							"spec": {
+								"name": "A",
+								"signal": "metrics",
+								"aggregations": [{"metricName": "cpu_usage", "spaceAggregation": "p50"}],
+								"stepInterval": "5m"
+							}
+						}],
+						"unit": "percent"
+					},
+					"target": 80.0,
+					"targetUnit": "%",
+					"matchType": "1",
+					"op": "1",
+					"thresholds": {
+						"kind": "basic",
+						"spec": [{
+							"name": "existing_threshold",
+							"target": 50.0,
+							"targetUnit": "MB",
+							"ruleUnit": "bytes",
+							"matchType": "1",
+							"op": "1"
+						}]
+					}
+				},
+				"evaluation": {
+					"kind": "rolling",
+					"spec": {
+						"evalWindow": "10m",
+						"frequency": "2m"
+					}
+				},
+				"frequency":"7m",
+				"evalWindow":"11m",
+				"labels": {
+					"severity": "critical"
+				}
+			}`),
+			kind:        RuleDataKindJson,
+			expectError: false,
+			validate: func(t *testing.T, rule *PostableRule) {
+				if rule.RuleCondition.Thresholds == nil {
+					t.Fatal("Expected Thresholds to be populated")
+				}
+
+				specs, ok := rule.RuleCondition.Thresholds.Spec.(BasicRuleThresholds)
+				if !ok {
+					t.Fatalf("Expected BasicRuleThresholds, got %T", rule.RuleCondition.Thresholds.Spec)
+				}
+
+				if len(specs) != 1 {
+					t.Fatalf("Expected 1 threshold spec, got %d", len(specs))
+				}
+
+				spec := specs[0]
+				if spec.Name != "critical" {
+					t.Errorf("Expected threshold name 'critical' (overwritten), got '%s'", spec.Name)
+				}
+
+				if *spec.TargetValue != 80.0 {
+					t.Errorf("Expected TargetValue 80.0 (overwritten), got %v", *spec.TargetValue)
+				}
+				if spec.TargetUnit != "%" {
+					t.Errorf("Expected TargetUnit '%%' (overwritten), got '%s'", spec.TargetUnit)
+				}
+
+				if rule.Evaluation == nil {
+					t.Fatal("Expected Evaluation to be populated")
+				}
+				if window, ok := rule.Evaluation.Spec.(RollingWindow); ok {
+					if !window.EvalWindow.Equal(rule.EvalWindow) {
+						t.Errorf("Expected Evaluation EvalWindow to be overwritten to %v, got %v", rule.EvalWindow, window.EvalWindow)
+					}
+					if !window.Frequency.Equal(rule.Frequency) {
+						t.Errorf("Expected Evaluation Frequency to be overwritten to %v, got %v", rule.Frequency, window.Frequency)
+					}
+				} else {
+					t.Errorf("Expected RollingWindow spec, got %T", rule.Evaluation.Spec)
+				}
+			},
+		},
 		{
 			name:     "schema v2alpha1 - uses explicit thresholds and evaluation",
 			initRule: PostableRule{},
@@ -182,8 +453,8 @@ func TestParseIntoRuleSchemaVersioning(t *testing.T) {
 			kind:        RuleDataKindJson,
 			expectError: false,
 			validate: func(t *testing.T, rule *PostableRule) {
-				if rule.SchemaVersion.StringValue() != SchemaVersionV2Alpha1 {
-					t.Errorf("Expected schemaVersion %q, got %q", SchemaVersionV2Alpha1, rule.SchemaVersion.StringValue())
+				if rule.SchemaVersion != SchemaVersionV2Alpha1 {
+					t.Errorf("Expected schemaVersion %q, got %q", SchemaVersionV2Alpha1, rule.SchemaVersion)
 				}
 
 				if rule.RuleCondition.Thresholds == nil {
@@ -374,19 +645,19 @@ func TestParseIntoRuleSchemaVersioning(t *testing.T) {
 							}
 						}]
 					},
-					"thresholds": {"kind": "basic", "spec": [{"name": "critical", "target": 100.0, "matchType": "1", "op": "1"}]}
-				},
-				"evaluation": {"kind": "rolling", "spec": {"evalWindow": "5m", "frequency": "1m"}},
-				"notificationSettings": {"renotify": {"enabled": true, "interval": "4h", "alertStates": ["firing"]}}
+					"target": 100.0,
+					"matchType": "1",
+					"op": "1"
+				}
 			}`),
 			kind:                RuleDataKindJson,
 			expectValidateError: true,
 		},
 		{
-			name:     "missing schema version - rejected on write",
+			name:     "default schema version - defaults to v1 behavior",
 			initRule: PostableRule{},
 			content: []byte(`{
-				"alert": "MissingSchemaTest",
+				"alert": "DefaultSchemaTest",
 				"version": "v5",
 				"condition": {
 					"compositeQuery": {
@@ -401,13 +672,24 @@ func TestParseIntoRuleSchemaVersioning(t *testing.T) {
 							}
 						}]
 					},
-					"thresholds": {"kind": "basic", "spec": [{"name": "critical", "target": 75.0, "matchType": "1", "op": "1"}]}
-				},
-				"evaluation": {"kind": "rolling", "spec": {"evalWindow": "5m", "frequency": "1m"}},
-				"notificationSettings": {"renotify": {"enabled": true, "interval": "4h", "alertStates": ["firing"]}}
+					"target": 75.0,
+					"matchType": "1",
+					"op": "1"
+				}
 			}`),
-			kind:                RuleDataKindJson,
-			expectValidateError: true,
+			kind:        RuleDataKindJson,
+			expectError: false,
+			validate: func(t *testing.T, rule *PostableRule) {
+				if rule.SchemaVersion != DefaultSchemaVersion {
+					t.Errorf("Expected default schemaVersion '%s', got '%s'", DefaultSchemaVersion, rule.SchemaVersion)
+				}
+				if rule.RuleCondition.Thresholds == nil {
+					t.Error("Expected Thresholds to be populated for default schema version")
+				}
+				if rule.Evaluation == nil {
+					t.Error("Expected Evaluation to be populated for default schema version")
+				}
+			},
 		},
 	}
 
@@ -455,7 +737,11 @@ func TestParseIntoRuleThresholdGeneration(t *testing.T) {
 					}
 				}]
 			},
-			"selectedQueryName": "A",
+			"target": 100.0,
+			"matchType": "1",
+			"op": "1",
+			"selectedQuery": "A",
+			"targetUnit": "ms",
 			"thresholds": {
 				"kind": "basic",
 				"spec": [
@@ -621,6 +907,428 @@ func TestParseIntoRuleMultipleThresholds(t *testing.T) {
 	assert.Equal(t, 1, len(vector))
 }
 
+func TestAnomalyNegationEval(t *testing.T) {
+	tests := []struct {
+		name          string
+		ruleJSON      []byte
+		series        *qbtypes.TimeSeries
+		shouldAlert   bool
+		expectedValue float64
+	}{
+		{
+			name: "anomaly rule with ValueIsBelow - should alert",
+			ruleJSON: []byte(`{
+				"alert": "AnomalyBelowTest",
+				"ruleType": "anomaly_rule",
+				"version": "v5",
+				"condition": {
+					"compositeQuery": {
+						"queryType": "builder",
+						"queries": [{
+							"type": "builder_query",
+							"spec": {
+								"name": "A",
+								"signal": "metrics",
+								"aggregations": [{"metricName": "test", "spaceAggregation": "p50"}],
+								"stepInterval": "5m"
+							}
+						}]
+					},
+					"target": 2.0,
+					"matchType": "1",
+					"op": "2",
+					"selectedQuery": "A"
+				}
+			}`),
+			series: &qbtypes.TimeSeries{
+				Labels: []*qbtypes.Label{
+					{
+						Key: telemetrytypes.TelemetryFieldKey{
+							Name: "host",
+						},
+						Value: "server1",
+					},
+				},
+				Values: []*qbtypes.TimeSeriesValue{
+					{Timestamp: 1000, Value: -2.1}, // below & at least once, should alert
+					{Timestamp: 2000, Value: -2.3},
+				},
+			},
+			shouldAlert:   true,
+			expectedValue: -2.1,
+		},
+		{
+			name: "anomaly rule with ValueIsBelow; should not alert",
+			ruleJSON: []byte(`{
+				"alert": "AnomalyBelowTest",
+				"ruleType": "anomaly_rule",
+				"version": "v5",
+				"condition": {
+					"compositeQuery": {
+						"queryType": "builder",
+						"queries": [{
+							"type": "builder_query",
+							"spec": {
+								"name": "A",
+								"signal": "metrics",
+								"aggregations": [{"metricName": "test", "spaceAggregation": "p50"}],
+								"stepInterval": "5m"
+							}
+						}]
+					},
+					"target": 2.0,
+					"matchType": "1",
+					"op": "2",
+					"selectedQuery": "A"
+				}
+			}`), // below & at least once, no value below -2.0
+			series: &qbtypes.TimeSeries{
+				Labels: []*qbtypes.Label{
+					{
+						Key: telemetrytypes.TelemetryFieldKey{
+							Name: "host",
+						},
+						Value: "server1",
+					},
+				},
+				Values: []*qbtypes.TimeSeriesValue{
+					{Timestamp: 1000, Value: -1.9},
+					{Timestamp: 2000, Value: -1.8},
+				},
+			},
+			shouldAlert: false,
+		},
+		{
+			name: "anomaly rule with ValueIsAbove; should alert",
+			ruleJSON: []byte(`{
+				"alert": "AnomalyAboveTest",
+				"ruleType": "anomaly_rule",
+				"version": "v5",
+				"condition": {
+					"compositeQuery": {
+						"queryType": "builder",
+						"queries": [{
+							"type": "builder_query",
+							"spec": {
+								"name": "A",
+								"signal": "metrics",
+								"aggregations": [{"metricName": "test", "spaceAggregation": "p50"}],
+								"stepInterval": "5m"
+							}
+						}]
+					},
+					"target": 2.0,
+					"matchType": "1",
+					"op": "1",
+					"selectedQuery": "A"
+				}
+			}`), // above & at least once, should alert
+			series: &qbtypes.TimeSeries{
+				Labels: []*qbtypes.Label{
+					{
+						Key: telemetrytypes.TelemetryFieldKey{
+							Name: "host",
+						},
+						Value: "server1",
+					},
+				},
+				Values: []*qbtypes.TimeSeriesValue{
+					{Timestamp: 1000, Value: 2.1}, // above 2.0, should alert
+					{Timestamp: 2000, Value: 2.2},
+				},
+			},
+			shouldAlert:   true,
+			expectedValue: 2.1,
+		},
+		{
+			name: "anomaly rule with ValueIsAbove; should not alert",
+			ruleJSON: []byte(`{
+				"alert": "AnomalyAboveTest",
+				"ruleType": "anomaly_rule",
+				"version": "v5",
+				"condition": {
+					"compositeQuery": {
+						"queryType": "builder",
+						"queries": [{
+							"type": "builder_query",
+							"spec": {
+								"name": "A",
+								"signal": "metrics",
+								"aggregations": [{"metricName": "test", "spaceAggregation": "p50"}],
+								"stepInterval": "5m"
+							}
+						}]
+					},
+					"target": 2.0,
+					"matchType": "1",
+					"op": "1",
+					"selectedQuery": "A"
+				}
+			}`),
+			series: &qbtypes.TimeSeries{
+				Labels: []*qbtypes.Label{
+					{
+						Key: telemetrytypes.TelemetryFieldKey{
+							Name: "host",
+						},
+						Value: "server1",
+					},
+				},
+				Values: []*qbtypes.TimeSeriesValue{
+					{Timestamp: 1000, Value: 1.1},
+					{Timestamp: 2000, Value: 1.2},
+				},
+			},
+			shouldAlert: false,
+		},
+		{
+			name: "anomaly rule with ValueIsBelow and AllTheTimes; should alert",
+			ruleJSON: []byte(`{
+				"alert": "AnomalyBelowAllTest",
+				"ruleType": "anomaly_rule",
+				"version": "v5",
+				"condition": {
+					"compositeQuery": {
+						"queryType": "builder",
+						"queries": [{
+							"type": "builder_query",
+							"spec": {
+								"name": "A",
+								"signal": "metrics",
+								"aggregations": [{"metricName": "test", "spaceAggregation": "p50"}],
+								"stepInterval": "5m"
+							}
+						}]
+					},
+					"target": 2.0,
+					"matchType": "2",
+					"op": "2",
+					"selectedQuery": "A"
+				}
+			}`), // below and all the times
+			series: &qbtypes.TimeSeries{
+				Labels: []*qbtypes.Label{
+					{
+						Key: telemetrytypes.TelemetryFieldKey{
+							Name: "host",
+						},
+						Value: "server1",
+					},
+				},
+				Values: []*qbtypes.TimeSeriesValue{
+					{Timestamp: 1000, Value: -2.1}, // all below -2
+					{Timestamp: 2000, Value: -2.2},
+					{Timestamp: 3000, Value: -2.5},
+				},
+			},
+			shouldAlert:   true,
+			expectedValue: -2.1, // max value when all are below threshold
+		},
+		{
+			name: "anomaly rule with ValueIsBelow and AllTheTimes; should not alert",
+			ruleJSON: []byte(`{
+				"alert": "AnomalyBelowAllTest",
+				"ruleType": "anomaly_rule",
+				"version": "v5",
+				"condition": {
+					"compositeQuery": {
+						"queryType": "builder",
+						"queries": [{
+							"type": "builder_query",
+							"spec": {
+								"name": "A",
+								"signal": "metrics",
+								"aggregations": [{"metricName": "test", "spaceAggregation": "p50"}],
+								"stepInterval": "5m"
+							}
+						}]
+					},
+					"target": 2.0,
+					"matchType": "2",
+					"op": "2",
+					"selectedQuery": "A"
+				}
+			}`),
+			series: &qbtypes.TimeSeries{
+				Labels: []*qbtypes.Label{
+					{
+						Key: telemetrytypes.TelemetryFieldKey{
+							Name: "host",
+						},
+						Value: "server1",
+					},
+				},
+				Values: []*qbtypes.TimeSeriesValue{
+					{Timestamp: 1000, Value: -3.0},
+					{Timestamp: 2000, Value: -1.0}, // above -2, breaks condition
+					{Timestamp: 3000, Value: -2.5},
+				},
+			},
+			shouldAlert: false,
+		},
+		{
+			name: "anomaly rule with ValueOutsideBounds; should alert",
+			ruleJSON: []byte(`{
+				"alert": "AnomalyOutOfBoundsTest",
+				"ruleType": "anomaly_rule",
+				"version": "v5",
+				"condition": {
+					"compositeQuery": {
+						"queryType": "builder",
+						"queries": [{
+							"type": "builder_query",
+							"spec": {
+								"name": "A",
+								"signal": "metrics",
+								"aggregations": [{"metricName": "test", "spaceAggregation": "p50"}],
+								"stepInterval": "5m"
+							}
+						}]
+					},
+					"target": 7.0,
+					"matchType": "1",
+					"op": "7",
+					"selectedQuery": "A"
+				}
+			}`),
+			series: &qbtypes.TimeSeries{
+				Labels: []*qbtypes.Label{
+					{
+						Key: telemetrytypes.TelemetryFieldKey{
+							Name: "host",
+						},
+						Value: "server1",
+					},
+				},
+				Values: []*qbtypes.TimeSeriesValue{
+					{Timestamp: 1000, Value: -8.0}, // abs(−8) >= 7, alert
+					{Timestamp: 2000, Value: 5.0},
+				},
+			},
+			shouldAlert:   true,
+			expectedValue: -8.0,
+		},
+		{
+			name: "non-anomaly threshold rule with ValueIsBelow; should alert",
+			ruleJSON: []byte(`{
+				"alert": "ThresholdTest",
+				"ruleType": "threshold_rule",
+				"version": "v5",
+				"condition": {
+					"compositeQuery": {
+						"queryType": "builder",
+						"queries": [{
+							"type": "builder_query",
+							"spec": {
+								"name": "A",
+								"signal": "metrics",
+								"aggregations": [{"metricName": "test", "spaceAggregation": "p50"}],
+								"stepInterval": "5m"
+							}
+						}]
+					},
+					"target": 90.0,
+					"matchType": "1",
+					"op": "2",
+					"selectedQuery": "A"
+				}
+			}`),
+			series: &qbtypes.TimeSeries{
+				Labels: []*qbtypes.Label{
+					{
+						Key: telemetrytypes.TelemetryFieldKey{
+							Name: "host",
+						},
+						Value: "server1",
+					},
+				},
+				Values: []*qbtypes.TimeSeriesValue{
+					{Timestamp: 1000, Value: 80.0}, // below 90, should alert
+					{Timestamp: 2000, Value: 85.0},
+				},
+			},
+			shouldAlert:   true,
+			expectedValue: 80.0,
+		},
+		{
+			name: "non-anomaly rule with ValueIsBelow - should not alert",
+			ruleJSON: []byte(`{
+				"alert": "ThresholdTest",
+				"ruleType": "threshold_rule",
+				"version": "v5",
+				"condition": {
+					"compositeQuery": {
+						"queryType": "builder",
+						"queries": [{
+							"type": "builder_query",
+							"spec": {
+								"name": "A",
+								"signal": "metrics",
+								"aggregations": [{"metricName": "test", "spaceAggregation": "p50"}],
+								"stepInterval": "5m"
+							}
+						}]
+					},
+					"target": 50.0,
+					"matchType": "1",
+					"op": "2",
+					"selectedQuery": "A"
+				}
+			}`),
+			series: &qbtypes.TimeSeries{
+				Labels: []*qbtypes.Label{
+					{
+						Key: telemetrytypes.TelemetryFieldKey{
+							Name: "host",
+						},
+						Value: "server1",
+					},
+				},
+				Values: []*qbtypes.TimeSeriesValue{
+					{Timestamp: 1000, Value: 60.0}, // below, should alert
+					{Timestamp: 2000, Value: 90.0},
+				},
+			},
+			shouldAlert: false,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			rule := PostableRule{}
+			err := json.Unmarshal(tt.ruleJSON, &rule)
+			if err != nil {
+				t.Fatalf("Failed to unmarshal rule: %v", err)
+			}
+
+			ruleThreshold, err := rule.RuleCondition.Thresholds.GetRuleThreshold()
+			if err != nil {
+				t.Fatalf("unexpected error from GetRuleThreshold: %v", err)
+			}
+
+			resultVector, err := ruleThreshold.Eval(tt.series, "", EvalData{})
+			if err != nil {
+				t.Fatalf("unexpected error from Eval: %v", err)
+			}
+
+			shouldAlert := len(resultVector) > 0
+
+			if shouldAlert != tt.shouldAlert {
+				t.Errorf("Expected shouldAlert=%v, got %v. %s",
+					tt.shouldAlert, shouldAlert, tt.name)
+			}
+
+			if tt.shouldAlert && len(resultVector) > 0 {
+				sample := resultVector[0]
+				if sample.V != tt.expectedValue {
+					t.Errorf("Expected alert value=%.2f, got %.2f. %s",
+						tt.expectedValue, sample.V, tt.name)
+				}
+			}
+		})
+	}
+}
+
 func TestVersionDefaultsToV5(t *testing.T) {
 	content := `{
 		"alert": "cpu high",

pkg/types/ruletypes/evaluation.go

@@ -10,12 +10,12 @@ import (
 )
 
 type EvaluationKind struct {
-	valuer.UnsetOrNonEmptyString
+	valuer.String
 }
 
 var (
-	RollingEvaluation    = EvaluationKind{valuer.MustNewUnsetOrNonEmptyString("rolling")}
-	CumulativeEvaluation = EvaluationKind{valuer.MustNewUnsetOrNonEmptyString("cumulative")}
+	RollingEvaluation    = EvaluationKind{valuer.NewString("rolling")}
+	CumulativeEvaluation = EvaluationKind{valuer.NewString("cumulative")}
 )
 
 // Enum implements jsonschema.Enum; returns the acceptable values for EvaluationKind.
@@ -55,9 +55,9 @@ func (rollingWindow RollingWindow) GetFrequency() valuer.TextDuration {
 }
 
 type CumulativeWindow struct {
-	Schedule  CumulativeSchedule           `json:"schedule" required:"true"`
-	Frequency valuer.TextDuration          `json:"frequency" required:"true"`
-	Timezone  valuer.UnsetOrNonEmptyString `json:"timezone" required:"true"`
+	Schedule  CumulativeSchedule  `json:"schedule" required:"true"`
+	Frequency valuer.TextDuration `json:"frequency" required:"true"`
+	Timezone  string              `json:"timezone" required:"true"`
 }
 
 type CumulativeSchedule struct {
@@ -69,14 +69,14 @@ type CumulativeSchedule struct {
 }
 
 type ScheduleType struct {
-	valuer.UnsetOrNonEmptyString
+	valuer.String
 }
 
 var (
-	ScheduleTypeHourly  = ScheduleType{valuer.MustNewUnsetOrNonEmptyString("hourly")}
-	ScheduleTypeDaily   = ScheduleType{valuer.MustNewUnsetOrNonEmptyString("daily")}
-	ScheduleTypeWeekly  = ScheduleType{valuer.MustNewUnsetOrNonEmptyString("weekly")}
-	ScheduleTypeMonthly = ScheduleType{valuer.MustNewUnsetOrNonEmptyString("monthly")}
+	ScheduleTypeHourly  = ScheduleType{valuer.NewString("hourly")}
+	ScheduleTypeDaily   = ScheduleType{valuer.NewString("daily")}
+	ScheduleTypeWeekly  = ScheduleType{valuer.NewString("weekly")}
+	ScheduleTypeMonthly = ScheduleType{valuer.NewString("monthly")}
 )
 
 // Enum implements jsonschema.Enum; returns the acceptable values for ScheduleType.
@@ -95,10 +95,7 @@ func (cumulativeWindow CumulativeWindow) Validate() error {
 		return err
 	}
 
-	if cumulativeWindow.Timezone.IsZero() {
-		return errors.NewInvalidInputf(errors.CodeInvalidInput, "timezone is required")
-	}
-	if _, err := time.LoadLocation(cumulativeWindow.Timezone.StringValue()); err != nil {
+	if _, err := time.LoadLocation(cumulativeWindow.Timezone); err != nil {
 		return errors.NewInvalidInputf(errors.CodeInvalidInput, "timezone is invalid")
 	}
 	if !cumulativeWindow.Frequency.IsPositive() {
@@ -160,8 +157,8 @@ func (cs CumulativeSchedule) Validate() error {
 
 func (cumulativeWindow CumulativeWindow) NextWindowFor(curr time.Time) (time.Time, time.Time) {
 	loc := time.UTC
-	if !cumulativeWindow.Timezone.IsZero() {
-		if tz, err := time.LoadLocation(cumulativeWindow.Timezone.StringValue()); err == nil {
+	if cumulativeWindow.Timezone != "" {
+		if tz, err := time.LoadLocation(cumulativeWindow.Timezone); err == nil {
 			loc = tz
 		}
 	}

pkg/types/ruletypes/evaluation_test.go

@@ -72,7 +72,7 @@ func TestCumulativeWindow_NewScheduleSystem(t *testing.T) {
 					Minute: intPtr(15),
 				},
 				Frequency: valuer.MustParseTextDuration("5m"),
-				Timezone:  valuer.MustNewUnsetOrNonEmptyString("UTC"),
+				Timezone:  "UTC",
 			},
 			current: time.Date(2025, 3, 15, 14, 30, 0, 0, time.UTC),
 			wantErr: false,
@@ -86,7 +86,7 @@ func TestCumulativeWindow_NewScheduleSystem(t *testing.T) {
 					Minute: intPtr(30),
 				},
 				Frequency: valuer.MustParseTextDuration("1h"),
-				Timezone:  valuer.MustNewUnsetOrNonEmptyString("Asia/Kolkata"),
+				Timezone:  "Asia/Kolkata",
 			},
 			current: time.Date(2025, 3, 15, 15, 30, 0, 0, time.UTC),
 			wantErr: false,
@@ -101,7 +101,7 @@ func TestCumulativeWindow_NewScheduleSystem(t *testing.T) {
 					Minute:  intPtr(0),
 				},
 				Frequency: valuer.MustParseTextDuration("24h"),
-				Timezone:  valuer.MustNewUnsetOrNonEmptyString("America/New_York"),
+				Timezone:  "America/New_York",
 			},
 			current: time.Date(2025, 3, 18, 19, 0, 0, 0, time.UTC), // Tuesday
 			wantErr: false,
@@ -116,7 +116,7 @@ func TestCumulativeWindow_NewScheduleSystem(t *testing.T) {
 					Minute: intPtr(0),
 				},
 				Frequency: valuer.MustParseTextDuration("24h"),
-				Timezone:  valuer.MustNewUnsetOrNonEmptyString("UTC"),
+				Timezone:  "UTC",
 			},
 			current: time.Date(2025, 3, 15, 12, 0, 0, 0, time.UTC),
 			wantErr: false,
@@ -128,7 +128,7 @@ func TestCumulativeWindow_NewScheduleSystem(t *testing.T) {
 					Type: ScheduleTypeHourly,
 				},
 				Frequency: valuer.MustParseTextDuration("5m"),
-				Timezone:  valuer.MustNewUnsetOrNonEmptyString("UTC"),
+				Timezone:  "UTC",
 			},
 			current: time.Date(2025, 3, 15, 14, 30, 0, 0, time.UTC),
 			wantErr: true,
@@ -181,7 +181,7 @@ func TestCumulativeWindow_NextWindowFor(t *testing.T) {
 					Type:   ScheduleTypeHourly,
 					Minute: intPtr(30),
 				},
-				Timezone: valuer.MustNewUnsetOrNonEmptyString("UTC"),
+				Timezone: "UTC",
 			},
 			current:   time.Date(2025, 3, 15, 14, 30, 0, 0, time.UTC),
 			wantStart: time.Date(2025, 3, 15, 14, 30, 0, 0, time.UTC),
@@ -194,7 +194,7 @@ func TestCumulativeWindow_NextWindowFor(t *testing.T) {
 					Type:   ScheduleTypeHourly,
 					Minute: intPtr(15),
 				},
-				Timezone: valuer.MustNewUnsetOrNonEmptyString("UTC"),
+				Timezone: "UTC",
 			},
 			current:   time.Date(2025, 3, 15, 14, 45, 0, 0, time.UTC),
 			wantStart: time.Date(2025, 3, 15, 14, 15, 0, 0, time.UTC),
@@ -207,7 +207,7 @@ func TestCumulativeWindow_NextWindowFor(t *testing.T) {
 					Type:   ScheduleTypeHourly,
 					Minute: intPtr(30),
 				},
-				Timezone: valuer.MustNewUnsetOrNonEmptyString("UTC"),
+				Timezone: "UTC",
 			},
 			current:   time.Date(2025, 3, 15, 14, 15, 0, 0, time.UTC),
 			wantStart: time.Date(2025, 3, 15, 13, 30, 0, 0, time.UTC), // Previous hour
@@ -220,7 +220,7 @@ func TestCumulativeWindow_NextWindowFor(t *testing.T) {
 					Type:   ScheduleTypeHourly,
 					Minute: intPtr(30),
 				},
-				Timezone: valuer.MustNewUnsetOrNonEmptyString("UTC"),
+				Timezone: "UTC",
 			},
 			current:   time.Date(2025, 3, 15, 13, 14, 0, 0, time.UTC),
 			wantStart: time.Date(2025, 3, 15, 12, 30, 0, 0, time.UTC), // Previous hour
@@ -233,7 +233,7 @@ func TestCumulativeWindow_NextWindowFor(t *testing.T) {
 					Type:   ScheduleTypeHourly,
 					Minute: intPtr(30),
 				},
-				Timezone: valuer.MustNewUnsetOrNonEmptyString("Asia/Kolkata"),
+				Timezone: "Asia/Kolkata",
 			},
 			current:   time.Date(2025, 3, 15, 13, 14, 0, 0, time.UTC),
 			wantStart: time.Date(2025, 3, 15, 13, 00, 0, 0, time.UTC), // Previous hour
@@ -249,7 +249,7 @@ func TestCumulativeWindow_NextWindowFor(t *testing.T) {
 					Hour:   intPtr(9),
 					Minute: intPtr(30),
 				},
-				Timezone: valuer.MustNewUnsetOrNonEmptyString("UTC"),
+				Timezone: "UTC",
 			},
 			current:   time.Date(2025, 3, 15, 9, 30, 0, 0, time.UTC),
 			wantStart: time.Date(2025, 3, 15, 9, 30, 0, 0, time.UTC),
@@ -263,7 +263,7 @@ func TestCumulativeWindow_NextWindowFor(t *testing.T) {
 					Hour:   intPtr(9),
 					Minute: intPtr(30),
 				},
-				Timezone: valuer.MustNewUnsetOrNonEmptyString("UTC"),
+				Timezone: "UTC",
 			},
 			current:   time.Date(2025, 3, 15, 15, 45, 0, 0, time.UTC),
 			wantStart: time.Date(2025, 3, 15, 9, 30, 0, 0, time.UTC),
@@ -277,7 +277,7 @@ func TestCumulativeWindow_NextWindowFor(t *testing.T) {
 					Hour:   intPtr(9),
 					Minute: intPtr(30),
 				},
-				Timezone: valuer.MustNewUnsetOrNonEmptyString("UTC"),
+				Timezone: "UTC",
 			},
 			current:   time.Date(2025, 3, 15, 8, 15, 0, 0, time.UTC),
 			wantStart: time.Date(2025, 3, 14, 9, 30, 0, 0, time.UTC), // Previous day
@@ -291,7 +291,7 @@ func TestCumulativeWindow_NextWindowFor(t *testing.T) {
 					Hour:   intPtr(9),
 					Minute: intPtr(30),
 				},
-				Timezone: valuer.MustNewUnsetOrNonEmptyString("Asia/Kolkata"),
+				Timezone: "Asia/Kolkata",
 			},
 			current:   time.Date(2025, 3, 15, 15, 30, 0, 0, time.UTC), // 9:00 PM IST
 			wantStart: time.Date(2025, 3, 15, 4, 0, 0, 0, time.UTC),   // 9:30 AM IST in UTC
@@ -308,7 +308,7 @@ func TestCumulativeWindow_NextWindowFor(t *testing.T) {
 					Hour:    intPtr(14),
 					Minute:  intPtr(0),
 				},
-				Timezone: valuer.MustNewUnsetOrNonEmptyString("UTC"),
+				Timezone: "UTC",
 			},
 			current:   time.Date(2025, 3, 17, 14, 0, 0, 0, time.UTC), // Monday
 			wantStart: time.Date(2025, 3, 17, 14, 0, 0, 0, time.UTC),
@@ -323,7 +323,7 @@ func TestCumulativeWindow_NextWindowFor(t *testing.T) {
 					Hour:    intPtr(14),
 					Minute:  intPtr(0),
 				},
-				Timezone: valuer.MustNewUnsetOrNonEmptyString("UTC"),
+				Timezone: "UTC",
 			},
 			current:   time.Date(2025, 3, 19, 10, 30, 0, 0, time.UTC), // Wednesday
 			wantStart: time.Date(2025, 3, 17, 14, 0, 0, 0, time.UTC),  // Previous Monday
@@ -338,7 +338,7 @@ func TestCumulativeWindow_NextWindowFor(t *testing.T) {
 					Hour:    intPtr(14),
 					Minute:  intPtr(0),
 				},
-				Timezone: valuer.MustNewUnsetOrNonEmptyString("UTC"),
+				Timezone: "UTC",
 			},
 			current:   time.Date(2025, 3, 18, 10, 0, 0, 0, time.UTC), // Tuesday before 2 PM
 			wantStart: time.Date(2025, 3, 11, 14, 0, 0, 0, time.UTC), // Previous Tuesday
@@ -355,7 +355,7 @@ func TestCumulativeWindow_NextWindowFor(t *testing.T) {
 					Hour:   intPtr(12),
 					Minute: intPtr(0),
 				},
-				Timezone: valuer.MustNewUnsetOrNonEmptyString("UTC"),
+				Timezone: "UTC",
 			},
 			current:   time.Date(2025, 3, 15, 12, 0, 0, 0, time.UTC),
 			wantStart: time.Date(2025, 3, 15, 12, 0, 0, 0, time.UTC),
@@ -370,7 +370,7 @@ func TestCumulativeWindow_NextWindowFor(t *testing.T) {
 					Hour:   intPtr(0),
 					Minute: intPtr(0),
 				},
-				Timezone: valuer.MustNewUnsetOrNonEmptyString("UTC"),
+				Timezone: "UTC",
 			},
 			current:   time.Date(2025, 3, 15, 16, 30, 0, 0, time.UTC),
 			wantStart: time.Date(2025, 3, 1, 0, 0, 0, 0, time.UTC),
@@ -385,7 +385,7 @@ func TestCumulativeWindow_NextWindowFor(t *testing.T) {
 					Hour:   intPtr(12),
 					Minute: intPtr(0),
 				},
-				Timezone: valuer.MustNewUnsetOrNonEmptyString("UTC"),
+				Timezone: "UTC",
 			},
 			current:   time.Date(2025, 3, 10, 10, 0, 0, 0, time.UTC),
 			wantStart: time.Date(2025, 2, 15, 12, 0, 0, 0, time.UTC), // Previous month
@@ -400,7 +400,7 @@ func TestCumulativeWindow_NextWindowFor(t *testing.T) {
 					Hour:   intPtr(12),
 					Minute: intPtr(0),
 				},
-				Timezone: valuer.MustNewUnsetOrNonEmptyString("UTC"),
+				Timezone: "UTC",
 			},
 			current:   time.Date(2025, 3, 15, 10, 0, 0, 0, time.UTC),
 			wantStart: time.Date(2025, 2, 28, 12, 0, 0, 0, time.UTC), // Feb 28 (last day of Feb)
@@ -415,7 +415,7 @@ func TestCumulativeWindow_NextWindowFor(t *testing.T) {
 					Type:   ScheduleTypeHourly,
 					Minute: intPtr(45),
 				},
-				Timezone: valuer.MustNewUnsetOrNonEmptyString("Asia/Tokyo"),
+				Timezone: "Asia/Tokyo",
 			},
 			current:   time.Date(2023, 12, 15, 2, 30, 0, 0, time.UTC), // 11:30 AM JST
 			wantStart: time.Date(2023, 12, 15, 1, 45, 0, 0, time.UTC), // 10:45 AM JST in UTC
@@ -429,7 +429,7 @@ func TestCumulativeWindow_NextWindowFor(t *testing.T) {
 					Hour:   intPtr(8), // 8 AM EST
 					Minute: intPtr(0),
 				},
-				Timezone: valuer.MustNewUnsetOrNonEmptyString("America/New_York"),
+				Timezone: "America/New_York",
 			},
 			current:   time.Date(2023, 12, 15, 20, 30, 0, 0, time.UTC), // 3:30 PM EST
 			wantStart: time.Date(2023, 12, 15, 13, 0, 0, 0, time.UTC),  // 8 AM EST in UTC
@@ -444,7 +444,7 @@ func TestCumulativeWindow_NextWindowFor(t *testing.T) {
 					Hour:    intPtr(12),
 					Minute:  intPtr(0),
 				},
-				Timezone: valuer.MustNewUnsetOrNonEmptyString("Europe/London"),
+				Timezone: "Europe/London",
 			},
 			current:   time.Date(2023, 12, 15, 15, 0, 0, 0, time.UTC), // Friday 3 PM GMT
 			wantStart: time.Date(2023, 12, 11, 12, 0, 0, 0, time.UTC), // Previous Monday 12 PM GMT
@@ -459,7 +459,7 @@ func TestCumulativeWindow_NextWindowFor(t *testing.T) {
 					Hour:   intPtr(0), // Midnight AEDT
 					Minute: intPtr(0),
 				},
-				Timezone: valuer.MustNewUnsetOrNonEmptyString("Australia/Sydney"),
+				Timezone: "Australia/Sydney",
 			},
 			current:   time.Date(2023, 12, 15, 5, 0, 0, 0, time.UTC),  // 4 PM AEDT on 15th
 			wantStart: time.Date(2023, 11, 30, 13, 0, 0, 0, time.UTC), // Midnight AEDT on Dec 1st in UTC (Nov 30 13:00 UTC)
@@ -472,7 +472,7 @@ func TestCumulativeWindow_NextWindowFor(t *testing.T) {
 					Type:   ScheduleTypeHourly,
 					Minute: intPtr(30),
 				},
-				Timezone: valuer.MustNewUnsetOrNonEmptyString("Pacific/Honolulu"),
+				Timezone: "Pacific/Honolulu",
 			},
 			current:   time.Date(2023, 12, 15, 22, 45, 0, 0, time.UTC), // 12:45 PM HST
 			wantStart: time.Date(2023, 12, 15, 22, 30, 0, 0, time.UTC), // 12:30 PM HST in UTC
@@ -486,7 +486,7 @@ func TestCumulativeWindow_NextWindowFor(t *testing.T) {
 					Hour:   intPtr(2), // 2 AM PST/PDT
 					Minute: intPtr(0),
 				},
-				Timezone: valuer.MustNewUnsetOrNonEmptyString("America/Los_Angeles"),
+				Timezone: "America/Los_Angeles",
 			},
 			current:   time.Date(2023, 3, 12, 15, 0, 0, 0, time.UTC), // Day after DST starts
 			wantStart: time.Date(2023, 3, 12, 9, 0, 0, 0, time.UTC),  // 2 AM PDT in UTC (PDT = UTC-7)
@@ -501,7 +501,7 @@ func TestCumulativeWindow_NextWindowFor(t *testing.T) {
 					Hour:    intPtr(16), // 4 PM CET
 					Minute:  intPtr(30),
 				},
-				Timezone: valuer.MustNewUnsetOrNonEmptyString("Europe/Berlin"),
+				Timezone: "Europe/Berlin",
 			},
 			current:   time.Date(2023, 12, 18, 10, 0, 0, 0, time.UTC),  // Monday 11 AM CET
 			wantStart: time.Date(2023, 12, 15, 15, 30, 0, 0, time.UTC), // Previous Friday 4:30 PM CET
@@ -516,7 +516,7 @@ func TestCumulativeWindow_NextWindowFor(t *testing.T) {
 					Hour:   intPtr(23),
 					Minute: intPtr(59),
 				},
-				Timezone: valuer.MustNewUnsetOrNonEmptyString("Asia/Kolkata"),
+				Timezone: "Asia/Kolkata",
 			},
 			current:   time.Date(2023, 3, 10, 12, 0, 0, 0, time.UTC),  // March 10th 5:30 PM IST
 			wantStart: time.Date(2023, 2, 28, 18, 29, 0, 0, time.UTC), // Feb 28 11:59 PM IST (last day of Feb)
@@ -529,7 +529,7 @@ func TestCumulativeWindow_NextWindowFor(t *testing.T) {
 					Type:   ScheduleTypeHourly,
 					Minute: intPtr(0), // Top of hour
 				},
-				Timezone: valuer.MustNewUnsetOrNonEmptyString("America/Chicago"),
+				Timezone: "America/Chicago",
 			},
 			current:   time.Date(2023, 12, 15, 6, 30, 0, 0, time.UTC), // 12:30 AM CST
 			wantStart: time.Date(2023, 12, 15, 6, 0, 0, 0, time.UTC),  // Midnight CST in UTC
@@ -545,7 +545,7 @@ func TestCumulativeWindow_NextWindowFor(t *testing.T) {
 					Hour:   intPtr(0),
 					Minute: intPtr(0),
 				},
-				Timezone: valuer.MustNewUnsetOrNonEmptyString("UTC"),
+				Timezone: "UTC",
 			},
 			current:   time.Date(2024, 1, 1, 12, 0, 0, 0, time.UTC), // Jan 1st noon
 			wantStart: time.Date(2024, 1, 1, 0, 0, 0, 0, time.UTC),  // Jan 1st midnight
@@ -560,7 +560,7 @@ func TestCumulativeWindow_NextWindowFor(t *testing.T) {
 					Hour:   intPtr(15),
 					Minute: intPtr(30),
 				},
-				Timezone: valuer.MustNewUnsetOrNonEmptyString("UTC"),
+				Timezone: "UTC",
 			},
 			current:   time.Date(2024, 3, 10, 10, 0, 0, 0, time.UTC),  // March 10th (leap year)
 			wantStart: time.Date(2024, 2, 29, 15, 30, 0, 0, time.UTC), // Feb 29th exists in leap year
@@ -575,7 +575,7 @@ func TestCumulativeWindow_NextWindowFor(t *testing.T) {
 					Hour:   intPtr(15),
 					Minute: intPtr(30),
 				},
-				Timezone: valuer.MustNewUnsetOrNonEmptyString("UTC"),
+				Timezone: "UTC",
 			},
 			current:   time.Date(2023, 3, 10, 10, 0, 0, 0, time.UTC),  // March 10th (non-leap year)
 			wantStart: time.Date(2023, 2, 28, 15, 30, 0, 0, time.UTC), // Feb 28th (fallback)
@@ -590,7 +590,7 @@ func TestCumulativeWindow_NextWindowFor(t *testing.T) {
 					Hour:   intPtr(12),
 					Minute: intPtr(0),
 				},
-				Timezone: valuer.MustNewUnsetOrNonEmptyString("UTC"),
+				Timezone: "UTC",
 			},
 			current:   time.Date(2023, 5, 15, 10, 0, 0, 0, time.UTC), // May 15th
 			wantStart: time.Date(2023, 4, 30, 12, 0, 0, 0, time.UTC), // April 30th (fallback from 31st)
@@ -605,7 +605,7 @@ func TestCumulativeWindow_NextWindowFor(t *testing.T) {
 					Hour:    intPtr(23),
 					Minute:  intPtr(59),
 				},
-				Timezone: valuer.MustNewUnsetOrNonEmptyString("UTC"),
+				Timezone: "UTC",
 			},
 			current:   time.Date(2023, 12, 11, 1, 0, 0, 0, time.UTC),   // Monday 1 AM
 			wantStart: time.Date(2023, 12, 10, 23, 59, 0, 0, time.UTC), // Previous Sunday 11:59 PM
@@ -618,7 +618,7 @@ func TestCumulativeWindow_NextWindowFor(t *testing.T) {
 					Type:   ScheduleTypeHourly,
 					Minute: intPtr(59),
 				},
-				Timezone: valuer.MustNewUnsetOrNonEmptyString("UTC"),
+				Timezone: "UTC",
 			},
 			current:   time.Date(2023, 12, 15, 14, 5, 0, 0, time.UTC),  // 14:05
 			wantStart: time.Date(2023, 12, 15, 13, 59, 0, 0, time.UTC), // 13:59 (previous hour)
@@ -632,7 +632,7 @@ func TestCumulativeWindow_NextWindowFor(t *testing.T) {
 					Hour:   intPtr(2), // 2 AM (skipped during DST)
 					Minute: intPtr(30),
 				},
-				Timezone: valuer.MustNewUnsetOrNonEmptyString("America/New_York"),
+				Timezone: "America/New_York",
 			},
 			current:   time.Date(2023, 3, 12, 15, 0, 0, 0, time.UTC), // Day DST starts
 			wantStart: time.Date(2023, 3, 12, 6, 30, 0, 0, time.UTC), // Same day 2:30 AM EDT (adjusted for DST)
@@ -646,7 +646,7 @@ func TestCumulativeWindow_NextWindowFor(t *testing.T) {
 					Hour:   intPtr(2), // 2 AM (occurs twice)
 					Minute: intPtr(30),
 				},
-				Timezone: valuer.MustNewUnsetOrNonEmptyString("America/New_York"),
+				Timezone: "America/New_York",
 			},
 			current:   time.Date(2023, 11, 5, 15, 0, 0, 0, time.UTC), // Day DST ends
 			wantStart: time.Date(2023, 11, 5, 7, 30, 0, 0, time.UTC), // Same day 2:30 AM EST (after fall back)
@@ -661,7 +661,7 @@ func TestCumulativeWindow_NextWindowFor(t *testing.T) {
 					Hour:   intPtr(0),
 					Minute: intPtr(0),
 				},
-				Timezone: valuer.MustNewUnsetOrNonEmptyString("UTC"),
+				Timezone: "UTC",
 			},
 			current:   time.Date(2023, 2, 15, 12, 0, 0, 0, time.UTC), // February 15th
 			wantStart: time.Date(2023, 1, 31, 0, 0, 0, 0, time.UTC),  // January 31st (exists)
@@ -675,7 +675,7 @@ func TestCumulativeWindow_NextWindowFor(t *testing.T) {
 					Hour:   intPtr(12),
 					Minute: intPtr(0),
 				},
-				Timezone: valuer.MustNewUnsetOrNonEmptyString("Pacific/Kiritimati"), // UTC+14
+				Timezone: "Pacific/Kiritimati", // UTC+14
 			},
 			current:   time.Date(2023, 12, 15, 5, 0, 0, 0, time.UTC),  // 7 PM local time
 			wantStart: time.Date(2023, 12, 14, 22, 0, 0, 0, time.UTC), // 12 PM local time (previous day in UTC)
@@ -689,7 +689,7 @@ func TestCumulativeWindow_NextWindowFor(t *testing.T) {
 					Hour:   intPtr(12),
 					Minute: intPtr(0),
 				},
-				Timezone: valuer.MustNewUnsetOrNonEmptyString("Etc/GMT+12"), // UTC-12 (use standard timezone name)
+				Timezone: "Etc/GMT+12", // UTC-12 (use standard timezone name)
 			},
 			current:   time.Date(2023, 12, 15, 5, 0, 0, 0, time.UTC), // 5 PM previous day local time
 			wantStart: time.Date(2023, 12, 15, 0, 0, 0, 0, time.UTC), // 12 PM local time (same day in UTC)
@@ -704,7 +704,7 @@ func TestCumulativeWindow_NextWindowFor(t *testing.T) {
 					Hour:    intPtr(0),
 					Minute:  intPtr(0),
 				},
-				Timezone: valuer.MustNewUnsetOrNonEmptyString("UTC"),
+				Timezone: "UTC",
 			},
 			current:   time.Date(2023, 12, 17, 12, 0, 0, 0, time.UTC), // Sunday noon
 			wantStart: time.Date(2023, 12, 16, 0, 0, 0, 0, time.UTC),  // Saturday midnight
@@ -771,7 +771,7 @@ func TestEvaluationEnvelope_UnmarshalJSON(t *testing.T) {
 					Minute: intPtr(30),
 				},
 				Frequency: valuer.MustParseTextDuration("2m"),
-				Timezone:  valuer.MustNewUnsetOrNonEmptyString("UTC"),
+				Timezone:  "UTC",
 			},
 		},
 		{

pkg/types/ruletypes/roundtrip_test.go

@@ -147,7 +147,7 @@ func TestV2MinimalReadShape(t *testing.T) {
 
 	body := readBody(t, stored)
 
-	for _, field := range []string{"labels", "annotations", "description"} {
+	for _, field := range []string{"labels", "annotations", "description", "preferredChannels", "evalWindow", "frequency"} {
 		assert.NotContains(t, body, field)
 	}
 

pkg/types/ruletypes/rule_type.go

@@ -6,13 +6,13 @@ import (
 )
 
 type RuleType struct {
-	valuer.UnsetOrNonEmptyString
+	valuer.String
 }
 
 var (
-	RuleTypeThreshold = RuleType{valuer.MustNewUnsetOrNonEmptyString("threshold_rule")}
-	RuleTypeProm      = RuleType{valuer.MustNewUnsetOrNonEmptyString("promql_rule")}
-	RuleTypeAnomaly   = RuleType{valuer.MustNewUnsetOrNonEmptyString("anomaly_rule")}
+	RuleTypeThreshold = RuleType{valuer.NewString("threshold_rule")}
+	RuleTypeProm      = RuleType{valuer.NewString("promql_rule")}
+	RuleTypeAnomaly   = RuleType{valuer.NewString("anomaly_rule")}
 )
 
 func (RuleType) Enum() []any {

pkg/types/ruletypes/seasonality.go

@@ -6,13 +6,13 @@ import (
 )
 
 type Seasonality struct {
-	valuer.UnsetOrNonEmptyString
+	valuer.String
 }
 
 var (
-	SeasonalityHourly = Seasonality{valuer.MustNewUnsetOrNonEmptyString("hourly")}
-	SeasonalityDaily  = Seasonality{valuer.MustNewUnsetOrNonEmptyString("daily")}
-	SeasonalityWeekly = Seasonality{valuer.MustNewUnsetOrNonEmptyString("weekly")}
+	SeasonalityHourly = Seasonality{valuer.NewString("hourly")}
+	SeasonalityDaily  = Seasonality{valuer.NewString("daily")}
+	SeasonalityWeekly = Seasonality{valuer.NewString("weekly")}
 )
 
 func (Seasonality) Enum() []any {

pkg/types/ruletypes/threshold.go

@@ -15,11 +15,11 @@ import (
 )
 
 type ThresholdKind struct {
-	valuer.UnsetOrNonEmptyString
+	valuer.String
 }
 
 var (
-	BasicThresholdKind = ThresholdKind{valuer.MustNewUnsetOrNonEmptyString("basic")}
+	BasicThresholdKind = ThresholdKind{valuer.NewString("basic")}
 )
 
 // Enum implements jsonschema.Enum; returns the acceptable values for ThresholdKind.
@@ -85,6 +85,9 @@ func (r *RuleThresholdData) UnmarshalJSON(data []byte) error {
 		if err := json.Unmarshal(raw["spec"], &basicThresholds); err != nil {
 			return errors.NewInvalidInputf(errors.CodeInvalidInput, "failed to unmarshal rule threshold spec: %v", err)
 		}
+		if err := basicThresholds.Validate(); err != nil {
+			return errors.NewInvalidInputf(errors.CodeInvalidInput, "invalid rule threshold spec: %v", err)
+		}
 		r.Spec = basicThresholds
 
 	default:
@@ -127,9 +130,6 @@ type RuleThreshold interface {
 	// using the given EvalData and returns the matching series
 	Eval(series *qbtypes.TimeSeries, unit string, evalData EvalData) (Vector, error)
 	GetRuleReceivers() []RuleReceivers
-	// Validate runs on the write path and before a task is built; a stored
-	// rule may hold a threshold that fails it and still decode.
-	Validate() error
 }
 
 type BasicRuleThreshold struct {
@@ -170,17 +170,6 @@ func (r BasicRuleThresholds) Validate() error {
 	return errors.Join(errs...)
 }
 
-func (r BasicRuleThresholds) validateUniqueNames() error {
-	names := make(map[string]struct{}, len(r))
-	for _, basicThreshold := range r {
-		if _, seen := names[basicThreshold.Name]; seen {
-			return errors.NewInvalidInputf(errors.CodeInvalidInput, "condition.thresholds.spec: duplicate threshold name %q", basicThreshold.Name)
-		}
-		names[basicThreshold.Name] = struct{}{}
-	}
-	return nil
-}
-
 func (r BasicRuleThresholds) Eval(s *qbtypes.TimeSeries, unit string, evalData EvalData) (Vector, error) {
 
 	series := &qbtypes.TimeSeries{

tests/fixtures/alerts.py

@@ -32,12 +32,12 @@ def create_alert_rule(signoz: types.SigNoz, get_token: Callable[[str, str], str]
 
     def _create_alert_rule(rule_data: dict) -> str:
         response = requests.post(
-            signoz.self.host_configs["8080"].get("/api/v2/rules"),
+            signoz.self.host_configs["8080"].get("/api/v1/rules"),
             json=rule_data,
             headers={"Authorization": f"Bearer {admin_token}"},
             timeout=5,
         )
-        assert response.status_code == HTTPStatus.CREATED, f"Failed to create rule, api returned {response.status_code} with response: {response.text}"
+        assert response.status_code == HTTPStatus.OK, f"Failed to create rule, api returned {response.status_code} with response: {response.text}"
         rule_id = response.json()["data"]["id"]
         rule_ids.append(rule_id)
         return rule_id
@@ -45,11 +45,11 @@ def create_alert_rule(signoz: types.SigNoz, get_token: Callable[[str, str], str]
     def _delete_alert_rule(rule_id: str):
         logger.info("Deleting rule: %s", {"rule_id": rule_id})
         response = requests.delete(
-            signoz.self.host_configs["8080"].get(f"/api/v2/rules/{rule_id}"),
+            signoz.self.host_configs["8080"].get(f"/api/v1/rules/{rule_id}"),
             headers={"Authorization": f"Bearer {admin_token}"},
             timeout=5,
         )
-        if response.status_code != HTTPStatus.NO_CONTENT:
+        if response.status_code != HTTPStatus.OK:
             raise Exception(  # pylint: disable=broad-exception-raised
                 f"Failed to delete rule, api returned {response.status_code} with response: {response.text}"
             )
@@ -156,22 +156,19 @@ def create_downtime_schedule(signoz: types.SigNoz, get_token: Callable[[str, str
 
 
 def delete_all_rules(signoz: types.SigNoz, token: str) -> None:
-    # the v3 list is paginated; 200 is its maximum page and more rules than
-    # that would mean a seeding bug, not a second page
     response = requests.get(
-        signoz.self.host_configs["8080"].get("/api/v3/rules"),
-        params={"limit": 200},
+        signoz.self.host_configs["8080"].get("/api/v2/rules"),
         headers={"Authorization": f"Bearer {token}"},
         timeout=5,
     )
     assert response.status_code == HTTPStatus.OK
-    for rule in response.json()["data"]["rules"]:
+    for rule in response.json()["data"]:
         delete_response = requests.delete(
-            signoz.self.host_configs["8080"].get(f"/api/v2/rules/{rule['id']}"),
+            signoz.self.host_configs["8080"].get(f"/api/v1/rules/{rule['id']}"),
             headers={"Authorization": f"Bearer {token}"},
             timeout=5,
         )
-        assert delete_response.status_code == HTTPStatus.NO_CONTENT, f"failed to delete rule {rule['id']}: {delete_response.text}"
+        assert delete_response.status_code == HTTPStatus.OK, f"failed to delete rule {rule['id']}: {delete_response.text}"
 
 
 @pytest.fixture(name="seed_alert_rules", scope="function")

tests/integration/tests/ruler/05_list_rules_v3.py

@@ -573,3 +573,24 @@ def test_error_contract(
         error = response.json()["error"]
         assert error["code"] == expected_code, f"params {params!r}"
         assert expected_message_part in error["message"], f"params {params!r}: {error['message']}"
+
+
+def test_v2_list_still_serves_bare_array(
+    signoz: SigNoz,
+    create_user_admin: Operation,  # pylint: disable=unused-argument
+    get_token: Callable[[str, str], str],
+    seed_alert_rules: Callable[[str, list[dict]], None],
+):
+    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
+    seed_alert_rules(SEED_CHANNEL_NAME, SEED_RULES)
+
+    response = requests.get(
+        signoz.self.host_configs["8080"].get("/api/v2/rules"),
+        headers={"Authorization": f"Bearer {token}"},
+        timeout=5,
+    )
+
+    assert response.status_code == HTTPStatus.OK
+    data = response.json()["data"]
+    assert isinstance(data, list), "deprecated v2 must keep returning a bare array"
+    assert {rule["alert"] for rule in data} == {r["alert"] for r in SEED_RULES}

tests/integration/tests/ruler/08_rule_validation.py

@@ -1,316 +0,0 @@
-import time
-from collections.abc import Callable
-from http import HTTPStatus
-
-import requests
-
-from fixtures.auth import USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD
-from fixtures.types import Operation, SigNoz
-
-BASE_URL = "/api/v2/rules"
-
-VALID_RULE = {
-    "alert": "validation probe",
-    "alertType": "METRIC_BASED_ALERT",
-    "ruleType": "threshold_rule",
-    "condition": {
-        "thresholds": {
-            "kind": "basic",
-            "spec": [{"name": "critical", "target": 90, "matchType": "at_least_once", "op": "above", "channels": []}],
-        },
-        "compositeQuery": {
-            "queryType": "builder",
-            "panelType": "graph",
-            "queries": [
-                {
-                    "type": "builder_query",
-                    "spec": {
-                        "name": "A",
-                        "signal": "metrics",
-                        "aggregations": [{"metricName": "validation_probe_cpu", "timeAggregation": "avg", "spaceAggregation": "max"}],
-                    },
-                }
-            ],
-        },
-        "selectedQueryName": "A",
-    },
-    "labels": {"severity": "critical"},
-    "annotations": {"summary": "s", "description": "d"},
-    "disabled": True,
-    "evaluation": {"kind": "rolling", "spec": {"evalWindow": "5m", "frequency": "1m"}},
-    "notificationSettings": {"usePolicy": False, "renotify": {"enabled": False}},
-    "schemaVersion": "v2alpha1",
-}
-
-
-def test_create_rejects_missing_alert_type(
-    signoz: SigNoz,
-    create_user_admin: Operation,  # pylint: disable=unused-argument
-    get_token: Callable[[str, str], str],
-):
-    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
-
-    rule = {key: value for key, value in VALID_RULE.items() if key != "alertType"}
-    response = requests.post(
-        signoz.self.host_configs["8080"].get(BASE_URL),
-        json=rule,
-        headers={"Authorization": f"Bearer {token}"},
-        timeout=5,
-    )
-
-    assert response.status_code == HTTPStatus.BAD_REQUEST, response.text
-    assert response.json() == {
-        "status": "error",
-        "error": {
-            "type": "invalid-input",
-            "code": "invalid_input",
-            "message": "alert rule is not valid",
-            "errors": [{"message": "alertType: field is required", "suggestions": []}],
-            "suggestions": [],
-        },
-    }
-
-
-def test_create_rejects_unknown_panel_type(
-    signoz: SigNoz,
-    create_user_admin: Operation,  # pylint: disable=unused-argument
-    get_token: Callable[[str, str], str],
-):
-    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
-
-    rule = {**VALID_RULE, "condition": {**VALID_RULE["condition"], "compositeQuery": {**VALID_RULE["condition"]["compositeQuery"], "panelType": "pie"}}}
-    response = requests.post(
-        signoz.self.host_configs["8080"].get(BASE_URL),
-        json=rule,
-        headers={"Authorization": f"Bearer {token}"},
-        timeout=5,
-    )
-
-    assert response.status_code == HTTPStatus.BAD_REQUEST, response.text
-    assert response.json() == {
-        "status": "error",
-        "error": {
-            "type": "invalid-input",
-            "code": "invalid_input",
-            "message": "alert rule is not valid",
-            "errors": [{"message": 'condition.compositeQuery.panelType: unsupported value "pie"; must be one of value, table, graph', "suggestions": []}],
-            "suggestions": [],
-        },
-    }
-
-
-def test_create_rejects_malformed_json(
-    signoz: SigNoz,
-    create_user_admin: Operation,  # pylint: disable=unused-argument
-    get_token: Callable[[str, str], str],
-):
-    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
-
-    response = requests.post(
-        signoz.self.host_configs["8080"].get(BASE_URL),
-        data='{"alert": ',
-        headers={"Authorization": f"Bearer {token}", "Content-Type": "application/json"},
-        timeout=5,
-    )
-
-    assert response.status_code == HTTPStatus.BAD_REQUEST, response.text
-    assert response.json() == {
-        "status": "error",
-        "error": {
-            "type": "invalid-input",
-            "code": "invalid_input",
-            "message": "failed to parse json: unexpected end of JSON input",
-            "errors": [],
-            "suggestions": [],
-        },
-    }
-
-
-def test_create_rejects_unnamed_threshold(
-    signoz: SigNoz,
-    create_user_admin: Operation,  # pylint: disable=unused-argument
-    get_token: Callable[[str, str], str],
-):
-    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
-
-    rule = {**VALID_RULE, "condition": {**VALID_RULE["condition"], "thresholds": {"kind": "basic", "spec": [{"name": "", "target": 90, "matchType": "at_least_once", "op": "above", "channels": []}]}}}
-    response = requests.post(
-        signoz.self.host_configs["8080"].get(BASE_URL),
-        json=rule,
-        headers={"Authorization": f"Bearer {token}"},
-        timeout=5,
-    )
-
-    assert response.status_code == HTTPStatus.BAD_REQUEST, response.text
-    assert response.json() == {
-        "status": "error",
-        "error": {
-            "type": "invalid-input",
-            "code": "invalid_input",
-            "message": "alert rule is not valid",
-            "errors": [{"message": "threshold name cannot be empty", "suggestions": []}],
-            "suggestions": [],
-        },
-    }
-
-
-def test_create_rejects_duplicate_threshold_names(
-    signoz: SigNoz,
-    create_user_admin: Operation,  # pylint: disable=unused-argument
-    get_token: Callable[[str, str], str],
-):
-    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
-
-    threshold = {"name": "critical", "target": 90, "matchType": "at_least_once", "op": "above", "channels": []}
-    rule = {**VALID_RULE, "condition": {**VALID_RULE["condition"], "thresholds": {"kind": "basic", "spec": [threshold, {**threshold, "target": 95}]}}}
-    response = requests.post(
-        signoz.self.host_configs["8080"].get(BASE_URL),
-        json=rule,
-        headers={"Authorization": f"Bearer {token}"},
-        timeout=5,
-    )
-
-    assert response.status_code == HTTPStatus.BAD_REQUEST, response.text
-    assert response.json() == {
-        "status": "error",
-        "error": {
-            "type": "invalid-input",
-            "code": "invalid_input",
-            "message": "alert rule is not valid",
-            "errors": [{"message": 'condition.thresholds.spec: duplicate threshold name "critical"', "suggestions": []}],
-            "suggestions": [],
-        },
-    }
-
-
-def test_create_rejects_empty_rule_type(
-    signoz: SigNoz,
-    create_user_admin: Operation,  # pylint: disable=unused-argument
-    get_token: Callable[[str, str], str],
-):
-    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
-
-    response = requests.post(
-        signoz.self.host_configs["8080"].get(BASE_URL),
-        json={**VALID_RULE, "ruleType": ""},
-        headers={"Authorization": f"Bearer {token}"},
-        timeout=5,
-    )
-
-    assert response.status_code == HTTPStatus.BAD_REQUEST, response.text
-    assert response.json() == {
-        "status": "error",
-        "error": {
-            "type": "invalid-input",
-            "code": "invalid_input",
-            "message": "failed to parse json: string must not be empty",
-            "errors": [],
-            "suggestions": [],
-        },
-    }
-
-
-def test_create_rejects_empty_schema_version(
-    signoz: SigNoz,
-    create_user_admin: Operation,  # pylint: disable=unused-argument
-    get_token: Callable[[str, str], str],
-):
-    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
-
-    response = requests.post(
-        signoz.self.host_configs["8080"].get(BASE_URL),
-        json={**VALID_RULE, "schemaVersion": ""},
-        headers={"Authorization": f"Bearer {token}"},
-        timeout=5,
-    )
-
-    assert response.status_code == HTTPStatus.BAD_REQUEST, response.text
-    assert response.json() == {
-        "status": "error",
-        "error": {
-            "type": "invalid-input",
-            "code": "invalid_input",
-            "message": "failed to parse json: string must not be empty",
-            "errors": [],
-            "suggestions": [],
-        },
-    }
-
-
-def test_create_rejects_empty_seasonality(
-    signoz: SigNoz,
-    create_user_admin: Operation,  # pylint: disable=unused-argument
-    get_token: Callable[[str, str], str],
-):
-    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
-
-    response = requests.post(
-        signoz.self.host_configs["8080"].get(BASE_URL),
-        json={**VALID_RULE, "condition": {**VALID_RULE["condition"], "seasonality": ""}},
-        headers={"Authorization": f"Bearer {token}"},
-        timeout=5,
-    )
-
-    assert response.status_code == HTTPStatus.BAD_REQUEST, response.text
-    assert response.json() == {
-        "status": "error",
-        "error": {
-            "type": "invalid-input",
-            "code": "invalid_input",
-            "message": "failed to parse json: string must not be empty",
-            "errors": [],
-            "suggestions": [],
-        },
-    }
-
-
-def test_create_defaults_clickhouse_rule_type(
-    signoz: SigNoz,
-    create_user_admin: Operation,  # pylint: disable=unused-argument
-    get_token: Callable[[str, str], str],
-    create_alert_rule: Callable[[dict], str],
-):
-    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
-
-    rule = {key: value for key, value in VALID_RULE.items() if key != "ruleType"}
-    rule["condition"] = {**VALID_RULE["condition"], "compositeQuery": {"queryType": "clickhouse_sql", "panelType": "graph", "queries": [{"type": "clickhouse_sql", "spec": {"name": "A", "query": "SELECT now() AS ts, 1 AS value"}}]}}
-    rule_id = create_alert_rule(rule)
-
-    response = requests.get(
-        signoz.self.host_configs["8080"].get(f"{BASE_URL}/{rule_id}"),
-        headers={"Authorization": f"Bearer {token}"},
-        timeout=5,
-    )
-
-    assert response.status_code == HTTPStatus.OK, response.text
-    assert response.json()["data"]["ruleType"] == "threshold_rule"
-
-
-def test_timeline_rejects_unknown_state(
-    signoz: SigNoz,
-    create_user_admin: Operation,  # pylint: disable=unused-argument
-    get_token: Callable[[str, str], str],
-    create_alert_rule: Callable[[dict], str],
-):
-    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
-    rule_id = create_alert_rule(VALID_RULE)
-
-    end_ms = int(time.time() * 1000)
-    response = requests.get(
-        signoz.self.host_configs["8080"].get(f"{BASE_URL}/{rule_id}/history/timeline"),
-        params={"start": end_ms - 3_600_000, "end": end_ms, "state": "bogus"},
-        headers={"Authorization": f"Bearer {token}"},
-        timeout=5,
-    )
-
-    assert response.status_code == HTTPStatus.BAD_REQUEST, response.text
-    assert response.json() == {
-        "status": "error",
-        "error": {
-            "type": "invalid-input",
-            "code": "invalid_input",
-            "message": "invalid query parameters",
-            "errors": [],
-            "suggestions": [],
-        },
-    }

tests/integration/tests/ruler/08_threshold_validation.py

@@ -1,126 +0,0 @@
-from collections.abc import Callable
-from http import HTTPStatus
-
-import requests
-
-from fixtures.auth import USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD
-from fixtures.types import Operation, SigNoz
-
-BASE_URL = "/api/v2/rules"
-
-VALID_RULE = {
-    "alert": "threshold probe",
-    "alertType": "METRIC_BASED_ALERT",
-    "ruleType": "threshold_rule",
-    "condition": {
-        "thresholds": {
-            "kind": "basic",
-            "spec": [{"name": "critical", "target": 90, "matchType": "at_least_once", "op": "above", "channels": []}],
-        },
-        "compositeQuery": {
-            "queryType": "builder",
-            "panelType": "graph",
-            "queries": [
-                {
-                    "type": "builder_query",
-                    "spec": {
-                        "name": "A",
-                        "signal": "metrics",
-                        "aggregations": [{"metricName": "threshold_probe_cpu", "timeAggregation": "avg", "spaceAggregation": "max"}],
-                    },
-                }
-            ],
-        },
-        "selectedQueryName": "A",
-    },
-    "labels": {"severity": "critical"},
-    "annotations": {"summary": "s", "description": "d"},
-    "disabled": True,
-    "evaluation": {"kind": "rolling", "spec": {"evalWindow": "5m", "frequency": "1m"}},
-    "notificationSettings": {"usePolicy": False, "renotify": {"enabled": False}},
-    "schemaVersion": "v2alpha1",
-}
-
-
-def test_create_rejects_null_target(
-    signoz: SigNoz,
-    create_user_admin: Operation,  # pylint: disable=unused-argument
-    get_token: Callable[[str, str], str],
-):
-    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
-
-    rule = {**VALID_RULE, "condition": {**VALID_RULE["condition"], "thresholds": {"kind": "basic", "spec": [{"name": "critical", "target": None, "matchType": "at_least_once", "op": "above", "channels": []}]}}}
-    response = requests.post(
-        signoz.self.host_configs["8080"].get(BASE_URL),
-        json=rule,
-        headers={"Authorization": f"Bearer {token}"},
-        timeout=5,
-    )
-
-    assert response.status_code == HTTPStatus.BAD_REQUEST, response.text
-    assert response.json() == {
-        "status": "error",
-        "error": {
-            "type": "invalid-input",
-            "code": "invalid_input",
-            "message": "alert rule is not valid",
-            "errors": [{"message": "target value cannot be nil", "suggestions": []}],
-            "suggestions": [],
-        },
-    }
-
-
-def test_create_rejects_empty_op(
-    signoz: SigNoz,
-    create_user_admin: Operation,  # pylint: disable=unused-argument
-    get_token: Callable[[str, str], str],
-):
-    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
-
-    rule = {**VALID_RULE, "condition": {**VALID_RULE["condition"], "thresholds": {"kind": "basic", "spec": [{"name": "critical", "target": 90, "matchType": "at_least_once", "op": "", "channels": []}]}}}
-    response = requests.post(
-        signoz.self.host_configs["8080"].get(BASE_URL),
-        json=rule,
-        headers={"Authorization": f"Bearer {token}"},
-        timeout=5,
-    )
-
-    assert response.status_code == HTTPStatus.BAD_REQUEST, response.text
-    assert response.json() == {
-        "status": "error",
-        "error": {
-            "type": "invalid-input",
-            "code": "invalid_input",
-            "message": "alert rule is not valid",
-            "errors": [{"message": 'condition.op: unsupported value ""; must be one of above, below, equal, not_equal, above_or_equal, below_or_equal, outside_bounds', "suggestions": []}],
-            "suggestions": [],
-        },
-    }
-
-
-def test_create_rejects_unknown_match_type(
-    signoz: SigNoz,
-    create_user_admin: Operation,  # pylint: disable=unused-argument
-    get_token: Callable[[str, str], str],
-):
-    token = get_token(USER_ADMIN_EMAIL, USER_ADMIN_PASSWORD)
-
-    rule = {**VALID_RULE, "condition": {**VALID_RULE["condition"], "thresholds": {"kind": "basic", "spec": [{"name": "critical", "target": 90, "matchType": "0", "op": "above", "channels": []}]}}}
-    response = requests.post(
-        signoz.self.host_configs["8080"].get(BASE_URL),
-        json=rule,
-        headers={"Authorization": f"Bearer {token}"},
-        timeout=5,
-    )
-
-    assert response.status_code == HTTPStatus.BAD_REQUEST, response.text
-    assert response.json() == {
-        "status": "error",
-        "error": {
-            "type": "invalid-input",
-            "code": "invalid_input",
-            "message": "alert rule is not valid",
-            "errors": [{"message": 'condition.matchType: unsupported value "0"; must be one of at_least_once, all_the_times, on_average, in_total, last', "suggestions": []}],
-            "suggestions": [],
-        },
-    }