fix: opening /ai-assistant opens 2 new conversations instead of one

docs/api/openapi.yml

@@ -618,6 +618,13 @@ components:
         provider:
           $ref: '#/components/schemas/AuthtypesAuthNProvider'
       type: object
+    AuthtypesPatchableRole:
+      properties:
+        description:
+          type: string
+      required:
+      - description
+      type: object
     AuthtypesPostableAuthDomain:
       properties:
         config:
@@ -2529,6 +2536,22 @@ components:
       - resource
       - selectors
       type: object
+    CoretypesPatchableObjects:
+      properties:
+        additions:
+          items:
+            $ref: '#/components/schemas/CoretypesObjectGroup'
+          nullable: true
+          type: array
+        deletions:
+          items:
+            $ref: '#/components/schemas/CoretypesObjectGroup'
+          nullable: true
+          type: array
+      required:
+      - additions
+      - deletions
+      type: object
     CoretypesResourceRef:
       properties:
         kind:
@@ -2714,14 +2737,6 @@ components:
           type: string
         dashboardName:
           type: string
-        filterBy:
-          items:
-            type: string
-          type: array
-        groupBy:
-          items:
-            type: string
-          type: array
         panelId:
           type: string
         panelName:
@@ -3571,7 +3586,7 @@ components:
       - user
       - system
       - integration
-      type: string
+      type: object
     DashboardtypesSpanGaps:
       properties:
         fillLessThan:
@@ -5397,9 +5412,6 @@ components:
           type: string
         id:
           type: string
-        ingestedSamples:
-          minimum: 0
-          type: integer
         ingestedSeries:
           minimum: 0
           type: integer
@@ -5412,9 +5424,9 @@ components:
           $ref: '#/components/schemas/MetricreductionruletypesMatchType'
         metricName:
           type: string
-        retainedSamples:
-          minimum: 0
-          type: integer
+        reductionPercent:
+          format: double
+          type: number
         retainedSeries:
           minimum: 0
           type: integer
@@ -5432,8 +5444,7 @@ components:
       - active
       - ingestedSeries
       - retainedSeries
-      - ingestedSamples
-      - retainedSamples
+      - reductionPercent
       type: object
     MetricreductionruletypesGettableReductionRulePreview:
       properties:
@@ -5476,23 +5487,15 @@ components:
         estimatedMonthlySavingsUsd:
           format: double
           type: number
-        ingestedSamples:
-          minimum: 0
-          type: integer
         ingestedSeries:
           minimum: 0
           type: integer
-        retainedSamples:
-          minimum: 0
-          type: integer
         retainedSeries:
           minimum: 0
           type: integer
       required:
       - ingestedSeries
       - retainedSeries
-      - ingestedSamples
-      - retainedSamples
       - estimatedMonthlySavingsUsd
       type: object
     MetricreductionruletypesGettableReductionRules:
@@ -5558,6 +5561,7 @@ components:
       - metric
       - ingested_volume
       - reduced_volume
+      - reduction
       - last_updated
       type: string
     MetricreductionruletypesUpdatableReductionRule:
@@ -11821,6 +11825,68 @@ paths:
       summary: Get role
       tags:
       - role
+    patch:
+      deprecated: true
+      description: This endpoint patches a role
+      operationId: PatchRole
+      parameters:
+      - in: path
+        name: id
+        required: true
+        schema:
+          type: string
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/AuthtypesPatchableRole'
+      responses:
+        "204":
+          description: No Content
+        "401":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RenderErrorResponse'
+          description: Unauthorized
+        "403":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RenderErrorResponse'
+          description: Forbidden
+        "404":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RenderErrorResponse'
+          description: Not Found
+        "451":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RenderErrorResponse'
+          description: Unavailable For Legal Reasons
+        "500":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RenderErrorResponse'
+          description: Internal Server Error
+        "501":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RenderErrorResponse'
+          description: Not Implemented
+      security:
+      - api_key:
+        - role:update
+      - tokenizer:
+        - role:update
+      summary: Patch role
+      tags:
+      - role
     put:
       deprecated: false
       description: This endpoint updates a role
@@ -11883,6 +11949,158 @@ paths:
       summary: Update role
       tags:
       - role
+  /api/v1/roles/{id}/relations/{relation}/objects:
+    get:
+      deprecated: false
+      description: Gets all objects connected to the specified role via a given relation
+        type
+      operationId: GetObjects
+      parameters:
+      - in: path
+        name: id
+        required: true
+        schema:
+          type: string
+      - in: path
+        name: relation
+        required: true
+        schema:
+          type: string
+      responses:
+        "200":
+          content:
+            application/json:
+              schema:
+                properties:
+                  data:
+                    items:
+                      $ref: '#/components/schemas/CoretypesObjectGroup'
+                    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
+        "404":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RenderErrorResponse'
+          description: Not Found
+        "451":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RenderErrorResponse'
+          description: Unavailable For Legal Reasons
+        "500":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RenderErrorResponse'
+          description: Internal Server Error
+        "501":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RenderErrorResponse'
+          description: Not Implemented
+      security:
+      - api_key:
+        - role:read
+      - tokenizer:
+        - role:read
+      summary: Get objects for a role by relation
+      tags:
+      - role
+    patch:
+      deprecated: true
+      description: Patches the objects connected to the specified role via a given
+        relation type
+      operationId: PatchObjects
+      parameters:
+      - in: path
+        name: id
+        required: true
+        schema:
+          type: string
+      - in: path
+        name: relation
+        required: true
+        schema:
+          type: string
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/CoretypesPatchableObjects'
+      responses:
+        "204":
+          description: No Content
+        "400":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RenderErrorResponse'
+          description: Bad Request
+        "401":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RenderErrorResponse'
+          description: Unauthorized
+        "403":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RenderErrorResponse'
+          description: Forbidden
+        "404":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RenderErrorResponse'
+          description: Not Found
+        "451":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RenderErrorResponse'
+          description: Unavailable For Legal Reasons
+        "500":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RenderErrorResponse'
+          description: Internal Server Error
+        "501":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RenderErrorResponse'
+          description: Not Implemented
+      security:
+      - api_key:
+        - role:update
+      - tokenizer:
+        - role:update
+      summary: Patch objects for a role by relation
+      tags:
+      - role
   /api/v1/route_policies:
     get:
       deprecated: false

ee/authz/openfgaauthz/provider.go

@@ -260,6 +260,40 @@ func (provider *provider) GetWithTransactionGroups(ctx context.Context, orgID va
 	return authtypes.MakeRoleWithTransactionGroups(role, transactionGroups), nil
 }
 
+func (provider *provider) GetObjects(ctx context.Context, orgID valuer.UUID, id valuer.UUID, relation authtypes.Relation) ([]*coretypes.Object, error) {
+	_, err := provider.licensing.GetActive(ctx, orgID)
+	if err != nil {
+		return nil, errors.New(errors.TypeLicenseUnavailable, errors.CodeLicenseUnavailable, "a valid license is not available").WithAdditional("this feature requires a valid license").WithAdditional(err.Error())
+	}
+
+	storableRole, err := provider.store.Get(ctx, orgID, id)
+	if err != nil {
+		return nil, err
+	}
+
+	objects := make([]*coretypes.Object, 0)
+	for _, objectType := range provider.registry.Types() {
+		if coretypes.ErrIfVerbNotValidForType(relation.Verb, objectType) != nil {
+			continue
+		}
+
+		resourceObjects, err := provider.
+			ListObjects(
+				ctx,
+				authtypes.MustNewSubject(coretypes.NewResourceRole(), storableRole.Name, orgID, &coretypes.VerbAssignee),
+				relation,
+				objectType,
+			)
+		if err != nil {
+			return nil, err
+		}
+
+		objects = append(objects, resourceObjects...)
+	}
+
+	return objects, nil
+}
+
 func (provider *provider) Update(ctx context.Context, orgID valuer.UUID, updatedRole *authtypes.RoleWithTransactionGroups) error {
 	_, err := provider.licensing.GetActive(ctx, orgID)
 	if err != nil {
@@ -290,6 +324,39 @@ func (provider *provider) Update(ctx context.Context, orgID valuer.UUID, updated
 	return provider.store.Update(ctx, orgID, updatedRole.Role)
 }
 
+func (provider *provider) Patch(ctx context.Context, orgID valuer.UUID, role *authtypes.Role) error {
+	_, err := provider.licensing.GetActive(ctx, orgID)
+	if err != nil {
+		return errors.New(errors.TypeLicenseUnavailable, errors.CodeLicenseUnavailable, "a valid license is not available").WithAdditional("this feature requires a valid license").WithAdditional(err.Error())
+	}
+
+	return provider.store.Update(ctx, orgID, role)
+}
+
+func (provider *provider) PatchObjects(ctx context.Context, orgID valuer.UUID, name string, relation authtypes.Relation, additions, deletions []*coretypes.Object) error {
+	_, err := provider.licensing.GetActive(ctx, orgID)
+	if err != nil {
+		return errors.New(errors.TypeLicenseUnavailable, errors.CodeLicenseUnavailable, "a valid license is not available").WithAdditional("this feature requires a valid license").WithAdditional(err.Error())
+	}
+
+	additionTuples, err := authtypes.GetAdditionTuples(name, orgID, relation, additions)
+	if err != nil {
+		return err
+	}
+
+	deletionTuples, err := authtypes.GetDeletionTuples(name, orgID, relation, deletions)
+	if err != nil {
+		return err
+	}
+
+	err = provider.Write(ctx, additionTuples, deletionTuples)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
 func (provider *provider) Delete(ctx context.Context, orgID valuer.UUID, id valuer.UUID) error {
 	_, err := provider.licensing.GetActive(ctx, orgID)
 	if err != nil {

ee/modules/dashboard/impldashboard/module.go

@@ -286,7 +286,7 @@ func (module *module) Get(ctx context.Context, orgID valuer.UUID, id valuer.UUID
 	return module.pkgDashboardModule.Get(ctx, orgID, id)
 }
 
-func (module *module) GetByMetricNames(ctx context.Context, orgID valuer.UUID, metricNames []string) (map[string][]dashboardtypes.DashboardPanelRef, error) {
+func (module *module) GetByMetricNames(ctx context.Context, orgID valuer.UUID, metricNames []string) (map[string][]map[string]string, error) {
 	return module.pkgDashboardModule.GetByMetricNames(ctx, orgID, metricNames)
 }
 

ee/modules/metricreductionrule/implmetricreductionrule/clickhouse.go

@@ -22,8 +22,6 @@ var (
 
 const timeSeriesBucketMilli = int64(time.Hour / time.Millisecond)
 
-const sampleBucketExpr = "toInt64(toUnixTimestamp(toStartOfInterval(toDateTime(intDiv(unix_milli, 1000)), toIntervalMinute(10)))) * 1000 AS bucket"
-
 type volumeRow struct {
 	MetricName string
 	Ingested   uint64
@@ -291,9 +289,12 @@ func (c *clickhouse) RankByVolume(ctx context.Context, metricNames []string, eff
 	}
 	ctx = c.withThreads(ctx)
 
-	orderExpr := "ifNull(i.samples, 0)"
-	if orderBy == metricreductionruletypes.OrderByReducedVolume {
-		orderExpr = "if(ifNull(d.samples, 0) = 0 OR ifNull(d.samples, 0) > ifNull(i.samples, 0), ifNull(i.samples, 0), ifNull(d.samples, 0))"
+	orderExpr := "ingested"
+	switch orderBy {
+	case metricreductionruletypes.OrderByReducedVolume:
+		orderExpr = "reduced"
+	case metricreductionruletypes.OrderByReduction:
+		orderExpr = "if(ingested = 0, 0, (toFloat64(ingested) - toFloat64(reduced)) / toFloat64(ingested))"
 	}
 	direction := "ASC"
 	if order == metricreductionruletypes.OrderDesc {
@@ -309,17 +310,17 @@ func (c *clickhouse) RankByVolume(ctx context.Context, metricNames []string, eff
 	sb.From("(SELECT arrayJoin(" + sb.Var(metricNames) + ") AS metric_name) AS base")
 	sb.JoinWithOption(
 		sqlbuilder.LeftJoin,
-		"(SELECT metric_name, uniq(fingerprint) AS cnt, count() AS samples FROM "+ingestedTable+" WHERE has("+sb.Var(metricNames)+", metric_name) AND unix_milli >= "+sb.Var(startMs)+" AND unix_milli < "+sb.Var(endMs)+" AND "+strictEffectiveFrom(sb, metricNames, effectiveFrom)+" GROUP BY metric_name) AS i",
+		"(SELECT metric_name, uniq(fingerprint) AS cnt FROM "+ingestedTable+" WHERE has("+sb.Var(metricNames)+", metric_name) AND unix_milli >= "+sb.Var(startMs)+" AND unix_milli < "+sb.Var(endMs)+" AND "+strictEffectiveFrom(sb, metricNames, effectiveFrom)+" GROUP BY metric_name) AS i",
 		"base.metric_name = i.metric_name",
 	)
 	// Reduced series are spread across two type-specific tables; union the per-table distinct
 	// reduced_fingerprints and sum per metric (a metric only lands in the table matching its type).
 	sb.JoinWithOption(
 		sqlbuilder.LeftJoin,
-		"(SELECT metric_name, sum(cnt) AS cnt, sum(samples) AS samples FROM ("+
-			"SELECT metric_name, uniq(reduced_fingerprint) AS cnt, uniq(reduced_fingerprint, unix_milli) AS samples FROM "+reducedLast+" WHERE has("+sb.Var(metricNames)+", metric_name) AND unix_milli >= "+sb.Var(startMs)+" AND unix_milli < "+sb.Var(endMs)+" AND "+strictEffectiveFrom(sb, metricNames, effectiveFrom)+" GROUP BY metric_name"+
+		"(SELECT metric_name, sum(cnt) AS cnt FROM ("+
+			"SELECT metric_name, uniq(reduced_fingerprint) AS cnt FROM "+reducedLast+" WHERE has("+sb.Var(metricNames)+", metric_name) AND unix_milli >= "+sb.Var(startMs)+" AND unix_milli < "+sb.Var(endMs)+" AND "+strictEffectiveFrom(sb, metricNames, effectiveFrom)+" GROUP BY metric_name"+
 			" UNION ALL "+
-			"SELECT metric_name, uniq(reduced_fingerprint) AS cnt, uniq(reduced_fingerprint, unix_milli) AS samples FROM "+reducedSum+" WHERE has("+sb.Var(metricNames)+", metric_name) AND unix_milli >= "+sb.Var(startMs)+" AND unix_milli < "+sb.Var(endMs)+" AND "+strictEffectiveFrom(sb, metricNames, effectiveFrom)+" GROUP BY metric_name"+
+			"SELECT metric_name, uniq(reduced_fingerprint) AS cnt FROM "+reducedSum+" WHERE has("+sb.Var(metricNames)+", metric_name) AND unix_milli >= "+sb.Var(startMs)+" AND unix_milli < "+sb.Var(endMs)+" AND "+strictEffectiveFrom(sb, metricNames, effectiveFrom)+" GROUP BY metric_name"+
 			") GROUP BY metric_name) AS d",
 		"base.metric_name = d.metric_name",
 	)
@@ -346,184 +347,120 @@ func (c *clickhouse) RankByVolume(ctx context.Context, metricNames []string, eff
 	return out, rows.Err()
 }
 
-func (c *clickhouse) SampleVolumeByMetric(ctx context.Context, metricNames []string, effectiveFrom map[string]int64, startMs, endMs int64) (map[string]volumeRow, error) {
+func (c *clickhouse) SampleVolume(ctx context.Context, metricNames []string, effectiveFrom map[string]int64, startMs, endMs int64) (uint64, uint64, error) {
 	if len(metricNames) == 0 {
-		return map[string]volumeRow{}, nil
+		return 0, 0, nil
 	}
 	ctx = c.withThreads(ctx)
 
-	ingested, err := c.countSamplesByMetric(ctx, telemetrymetrics.DBName+"."+telemetrymetrics.SamplesV4BufferTableName, "count()", metricNames, effectiveFrom, startMs, endMs)
+	ingested, err := c.countRawSamples(ctx, telemetrymetrics.DBName+"."+telemetrymetrics.SamplesV4BufferTableName, metricNames, effectiveFrom, startMs, endMs)
 	if err != nil {
-		return nil, err
+		return 0, 0, err
 	}
 
-	last, err := c.countSamplesByMetric(ctx, telemetrymetrics.DBName+"."+telemetrymetrics.SamplesV4ReducedLastTableName, "uniq(reduced_fingerprint, unix_milli)", metricNames, effectiveFrom, startMs, endMs)
+	last, err := c.countReducedSamples(ctx, telemetrymetrics.DBName+"."+telemetrymetrics.SamplesV4ReducedLastTableName, metricNames, effectiveFrom, startMs, endMs)
 	if err != nil {
-		return nil, err
+		return 0, 0, err
 	}
-	sum, err := c.countSamplesByMetric(ctx, telemetrymetrics.DBName+"."+telemetrymetrics.SamplesV4ReducedSumTableName, "uniq(reduced_fingerprint, unix_milli)", metricNames, effectiveFrom, startMs, endMs)
+	sum, err := c.countReducedSamples(ctx, telemetrymetrics.DBName+"."+telemetrymetrics.SamplesV4ReducedSumTableName, metricNames, effectiveFrom, startMs, endMs)
 	if err != nil {
-		return nil, err
+		return 0, 0, err
 	}
 
-	out := make(map[string]volumeRow, len(metricNames))
-	for _, name := range metricNames {
-		out[name] = volumeRow{MetricName: name, Ingested: ingested[name], Reduced: last[name] + sum[name]}
-	}
-	return out, nil
+	return ingested, min(last+sum, ingested), nil
 }
 
-func (c *clickhouse) countSamplesByMetric(ctx context.Context, table, countExpr string, metricNames []string, effectiveFrom map[string]int64, startMs, endMs int64) (map[string]uint64, error) {
+func (c *clickhouse) countRawSamples(ctx context.Context, table string, metricNames []string, effectiveFrom map[string]int64, startMs, endMs int64) (uint64, error) {
 	names := make([]any, len(metricNames))
 	for i, name := range metricNames {
 		names[i] = name
 	}
 
 	sb := sqlbuilder.NewSelectBuilder()
-	sb.Select("metric_name", countExpr)
+	sb.Select("count()")
 	sb.From(table)
-	conds := []string{
-		sb.In("metric_name", names...),
-		sb.GE("unix_milli", startMs),
-		sb.LT("unix_milli", endMs),
-	}
-	if len(effectiveFrom) > 0 {
-		conds = append(conds, strictEffectiveFrom(sb, metricNames, effectiveFrom))
-	}
-	sb.Where(conds...)
-	sb.GroupBy("metric_name")
-
-	query, args := sb.BuildWithFlavor(sqlbuilder.ClickHouse)
-	rows, err := c.telemetryStore.ClickhouseDB().Query(ctx, query, args...)
-	if err != nil {
-		return nil, errors.WrapInternalf(err, errors.CodeInternal, "failed to count samples")
-	}
-	defer rows.Close()
-
-	out := make(map[string]uint64, len(metricNames))
-	for rows.Next() {
-		var (
-			metricName string
-			count      uint64
-		)
-		if err := rows.Scan(&metricName, &count); err != nil {
-			return nil, errors.WrapInternalf(err, errors.CodeInternal, "failed to scan series count")
-		}
-		out[metricName] = count
-	}
-	return out, rows.Err()
-}
-
-func (c *clickhouse) TotalVolume(ctx context.Context, startMs, endMs int64) (uint64, uint64, error) {
-	ctx = c.withThreads(ctx)
-
-	sb := sqlbuilder.NewSelectBuilder()
-	sb.Select("uniq(fingerprint)", "count()")
-	sb.From(telemetrymetrics.DBName + "." + telemetrymetrics.SamplesV4BufferTableName)
-	sb.Where(sb.GE("unix_milli", startMs), sb.LT("unix_milli", endMs))
-
-	query, args := sb.BuildWithFlavor(sqlbuilder.ClickHouse)
-	var series, samples uint64
-	if err := c.telemetryStore.ClickhouseDB().QueryRow(ctx, query, args...).Scan(&series, &samples); err != nil {
-		return 0, 0, errors.WrapInternalf(err, errors.CodeInternal, "failed to count total ingested volume")
-	}
-	return series, samples, nil
-}
-
-func (c *clickhouse) SampleTimeseries(ctx context.Context, ruledMetrics []string, effectiveFrom map[string]int64, startMs, endMs int64) ([]volumePoint, error) {
-	ctx = c.withThreads(ctx)
-
-	ingested, err := c.totalSamplesByBucket(ctx, startMs, endMs)
-	if err != nil {
-		return nil, err
-	}
-
-	ruledIngested := make(map[int64]uint64)
-	ruledRetained := make(map[int64]uint64)
-	if len(ruledMetrics) > 0 {
-		ruledIngested, err = c.ruledIngestedSamplesByBucket(ctx, ruledMetrics, effectiveFrom, startMs, endMs)
-		if err != nil {
-			return nil, err
-		}
-		ruledRetained, err = c.ruledRetainedSamplesByBucket(ctx, ruledMetrics, effectiveFrom, startMs, endMs)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	retained := make(map[int64]uint64, len(ingested))
-	for ts, total := range ingested {
-		shed := uint64(0)
-		if ri := ruledIngested[ts]; ri > ruledRetained[ts] {
-			shed = ri - ruledRetained[ts]
-		}
-		if total > shed {
-			retained[ts] = total - shed
-		} else {
-			retained[ts] = 0
-		}
-	}
-
-	return mergeVolumePoints(ingested, retained), nil
-}
-
-func (c *clickhouse) totalSamplesByBucket(ctx context.Context, startMs, endMs int64) (map[int64]uint64, error) {
-	sb := sqlbuilder.NewSelectBuilder()
-	sb.Select(sampleBucketExpr, "count()")
-	sb.From(telemetrymetrics.DBName + "." + telemetrymetrics.SamplesV4BufferTableName)
-	sb.Where(sb.GE("unix_milli", startMs), sb.LT("unix_milli", endMs))
-	sb.GroupBy("bucket")
-
-	return c.scanBuckets(ctx, sb)
-}
-
-func (c *clickhouse) ruledIngestedSamplesByBucket(ctx context.Context, metricNames []string, effectiveFrom map[string]int64, startMs, endMs int64) (map[int64]uint64, error) {
-	names := make([]any, len(metricNames))
-	for i, name := range metricNames {
-		names[i] = name
-	}
-
-	sb := sqlbuilder.NewSelectBuilder()
-	sb.Select(sampleBucketExpr, "count()")
-	sb.From(telemetrymetrics.DBName + "." + telemetrymetrics.SamplesV4BufferTableName)
 	conds := []string{sb.In("metric_name", names...), sb.GE("unix_milli", startMs), sb.LT("unix_milli", endMs)}
 	if len(effectiveFrom) > 0 {
 		conds = append(conds, strictEffectiveFrom(sb, metricNames, effectiveFrom))
 	}
 	sb.Where(conds...)
-	sb.GroupBy("bucket")
 
-	return c.scanBuckets(ctx, sb)
+	query, args := sb.BuildWithFlavor(sqlbuilder.ClickHouse)
+	var count uint64
+	if err := c.telemetryStore.ClickhouseDB().QueryRow(ctx, query, args...).Scan(&count); err != nil {
+		return 0, errors.WrapInternalf(err, errors.CodeInternal, "failed to count ingested samples")
+	}
+	return count, nil
 }
 
-// reduced 60s rows are versioned by computed_at, so count distinct buckets.
-func (c *clickhouse) ruledRetainedSamplesByBucket(ctx context.Context, metricNames []string, effectiveFrom map[string]int64, startMs, endMs int64) (map[int64]uint64, error) {
-	out := make(map[int64]uint64)
-	for _, table := range []string{telemetrymetrics.SamplesV4ReducedLastTableName, telemetrymetrics.SamplesV4ReducedSumTableName} {
-		names := make([]any, len(metricNames))
-		for i, name := range metricNames {
-			names[i] = name
-		}
+func (c *clickhouse) countReducedSamples(ctx context.Context, table string, metricNames []string, effectiveFrom map[string]int64, startMs, endMs int64) (uint64, error) {
+	names := make([]any, len(metricNames))
+	for i, name := range metricNames {
+		names[i] = name
+	}
 
-		sb := sqlbuilder.NewSelectBuilder()
-		sb.Select(sampleBucketExpr, "uniq(reduced_fingerprint, unix_milli)")
-		sb.From(telemetrymetrics.DBName + "." + table)
-		conds := []string{sb.In("metric_name", names...), sb.GE("unix_milli", startMs), sb.LT("unix_milli", endMs)}
-		if len(effectiveFrom) > 0 {
-			conds = append(conds, strictEffectiveFrom(sb, metricNames, effectiveFrom))
-		}
-		sb.Where(conds...)
-		sb.GroupBy("bucket")
+	sb := sqlbuilder.NewSelectBuilder()
+	// Reduced tables key the series on reduced_fingerprint (not fingerprint); dedupe ReplacingMergeTree recomputes.
+	sb.Select("uniq(reduced_fingerprint, unix_milli)")
+	sb.From(table)
+	conds := []string{sb.In("metric_name", names...), sb.GE("unix_milli", startMs), sb.LT("unix_milli", endMs)}
+	if len(effectiveFrom) > 0 {
+		conds = append(conds, strictEffectiveFrom(sb, metricNames, effectiveFrom))
+	}
+	sb.Where(conds...)
 
-		counts, err := c.scanBuckets(ctx, sb)
+	query, args := sb.BuildWithFlavor(sqlbuilder.ClickHouse)
+	var count uint64
+	if err := c.telemetryStore.ClickhouseDB().QueryRow(ctx, query, args...).Scan(&count); err != nil {
+		return 0, errors.WrapInternalf(err, errors.CodeInternal, "failed to count reduced samples")
+	}
+	return count, nil
+}
+
+// SeriesTimeseries returns ingested vs reduced series per 60s bucket from the samples tables, gated
+// to each metric's strict effective_from (see strictEffectiveFrom).
+func (c *clickhouse) SeriesTimeseries(ctx context.Context, allMetrics, reducedMetrics []string, effectiveFrom map[string]int64, startMs, endMs int64) ([]volumePoint, error) {
+	if len(allMetrics) == 0 {
+		return []volumePoint{}, nil
+	}
+	ctx = c.withThreads(ctx)
+
+	ingested, err := c.ingestedSeriesByBucket(ctx, allMetrics, effectiveFrom, startMs, endMs)
+	if err != nil {
+		return nil, err
+	}
+
+	retained := make(map[int64]uint64)
+	if len(reducedMetrics) > 0 {
+		reduced, err := c.reducedSeriesByBucket(ctx, reducedMetrics, effectiveFrom, startMs, endMs)
 		if err != nil {
 			return nil, err
 		}
-		for ts, count := range counts {
-			out[ts] += count
+		for ts, count := range reduced {
+			retained[ts] += count
 		}
 	}
-	return out, nil
+	reducedSet := make(map[string]struct{}, len(reducedMetrics))
+	for _, name := range reducedMetrics {
+		reducedSet[name] = struct{}{}
+	}
+	nonReduced := make([]string, 0, len(allMetrics))
+	for _, name := range allMetrics {
+		if _, ok := reducedSet[name]; !ok {
+			nonReduced = append(nonReduced, name)
+		}
+	}
+	if len(nonReduced) > 0 {
+		nonReducedIngested, err := c.ingestedSeriesByBucket(ctx, nonReduced, effectiveFrom, startMs, endMs)
+		if err != nil {
+			return nil, err
+		}
+		for ts, count := range nonReducedIngested {
+			retained[ts] += count
+		}
+	}
+
+	return mergeVolumePoints(ingested, retained), nil
 }
 
 func mergeVolumePoints(ingested, reduced map[int64]uint64) []volumePoint {
@@ -551,6 +488,60 @@ func mergeVolumePoints(ingested, reduced map[int64]uint64) []volumePoint {
 	return points
 }
 
+// ingestedSeriesByBucket counts distinct raw fingerprints per hourly bucket from the samples buffer.
+func (c *clickhouse) ingestedSeriesByBucket(ctx context.Context, metricNames []string, effectiveFrom map[string]int64, startMs, endMs int64) (map[int64]uint64, error) {
+	names := make([]any, len(metricNames))
+	for i, name := range metricNames {
+		names[i] = name
+	}
+
+	sb := sqlbuilder.NewSelectBuilder()
+	bucketExpr := "toInt64(toUnixTimestamp(toStartOfInterval(toDateTime(intDiv(unix_milli, 1000)), toIntervalHour(1)))) * 1000 AS bucket"
+	sb.Select(bucketExpr, "uniq(fingerprint)")
+	sb.From(telemetrymetrics.DBName + "." + telemetrymetrics.SamplesV4BufferTableName)
+	conds := []string{sb.In("metric_name", names...), sb.GE("unix_milli", startMs), sb.LT("unix_milli", endMs)}
+	if len(effectiveFrom) > 0 {
+		conds = append(conds, strictEffectiveFrom(sb, metricNames, effectiveFrom))
+	}
+	sb.Where(conds...)
+	sb.GroupBy("bucket")
+
+	return c.scanBuckets(ctx, sb)
+}
+
+// reducedSeriesByBucket counts distinct reduced_fingerprints per hourly bucket, summed across the two
+// reduced sample tables (a metric only lands in the table matching its type, so per-bucket sums are
+// exact).
+func (c *clickhouse) reducedSeriesByBucket(ctx context.Context, metricNames []string, effectiveFrom map[string]int64, startMs, endMs int64) (map[int64]uint64, error) {
+	out := make(map[int64]uint64)
+	for _, table := range []string{telemetrymetrics.SamplesV4ReducedLastTableName, telemetrymetrics.SamplesV4ReducedSumTableName} {
+		names := make([]any, len(metricNames))
+		for i, name := range metricNames {
+			names[i] = name
+		}
+
+		sb := sqlbuilder.NewSelectBuilder()
+		bucketExpr := "toInt64(toUnixTimestamp(toStartOfInterval(toDateTime(intDiv(unix_milli, 1000)), toIntervalHour(1)))) * 1000 AS bucket"
+		sb.Select(bucketExpr, "uniq(reduced_fingerprint)")
+		sb.From(telemetrymetrics.DBName + "." + table)
+		conds := []string{sb.In("metric_name", names...), sb.GE("unix_milli", startMs), sb.LT("unix_milli", endMs)}
+		if len(effectiveFrom) > 0 {
+			conds = append(conds, strictEffectiveFrom(sb, metricNames, effectiveFrom))
+		}
+		sb.Where(conds...)
+		sb.GroupBy("bucket")
+
+		counts, err := c.scanBuckets(ctx, sb)
+		if err != nil {
+			return nil, err
+		}
+		for ts, count := range counts {
+			out[ts] += count
+		}
+	}
+	return out, nil
+}
+
 func (c *clickhouse) scanBuckets(ctx context.Context, sb *sqlbuilder.SelectBuilder) (map[int64]uint64, error) {
 	query, args := sb.BuildWithFlavor(sqlbuilder.ClickHouse)
 	rows, err := c.telemetryStore.ClickhouseDB().Query(ctx, query, args...)

ee/modules/metricreductionrule/implmetricreductionrule/module.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"log/slog"
 	"sort"
+	"strings"
 	"time"
 
 	"github.com/SigNoz/signoz/pkg/errors"
@@ -27,16 +28,9 @@ import (
 
 const (
 	// effectiveFromMargin delays effective_from so the collector picks up the synced rule before it
-	// goes live; it must be >= the collector's rule-refresh interval (~2m worst case,
-	// see signoz-otel-collector#839).
-	effectiveFromMargin = 2 * time.Minute
-	// uiActivationDelay keeps a rule shown as "pending" in the UI for a while after it goes live to
-	// the collector, so the user doesn't see "active" before reduced data is actually flowing. The
-	// user-facing pending window is effectiveFromMargin + uiActivationDelay (~5m).
-	uiActivationDelay      = 3 * time.Minute
-	defaultPreviewLookback = 1 * time.Hour
-	statsLookback          = 1 * time.Hour
-	timeseriesLookback     = 6 * time.Hour
+	// goes live; it must be >= the collector's rule-refresh interval (see signoz-otel-collector#839).
+	effectiveFromMargin    = 5 * time.Minute
+	defaultPreviewLookback = 24 * time.Hour
 
 	pricePerMillionSamplesUSD = 0.1
 	monthDuration             = 30 * 24 * time.Hour
@@ -86,7 +80,7 @@ func (m *module) List(ctx context.Context, orgID valuer.UUID, params *metricredu
 	}
 
 	now := time.Now()
-	startMs := now.Add(-statsLookback).UnixMilli()
+	startMs := now.Add(-defaultPreviewLookback).UnixMilli()
 	endMs := now.UnixMilli()
 
 	switch params.OrderBy {
@@ -113,14 +107,10 @@ func (m *module) listSortedByColumn(ctx context.Context, orgID valuer.UUID, para
 	if err != nil {
 		return nil, err
 	}
-	sampleVolumes, err := m.ch.SampleVolumeByMetric(ctx, metricNames, effectiveFrom, startMs, endMs)
-	if err != nil {
-		return nil, err
-	}
 
 	rules := make([]metricreductionruletypes.GettableReductionRule, 0, len(domainRules))
 	for _, rule := range domainRules {
-		rules = append(rules, withVolume(toGettableReductionRule(rule), volumes[rule.MetricName], sampleVolumes[rule.MetricName]))
+		rules = append(rules, withVolume(toGettableReductionRule(rule), volumes[rule.MetricName]))
 	}
 
 	return &metricreductionruletypes.GettableReductionRules{Rules: rules, Total: total}, nil
@@ -149,24 +139,13 @@ func (m *module) listSortedByVolume(ctx context.Context, orgID valuer.UUID, para
 		return nil, err
 	}
 
-	pageMetricNames := make([]string, 0, len(ranked))
-	for _, row := range ranked {
-		pageMetricNames = append(pageMetricNames, row.MetricName)
-	}
-
-	// TODO(srikanthccv): do we need to run this query? can we just get the same from RankByVolume?
-	sampleVolumes, err := m.ch.SampleVolumeByMetric(ctx, pageMetricNames, effectiveFrom, startMs, endMs)
-	if err != nil {
-		return nil, err
-	}
-
 	rules := make([]metricreductionruletypes.GettableReductionRule, 0, len(ranked))
 	for _, row := range ranked {
 		rule, ok := ruleByMetric[row.MetricName]
 		if !ok {
 			continue
 		}
-		rules = append(rules, withVolume(toGettableReductionRule(rule), row, sampleVolumes[row.MetricName]))
+		rules = append(rules, withVolume(toGettableReductionRule(rule), row))
 	}
 
 	return &metricreductionruletypes.GettableReductionRules{Rules: rules, Total: total}, nil
@@ -309,17 +288,20 @@ func (m *module) Stats(ctx context.Context, orgID valuer.UUID) (*metricreduction
 	}
 
 	now := time.Now()
-	startMs := now.Add(-statsLookback).UnixMilli()
+	startMs := now.Add(-defaultPreviewLookback).UnixMilli()
 	endMs := now.UnixMilli()
 
-	rules, _, err := m.store.List(ctx, orgID, &metricreductionruletypes.ListReductionRulesParams{})
+	allRules, total, err := m.store.List(ctx, orgID, &metricreductionruletypes.ListReductionRulesParams{})
 	if err != nil {
 		return nil, err
 	}
+	if total == 0 {
+		return &metricreductionruletypes.GettableReductionRuleStats{}, nil
+	}
 
-	metricNames := make([]string, len(rules))
-	effectiveFrom := make(map[string]int64, len(rules))
-	for i, rule := range rules {
+	metricNames := make([]string, len(allRules))
+	effectiveFrom := make(map[string]int64, len(allRules))
+	for i, rule := range allRules {
 		metricNames[i] = rule.MetricName
 		effectiveFrom[rule.MetricName] = rule.EffectiveFrom.UnixMilli()
 	}
@@ -328,43 +310,31 @@ func (m *module) Stats(ctx context.Context, orgID valuer.UUID) (*metricreduction
 	if err != nil {
 		return nil, err
 	}
-	var ruledIngestedSeries, ruledRetainedSeries uint64
-	for _, volume := range volumes {
-		ruledIngestedSeries += volume.Ingested
-		ruledRetainedSeries += effectiveRetained(volume.Ingested, volume.Reduced)
+	var ingestedSeries, retainedSeries uint64
+	reducedMetricNames := make([]string, 0, len(volumes))
+	reducedEffectiveFrom := make(map[string]int64, len(volumes))
+	for name, volume := range volumes {
+		ingestedSeries += volume.Ingested
+		retained := effectiveRetained(volume.Ingested, volume.Reduced)
+		retainedSeries += retained
+		if retained < volume.Ingested {
+			reducedMetricNames = append(reducedMetricNames, name)
+			reducedEffectiveFrom[name] = effectiveFrom[name]
+		}
 	}
 
-	sampleVolumes, err := m.ch.SampleVolumeByMetric(ctx, metricNames, effectiveFrom, startMs, endMs)
-	if err != nil {
-		return nil, err
-	}
-	var ruledIngestedSamples, ruledRetainedSamples uint64
-	for _, sv := range sampleVolumes {
-		ruledIngestedSamples += sv.Ingested
-		ruledRetainedSamples += effectiveRetained(sv.Ingested, sv.Reduced)
-	}
-
-	totalSeries, totalSamples, err := m.ch.TotalVolume(ctx, startMs, endMs)
+	ingestedSamples, reducedSamples, err := m.ch.SampleVolume(ctx, reducedMetricNames, reducedEffectiveFrom, startMs, endMs)
 	if err != nil {
 		return nil, err
 	}
 
 	return &metricreductionruletypes.GettableReductionRuleStats{
-		IngestedSeries:             totalSeries,
-		RetainedSeries:             clampSub(totalSeries, ruledIngestedSeries-ruledRetainedSeries),
-		IngestedSamples:            totalSamples,
-		RetainedSamples:            clampSub(totalSamples, ruledIngestedSamples-ruledRetainedSamples),
-		EstimatedMonthlySavingsUsd: monthlySavingsUSD(ruledIngestedSamples, ruledRetainedSamples, startMs, endMs),
+		IngestedSeries:             ingestedSeries,
+		RetainedSeries:             retainedSeries,
+		EstimatedMonthlySavingsUsd: monthlySavingsUSD(ingestedSamples, reducedSamples, startMs, endMs),
 	}, nil
 }
 
-func clampSub(a, b uint64) uint64 {
-	if a < b {
-		return 0
-	}
-	return a - b
-}
-
 // monthlySavingsUSD extrapolates the windowed sample reduction to a monthly figure at the per-sample
 // list price. Ingested is gated to effective_from upstream, so pre-activation hours don't inflate it.
 func monthlySavingsUSD(ingestedSamples, reducedSamples uint64, startMs, endMs int64) float64 {
@@ -382,7 +352,7 @@ func (m *module) Timeseries(ctx context.Context, orgID valuer.UUID) (*querybuild
 	}
 
 	now := time.Now()
-	startMs := now.Add(-timeseriesLookback).UnixMilli()
+	startMs := now.Add(-defaultPreviewLookback).UnixMilli()
 	endMs := now.UnixMilli()
 
 	allRules, _, err := m.store.List(ctx, orgID, &metricreductionruletypes.ListReductionRulesParams{})
@@ -396,7 +366,18 @@ func (m *module) Timeseries(ctx context.Context, orgID valuer.UUID) (*querybuild
 		effectiveFrom[rule.MetricName] = rule.EffectiveFrom.UnixMilli()
 	}
 
-	points, err := m.ch.SampleTimeseries(ctx, metricNames, effectiveFrom, startMs, endMs)
+	volumes, err := m.ch.VolumeByMetric(ctx, metricNames, effectiveFrom, startMs, endMs)
+	if err != nil {
+		return nil, err
+	}
+	reducedNames := make([]string, 0, len(volumes))
+	for name, volume := range volumes {
+		if effectiveRetained(volume.Ingested, volume.Reduced) < volume.Ingested {
+			reducedNames = append(reducedNames, name)
+		}
+	}
+
+	points, err := m.ch.SeriesTimeseries(ctx, metricNames, reducedNames, effectiveFrom, startMs, endMs)
 	if err != nil {
 		return nil, err
 	}
@@ -433,7 +414,7 @@ func buildVolumeTimeseries(points []volumePoint) *querybuildertypesv5.QueryRange
 }
 
 func (m *module) validateMetricForReduction(ctx context.Context, orgID valuer.UUID, metricName string) error {
-	lastSeen, err := m.metadataStore.FetchLastSeenInfoMulti(ctx, orgID, metricName)
+	lastSeen, err := m.metadataStore.FetchLastSeenInfoMulti(ctx, metricName)
 	if err != nil {
 		return err
 	}
@@ -466,12 +447,12 @@ func (m *module) relatedAssetImpact(ctx context.Context, orgID valuer.UUID, metr
 		m.logger.WarnContext(ctx, "failed to fetch related dashboards for reduction preview", slog.String("metric_name", metricName), errors.Attr(err))
 	} else {
 		for _, item := range dashboards[metricName] {
-			usedLabels := append(append([]string{}, item.GroupBy...), item.FilterBy...)
+			usedLabels := append(splitCSV(item["group_by"]), splitCSV(item["filter_by"])...)
 			affected = append(affected, metricreductionruletypes.AffectedAsset{
 				Type:           metricreductionruletypes.AssetTypeDashboard,
-				ID:             item.DashboardID,
-				Name:           item.DashboardName,
-				Widget:         &metricreductionruletypes.AffectedWidget{ID: item.PanelID, Name: item.PanelName},
+				ID:             item["dashboard_id"],
+				Name:           item["dashboard_name"],
+				Widget:         &metricreductionruletypes.AffectedWidget{ID: item["widget_id"], Name: item["widget_name"]},
 				ImpactedLabels: intersectLabels(usedLabels, droppedSet),
 			})
 		}
@@ -501,7 +482,7 @@ func toGettableReductionRule(rule *metricreductionruletypes.ReductionRule) metri
 		MatchType:     rule.MatchType,
 		Labels:        rule.Labels,
 		EffectiveFrom: rule.EffectiveFrom,
-		Active:        !rule.EffectiveFrom.Add(uiActivationDelay).After(time.Now()),
+		Active:        !rule.EffectiveFrom.After(time.Now()),
 	}
 }
 
@@ -512,11 +493,12 @@ func effectiveRetained(ingested, reduced uint64) uint64 {
 	return reduced
 }
 
-func withVolume(rule metricreductionruletypes.GettableReductionRule, series volumeRow, samples volumeRow) metricreductionruletypes.GettableReductionRule {
-	rule.IngestedSeries = series.Ingested
-	rule.RetainedSeries = effectiveRetained(series.Ingested, series.Reduced)
-	rule.IngestedSamples = samples.Ingested
-	rule.RetainedSamples = effectiveRetained(samples.Ingested, samples.Reduced)
+func withVolume(rule metricreductionruletypes.GettableReductionRule, volume volumeRow) metricreductionruletypes.GettableReductionRule {
+	rule.IngestedSeries = volume.Ingested
+	rule.RetainedSeries = effectiveRetained(volume.Ingested, volume.Reduced)
+	if volume.Ingested > 0 {
+		rule.ReductionPercent = (1 - float64(rule.RetainedSeries)/float64(volume.Ingested)) * 100
+	}
 	return rule
 }
 
@@ -536,6 +518,13 @@ func intersectLabels(keys []string, droppedSet map[string]struct{}) []string {
 	return out
 }
 
+func splitCSV(s string) []string {
+	if s == "" {
+		return nil
+	}
+	return strings.Split(s, ",")
+}
+
 func resolveDroppedKept(matchType metricreductionruletypes.MatchType, ruleLabels, keys []string) (dropped, kept []string) {
 	ruleSet := make(map[string]struct{}, len(ruleLabels))
 	for _, l := range ruleLabels {

ee/modules/metricreductionrule/implmetricreductionrule/store.go

@@ -35,7 +35,7 @@ func (s *store) List(ctx context.Context, orgID valuer.UUID, params *metricreduc
 		Where("org_id = ?", orgID).
 		Order(column + " " + direction)
 	if params.Search != "" {
-		query = query.Where("metric_name LIKE ? ESCAPE '\\'", "%"+s.sqlstore.Formatter().EscapeLikePattern(params.Search)+"%")
+		query = query.Where("metric_name LIKE ?", "%"+params.Search+"%")
 	}
 	if params.MetricName != "" {
 		query = query.Where("metric_name = ?", params.MetricName)

ee/query-service/app/server.go

@@ -64,7 +64,6 @@ func NewServer(config signoz.Config, signoz *signoz.SigNoz) (*Server, error) {
 		signoz.Prometheus,
 		signoz.TelemetryStore.Cluster(),
 		signoz.Cache,
-		signoz.Flagger,
 		nil,
 	)
 

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

@@ -61,7 +61,5 @@
 	"ROLE_DETAILS": "SigNoz | Role Details",
 	"TRACES_FUNNELS_DETAIL": "SigNoz | Funnel",
 	"INTEGRATIONS_DETAIL": "SigNoz | Integration",
-	"PUBLIC_DASHBOARD": "SigNoz | Dashboard",
-	"LLM_OBSERVABILITY_BASE": "SigNoz | LLM Observability",
-	"LLM_OBSERVABILITY_MODEL_PRICING": "SigNoz | Model Pricing"
+	"PUBLIC_DASHBOARD": "SigNoz | Dashboard"
 }

frontend/public/locales/en/titles.json

@@ -86,7 +86,5 @@
 	"ROLE_EDIT": "SigNoz | Edit Role",
 	"TRACES_FUNNELS_DETAIL": "SigNoz | Funnel",
 	"INTEGRATIONS_DETAIL": "SigNoz | Integration",
-	"PUBLIC_DASHBOARD": "SigNoz | Dashboard",
-	"LLM_OBSERVABILITY_BASE": "SigNoz | LLM Observability",
-	"LLM_OBSERVABILITY_MODEL_PRICING": "SigNoz | Model Pricing"
+	"PUBLIC_DASHBOARD": "SigNoz | Dashboard"
 }

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

@@ -18,13 +18,19 @@ import type {
 } from 'react-query';
 
 import type {
+	AuthtypesPatchableRoleDTO,
 	AuthtypesPostableRoleDTO,
 	AuthtypesUpdatableRoleDTO,
+	CoretypesPatchableObjectsDTO,
 	CreateRole201,
 	DeleteRolePathParameters,
+	GetObjects200,
+	GetObjectsPathParameters,
 	GetRole200,
 	GetRolePathParameters,
 	ListRoles200,
+	PatchObjectsPathParameters,
+	PatchRolePathParameters,
 	RenderErrorResponseDTO,
 	UpdateRolePathParameters,
 } from '../sigNoz.schemas';
@@ -359,6 +365,107 @@ export const invalidateGetRole = async (
 	return queryClient;
 };
 
+/**
+ * This endpoint patches a role
+ * @deprecated
+ * @summary Patch role
+ */
+export const patchRole = (
+	{ id }: PatchRolePathParameters,
+	authtypesPatchableRoleDTO?: BodyType<AuthtypesPatchableRoleDTO>,
+	signal?: AbortSignal,
+) => {
+	return GeneratedAPIInstance<void>({
+		url: `/api/v1/roles/${id}`,
+		method: 'PATCH',
+		headers: { 'Content-Type': 'application/json' },
+		data: authtypesPatchableRoleDTO,
+		signal,
+	});
+};
+
+export const getPatchRoleMutationOptions = <
+	TError = ErrorType<RenderErrorResponseDTO>,
+	TContext = unknown,
+>(options?: {
+	mutation?: UseMutationOptions<
+		Awaited<ReturnType<typeof patchRole>>,
+		TError,
+		{
+			pathParams: PatchRolePathParameters;
+			data?: BodyType<AuthtypesPatchableRoleDTO>;
+		},
+		TContext
+	>;
+}): UseMutationOptions<
+	Awaited<ReturnType<typeof patchRole>>,
+	TError,
+	{
+		pathParams: PatchRolePathParameters;
+		data?: BodyType<AuthtypesPatchableRoleDTO>;
+	},
+	TContext
+> => {
+	const mutationKey = ['patchRole'];
+	const { mutation: mutationOptions } = options
+		? options.mutation &&
+			'mutationKey' in options.mutation &&
+			options.mutation.mutationKey
+			? options
+			: { ...options, mutation: { ...options.mutation, mutationKey } }
+		: { mutation: { mutationKey } };
+
+	const mutationFn: MutationFunction<
+		Awaited<ReturnType<typeof patchRole>>,
+		{
+			pathParams: PatchRolePathParameters;
+			data?: BodyType<AuthtypesPatchableRoleDTO>;
+		}
+	> = (props) => {
+		const { pathParams, data } = props ?? {};
+
+		return patchRole(pathParams, data);
+	};
+
+	return { mutationFn, ...mutationOptions };
+};
+
+export type PatchRoleMutationResult = NonNullable<
+	Awaited<ReturnType<typeof patchRole>>
+>;
+export type PatchRoleMutationBody =
+	| BodyType<AuthtypesPatchableRoleDTO>
+	| undefined;
+export type PatchRoleMutationError = ErrorType<RenderErrorResponseDTO>;
+
+/**
+ * @deprecated
+ * @summary Patch role
+ */
+export const usePatchRole = <
+	TError = ErrorType<RenderErrorResponseDTO>,
+	TContext = unknown,
+>(options?: {
+	mutation?: UseMutationOptions<
+		Awaited<ReturnType<typeof patchRole>>,
+		TError,
+		{
+			pathParams: PatchRolePathParameters;
+			data?: BodyType<AuthtypesPatchableRoleDTO>;
+		},
+		TContext
+	>;
+}): UseMutationResult<
+	Awaited<ReturnType<typeof patchRole>>,
+	TError,
+	{
+		pathParams: PatchRolePathParameters;
+		data?: BodyType<AuthtypesPatchableRoleDTO>;
+	},
+	TContext
+> => {
+	return useMutation(getPatchRoleMutationOptions(options));
+};
 /**
  * This endpoint updates a role
  * @summary Update role
@@ -458,3 +565,205 @@ export const useUpdateRole = <
 > => {
 	return useMutation(getUpdateRoleMutationOptions(options));
 };
+/**
+ * Gets all objects connected to the specified role via a given relation type
+ * @summary Get objects for a role by relation
+ */
+export const getObjects = (
+	{ id, relation }: GetObjectsPathParameters,
+	signal?: AbortSignal,
+) => {
+	return GeneratedAPIInstance<GetObjects200>({
+		url: `/api/v1/roles/${id}/relations/${relation}/objects`,
+		method: 'GET',
+		signal,
+	});
+};
+
+export const getGetObjectsQueryKey = ({
+	id,
+	relation,
+}: GetObjectsPathParameters) => {
+	return [`/api/v1/roles/${id}/relations/${relation}/objects`] as const;
+};
+
+export const getGetObjectsQueryOptions = <
+	TData = Awaited<ReturnType<typeof getObjects>>,
+	TError = ErrorType<RenderErrorResponseDTO>,
+>(
+	{ id, relation }: GetObjectsPathParameters,
+	options?: {
+		query?: UseQueryOptions<
+			Awaited<ReturnType<typeof getObjects>>,
+			TError,
+			TData
+		>;
+	},
+) => {
+	const { query: queryOptions } = options ?? {};
+
+	const queryKey =
+		queryOptions?.queryKey ?? getGetObjectsQueryKey({ id, relation });
+
+	const queryFn: QueryFunction<Awaited<ReturnType<typeof getObjects>>> = ({
+		signal,
+	}) => getObjects({ id, relation }, signal);
+
+	return {
+		queryKey,
+		queryFn,
+		enabled: !!(id && relation),
+		...queryOptions,
+	} as UseQueryOptions<Awaited<ReturnType<typeof getObjects>>, TError, TData> & {
+		queryKey: QueryKey;
+	};
+};
+
+export type GetObjectsQueryResult = NonNullable<
+	Awaited<ReturnType<typeof getObjects>>
+>;
+export type GetObjectsQueryError = ErrorType<RenderErrorResponseDTO>;
+
+/**
+ * @summary Get objects for a role by relation
+ */
+
+export function useGetObjects<
+	TData = Awaited<ReturnType<typeof getObjects>>,
+	TError = ErrorType<RenderErrorResponseDTO>,
+>(
+	{ id, relation }: GetObjectsPathParameters,
+	options?: {
+		query?: UseQueryOptions<
+			Awaited<ReturnType<typeof getObjects>>,
+			TError,
+			TData
+		>;
+	},
+): UseQueryResult<TData, TError> & { queryKey: QueryKey } {
+	const queryOptions = getGetObjectsQueryOptions({ id, relation }, options);
+
+	const query = useQuery(queryOptions) as UseQueryResult<TData, TError> & {
+		queryKey: QueryKey;
+	};
+
+	return { ...query, queryKey: queryOptions.queryKey };
+}
+
+/**
+ * @summary Get objects for a role by relation
+ */
+export const invalidateGetObjects = async (
+	queryClient: QueryClient,
+	{ id, relation }: GetObjectsPathParameters,
+	options?: InvalidateOptions,
+): Promise<QueryClient> => {
+	await queryClient.invalidateQueries(
+		{ queryKey: getGetObjectsQueryKey({ id, relation }) },
+		options,
+	);
+
+	return queryClient;
+};
+
+/**
+ * Patches the objects connected to the specified role via a given relation type
+ * @deprecated
+ * @summary Patch objects for a role by relation
+ */
+export const patchObjects = (
+	{ id, relation }: PatchObjectsPathParameters,
+	coretypesPatchableObjectsDTO?: BodyType<CoretypesPatchableObjectsDTO>,
+	signal?: AbortSignal,
+) => {
+	return GeneratedAPIInstance<void>({
+		url: `/api/v1/roles/${id}/relations/${relation}/objects`,
+		method: 'PATCH',
+		headers: { 'Content-Type': 'application/json' },
+		data: coretypesPatchableObjectsDTO,
+		signal,
+	});
+};
+
+export const getPatchObjectsMutationOptions = <
+	TError = ErrorType<RenderErrorResponseDTO>,
+	TContext = unknown,
+>(options?: {
+	mutation?: UseMutationOptions<
+		Awaited<ReturnType<typeof patchObjects>>,
+		TError,
+		{
+			pathParams: PatchObjectsPathParameters;
+			data?: BodyType<CoretypesPatchableObjectsDTO>;
+		},
+		TContext
+	>;
+}): UseMutationOptions<
+	Awaited<ReturnType<typeof patchObjects>>,
+	TError,
+	{
+		pathParams: PatchObjectsPathParameters;
+		data?: BodyType<CoretypesPatchableObjectsDTO>;
+	},
+	TContext
+> => {
+	const mutationKey = ['patchObjects'];
+	const { mutation: mutationOptions } = options
+		? options.mutation &&
+			'mutationKey' in options.mutation &&
+			options.mutation.mutationKey
+			? options
+			: { ...options, mutation: { ...options.mutation, mutationKey } }
+		: { mutation: { mutationKey } };
+
+	const mutationFn: MutationFunction<
+		Awaited<ReturnType<typeof patchObjects>>,
+		{
+			pathParams: PatchObjectsPathParameters;
+			data?: BodyType<CoretypesPatchableObjectsDTO>;
+		}
+	> = (props) => {
+		const { pathParams, data } = props ?? {};
+
+		return patchObjects(pathParams, data);
+	};
+
+	return { mutationFn, ...mutationOptions };
+};
+
+export type PatchObjectsMutationResult = NonNullable<
+	Awaited<ReturnType<typeof patchObjects>>
+>;
+export type PatchObjectsMutationBody =
+	| BodyType<CoretypesPatchableObjectsDTO>
+	| undefined;
+export type PatchObjectsMutationError = ErrorType<RenderErrorResponseDTO>;
+
+/**
+ * @deprecated
+ * @summary Patch objects for a role by relation
+ */
+export const usePatchObjects = <
+	TError = ErrorType<RenderErrorResponseDTO>,
+	TContext = unknown,
+>(options?: {
+	mutation?: UseMutationOptions<
+		Awaited<ReturnType<typeof patchObjects>>,
+		TError,
+		{
+			pathParams: PatchObjectsPathParameters;
+			data?: BodyType<CoretypesPatchableObjectsDTO>;
+		},
+		TContext
+	>;
+}): UseMutationResult<
+	Awaited<ReturnType<typeof patchObjects>>,
+	TError,
+	{
+		pathParams: PatchObjectsPathParameters;
+		data?: BodyType<CoretypesPatchableObjectsDTO>;
+	},
+	TContext
+> => {
+	return useMutation(getPatchObjectsMutationOptions(options));
+};

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

@@ -2230,6 +2230,13 @@ export interface AuthtypesOrgSessionContextDTO {
 	warning?: ErrorsJSONDTO;
 }
 
+export interface AuthtypesPatchableRoleDTO {
+	/**
+	 * @type string
+	 */
+	description: string;
+}
+
 export interface AuthtypesPostableAuthDomainDTO {
 	config?: AuthtypesAuthDomainConfigDTO;
 	/**
@@ -3242,6 +3249,17 @@ export interface CommonJSONRefDTO {
 	$ref?: string;
 }
 
+export interface CoretypesPatchableObjectsDTO {
+	/**
+	 * @type array,null
+	 */
+	additions: CoretypesObjectGroupDTO[] | null;
+	/**
+	 * @type array,null
+	 */
+	deletions: CoretypesObjectGroupDTO[] | null;
+}
+
 export interface DashboardGridItemDTO {
 	content?: CommonJSONRefDTO;
 	/**
@@ -3977,14 +3995,6 @@ export interface DashboardtypesDashboardPanelRefDTO {
 	 * @type string
 	 */
 	dashboardName: string;
-	/**
-	 * @type array
-	 */
-	filterBy?: string[];
-	/**
-	 * @type array
-	 */
-	groupBy?: string[];
 	/**
 	 * @type string
 	 */
@@ -6909,11 +6919,6 @@ export interface MetricreductionruletypesGettableReductionRuleDTO {
 	 * @type string
 	 */
 	id: string;
-	/**
-	 * @type integer
-	 * @minimum 0
-	 */
-	ingestedSamples: number;
 	/**
 	 * @type integer
 	 * @minimum 0
@@ -6929,10 +6934,10 @@ export interface MetricreductionruletypesGettableReductionRuleDTO {
 	 */
 	metricName: string;
 	/**
-	 * @type integer
-	 * @minimum 0
+	 * @type number
+	 * @format double
 	 */
-	retainedSamples: number;
+	reductionPercent: number;
 	/**
 	 * @type integer
 	 * @minimum 0
@@ -6991,21 +6996,11 @@ export interface MetricreductionruletypesGettableReductionRuleStatsDTO {
 	 * @format double
 	 */
 	estimatedMonthlySavingsUsd: number;
-	/**
-	 * @type integer
-	 * @minimum 0
-	 */
-	ingestedSamples: number;
 	/**
 	 * @type integer
 	 * @minimum 0
 	 */
 	ingestedSeries: number;
-	/**
-	 * @type integer
-	 * @minimum 0
-	 */
-	retainedSamples: number;
 	/**
 	 * @type integer
 	 * @minimum 0
@@ -7061,6 +7056,7 @@ export enum MetricreductionruletypesReductionRuleOrderByDTO {
 	metric = 'metric',
 	ingested_volume = 'ingested_volume',
 	reduced_volume = 'reduced_volume',
+	reduction = 'reduction',
 	last_updated = 'last_updated',
 }
 export interface MetricreductionruletypesUpdatableReductionRuleDTO {
@@ -10252,9 +10248,31 @@ export type GetRole200 = {
 	status: string;
 };
 
+export type PatchRolePathParameters = {
+	id: string;
+};
 export type UpdateRolePathParameters = {
 	id: string;
 };
+export type GetObjectsPathParameters = {
+	id: string;
+	relation: string;
+};
+export type GetObjects200 = {
+	/**
+	 * @type array
+	 */
+	data: CoretypesObjectGroupDTO[];
+	/**
+	 * @type string
+	 */
+	status: string;
+};
+
+export type PatchObjectsPathParameters = {
+	id: string;
+	relation: string;
+};
 export type GetAllRoutePolicies200 = {
 	/**
 	 * @type array

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

@@ -1,28 +1,7 @@
-.filtersBar {
-	display: flex;
-	gap: var(--spacing-6);
-	align-items: center;
-	justify-content: space-between;
-}
-
-.filtersBarLeft {
-	display: flex;
-	gap: var(--spacing-6);
-	align-items: center;
-}
-
-.filtersBarSearch {
-	width: 280px;
-}
-
-.filtersBarSource {
-	width: 160px;
-}
-
 .pageError {
 	padding: var(--spacing-6) var(--spacing-8);
 	border-radius: var(--radius-2);
-	background: color-mix(in srgb, var(--accent-cherry) 8%, transparent);
-	color: var(--accent-cherry);
+	background: color-mix(in srgb, var(--bg-cherry-400) 8%, transparent);
+	color: var(--text-cherry-400);
 	font-size: var(--periscope-font-size-base);
 }

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

@@ -1,164 +1,52 @@
 import { useMemo } from 'react';
-import { Button } from '@signozhq/ui/button';
-import { Input } from '@signozhq/ui/input';
-import { SelectSimple } from '@signozhq/ui/select';
-import { Typography } from '@signozhq/ui/typography';
-import { Plus, Search, X } from '@signozhq/icons';
 import { useListLLMPricingRules } from 'api/generated/services/llmpricingrules';
 import { type ListLLMPricingRulesParams } from 'api/generated/services/sigNoz.schemas';
 import { useTableParams } from 'components/TanStackTableView';
-import useComponentPermission from 'hooks/useComponentPermission';
-import useDebounce from 'hooks/useDebounce';
-import { parseAsString, parseAsStringEnum, useQueryState } from 'nuqs';
-import { useAppContext } from 'providers/App/App';
+import { Typography } from '@signozhq/ui/typography';
 
-import {
-	LIMIT_KEY,
-	PAGE_KEY,
-	PAGE_SIZE,
-	SEARCH_DEBOUNCE_MS,
-	SEARCH_KEY,
-	SOURCE_FILTER_OPTIONS,
-	SOURCE_FILTER_TO_IS_OVERRIDE,
-	SOURCE_KEY,
-	type SourceFilter,
-} from '../constants';
-import type { PricingRule } from '../types';
-import DeleteConfirmDialog from './components/DeleteConfirmDialog';
-import ModelCostDrawer, {
-	useModelCostDrawer,
-} from './components/ModelCostDrawer';
-import ModelCostsTable from './components/ModelCostsTable';
-import { useModelCostDelete } from './hooks/useModelCostDelete';
+import { LIMIT_KEY, PAGE_KEY, PAGE_SIZE } from '../constants';
 import styles from './ModelCostTabPanel.module.scss';
+import ModelCostsTable from './components/ModelCostsTable';
+import { type LlmpricingruletypesLLMPricingRuleDTO } from 'api/generated/services/sigNoz.schemas';
 
-// "Model costs" tab: the priced-model listing, search + source filter, the add/
-// edit drawer, and pagination. Page and page size live in the URL (shareable/
-// reload-safe) and are owned by TanStackTable via enableQueryParams — this tab
-// reads them back through the same useTableParams hook so the two stay in lockstep.
 function ModelCostTabPanel(): JSX.Element {
-	const { page, limit, setPage } = useTableParams(
+	const { page, limit } = useTableParams(
 		{ page: PAGE_KEY, limit: LIMIT_KEY },
 		{ page: 1, limit: PAGE_SIZE },
 	);
 
-	const [search, setSearch] = useQueryState(
-		SEARCH_KEY,
-		parseAsString.withDefault(''),
-	);
-	const debouncedSearch = useDebounce(search, SEARCH_DEBOUNCE_MS);
-
-	const [source, setSource] = useQueryState(
-		SOURCE_KEY,
-		parseAsStringEnum<SourceFilter>(
-			SOURCE_FILTER_OPTIONS.map((option) => option.value),
-		).withDefault('all'),
-	);
-
-	const handleSearchChange = (
-		event: React.ChangeEvent<HTMLInputElement>,
-	): void => {
-		void setSearch(event.target.value || null);
-		setPage(1);
-	};
-
-	const clearSearch = (): void => {
-		void setSearch(null);
-		setPage(1);
-	};
-
-	const handleSourceChange = (value: string | string[]): void => {
-		void setSource(value as SourceFilter);
-		setPage(1);
-	};
-
-	const isOverride = SOURCE_FILTER_TO_IS_OVERRIDE[source];
-
+	// Search + source filters are intentionally omitted for now — the list API
+	// doesn't honour them yet. They'll be reintroduced here once it does.
 	const listParams: ListLLMPricingRulesParams = {
 		offset: (page - 1) * limit,
 		limit,
-		...(debouncedSearch ? { q: debouncedSearch } : {}),
-		...(isOverride !== undefined ? { isOverride } : {}),
 	};
 
-	const { data, isLoading, isError } = useListLLMPricingRules(listParams, {
-		query: {
-			enabled: search === debouncedSearch,
-		},
-	});
+	const { data, isLoading, isError } = useListLLMPricingRules(listParams);
 
-	const { user } = useAppContext();
-	const [canManagePricing] = useComponentPermission(
-		['manage_llm_pricing'],
-		user.role,
+	const rules: LlmpricingruletypesLLMPricingRuleDTO[] = useMemo(
+		() => data?.data?.items || [],
+		[data],
 	);
-
-	const rules: PricingRule[] = useMemo(() => data?.data?.items || [], [data]);
 	const total = data?.data?.total ?? 0;
 
-	const drawer = useModelCostDrawer();
-	const deletion = useModelCostDelete();
-
 	return (
 		<>
-			<div className={styles.filtersBar}>
-				<div className={styles.filtersBarLeft}>
-					<Input
-						className={styles.filtersBarSearch}
-						placeholder="Search by model or provider"
-						value={search}
-						onChange={handleSearchChange}
-						prefix={<Search size={14} />}
-						suffix={
-							search ? (
-								<Button
-									variant="ghost"
-									color="secondary"
-									size="icon"
-									prefix={<X size={14} />}
-									onClick={clearSearch}
-									aria-label="Clear search"
-									testId="model-cost-search-clear"
-								/>
-							) : undefined
-						}
-						testId="model-cost-search"
-					/>
-					<SelectSimple
-						className={styles.filtersBarSource}
-						items={SOURCE_FILTER_OPTIONS}
-						value={source}
-						onChange={handleSourceChange}
-						testId="source-filter"
-					/>
-				</div>
-				{canManagePricing && (
-					<Button
-						variant="solid"
-						color="primary"
-						prefix={<Plus size={14} />}
-						onClick={(): void => drawer.openForAdd()}
-						testId="add-model-cost-btn"
-					>
-						Add model cost
-					</Button>
-				)}
-			</div>
-
 			{isError && (
 				<div className={styles.pageError} role="alert">
 					Failed to load pricing rules. Please try again.
 				</div>
 			)}
 
+			{/* Read-only listing. Edit/Add wiring + the drawer land in the next PR. */}
 			<ModelCostsTable
 				rules={rules}
 				isLoading={isLoading}
 				total={total}
-				selectedRuleId={drawer.selectedRuleId}
-				canManage={canManagePricing}
-				onEdit={drawer.openForEdit}
-				onDelete={deletion.requestDelete}
+				selectedRuleId={null}
+				canManage={false}
+				onEdit={(): void => undefined}
+				onDelete={(): void => undefined}
 			/>
 
 			<footer>
@@ -166,29 +54,6 @@ function ModelCostTabPanel(): JSX.Element {
 					All prices per 1M tokens (USD)
 				</Typography.Text>
 			</footer>
-
-			{drawer.isOpen && (
-				<ModelCostDrawer
-					isOpen={drawer.isOpen}
-					mode={drawer.mode}
-					initialDraft={drawer.initialDraft}
-					onClose={drawer.close}
-					onSave={drawer.save}
-					isSaving={drawer.isSaving}
-					saveError={drawer.saveError}
-					canManage={canManagePricing}
-				/>
-			)}
-
-			{deletion.pendingDelete && (
-				<DeleteConfirmDialog
-					open
-					modelName={deletion.pendingDelete.modelName}
-					isDeleting={deletion.isDeleting}
-					onConfirm={deletion.confirmDelete}
-					onCancel={deletion.cancelDelete}
-				/>
-			)}
 		</>
 	);
 }

frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/DeleteConfirmDialog/DeleteConfirmDialog.tsx

@@ -1,64 +0,0 @@
-import { AlertDialog } from '@signozhq/ui/alert-dialog';
-import { Button } from '@signozhq/ui/button';
-import { Trash2, X } from '@signozhq/icons';
-
-interface DeleteConfirmDialogProps {
-	open: boolean;
-	modelName: string;
-	isDeleting: boolean;
-	onConfirm: () => void;
-	onCancel: () => void;
-}
-
-// Confirmation step before deleting a model cost — deletion is irreversible, so
-// the destructive action is gated behind an explicit confirm. AlertDialog blocks
-// outside-click dismissal and hides the close button to force an explicit choice.
-function DeleteConfirmDialog({
-	open,
-	modelName,
-	isDeleting,
-	onConfirm,
-	onCancel,
-}: DeleteConfirmDialogProps): JSX.Element {
-	return (
-		<AlertDialog
-			open={open}
-			onOpenChange={(isOpen): void => {
-				if (!isOpen) {
-					onCancel();
-				}
-			}}
-			width="narrow"
-			title="Delete Model Cost Data "
-			titleIcon={<Trash2 size={16} />}
-			footer={
-				<>
-					<Button
-						variant="solid"
-						color="secondary"
-						onClick={onCancel}
-						prefix={<X size={12} />}
-						testId="drawer-delete-cancel-btn"
-					>
-						Cancel
-					</Button>
-					<Button
-						variant="solid"
-						color="destructive"
-						loading={isDeleting}
-						onClick={onConfirm}
-						prefix={<Trash2 size={12} />}
-						testId="drawer-delete-confirm-btn"
-					>
-						Delete
-					</Button>
-				</>
-			}
-		>
-			Are you sure you want to delete <strong>{modelName}</strong>? Once deleted,
-			this action cannot be undone.
-		</AlertDialog>
-	);
-}
-
-export default DeleteConfirmDialog;

frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/DeleteConfirmDialog/index.ts

@@ -1 +0,0 @@
-export { default } from './DeleteConfirmDialog';

frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostDrawer/ModelCostDrawer.module.scss

@@ -1,58 +0,0 @@
-.drawerSection {
-	composes: drawerSection from './shared.module.scss';
-}
-
-.fullWidth {
-	width: 100%;
-}
-
-.required {
-	composes: required from './shared.module.scss';
-}
-
-.modelCostDrawer {
-	// Uniform horizontal padding across header / body / footer. The header and
-	// footer read these dialog vars; the body (rendered in drawer-description)
-	// is set directly below.
-	--dialog-header-padding: var(--spacing-10) var(--spacing-12);
-	--dialog-footer-padding: var(--spacing-8) var(--spacing-12);
-
-	display: flex;
-	overflow-y: auto;
-
-	// The drawer body — children render inside [data-slot='drawer-description']
-	// (this is the @signozhq drawer, not antd, so .ant-drawer-body was a no-op).
-	[data-slot='drawer-description'] {
-		display: flex;
-		flex-direction: column;
-		gap: var(--spacing-12);
-		padding: var(--spacing-10) var(--spacing-12);
-	}
-
-	[data-slot='select-content'] {
-		width: var(--radix-select-trigger-width);
-	}
-}
-
-.title {
-	h3 {
-		margin: 0;
-		font-size: var(--periscope-font-size-medium);
-		font-weight: var(--font-weight-semibold);
-	}
-
-	p {
-		margin: var(--spacing-2) 0 0;
-		color: var(--l3-foreground);
-		font-size: 12px;
-	}
-}
-
-.footer {
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	// Horizontal padding is provided by the drawer-footer slot var above.
-	padding: 0;
-	width: 100%;
-}

frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostDrawer/ModelCostDrawer.tsx

@@ -1,238 +0,0 @@
-import { Button } from '@signozhq/ui/button';
-import { DrawerWrapper } from '@signozhq/ui/drawer';
-import { Input } from '@signozhq/ui/input';
-import { SelectSimple } from '@signozhq/ui/select';
-import { Typography } from '@signozhq/ui/typography';
-import { Controller, useForm } from 'react-hook-form';
-
-import PatternEditor from './components/PatternEditor';
-import PricingFields from './components/PricingFields';
-import SourceSelector from './components/SourceSelector';
-import { PROVIDER_OPTIONS } from '../../../constants';
-import styles from './ModelCostDrawer.module.scss';
-import {
-	validateModelName,
-	validatePricing,
-	validateProvider,
-} from '../../../utils';
-import type { DrawerDraft, DrawerMode } from '../../../types';
-
-interface ModelCostDrawerProps {
-	isOpen: boolean;
-	mode: DrawerMode;
-	initialDraft: DrawerDraft;
-	onClose: () => void;
-	onSave: (draft: DrawerDraft) => void;
-	isSaving: boolean;
-	saveError: string | null;
-	canManage: boolean;
-}
-
-function ModelCostDrawer({
-	isOpen,
-	mode,
-	initialDraft,
-	onClose,
-	onSave,
-	isSaving,
-	saveError,
-	canManage,
-}: ModelCostDrawerProps): JSX.Element {
-	// Default mode validates on submit, then re-validates on change — so we don't
-	// flag empty fields before the user has tried to save, but errors clear live
-	// once they start fixing them.
-	const {
-		control,
-		handleSubmit,
-		watch,
-		formState: { isDirty },
-	} = useForm<DrawerDraft>({
-		defaultValues: initialDraft,
-	});
-
-	const isOverride = watch('isOverride');
-
-	// Metadata (model id / provider / patterns / source) is editable by any
-	// manager. Pricing fields are editable only once the user picks "User
-	// override" — auto-populated pricing is managed by SigNoz. Write APIs are
-	// Admin-only, so non-managers can't edit anything.
-	const metadataReadOnly = !canManage;
-	const pricingReadOnly = !canManage || !isOverride;
-
-	// Non-managers can only view (write APIs are Admin-only), so the drawer is a
-	// read-only "View" rather than "Edit"/"Add".
-	let drawerTitle = 'Add model cost';
-	if (!canManage) {
-		drawerTitle = 'View model cost';
-	} else if (mode === 'edit') {
-		drawerTitle = 'Edit model cost';
-	}
-
-	const footer = (
-		<div className={styles.footer}>
-			<Button
-				variant="outlined"
-				color="secondary"
-				onClick={onClose}
-				testId="drawer-cancel-btn"
-			>
-				{canManage ? 'Cancel' : 'Close'}
-			</Button>
-			{canManage && (
-				<Button
-					variant="solid"
-					color="primary"
-					onClick={handleSubmit(onSave)}
-					disabled={!isDirty}
-					loading={isSaving}
-					testId="drawer-save-btn"
-				>
-					Save
-				</Button>
-			)}
-		</div>
-	);
-
-	return (
-		<DrawerWrapper
-			open={isOpen}
-			onOpenChange={(open): void => {
-				if (!open) {
-					onClose();
-				}
-			}}
-			direction="right"
-			width="base"
-			className={styles.modelCostDrawer}
-			footer={footer}
-			title={drawerTitle}
-			drawerHeaderProps={{ className: styles.title }}
-		>
-			<div className={styles.drawerSection}>
-				<label htmlFor="billing-model-id">
-					Billing model ID{' '}
-					<span className={styles.required} aria-hidden="true">
-						*
-					</span>
-				</label>
-				<Controller
-					name="modelName"
-					control={control}
-					rules={{
-						validate: (value): true | string => validateModelName(value, mode),
-					}}
-					render={({ field, fieldState }): JSX.Element => (
-						<>
-							<Input
-								id="billing-model-id"
-								placeholder="e.g. openai:gpt-4o"
-								required
-								value={field.value}
-								disabled={mode === 'edit' || metadataReadOnly}
-								aria-invalid={!!fieldState.error}
-								onChange={(e): void => field.onChange(e.target.value)}
-								testId="drawer-model-id-input"
-							/>
-							{fieldState.error && (
-								<Typography.Text as="p" size="small" color="danger" role="alert">
-									{fieldState.error.message}
-								</Typography.Text>
-							)}
-						</>
-					)}
-				/>
-			</div>
-
-			<div className={styles.drawerSection}>
-				<label htmlFor="provider-select">Provider</label>
-				<Controller
-					name="provider"
-					control={control}
-					rules={{ validate: validateProvider }}
-					render={({ field, fieldState }): JSX.Element => (
-						<>
-							<SelectSimple
-								id="provider-select"
-								value={field.value}
-								onChange={(value): void => field.onChange(value as string)}
-								items={PROVIDER_OPTIONS}
-								disabled={mode === 'edit' || metadataReadOnly}
-								className={styles.fullWidth}
-								withPortal={false}
-								testId="drawer-provider-select"
-							/>
-							{fieldState.error && (
-								<Typography.Text size="small" color="danger" role="alert">
-									{fieldState.error.message}
-								</Typography.Text>
-							)}
-						</>
-					)}
-				/>
-			</div>
-
-			<Controller
-				name="patterns"
-				control={control}
-				render={({ field }): JSX.Element => (
-					<PatternEditor
-						patterns={field.value}
-						isReadOnly={metadataReadOnly}
-						onChange={field.onChange}
-					/>
-				)}
-			/>
-
-			{/* Source is auto vs. override — a choice only a manager can make, so
-			    there's nothing to show a read-only viewer. */}
-			{canManage && (
-				<Controller
-					name="isOverride"
-					control={control}
-					// Pricing requirements depend on this toggle, so re-validate pricing
-					// whenever the source changes (clears/sets the pricing error).
-					rules={{ deps: ['pricing'] }}
-					render={({ field }): JSX.Element => (
-						<SourceSelector
-							isOverride={field.value}
-							isReadOnly={metadataReadOnly}
-							disableAuto={mode === 'add' || !initialDraft.sourceId}
-							onChange={field.onChange}
-						/>
-					)}
-				/>
-			)}
-
-			<Controller
-				name="pricing"
-				control={control}
-				rules={{
-					validate: (value, values): true | string =>
-						validatePricing(value, values.isOverride),
-				}}
-				render={({ field, fieldState }): JSX.Element => (
-					<>
-						<PricingFields
-							pricing={field.value}
-							isReadOnly={pricingReadOnly}
-							onChange={(patch): void => field.onChange({ ...field.value, ...patch })}
-						/>
-						{fieldState.error && (
-							<Typography.Text as="p" size="small" color="danger" role="alert">
-								{fieldState.error.message}
-							</Typography.Text>
-						)}
-					</>
-				)}
-			/>
-
-			{saveError && (
-				<Typography.Text as="p" size="small" color="danger" role="alert">
-					{saveError}
-				</Typography.Text>
-			)}
-		</DrawerWrapper>
-	);
-}
-
-export default ModelCostDrawer;

frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostDrawer/components/ExtraPricingBuckets/ExtraPricingBuckets.module.scss

@@ -1,69 +0,0 @@
-.drawerSection {
-	composes: drawerSection from '../../shared.module.scss';
-}
-
-.fullWidth {
-	width: 100%;
-}
-
-.pricingField {
-	composes: pricingField from '../../shared.module.scss';
-}
-
-.cacheModeField {
-	margin-top: var(--spacing-5);
-}
-
-.extraBucketsSection {
-	margin-top: var(--spacing-7);
-	gap: var(--spacing-5);
-}
-
-.extraBucketsSectionHead {
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-}
-
-.bucketRow {
-	display: flex;
-	align-items: center;
-	gap: var(--spacing-2);
-
-	input {
-		flex: 1 auto auto;
-		min-width: 0;
-	}
-}
-
-.bucketRowName {
-	flex: 0 0 110px;
-}
-
-.bucketAddBtn {
-	width: 100%;
-}
-
-.bucketPicker {
-	display: flex;
-	flex-direction: column;
-	align-items: flex-start;
-	gap: var(--spacing-5);
-	padding: var(--spacing-6);
-	border-radius: 6px;
-	background: var(--l2-background);
-	border: 1px solid var(--l2-border);
-}
-
-.bucketPickerTitle {
-	font-size: var(--periscope-font-size-small);
-	text-transform: uppercase;
-	letter-spacing: 0.04em;
-	color: var(--l3-foreground);
-}
-
-.bucketPickerChips {
-	display: flex;
-	flex-wrap: wrap;
-	gap: var(--spacing-4);
-}

frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostDrawer/components/ExtraPricingBuckets/ExtraPricingBuckets.tsx

@@ -1,179 +0,0 @@
-import { useState } from 'react';
-import { Button } from '@signozhq/ui/button';
-import { Input } from '@signozhq/ui/input';
-import { SelectSimple } from '@signozhq/ui/select';
-import { Typography } from '@signozhq/ui/typography';
-import { Plus, Trash2 } from '@signozhq/icons';
-import { LlmpricingruletypesLLMPricingRuleCacheModeDTO as CacheModeDTO } from 'api/generated/services/sigNoz.schemas';
-import cx from 'classnames';
-
-import { CACHE_BUCKETS, CACHE_MODE_OPTIONS } from '../../../../../constants';
-import styles from './ExtraPricingBuckets.module.scss';
-import { parsePricingAmount } from '../../../../../utils';
-import type { CacheBucketKey, DrawerDraft } from '../../../../../types';
-import { Tooltip } from 'antd';
-
-type Pricing = DrawerDraft['pricing'];
-
-interface ExtraPricingBucketsProps {
-	pricing: Pricing;
-	isReadOnly: boolean;
-	onChange: (patch: Partial<Pricing>) => void;
-}
-
-function ExtraPricingBuckets({
-	pricing,
-	isReadOnly,
-	onChange,
-}: ExtraPricingBucketsProps): JSX.Element {
-	const [isExtraPricingBucketOpen, setIsExtraPricingBucketOpen] =
-		useState<boolean>(false);
-
-	// Track which buckets are shown separately from their value, so a freshly
-	// added bucket can start blank (value null) instead of being seeded to 0.
-	// Seeded from buckets that already carry a value (edit mode).
-	const [addedKeys, setAddedKeys] = useState<Set<CacheBucketKey>>(
-		() =>
-			new Set(
-				CACHE_BUCKETS.filter((b) => pricing[b.key] !== null).map((b) => b.key),
-			),
-	);
-
-	const addedBuckets = CACHE_BUCKETS.filter((b) => addedKeys.has(b.key));
-	const availableBuckets = CACHE_BUCKETS.filter((b) => !addedKeys.has(b.key));
-	const patchBucket = (key: CacheBucketKey, value: number | null): void => {
-		const patch: Partial<Pricing> = { [key]: value };
-		onChange(patch);
-	};
-
-	const addBucket = (key: CacheBucketKey): void => {
-		// Leave the value null so the field renders blank until the user types.
-		setAddedKeys((prev) => new Set(prev).add(key));
-		// Close the picker once nothing is left to add.
-		if (availableBuckets.length <= 1) {
-			setIsExtraPricingBucketOpen(false);
-		}
-	};
-
-	const removeBucket = (key: CacheBucketKey): void => {
-		setAddedKeys((prev) => {
-			const next = new Set(prev);
-			next.delete(key);
-			return next;
-		});
-		patchBucket(key, null);
-	};
-
-	return (
-		<div className={cx(styles.extraBucketsSection, styles.drawerSection)}>
-			<div className={styles.extraBucketsSectionHead}>
-				<Typography.Text as="span" size="small" color="muted">
-					Extra pricing buckets
-				</Typography.Text>
-				<Typography.Text as="span" size="small" color="muted">
-					optional
-				</Typography.Text>
-			</div>
-
-			{addedBuckets.map((bucket) => (
-				<div className={styles.bucketRow} key={bucket.key}>
-					<Typography.Text as="span" className={styles.bucketRowName}>
-						{bucket.label}
-					</Typography.Text>
-					<Input
-						type="number"
-						min={0}
-						step={0.01}
-						value={pricing[bucket.key] ?? ''}
-						disabled={isReadOnly}
-						onChange={(e): void =>
-							// Clearing the field is allowed — the row stays mounted because
-							// presence is tracked in `addedKeys`, not the value. Removal is
-							// explicit via the trash button.
-							patchBucket(bucket.key, parsePricingAmount(e.target.value))
-						}
-						testId={`drawer-${bucket.testId}-cost`}
-					/>
-					<Tooltip title="Pricing per 1M tokens" placement="left">
-						<Typography.Text size="xs" color="muted">
-							1M
-						</Typography.Text>
-					</Tooltip>
-
-					{!isReadOnly && (
-						<Button
-							size="icon"
-							variant="ghost"
-							color="destructive"
-							onClick={(): void => removeBucket(bucket.key)}
-							aria-label={`Remove ${bucket.label}`}
-							data-testid={`drawer-remove-${bucket.testId}`}
-							prefix={<Trash2 size={14} />}
-						/>
-					)}
-				</div>
-			))}
-
-			{addedBuckets.length > 0 && (
-				<div className={cx(styles.pricingField, styles.cacheModeField)}>
-					<label htmlFor="cache-mode">Cache mode</label>
-					<SelectSimple
-						id="cache-mode"
-						value={pricing.cacheMode}
-						items={CACHE_MODE_OPTIONS}
-						onChange={(v): void => onChange({ cacheMode: v as CacheModeDTO })}
-						disabled={isReadOnly}
-						className={styles.fullWidth}
-						withPortal={false}
-						testId="drawer-cache-mode"
-					/>
-				</div>
-			)}
-
-			{!isReadOnly && !isExtraPricingBucketOpen && availableBuckets.length > 0 && (
-				<Button
-					variant="dashed"
-					color="secondary"
-					className={styles.bucketAddBtn}
-					prefix={<Plus size={14} />}
-					onClick={(): void => setIsExtraPricingBucketOpen(true)}
-					testId="drawer-add-bucket-btn"
-				>
-					Add pricing bucket
-				</Button>
-			)}
-
-			{!isReadOnly && isExtraPricingBucketOpen && (
-				<div className={styles.bucketPicker} data-testid="drawer-bucket-picker">
-					<div className={styles.bucketPickerTitle}>Add a pricing bucket</div>
-					<div className={styles.bucketPickerChips}>
-						{availableBuckets.map((bucket) => (
-							<Button
-								key={bucket.key}
-								variant="outlined"
-								color="secondary"
-								size="sm"
-								prefix={<Plus size={12} />}
-								onClick={(): void => addBucket(bucket.key)}
-								testId={`drawer-add-bucket-${bucket.testId}`}
-							>
-								{bucket.label}
-							</Button>
-						))}
-					</div>
-					<Button
-						variant="ghost"
-						color="secondary"
-						size="sm"
-						onClick={(): void => setIsExtraPricingBucketOpen(false)}
-						testId="drawer-add-bucket-cancel"
-					>
-						Cancel
-					</Button>
-				</div>
-			)}
-		</div>
-	);
-}
-
-export default ExtraPricingBuckets;

frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostDrawer/components/ExtraPricingBuckets/index.ts

@@ -1 +0,0 @@
-export { default } from './ExtraPricingBuckets';

frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostDrawer/components/PatternEditor/PatternEditor.module.scss

@@ -1,49 +0,0 @@
-.drawerSection {
-	composes: drawerSection from '../../shared.module.scss';
-}
-
-.help {
-	composes: help from '../../shared.module.scss';
-}
-
-.patternBox {
-	display: flex;
-	flex-direction: column;
-	gap: var(--spacing-6);
-	padding: var(--spacing-6);
-	border-radius: 6px;
-	border: 1px solid var(--l2-border);
-}
-
-.patternChips {
-	display: flex;
-	flex-wrap: wrap;
-	gap: var(--spacing-3);
-	min-height: 28px;
-}
-
-.patternChip {
-	display: inline-flex;
-	align-items: center;
-	gap: var(--spacing-2);
-}
-
-.patternChipRemove {
-	background: transparent;
-	border: none;
-	padding: 0;
-	margin-left: 2px;
-	cursor: pointer;
-	color: inherit;
-	display: inline-flex;
-	align-items: center;
-
-	&:hover {
-		color: var(--accent-cherry);
-	}
-}
-
-.patternAdd {
-	display: flex;
-	gap: var(--spacing-3);
-}

frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostDrawer/components/PatternEditor/PatternEditor.tsx

@@ -1,102 +0,0 @@
-import { useState } from 'react';
-import { Badge } from '@signozhq/ui/badge';
-import { Button } from '@signozhq/ui/button';
-import { Input } from '@signozhq/ui/input';
-import { Typography } from '@signozhq/ui/typography';
-import { X } from '@signozhq/icons';
-
-import styles from './PatternEditor.module.scss';
-
-interface PatternEditorProps {
-	patterns: string[];
-	isReadOnly: boolean;
-	onChange: (patterns: string[]) => void;
-}
-
-// Model-name prefix patterns as removable chips + an add input.
-function PatternEditor({
-	patterns,
-	isReadOnly,
-	onChange,
-}: PatternEditorProps): JSX.Element {
-	const [patternInput, setPatternInput] = useState<string>('');
-
-	const addPattern = (): void => {
-		const next = patternInput.trim();
-		if (!next || patterns.includes(next)) {
-			setPatternInput('');
-			return;
-		}
-		onChange([...patterns, next]);
-		setPatternInput('');
-	};
-
-	const removePattern = (pattern: string): void => {
-		onChange(patterns.filter((p) => p !== pattern));
-	};
-
-	return (
-		<div className={styles.drawerSection}>
-			<Typography.Text as="span">
-				Model name patterns{' '}
-				<Typography.Text as="span" color="muted">
-					(prefix match)
-				</Typography.Text>
-			</Typography.Text>
-			<div className={styles.patternBox}>
-				<div className={styles.patternChips}>
-					{patterns.map((pattern) => (
-						<Badge
-							key={pattern}
-							color="vanilla"
-							variant="outline"
-							className={styles.patternChip}
-						>
-							{pattern}*
-							{!isReadOnly && (
-								<button
-									type="button"
-									aria-label={`Remove pattern ${pattern}`}
-									className={styles.patternChipRemove}
-									onClick={(): void => removePattern(pattern)}
-								>
-									<X size={10} />
-								</button>
-							)}
-						</Badge>
-					))}
-				</div>
-				{!isReadOnly && (
-					<div className={styles.patternAdd}>
-						<Input
-							placeholder="Add pattern…"
-							value={patternInput}
-							onChange={(e): void => setPatternInput(e.target.value)}
-							onKeyDown={(e): void => {
-								if (e.key === 'Enter') {
-									e.preventDefault();
-									addPattern();
-								}
-							}}
-							testId="drawer-pattern-input"
-						/>
-						<Button
-							variant="outlined"
-							color="secondary"
-							onClick={addPattern}
-							testId="drawer-pattern-add-btn"
-						>
-							+ Add
-						</Button>
-					</div>
-				)}
-			</div>
-			<Typography.Text as="p" size="small" color="muted">
-				Each pattern uses <strong>prefix matching</strong> against{' '}
-				<code>gen_ai.request.model</code>.
-			</Typography.Text>
-		</div>
-	);
-}
-
-export default PatternEditor;

frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostDrawer/components/PatternEditor/index.ts

@@ -1 +0,0 @@
-export { default } from './PatternEditor';

frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostDrawer/components/PricingFields/PricingFields.module.scss

@@ -1,31 +0,0 @@
-.drawerSection {
-	composes: drawerSection from '../../shared.module.scss';
-}
-
-.drawerSurface {
-	composes: drawerSurface from '../../shared.module.scss';
-}
-
-.drawerSurfaceHead {
-	composes: drawerSurfaceHead from '../../shared.module.scss';
-}
-
-.managedLabel {
-	display: flex;
-	align-items: center;
-	gap: var(--spacing-2);
-}
-
-.pricingField {
-	composes: pricingField from '../../shared.module.scss';
-}
-
-.required {
-	composes: required from '../../shared.module.scss';
-}
-
-.pricingGrid {
-	display: grid;
-	grid-template-columns: 1fr 1fr;
-	gap: var(--spacing-6);
-}

frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostDrawer/components/PricingFields/PricingFields.tsx

@@ -1,91 +0,0 @@
-import { Input } from '@signozhq/ui/input';
-import { Lock } from '@signozhq/icons';
-import cx from 'classnames';
-
-import ExtraPricingBuckets from '../ExtraPricingBuckets';
-import styles from './PricingFields.module.scss';
-import { parsePricingAmount } from '../../../../../utils';
-import type { DrawerDraft } from '../../../../../types';
-import { Typography } from '@signozhq/ui/typography';
-
-type Pricing = DrawerDraft['pricing'];
-
-interface PricingFieldsProps {
-	pricing: Pricing;
-	isReadOnly: boolean;
-	onChange: (patch: Partial<Pricing>) => void;
-}
-
-function PricingFields({
-	pricing,
-	isReadOnly,
-	onChange,
-}: PricingFieldsProps): JSX.Element {
-	return (
-		<div className={cx(styles.drawerSection, styles.drawerSurface)}>
-			<div className={styles.drawerSurfaceHead}>
-				<Typography.Text size="base" weight="bold">
-					Pricing (per 1M tokens, USD)
-				</Typography.Text>
-
-				{isReadOnly && (
-					<span className={styles.managedLabel} data-testid="drawer-readonly-label">
-						<Lock size={12} />
-
-						<Typography.Text color="muted">Read-only</Typography.Text>
-					</span>
-				)}
-			</div>
-			<div className={styles.pricingGrid}>
-				<div className={styles.pricingField}>
-					<label htmlFor="input-cost">
-						Input cost{' '}
-						<span className={styles.required} aria-hidden="true">
-							*
-						</span>
-					</label>
-					<Input
-						id="input-cost"
-						type="number"
-						step={0.01}
-						required
-						value={pricing.input ?? ''}
-						disabled={isReadOnly}
-						onChange={(e): void =>
-							onChange({ input: parsePricingAmount(e.target.value) })
-						}
-						testId="drawer-input-cost"
-					/>
-				</div>
-				<div className={styles.pricingField}>
-					<label htmlFor="output-cost">
-						Output cost{' '}
-						<span className={styles.required} aria-hidden="true">
-							*
-						</span>
-					</label>
-					<Input
-						id="output-cost"
-						type="number"
-						step={0.01}
-						required
-						value={pricing.output ?? ''}
-						disabled={isReadOnly}
-						onChange={(e): void =>
-							onChange({ output: parsePricingAmount(e.target.value) })
-						}
-						testId="drawer-output-cost"
-					/>
-				</div>
-			</div>
-
-			<ExtraPricingBuckets
-				pricing={pricing}
-				isReadOnly={isReadOnly}
-				onChange={onChange}
-			/>
-		</div>
-	);
-}
-
-export default PricingFields;

frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostDrawer/components/PricingFields/index.ts

@@ -1 +0,0 @@
-export { default } from './PricingFields';

frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostDrawer/components/SourceSelector/SourceSelector.module.scss

@@ -1,115 +0,0 @@
-.drawerSection {
-	composes: drawerSection from '../../shared.module.scss';
-}
-
-.drawerSurface {
-	composes: drawerSurface from '../../shared.module.scss';
-}
-
-.drawerSurfaceHead {
-	composes: drawerSurfaceHead from '../../shared.module.scss';
-}
-
-.managedLabel {
-	composes: managedLabel from '../../shared.module.scss';
-}
-
-.sourceRadioGroup {
-	--radio-group-item-border-color: var(--l2-border);
-
-	display: flex;
-	flex-direction: column;
-	gap: var(--spacing-4);
-	width: 100%;
-	.sourceRadio {
-		display: flex;
-		flex-direction: row;
-		align-items: flex-start;
-		justify-content: flex-start;
-		gap: var(--spacing-5);
-		padding: var(--spacing-5) var(--spacing-6);
-		border-radius: var(--radius-2);
-		border: 1px solid transparent;
-		background: var(--l3-background);
-		margin: 0;
-		width: 100%;
-		// Include padding + border in the 100% width so the card fits inside
-		// the SOURCE surface instead of overflowing its right edge.
-		box-sizing: border-box;
-		cursor: pointer;
-		transition:
-			background-color 0.12s ease,
-			border-color 0.12s ease;
-
-		// The radio button itself: keep it fixed-size and aligned with the title
-		// baseline (margin-top compensates for align-items: flex-start vs the
-		// title's line-box).
-		> button[role='radio'] {
-			flex: 0 0 16px;
-			width: 16px;
-			height: 16px;
-			margin-top: 3px;
-		}
-
-		// The library wraps children in a <label>. Make it grow into the
-		// remaining width and reset the .drawerSection label typography leak
-		// (set earlier in this file) so the title/desc divs use their own styles.
-		> label {
-			flex: 1 1 auto;
-			min-width: 0;
-			display: block;
-			text-align: left;
-			cursor: pointer;
-			font-size: inherit;
-			font-weight: inherit;
-			color: inherit;
-		}
-
-		// Radix RadioGroupItem renders <button data-state="checked|unchecked">.
-		// Use :has() to highlight the wrapper card when its inner button is checked.
-		&.sourceRadioAuto:has(button[data-state='checked']) {
-			background: color-mix(in srgb, var(--accent-primary) 10%, transparent);
-			border-color: color-mix(in srgb, var(--accent-primary) 30%, transparent);
-		}
-
-		&.sourceRadioOverride:has(button[data-state='checked']) {
-			background: color-mix(in srgb, var(--accent-amber) 10%, transparent);
-			border-color: color-mix(in srgb, var(--accent-amber) 30%, transparent);
-		}
-
-		&:hover {
-			background: var(--l3-background-hover);
-		}
-	}
-}
-
-.sourceRadioTitle {
-	font-weight: var(--font-weight-semibold);
-	font-size: var(--periscope-font-size-base);
-	color: var(--l1-foreground);
-}
-
-.sourceRadioDesc {
-	margin-top: 2px;
-	font-size: 12px;
-	color: var(--l3-foreground);
-}
-
-.resetConfirm {
-	margin-top: var(--spacing-6);
-	padding: var(--spacing-6);
-	border-radius: var(--radius-2);
-	background: color-mix(in srgb, var(--accent-primary) 6%, transparent);
-	border: 1px solid color-mix(in srgb, var(--accent-primary) 20%, transparent);
-
-	p {
-		margin: 0 0 var(--spacing-5);
-		font-size: 12px;
-	}
-}
-
-.resetConfirmActions {
-	display: flex;
-	gap: var(--spacing-4);
-	justify-content: flex-end;
-}

frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostDrawer/components/SourceSelector/SourceSelector.tsx

@@ -1,115 +0,0 @@
-import { useState } from 'react';
-import { Button } from '@signozhq/ui/button';
-import { RadioGroup, RadioGroupItem } from '@signozhq/ui/radio-group';
-import { Lock } from '@signozhq/icons';
-import { Typography } from '@signozhq/ui/typography';
-import cx from 'classnames';
-
-import styles from './SourceSelector.module.scss';
-
-interface SourceSelectorProps {
-	isOverride: boolean;
-	isReadOnly: boolean;
-	disableAuto?: boolean;
-	onChange: (isOverride: boolean) => void;
-}
-
-// Auto-populated vs user-override selector, with a confirm step before
-// discarding custom values back to defaults.
-function SourceSelector({
-	isOverride,
-	isReadOnly,
-	disableAuto = false,
-	onChange,
-}: SourceSelectorProps): JSX.Element {
-	const [showResetConfirm, setShowResetConfirm] = useState<boolean>(false);
-
-	const handleSourceChange = (value: 'auto' | 'override'): void => {
-		if (value === 'auto' && isOverride) {
-			setShowResetConfirm(true);
-			return;
-		}
-		if (value === 'override' && !isOverride) {
-			onChange(true);
-		}
-	};
-
-	const confirmReset = (): void => {
-		onChange(false);
-		setShowResetConfirm(false);
-	};
-
-	return (
-		<div className={cx(styles.drawerSection, styles.drawerSurface)}>
-			<div className={styles.drawerSurfaceHead}>
-				<Typography.Text weight="bold" size="base">
-					Source
-				</Typography.Text>
-
-				{isReadOnly && (
-					<span className={styles.managedLabel} data-testid="drawer-managed-label">
-						<Lock size={12} />
-						Managed by SigNoz
-					</span>
-				)}
-			</div>
-			<RadioGroup
-				value={isOverride ? 'override' : 'auto'}
-				onChange={(value): void => handleSourceChange(value as 'auto' | 'override')}
-				className={styles.sourceRadioGroup}
-			>
-				<RadioGroupItem
-					value="auto"
-					containerClassName={cx(styles.sourceRadio, styles.sourceRadioAuto)}
-					testId="drawer-source-auto"
-					disabled={disableAuto}
-				>
-					<div className={styles.sourceRadioTitle}>Auto-populated</div>
-					<div className={styles.sourceRadioDesc}>
-						{disableAuto
-							? 'Available once SigNoz has default pricing for this model.'
-							: 'Default pricing from SigNoz.'}
-					</div>
-				</RadioGroupItem>
-				<RadioGroupItem
-					value="override"
-					containerClassName={cx(styles.sourceRadio, styles.sourceRadioOverride)}
-					testId="drawer-source-override"
-				>
-					<div className={styles.sourceRadioTitle}>User override</div>
-					<div className={styles.sourceRadioDesc}>
-						Custom pricing. Takes precedence.
-					</div>
-				</RadioGroupItem>
-			</RadioGroup>
-			{showResetConfirm && (
-				<div className={styles.resetConfirm} aria-label="Reset to default pricing">
-					<p>
-						Reset to default pricing? Custom values will be discarded. It might take
-						24 hours for changes to take effect.
-					</p>
-					<div className={styles.resetConfirmActions}>
-						<Button
-							variant="outlined"
-							color="secondary"
-							onClick={(): void => setShowResetConfirm(false)}
-							testId="drawer-reset-keep-btn"
-						>
-							Keep
-						</Button>
-						<Button
-							variant="solid"
-							color="primary"
-							onClick={confirmReset}
-							testId="drawer-reset-confirm-btn"
-						>
-							Reset
-						</Button>
-					</div>
-				</div>
-			)}
-		</div>
-	);
-}
-
-export default SourceSelector;

frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostDrawer/components/SourceSelector/index.ts

@@ -1 +0,0 @@
-export { default } from './SourceSelector';

frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostDrawer/hooks/useModelCostDrawer.ts

@@ -1,100 +0,0 @@
-import { useCallback, useState } from 'react';
-import { toast } from '@signozhq/ui/sonner';
-import { useQueryClient } from 'react-query';
-import {
-	getListLLMPricingRulesQueryKey,
-	useCreateOrUpdateLLMPricingRules,
-} from 'api/generated/services/llmpricingrules';
-
-import { EMPTY_DRAFT } from '../../../../constants';
-import type { DrawerDraft, DrawerMode, PricingRule } from '../../../../types';
-import { buildRulePayload, draftFromRule } from '../../../../utils';
-
-interface UseModelCostDrawerResult {
-	isOpen: boolean;
-	mode: DrawerMode;
-	initialDraft: DrawerDraft;
-	openForAdd: (prefillModelName?: string) => void;
-	openForEdit: (rule: PricingRule) => void;
-	close: () => void;
-	save: (draft: DrawerDraft) => Promise<void>;
-	isSaving: boolean;
-	saveError: string | null;
-	selectedRuleId: string | null;
-}
-
-export function useModelCostDrawer(): UseModelCostDrawerResult {
-	const queryClient = useQueryClient();
-	const [isOpen, setIsOpen] = useState<boolean>(false);
-	const [mode, setMode] = useState<DrawerMode>('add');
-	const [initialDraft, setInitialDraft] = useState<DrawerDraft>(EMPTY_DRAFT);
-	const [selectedRuleId, setSelectedRuleId] = useState<string | null>(null);
-	const [saveError, setSaveError] = useState<string | null>(null);
-
-	const { mutateAsync: createOrUpdate, isLoading: isSaving } =
-		useCreateOrUpdateLLMPricingRules();
-
-	const invalidateList = useCallback(async (): Promise<void> => {
-		await queryClient.invalidateQueries({
-			queryKey: getListLLMPricingRulesQueryKey(),
-		});
-	}, [queryClient]);
-
-	const openForAdd = useCallback((): void => {
-		setMode('add');
-		setInitialDraft({
-			...EMPTY_DRAFT,
-			modelName: '',
-			patterns: [],
-		});
-		setSelectedRuleId(null);
-		setSaveError(null);
-		setIsOpen(true);
-	}, []);
-
-	const openForEdit = useCallback((rule: PricingRule): void => {
-		setMode('edit');
-		setInitialDraft(draftFromRule(rule));
-		setSelectedRuleId(rule.id);
-		setSaveError(null);
-		setIsOpen(true);
-	}, []);
-
-	const close = useCallback((): void => {
-		setIsOpen(false);
-		setSelectedRuleId(null);
-		setSaveError(null);
-	}, []);
-
-	const save = useCallback(
-		async (draft: DrawerDraft): Promise<void> => {
-			setSaveError(null);
-			try {
-				await createOrUpdate({
-					data: { rules: [buildRulePayload(draft)] },
-				});
-				await invalidateList();
-				setIsOpen(false);
-				setSelectedRuleId(null);
-				toast.success(mode === 'edit' ? 'Model cost updated' : 'Model cost added');
-			} catch (error) {
-				const message = error instanceof Error ? error.message : 'Save failed';
-				setSaveError(message);
-			}
-		},
-		[createOrUpdate, invalidateList, mode],
-	);
-
-	return {
-		isOpen,
-		mode,
-		initialDraft,
-		openForAdd,
-		openForEdit,
-		close,
-		save,
-		isSaving,
-		saveError,
-		selectedRuleId,
-	};
-}

frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostDrawer/index.ts

@@ -1,2 +0,0 @@
-export { default } from './ModelCostDrawer';
-export { useModelCostDrawer } from './hooks/useModelCostDrawer';

frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostDrawer/shared.module.scss

@@ -1,59 +0,0 @@
-/* Shared drawer selectors used by 2+ of the model-cost drawer components. */
-/* Components pull these in via CSS-modules `composes` from their own module so */
-/* the authored class names in the TSX stay identical. */
-/* NOTE: this file is a `composes` target, so it is parsed as plain CSS (no SCSS */
-/* preprocessing). Keep it flat — no nesting, no slash-slash comments. */
-
-.drawerSection {
-	display: flex;
-	flex-direction: column;
-	gap: var(--spacing-3);
-}
-
-.drawerSection .help,
-.help {
-	margin: 0;
-}
-
-.help code {
-	padding: 1px var(--spacing-2);
-	border-radius: 3px;
-	background: var(--l3-background);
-	font-size: 10px;
-}
-
-.drawerSurface {
-	padding: var(--spacing-7);
-	border-radius: 6px;
-	background: var(--l2-background);
-	border: 1px solid var(--l2-border);
-}
-
-.drawerSurfaceHead {
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	margin-bottom: var(--spacing-5);
-}
-
-.managedLabel {
-	display: inline-flex;
-	align-items: center;
-	gap: var(--spacing-2);
-	font-size: var(--periscope-font-size-small);
-	color: var(--l3-foreground);
-}
-
-.required {
-	color: var(--accent-cherry);
-}
-
-.pricingField {
-	display: flex;
-	flex-direction: column;
-	gap: var(--spacing-2);
-}
-
-.pricingField input {
-	width: 100%;
-}

frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostsTable/ModelCostsTable.module.scss

@@ -15,6 +15,6 @@
 	justify-content: center;
 	margin-top: var(--spacing-8);
 	min-height: 400px;
-	color: var(--l3-foreground);
+	color: var(--text-vanilla-400);
 	font-size: var(--periscope-font-size-base);
 }

frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/hooks/useModelCostDelete.ts

@@ -1,66 +0,0 @@
-import { useCallback, useState } from 'react';
-import { toast } from '@signozhq/ui/sonner';
-import { useQueryClient } from 'react-query';
-import {
-	getListLLMPricingRulesQueryKey,
-	useDeleteLLMPricingRule,
-} from 'api/generated/services/llmpricingrules';
-
-import type { PricingRule } from '../../types';
-
-// The minimal slice of a rule the delete-confirm flow needs: the id to delete
-// and the model name to show in the confirmation copy.
-type PendingDelete = Pick<PricingRule, 'id' | 'modelName'>;
-
-interface UseModelCostDeleteResult {
-	requestDelete: (rule: PendingDelete) => void;
-	confirmDelete: () => Promise<void>;
-	cancelDelete: () => void;
-	pendingDelete: PendingDelete | null;
-	isDeleting: boolean;
-}
-
-// Owns the confirm-then-delete flow for a pricing rule, independent of the
-// add/edit drawer — delete is triggered from the table row menu, so this state
-// lives at the panel level rather than inside useModelCostDrawer.
-export function useModelCostDelete(): UseModelCostDeleteResult {
-	const queryClient = useQueryClient();
-	// The rule queued for deletion. Non-null drives the confirm dialog open.
-	const [pendingDelete, setPendingDelete] = useState<PendingDelete | null>(null);
-
-	const { mutateAsync: deleteRuleApi, isLoading: isDeleting } =
-		useDeleteLLMPricingRule();
-
-	const requestDelete = useCallback((rule: PendingDelete): void => {
-		setPendingDelete({ id: rule.id, modelName: rule.modelName });
-	}, []);
-
-	const cancelDelete = useCallback((): void => {
-		setPendingDelete(null);
-	}, []);
-
-	const confirmDelete = useCallback(async (): Promise<void> => {
-		if (!pendingDelete) {
-			return;
-		}
-		try {
-			await deleteRuleApi({ pathParams: { id: pendingDelete.id } });
-			await queryClient.invalidateQueries({
-				queryKey: getListLLMPricingRulesQueryKey(),
-			});
-			setPendingDelete(null);
-			toast.success('Model cost deleted');
-		} catch (error) {
-			const message = error instanceof Error ? error.message : 'Delete failed';
-			toast.error(message);
-		}
-	}, [deleteRuleApi, pendingDelete, queryClient]);
-
-	return {
-		requestDelete,
-		confirmDelete,
-		cancelDelete,
-		pendingDelete,
-		isDeleting,
-	};
-}

frontend/src/container/LLMObservability/Settings/ModelPricing/constants.ts

@@ -1,68 +1,6 @@
-import { LlmpricingruletypesLLMPricingRuleCacheModeDTO as CacheModeDTO } from 'api/generated/services/sigNoz.schemas';
-
-import type { CacheBucketDef, DrawerDraft } from './types';
-
 export const PAGE_SIZE = 20;
 
 export const PAGE_KEY = 'page';
 export const LIMIT_KEY = 'limit';
-export const SEARCH_KEY = 'search';
-export const SEARCH_DEBOUNCE_MS = 300;
-export const SOURCE_KEY = 'source';
 
-export type SourceFilter = 'all' | 'override' | 'auto';
-export const SOURCE_FILTER_OPTIONS: { value: SourceFilter; label: string }[] = [
-	{ value: 'all', label: 'All sources' },
-	{ value: 'override', label: 'User override' },
-	{ value: 'auto', label: 'Auto' },
-];
-
-export const SOURCE_FILTER_TO_IS_OVERRIDE: Record<
-	SourceFilter,
-	boolean | undefined
-> = {
-	all: undefined,
-	override: true,
-	auto: false,
-};
-
-// Match the page size so the skeleton reserves the same number of rows the
-// loaded page renders — otherwise the table height jumps on load.
 export const SKELETON_ROW_COUNT = PAGE_SIZE;
-
-export const PROVIDER_OPTIONS = [
-	{ value: 'OpenAI', label: 'OpenAI' },
-	{ value: 'Anthropic', label: 'Anthropic' },
-	{ value: 'Azure OpenAI', label: 'Azure OpenAI' },
-	{ value: 'Google', label: 'Google' },
-	{ value: 'Self-hosted', label: 'Self-hosted' },
-	{ value: 'Other', label: 'Other' },
-];
-
-export const CACHE_MODE_OPTIONS = [
-	{ value: CacheModeDTO.subtract, label: 'Subtract (OpenAI style)' },
-	{ value: CacheModeDTO.additive, label: 'Additive (Anthropic style)' },
-	// https://app.notion.com/p/signoz/LLM-Tokens-Cost-Calculation-330fcc6bcd19805283ccc841d596358e?source=copy_link#33efcc6bcd1980e6a187e442c6ba5996
-	{ value: CacheModeDTO.unknown, label: 'Unknown' },
-];
-
-export const CACHE_BUCKETS: CacheBucketDef[] = [
-	{ key: 'cacheRead', label: 'cache_read', testId: 'cache-read' },
-	{ key: 'cacheWrite', label: 'cache_write', testId: 'cache-write' },
-];
-
-export const EMPTY_DRAFT: DrawerDraft = {
-	id: null,
-	sourceId: null,
-	modelName: '',
-	provider: 'OpenAI',
-	patterns: [],
-	isOverride: true,
-	pricing: {
-		input: null,
-		output: null,
-		cacheMode: CacheModeDTO.unknown,
-		cacheRead: null,
-		cacheWrite: null,
-	},
-};

frontend/src/container/LLMObservability/Settings/ModelPricing/types.ts

@@ -1,39 +1,4 @@
-import {
-	LlmpricingruletypesLLMPricingRuleCacheModeDTO as CacheModeDTO,
-	type LlmpricingruletypesLLMPricingRuleDTO,
-} from 'api/generated/services/sigNoz.schemas';
-
-export type PricingRule = LlmpricingruletypesLLMPricingRuleDTO;
-
 export interface ExtraBucket {
 	key: string;
 	pricePerMillion: number;
 }
-
-export type DrawerMode = 'add' | 'edit';
-
-// Optional pricing buckets the user can add/remove. Keyed by the matching
-// DrawerDraft['pricing'] field.
-export type CacheBucketKey = 'cacheRead' | 'cacheWrite';
-
-export interface CacheBucketDef {
-	key: CacheBucketKey;
-	label: string;
-	testId: string;
-}
-
-export interface DrawerDraft {
-	id: string | null;
-	sourceId: string | null;
-	modelName: string;
-	provider: string;
-	patterns: string[];
-	isOverride: boolean;
-	pricing: {
-		input: number | null;
-		output: number | null;
-		cacheMode: CacheModeDTO;
-		cacheRead: number | null;
-		cacheWrite: number | null;
-	};
-}

frontend/src/container/LLMObservability/Settings/ModelPricing/utils.ts

@@ -1,19 +1,8 @@
-import {
-	LlmpricingruletypesLLMPricingRuleCacheModeDTO as CacheModeDTO,
-	LlmpricingruletypesLLMPricingRuleUnitDTO as UnitDTO,
-	type LlmpricingruletypesLLMPricingCacheCostsDTO,
-	type LlmpricingruletypesLLMRulePricingDTO,
-	type LlmpricingruletypesUpdatableLLMPricingRuleDTO,
-} from 'api/generated/services/sigNoz.schemas';
 import dayjs from 'dayjs';
 import relativeTime from 'dayjs/plugin/relativeTime';
 
-import type {
-	DrawerDraft,
-	DrawerMode,
-	ExtraBucket,
-	PricingRule,
-} from './types';
+import type { ExtraBucket } from './types';
+import type { LlmpricingruletypesLLMPricingRuleDTO } from 'api/generated/services/sigNoz.schemas';
 
 dayjs.extend(relativeTime);
 
@@ -24,19 +13,6 @@ const getRelativeTime = (
 	return parsed?.isValid() ? parsed.fromNow() : '—';
 };
 
-const hasCacheValue = (value: number | null | undefined): value is number =>
-	typeof value === 'number' && value > 0;
-
-// ─── Input helpers ───────────────────────────────────────────────────────────
-
-export const parsePricingAmount = (raw: string): number | null => {
-	if (raw.trim() === '') {
-		return null;
-	}
-	const value = Number(raw);
-	return Number.isFinite(value) ? value : 0;
-};
-
 // ─── Display helpers ─────────────────────────────────────────────────────────
 
 export const formatPricePerMillion = (value: number | undefined): string => {
@@ -47,117 +23,38 @@ export const formatPricePerMillion = (value: number | undefined): string => {
 	return `$${value.toFixed(2)}`;
 };
 
-export const getExtraBuckets = (rule: PricingRule): ExtraBucket[] => {
+export const getExtraBuckets = (
+	rule: LlmpricingruletypesLLMPricingRuleDTO,
+): ExtraBucket[] => {
 	const cache = rule.pricing?.cache;
 	if (!cache) {
 		return [];
 	}
 	const buckets: ExtraBucket[] = [];
-	if (hasCacheValue(cache.read)) {
+	if (typeof cache.read === 'number' && cache.read > 0) {
 		buckets.push({ key: 'cache_read', pricePerMillion: cache.read });
 	}
-	if (hasCacheValue(cache.write)) {
+	if (typeof cache.write === 'number' && cache.write > 0) {
 		buckets.push({ key: 'cache_write', pricePerMillion: cache.write });
 	}
 	return buckets;
 };
 
-export const getSourceLabel = (rule: PricingRule): 'Auto' | 'User override' =>
-	rule.isOverride ? 'User override' : 'Auto';
+export const getSourceLabel = (
+	rule: LlmpricingruletypesLLMPricingRuleDTO,
+): 'Auto' | 'User override' => (rule.isOverride ? 'User override' : 'Auto');
 
-export const getRelativeLastSeen = (rule: PricingRule): string =>
-	getRelativeTime(rule.updatedAt || rule.syncedAt || rule.createdAt);
+export const getRelativeLastSeen = (
+	rule: LlmpricingruletypesLLMPricingRuleDTO,
+): string => getRelativeTime(rule.updatedAt || rule.syncedAt || rule.createdAt);
 
 // Canonical id shown under the model name, e.g. "openai:gpt-4o". Both segments
 // are lower-cased so the id is consistently normalised (providers/models can
 // arrive with mixed casing).
-export const getCanonicalId = (rule: PricingRule): string => {
+export const getCanonicalId = (
+	rule: LlmpricingruletypesLLMPricingRuleDTO,
+): string => {
 	const provider = rule.provider?.trim().toLowerCase() || 'unknown';
 	const model = rule.modelName?.trim().toLowerCase() || 'unknown';
 	return `${provider}:${model}`;
 };
-
-// ─── Drawer draft <-> API helpers ────────────────────────────────────────────
-
-export const draftFromRule = (rule: PricingRule): DrawerDraft => ({
-	id: rule.id,
-	sourceId: rule.sourceId ?? null,
-	modelName: rule.modelName,
-	provider: rule.provider,
-	patterns: rule.modelPattern || [],
-	isOverride: !!rule.isOverride,
-	pricing: {
-		input: rule.pricing?.input ?? 0,
-		output: rule.pricing?.output ?? 0,
-		cacheMode: rule.pricing?.cache?.mode ?? CacheModeDTO.unknown,
-		cacheRead: rule.pricing?.cache?.read ?? null,
-		cacheWrite: rule.pricing?.cache?.write ?? null,
-	},
-});
-
-const buildCacheCosts = (
-	pricing: DrawerDraft['pricing'],
-): LlmpricingruletypesLLMPricingCacheCostsDTO | undefined => {
-	const { cacheMode, cacheRead, cacheWrite } = pricing;
-	if (!hasCacheValue(cacheRead) && !hasCacheValue(cacheWrite)) {
-		return undefined;
-	}
-	return {
-		mode: cacheMode,
-		...(hasCacheValue(cacheRead) && { read: cacheRead }),
-		...(hasCacheValue(cacheWrite) && { write: cacheWrite }),
-	};
-};
-
-export const buildPricingPayload = (
-	draft: DrawerDraft,
-): LlmpricingruletypesLLMRulePricingDTO => {
-	const cache = buildCacheCosts(draft.pricing);
-	return {
-		input: draft.pricing.input ?? 0,
-		output: draft.pricing.output ?? 0,
-		...(cache && { cache }),
-	};
-};
-
-export const buildRulePayload = (
-	draft: DrawerDraft,
-): LlmpricingruletypesUpdatableLLMPricingRuleDTO => ({
-	id: draft.id || undefined,
-	sourceId: draft.sourceId || undefined,
-	modelName: draft.modelName.trim(),
-	provider: draft.provider.trim(),
-	modelPattern: draft.patterns,
-	isOverride: draft.isOverride,
-	enabled: true,
-	unit: UnitDTO.per_million_tokens,
-	pricing: buildPricingPayload(draft),
-});
-
-export const validateModelName = (
-	modelName: string,
-	mode: DrawerMode,
-): true | string =>
-	mode === 'add' && !modelName.trim() ? 'Billing model ID is required.' : true;
-
-export const validateProvider = (provider: string): true | string =>
-	provider.trim() ? true : 'Provider is required.';
-
-export const validatePricing = (
-	pricing: DrawerDraft['pricing'],
-	isOverride: boolean,
-): true | string => {
-	if (!isOverride) {
-		return true;
-	}
-	if (pricing.input === null || pricing.input <= 0) {
-		return 'Input cost must be greater than 0.';
-	}
-	if (pricing.output === null || pricing.output <= 0) {
-		return 'Output cost must be greater than 0.';
-	}
-	if ((pricing.cacheRead ?? 0) < 0 || (pricing.cacheWrite ?? 0) < 0) {
-		return 'Cache costs must be non-negative.';
-	}
-	return true;
-};

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

@@ -1,5 +1,4 @@
 import { Gauge } from '@signozhq/icons';
-import { Tooltip } from 'antd';
 import { MetricreductionruletypesGettableReductionRuleDTO } from 'api/generated/services/sigNoz.schemas';
 
 import { Badge } from '@signozhq/ui/badge';
@@ -9,26 +8,16 @@ interface VolumeControlBadgeProps {
 }
 
 function VolumeControlBadge({ rule }: VolumeControlBadgeProps): JSX.Element {
-	const badge = (
+	return (
 		<Badge
 			data-testid="vc-badge-active"
 			variant="outline"
-			color={rule.active ? 'success' : 'warning'}
+			color={!rule.active ? 'success' : 'warning'}
 		>
 			<Gauge size={12} />
-			{rule.active ? 'Active' : 'Pending'}
+			{!rule.active ? 'Active' : 'Pending'}
 		</Badge>
 	);
-
-	if (rule.active) {
-		return badge;
-	}
-
-	return (
-		<Tooltip title="Takes about 5 minutes to take effect">
-			<span>{badge}</span>
-		</Tooltip>
-	);
 }
 
 export default VolumeControlBadge;

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

@@ -7,12 +7,6 @@
 	padding: 12px 16px 0 16px;
 }
 
-.chartHeader {
-	display: flex;
-	flex-direction: column;
-	gap: 2px;
-}
-
 .chartTitle {
 	text-transform: uppercase;
 	letter-spacing: 0.05em;
@@ -21,11 +15,3 @@
 .chartBody {
 	height: 340px;
 }
-
-.chartStatus {
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	width: 100%;
-	height: 100%;
-}

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

@@ -1,6 +1,5 @@
 import { Color } from '@signozhq/design-tokens';
 import { Typography } from '@signozhq/ui/typography';
-import { Spin } from 'antd';
 import { useGetMetricReductionRuleTimeseries } from 'api/generated/services/metrics';
 import { PANEL_TYPES } from 'constants/queryBuilder';
 import BarChart from 'container/DashboardContainer/visualization/charts/BarChart/BarChart';
@@ -26,9 +25,7 @@ interface VolumeControlChartProps {
 }
 
 function VolumeControlChart({ enabled }: VolumeControlChartProps): JSX.Element {
-	const { data, isLoading, isError } = useGetMetricReductionRuleTimeseries({
-		query: { enabled },
-	});
+	const { data } = useGetMetricReductionRuleTimeseries({ query: { enabled } });
 
 	const isDarkMode = useIsDarkMode();
 	const { timezone } = useTimezone();
@@ -68,34 +65,11 @@ function VolumeControlChart({ enabled }: VolumeControlChartProps): JSX.Element {
 
 	return (
 		<div className={styles.chart} data-testid="volume-control-chart">
-			<div className={styles.chartHeader}>
-				<Typography.Text className={styles.chartTitle} size={'small'}>
-					Sample volume · ingested vs retained
-				</Typography.Text>
-				<Typography.Text size="small" color="muted">
-					Last 6 hours
-				</Typography.Text>
-			</div>
+			<Typography.Text className={styles.chartTitle} size={'small'}>
+				Series volume over time · ingested vs retained
+			</Typography.Text>
 			<div className={styles.chartBody} ref={graphRef}>
-				{isLoading && (
-					<div
-						className={styles.chartStatus}
-						data-testid="volume-control-chart-loading"
-					>
-						<Spin size="small" />
-					</div>
-				)}
-				{!isLoading && isError && (
-					<div
-						className={styles.chartStatus}
-						data-testid="volume-control-chart-error"
-					>
-						<Typography.Text size="small" color="danger">
-							Failed to load chart
-						</Typography.Text>
-					</div>
-				)}
-				{!isLoading && !isError && dimensions.width > 0 && (
+				{dimensions.width > 0 && (
 					<BarChart
 						config={config}
 						data={chartData}

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

@@ -17,27 +17,11 @@
 	gap: 5px;
 }
 
-.meterLabelRow {
-	display: flex;
-	align-items: center;
-	gap: 4px;
-}
-
 .meterLabel {
 	text-transform: uppercase;
 	letter-spacing: 0.04em;
 }
 
-.meterInfo {
-	flex-shrink: 0;
-	color: var(--bg-vanilla-400, #c0c1c3);
-	line-height: 1;
-	cursor: help;
-}
-
 .meterValue {
-	display: flex;
-	align-items: baseline;
-	gap: 6px;
 	font-family: 'Geist Mono', monospace;
 }

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

@@ -1,8 +1,6 @@
-import { Info } from '@signozhq/icons';
 import { Typography } from '@signozhq/ui/typography';
-import { Spin, Tooltip } from 'antd';
+import { Spin } from 'antd';
 import { MetricreductionruletypesGettableReductionRulePreviewDTO } from 'api/generated/services/sigNoz.schemas';
-import { popupContainer } from 'utils/selectPopupContainer';
 
 import { formatCompact } from '../../../configUtils';
 import { RuleMode } from '../../../types';
@@ -29,7 +27,6 @@ function ImpactPanel({
 		);
 	}
 
-	const full = preview?.ingestedSeries ?? 0;
 	const current = preview?.currentRetainedSeries ?? 0;
 	const proposed = preview?.retainedSeries ?? 0;
 	const deltaPct = current > 0 ? (1 - proposed / current) * 100 : 0;
@@ -43,59 +40,31 @@ function ImpactPanel({
 			{!isLoading && preview && (
 				<div className={styles.meterGrid}>
 					<div className={styles.meter}>
-						<div className={styles.meterLabelRow}>
-							<Typography.Text size="xs" color="muted" className={styles.meterLabel}>
-								Full series
-							</Typography.Text>
-							<Tooltip
-								title="Total number of series for this metric before any reduction."
-								getPopupContainer={popupContainer}
-							>
-								<Info size={12} className={styles.meterInfo} />
-							</Tooltip>
-						</div>
-						<Typography.Text size="2xl" className={styles.meterValue}>
-							{formatCompact(full)}
+						<Typography.Text size="xs" color="muted" className={styles.meterLabel}>
+							Current series
 						</Typography.Text>
-					</div>
-					<div className={styles.meter}>
-						<div className={styles.meterLabelRow}>
-							<Typography.Text size="xs" color="muted" className={styles.meterLabel}>
-								Current retained
-							</Typography.Text>
-							<Tooltip
-								title="Series kept today under the metric's existing rule, or all of them if it has no rule yet."
-								getPopupContainer={popupContainer}
-							>
-								<Info size={12} className={styles.meterInfo} />
-							</Tooltip>
-						</div>
 						<Typography.Text size="2xl" className={styles.meterValue}>
 							{formatCompact(current)}
 						</Typography.Text>
 					</div>
 					<div className={styles.meter}>
-						<div className={styles.meterLabelRow}>
-							<Typography.Text size="xs" color="muted" className={styles.meterLabel}>
-								Potential retained
-							</Typography.Text>
-							<Tooltip
-								title="Series that would be kept if you save this rule, with the reduction vs what's retained today."
-								getPopupContainer={popupContainer}
-							>
-								<Info size={12} className={styles.meterInfo} />
-							</Tooltip>
-						</div>
+						<Typography.Text size="xs" color="muted" className={styles.meterLabel}>
+							Proposed series
+						</Typography.Text>
 						<Typography.Text size="2xl" className={styles.meterValue}>
 							{formatCompact(proposed)}
-							{deltaPct !== 0 && (
-								<Typography.Text
-									size="small"
-									color={deltaPct >= 0 ? 'success' : undefined}
-								>
-									{reductionLabel}
-								</Typography.Text>
-							)}
+						</Typography.Text>
+					</div>
+					<div className={styles.meter}>
+						<Typography.Text size="xs" color="muted" className={styles.meterLabel}>
+							Reduction
+						</Typography.Text>
+						<Typography.Text
+							size="2xl"
+							color={deltaPct >= 0 ? 'success' : undefined}
+							className={styles.meterValue}
+						>
+							{reductionLabel}
 						</Typography.Text>
 					</div>
 				</div>

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

@@ -18,12 +18,12 @@ const MODE_OPTIONS: ModeOption[] = [
 	},
 	{
 		mode: 'include',
-		title: 'Include',
+		title: 'Include attributes',
 		description: 'Allowlist: only the selected attributes stay queryable.',
 	},
 	{
 		mode: 'exclude',
-		title: 'Exclude',
+		title: 'Exclude attributes',
 		description: 'Blocklist: the selected attributes are aggregated away.',
 	},
 ];

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

@@ -53,12 +53,12 @@ function RelatedAssetsWarning({
 		<div className={styles.warning} data-testid="volume-control-warning">
 			<Info size={14} />
 			<div className={styles.warningBody}>
-				<Typography.Text as="div" size="base" weight="semibold" color="warning">
+				<Typography.Text as="div" size="small" weight="semibold" color="warning">
 					This rule affects {impacted.length} related asset
 					{impacted.length > 1 ? 's' : ''}.
 				</Typography.Text>
 				{impactedLabels.length > 0 && (
-					<Typography.Text as="div" size="base" color="muted">
+					<Typography.Text as="div" size="sm" color="muted">
 						{impactedLabels.join(', ')} will no longer be queryable; affected panels
 						fall back to aggregated data once the rule applies.
 					</Typography.Text>
@@ -73,7 +73,7 @@ function RelatedAssetsWarning({
 							<li key={`${asset.type}-${asset.id}-${asset.widget?.id ?? ''}`}>
 								{href ? (
 									<Typography.Link
-										size="base"
+										size="sm"
 										href={href}
 										target="_blank"
 										rel="noopener noreferrer"
@@ -81,7 +81,7 @@ function RelatedAssetsWarning({
 										{label}
 									</Typography.Link>
 								) : (
-									<Typography.Text size="base" color="muted">
+									<Typography.Text size="sm" color="muted">
 										{label}
 									</Typography.Text>
 								)}

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

@@ -42,10 +42,6 @@ function VolumeControlConfigDrawer({
 
 	const footer = (
 		<div className={styles.footer}>
-			<Typography.Text size="small" color="muted">
-				Changes take effect about 5 minutes after saving.
-			</Typography.Text>
-			<div className={styles.footerSpacer} />
 			<Button
 				variant="outlined"
 				color="secondary"
@@ -54,6 +50,7 @@ function VolumeControlConfigDrawer({
 			>
 				Cancel
 			</Button>
+			<div className={styles.footerSpacer} />
 			{hasExistingRule && (
 				<Button
 					variant="ghost"

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

@@ -8,8 +8,8 @@ function PendingActivationBanner(): JSX.Element {
 		<div className={styles.banner} data-testid="volume-control-pending-banner">
 			<Info size={13} />
 			<Typography.Text size="sm" color="muted">
-				This metric&apos;s configuration was recently updated. Volume changes take
-				effect within about 5 minutes.
+				This metric&apos;s configuration was recently updated. Volume changes will
+				take effect within a few minutes.
 			</Typography.Text>
 		</div>
 	);

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

@@ -22,7 +22,7 @@ function VolumeControlSection({
 		useVolumeControlFeatureGate();
 	const [isConfigOpen, setIsConfigOpen] = useState(false);
 
-	const { data, isLoading, isError } = useListMetricReductionRules(
+	const { data, isLoading, error } = useListMetricReductionRules(
 		{ metricName },
 		{
 			query: {
@@ -37,7 +37,7 @@ function VolumeControlSection({
 	}
 
 	const rule = data?.data.rules?.[0];
-	const hasRule = !!rule && !isError;
+	const hasRule = !!rule && !error;
 
 	const openConfig = (): void => setIsConfigOpen(true);
 	const closeConfig = (): void => setIsConfigOpen(false);
@@ -53,16 +53,6 @@ function VolumeControlSection({
 
 			{isLoading && <Skeleton active title={false} paragraph={{ rows: 2 }} />}
 
-			{!isLoading && isError && (
-				<Typography.Text
-					size="small"
-					color="danger"
-					data-testid="volume-control-section-error"
-				>
-					Failed to load volume control. Please try again.
-				</Typography.Text>
-			)}
-
 			{!isLoading && hasRule && rule && !rule.active && (
 				<PendingActivationBanner />
 			)}
@@ -75,7 +65,7 @@ function VolumeControlSection({
 				/>
 			)}
 
-			{!isLoading && !isError && !hasRule && (
+			{!isLoading && !hasRule && (
 				<NoRuleEmptyState canManage={canManageVolumeControl} onSetup={openConfig} />
 			)}
 

frontend/src/container/MetricsExplorer/VolumeControl/components/VolumeControlTab/VolumeControlStats/VolumeControlStats.module.scss

@@ -1,9 +1,3 @@
-.statsSection {
-	display: flex;
-	flex-direction: column;
-	gap: 8px;
-}
-
 .stats {
 	display: flex;
 	flex-wrap: wrap;
@@ -27,24 +21,11 @@
 	background: var(--callout-success-background);
 }
 
-.statCardLabelRow {
-	display: flex;
-	align-items: center;
-	gap: 4px;
-}
-
 .statCardLabel {
 	text-transform: uppercase;
 	letter-spacing: 0.05em;
 }
 
-.statCardInfo {
-	flex-shrink: 0;
-	color: var(--bg-vanilla-400, #c0c1c3);
-	line-height: 1;
-	cursor: help;
-}
-
 .statCardValue {
 	display: flex;
 	align-items: baseline;

frontend/src/container/MetricsExplorer/VolumeControl/components/VolumeControlTab/VolumeControlStats/VolumeControlStats.tsx

@@ -1,6 +1,4 @@
-import { Info } from '@signozhq/icons';
 import { Typography } from '@signozhq/ui/typography';
-import { Skeleton, Tooltip } from 'antd';
 import cx from 'classnames';
 
 import { formatCompact, formatUsd } from '../../../configUtils';
@@ -10,17 +8,12 @@ interface VolumeControlStatsProps {
 	activeRules: number;
 	ingestedSeries: number;
 	retainedSeries: number;
-	ingestedSamples: number;
-	retainedSamples: number;
 	estimatedMonthlySavingsUsd: number;
-	isLoading?: boolean;
-	isError?: boolean;
 }
 
 interface StatItem {
 	label: string;
 	value: string;
-	tooltip: string;
 	delta?: string;
 	unit?: string;
 	highlighted?: boolean;
@@ -31,53 +24,20 @@ function VolumeControlStats({
 	activeRules,
 	ingestedSeries,
 	retainedSeries,
-	ingestedSamples,
-	retainedSamples,
 	estimatedMonthlySavingsUsd,
-	isLoading = false,
-	isError = false,
 }: VolumeControlStatsProps): JSX.Element {
 	const overallReduction =
 		ingestedSeries > 0
 			? Math.round((1 - retainedSeries / ingestedSeries) * 100)
 			: 0;
 
-	const sampleReduction =
-		ingestedSamples > 0
-			? Math.round((1 - retainedSamples / ingestedSamples) * 100)
-			: 0;
-
 	const items: StatItem[] = [
-		{
-			label: 'Configured rules',
-			value: String(activeRules),
-			tooltip: 'Volume-control rules currently configured for this workspace.',
-		},
-		{
-			label: 'Ingested series',
-			value: formatCompact(ingestedSeries),
-			tooltip:
-				'Distinct time series across all metrics in the last 1 hour, before any reduction.',
-		},
+		{ label: 'Active rules', value: String(activeRules) },
+		{ label: 'Ingested series', value: formatCompact(ingestedSeries) },
 		{
 			label: 'Retained series',
 			value: formatCompact(retainedSeries),
 			delta: overallReduction > 0 ? `−${overallReduction}%` : undefined,
-			tooltip:
-				'Distinct time series kept across all metrics in the last 1 hour; everything except what the rules reduce away. Lower than ingested means more reduction.',
-		},
-		{
-			label: 'Ingested samples',
-			value: formatCompact(ingestedSamples),
-			tooltip:
-				'Sample data points across all metrics in the last 1 hour, before any reduction.',
-		},
-		{
-			label: 'Retained samples',
-			value: formatCompact(retainedSamples),
-			delta: sampleReduction > 0 ? `−${sampleReduction}%` : undefined,
-			tooltip:
-				'Sample data points kept across all metrics in the last 1 hour; everything except what the rules reduce. Samples reduce more than series because series do not all carry the same sample volume.',
 		},
 		{
 			label: 'Est. monthly savings',
@@ -85,73 +45,42 @@ function VolumeControlStats({
 			unit: '/mo',
 			highlighted: true,
 			valueGood: true,
-			tooltip:
-				'Rough monthly estimate: the samples the rules reduced in the last 1 hour, scaled to a month at 1-month standard retention. It is extrapolated from a single rolling hour.',
 		},
 	];
 
 	return (
-		<div className={styles.statsSection}>
-			<Typography.Text size="small" color="muted">
-				Last 1 hour
-			</Typography.Text>
-			<div className={styles.stats} data-testid="volume-control-stats">
-				{items.map((item) => (
-					<div
-						key={item.label}
-						className={cx(styles.statCard, {
-							[styles.statCardHighlighted]: item.highlighted,
-						})}
+		<div className={styles.stats} data-testid="volume-control-stats">
+			{items.map((item) => (
+				<div
+					key={item.label}
+					className={cx(styles.statCard, {
+						[styles.statCardHighlighted]: item.highlighted,
+					})}
+				>
+					<Typography.Text size="sm" color="muted" className={styles.statCardLabel}>
+						{item.label}
+					</Typography.Text>
+					<Typography.Text
+						as="div"
+						size="large"
+						weight="semibold"
+						color={item.valueGood ? 'success' : undefined}
+						className={styles.statCardValue}
 					>
-						<div className={styles.statCardLabelRow}>
-							<Typography.Text
-								size="sm"
-								color="muted"
-								className={styles.statCardLabel}
-							>
-								{item.label}
-							</Typography.Text>
-							<Tooltip title={item.tooltip}>
-								<Info size={12} className={styles.statCardInfo} />
-							</Tooltip>
-						</div>
-						{isLoading && (
-							<Skeleton.Button active size="small" className={styles.statCardValue} />
-						)}
-						{!isLoading && isError && (
-							<Typography.Text
-								as="div"
-								size="small"
-								color="danger"
-								className={styles.statCardValue}
-							>
-								Failed to load
+						{item.value}
+						{item.delta && (
+							<Typography.Text size="small" weight="semibold" color="success">
+								{item.delta}
 							</Typography.Text>
 						)}
-						{!isLoading && !isError && (
-							<Typography.Text
-								as="div"
-								size="large"
-								weight="semibold"
-								color={item.valueGood ? 'success' : undefined}
-								className={styles.statCardValue}
-							>
-								{item.value}
-								{item.delta && (
-									<Typography.Text size="small" weight="semibold" color="success">
-										{item.delta}
-									</Typography.Text>
-								)}
-								{item.unit && (
-									<Typography.Text size="small" weight="medium" color="muted">
-										{item.unit}
-									</Typography.Text>
-								)}
+						{item.unit && (
+							<Typography.Text size="small" weight="medium" color="muted">
+								{item.unit}
 							</Typography.Text>
 						)}
-					</div>
-				))}
-			</div>
+					</Typography.Text>
+				</div>
+			))}
 		</div>
 	);
 }

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

@@ -13,10 +13,8 @@
 	font-family: 'Geist Mono', monospace;
 }
 
-.volumeCell {
-	display: flex;
-	flex-direction: column;
-	gap: 2px;
+.reductionCell {
+	font-family: 'Geist Mono', monospace;
 }
 
 .empty {

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

@@ -36,7 +36,7 @@ type VolumeControlTableParams = Required<
 >;
 
 const DEFAULT_PARAMS: VolumeControlTableParams = {
-	orderBy: OrderBy.ingested_volume,
+	orderBy: OrderBy.reduction,
 	order: SortOrder.desc,
 	search: '',
 	offset: 0,
@@ -60,20 +60,11 @@ function VolumeControlTab(): JSX.Element {
 		);
 	}, [debouncedSearch]);
 
-	const {
-		data,
-		isLoading,
-		isError: isListError,
-	} = useListMetricReductionRules(params, {
+	const { data, isLoading } = useListMetricReductionRules(params, {
 		query: { enabled: isVolumeControlEnabled },
 	});
 
-	const {
-		data: statsData,
-		isLoading: isStatsLoading,
-		isFetching: isStatsFetching,
-		isError: isStatsError,
-	} = useGetMetricReductionRuleStats({
+	const { data: statsData } = useGetMetricReductionRuleStats({
 		query: { enabled: isVolumeControlEnabled },
 	});
 	const stats = statsData?.data;
@@ -120,7 +111,7 @@ function VolumeControlTab(): JSX.Element {
 				{
 					title: 'MODE',
 					key: 'mode',
-					width: 110,
+					width: 160,
 					render: (
 						_value: unknown,
 						rule: MetricreductionruletypesGettableReductionRuleDTO,
@@ -147,14 +138,7 @@ function VolumeControlTab(): JSX.Element {
 					),
 				},
 				{
-					title: (
-						<>
-							INGESTED{' '}
-							<Typography.Text size="small" color="muted">
-								(1h)
-							</Typography.Text>
-						</>
-					),
+					title: 'INGESTED',
 					key: OrderBy.ingested_volume,
 					width: 130,
 					sorter: true,
@@ -163,28 +147,13 @@ function VolumeControlTab(): JSX.Element {
 						_value: unknown,
 						rule: MetricreductionruletypesGettableReductionRuleDTO,
 					): JSX.Element => (
-						<div className={styles.volumeCell}>
-							<Typography.Text size="small">
-								{formatCompact(rule.ingestedSeries)}{' '}
-								<Typography.Text size="small" color="muted">
-									series
-								</Typography.Text>
-							</Typography.Text>
-							<Typography.Text size="small" color="muted">
-								{formatCompact(rule.ingestedSamples)} samples
-							</Typography.Text>
-						</div>
+						<Typography.Text size="small" color="muted">
+							{formatCompact(rule.ingestedSeries)}
+						</Typography.Text>
 					),
 				},
 				{
-					title: (
-						<>
-							RETAINED{' '}
-							<Typography.Text size="small" color="muted">
-								(1h)
-							</Typography.Text>
-						</>
-					),
+					title: 'RETAINED',
 					key: OrderBy.reduced_volume,
 					width: 130,
 					sorter: true,
@@ -193,35 +162,22 @@ function VolumeControlTab(): JSX.Element {
 						_value: unknown,
 						rule: MetricreductionruletypesGettableReductionRuleDTO,
 					): JSX.Element => (
-						<div className={styles.volumeCell}>
-							<Typography.Text size="small">
-								{formatCompact(rule.retainedSeries)}{' '}
-								<Typography.Text size="small" color="muted">
-									series
-								</Typography.Text>
-							</Typography.Text>
-							<Typography.Text size="small" color="muted">
-								{formatCompact(rule.retainedSamples)} samples
-							</Typography.Text>
-						</div>
+						<Typography.Text size="small">
+							{formatCompact(rule.retainedSeries)}
+						</Typography.Text>
 					),
 				},
 				{
 					title: 'CHANGE',
-					width: 140,
+					key: OrderBy.reduction,
+					width: 110,
+					sorter: true,
+					sortOrder: sortOrderFor(OrderBy.reduction),
 					render: (
 						_value: unknown,
 						rule: MetricreductionruletypesGettableReductionRuleDTO,
 					): JSX.Element => {
-						const seriesReduction =
-							rule.ingestedSeries > 0
-								? (1 - rule.retainedSeries / rule.ingestedSeries) * 100
-								: 0;
-						const samplesReduction =
-							rule.ingestedSamples > 0
-								? (1 - rule.retainedSamples / rule.ingestedSamples) * 100
-								: 0;
-						if (seriesReduction <= 0 && samplesReduction <= 0) {
+						if (rule.reductionPercent <= 0) {
 							return (
 								<Typography.Text size="small" color="muted">
 									—
@@ -229,18 +185,14 @@ function VolumeControlTab(): JSX.Element {
 							);
 						}
 						return (
-							<div className={styles.volumeCell}>
-								<Typography.Text size="small" weight="semibold" color="success">
-									{seriesReduction > 0 ? `−${Math.round(seriesReduction)}%` : '0%'}{' '}
-									<Typography.Text size="small" color="muted">
-										series
-									</Typography.Text>
-								</Typography.Text>
-								<Typography.Text size="small" color="muted">
-									{samplesReduction > 0 ? `−${Math.round(samplesReduction)}%` : '0%'}{' '}
-									samples
-								</Typography.Text>
-							</div>
+							<Typography.Text
+								size="small"
+								weight="semibold"
+								color="success"
+								className={styles.reductionCell}
+							>
+								−{Math.round(rule.reductionPercent)}%
+							</Typography.Text>
 						);
 					},
 				},
@@ -321,11 +273,7 @@ function VolumeControlTab(): JSX.Element {
 				activeRules={total}
 				ingestedSeries={stats?.ingestedSeries ?? 0}
 				retainedSeries={stats?.retainedSeries ?? 0}
-				ingestedSamples={stats?.ingestedSamples ?? 0}
-				retainedSamples={stats?.retainedSamples ?? 0}
 				estimatedMonthlySavingsUsd={stats?.estimatedMonthlySavingsUsd ?? 0}
-				isLoading={isStatsLoading || isStatsFetching}
-				isError={isStatsError}
 			/>
 
 			<VolumeControlChart enabled={isVolumeControlEnabled} />
@@ -345,13 +293,7 @@ function VolumeControlTab(): JSX.Element {
 					showSizeChanger: false,
 				}}
 				locale={{
-					emptyText: isListError ? (
-						<div className={styles.empty} data-testid="volume-control-tab-error">
-							<Typography.Text color="danger">
-								Failed to load volume control rules. Please try again.
-							</Typography.Text>
-						</div>
-					) : (
+					emptyText: (
 						<div className={styles.empty} data-testid="volume-control-tab-empty">
 							<Typography.Text color="muted">
 								No volume control rules yet. Open a metric and set one up to start

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

@@ -49,7 +49,6 @@ export interface UseVolumeControlConfigResult {
 const PREVIEW_DEBOUNCE_MS = 400;
 const SAVE_ERROR_MESSAGE = 'Failed to save volume control rule';
 const REMOVE_ERROR_MESSAGE = 'Failed to remove volume control rule';
-const PREVIEW_ERROR_MESSAGE = 'Failed to preview volume control rule';
 
 export function useVolumeControlConfig({
 	metricName,
@@ -96,25 +95,11 @@ export function useVolumeControlConfig({
 		const timer = setTimeout(() => {
 			previewMutate(
 				{ data: { metricName, matchType: matchTypeForMode(mode), labels } },
-				{
-					onError: (error) =>
-						notifications.error({
-							message: error.response?.data?.error?.message ?? PREVIEW_ERROR_MESSAGE,
-						}),
-					onSettled: () => setIsPreviewPending(false),
-				},
+				{ onSettled: () => setIsPreviewPending(false) },
 			);
 		}, PREVIEW_DEBOUNCE_MS);
 		return (): void => clearTimeout(timer);
-	}, [
-		open,
-		mode,
-		labels,
-		metricName,
-		previewMutate,
-		previewReset,
-		notifications,
-	]);
+	}, [open, mode, labels, metricName, previewMutate, previewReset]);
 
 	const createMutation = useCreateMetricReductionRule();
 	const updateMutation = useUpdateMetricReductionRuleByID();
@@ -157,10 +142,7 @@ export function useVolumeControlConfig({
 		}
 
 		const onSuccess = (): void => {
-			notifications.success({
-				message:
-					'Volume control rule saved. It takes about 5 minutes to take effect.',
-			});
+			notifications.success({ message: 'Volume control rule saved' });
 			invalidate();
 			onClose();
 		};

frontend/src/container/MetricsExplorer/VolumeControl/ruleUtils.ts

@@ -9,7 +9,7 @@ export function isKeepMode(
 export function getMatchTypeLabel(
 	matchType: MetricreductionruletypesMatchTypeDTO,
 ): string {
-	return isKeepMode(matchType) ? 'Include' : 'Exclude';
+	return isKeepMode(matchType) ? 'Include attributes' : 'Exclude attributes';
 }
 
 export function getLabelVerb(

frontend/src/hooks/queryBuilder/useCreateAlerts.tsx

@@ -24,11 +24,6 @@ import { GlobalReducer } from 'types/reducer/globalTime';
 import { withBasePath } from 'utils/basePath';
 import { getGraphType } from 'utils/getGraphType';
 
-/**
- * @deprecated V1-only. V2 dashboards seed alerts from a panel via
- * `useCreateAlertFromPanel` / `buildCreateAlertUrl`
- * (pages/DashboardPageV2/.../Panel). Do not use in new code.
- */
 const useCreateAlerts = (widget?: Widgets, caller?: string): VoidFunction => {
 	const queryRangeMutation = useMutation(getSubstituteVars);
 

frontend/src/pages/AIAssistantPage/AIAssistantPage.tsx

@@ -26,8 +26,8 @@ export default function AIAssistantPage(): JSX.Element {
 
 	// Skip the mount-time Opened fire when the user expanded an already-open
 	// drawer/modal — that surface already emitted Opened with the right source.
-	// Router state (vs a module flag) survives StrictMode double-mount and
-	// aborted navigations.
+	// Router state (vs a module flag) survives page remounts and aborted
+	// navigations.
 	const fromInApp = location.state?.fromInApp === true;
 	useEffect(() => {
 		if (fromInApp) {
@@ -52,18 +52,34 @@ export default function AIAssistantPage(): JSX.Element {
 		(s) => s.startNewConversation,
 	);
 
-	// Keep a ref so the effect can read latest conversations without re-firing
-	// when startNewConversation mutates the store mid-effect.
+	// Keep refs so the effect can read the latest store state without re-firing
+	// when it mutates the store mid-effect (it only depends on the URL param).
 	const conversationsRef = useRef(conversations);
 	conversationsRef.current = conversations;
+	const activeConversationIdRef = useRef(activeConversationId);
+	activeConversationIdRef.current = activeConversationId;
 
 	useEffect(() => {
-		if (conversationsRef.current[conversationId]) {
+		// URL points at a known conversation → just activate it.
+		if (conversationId && conversationsRef.current[conversationId]) {
 			setActiveConversation(conversationId);
-		} else {
-			const newId = startNewConversation();
-			history.replace(ROUTES.AI_ASSISTANT.replace(':conversationId', newId));
+			return;
 		}
+
+		// The URL has no usable conversation id (bare `/ai-assistant`, or a stale
+		// param). Prefer resuming the active conversation — including the
+		// rehydrating placeholder for the persisted thread — over minting a new
+		// one. This is what stops a throwaway blank chat from flashing as a
+		// second thread during load, and stops a duplicate when the page
+		// remounts during startup route churn (the active id is already set, so
+		// we resume instead of create). Starting fresh is the last resort, only
+		// when there is genuinely nothing to resume.
+		const activeId = activeConversationIdRef.current;
+		const resumeId =
+			activeId && conversationsRef.current[activeId]
+				? activeId
+				: startNewConversation();
+		history.replace(ROUTES.AI_ASSISTANT.replace(':conversationId', resumeId));
 		// Only re-run when the URL param changes, not when conversations mutates.
 		// eslint-disable-next-line react-hooks/exhaustive-deps
 	}, [conversationId]);

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

@@ -0,0 +1,181 @@
+import { MemoryRouter, Route } from 'react-router-dom';
+// eslint-disable-next-line no-restricted-imports
+import { render } from '@testing-library/react';
+import ROUTES from 'constants/routes';
+import { useAIAssistantStore } from 'container/AIAssistant/store/useAIAssistantStore';
+
+jest.mock('api/common/logEvent', () => ({
+	__esModule: true,
+	default: jest.fn(),
+}));
+
+jest.mock('container/AIAssistant/ConversationView', () => ({
+	__esModule: true,
+	default: (): JSX.Element => <div data-testid="conversation-view" />,
+}));
+
+jest.mock('container/AIAssistant/components/ConversationsList', () => ({
+	__esModule: true,
+	default: (): JSX.Element => <div data-testid="conversations-list" />,
+}));
+
+jest.mock('components/Noz/Noz', () => ({
+	__esModule: true,
+	default: (): JSX.Element => <div data-testid="noz" />,
+}));
+
+jest.mock('container/AIAssistant/hooks/useAIAssistantAnalyticsContext', () => ({
+	normalizePage: (page: string): string => page,
+	useAIAssistantAnalyticsContext: (): unknown => ({ mode: 'page' }),
+}));
+
+// eslint-disable-next-line import/first
+import AIAssistantPage from '../AIAssistantPage';
+
+function renderAt(entry: string): { unmount: () => void } {
+	return render(
+		<MemoryRouter initialEntries={[entry]}>
+			<Route
+				exact
+				path={[ROUTES.AI_ASSISTANT_BASE, ROUTES.AI_ASSISTANT]}
+				component={AIAssistantPage}
+			/>
+		</MemoryRouter>,
+	);
+}
+
+function renderAtBase(): { unmount: () => void } {
+	return renderAt(ROUTES.AI_ASSISTANT_BASE);
+}
+
+function conversationCount(): number {
+	return Object.keys(useAIAssistantStore.getState().conversations).length;
+}
+
+function conversationIds(): string[] {
+	return Object.keys(useAIAssistantStore.getState().conversations);
+}
+
+function activeId(): string | null {
+	return useAIAssistantStore.getState().activeConversationId;
+}
+
+describe('AIAssistantPage', () => {
+	beforeEach(() => {
+		useAIAssistantStore.setState({
+			conversations: {},
+			streams: {},
+			activeConversationId: null,
+		});
+	});
+
+	it('opens exactly one conversation when navigating to /ai-assistant', () => {
+		const { unmount } = renderAtBase();
+
+		expect(conversationCount()).toBe(1);
+
+		unmount();
+	});
+
+	it('does not stack a second conversation when the page remounts at the bare URL (route churn)', () => {
+		// First mount at `/ai-assistant` creates one blank conversation and
+		// redirects to `/ai-assistant/:id`.
+		const { unmount } = renderAtBase();
+		expect(conversationCount()).toBe(1);
+		const firstId = conversationIds()[0];
+
+		// Startup route-list churn unmounts and remounts the page while the URL
+		// is momentarily back at the bare `/ai-assistant`. This previously
+		// created a second blank conversation — now it reuses the first.
+		unmount();
+		const { unmount: unmount2 } = renderAtBase();
+
+		expect(conversationCount()).toBe(1);
+		// The surviving conversation is the original one, resumed — not a fresh mint.
+		expect(conversationIds()).toStrictEqual([firstId]);
+		expect(activeId()).toBe(firstId);
+
+		unmount2();
+	});
+
+	it('activates the conversation named in the URL without creating a new one', () => {
+		useAIAssistantStore.setState({
+			conversations: {
+				existing: {
+					id: 'existing',
+					messages: [],
+					createdAt: 1,
+					updatedAt: 1,
+				},
+			},
+			streams: {},
+			activeConversationId: null,
+		});
+
+		const { unmount } = renderAt(
+			ROUTES.AI_ASSISTANT.replace(':conversationId', 'existing'),
+		);
+
+		expect(conversationCount()).toBe(1);
+		expect(activeId()).toBe('existing');
+
+		unmount();
+	});
+
+	it('resumes the active conversation on /ai-assistant/new instead of minting a new one', () => {
+		// The sidenav only routes to `/ai-assistant/new` as a fallback, but if an
+		// active conversation exists the page must resume it rather than spawn a
+		// throwaway blank thread for the unknown "new" param.
+		useAIAssistantStore.setState({
+			conversations: {
+				active: {
+					id: 'active',
+					messages: [],
+					createdAt: 1,
+					updatedAt: 1,
+				},
+			},
+			streams: {},
+			activeConversationId: 'active',
+		});
+
+		const { unmount } = renderAt(
+			ROUTES.AI_ASSISTANT.replace(':conversationId', 'new'),
+		);
+
+		expect(conversationCount()).toBe(1);
+		expect(conversationIds()).toStrictEqual(['active']);
+		expect(activeId()).toBe('active');
+
+		unmount();
+	});
+
+	it('resumes the persisted (hydrating) conversation during load instead of creating a second', () => {
+		// Simulates `onRehydrateStorage` priming the persisted active
+		// conversation as a hydrating placeholder before `fetchThreads` resolves.
+		useAIAssistantStore.setState({
+			conversations: {
+				persisted: {
+					id: 'persisted',
+					messages: [],
+					createdAt: 1,
+					updatedAt: 1,
+					isHydrating: true,
+				},
+			},
+			streams: {},
+			activeConversationId: 'persisted',
+		});
+
+		const { unmount } = renderAtBase();
+
+		// Opening the bare URL must resume the persisted conversation, not mint a
+		// throwaway blank alongside it (which flashed as a 2nd thread during load).
+		expect(conversationCount()).toBe(1);
+		expect(
+			Object.keys(useAIAssistantStore.getState().conversations),
+		).toStrictEqual(['persisted']);
+
+		unmount();
+	});
+});

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/ConfigPane/ConfigActions/ConfigActionRow.tsx

@@ -1,43 +0,0 @@
-import { SquareArrowOutUpRight } from '@signozhq/icons';
-import { Button } from '@signozhq/ui/button';
-import { Typography } from '@signozhq/ui/typography';
-import type { ReactNode } from 'react';
-
-import styles from './ConfigActions.module.scss';
-
-interface ConfigActionRowProps {
-	/** Leading glyph for the action. */
-	icon: ReactNode;
-	label: string;
-	onClick: () => void;
-	testId?: string;
-}
-
-/**
- * One row in the config pane's "Actions" list — a cross-page navigation link
- * (leading icon, label, trailing external-link affordance). The whole row is the
- * click target.
- */
-function ConfigActionRow({
-	icon,
-	label,
-	onClick,
-	testId,
-}: ConfigActionRowProps): JSX.Element {
-	return (
-		<Button
-			type="button"
-			variant="outlined"
-			color="secondary"
-			className={styles.row}
-			data-testid={testId}
-			onClick={onClick}
-			prefix={<span className={styles.icon}>{icon}</span>}
-			suffix={<SquareArrowOutUpRight size={14} />}
-		>
-			<Typography.Text className={styles.label}>{label}</Typography.Text>
-		</Button>
-	);
-}
-
-export default ConfigActionRow;

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/ConfigPane/ConfigActions/ConfigActions.module.scss

@@ -1,57 +0,0 @@
-/* The "Actions" group: a list of cross-page navigation links, visually separated
-   from the collapsible config sections above by the same hairline divider. */
-.divider {
-	height: 1px;
-	background: var(--l2-border);
-	margin: 18px 0;
-}
-
-.container {
-	padding: 0 16px;
-}
-
-.eyebrow {
-	display: block;
-	margin: 0 2px 10px;
-	font-size: 11px;
-	font-weight: 600;
-	letter-spacing: 0.06em;
-	text-transform: uppercase;
-	color: var(--l1-foreground);
-}
-
-.list {
-	display: flex;
-	flex-direction: column;
-}
-
-/* A navigation-link row: leading icon, label, trailing external-link affordance. */
-.row {
-	display: flex;
-	align-items: center;
-	gap: 11px;
-	width: 100%;
-	height: 44px;
-	padding: 0 4px;
-	border: none;
-	background: transparent;
-	cursor: pointer;
-	color: var(--text-vanilla-100);
-	border-radius: 4px;
-
-	&:hover {
-		background: color-mix(in srgb, var(--bg-vanilla-100) 6%, transparent);
-	}
-}
-
-.icon {
-	display: grid;
-	place-items: center;
-	flex: none;
-	color: var(--l2-foreground);
-}
-
-.label {
-	flex: 1;
-	text-align: left;
-}

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/ConfigPane/ConfigActions/ConfigActions.tsx

@@ -1,51 +0,0 @@
-import { Bell } from '@signozhq/icons';
-import type { DashboardtypesPanelDTO } from 'api/generated/services/sigNoz.schemas';
-import { getPanelDefinition } from 'pages/DashboardPageV2/DashboardContainer/Panels/registry';
-import { useCreateAlertFromPanel } from 'pages/DashboardPageV2/DashboardContainer/PanelsAndSectionsLayout/Panel/hooks/useCreateAlertFromPanel';
-
-import ConfigActionRow from './ConfigActionRow';
-import styles from './ConfigActions.module.scss';
-
-interface ConfigActionsProps {
-	/** The draft panel — its current query seeds the actions (e.g. Create alert). */
-	panel: DashboardtypesPanelDTO;
-	panelId: string;
-}
-
-/**
- * The "Actions" group at the foot of the config pane: cross-page navigation links,
- * kept distinct from the collapsible config sections above. Each link is gated by the
- * panel kind's capabilities; the whole group hides when none apply.
- */
-function ConfigActions({
-	panel,
-	panelId,
-}: ConfigActionsProps): JSX.Element | null {
-	const createAlert = useCreateAlertFromPanel();
-	const { actions } = getPanelDefinition(panel.spec.plugin.kind);
-
-	// Only kinds whose query can seed an alert offer this today; mirror the panel
-	// menu's create-alert capability.
-	if (!actions.createAlert) {
-		return null;
-	}
-
-	return (
-		<>
-			<div className={styles.divider} />
-			<div className={styles.container}>
-				<span className={styles.eyebrow}>Actions</span>
-				<div className={styles.list}>
-					<ConfigActionRow
-						testId="panel-editor-v2-create-alert"
-						icon={<Bell size={14} />}
-						label="Create alert"
-						onClick={(): void => createAlert(panel, panelId)}
-					/>
-				</div>
-			</div>
-		</>
-	);
-}
-
-export default ConfigActions;

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/ConfigPane/ConfigActions/__tests__/ConfigActions.test.tsx

@@ -1,51 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import type { DashboardtypesPanelDTO } from 'api/generated/services/sigNoz.schemas';
-
-import ConfigActions from '../ConfigActions';
-
-const mockCreateAlert = jest.fn();
-jest.mock(
-	'pages/DashboardPageV2/DashboardContainer/PanelsAndSectionsLayout/Panel/hooks/useCreateAlertFromPanel',
-	() => ({
-		useCreateAlertFromPanel: jest.fn(() => mockCreateAlert),
-	}),
-);
-
-function makePanel(kind: string): DashboardtypesPanelDTO {
-	return {
-		kind: 'Panel',
-		spec: {
-			display: { name: 'CPU' },
-			plugin: { kind, spec: {} },
-			queries: [],
-		},
-	} as unknown as DashboardtypesPanelDTO;
-}
-
-describe('ConfigActions', () => {
-	beforeEach(() => jest.clearAllMocks());
-
-	it('offers "Create alert rule" for a create-alert-capable kind and seeds from the panel', async () => {
-		const user = userEvent.setup();
-		const panel = makePanel('signoz/TimeSeriesPanel');
-		render(<ConfigActions panel={panel} panelId="panel-1" />);
-
-		const row = screen.getByTestId('panel-editor-v2-create-alert');
-		expect(row).toHaveTextContent('Create alert');
-
-		await user.click(row);
-		expect(mockCreateAlert).toHaveBeenCalledWith(panel, 'panel-1');
-	});
-
-	it('renders nothing for a kind that cannot seed an alert', () => {
-		const { container } = render(
-			<ConfigActions panel={makePanel('signoz/TablePanel')} panelId="panel-1" />,
-		);
-
-		expect(
-			screen.queryByTestId('panel-editor-v2-create-alert'),
-		).not.toBeInTheDocument();
-		expect(container).toBeEmptyDOMElement();
-	});
-});

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/ConfigPane/ConfigPane.tsx

@@ -1,22 +1,20 @@
 import { Input } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
-import type {
-	DashboardtypesPanelDTO,
-	DashboardtypesPanelSpecDTO,
-} from 'api/generated/services/sigNoz.schemas';
+import type { DashboardtypesPanelSpecDTO } from 'api/generated/services/sigNoz.schemas';
 import { getPanelDefinition } from 'pages/DashboardPageV2/DashboardContainer/Panels/registry';
 import { resolveSignal } from 'pages/DashboardPageV2/DashboardContainer/Panels/utils/getBuilderQueries';
 import type { EQueryType } from 'types/common/dashboard';
 
 import type { LegendSeries } from '../hooks/useLegendSeries';
 import type { TableColumnOption } from '../hooks/useTableColumns';
-import ConfigActions from './ConfigActions/ConfigActions';
 import SectionSlot from './SectionSlot/SectionSlot';
 
 import styles from './ConfigPane.module.scss';
 import { PanelKind } from '../../Panels/types/panelKind';
 
 interface ConfigPaneProps {
+	/** Full plugin kind (e.g. `signoz/TimeSeriesPanel`); drives which sections show. */
+	panelKind: PanelKind;
 	/** The panel spec — the single editing surface (title/description + section slices). */
 	spec: DashboardtypesPanelSpecDTO;
 	onChangeSpec: (next: DashboardtypesPanelSpecDTO) => void;
@@ -34,12 +32,6 @@ interface ConfigPaneProps {
 	tableColumns: TableColumnOption[];
 	/** Query step interval (seconds), for the chart-appearance span-gaps floor. */
 	stepInterval?: number;
-	/**
-	 * The draft panel and its id — the "Actions" group seeds cross-page links
-	 * (Create alert) from the current query.
-	 */
-	panel: DashboardtypesPanelDTO;
-	panelId: string;
 }
 
 /**
@@ -49,6 +41,7 @@ interface ConfigPaneProps {
  * generically via the section registry — only sections with a built editor appear.
  */
 function ConfigPane({
+	panelKind,
 	spec,
 	onChangeSpec,
 	onChangePanelKind,
@@ -56,10 +49,7 @@ function ConfigPane({
 	legendSeries,
 	tableColumns,
 	stepInterval,
-	panel,
-	panelId,
 }: ConfigPaneProps): JSX.Element {
-	const panelKind = spec.plugin.kind;
 	const definition = getPanelDefinition(panelKind);
 	const sections = definition.sections;
 
@@ -124,8 +114,6 @@ function ConfigPane({
 					</div>
 				</>
 			)}
-
-			<ConfigActions panel={panel} panelId={panelId} />
 		</div>
 	);
 }

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/ConfigPane/__tests__/ConfigPane.test.tsx

@@ -1,20 +1,9 @@
 import { fireEvent, render, screen } from '@testing-library/react';
-import type {
-	DashboardtypesPanelDTO,
-	DashboardtypesPanelSpecDTO,
-} from 'api/generated/services/sigNoz.schemas';
+import type { DashboardtypesPanelSpecDTO } from 'api/generated/services/sigNoz.schemas';
 import { EQueryType } from 'types/common/dashboard';
 
 import ConfigPane from '../ConfigPane';
 
-// The Actions group's hook navigates/logs; stub it so ConfigPane renders without a router.
-jest.mock(
-	'pages/DashboardPageV2/DashboardContainer/PanelsAndSectionsLayout/Panel/hooks/useCreateAlertFromPanel',
-	() => ({
-		useCreateAlertFromPanel: (): jest.Mock => jest.fn(),
-	}),
-);
-
 function spec(unit?: string): DashboardtypesPanelSpecDTO {
 	return {
 		display: { name: 'CPU', description: 'usage' },
@@ -30,14 +19,13 @@ function renderConfigPane(
 	overrides: Partial<React.ComponentProps<typeof ConfigPane>> = {},
 ): React.ComponentProps<typeof ConfigPane> {
 	const props: React.ComponentProps<typeof ConfigPane> = {
+		panelKind: 'signoz/TimeSeriesPanel',
 		spec: spec(),
 		onChangeSpec: jest.fn(),
 		onChangePanelKind: jest.fn(),
 		queryType: EQueryType.QUERY_BUILDER,
 		legendSeries: [],
 		tableColumns: [],
-		panel: { kind: 'Panel', spec: spec() } as DashboardtypesPanelDTO,
-		panelId: 'panel-1',
 		...overrides,
 	};
 	render(<ConfigPane {...props} />);
@@ -75,28 +63,4 @@ describe('ConfigPane', () => {
 			screen.getByTestId('config-section-formatting-&-units'),
 		).toBeInTheDocument();
 	});
-
-	it('renders the Actions group for a create-alert-capable panel', () => {
-		// renderConfigPane defaults to a TimeSeries panel, which can seed an alert.
-		renderConfigPane();
-
-		expect(screen.getByText('Actions')).toBeInTheDocument();
-		expect(
-			screen.getByTestId('panel-editor-v2-create-alert'),
-		).toBeInTheDocument();
-	});
-
-	it('omits the create-alert action for a kind that cannot seed an alert', () => {
-		// Table panels can't seed alerts → the Actions group hides its row. Only the
-		// panel passed to ConfigActions needs the kind; sections are asserted elsewhere.
-		const panel = {
-			kind: 'Panel',
-			spec: { ...spec(), plugin: { kind: 'signoz/TablePanel', spec: {} } },
-		} as DashboardtypesPanelDTO;
-		renderConfigPane({ panel });
-
-		expect(
-			screen.queryByTestId('panel-editor-v2-create-alert'),
-		).not.toBeInTheDocument();
-	});
 });

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/PreviewPane/PreviewPane.tsx

@@ -71,8 +71,10 @@ function PreviewPane({
 			<div className={styles.container}>
 				<div className={styles.surface}>
 					<PanelHeader
+						name={panel.spec.display.name}
+						description={panel.spec.display.description}
 						panelId={panelId}
-						panel={panel}
+						panelKind={panel.spec.plugin.kind}
 						isFetching={isFetching}
 						error={error}
 						warning={data.response?.data?.warning}

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/index.tsx

@@ -242,8 +242,7 @@ function PanelEditorContainer({
 					className={styles.right}
 				>
 					<ConfigPane
-						panel={draft}
-						panelId={panelId}
+						panelKind={draft.spec.plugin.kind}
 						spec={spec}
 						onChangeSpec={setSpec}
 						onChangePanelKind={onChangePanelKind}

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelsAndSectionsLayout/Panel/Panel.tsx

@@ -41,6 +41,10 @@ function Panel({
 	isVisible,
 	panelActions,
 }: PanelProps): JSX.Element {
+	const name = panel.spec.display.name;
+	const description = panel.spec.display?.description;
+	const fullKind = panel.spec.plugin.kind;
+
 	// A per-panel time preference is surfaced as a header pill. `visualization` is
 	// common to every plugin-spec variant — localized cast reads it without
 	// narrowing on kind.
@@ -51,8 +55,7 @@ function Panel({
 	)?.visualization?.timePreference;
 	const timeLabel = panelTimePreferenceLabel(timePreference);
 
-	const panelKind = panel.spec.plugin.kind;
-	const panelDefinition = getPanelDefinition(panelKind);
+	const panelDefinition = getPanelDefinition(fullKind);
 
 	// Header search: only kinds that declare it render the box. The term is owned
 	// here and threaded to both the header (input) and renderer (filter).
@@ -74,8 +77,10 @@ function Panel({
 			data-panel-visible={isVisible ? 'true' : 'false'}
 		>
 			<PanelHeader
+				name={name}
+				description={description}
 				panelId={panelId}
-				panel={panel}
+				panelKind={fullKind}
 				isFetching={isFetching}
 				error={error}
 				warning={data.response?.data?.warning}

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelActionsMenu/PanelActionsMenu.tsx

@@ -1,17 +1,17 @@
 import { EllipsisVertical } from '@signozhq/icons';
 import { Button } from '@signozhq/ui/button';
 import { DropdownMenuSimple } from '@signozhq/ui/dropdown-menu';
-import type { DashboardtypesPanelDTO } from 'api/generated/services/sigNoz.schemas';
 
 import ConfirmDeleteDialog from '../../../components/ConfirmDeleteDialog/ConfirmDeleteDialog';
 import type { PanelActionsConfig } from '../Panel';
 import { usePanelActionItems } from './usePanelActionItems';
 import styles from './PanelActionsMenu.module.scss';
+import { PanelKind } from 'pages/DashboardPageV2/DashboardContainer/Panels/types/panelKind';
 
 interface PanelActionsMenuProps {
 	panelId: string;
-	/** The panel itself — its query seeds "Create Alerts". */
-	panel: DashboardtypesPanelDTO;
+	/** Full plugin kind (e.g. `signoz/TimeSeriesPanel`);*/
+	panelKind: PanelKind;
 	/** Layout context for move/delete — absent outside editable sectioned mode. */
 	panelActions?: PanelActionsConfig;
 }
@@ -23,12 +23,12 @@ interface PanelActionsMenuProps {
  */
 function PanelActionsMenu({
 	panelId,
-	panel,
+	panelKind,
 	panelActions,
 }: PanelActionsMenuProps): JSX.Element | null {
 	const { items, deleteConfirm } = usePanelActionItems({
 		panelId,
-		panel,
+		panelKind,
 		panelActions,
 	});
 

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelActionsMenu/__tests__/usePanelActionItems.test.tsx

@@ -1,10 +1,10 @@
 import { act, renderHook } from '@testing-library/react';
-import type { DashboardtypesPanelDTO } from 'api/generated/services/sigNoz.schemas';
 import type { ROLES } from 'types/roles';
 
 import type { DashboardSection } from '../../../../utils';
 import { useDashboardStore } from '../../../../store/useDashboardStore';
 import { usePanelActionItems } from '../usePanelActionItems';
+import { PanelKind } from 'pages/DashboardPageV2/DashboardContainer/Panels/types/panelKind';
 
 const mockOpenEditor = jest.fn();
 jest.mock(
@@ -29,11 +29,6 @@ jest.mock('../../hooks/useClonePanel', () => ({
 	useClonePanel: (): jest.Mock => mockClonePanel,
 }));
 
-const mockCreateAlert = jest.fn();
-jest.mock('../../hooks/useCreateAlertFromPanel', () => ({
-	useCreateAlertFromPanel: (): jest.Mock => mockCreateAlert,
-}));
-
 // Role is the only thing read off the app context; useComponentPermission runs
 // for real so the tests exercise the actual role → permission mapping.
 let mockRole: ROLES = 'ADMIN';
@@ -60,20 +55,9 @@ const TWO_TITLED_SECTIONS = [section(0, 'Overview'), section(1, 'Latency')];
 // Index 0 is the untitled root (free-flow) section; index 1 is a titled section.
 const TITLED_WITH_ROOT = [section(0, undefined), section(1, 'Latency')];
 
-// Minimal panel — only its presence gates "Create Alerts"; the query→URL
-// translation it drives is covered by buildCreateAlertUrl's own tests.
-const mockPanel = {
-	kind: 'Panel',
-	spec: {
-		display: { name: 'CPU' },
-		plugin: { kind: 'signoz/TimeSeriesPanel', spec: {} },
-		queries: [],
-	},
-} as unknown as DashboardtypesPanelDTO;
-
 const baseArgs = {
 	panelId: 'panel-1',
-	panel: mockPanel,
+	panelKind: 'signoz/TimeSeriesPanel' as PanelKind,
 	panelActions: { currentLayoutIndex: 0, sections: TWO_TITLED_SECTIONS },
 };
 
@@ -131,18 +115,29 @@ describe('usePanelActionItems', () => {
 		]);
 	});
 
-	it('read-only dashboard keeps View and Create Alerts (V1 parity: both survive a lock)', () => {
+	it('unknown panel kind hides all kind-gated actions (incl. clone), keeping only move/delete', () => {
+		const { result } = renderHook(() =>
+			// A kind with no registered definition — exercises the "unsupported kind"
+			// branch. Clone is kind-gated (needs the kind to declare actions.clone),
+			// so it drops too; only the kind-agnostic layout actions remain.
+			usePanelActionItems({
+				...baseArgs,
+				panelKind: 'signoz/UnsupportedPanel' as PanelKind,
+			}),
+		);
+		expect(itemKeys(result.current)).toStrictEqual([
+			'move',
+			'divider',
+			'delete-panel',
+		]);
+	});
+
+	it('read-only dashboard keeps only View (V1 parity)', () => {
 		useDashboardStore.setState({ isEditable: false });
 		const { result } = renderHook(() =>
 			usePanelActionItems({ ...baseArgs, panelActions: undefined }),
 		);
-		// Create Alerts opens a new tab and never mutates the dashboard, so it
-		// isn't gated on edit access — matching V1's locked-dashboard menu.
-		expect(itemKeys(result.current)).toStrictEqual([
-			'view-panel',
-			'divider',
-			'create-alert',
-		]);
+		expect(itemKeys(result.current)).toStrictEqual(['view-panel']);
 	});
 
 	it('move is disabled when there is no other titled section to move to', () => {
@@ -264,26 +259,18 @@ describe('usePanelActionItems', () => {
 		});
 	});
 
-	it('not-yet-implemented actions (view) fire the placeholder alert with the feature name', () => {
+	it('not-yet-implemented actions (view/create-alert) fire the placeholder alert with the feature name', () => {
 		const alertSpy = jest.spyOn(window, 'alert').mockImplementation(() => {});
 		const { result } = renderHook(() => usePanelActionItems(baseArgs));
 
-		const view = result.current.items.find(
-			(i) => 'key' in i && i.key === 'view-panel',
-		);
-		(view as { onClick: () => void }).onClick();
+		['view-panel', 'create-alert'].forEach((key) => {
+			const item = result.current.items.find((i) => 'key' in i && i.key === key);
+			(item as { onClick: () => void }).onClick();
+		});
 
-		expect(alertSpy).toHaveBeenCalledTimes(1);
+		expect(alertSpy).toHaveBeenCalledTimes(2);
 		expect(alertSpy).toHaveBeenCalledWith('View option clicked');
+		expect(alertSpy).toHaveBeenCalledWith('Create Alerts option clicked');
 		alertSpy.mockRestore();
 	});
-
-	it('create-alert seeds an alert from this panel', () => {
-		const { result } = renderHook(() => usePanelActionItems(baseArgs));
-		const createAlert = result.current.items.find(
-			(i) => 'key' in i && i.key === 'create-alert',
-		);
-		(createAlert as { onClick: () => void }).onClick();
-		expect(mockCreateAlert).toHaveBeenCalledWith(mockPanel, 'panel-1');
-	});
 });

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelActionsMenu/usePanelActionItems.tsx

@@ -10,7 +10,6 @@ import {
 	Trash2,
 } from '@signozhq/icons';
 import type { MenuItem } from '@signozhq/ui/dropdown-menu';
-import type { DashboardtypesPanelDTO } from 'api/generated/services/sigNoz.schemas';
 import useComponentPermission from 'hooks/useComponentPermission';
 import {
 	type ConfirmableAction,
@@ -24,13 +23,13 @@ import { useAppContext } from 'providers/App/App';
 import type { DashboardSection } from '../../../utils';
 import type { PanelActionsConfig } from '../Panel';
 import { useClonePanel } from '../hooks/useClonePanel';
-import { useCreateAlertFromPanel } from '../hooks/useCreateAlertFromPanel';
 import { useDeletePanel } from '../hooks/useDeletePanel';
 import {
 	type MovePanelArgs,
 	useMovePanelToSection,
 } from '../hooks/useMovePanelToSection';
 import { PANEL_ACTION_META } from './panelActionMeta';
+import { PanelKind } from 'pages/DashboardPageV2/DashboardContainer/Panels/types/panelKind';
 
 // Stable fallback so renders without layout context don't churn the mutation
 // hooks' deps (a fresh [] each render would re-create their callbacks).
@@ -104,8 +103,8 @@ function buildMoveItems({
 
 interface UsePanelActionItemsArgs {
 	panelId: string;
-	/** The panel itself — its query seeds the "Create Alerts" action. */
-	panel: DashboardtypesPanelDTO;
+	/** Full plugin kind (e.g. `signoz/TimeSeriesPanel`); */
+	panelKind: PanelKind;
 	/** Layout context for move/delete — absent outside editable mode. */
 	panelActions?: PanelActionsConfig;
 }
@@ -129,10 +128,9 @@ export interface PanelActionItems {
  */
 export function usePanelActionItems({
 	panelId,
-	panel,
+	panelKind,
 	panelActions,
 }: UsePanelActionItemsArgs): PanelActionItems {
-	const panelKind = panel.spec.plugin.kind;
 	const { user } = useAppContext();
 	const [canEditWidget, canMove, canDelete] = useComponentPermission(
 		[
@@ -145,7 +143,6 @@ export function usePanelActionItems({
 	);
 	const isEditable = useDashboardStore((s) => s.isEditable);
 	const openPanelEditor = useOpenPanelEditor();
-	const createAlert = useCreateAlertFromPanel();
 
 	// Mutations are store-backed (dashboardId/refetch) — the layout tree only
 	// supplies data (`sections`), so no callbacks are threaded through it.
@@ -154,7 +151,7 @@ export function usePanelActionItems({
 	const deletePanel = useDeletePanel({ sections });
 	const clonePanel = useClonePanel({ sections });
 
-	const panelCapabilities = getPanelDefinition(panelKind).actions;
+	const kindActions = getPanelDefinition(panelKind)?.actions;
 
 	// Delete runs on confirm, not on click — the menu item opens a prompt.
 	const deleteConfirm = useConfirmableAction(
@@ -173,7 +170,7 @@ export function usePanelActionItems({
 
 	const items = useMemo<MenuItem[]>(() => {
 		const panelGroup: MenuItem[] = [];
-		if (panelCapabilities.view) {
+		if (kindActions?.view) {
 			panelGroup.push({
 				key: 'view-panel',
 				label: 'View',
@@ -181,7 +178,7 @@ export function usePanelActionItems({
 				onClick: (): void => notImplementedYet('View'),
 			});
 		}
-		if (isEditable && canEditWidget && panelCapabilities.edit) {
+		if (isEditable && canEditWidget && kindActions?.edit) {
 			panelGroup.push({
 				key: 'edit-panel',
 				label: 'Edit panel',
@@ -191,7 +188,7 @@ export function usePanelActionItems({
 		}
 		// Clone needs the section context (source spec + dimensions) to place the
 		// copy, so — unlike Edit — it requires panelActions.
-		if (isEditable && canEditWidget && panelActions && panelCapabilities.clone) {
+		if (isEditable && canEditWidget && panelActions && kindActions?.clone) {
 			panelGroup.push({
 				key: 'clone-panel',
 				label: 'Clone',
@@ -205,7 +202,7 @@ export function usePanelActionItems({
 		}
 
 		const dataGroup: MenuItem[] = [];
-		if (panelCapabilities.download) {
+		if (kindActions?.download) {
 			dataGroup.push({
 				key: 'download-panel',
 				label: 'Download as CSV',
@@ -213,15 +210,12 @@ export function usePanelActionItems({
 				onClick: (): void => notImplementedYet('Download'),
 			});
 		}
-		// Seeding an alert opens a new tab and never mutates the dashboard, so —
-		// unlike edit/clone — it isn't gated on `isEditable` (V1 parity: available
-		// on locked dashboards too).
-		if (panelCapabilities.createAlert) {
+		if (isEditable && kindActions?.createAlert) {
 			dataGroup.push({
 				key: 'create-alert',
 				label: 'Create Alerts',
 				icon: <Bell size={14} />,
-				onClick: (): void => createAlert(panel, panelId),
+				onClick: (): void => notImplementedYet('Create Alerts'),
 			});
 		}
 
@@ -258,13 +252,11 @@ export function usePanelActionItems({
 		canEditWidget,
 		canMove,
 		canDelete,
-		panelCapabilities,
-		panel,
+		kindActions,
 		panelActions,
 		sections,
 		panelId,
 		openPanelEditor,
-		createAlert,
 		movePanel,
 		clonePanel,
 		requestDelete,

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelHeader/PanelHeader.tsx

@@ -1,10 +1,7 @@
 import { useMemo } from 'react';
 import { Info, Loader } from '@signozhq/icons';
 import { Typography } from '@signozhq/ui/typography';
-import type {
-	DashboardtypesPanelDTO,
-	Querybuildertypesv5QueryWarnDataDTO as WarningDTO,
-} from 'api/generated/services/sigNoz.schemas';
+import type { Querybuildertypesv5QueryWarnDataDTO as WarningDTO } from 'api/generated/services/sigNoz.schemas';
 import cx from 'classnames';
 import type { PanelTimePreferenceLabel } from 'pages/DashboardPageV2/DashboardContainer/hooks/resolvePanelTimeWindow';
 
@@ -17,12 +14,15 @@ import {
 	panelStatusFromWarning,
 } from '../PanelStatus/utils';
 import styles from './PanelHeader.module.scss';
+import { PanelKind } from 'pages/DashboardPageV2/DashboardContainer/Panels/types/panelKind';
 import { TooltipSimple } from '@signozhq/ui/tooltip';
 
 interface PanelHeaderProps {
+	name: string;
+	description?: string;
 	panelId: string;
-	/** The panel itself — its query seeds the menu's "Create Alerts" action. */
-	panel: DashboardtypesPanelDTO;
+	/** Full plugin kind — drives kind-gated menu actions. */
+	panelKind: PanelKind;
 	/** Background refresh in flight — shows a spinner without blinking the chart. */
 	isFetching: boolean;
 	/** Latest query error — surfaced as a header error indicator. */
@@ -49,8 +49,10 @@ interface PanelHeaderProps {
 
 /** Panel chrome: drag handle, title, refetch + status indicators, actions. */
 function PanelHeader({
+	name,
+	description,
 	panelId,
-	panel,
+	panelKind,
 	isFetching,
 	error,
 	warning,
@@ -61,8 +63,6 @@ function PanelHeader({
 	onSearchChange,
 	hideActions,
 }: PanelHeaderProps): JSX.Element {
-	const name = panel.spec.display.name;
-	const description = panel.spec.display.description;
 	const errorDetail = useMemo(() => panelStatusFromError(error), [error]);
 
 	const warningDetail = useMemo(
@@ -116,7 +116,7 @@ function PanelHeader({
 				{!hideActions && (
 					<PanelActionsMenu
 						panelId={panelId}
-						panel={panel}
+						panelKind={panelKind}
 						panelActions={panelActions}
 					/>
 				)}

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelsAndSectionsLayout/Panel/__tests__/PanelHeader.test.tsx

@@ -1,11 +1,11 @@
 import { TooltipProvider } from '@signozhq/ui/tooltip';
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import type { DashboardtypesPanelDTO } from 'api/generated/services/sigNoz.schemas';
 import type { ReactElement } from 'react';
 import type { Warning } from 'types/api';
 
 import PanelHeader from '../PanelHeader/PanelHeader';
+import { PanelKind } from 'pages/DashboardPageV2/DashboardContainer/Panels/types/panelKind';
 
 // Status indicators use a radix tooltip, which needs a TooltipProvider ancestor
 // (supplied globally by AppLayout at runtime).
@@ -22,26 +22,9 @@ jest.mock(
 		},
 );
 
-// The header reads its name/description/kind off the panel itself.
-function makePanel(overrides?: {
-	name?: string;
-	description?: string;
-}): DashboardtypesPanelDTO {
-	return {
-		kind: 'Panel',
-		spec: {
-			display: {
-				name: overrides?.name ?? 'My panel',
-				description: overrides?.description,
-			},
-			plugin: { kind: 'signoz/TimeSeriesPanel', spec: {} },
-			queries: [],
-		},
-	} as unknown as DashboardtypesPanelDTO;
-}
-
 const baseProps = {
-	panel: makePanel(),
+	name: 'My panel',
+	panelKind: 'signoz/TimeSeriesPanel' as PanelKind,
 	panelId: 'panel-1',
 	isFetching: false,
 };
@@ -61,10 +44,7 @@ describe('PanelHeader title and description', () => {
 
 	it('shows the description info icon when a description is provided', () => {
 		renderWithProvider(
-			<PanelHeader
-				{...baseProps}
-				panel={makePanel({ description: 'What this panel measures' })}
-			/>,
+			<PanelHeader {...baseProps} description="What this panel measures" />,
 		);
 		expect(screen.getByTestId('panel-header-info-icon')).toBeInTheDocument();
 	});

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelsAndSectionsLayout/Panel/hooks/__tests__/useCreateAlertFromPanel.test.ts

@@ -1,69 +0,0 @@
-import { renderHook } from '@testing-library/react';
-import logEvent from 'api/common/logEvent';
-import type { DashboardtypesPanelDTO } from 'api/generated/services/sigNoz.schemas';
-import { PANEL_TYPES } from 'constants/queryBuilder';
-import { useDashboardStore } from 'pages/DashboardPageV2/DashboardContainer/store/useDashboardStore';
-
-import { useCreateAlertFromPanel } from '../useCreateAlertFromPanel';
-
-jest.mock('api/common/logEvent', () => ({
-	__esModule: true,
-	default: jest.fn(),
-}));
-
-const mockSafeNavigate = jest.fn();
-jest.mock('hooks/useSafeNavigate', () => ({
-	useSafeNavigate: (): { safeNavigate: jest.Mock } => ({
-		safeNavigate: mockSafeNavigate,
-	}),
-}));
-
-// The V5→V1 query→URL translation is covered by buildCreateAlertUrl's own tests;
-// stub it so this asserts only the hook's side effects (analytics + navigation).
-jest.mock('../../utils/buildCreateAlertUrl', () => ({
-	buildCreateAlertUrl: (): string => '/alerts/new?composite=1',
-}));
-
-const mockLogEvent = logEvent as jest.Mock;
-
-const panel = {
-	kind: 'Panel',
-	spec: {
-		display: { name: 'CPU' },
-		plugin: { kind: 'signoz/TimeSeriesPanel', spec: {} },
-		queries: [],
-	},
-} as unknown as DashboardtypesPanelDTO;
-
-describe('useCreateAlertFromPanel', () => {
-	beforeEach(() => {
-		jest.clearAllMocks();
-		useDashboardStore.setState({ dashboardId: 'dash-1' });
-	});
-
-	it('opens the seeded alert builder in a new tab', () => {
-		const { result } = renderHook(() => useCreateAlertFromPanel());
-
-		result.current(panel, 'panel-1');
-
-		expect(mockSafeNavigate).toHaveBeenCalledWith('/alerts/new?composite=1', {
-			newTab: true,
-		});
-	});
-
-	it('logs the create-alert action with panel and dashboard context (V1 parity)', () => {
-		const { result } = renderHook(() => useCreateAlertFromPanel());
-
-		result.current(panel, 'panel-1');
-
-		expect(mockLogEvent).toHaveBeenCalledWith(
-			'Dashboard Detail: Panel action',
-			expect.objectContaining({
-				action: 'createAlerts',
-				panelType: PANEL_TYPES.TIME_SERIES,
-				dashboardId: 'dash-1',
-				widgetId: 'panel-1',
-			}),
-		);
-	});
-});

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelsAndSectionsLayout/Panel/hooks/useCreateAlertFromPanel.ts

@@ -1,37 +0,0 @@
-import { useCallback } from 'react';
-import logEvent from 'api/common/logEvent';
-import type { DashboardtypesPanelDTO } from 'api/generated/services/sigNoz.schemas';
-import { useSafeNavigate } from 'hooks/useSafeNavigate';
-import { PANEL_KIND_TO_PANEL_TYPE } from 'pages/DashboardPageV2/DashboardContainer/Panels/types/panelKind';
-import { getPanelQueryType } from 'pages/DashboardPageV2/DashboardContainer/Panels/utils/getPanelQueryType';
-import { useDashboardStore } from 'pages/DashboardPageV2/DashboardContainer/store/useDashboardStore';
-
-import { buildCreateAlertUrl } from '../utils/buildCreateAlertUrl';
-
-/**
- * Returns a callback that opens the alert builder in a new tab, seeded from a
- * panel's query, and logs the action — mirroring V1's `useCreateAlerts`
- * ('dashboardView' caller). The panel is supplied at call time so the callback
- * stays stable across panels (and the dashboard's react-query refetches).
- */
-export function useCreateAlertFromPanel(): (
-	panel: DashboardtypesPanelDTO,
-	panelId: string,
-) => void {
-	const { safeNavigate } = useSafeNavigate();
-	const dashboardId = useDashboardStore((s) => s.dashboardId);
-
-	return useCallback(
-		(panel: DashboardtypesPanelDTO, panelId: string): void => {
-			void logEvent('Dashboard Detail: Panel action', {
-				action: 'createAlerts',
-				panelType: PANEL_KIND_TO_PANEL_TYPE[panel.spec.plugin.kind],
-				dashboardId,
-				widgetId: panelId,
-				queryType: getPanelQueryType(panel),
-			});
-			safeNavigate(buildCreateAlertUrl(panel), { newTab: true });
-		},
-		[dashboardId, safeNavigate],
-	);
-}

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelsAndSectionsLayout/Panel/utils/__tests__/buildCreateAlertUrl.test.ts

@@ -1,103 +0,0 @@
-import type { DashboardtypesPanelDTO } from 'api/generated/services/sigNoz.schemas';
-import { ENTITY_VERSION_V5 } from 'constants/app';
-import { QueryParams } from 'constants/query';
-import { PANEL_TYPES } from 'constants/queryBuilder';
-import ROUTES from 'constants/routes';
-import { fromPerses } from 'pages/DashboardPageV2/DashboardContainer/queryV5/persesQueryAdapters';
-import type { Query } from 'types/api/queryBuilder/queryBuilderData';
-import { EQueryType } from 'types/common/dashboard';
-
-import { buildCreateAlertUrl } from '../buildCreateAlertUrl';
-
-// The V5→V1 translation has its own coverage; stub it so this asserts only the
-// URL assembly (params, encoding, unit) buildCreateAlertUrl owns.
-jest.mock(
-	'pages/DashboardPageV2/DashboardContainer/queryV5/persesQueryAdapters',
-	() => ({
-		fromPerses: jest.fn(),
-	}),
-);
-
-const mockFromPerses = fromPerses as jest.Mock;
-
-const translatedQuery: Query = {
-	queryType: EQueryType.QUERY_BUILDER,
-	promql: [],
-	clickhouse_sql: [],
-	builder: { queryData: [], queryFormulas: [], queryTraceOperator: [] },
-	id: 'q1',
-};
-
-function makePanel(
-	overrides?: Partial<{ unit: string; queries: unknown[] }>,
-): DashboardtypesPanelDTO {
-	return {
-		kind: 'Panel',
-		spec: {
-			display: { name: 'CPU' },
-			plugin: {
-				kind: 'signoz/TimeSeriesPanel',
-				spec: overrides?.unit ? { formatting: { unit: overrides.unit } } : {},
-			},
-			queries: overrides?.queries ?? [{ some: 'query' }],
-		},
-	} as unknown as DashboardtypesPanelDTO;
-}
-
-describe('buildCreateAlertUrl', () => {
-	beforeEach(() => {
-		mockFromPerses.mockReset();
-		mockFromPerses.mockReturnValue({ ...translatedQuery });
-	});
-
-	function parse(url: string): URLSearchParams {
-		expect(url.startsWith(`${ROUTES.ALERTS_NEW}?`)).toBe(true);
-		return new URLSearchParams(url.slice(url.indexOf('?') + 1));
-	}
-
-	it('translates the panel queries with the mapped panel type', () => {
-		const panel = makePanel();
-		buildCreateAlertUrl(panel);
-
-		expect(mockFromPerses).toHaveBeenCalledWith(
-			panel.spec.queries,
-			PANEL_TYPES.TIME_SERIES,
-		);
-	});
-
-	it('tags the URL with panel type, v5 version, and the dashboards source', () => {
-		const params = parse(buildCreateAlertUrl(makePanel()));
-
-		expect(params.get(QueryParams.panelTypes)).toBe(PANEL_TYPES.TIME_SERIES);
-		expect(params.get(QueryParams.version)).toBe(ENTITY_VERSION_V5);
-		expect(params.get(QueryParams.source)).toBe('dashboards');
-	});
-
-	it('encodes the translated query as the compositeQuery param', () => {
-		const params = parse(buildCreateAlertUrl(makePanel()));
-
-		const raw = params.get(QueryParams.compositeQuery);
-		expect(raw).toBeTruthy();
-		const decoded = JSON.parse(decodeURIComponent(raw as string));
-		expect(decoded.queryType).toBe(EQueryType.QUERY_BUILDER);
-		expect(decoded.id).toBe('q1');
-	});
-
-	it('carries the panel formatting unit onto the alert query when set', () => {
-		const params = parse(buildCreateAlertUrl(makePanel({ unit: 'bytes' })));
-
-		const decoded = JSON.parse(
-			decodeURIComponent(params.get(QueryParams.compositeQuery) as string),
-		);
-		expect(decoded.unit).toBe('bytes');
-	});
-
-	it('leaves the query unit unset when the panel has no formatting unit', () => {
-		const params = parse(buildCreateAlertUrl(makePanel()));
-
-		const decoded = JSON.parse(
-			decodeURIComponent(params.get(QueryParams.compositeQuery) as string),
-		);
-		expect(decoded.unit).toBeUndefined();
-	});
-});

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelsAndSectionsLayout/Panel/utils/buildCreateAlertUrl.ts

@@ -1,54 +0,0 @@
-import type {
-	DashboardtypesPanelDTO,
-	DashboardtypesPanelPluginDTO,
-} from 'api/generated/services/sigNoz.schemas';
-import { YAxisSource } from 'components/YAxisUnitSelector/types';
-import { ENTITY_VERSION_V5 } from 'constants/app';
-import { QueryParams } from 'constants/query';
-import ROUTES from 'constants/routes';
-import { PANEL_KIND_TO_PANEL_TYPE } from 'pages/DashboardPageV2/DashboardContainer/Panels/types/panelKind';
-import { fromPerses } from 'pages/DashboardPageV2/DashboardContainer/queryV5/persesQueryAdapters';
-
-function readPanelUnit(
-	plugin: DashboardtypesPanelPluginDTO,
-): string | undefined {
-	switch (plugin.kind) {
-		case 'signoz/TimeSeriesPanel':
-		case 'signoz/BarChartPanel':
-		case 'signoz/NumberPanel':
-		case 'signoz/PieChartPanel':
-			return plugin.spec.formatting?.unit;
-		default:
-			return undefined;
-	}
-}
-
-/**
- * Builds the `/alerts/new` URL that seeds the alert builder from a panel's query,
- * mirroring V1's `useCreateAlerts`: the panel's V5 queries are translated to the
- * V1 `Query` the alert page reads from `compositeQuery`, tagged with the panel
- * type, entity version, and a `dashboards` source.
- *
- * Unlike V1 there is no `/substitute_vars` round-trip — V2 has no query-variable
- * plumbing yet, so any dashboard-variable references travel through verbatim.
- */
-export function buildCreateAlertUrl(panel: DashboardtypesPanelDTO): string {
-	const panelType = PANEL_KIND_TO_PANEL_TYPE[panel.spec.plugin.kind];
-	const query = fromPerses(panel.spec.queries, panelType);
-
-	const unit = readPanelUnit(panel.spec.plugin);
-	if (unit) {
-		query.unit = unit;
-	}
-
-	const params = new URLSearchParams();
-	params.set(
-		QueryParams.compositeQuery,
-		encodeURIComponent(JSON.stringify(query)),
-	);
-	params.set(QueryParams.panelTypes, panelType);
-	params.set(QueryParams.version, ENTITY_VERSION_V5);
-	params.set(QueryParams.source, YAxisSource.DASHBOARDS);
-
-	return `${ROUTES.ALERTS_NEW}?${params.toString()}`;
-}

frontend/src/pages/DashboardPageV2/DashboardContainer/hooks/__tests__/useResolvedVariables.test.tsx

@@ -1,67 +0,0 @@
-import { renderHook } from '@testing-library/react';
-import type {
-	DashboardtypesGettableDashboardV2DTO,
-	DashboardtypesVariableDTO,
-} from 'api/generated/services/sigNoz.schemas';
-
-import { selectResolvedVariables } from '../../store/slices/variableSelectionSlice';
-import { useDashboardStore } from '../../store/useDashboardStore';
-import { useResolvedVariables } from '../useResolvedVariables';
-
-// A text variable is the simplest envelope (no list plugin); the builder's full
-// type/value matrix is covered in buildVariablesPayload.test.ts. The envelope is
-// cast at the boundary — its kind discriminant is the literal 'TextVariable'.
-function textVariable(name: string, value: string): DashboardtypesVariableDTO {
-	return {
-		kind: 'TextVariable',
-		spec: { name, value, display: { name } },
-	} as unknown as DashboardtypesVariableDTO;
-}
-
-function dashboard(
-	id: string,
-	variables: DashboardtypesVariableDTO[],
-): DashboardtypesGettableDashboardV2DTO {
-	return {
-		id,
-		spec: { variables },
-	} as unknown as DashboardtypesGettableDashboardV2DTO;
-}
-
-describe('useResolvedVariables', () => {
-	afterEach(() => {
-		useDashboardStore.setState({ variableValues: {}, resolvedVariables: {} });
-	});
-
-	it('publishes the resolved V5 payload for the dashboard to the store', () => {
-		renderHook(() =>
-			useResolvedVariables(dashboard('d1', [textVariable('env', 'prod')])),
-		);
-
-		expect(
-			selectResolvedVariables('d1')(useDashboardStore.getState()),
-		).toStrictEqual({ env: { type: 'text', value: 'prod' } });
-	});
-
-	it('reflects the runtime selection over the configured default', () => {
-		useDashboardStore
-			.getState()
-			.setVariableValues('d2', { env: { value: 'staging', allSelected: false } });
-
-		renderHook(() =>
-			useResolvedVariables(dashboard('d2', [textVariable('env', 'prod')])),
-		);
-
-		expect(
-			selectResolvedVariables('d2')(useDashboardStore.getState()),
-		).toStrictEqual({ env: { type: 'text', value: 'staging' } });
-	});
-
-	it('publishes an empty payload when the dashboard has no variables', () => {
-		renderHook(() => useResolvedVariables(dashboard('d3', [])));
-
-		expect(
-			selectResolvedVariables('d3')(useDashboardStore.getState()),
-		).toStrictEqual({});
-	});
-});

frontend/src/pages/DashboardPageV2/DashboardContainer/hooks/usePanelQuery.ts

@@ -17,8 +17,6 @@ import type { PanelPagination, PanelQueryData } from '../queryV5/types';
 import { getRawResults } from '../queryV5/v5ResponseData';
 import { getBuilderQueries } from '../Panels/utils/getBuilderQueries';
 import { PANEL_KIND_TO_PANEL_TYPE } from '../Panels/types/panelKind';
-import { selectResolvedVariables } from '../store/slices/variableSelectionSlice';
-import { useDashboardStore } from '../store/useDashboardStore';
 import { resolvePanelTimeWindow } from './resolvePanelTimeWindow';
 import { useGetQueryRangeV5 } from './useGetQueryRangeV5';
 
@@ -67,9 +65,8 @@ export interface UsePanelQueryResult {
 /**
  * Fetches query-range data for a V2 panel over the pure-V5 contract: builds the request DTO
  * from the panel's perses queries (no V1 `Query` intermediary), reads global time from Redux,
- * substitutes the dashboard's resolved variable values (published to the store by
- * `useResolvedVariables`), and posts via `useGetQueryRangeV5`. Renderers consume the raw
- * response through the `queryV5` prep utils.
+ * and posts via `useGetQueryRangeV5`. Variable substitution is deferred until V2 has its own
+ * variable plumbing. Renderers consume the raw response through the `queryV5` prep utils.
  */
 export function usePanelQuery({
 	panel,
@@ -108,11 +105,6 @@ export function usePanelQuery({
 		minTime,
 	} = useSelector<AppState, GlobalReducer>((state) => state.globalTime);
 
-	// Resolved variable values for this dashboard, published by useResolvedVariables.
-	// Substituted into the request and keyed into the cache so a selection change refetches.
-	const dashboardId = useDashboardStore((s) => s.dashboardId);
-	const variables = useDashboardStore(selectResolvedVariables(dashboardId));
-
 	// `visualization` exists only on variants that declare it — read via `in` narrowing over the
 	// generated union (no cast). `fillSpans` (TimeSeries/Bar only) → formatOptions.fillGaps.
 	const pluginSpec = panel.spec.plugin.spec;
@@ -149,19 +141,8 @@ export function usePanelQuery({
 				endMs,
 				fillGaps,
 				pagination: isPaginated ? { offset, limit: pageSize } : undefined,
-				variables,
 			}),
-		[
-			queries,
-			panelType,
-			startMs,
-			endMs,
-			fillGaps,
-			isPaginated,
-			offset,
-			pageSize,
-			variables,
-		],
+		[queries, panelType, startMs, endMs, fillGaps, isPaginated, offset, pageSize],
 	);
 
 	const legendMap = useMemo(() => extractLegendMap(queries), [queries]);
@@ -186,8 +167,6 @@ export function usePanelQuery({
 			// Each page is its own cache entry (0/default for non-paged kinds).
 			offset,
 			pageSize,
-			// Variable selection changes the request, so it must re-key the cache (refetch).
-			variables,
 		],
 		[
 			panelId,
@@ -203,7 +182,6 @@ export function usePanelQuery({
 			queries,
 			offset,
 			pageSize,
-			variables,
 		],
 	);
 

frontend/src/pages/DashboardPageV2/DashboardContainer/hooks/useResolvedVariables.ts

@@ -1,42 +0,0 @@
-import { useEffect, useMemo } from 'react';
-import type { DashboardtypesGettableDashboardV2DTO } from 'api/generated/services/sigNoz.schemas';
-
-import { dtoToFormModel } from '../DashboardSettings/Variables/variableAdapters';
-import { buildVariablesPayload } from '../queryV5/buildVariablesPayload';
-import { selectVariableValues } from '../store/slices/variableSelectionSlice';
-import { useDashboardStore } from '../store/useDashboardStore';
-
-/**
- * Resolves the dashboard's variable selection into the V5 query payload and
- * publishes it to the store, so `usePanelQuery` reads it by dashboardId without
- * the spec being threaded through the panel tree (the `setEditContext` pattern).
- *
- * Definitions come from the spec; values come from the runtime selection (seeded
- * by the variable bar). Re-publishes whenever either changes, which re-keys the
- * panel queries and triggers a refetch with the new values.
- */
-export function useResolvedVariables(
-	dashboard: DashboardtypesGettableDashboardV2DTO,
-): void {
-	const dashboardId = dashboard.id ?? '';
-
-	const definitions = useMemo(
-		() => (dashboard.spec?.variables ?? []).map(dtoToFormModel),
-		[dashboard.spec?.variables],
-	);
-
-	const selection = useDashboardStore(selectVariableValues(dashboardId));
-	const setResolvedVariables = useDashboardStore((s) => s.setResolvedVariables);
-
-	const resolved = useMemo(
-		() => buildVariablesPayload(definitions, selection),
-		[definitions, selection],
-	);
-
-	useEffect(() => {
-		if (!dashboardId) {
-			return;
-		}
-		setResolvedVariables(dashboardId, resolved);
-	}, [dashboardId, resolved, setResolvedVariables]);
-}

frontend/src/pages/DashboardPageV2/DashboardContainer/index.tsx

@@ -7,7 +7,6 @@ import { useAppContext } from 'providers/App/App';
 
 import DashboardPageToolbar from './DashboardPageToolbar';
 import PanelsAndSectionsLayout from './PanelsAndSectionsLayout';
-import { useResolvedVariables } from './hooks/useResolvedVariables';
 import { useDashboardStore } from './store/useDashboardStore';
 import styles from './DashboardContainer.module.scss';
 import DashboardPageHeader from './components/DashboardPageHeader/DashboardPageHeader';
@@ -51,10 +50,6 @@ function DashboardContainer({
 		setEditContext,
 	]);
 
-	// Resolve the variable selection into the V5 query payload and publish it to
-	// the store, so each panel's query substitutes the bar's selected values.
-	useResolvedVariables(dashboard);
-
 	const spec = dashboard.spec;
 	const image = dashboard.image || Base64Icons[0];
 	const name = spec.display.name;

frontend/src/pages/DashboardPageV2/DashboardContainer/queryV5/__tests__/buildVariablesPayload.test.ts

@@ -1,103 +0,0 @@
-import {
-	emptyVariableFormModel,
-	type VariableFormModel,
-	type VariableType,
-} from '../../DashboardSettings/Variables/variableFormModel';
-import type { VariableSelectionMap } from '../../VariablesBar/selectionTypes';
-import { buildVariablesPayload } from '../buildVariablesPayload';
-
-function variable(
-	name: string,
-	type: VariableType,
-	overrides: Partial<VariableFormModel> = {},
-): VariableFormModel {
-	return { ...emptyVariableFormModel(), name, type, ...overrides };
-}
-
-describe('buildVariablesPayload', () => {
-	it('returns an empty map when there are no definitions', () => {
-		expect(buildVariablesPayload([], {})).toStrictEqual({});
-	});
-
-	it('maps each UI variable type to its V5 wire type', () => {
-		const definitions = [
-			variable('q', 'QUERY'),
-			variable('c', 'CUSTOM'),
-			variable('t', 'TEXT'),
-			variable('d', 'DYNAMIC'),
-		];
-		const selection: VariableSelectionMap = {
-			q: { value: 'a', allSelected: false },
-			c: { value: 'b', allSelected: false },
-			t: { value: 'c', allSelected: false },
-			d: { value: 'e', allSelected: false },
-		};
-		expect(buildVariablesPayload(definitions, selection)).toStrictEqual({
-			q: { type: 'query', value: 'a' },
-			c: { type: 'custom', value: 'b' },
-			t: { type: 'text', value: 'c' },
-			d: { type: 'dynamic', value: 'e' },
-		});
-	});
-
-	it('passes a multi-select array value through verbatim', () => {
-		const definitions = [variable('svc', 'QUERY', { multiSelect: true })];
-		const selection: VariableSelectionMap = {
-			svc: { value: ['a', 'b'], allSelected: false },
-		};
-		expect(buildVariablesPayload(definitions, selection)).toStrictEqual({
-			svc: { type: 'query', value: ['a', 'b'] },
-		});
-	});
-
-	it('collapses a multi-select dynamic ALL selection to the __all__ sentinel', () => {
-		const definitions = [variable('pod', 'DYNAMIC', { multiSelect: true })];
-		const selection: VariableSelectionMap = {
-			pod: { value: null, allSelected: true },
-		};
-		expect(buildVariablesPayload(definitions, selection)).toStrictEqual({
-			pod: { type: 'dynamic', value: '__all__' },
-		});
-	});
-
-	it('does NOT collapse a query ALL selection — it sends the full value array', () => {
-		const definitions = [variable('svc', 'QUERY', { multiSelect: true })];
-		const selection: VariableSelectionMap = {
-			svc: { value: ['a', 'b'], allSelected: true },
-		};
-		expect(buildVariablesPayload(definitions, selection)).toStrictEqual({
-			svc: { type: 'query', value: ['a', 'b'] },
-		});
-	});
-
-	it('falls back to a text variable configured value when unselected', () => {
-		const definitions = [variable('env', 'TEXT', { textValue: 'prod' })];
-		expect(buildVariablesPayload(definitions, {})).toStrictEqual({
-			env: { type: 'text', value: 'prod' },
-		});
-	});
-
-	it('falls back to a list variable configured default when unselected', () => {
-		const definitions = [
-			variable('region', 'QUERY', {
-				defaultValue: { value: 'us-east' },
-			} as unknown as Partial<VariableFormModel>),
-		];
-		expect(buildVariablesPayload(definitions, {})).toStrictEqual({
-			region: { type: 'query', value: 'us-east' },
-		});
-	});
-
-	it('omits a variable with no selection and no default', () => {
-		const definitions = [variable('q', 'QUERY')];
-		expect(buildVariablesPayload(definitions, {})).toStrictEqual({});
-	});
-
-	it('omits an unnamed variable', () => {
-		const definitions = [variable('', 'QUERY')];
-		const selection: VariableSelectionMap = {
-			'': { value: 'x', allSelected: false },
-		};
-		expect(buildVariablesPayload(definitions, selection)).toStrictEqual({});
-	});
-});

frontend/src/pages/DashboardPageV2/DashboardContainer/queryV5/buildQueryRangeRequest.ts

@@ -6,7 +6,6 @@ import type {
 	Querybuildertypesv5PromQueryDTO,
 	Querybuildertypesv5QueryEnvelopeDTO,
 	Querybuildertypesv5QueryRangeRequestDTO,
-	Querybuildertypesv5QueryRangeRequestDTOVariables,
 } from 'api/generated/services/sigNoz.schemas';
 import {
 	Querybuildertypesv5QueryEnvelopeBuilderDTOType,
@@ -203,13 +202,11 @@ export interface BuildQueryRangeRequestArgs {
 	fillGaps?: boolean;
 	/** Server-side paging for raw/list panels, written onto the builder queries' `offset`/`limit`. */
 	pagination?: { offset: number; limit: number };
-	/** Runtime variable values (name → {type,value}) substituted server-side; built by `buildVariablesPayload`. */
-	variables?: Querybuildertypesv5QueryRangeRequestDTOVariables;
 }
 
 /**
  * Builds the V5 query-range request DTO directly from the panel's perses queries (no V1 `Query`
- * intermediary). `variables` carries the runtime selection (empty when the dashboard has none).
+ * intermediary). Variables are absent (`variables: {}`) until V2 grows its own variable plumbing.
  */
 export function buildQueryRangeRequest({
 	queries,
@@ -218,7 +215,6 @@ export function buildQueryRangeRequest({
 	endMs,
 	fillGaps = false,
 	pagination,
-	variables = {},
 }: BuildQueryRangeRequestArgs): Querybuildertypesv5QueryRangeRequestDTO {
 	let envelopes = toQueryEnvelopes(queries);
 	if (panelType === PANEL_TYPES.BAR) {
@@ -238,7 +234,7 @@ export function buildQueryRangeRequest({
 			formatTableResultForUI: panelType === PANEL_TYPES.TABLE,
 			fillGaps,
 		},
-		variables,
+		variables: {},
 	};
 }
 

frontend/src/pages/DashboardPageV2/DashboardContainer/queryV5/buildVariablesPayload.ts

@@ -1,105 +0,0 @@
-import type {
-	Querybuildertypesv5QueryRangeRequestDTOVariables,
-	Querybuildertypesv5VariableItemDTOValue,
-} from 'api/generated/services/sigNoz.schemas';
-import { Querybuildertypesv5VariableTypeDTO } from 'api/generated/services/sigNoz.schemas';
-
-import type {
-	VariableFormModel,
-	VariableType,
-} from '../DashboardSettings/Variables/variableFormModel';
-import type {
-	SelectedVariableValue,
-	VariableSelection,
-	VariableSelectionMap,
-} from '../VariablesBar/selectionTypes';
-
-/**
- * Backend sentinel for "every value selected" on a multi-select dynamic variable.
- * V1 parity (`getDashboardVariables`): only dynamic vars collapse to `__all__`;
- * query/custom multi-selects send the full value array instead. Lowercase — the
- * URL/store `__ALL__` sentinel is a separate serialization concern.
- */
-const ALL_VALUES_SENTINEL = '__all__';
-
-/** UI variable grouping → the V5 wire `variables[].type`. */
-const VARIABLE_TYPE_TO_DTO: Record<
-	VariableType,
-	Querybuildertypesv5VariableTypeDTO
-> = {
-	QUERY: Querybuildertypesv5VariableTypeDTO.query,
-	CUSTOM: Querybuildertypesv5VariableTypeDTO.custom,
-	TEXT: Querybuildertypesv5VariableTypeDTO.text,
-	DYNAMIC: Querybuildertypesv5VariableTypeDTO.dynamic,
-};
-
-/** The variable's configured default, used when nothing is selected yet. */
-function configuredDefault(
-	definition: VariableFormModel,
-): SelectedVariableValue | undefined {
-	if (definition.type === 'TEXT') {
-		return definition.textValue || undefined;
-	}
-	return (
-		definition.defaultValue as { value?: SelectedVariableValue } | undefined
-	)?.value;
-}
-
-/**
- * Resolves the wire value for one variable: the dynamic "ALL" sentinel, else the
- * user's selection, else the configured default. Returns `undefined` when there
- * is nothing meaningful to send (the variable is then omitted from the payload).
- */
-function resolveValue(
-	definition: VariableFormModel,
-	selection: VariableSelection | undefined,
-): Querybuildertypesv5VariableItemDTOValue | undefined {
-	if (
-		definition.type === 'DYNAMIC' &&
-		definition.multiSelect &&
-		selection?.allSelected
-	) {
-		return ALL_VALUES_SENTINEL;
-	}
-
-	const selected = selection?.value;
-	const hasSelection =
-		selected !== null &&
-		selected !== undefined &&
-		!(typeof selected === 'string' && selected === '');
-	if (hasSelection) {
-		return selected as Querybuildertypesv5VariableItemDTOValue;
-	}
-
-	const fallback = configuredDefault(definition);
-	return fallback == null
-		? undefined
-		: (fallback as Querybuildertypesv5VariableItemDTOValue);
-}
-
-/**
- * Builds the V5 `variables` map from the dashboard's variable definitions and the
- * runtime selection, so a panel query substitutes the values the user picked in
- * the variable bar (V1 parity with `getDashboardVariables` + the V5 prep). The
- * definition list supplies the wire `type` (the selection map carries only values).
- */
-export function buildVariablesPayload(
-	definitions: VariableFormModel[],
-	selection: VariableSelectionMap,
-): Querybuildertypesv5QueryRangeRequestDTOVariables {
-	const payload: Querybuildertypesv5QueryRangeRequestDTOVariables = {};
-	definitions.forEach((definition) => {
-		if (!definition.name) {
-			return;
-		}
-		const value = resolveValue(definition, selection[definition.name]);
-		if (value === undefined) {
-			return;
-		}
-		payload[definition.name] = {
-			type: VARIABLE_TYPE_TO_DTO[definition.type],
-			value,
-		};
-	});
-	return payload;
-}

frontend/src/pages/DashboardPageV2/DashboardContainer/store/slices/variableSelectionSlice.ts

@@ -1,4 +1,3 @@
-import type { Querybuildertypesv5QueryRangeRequestDTOVariables } from 'api/generated/services/sigNoz.schemas';
 import type { StateCreator } from 'zustand';
 
 import type {
@@ -13,19 +12,9 @@ import type { DashboardStore } from '../useDashboardStore';
  * localStorage (mirrored to the URL by the bar for shareable links); it is
  * deliberately NOT part of the dashboard spec, so selecting a value never
  * patches the dashboard.
- *
- * `resolvedVariables` is the same selection resolved into the V5 query payload
- * shape (`{ name: { type, value } }`), published by `useResolvedVariables` so
- * `usePanelQuery` reads it without threading the dashboard spec down the tree
- * (the edit-context publish pattern). Transient — not persisted (it is derived
- * from `variableValues` + the spec on every load).
  */
 export interface VariableSelectionSlice {
 	variableValues: Record<string, VariableSelectionMap>;
-	resolvedVariables: Record<
-		string,
-		Querybuildertypesv5QueryRangeRequestDTOVariables
-	>;
 	setVariableValue: (
 		dashboardId: string,
 		name: string,
@@ -33,11 +22,6 @@ export interface VariableSelectionSlice {
 	) => void;
 	/** Bulk set (used to seed from URL/localStorage/defaults on load). */
 	setVariableValues: (dashboardId: string, values: VariableSelectionMap) => void;
-	/** Publish the resolved V5 variables payload for a dashboard. */
-	setResolvedVariables: (
-		dashboardId: string,
-		variables: Querybuildertypesv5QueryRangeRequestDTOVariables,
-	) => void;
 }
 
 export const createVariableSelectionSlice: StateCreator<
@@ -47,7 +31,6 @@ export const createVariableSelectionSlice: StateCreator<
 	VariableSelectionSlice
 > = (set, get) => ({
 	variableValues: {},
-	resolvedVariables: {},
 	setVariableValue: (dashboardId, name, selection): void => {
 		const { variableValues } = get();
 		set({
@@ -63,12 +46,6 @@ export const createVariableSelectionSlice: StateCreator<
 			variableValues: { ...variableValues, [dashboardId]: values },
 		});
 	},
-	setResolvedVariables: (dashboardId, variables): void => {
-		const { resolvedVariables } = get();
-		set({
-			resolvedVariables: { ...resolvedVariables, [dashboardId]: variables },
-		});
-	},
 });
 
 /**
@@ -83,13 +60,3 @@ export const selectVariableValues =
 	(dashboardId: string) =>
 	(state: DashboardStore): VariableSelectionMap =>
 		state.variableValues[dashboardId] ?? EMPTY_SELECTION_MAP;
-
-/** Stable empty payload — same rationale as {@link EMPTY_SELECTION_MAP}. */
-const EMPTY_RESOLVED_VARIABLES: Querybuildertypesv5QueryRangeRequestDTOVariables =
-	{};
-
-/** Selector: the resolved V5 variables payload for a dashboard (empty if none). */
-export const selectResolvedVariables =
-	(dashboardId: string) =>
-	(state: DashboardStore): Querybuildertypesv5QueryRangeRequestDTOVariables =>
-		state.resolvedVariables[dashboardId] ?? EMPTY_RESOLVED_VARIABLES;

frontend/src/utils/permission/index.ts

@@ -20,8 +20,7 @@ export type ComponentTypes =
 	| 'add_panel'
 	| 'page_pipelines'
 	| 'edit_locked_dashboard'
-	| 'add_panel_locked_dashboard'
-	| 'manage_llm_pricing';
+	| 'add_panel_locked_dashboard';
 
 export const componentPermission: Record<ComponentTypes, ROLES[]> = {
 	current_org_settings: ['ADMIN'],
@@ -43,7 +42,6 @@ export const componentPermission: Record<ComponentTypes, ROLES[]> = {
 	page_pipelines: ['ADMIN', 'EDITOR'],
 	edit_locked_dashboard: ['ADMIN', 'AUTHOR'],
 	add_panel_locked_dashboard: ['ADMIN', 'AUTHOR'],
-	manage_llm_pricing: ['ADMIN'],
 };
 
 export const routePermission: Record<keyof typeof ROUTES, ROLES[]> = {

pkg/apiserver/signozapiserver/role.go

@@ -145,5 +145,86 @@ func (provider *provider) addRoleRoutes(router *mux.Router) error {
 		return err
 	}
 
+	if err := router.Handle("/api/v1/roles/{id}/relations/{relation}/objects", handler.New(
+		provider.authzMiddleware.CheckResources(provider.authzHandler.GetObjects, authtypes.SigNozAdminRoleName),
+		handler.OpenAPIDef{
+			ID:                  "GetObjects",
+			Tags:                []string{"role"},
+			Summary:             "Get objects for a role by relation",
+			Description:         "Gets all objects connected to the specified role via a given relation type",
+			Request:             nil,
+			RequestContentType:  "",
+			Response:            make([]*coretypes.ObjectGroup, 0),
+			ResponseContentType: "application/json",
+			SuccessStatusCode:   http.StatusOK,
+			ErrorStatusCodes:    []int{http.StatusNotFound, http.StatusNotImplemented, http.StatusUnavailableForLegalReasons},
+			Deprecated:          false,
+			SecuritySchemes:     newScopedSecuritySchemes([]string{coretypes.ResourceRole.Scope(coretypes.VerbRead)}),
+		},
+		handler.WithResourceDefs(handler.BasicResourceDef{
+			Resource: coretypes.ResourceRole,
+			Verb:     coretypes.VerbRead,
+			Category: coretypes.ActionCategoryAccessControl,
+			ID:       coretypes.PathParam("id"),
+			Selector: provider.roleSelector,
+		}),
+	)).Methods(http.MethodGet).GetError(); err != nil {
+		return err
+	}
+
+	if err := router.Handle("/api/v1/roles/{id}", handler.New(
+		provider.authzMiddleware.CheckResources(provider.authzHandler.Patch, authtypes.SigNozAdminRoleName),
+		handler.OpenAPIDef{
+			ID:                  "PatchRole",
+			Tags:                []string{"role"},
+			Summary:             "Patch role",
+			Description:         "This endpoint patches a role",
+			Request:             new(authtypes.PatchableRole),
+			RequestContentType:  "",
+			Response:            nil,
+			ResponseContentType: "application/json",
+			SuccessStatusCode:   http.StatusNoContent,
+			ErrorStatusCodes:    []int{http.StatusNotFound, http.StatusNotImplemented, http.StatusUnavailableForLegalReasons},
+			Deprecated:          true,
+			SecuritySchemes:     newScopedSecuritySchemes([]string{coretypes.ResourceRole.Scope(coretypes.VerbUpdate)}),
+		},
+		handler.WithResourceDefs(handler.BasicResourceDef{
+			Resource: coretypes.ResourceRole,
+			Verb:     coretypes.VerbUpdate,
+			Category: coretypes.ActionCategoryAccessControl,
+			ID:       coretypes.PathParam("id"),
+			Selector: provider.roleSelector,
+		}),
+	)).Methods(http.MethodPatch).GetError(); err != nil {
+		return err
+	}
+
+	if err := router.Handle("/api/v1/roles/{id}/relations/{relation}/objects", handler.New(
+		provider.authzMiddleware.CheckResources(provider.authzHandler.PatchObjects, authtypes.SigNozAdminRoleName),
+		handler.OpenAPIDef{
+			ID:                  "PatchObjects",
+			Tags:                []string{"role"},
+			Summary:             "Patch objects for a role by relation",
+			Description:         "Patches the objects connected to the specified role via a given relation type",
+			Request:             new(coretypes.PatchableObjects),
+			RequestContentType:  "",
+			Response:            nil,
+			ResponseContentType: "application/json",
+			SuccessStatusCode:   http.StatusNoContent,
+			ErrorStatusCodes:    []int{http.StatusNotFound, http.StatusBadRequest, http.StatusNotImplemented, http.StatusUnavailableForLegalReasons},
+			Deprecated:          true,
+			SecuritySchemes:     newScopedSecuritySchemes([]string{coretypes.ResourceRole.Scope(coretypes.VerbUpdate)}),
+		},
+		handler.WithResourceDefs(handler.BasicResourceDef{
+			Resource: coretypes.ResourceRole,
+			Verb:     coretypes.VerbUpdate,
+			Category: coretypes.ActionCategoryAccessControl,
+			ID:       coretypes.PathParam("id"),
+			Selector: provider.roleSelector,
+		}),
+	)).Methods(http.MethodPatch).GetError(); err != nil {
+		return err
+	}
+
 	return nil
 }

pkg/authz/authz.go

@@ -39,6 +39,15 @@ type AuthZ interface {
 	// Gets the role if it exists or creates one.
 	GetOrCreate(context.Context, valuer.UUID, *authtypes.Role) (*authtypes.Role, error)
 
+	// Gets the objects associated with the given role and relation.
+	GetObjects(context.Context, valuer.UUID, valuer.UUID, authtypes.Relation) ([]*coretypes.Object, error)
+
+	// Patches the role.
+	Patch(context.Context, valuer.UUID, *authtypes.Role) error
+
+	// Patches the objects in authorization server associated with the given role and relation
+	PatchObjects(context.Context, valuer.UUID, string, authtypes.Relation, []*coretypes.Object, []*coretypes.Object) error
+
 	// Updates the role's metadata and reconciles its transaction groups.
 	Update(context.Context, valuer.UUID, *authtypes.RoleWithTransactionGroups) error
 
@@ -93,8 +102,14 @@ type Handler interface {
 
 	Get(http.ResponseWriter, *http.Request)
 
+	GetObjects(http.ResponseWriter, *http.Request)
+
 	List(http.ResponseWriter, *http.Request)
 
+	Patch(http.ResponseWriter, *http.Request)
+
+	PatchObjects(http.ResponseWriter, *http.Request)
+
 	Update(http.ResponseWriter, *http.Request)
 
 	Check(http.ResponseWriter, *http.Request)

pkg/authz/openfgaauthz/provider.go

@@ -189,10 +189,22 @@ func (provider *provider) GetOrCreate(_ context.Context, _ valuer.UUID, _ *autht
 	return nil, errors.Newf(errors.TypeUnsupported, authtypes.ErrCodeRoleUnsupported, "not implemented")
 }
 
+func (provider *provider) GetObjects(ctx context.Context, orgID valuer.UUID, id valuer.UUID, relation authtypes.Relation) ([]*coretypes.Object, error) {
+	return nil, errors.Newf(errors.TypeUnsupported, authtypes.ErrCodeRoleUnsupported, "not implemented")
+}
+
 func (provider *provider) Update(_ context.Context, _ valuer.UUID, _ *authtypes.RoleWithTransactionGroups) error {
 	return errors.Newf(errors.TypeUnsupported, authtypes.ErrCodeRoleUnsupported, "not implemented")
 }
 
+func (provider *provider) Patch(_ context.Context, _ valuer.UUID, _ *authtypes.Role) error {
+	return errors.Newf(errors.TypeUnsupported, authtypes.ErrCodeRoleUnsupported, "not implemented")
+}
+
+func (provider *provider) PatchObjects(_ context.Context, _ valuer.UUID, _ string, _ authtypes.Relation, _, _ []*coretypes.Object) error {
+	return errors.Newf(errors.TypeUnsupported, authtypes.ErrCodeRoleUnsupported, "not implemented")
+}
+
 func (provider *provider) Delete(_ context.Context, _ valuer.UUID, _ valuer.UUID) error {
 	return errors.Newf(errors.TypeUnsupported, authtypes.ErrCodeRoleUnsupported, "not implemented")
 }

pkg/authz/signozauthzapi/handler.go

@@ -74,6 +74,46 @@ func (handler *handler) Get(rw http.ResponseWriter, r *http.Request) {
 	render.Success(rw, http.StatusOK, roleWithTransactionGroups)
 }
 
+func (handler *handler) GetObjects(rw http.ResponseWriter, r *http.Request) {
+	ctx := r.Context()
+	claims, err := authtypes.ClaimsFromContext(ctx)
+	if err != nil {
+		render.Error(rw, err)
+		return
+	}
+
+	id, ok := mux.Vars(r)["id"]
+	if !ok {
+		render.Error(rw, errors.New(errors.TypeInvalidInput, authtypes.ErrCodeRoleInvalidInput, "id is missing from the request"))
+		return
+	}
+	roleID, err := valuer.NewUUID(id)
+	if err != nil {
+		render.Error(rw, err)
+		return
+	}
+
+	relationStr, ok := mux.Vars(r)["relation"]
+	if !ok {
+		render.Error(rw, errors.New(errors.TypeInvalidInput, authtypes.ErrCodeRoleInvalidInput, "relation is missing from the request"))
+		return
+	}
+
+	relation, err := coretypes.NewVerb(relationStr)
+	if err != nil {
+		render.Error(rw, err)
+		return
+	}
+
+	objects, err := handler.authz.GetObjects(ctx, valuer.MustNewUUID(claims.OrgID), roleID, authtypes.Relation{Verb: relation})
+	if err != nil {
+		render.Error(rw, err)
+		return
+	}
+
+	render.Success(rw, http.StatusOK, coretypes.NewObjectGroupsFromObjects(objects))
+}
+
 func (handler *handler) List(rw http.ResponseWriter, r *http.Request) {
 	ctx := r.Context()
 	claims, err := authtypes.ClaimsFromContext(ctx)
@@ -91,6 +131,99 @@ func (handler *handler) List(rw http.ResponseWriter, r *http.Request) {
 	render.Success(rw, http.StatusOK, roles)
 }
 
+func (handler *handler) Patch(rw http.ResponseWriter, r *http.Request) {
+	ctx := r.Context()
+	claims, err := authtypes.ClaimsFromContext(ctx)
+	if err != nil {
+		render.Error(rw, err)
+		return
+	}
+
+	id, err := valuer.NewUUID(mux.Vars(r)["id"])
+	if err != nil {
+		render.Error(rw, err)
+		return
+	}
+
+	req := new(authtypes.PatchableRole)
+	if err := binding.JSON.BindBody(r.Body, req); err != nil {
+		render.Error(rw, err)
+		return
+	}
+
+	role, err := handler.authz.Get(ctx, valuer.MustNewUUID(claims.OrgID), id)
+	if err != nil {
+		render.Error(rw, err)
+		return
+	}
+
+	err = role.PatchMetadata(req.Description)
+	if err != nil {
+		render.Error(rw, err)
+		return
+	}
+
+	err = handler.authz.Patch(ctx, valuer.MustNewUUID(claims.OrgID), role)
+	if err != nil {
+		render.Error(rw, err)
+		return
+	}
+
+	render.Success(rw, http.StatusNoContent, nil)
+}
+
+func (handler *handler) PatchObjects(rw http.ResponseWriter, r *http.Request) {
+	ctx := r.Context()
+	claims, err := authtypes.ClaimsFromContext(ctx)
+	if err != nil {
+		render.Error(rw, err)
+		return
+	}
+
+	id, err := valuer.NewUUID(mux.Vars(r)["id"])
+	if err != nil {
+		render.Error(rw, err)
+		return
+	}
+
+	relation, err := coretypes.NewVerb(mux.Vars(r)["relation"])
+	if err != nil {
+		render.Error(rw, err)
+		return
+	}
+
+	role, err := handler.authz.Get(ctx, valuer.MustNewUUID(claims.OrgID), id)
+	if err != nil {
+		render.Error(rw, err)
+		return
+	}
+
+	if err := role.ErrIfManaged(); err != nil {
+		render.Error(rw, err)
+		return
+	}
+
+	req := new(coretypes.PatchableObjects)
+	if err := binding.JSON.BindBody(r.Body, req); err != nil {
+		render.Error(rw, err)
+		return
+	}
+
+	additions, deletions, err := coretypes.NewPatchableObjects(req.Additions, req.Deletions, relation)
+	if err != nil {
+		render.Error(rw, err)
+		return
+	}
+
+	err = handler.authz.PatchObjects(ctx, valuer.MustNewUUID(claims.OrgID), role.Name, authtypes.Relation{Verb: relation}, additions, deletions)
+	if err != nil {
+		render.Error(rw, err)
+		return
+	}
+
+	render.Success(rw, http.StatusNoContent, nil)
+}
+
 func (handler *handler) Update(rw http.ResponseWriter, r *http.Request) {
 	ctx := r.Context()
 	claims, err := authtypes.ClaimsFromContext(ctx)

pkg/modules/dashboard/dashboard.go

@@ -49,7 +49,7 @@ type Module interface {
 	// DeleteUnsafe deletes a dashboard bypassing the guards. Intended for internal system callers.
 	DeleteUnsafe(ctx context.Context, orgID valuer.UUID, id valuer.UUID) error
 
-	GetByMetricNames(ctx context.Context, orgID valuer.UUID, metricNames []string) (map[string][]dashboardtypes.DashboardPanelRef, error)
+	GetByMetricNames(ctx context.Context, orgID valuer.UUID, metricNames []string) (map[string][]map[string]string, error)
 
 	statsreporter.StatsCollector
 

pkg/modules/dashboard/impldashboard/module.go

@@ -11,7 +11,6 @@ import (
 	"github.com/SigNoz/signoz/pkg/modules/dashboard"
 	"github.com/SigNoz/signoz/pkg/modules/organization"
 	"github.com/SigNoz/signoz/pkg/modules/tag"
-	"github.com/SigNoz/signoz/pkg/querybuilder"
 	"github.com/SigNoz/signoz/pkg/queryparser"
 	"github.com/SigNoz/signoz/pkg/types"
 	"github.com/SigNoz/signoz/pkg/types/coretypes"
@@ -169,13 +168,13 @@ func (module *module) DeleteUnsafe(ctx context.Context, orgID valuer.UUID, id va
 	return module.store.Delete(ctx, orgID, id)
 }
 
-func (module *module) GetByMetricNames(ctx context.Context, orgID valuer.UUID, metricNames []string) (map[string][]dashboardtypes.DashboardPanelRef, error) {
+func (module *module) GetByMetricNames(ctx context.Context, orgID valuer.UUID, metricNames []string) (map[string][]map[string]string, error) {
 	dashboards, err := module.List(ctx, orgID)
 	if err != nil {
 		return nil, err
 	}
 
-	result := make(map[string][]dashboardtypes.DashboardPanelRef)
+	result := make(map[string][]map[string]string)
 
 	for _, dashboard := range dashboards {
 		dashData := dashboard.Data
@@ -199,27 +198,21 @@ func (module *module) GetByMetricNames(ctx context.Context, orgID valuer.UUID, m
 				continue
 			}
 
-			// Track which metrics were found in this widget, along with the
-			// group-by and filter labels referenced for each metric. CH/PromQL
-			// paths are presence-only and leave the label sets empty.
+			// Track which metrics were found in this widget
 			foundMetrics := make(map[string]bool)
-			groupByByMetric := make(map[string][]string)
-			filterByByMetric := make(map[string][]string)
 
 			// Check all three query types
-			module.checkBuilderQueriesForMetricNames(query, metricNames, foundMetrics, groupByByMetric, filterByByMetric)
+			module.checkBuilderQueriesForMetricNames(query, metricNames, foundMetrics)
 			module.checkClickHouseQueriesForMetricNames(ctx, query, metricNames, foundMetrics)
 			module.checkPromQLQueriesForMetricNames(ctx, query, metricNames, foundMetrics)
 
 			// Add widget to results for all found metrics
 			for metricName := range foundMetrics {
-				result[metricName] = append(result[metricName], dashboardtypes.DashboardPanelRef{
-					DashboardID:   dashboard.ID,
-					DashboardName: dashTitle,
-					PanelID:       widgetID,
-					PanelName:     widgetTitle,
-					GroupBy:       groupByByMetric[metricName],
-					FilterBy:      filterByByMetric[metricName],
+				result[metricName] = append(result[metricName], map[string]string{
+					"dashboard_id":   dashboard.ID,
+					"widget_name":    widgetTitle,
+					"widget_id":      widgetID,
+					"dashboard_name": dashTitle,
 				})
 			}
 		}
@@ -267,10 +260,7 @@ func (module *module) DeletePublic(_ context.Context, _ valuer.UUID, _ valuer.UU
 }
 
 // checkBuilderQueriesForMetricNames checks builder.queryData[] for aggregations[].metricName.
-// For each queryData entry whose dataSource is "metrics" and that references a
-// target metric, it accumulates (deduped) the group-by and filter labels used
-// by that entry into groupByByMetric/filterByByMetric, keyed by metric name.
-func (module *module) checkBuilderQueriesForMetricNames(query map[string]interface{}, metricNames []string, foundMetrics map[string]bool, groupByByMetric, filterByByMetric map[string][]string) {
+func (module *module) checkBuilderQueriesForMetricNames(query map[string]interface{}, metricNames []string, foundMetrics map[string]bool) {
 	builder, ok := query["builder"].(map[string]interface{})
 	if !ok {
 		return
@@ -298,7 +288,6 @@ func (module *module) checkBuilderQueriesForMetricNames(query map[string]interfa
 			continue
 		}
 
-		entryMetrics := make([]string, 0, len(aggregations))
 		for _, agg := range aggregations {
 			aggMap, ok := agg.(map[string]interface{})
 			if !ok {
@@ -312,98 +301,9 @@ func (module *module) checkBuilderQueriesForMetricNames(query map[string]interfa
 
 			if slices.Contains(metricNames, metricName) {
 				foundMetrics[metricName] = true
-				entryMetrics = append(entryMetrics, metricName)
-			}
-		}
-
-		if len(entryMetrics) == 0 {
-			continue
-		}
-
-		groupBy := extractBuilderGroupByLabels(data)
-		filterBy := extractBuilderFilterLabels(data)
-		for _, metricName := range entryMetrics {
-			groupByByMetric[metricName] = appendDedup(groupByByMetric[metricName], groupBy...)
-			filterByByMetric[metricName] = appendDedup(filterByByMetric[metricName], filterBy...)
-		}
-	}
-}
-
-func extractBuilderGroupByLabels(data map[string]interface{}) []string {
-	gb, ok := data["groupBy"].([]interface{})
-	if !ok {
-		return nil
-	}
-
-	out := make([]string, 0, len(gb))
-	for _, g := range gb {
-		gm, ok := g.(map[string]interface{})
-		if !ok {
-			continue
-		}
-		if name, ok := gm["name"].(string); ok && name != "" {
-			out = append(out, name)
-			continue
-		}
-		// v3: groupBy[].key may be a plain string ...
-		if key, ok := gm["key"].(string); ok && key != "" {
-			out = append(out, key)
-			continue
-		}
-		// ... or a nested object {key: "<name>"}.
-		if km, ok := gm["key"].(map[string]interface{}); ok {
-			if key, ok := km["key"].(string); ok && key != "" {
-				out = append(out, key)
 			}
 		}
 	}
-	return out
-}
-
-func extractBuilderFilterLabels(data map[string]interface{}) []string {
-	out := []string{}
-
-	// v5: filter.expression
-	if f, ok := data["filter"].(map[string]interface{}); ok {
-		if expr, ok := f["expression"].(string); ok && expr != "" {
-			for _, sel := range querybuilder.QueryStringToKeysSelectors(expr) {
-				if sel != nil && sel.Name != "" {
-					out = append(out, sel.Name)
-				}
-			}
-		}
-	}
-
-	// v3: filters.items[].key.key
-	if f, ok := data["filters"].(map[string]interface{}); ok {
-		if items, ok := f["items"].([]interface{}); ok {
-			for _, it := range items {
-				im, ok := it.(map[string]interface{})
-				if !ok {
-					continue
-				}
-				km, ok := im["key"].(map[string]interface{})
-				if !ok {
-					continue
-				}
-				if key, ok := km["key"].(string); ok && key != "" {
-					out = append(out, key)
-				}
-			}
-		}
-	}
-
-	return out
-}
-
-func appendDedup(dst []string, values ...string) []string {
-	for _, v := range values {
-		if v == "" || slices.Contains(dst, v) {
-			continue
-		}
-		dst = append(dst, v)
-	}
-	return dst
 }
 
 // checkClickHouseQueriesForMetricNames checks clickhouse_sql[] array for metric names in query strings.

pkg/modules/fields/implfields/handler.go

@@ -7,9 +7,7 @@ import (
 	"github.com/SigNoz/signoz/pkg/http/binding"
 	"github.com/SigNoz/signoz/pkg/http/render"
 	"github.com/SigNoz/signoz/pkg/modules/fields"
-	"github.com/SigNoz/signoz/pkg/types/authtypes"
 	"github.com/SigNoz/signoz/pkg/types/telemetrytypes"
-	"github.com/SigNoz/signoz/pkg/valuer"
 )
 
 type handler struct {
@@ -56,13 +54,7 @@ func (handler *handler) GetFieldsValues(rw http.ResponseWriter, req *http.Reques
 
 	fieldValueSelector := telemetrytypes.NewFieldValueSelectorFromPostableFieldValueParams(params)
 
-	claims, err := authtypes.ClaimsFromContext(ctx)
-	if err != nil {
-		render.Error(rw, err)
-		return
-	}
-
-	allValues, allComplete, err := handler.telemetryMetadataStore.GetAllValues(ctx, valuer.MustNewUUID(claims.OrgID), fieldValueSelector)
+	allValues, allComplete, err := handler.telemetryMetadataStore.GetAllValues(ctx, fieldValueSelector)
 	if err != nil {
 		render.Error(rw, err)
 		return

pkg/modules/inframonitoring/implinframonitoring/clusters.go

@@ -132,12 +132,12 @@ func (m *module) getTopClusterGroups(
 	return paginateWithBackfill(allMetricGroups, metadataMap, req.GroupBy, req.Offset, req.Limit), nil
 }
 
-func (m *module) getClustersTableMetadata(ctx context.Context, orgID valuer.UUID, req *inframonitoringtypes.PostableClusters) (map[string]map[string]string, error) {
+func (m *module) getClustersTableMetadata(ctx context.Context, req *inframonitoringtypes.PostableClusters) (map[string]map[string]string, error) {
 	var nonGroupByAttrs []string
 	for _, key := range clusterAttrKeysForMetadata {
 		if !isKeyInGroupByAttrs(req.GroupBy, key) {
 			nonGroupByAttrs = append(nonGroupByAttrs, key)
 		}
 	}
-	return m.getMetadata(ctx, orgID, clustersTableMetricNamesList, req.GroupBy, nonGroupByAttrs, req.Filter, req.Start, req.End)
+	return m.getMetadata(ctx, clustersTableMetricNamesList, req.GroupBy, nonGroupByAttrs, req.Filter, req.Start, req.End)
 }

pkg/modules/inframonitoring/implinframonitoring/daemonsets.go

@@ -140,12 +140,12 @@ func (m *module) getTopDaemonSetGroups(
 	return paginateWithBackfill(allMetricGroups, metadataMap, req.GroupBy, req.Offset, req.Limit), nil
 }
 
-func (m *module) getDaemonSetsTableMetadata(ctx context.Context, orgID valuer.UUID, req *inframonitoringtypes.PostableDaemonSets) (map[string]map[string]string, error) {
+func (m *module) getDaemonSetsTableMetadata(ctx context.Context, req *inframonitoringtypes.PostableDaemonSets) (map[string]map[string]string, error) {
 	var nonGroupByAttrs []string
 	for _, key := range daemonSetAttrKeysForMetadata {
 		if !isKeyInGroupByAttrs(req.GroupBy, key) {
 			nonGroupByAttrs = append(nonGroupByAttrs, key)
 		}
 	}
-	return m.getMetadata(ctx, orgID, daemonSetsTableMetricNamesList, req.GroupBy, nonGroupByAttrs, req.Filter, req.Start, req.End)
+	return m.getMetadata(ctx, daemonSetsTableMetricNamesList, req.GroupBy, nonGroupByAttrs, req.Filter, req.Start, req.End)
 }

pkg/modules/inframonitoring/implinframonitoring/deployments.go

@@ -140,12 +140,12 @@ func (m *module) getTopDeploymentGroups(
 	return paginateWithBackfill(allMetricGroups, metadataMap, req.GroupBy, req.Offset, req.Limit), nil
 }
 
-func (m *module) getDeploymentsTableMetadata(ctx context.Context, orgID valuer.UUID, req *inframonitoringtypes.PostableDeployments) (map[string]map[string]string, error) {
+func (m *module) getDeploymentsTableMetadata(ctx context.Context, req *inframonitoringtypes.PostableDeployments) (map[string]map[string]string, error) {
 	var nonGroupByAttrs []string
 	for _, key := range deploymentAttrKeysForMetadata {
 		if !isKeyInGroupByAttrs(req.GroupBy, key) {
 			nonGroupByAttrs = append(nonGroupByAttrs, key)
 		}
 	}
-	return m.getMetadata(ctx, orgID, deploymentsTableMetricNamesList, req.GroupBy, nonGroupByAttrs, req.Filter, req.Start, req.End)
+	return m.getMetadata(ctx, deploymentsTableMetricNamesList, req.GroupBy, nonGroupByAttrs, req.Filter, req.Start, req.End)
 }

pkg/modules/inframonitoring/implinframonitoring/helpers.go

@@ -7,14 +7,11 @@ import (
 	"strings"
 
 	"github.com/SigNoz/signoz/pkg/errors"
-	"github.com/SigNoz/signoz/pkg/flagger"
 	"github.com/SigNoz/signoz/pkg/querybuilder"
 	"github.com/SigNoz/signoz/pkg/telemetrymetrics"
-	"github.com/SigNoz/signoz/pkg/types/featuretypes"
 	"github.com/SigNoz/signoz/pkg/types/metrictypes"
 	qbtypes "github.com/SigNoz/signoz/pkg/types/querybuildertypes/querybuildertypesv5"
 	"github.com/SigNoz/signoz/pkg/types/telemetrytypes"
-	"github.com/SigNoz/signoz/pkg/valuer"
 	"github.com/huandu/go-sqlbuilder"
 )
 
@@ -370,33 +367,6 @@ func (m *module) buildSamplesTblFingerprintSubQuery(metricNames []string, sample
 	return fpSB
 }
 
-// buildReducedSamplesTblFingerprintSubQuery is like buildSamplesTblFingerprintSubQuery
-// but for the reduced tables.
-func (m *module) buildReducedSamplesTblFingerprintSubQuery(metricNames []string, flooredStart, flooredEnd uint64) *sqlbuilder.SelectBuilder {
-	lastSB := sqlbuilder.NewSelectBuilder()
-	lastSB.Select("reduced_fingerprint")
-	lastSB.From(fmt.Sprintf("%s.%s", telemetrymetrics.DBName, telemetrymetrics.SamplesV4ReducedLastTableName))
-	lastSB.Where(
-		lastSB.In("metric_name", sqlbuilder.List(metricNames)),
-		lastSB.GE("unix_milli", flooredStart),
-		lastSB.L("unix_milli", flooredEnd),
-	)
-
-	sumSB := sqlbuilder.NewSelectBuilder()
-	sumSB.Select("reduced_fingerprint")
-	sumSB.From(fmt.Sprintf("%s.%s", telemetrymetrics.DBName, telemetrymetrics.SamplesV4ReducedSumTableName))
-	sumSB.Where(
-		sumSB.In("metric_name", sqlbuilder.List(metricNames)),
-		sumSB.GE("unix_milli", flooredStart),
-		sumSB.L("unix_milli", flooredEnd),
-	)
-
-	fpSB := sqlbuilder.NewSelectBuilder()
-	fpSB.Select("DISTINCT reduced_fingerprint AS fingerprint")
-	fpSB.From(fpSB.BuilderAs(sqlbuilder.UnionAll(lastSB, sumSB), "reduced_samples"))
-	return fpSB
-}
-
 func (m *module) buildFilterClause(ctx context.Context, filter *qbtypes.Filter, startMillis, endMillis int64) (*sqlbuilder.WhereClause, error) {
 	expression := ""
 	if filter != nil {
@@ -563,7 +533,6 @@ func (m *module) getAttributesExistence(ctx context.Context, metricNames, attrNa
 // mapping to a flat map of attr_name -> attr_value (includes both groupBy and additional cols).
 func (m *module) getMetadata(
 	ctx context.Context,
-	orgID valuer.UUID,
 	metricNames []string,
 	groupBy []qbtypes.GroupByKey,
 	additionalCols []string,
@@ -577,8 +546,6 @@ func (m *module) getMetadata(
 		return nil, errors.NewInvalidInputf(errors.CodeInvalidInput, "groupBy must not be empty")
 	}
 
-	reductionEnabled := m.fl.BooleanOrEmpty(ctx, flagger.FeatureEnableMetricsReduction, featuretypes.NewFlaggerEvaluationContext(orgID))
-
 	// Step-floor the window and pick the right tables — matches the bounds the
 	// QB v5 metric querier uses, so metadataMap covers the same universe the
 	// ranking sees (see alignedMetricWindow doc).
@@ -616,64 +583,22 @@ func (m *module) getMetadata(
 	}
 
 	innerSB.Select(innerSelectCols...)
+	innerSB.From(fmt.Sprintf("%s.%s", telemetrymetrics.DBName, distributedTableName))
+	innerSB.Where(
+		innerSB.In("metric_name", sqlbuilder.List(metricNames)),
+		innerSB.GE("unix_milli", tsAdjustedStartMs),
+		innerSB.LE("unix_milli", flooredEndMs),
+		fmt.Sprintf("fingerprint IN (%s)", innerSB.Var(fpSB)),
+	)
 
-	if reductionEnabled {
-		var filterClause *sqlbuilder.WhereClause
-		if filter != nil && strings.TrimSpace(filter.Expression) != "" {
-			var err error
-			filterClause, err = m.buildFilterClause(ctx, filter, startMs, endMs)
-			if err != nil {
-				return nil, err
-			}
+	// Apply optional filter expression
+	if filter != nil && strings.TrimSpace(filter.Expression) != "" {
+		filterClause, err := m.buildFilterClause(ctx, filter, startMs, endMs)
+		if err != nil {
+			return nil, err
 		}
-
-		reducedFpSB := m.buildReducedSamplesTblFingerprintSubQuery(metricNames, samplesStartMs, flooredEndMs)
-
-		rawSrc := sqlbuilder.NewSelectBuilder()
-		rawSrc.Select("labels", "unix_milli")
-		rawSrc.From(fmt.Sprintf("%s.%s", telemetrymetrics.DBName, distributedTableName))
-		rawSrc.Where(
-			rawSrc.In("metric_name", sqlbuilder.List(metricNames)),
-			rawSrc.GE("unix_milli", tsAdjustedStartMs),
-			rawSrc.LE("unix_milli", flooredEndMs),
-			fmt.Sprintf("fingerprint IN (%s)", rawSrc.Var(fpSB)),
-		)
 		if filterClause != nil {
-			rawSrc.AddWhereClause(sqlbuilder.CopyWhereClause(filterClause))
-		}
-
-		reducedSrc := sqlbuilder.NewSelectBuilder()
-		reducedSrc.Select("labels", "unix_milli")
-		reducedSrc.From(fmt.Sprintf("%s.%s", telemetrymetrics.DBName, telemetrymetrics.TimeseriesV4ReducedTableName))
-		reducedSrc.Where(
-			reducedSrc.In("metric_name", sqlbuilder.List(metricNames)),
-			reducedSrc.GE("unix_milli", tsAdjustedStartMs),
-			reducedSrc.LE("unix_milli", flooredEndMs),
-			fmt.Sprintf("fingerprint IN (%s)", reducedSrc.Var(reducedFpSB)),
-		)
-		if filterClause != nil {
-			reducedSrc.AddWhereClause(sqlbuilder.CopyWhereClause(filterClause))
-		}
-
-		// Inner query reads over the union of raw + reduced series.
-		innerSB.From(innerSB.BuilderAs(sqlbuilder.UnionAll(rawSrc, reducedSrc), "series"))
-	} else {
-		innerSB.From(fmt.Sprintf("%s.%s", telemetrymetrics.DBName, distributedTableName))
-		innerSB.Where(
-			innerSB.In("metric_name", sqlbuilder.List(metricNames)),
-			innerSB.GE("unix_milli", tsAdjustedStartMs),
-			innerSB.LE("unix_milli", flooredEndMs),
-			fmt.Sprintf("fingerprint IN (%s)", innerSB.Var(fpSB)),
-		)
-
-		if filter != nil && strings.TrimSpace(filter.Expression) != "" {
-			filterClause, err := m.buildFilterClause(ctx, filter, startMs, endMs)
-			if err != nil {
-				return nil, err
-			}
-			if filterClause != nil {
-				innerSB.AddWhereClause(filterClause)
-			}
+			innerSB.AddWhereClause(filterClause)
 		}
 	}
 

pkg/modules/inframonitoring/implinframonitoring/hosts.go

@@ -6,9 +6,7 @@ import (
 	"slices"
 	"strings"
 
-	"github.com/SigNoz/signoz/pkg/flagger"
 	"github.com/SigNoz/signoz/pkg/telemetrymetrics"
-	"github.com/SigNoz/signoz/pkg/types/featuretypes"
 	"github.com/SigNoz/signoz/pkg/types/inframonitoringtypes"
 	qbtypes "github.com/SigNoz/signoz/pkg/types/querybuildertypes/querybuildertypesv5"
 	"github.com/SigNoz/signoz/pkg/valuer"
@@ -22,15 +20,12 @@ import (
 // and a simple uniqExactIf for total count. Inactive = total - active (computed in Go).
 func (m *module) getPerGroupHostStatusCounts(
 	ctx context.Context,
-	orgID valuer.UUID,
 	req *inframonitoringtypes.PostableHosts,
 	metricNames []string,
 	pageGroups []map[string]string,
 	sinceUnixMilli int64,
 ) (map[string]groupHostStatusCounts, error) {
 
-	reductionEnabled := m.fl.BooleanOrEmpty(ctx, flagger.FeatureEnableMetricsReduction, featuretypes.NewFlaggerEvaluationContext(orgID))
-
 	// Build the full filter expression from req (user filter + status filter) and page groups.
 	reqFilterExpr := ""
 	if req.Filter != nil {
@@ -58,65 +53,27 @@ func (m *module) getPerGroupHostStatusCounts(
 		fmt.Sprintf("uniqExactIf(%s, %s != '') AS total_host_count", hostNameExpr, hostNameExpr),
 	)
 
+	// Build a fingerprint subquery to restrict to fingerprints with actual sample
+	// data in the floored time range.
+	fpSB := m.buildSamplesTblFingerprintSubQuery(metricNames, localSamplesTable, samplesStartMs, flooredEndMs)
+
 	sb.Select(selectCols...)
+	sb.From(fmt.Sprintf("%s.%s", telemetrymetrics.DBName, distributedTimeSeriesTableName))
+	sb.Where(
+		sb.In("metric_name", sqlbuilder.List(metricNames)),
+		sb.GE("unix_milli", tsAdjustedStartMs),
+		sb.LE("unix_milli", flooredEndMs),
+		fmt.Sprintf("fingerprint IN (%s)", sb.Var(fpSB)),
+	)
 
-	if reductionEnabled {
-		var filterClause *sqlbuilder.WhereClause
-		if filterExpr != "" {
-			var err error
-			filterClause, err = m.buildFilterClause(ctx, &qbtypes.Filter{Expression: filterExpr}, req.Start, req.End)
-			if err != nil {
-				return nil, err
-			}
+	// Apply the combined filter expression (user filter + status filter + page groups IN).
+	if filterExpr != "" {
+		filterClause, err := m.buildFilterClause(ctx, &qbtypes.Filter{Expression: filterExpr}, req.Start, req.End)
+		if err != nil {
+			return nil, err
 		}
-
-		rawSrc := sqlbuilder.NewSelectBuilder()
-		rawSrc.Select("labels")
-		rawSrc.From(fmt.Sprintf("%s.%s", telemetrymetrics.DBName, distributedTimeSeriesTableName))
-		rawSrc.Where(
-			rawSrc.In("metric_name", sqlbuilder.List(metricNames)),
-			rawSrc.GE("unix_milli", tsAdjustedStartMs),
-			rawSrc.LE("unix_milli", flooredEndMs),
-			fmt.Sprintf("fingerprint IN (%s)", rawSrc.Var(m.buildSamplesTblFingerprintSubQuery(metricNames, localSamplesTable, samplesStartMs, flooredEndMs))),
-		)
 		if filterClause != nil {
-			rawSrc.AddWhereClause(sqlbuilder.CopyWhereClause(filterClause))
-		}
-
-		reducedSrc := sqlbuilder.NewSelectBuilder()
-		reducedSrc.Select("labels")
-		reducedSrc.From(fmt.Sprintf("%s.%s", telemetrymetrics.DBName, telemetrymetrics.TimeseriesV4ReducedTableName))
-		reducedSrc.Where(
-			reducedSrc.In("metric_name", sqlbuilder.List(metricNames)),
-			reducedSrc.GE("unix_milli", tsAdjustedStartMs),
-			reducedSrc.LE("unix_milli", flooredEndMs),
-			fmt.Sprintf("fingerprint IN (%s)", reducedSrc.Var(m.buildReducedSamplesTblFingerprintSubQuery(metricNames, samplesStartMs, flooredEndMs))),
-		)
-		if filterClause != nil {
-			reducedSrc.AddWhereClause(sqlbuilder.CopyWhereClause(filterClause))
-		}
-
-		sb.From(sb.BuilderAs(sqlbuilder.UnionAll(rawSrc, reducedSrc), "series"))
-	} else {
-
-		fpSB := m.buildSamplesTblFingerprintSubQuery(metricNames, localSamplesTable, samplesStartMs, flooredEndMs)
-
-		sb.From(fmt.Sprintf("%s.%s", telemetrymetrics.DBName, distributedTimeSeriesTableName))
-		sb.Where(
-			sb.In("metric_name", sqlbuilder.List(metricNames)),
-			sb.GE("unix_milli", tsAdjustedStartMs),
-			sb.LE("unix_milli", flooredEndMs),
-			fmt.Sprintf("fingerprint IN (%s)", sb.Var(fpSB)),
-		)
-
-		if filterExpr != "" {
-			filterClause, err := m.buildFilterClause(ctx, &qbtypes.Filter{Expression: filterExpr}, req.Start, req.End)
-			if err != nil {
-				return nil, err
-			}
-			if filterClause != nil {
-				sb.AddWhereClause(filterClause)
-			}
+			sb.AddWhereClause(filterClause)
 		}
 	}
 
@@ -331,7 +288,7 @@ func (m *module) applyHostsActiveStatusFilter(req *inframonitoringtypes.Postable
 	return false
 }
 
-func (m *module) getHostsTableMetadata(ctx context.Context, orgID valuer.UUID, req *inframonitoringtypes.PostableHosts) (map[string]map[string]string, error) {
+func (m *module) getHostsTableMetadata(ctx context.Context, req *inframonitoringtypes.PostableHosts) (map[string]map[string]string, error) {
 	var nonGroupByAttrs []string
 	for _, key := range hostAttrKeysForMetadata {
 		if !isKeyInGroupByAttrs(req.GroupBy, key) {
@@ -342,7 +299,7 @@ func (m *module) getHostsTableMetadata(ctx context.Context, orgID valuer.UUID, r
 	if req.Filter != nil {
 		filter = &req.Filter.Filter
 	}
-	metadataMap, err := m.getMetadata(ctx, orgID, hostsTableMetricNamesList, req.GroupBy, nonGroupByAttrs, filter, req.Start, req.End)
+	metadataMap, err := m.getMetadata(ctx, hostsTableMetricNamesList, req.GroupBy, nonGroupByAttrs, filter, req.Start, req.End)
 	if err != nil {
 		return nil, err
 	}

pkg/modules/inframonitoring/implinframonitoring/jobs.go

@@ -148,12 +148,12 @@ func (m *module) getTopJobGroups(
 	return paginateWithBackfill(allMetricGroups, metadataMap, req.GroupBy, req.Offset, req.Limit), nil
 }
 
-func (m *module) getJobsTableMetadata(ctx context.Context, orgID valuer.UUID, req *inframonitoringtypes.PostableJobs) (map[string]map[string]string, error) {
+func (m *module) getJobsTableMetadata(ctx context.Context, req *inframonitoringtypes.PostableJobs) (map[string]map[string]string, error) {
 	var nonGroupByAttrs []string
 	for _, key := range jobAttrKeysForMetadata {
 		if !isKeyInGroupByAttrs(req.GroupBy, key) {
 			nonGroupByAttrs = append(nonGroupByAttrs, key)
 		}
 	}
-	return m.getMetadata(ctx, orgID, jobsTableMetricNamesList, req.GroupBy, nonGroupByAttrs, req.Filter, req.Start, req.End)
+	return m.getMetadata(ctx, jobsTableMetricNamesList, req.GroupBy, nonGroupByAttrs, req.Filter, req.Start, req.End)
 }

pkg/modules/inframonitoring/implinframonitoring/module.go

@@ -6,7 +6,6 @@ import (
 	"time"
 
 	"github.com/SigNoz/signoz/pkg/factory"
-	"github.com/SigNoz/signoz/pkg/flagger"
 	"github.com/SigNoz/signoz/pkg/modules/inframonitoring"
 	"github.com/SigNoz/signoz/pkg/querier"
 	"github.com/SigNoz/signoz/pkg/telemetrymetrics"
@@ -27,7 +26,6 @@ type module struct {
 	condBuilder            qbtypes.ConditionBuilder
 	logger                 *slog.Logger
 	config                 inframonitoring.Config
-	fl                     flagger.Flagger
 }
 
 // NewModule constructs the inframonitoring module with the provided dependencies.
@@ -35,7 +33,6 @@ func NewModule(
 	telemetryStore telemetrystore.TelemetryStore,
 	telemetryMetadataStore telemetrytypes.MetadataStore,
 	querier querier.Querier,
-	fl flagger.Flagger,
 	providerSettings factory.ProviderSettings,
 	cfg inframonitoring.Config,
 ) inframonitoring.Module {
@@ -49,7 +46,6 @@ func NewModule(
 		condBuilder:            condBuilder,
 		logger:                 providerSettings.Logger,
 		config:                 cfg,
-		fl:                     fl,
 	}
 }
 
@@ -190,7 +186,7 @@ func (m *module) ListHosts(ctx context.Context, orgID valuer.UUID, req *inframon
 		return resp, nil
 	}
 
-	metadataMap, err := m.getHostsTableMetadata(ctx, orgID, req)
+	metadataMap, err := m.getHostsTableMetadata(ctx, req)
 	if err != nil {
 		return nil, err
 	}
@@ -226,7 +222,7 @@ func (m *module) ListHosts(ctx context.Context, orgID valuer.UUID, req *inframon
 	hostCounts := make(map[string]groupHostStatusCounts)
 	isHostNameInGroupBy := isKeyInGroupByAttrs(req.GroupBy, inframonitoringtypes.HostNameAttrKey)
 	if !isHostNameInGroupBy {
-		hostCounts, err = m.getPerGroupHostStatusCounts(ctx, orgID, req, hostsTableMetricNamesList, pageGroups, sinceUnixMilli)
+		hostCounts, err = m.getPerGroupHostStatusCounts(ctx, req, hostsTableMetricNamesList, pageGroups, sinceUnixMilli)
 		if err != nil {
 			return nil, err
 		}
@@ -276,7 +272,7 @@ func (m *module) ListPods(ctx context.Context, orgID valuer.UUID, req *inframoni
 		return resp, nil
 	}
 
-	metadataMap, err := m.getPodsTableMetadata(ctx, orgID, req)
+	metadataMap, err := m.getPodsTableMetadata(ctx, req)
 	if err != nil {
 		return nil, err
 	}
@@ -354,7 +350,7 @@ func (m *module) ListNodes(ctx context.Context, orgID valuer.UUID, req *inframon
 		return resp, nil
 	}
 
-	metadataMap, err := m.getNodesTableMetadata(ctx, orgID, req)
+	metadataMap, err := m.getNodesTableMetadata(ctx, req)
 	if err != nil {
 		return nil, err
 	}
@@ -437,7 +433,7 @@ func (m *module) ListNamespaces(ctx context.Context, orgID valuer.UUID, req *inf
 		return resp, nil
 	}
 
-	metadataMap, err := m.getNamespacesTableMetadata(ctx, orgID, req)
+	metadataMap, err := m.getNamespacesTableMetadata(ctx, req)
 	if err != nil {
 		return nil, err
 	}
@@ -514,7 +510,7 @@ func (m *module) ListClusters(ctx context.Context, orgID valuer.UUID, req *infra
 		return resp, nil
 	}
 
-	metadataMap, err := m.getClustersTableMetadata(ctx, orgID, req)
+	metadataMap, err := m.getClustersTableMetadata(ctx, req)
 	if err != nil {
 		return nil, err
 	}
@@ -604,7 +600,7 @@ func (m *module) ListVolumes(ctx context.Context, orgID valuer.UUID, req *infram
 		return resp, nil
 	}
 
-	metadataMap, err := m.getVolumesTableMetadata(ctx, orgID, req)
+	metadataMap, err := m.getVolumesTableMetadata(ctx, req)
 	if err != nil {
 		return nil, err
 	}
@@ -682,7 +678,7 @@ func (m *module) ListDeployments(ctx context.Context, orgID valuer.UUID, req *in
 		return resp, nil
 	}
 
-	metadataMap, err := m.getDeploymentsTableMetadata(ctx, orgID, req)
+	metadataMap, err := m.getDeploymentsTableMetadata(ctx, req)
 	if err != nil {
 		return nil, err
 	}
@@ -765,7 +761,7 @@ func (m *module) ListStatefulSets(ctx context.Context, orgID valuer.UUID, req *i
 		return resp, nil
 	}
 
-	metadataMap, err := m.getStatefulSetsTableMetadata(ctx, orgID, req)
+	metadataMap, err := m.getStatefulSetsTableMetadata(ctx, req)
 	if err != nil {
 		return nil, err
 	}
@@ -850,7 +846,7 @@ func (m *module) ListJobs(ctx context.Context, orgID valuer.UUID, req *inframoni
 		return resp, nil
 	}
 
-	metadataMap, err := m.getJobsTableMetadata(ctx, orgID, req)
+	metadataMap, err := m.getJobsTableMetadata(ctx, req)
 	if err != nil {
 		return nil, err
 	}
@@ -935,7 +931,7 @@ func (m *module) ListDaemonSets(ctx context.Context, orgID valuer.UUID, req *inf
 		return resp, nil
 	}
 
-	metadataMap, err := m.getDaemonSetsTableMetadata(ctx, orgID, req)
+	metadataMap, err := m.getDaemonSetsTableMetadata(ctx, req)
 	if err != nil {
 		return nil, err
 	}

pkg/modules/inframonitoring/implinframonitoring/namespaces.go

@@ -115,12 +115,12 @@ func (m *module) getTopNamespaceGroups(
 	return paginateWithBackfill(allMetricGroups, metadataMap, req.GroupBy, req.Offset, req.Limit), nil
 }
 
-func (m *module) getNamespacesTableMetadata(ctx context.Context, orgID valuer.UUID, req *inframonitoringtypes.PostableNamespaces) (map[string]map[string]string, error) {
+func (m *module) getNamespacesTableMetadata(ctx context.Context, req *inframonitoringtypes.PostableNamespaces) (map[string]map[string]string, error) {
 	var nonGroupByAttrs []string
 	for _, key := range namespaceAttrKeysForMetadata {
 		if !isKeyInGroupByAttrs(req.GroupBy, key) {
 			nonGroupByAttrs = append(nonGroupByAttrs, key)
 		}
 	}
-	return m.getMetadata(ctx, orgID, namespacesTableMetricNamesList, req.GroupBy, nonGroupByAttrs, req.Filter, req.Start, req.End)
+	return m.getMetadata(ctx, namespacesTableMetricNamesList, req.GroupBy, nonGroupByAttrs, req.Filter, req.Start, req.End)
 }

pkg/modules/inframonitoring/implinframonitoring/nodes.go

@@ -149,14 +149,14 @@ func (m *module) getTopNodeGroups(
 	return paginateWithBackfill(allMetricGroups, metadataMap, req.GroupBy, req.Offset, req.Limit), nil
 }
 
-func (m *module) getNodesTableMetadata(ctx context.Context, orgID valuer.UUID, req *inframonitoringtypes.PostableNodes) (map[string]map[string]string, error) {
+func (m *module) getNodesTableMetadata(ctx context.Context, req *inframonitoringtypes.PostableNodes) (map[string]map[string]string, error) {
 	var nonGroupByAttrs []string
 	for _, key := range nodeAttrKeysForMetadata {
 		if !isKeyInGroupByAttrs(req.GroupBy, key) {
 			nonGroupByAttrs = append(nonGroupByAttrs, key)
 		}
 	}
-	return m.getMetadata(ctx, orgID, nodesTableMetricNamesList, req.GroupBy, nonGroupByAttrs, req.Filter, req.Start, req.End)
+	return m.getMetadata(ctx, nodesTableMetricNamesList, req.GroupBy, nonGroupByAttrs, req.Filter, req.Start, req.End)
 }
 
 // getPerGroupNodeConditionCounts computes per-group node counts bucketed by each

pkg/modules/inframonitoring/implinframonitoring/pods.go

@@ -170,14 +170,14 @@ func (m *module) getTopPodGroups(
 	return paginateWithBackfill(allMetricGroups, metadataMap, req.GroupBy, req.Offset, req.Limit), nil
 }
 
-func (m *module) getPodsTableMetadata(ctx context.Context, orgID valuer.UUID, req *inframonitoringtypes.PostablePods) (map[string]map[string]string, error) {
+func (m *module) getPodsTableMetadata(ctx context.Context, req *inframonitoringtypes.PostablePods) (map[string]map[string]string, error) {
 	var nonGroupByAttrs []string
 	for _, key := range podAttrKeysForMetadata {
 		if !isKeyInGroupByAttrs(req.GroupBy, key) {
 			nonGroupByAttrs = append(nonGroupByAttrs, key)
 		}
 	}
-	return m.getMetadata(ctx, orgID, podsTableMetricNamesList, req.GroupBy, nonGroupByAttrs, req.Filter, req.Start, req.End)
+	return m.getMetadata(ctx, podsTableMetricNamesList, req.GroupBy, nonGroupByAttrs, req.Filter, req.Start, req.End)
 }
 
 // getPerGroupPodPhaseCounts computes per-group pod counts bucketed by each