fix(authz): add missing allowed/deniedPermissions to test mocks

Update UseAuthZResult mocks to include the new `allowed` and
`deniedPermissions` fields. Also fix oxlint warnings in useAuthZ.tsx.

.github/CODEOWNERS

@@ -109,10 +109,7 @@ go.mod @therealpandey
 /pkg/modules/role/ @therealpandey
 /pkg/types/coretypes/ @therealpandey @vikrantgupta25
 
-/frontend/src/hooks/useAuthZ/ @H4ad
-/frontend/src/components/GuardAuthZ/ @H4ad
-/frontend/src/components/AuthZTooltip/ @H4ad
-/frontend/src/components/createGuardedRoute/ @H4ad
+/frontend/src/lib/authz/ @H4ad
 /frontend/src/container/RolesSettings/ @H4ad
 /frontend/src/components/RolesSelect/ @H4ad
 /frontend/src/pages/MembersSettings/ @H4ad

cmd/authz.go

@@ -12,7 +12,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-const permissionsTypePath = "frontend/src/hooks/useAuthZ/permissions.type.ts"
+const permissionsTypePath = "frontend/src/lib/authz/hooks/useAuthZ/permissions.type.ts"
 
 var permissionsTypeTemplate = template.Must(template.New("permissions").Parse(
 	`// AUTO GENERATED FILE - DO NOT EDIT - GENERATED BY cmd/enterprise/*.go generate authz

docs/api/openapi.yml

@@ -618,13 +618,6 @@ components:
         provider:
           $ref: '#/components/schemas/AuthtypesAuthNProvider'
       type: object
-    AuthtypesPatchableRole:
-      properties:
-        description:
-          type: string
-      required:
-      - description
-      type: object
     AuthtypesPostableAuthDomain:
       properties:
         config:
@@ -2536,22 +2529,6 @@ 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:
@@ -2737,6 +2714,14 @@ components:
           type: string
         dashboardName:
           type: string
+        filterBy:
+          items:
+            type: string
+          type: array
+        groupBy:
+          items:
+            type: string
+          type: array
         panelId:
           type: string
         panelName:
@@ -3586,7 +3571,7 @@ components:
       - user
       - system
       - integration
-      type: object
+      type: string
     DashboardtypesSpanGaps:
       properties:
         fillLessThan:
@@ -5412,6 +5397,9 @@ components:
           type: string
         id:
           type: string
+        ingestedSamples:
+          minimum: 0
+          type: integer
         ingestedSeries:
           minimum: 0
           type: integer
@@ -5424,9 +5412,9 @@ components:
           $ref: '#/components/schemas/MetricreductionruletypesMatchType'
         metricName:
           type: string
-        reductionPercent:
-          format: double
-          type: number
+        retainedSamples:
+          minimum: 0
+          type: integer
         retainedSeries:
           minimum: 0
           type: integer
@@ -5444,7 +5432,8 @@ components:
       - active
       - ingestedSeries
       - retainedSeries
-      - reductionPercent
+      - ingestedSamples
+      - retainedSamples
       type: object
     MetricreductionruletypesGettableReductionRulePreview:
       properties:
@@ -5487,15 +5476,23 @@ 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:
@@ -5561,7 +5558,6 @@ components:
       - metric
       - ingested_volume
       - reduced_volume
-      - reduction
       - last_updated
       type: string
     MetricreductionruletypesUpdatableReductionRule:
@@ -11825,68 +11821,6 @@ 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
@@ -11949,158 +11883,6 @@ 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,40 +260,6 @@ 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 {
@@ -324,39 +290,6 @@ 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][]map[string]string, error) {
+func (module *module) GetByMetricNames(ctx context.Context, orgID valuer.UUID, metricNames []string) (map[string][]dashboardtypes.DashboardPanelRef, error) {
 	return module.pkgDashboardModule.GetByMetricNames(ctx, orgID, metricNames)
 }
 

ee/modules/metricreductionrule/implmetricreductionrule/clickhouse.go

@@ -22,6 +22,8 @@ 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
@@ -289,12 +291,9 @@ func (c *clickhouse) RankByVolume(ctx context.Context, metricNames []string, eff
 	}
 	ctx = c.withThreads(ctx)
 
-	orderExpr := "ingested"
-	switch orderBy {
-	case metricreductionruletypes.OrderByReducedVolume:
-		orderExpr = "reduced"
-	case metricreductionruletypes.OrderByReduction:
-		orderExpr = "if(ingested = 0, 0, (toFloat64(ingested) - toFloat64(reduced)) / toFloat64(ingested))"
+	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))"
 	}
 	direction := "ASC"
 	if order == metricreductionruletypes.OrderDesc {
@@ -310,17 +309,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 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, 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",
 		"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 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"+
+		"(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"+
 			" UNION ALL "+
-			"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"+
+			"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"+
 			") GROUP BY metric_name) AS d",
 		"base.metric_name = d.metric_name",
 	)
@@ -347,122 +346,186 @@ func (c *clickhouse) RankByVolume(ctx context.Context, metricNames []string, eff
 	return out, rows.Err()
 }
 
-func (c *clickhouse) SampleVolume(ctx context.Context, metricNames []string, effectiveFrom map[string]int64, startMs, endMs int64) (uint64, uint64, error) {
+func (c *clickhouse) SampleVolumeByMetric(ctx context.Context, metricNames []string, effectiveFrom map[string]int64, startMs, endMs int64) (map[string]volumeRow, error) {
 	if len(metricNames) == 0 {
-		return 0, 0, nil
+		return map[string]volumeRow{}, nil
 	}
 	ctx = c.withThreads(ctx)
 
-	ingested, err := c.countRawSamples(ctx, telemetrymetrics.DBName+"."+telemetrymetrics.SamplesV4BufferTableName, metricNames, effectiveFrom, startMs, endMs)
-	if err != nil {
-		return 0, 0, err
-	}
-
-	last, err := c.countReducedSamples(ctx, telemetrymetrics.DBName+"."+telemetrymetrics.SamplesV4ReducedLastTableName, metricNames, effectiveFrom, startMs, endMs)
-	if err != nil {
-		return 0, 0, err
-	}
-	sum, err := c.countReducedSamples(ctx, telemetrymetrics.DBName+"."+telemetrymetrics.SamplesV4ReducedSumTableName, metricNames, effectiveFrom, startMs, endMs)
-	if err != nil {
-		return 0, 0, err
-	}
-
-	return ingested, min(last+sum, ingested), nil
-}
-
-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("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...)
-
-	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
-}
-
-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()
-	// 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...)
-
-	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)
+	ingested, err := c.countSamplesByMetric(ctx, telemetrymetrics.DBName+"."+telemetrymetrics.SamplesV4BufferTableName, "count()", metricNames, 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)
+	last, err := c.countSamplesByMetric(ctx, telemetrymetrics.DBName+"."+telemetrymetrics.SamplesV4ReducedLastTableName, "uniq(reduced_fingerprint, unix_milli)", metricNames, effectiveFrom, startMs, endMs)
+	if err != nil {
+		return nil, err
+	}
+	sum, err := c.countSamplesByMetric(ctx, telemetrymetrics.DBName+"."+telemetrymetrics.SamplesV4ReducedSumTableName, "uniq(reduced_fingerprint, unix_milli)", metricNames, effectiveFrom, startMs, endMs)
+	if err != nil {
+		return nil, 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
+}
+
+func (c *clickhouse) countSamplesByMetric(ctx context.Context, table, countExpr string, metricNames []string, effectiveFrom map[string]int64, startMs, endMs int64) (map[string]uint64, error) {
+	names := make([]any, len(metricNames))
+	for i, name := range metricNames {
+		names[i] = name
+	}
+
+	sb := sqlbuilder.NewSelectBuilder()
+	sb.Select("metric_name", countExpr)
+	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
 		}
-		for ts, count := range reduced {
-			retained[ts] += count
-		}
-	}
-	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)
+		ruledRetained, err = c.ruledRetainedSamplesByBucket(ctx, ruledMetrics, effectiveFrom, startMs, endMs)
 		if err != nil {
 			return nil, err
 		}
-		for ts, count := range nonReducedIngested {
-			retained[ts] += count
+	}
+
+	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)
+}
+
+// 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
+		}
+
+		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")
+
+		counts, err := c.scanBuckets(ctx, sb)
+		if err != nil {
+			return nil, err
+		}
+		for ts, count := range counts {
+			out[ts] += count
+		}
+	}
+	return out, nil
+}
+
 func mergeVolumePoints(ingested, reduced map[int64]uint64) []volumePoint {
 	buckets := make(map[int64]struct{}, len(ingested))
 	for ts := range ingested {
@@ -488,60 +551,6 @@ 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,7 +4,6 @@ import (
 	"context"
 	"log/slog"
 	"sort"
-	"strings"
 	"time"
 
 	"github.com/SigNoz/signoz/pkg/errors"
@@ -28,9 +27,16 @@ 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 (see signoz-otel-collector#839).
-	effectiveFromMargin    = 5 * time.Minute
-	defaultPreviewLookback = 24 * time.Hour
+	// 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
 
 	pricePerMillionSamplesUSD = 0.1
 	monthDuration             = 30 * 24 * time.Hour
@@ -80,7 +86,7 @@ func (m *module) List(ctx context.Context, orgID valuer.UUID, params *metricredu
 	}
 
 	now := time.Now()
-	startMs := now.Add(-defaultPreviewLookback).UnixMilli()
+	startMs := now.Add(-statsLookback).UnixMilli()
 	endMs := now.UnixMilli()
 
 	switch params.OrderBy {
@@ -107,10 +113,14 @@ 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]))
+		rules = append(rules, withVolume(toGettableReductionRule(rule), volumes[rule.MetricName], sampleVolumes[rule.MetricName]))
 	}
 
 	return &metricreductionruletypes.GettableReductionRules{Rules: rules, Total: total}, nil
@@ -139,13 +149,24 @@ 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))
+		rules = append(rules, withVolume(toGettableReductionRule(rule), row, sampleVolumes[row.MetricName]))
 	}
 
 	return &metricreductionruletypes.GettableReductionRules{Rules: rules, Total: total}, nil
@@ -288,20 +309,17 @@ func (m *module) Stats(ctx context.Context, orgID valuer.UUID) (*metricreduction
 	}
 
 	now := time.Now()
-	startMs := now.Add(-defaultPreviewLookback).UnixMilli()
+	startMs := now.Add(-statsLookback).UnixMilli()
 	endMs := now.UnixMilli()
 
-	allRules, total, err := m.store.List(ctx, orgID, &metricreductionruletypes.ListReductionRulesParams{})
+	rules, _, 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(allRules))
-	effectiveFrom := make(map[string]int64, len(allRules))
-	for i, rule := range allRules {
+	metricNames := make([]string, len(rules))
+	effectiveFrom := make(map[string]int64, len(rules))
+	for i, rule := range rules {
 		metricNames[i] = rule.MetricName
 		effectiveFrom[rule.MetricName] = rule.EffectiveFrom.UnixMilli()
 	}
@@ -310,31 +328,43 @@ func (m *module) Stats(ctx context.Context, orgID valuer.UUID) (*metricreduction
 	if err != nil {
 		return nil, err
 	}
-	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]
-		}
+	var ruledIngestedSeries, ruledRetainedSeries uint64
+	for _, volume := range volumes {
+		ruledIngestedSeries += volume.Ingested
+		ruledRetainedSeries += effectiveRetained(volume.Ingested, volume.Reduced)
 	}
 
-	ingestedSamples, reducedSamples, err := m.ch.SampleVolume(ctx, reducedMetricNames, reducedEffectiveFrom, startMs, endMs)
+	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)
 	if err != nil {
 		return nil, err
 	}
 
 	return &metricreductionruletypes.GettableReductionRuleStats{
-		IngestedSeries:             ingestedSeries,
-		RetainedSeries:             retainedSeries,
-		EstimatedMonthlySavingsUsd: monthlySavingsUSD(ingestedSamples, reducedSamples, startMs, endMs),
+		IngestedSeries:             totalSeries,
+		RetainedSeries:             clampSub(totalSeries, ruledIngestedSeries-ruledRetainedSeries),
+		IngestedSamples:            totalSamples,
+		RetainedSamples:            clampSub(totalSamples, ruledIngestedSamples-ruledRetainedSamples),
+		EstimatedMonthlySavingsUsd: monthlySavingsUSD(ruledIngestedSamples, ruledRetainedSamples, 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 {
@@ -352,7 +382,7 @@ func (m *module) Timeseries(ctx context.Context, orgID valuer.UUID) (*querybuild
 	}
 
 	now := time.Now()
-	startMs := now.Add(-defaultPreviewLookback).UnixMilli()
+	startMs := now.Add(-timeseriesLookback).UnixMilli()
 	endMs := now.UnixMilli()
 
 	allRules, _, err := m.store.List(ctx, orgID, &metricreductionruletypes.ListReductionRulesParams{})
@@ -366,18 +396,7 @@ func (m *module) Timeseries(ctx context.Context, orgID valuer.UUID) (*querybuild
 		effectiveFrom[rule.MetricName] = rule.EffectiveFrom.UnixMilli()
 	}
 
-	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)
+	points, err := m.ch.SampleTimeseries(ctx, metricNames, effectiveFrom, startMs, endMs)
 	if err != nil {
 		return nil, err
 	}
@@ -414,7 +433,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, metricName)
+	lastSeen, err := m.metadataStore.FetchLastSeenInfoMulti(ctx, orgID, metricName)
 	if err != nil {
 		return err
 	}
@@ -447,12 +466,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(splitCSV(item["group_by"]), splitCSV(item["filter_by"])...)
+			usedLabels := append(append([]string{}, item.GroupBy...), item.FilterBy...)
 			affected = append(affected, metricreductionruletypes.AffectedAsset{
 				Type:           metricreductionruletypes.AssetTypeDashboard,
-				ID:             item["dashboard_id"],
-				Name:           item["dashboard_name"],
-				Widget:         &metricreductionruletypes.AffectedWidget{ID: item["widget_id"], Name: item["widget_name"]},
+				ID:             item.DashboardID,
+				Name:           item.DashboardName,
+				Widget:         &metricreductionruletypes.AffectedWidget{ID: item.PanelID, Name: item.PanelName},
 				ImpactedLabels: intersectLabels(usedLabels, droppedSet),
 			})
 		}
@@ -482,7 +501,7 @@ func toGettableReductionRule(rule *metricreductionruletypes.ReductionRule) metri
 		MatchType:     rule.MatchType,
 		Labels:        rule.Labels,
 		EffectiveFrom: rule.EffectiveFrom,
-		Active:        !rule.EffectiveFrom.After(time.Now()),
+		Active:        !rule.EffectiveFrom.Add(uiActivationDelay).After(time.Now()),
 	}
 }
 
@@ -493,12 +512,11 @@ func effectiveRetained(ingested, reduced uint64) uint64 {
 	return 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
-	}
+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)
 	return rule
 }
 
@@ -518,13 +536,6 @@ 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 ?", "%"+params.Search+"%")
+		query = query.Where("metric_name LIKE ? ESCAPE '\\'", "%"+s.sqlstore.Formatter().EscapeLikePattern(params.Search)+"%")
 	}
 	if params.MetricName != "" {
 		query = query.Where("metric_name = ?", params.MetricName)

ee/query-service/app/server.go

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

frontend/__mocks__/lib/env.ts

@@ -0,0 +1,3 @@
+export const IS_DEV = false;
+export const IS_PROD = true;
+export const MODE = 'test';

frontend/jest.config.ts

@@ -29,6 +29,7 @@ const config: Config.InitialOptions = {
 		'^constants/env$': '<rootDir>/__mocks__/env.ts',
 		'^src/constants/env$': '<rootDir>/__mocks__/env.ts',
 		'^@signozhq/icons$': '<rootDir>/__mocks__/signozhqIconsMock.tsx',
+		'^lib/env$': '<rootDir>/__mocks__/lib/env.ts',
 		'^test-mocks/(.*)$': '<rootDir>/__mocks__/$1',
 		'^react-syntax-highlighter/dist/esm/(.*)$':
 			'<rootDir>/node_modules/react-syntax-highlighter/dist/cjs/$1',

frontend/pnpm-lock.yaml

@@ -432,6 +432,9 @@ importers:
       '@typescript/native-preview':
         specifier: 7.0.0-dev.20260430.1
         version: 7.0.0-dev.20260430.1
+      babel-plugin-transform-import-meta:
+        specifier: ^2.3.3
+        version: 2.3.3(@babel/core@7.29.0)
       eslint-plugin-sonarjs:
         specifier: 4.0.2
         version: 4.0.2(eslint@10.2.1(jiti@2.6.1))
@@ -4089,6 +4092,11 @@ packages:
   babel-plugin-syntax-jsx@6.18.0:
     resolution: {integrity: sha512-qrPaCSo9c8RHNRHIotaufGbuOBN8rtdC4QrrFFc43vyWCCz7Kl7GL1PGaXtMGQZUXrkCjNEgxDfmAuAabr/rlw==}
 
+  babel-plugin-transform-import-meta@2.3.3:
+    resolution: {integrity: sha512-bbh30qz1m6ZU1ybJoNOhA2zaDvmeXMnGNBMVMDOJ1Fni4+wMBoy/j7MTRVmqAUCIcy54/rEnr9VEBsfcgbpm3Q==}
+    peerDependencies:
+      '@babel/core': ^7.10.0
+
   babel-preset-current-node-syntax@1.2.0:
     resolution: {integrity: sha512-E/VlAEzRrsLEb2+dv8yp3bo4scof3l9nR4lrld+Iy5NyVqgVYUJnDAmunkhPMisRI32Qc4iRiz425d8vM++2fg==}
     peerDependencies:
@@ -12997,6 +13005,12 @@ snapshots:
 
   babel-plugin-syntax-jsx@6.18.0: {}
 
+  babel-plugin-transform-import-meta@2.3.3(@babel/core@7.29.0):
+    dependencies:
+      '@babel/core': 7.29.0
+      '@babel/template': 7.28.6
+      tslib: 2.8.1
+
   babel-preset-current-node-syntax@1.2.0(@babel/core@7.29.0):
     dependencies:
       '@babel/core': 7.29.0

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

@@ -62,6 +62,6 @@
 	"TRACES_FUNNELS_DETAIL": "SigNoz | Funnel",
 	"INTEGRATIONS_DETAIL": "SigNoz | Integration",
 	"PUBLIC_DASHBOARD": "SigNoz | Dashboard",
-	"LLM_OBSERVABILITY_OVERVIEW": "SigNoz | LLM Observability Overview",
-	"LLM_OBSERVABILITY_CONFIGURATION": "SigNoz | LLM Observability Configuration"
-}
+	"LLM_OBSERVABILITY_BASE": "SigNoz | LLM Observability",
+	"LLM_OBSERVABILITY_MODEL_PRICING": "SigNoz | Model Pricing"
+}

frontend/public/locales/en/titles.json

@@ -87,6 +87,6 @@
 	"TRACES_FUNNELS_DETAIL": "SigNoz | Funnel",
 	"INTEGRATIONS_DETAIL": "SigNoz | Integration",
 	"PUBLIC_DASHBOARD": "SigNoz | Dashboard",
-	"LLM_OBSERVABILITY_OVERVIEW": "SigNoz | LLM Observability Overview",
-	"LLM_OBSERVABILITY_CONFIGURATION": "SigNoz | LLM Observability Configuration"
-}
+	"LLM_OBSERVABILITY_BASE": "SigNoz | LLM Observability",
+	"LLM_OBSERVABILITY_MODEL_PRICING": "SigNoz | Model Pricing"
+}

frontend/src/AppRoutes/pageComponents.ts

@@ -329,3 +329,10 @@ export const LLMObservabilityPage = Loadable(
 			/* webpackChunkName: "LLM Observability Page" */ 'pages/LLMObservability'
 		),
 );
+
+export const LLMObservabilityModelPricingPage = Loadable(
+	() =>
+		import(
+			/* webpackChunkName: "LLM Observability Model Pricing Page" */ 'pages/LLMObservabilityModelPricing'
+		),
+);

frontend/src/AppRoutes/routes.ts

@@ -24,6 +24,7 @@ import {
 	LicensePage,
 	ListAllALertsPage,
 	LLMObservabilityPage,
+	LLMObservabilityModelPricingPage,
 	LiveLogs,
 	Login,
 	Logs,
@@ -514,24 +515,17 @@ const routes: AppRoutes[] = [
 		isPrivate: true,
 	},
 	{
-		path: ROUTES.LLM_OBSERVABILITY_ATTRIBUTE_MAPPING,
+		path: ROUTES.LLM_OBSERVABILITY_BASE,
 		exact: true,
 		component: LLMObservabilityPage,
-		key: 'LLM_OBSERVABILITY_ATTRIBUTE_MAPPING',
+		key: 'LLM_OBSERVABILITY_BASE',
 		isPrivate: true,
 	},
 	{
-		path: ROUTES.LLM_OBSERVABILITY_OVERVIEW,
+		path: ROUTES.LLM_OBSERVABILITY_MODEL_PRICING,
 		exact: true,
-		component: LLMObservabilityPage,
-		key: 'LLM_OBSERVABILITY_OVERVIEW',
-		isPrivate: true,
-	},
-	{
-		path: ROUTES.LLM_OBSERVABILITY_CONFIGURATION,
-		exact: true,
-		component: LLMObservabilityPage,
-		key: 'LLM_OBSERVABILITY_CONFIGURATION',
+		component: LLMObservabilityModelPricingPage,
+		key: 'LLM_OBSERVABILITY_MODEL_PRICING',
 		isPrivate: true,
 	},
 ];

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

@@ -18,19 +18,13 @@ 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';
@@ -365,107 +359,6 @@ 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
@@ -565,205 +458,3 @@ 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,13 +2230,6 @@ export interface AuthtypesOrgSessionContextDTO {
 	warning?: ErrorsJSONDTO;
 }
 
-export interface AuthtypesPatchableRoleDTO {
-	/**
-	 * @type string
-	 */
-	description: string;
-}
-
 export interface AuthtypesPostableAuthDomainDTO {
 	config?: AuthtypesAuthDomainConfigDTO;
 	/**
@@ -3249,17 +3242,6 @@ 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;
 	/**
@@ -3995,6 +3977,14 @@ export interface DashboardtypesDashboardPanelRefDTO {
 	 * @type string
 	 */
 	dashboardName: string;
+	/**
+	 * @type array
+	 */
+	filterBy?: string[];
+	/**
+	 * @type array
+	 */
+	groupBy?: string[];
 	/**
 	 * @type string
 	 */
@@ -6919,6 +6909,11 @@ export interface MetricreductionruletypesGettableReductionRuleDTO {
 	 * @type string
 	 */
 	id: string;
+	/**
+	 * @type integer
+	 * @minimum 0
+	 */
+	ingestedSamples: number;
 	/**
 	 * @type integer
 	 * @minimum 0
@@ -6934,10 +6929,10 @@ export interface MetricreductionruletypesGettableReductionRuleDTO {
 	 */
 	metricName: string;
 	/**
-	 * @type number
-	 * @format double
+	 * @type integer
+	 * @minimum 0
 	 */
-	reductionPercent: number;
+	retainedSamples: number;
 	/**
 	 * @type integer
 	 * @minimum 0
@@ -6996,11 +6991,21 @@ 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
@@ -7056,7 +7061,6 @@ export enum MetricreductionruletypesReductionRuleOrderByDTO {
 	metric = 'metric',
 	ingested_volume = 'ingested_volume',
 	reduced_volume = 'reduced_volume',
-	reduction = 'reduction',
 	last_updated = 'last_updated',
 }
 export interface MetricreductionruletypesUpdatableReductionRuleDTO {
@@ -10248,31 +10252,9 @@ 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/components/CreateServiceAccountModal/CreateServiceAccountModal.tsx

@@ -2,8 +2,8 @@ import { Controller, useForm } from 'react-hook-form';
 import { useQueryClient } from 'react-query';
 import { X } from '@signozhq/icons';
 import { Button } from '@signozhq/ui/button';
-import AuthZTooltip from 'components/AuthZTooltip/AuthZTooltip';
-import { SACreatePermission } from 'hooks/useAuthZ/permissions/service-account.permissions';
+import AuthZTooltip from 'lib/authz/components/AuthZTooltip/AuthZTooltip';
+import { SACreatePermission } from 'lib/authz/hooks/useAuthZ/permissions/service-account.permissions';
 import { DialogFooter, DialogWrapper } from '@signozhq/ui/dialog';
 import { Input } from '@signozhq/ui/input';
 import { toast } from '@signozhq/ui/sonner';

frontend/src/components/CreateServiceAccountModal/__tests__/CreateServiceAccountModal.test.tsx

@@ -11,7 +11,7 @@ import {
 
 import CreateServiceAccountModal from '../CreateServiceAccountModal';
 
-jest.mock('components/AuthZTooltip/AuthZTooltip', () => ({
+jest.mock('lib/authz/components/AuthZTooltip/AuthZTooltip', () => ({
 	__esModule: true,
 	default: ({
 		children,

frontend/src/components/ServiceAccountDrawer/AddKeyModal/KeyFormPhase.tsx

@@ -4,11 +4,11 @@ import { Button } from '@signozhq/ui/button';
 import { Input } from '@signozhq/ui/input';
 import { ToggleGroupSimple } from '@signozhq/ui/toggle-group';
 import { DatePicker } from 'antd';
-import AuthZTooltip from 'components/AuthZTooltip/AuthZTooltip';
+import AuthZTooltip from 'lib/authz/components/AuthZTooltip/AuthZTooltip';
 import {
 	APIKeyCreatePermission,
 	buildSAAttachPermission,
-} from 'hooks/useAuthZ/permissions/service-account.permissions';
+} from 'lib/authz/hooks/useAuthZ/permissions/service-account.permissions';
 import { popupContainer } from 'utils/selectPopupContainer';
 
 import { disabledDate } from '../utils';

frontend/src/components/ServiceAccountDrawer/DeleteAccountModal.tsx

@@ -1,8 +1,8 @@
 import { useQueryClient } from 'react-query';
 import { Trash2, X } from '@signozhq/icons';
 import { Button } from '@signozhq/ui/button';
-import AuthZTooltip from 'components/AuthZTooltip/AuthZTooltip';
-import { buildSADeletePermission } from 'hooks/useAuthZ/permissions/service-account.permissions';
+import AuthZTooltip from 'lib/authz/components/AuthZTooltip/AuthZTooltip';
+import { buildSADeletePermission } from 'lib/authz/hooks/useAuthZ/permissions/service-account.permissions';
 import { DialogWrapper } from '@signozhq/ui/dialog';
 import { toast } from '@signozhq/ui/sonner';
 import { convertToApiError } from 'api/ErrorResponseHandlerForGeneratedAPIs';

frontend/src/components/ServiceAccountDrawer/EditKeyModal/EditKeyForm.tsx

@@ -7,12 +7,12 @@ import { Input } from '@signozhq/ui/input';
 import { ToggleGroupSimple } from '@signozhq/ui/toggle-group';
 import { DatePicker } from 'antd';
 import type { ServiceaccounttypesGettableFactorAPIKeyDTO } from 'api/generated/services/sigNoz.schemas';
-import AuthZTooltip from 'components/AuthZTooltip/AuthZTooltip';
+import AuthZTooltip from 'lib/authz/components/AuthZTooltip/AuthZTooltip';
 import {
 	buildAPIKeyDeletePermission,
 	buildAPIKeyUpdatePermission,
 	buildSADetachPermission,
-} from 'hooks/useAuthZ/permissions/service-account.permissions';
+} from 'lib/authz/hooks/useAuthZ/permissions/service-account.permissions';
 import { popupContainer } from 'utils/selectPopupContainer';
 
 import { disabledDate, formatLastObservedAt } from '../utils';

frontend/src/components/ServiceAccountDrawer/EditKeyModal/index.tsx

@@ -16,8 +16,8 @@ import type {
 import { AxiosError } from 'axios';
 import { SA_QUERY_PARAMS } from 'container/ServiceAccountsSettings/constants';
 import dayjs from 'dayjs';
-import { buildAPIKeyUpdatePermission } from 'hooks/useAuthZ/permissions/service-account.permissions';
-import { useAuthZ } from 'hooks/useAuthZ/useAuthZ';
+import { buildAPIKeyUpdatePermission } from 'lib/authz/hooks/useAuthZ/permissions/service-account.permissions';
+import { useAuthZ } from 'lib/authz/hooks/useAuthZ/useAuthZ';
 import { parseAsString, useQueryState } from 'nuqs';
 import { useErrorModal } from 'providers/ErrorModalProvider';
 import { useTimezone } from 'providers/Timezone';

frontend/src/components/ServiceAccountDrawer/KeysTab.tsx

@@ -4,13 +4,13 @@ import { Button } from '@signozhq/ui/button';
 import { Skeleton, Table, Tooltip } from 'antd';
 import type { ColumnsType } from 'antd/es/table/interface';
 import type { ServiceaccounttypesGettableFactorAPIKeyDTO } from 'api/generated/services/sigNoz.schemas';
-import AuthZTooltip from 'components/AuthZTooltip/AuthZTooltip';
+import AuthZTooltip from 'lib/authz/components/AuthZTooltip/AuthZTooltip';
 import {
 	APIKeyCreatePermission,
 	buildAPIKeyDeletePermission,
 	buildSAAttachPermission,
 	buildSADetachPermission,
-} from 'hooks/useAuthZ/permissions/service-account.permissions';
+} from 'lib/authz/hooks/useAuthZ/permissions/service-account.permissions';
 import { DATE_TIME_FORMATS } from 'constants/dateTimeFormats';
 import dayjs from 'dayjs';
 import { parseAsBoolean, parseAsString, useQueryState } from 'nuqs';

frontend/src/components/ServiceAccountDrawer/OverviewTab.tsx

@@ -5,11 +5,11 @@ import { Button } from '@signozhq/ui/button';
 import { Input } from '@signozhq/ui/input';
 import { useCopyToClipboard } from 'react-use';
 import type { AuthtypesRoleDTO } from 'api/generated/services/sigNoz.schemas';
-import AuthZTooltip from 'components/AuthZTooltip/AuthZTooltip';
+import AuthZTooltip from 'lib/authz/components/AuthZTooltip/AuthZTooltip';
 import RolesSelect from 'components/RolesSelect';
 import { DATE_TIME_FORMATS } from 'constants/dateTimeFormats';
 import { ServiceAccountRow } from 'container/ServiceAccountsSettings/utils';
-import { buildSAUpdatePermission } from 'hooks/useAuthZ/permissions/service-account.permissions';
+import { buildSAUpdatePermission } from 'lib/authz/hooks/useAuthZ/permissions/service-account.permissions';
 import { useTimezone } from 'providers/Timezone';
 import APIError from 'types/api/error';
 

frontend/src/components/ServiceAccountDrawer/RevokeKeyModal.tsx

@@ -1,11 +1,11 @@
 import { useQueryClient } from 'react-query';
 import { Trash2, X } from '@signozhq/icons';
 import { Button } from '@signozhq/ui/button';
-import AuthZTooltip from 'components/AuthZTooltip/AuthZTooltip';
+import AuthZTooltip from 'lib/authz/components/AuthZTooltip/AuthZTooltip';
 import {
 	buildAPIKeyDeletePermission,
 	buildSADetachPermission,
-} from 'hooks/useAuthZ/permissions/service-account.permissions';
+} from 'lib/authz/hooks/useAuthZ/permissions/service-account.permissions';
 import { DialogWrapper } from '@signozhq/ui/dialog';
 import { toast } from '@signozhq/ui/sonner';
 import { convertToApiError } from 'api/ErrorResponseHandlerForGeneratedAPIs';

frontend/src/components/ServiceAccountDrawer/ServiceAccountDrawer.tsx

@@ -16,7 +16,7 @@ import {
 import type { RenderErrorResponseDTO } from 'api/generated/services/sigNoz.schemas';
 import { AxiosError } from 'axios';
 import ErrorInPlace from 'components/ErrorInPlace/ErrorInPlace';
-import PermissionDeniedCallout from 'components/PermissionDeniedCallout/PermissionDeniedCallout';
+import PermissionDeniedCallout from 'lib/authz/components/PermissionDeniedCallout/PermissionDeniedCallout';
 import { useRoles } from 'components/RolesSelect';
 import { SA_QUERY_PARAMS } from 'container/ServiceAccountsSettings/constants';
 import {
@@ -35,8 +35,8 @@ import {
 	buildSADeletePermission,
 	buildSAReadPermission,
 	buildSAUpdatePermission,
-} from 'hooks/useAuthZ/permissions/service-account.permissions';
-import { useAuthZ } from 'hooks/useAuthZ/useAuthZ';
+} from 'lib/authz/hooks/useAuthZ/permissions/service-account.permissions';
+import { useAuthZ } from 'lib/authz/hooks/useAuthZ/useAuthZ';
 import {
 	parseAsBoolean,
 	parseAsInteger,
@@ -47,7 +47,7 @@ import {
 import APIError from 'types/api/error';
 import { toAPIError } from 'utils/errorUtils';
 
-import AuthZTooltip from 'components/AuthZTooltip/AuthZTooltip';
+import AuthZTooltip from 'lib/authz/components/AuthZTooltip/AuthZTooltip';
 import AddKeyModal from './AddKeyModal';
 import DeleteAccountModal from './DeleteAccountModal';
 import KeysTab from './KeysTab';

frontend/src/components/ServiceAccountDrawer/__tests__/EditKeyModal.test.tsx

@@ -6,7 +6,7 @@ import { render, screen, userEvent, waitFor } from 'tests/test-utils';
 
 import EditKeyModal from '../EditKeyModal';
 
-jest.mock('components/AuthZTooltip/AuthZTooltip', () => ({
+jest.mock('lib/authz/components/AuthZTooltip/AuthZTooltip', () => ({
 	__esModule: true,
 	default: ({
 		children,

frontend/src/components/ServiceAccountDrawer/__tests__/KeysTab.test.tsx

@@ -6,7 +6,7 @@ import { render, screen, userEvent, waitFor } from 'tests/test-utils';
 
 import KeysTab from '../KeysTab';
 
-jest.mock('components/AuthZTooltip/AuthZTooltip', () => ({
+jest.mock('lib/authz/components/AuthZTooltip/AuthZTooltip', () => ({
 	__esModule: true,
 	default: ({
 		children,

frontend/src/components/ServiceAccountDrawer/__tests__/ServiceAccountDrawer.authz.test.tsx

@@ -7,11 +7,11 @@ import {
 	setupAuthzAdmin,
 	setupAuthzDeny,
 	setupAuthzDenyAll,
-} from 'tests/authz-test-utils';
+} from 'lib/authz/utils/authz-test-utils';
 import {
 	APIKeyListPermission,
 	buildSADeletePermission,
-} from 'hooks/useAuthZ/permissions/service-account.permissions';
+} from 'lib/authz/hooks/useAuthZ/permissions/service-account.permissions';
 
 import ServiceAccountDrawer from '../ServiceAccountDrawer';
 

frontend/src/components/ServiceAccountDrawer/__tests__/ServiceAccountDrawer.test.tsx

@@ -3,7 +3,7 @@ import { listRolesSuccessResponse } from 'mocks-server/__mockdata__/roles';
 import { rest, server } from 'mocks-server/server';
 import { NuqsTestingAdapter } from 'nuqs/adapters/testing';
 import { render, screen, userEvent, waitFor } from 'tests/test-utils';
-import { setupAuthzAdmin } from 'tests/authz-test-utils';
+import { setupAuthzAdmin } from 'lib/authz/utils/authz-test-utils';
 
 import ServiceAccountDrawer from '../ServiceAccountDrawer';
 

frontend/src/components/cmdKPalette/cmdKPalette.tsx

@@ -22,6 +22,7 @@ import {
 } from 'container/AIAssistant/store/useAIAssistantStore';
 import { useThemeMode } from 'hooks/useDarkMode';
 import { useIsAIAssistantEnabled } from 'hooks/useIsAIAssistantEnabled';
+import { IS_DEV } from 'lib/env';
 import history from 'lib/history';
 import { ROLES as UserRole } from 'types/roles';
 
@@ -30,6 +31,33 @@ import { useCmdK } from '../../providers/cmdKProvider';
 
 import './cmdKPalette.scss';
 
+const AuthZDevModal = IS_DEV
+	? React.lazy(() =>
+			import('lib/authz/devtools/AuthZDevModal/AuthZDevModal').then((m) => ({
+				default: m.AuthZDevModal,
+			})),
+		)
+	: null;
+
+const AuthZDevFloatingIndicator = IS_DEV
+	? React.lazy(() =>
+			import('lib/authz/devtools/AuthZDevFloatingIndicator/AuthZDevFloatingIndicator').then(
+				(m) => ({
+					default: m.AuthZDevFloatingIndicator,
+				}),
+			),
+		)
+	: null;
+
+const openAuthZDevModal = IS_DEV
+	? (): void => {
+			void import('lib/authz/devtools/useAuthZDevStore').then((m) => {
+				m.openAuthZDevModal();
+				return m;
+			});
+		}
+	: undefined;
+
 type CmdAction = {
 	id: string;
 	name: string;
@@ -110,6 +138,7 @@ export function CmdKPalette({
 		aiAssistant: isAIAssistantEnabled
 			? { open: handleOpenAIAssistant }
 			: undefined,
+		authzDevTools: openAuthZDevModal ? { open: openAuthZDevModal } : undefined,
 	});
 
 	// RBAC filter: show action if no roles set OR current user role is included
@@ -146,37 +175,57 @@ export function CmdKPalette({
 	};
 
 	return (
-		<CommandDialog open={open} onOpenChange={setOpen} position="top" offset={110}>
-			<CommandInput placeholder="Search…" className="cmdk-input-wrapper" />
-			<CommandList className="cmdk-list-scroll">
-				<CommandEmpty>No results</CommandEmpty>
-				{grouped.map(([section, items]) => (
-					<CommandGroup
-						key={section}
-						heading={section}
-						className="cmdk-section-heading"
-					>
-						{items.map((it) => (
-							<CommandItem
-								key={it.id}
-								onSelect={(): void => handleInvoke(it)}
-								value={it.name}
-								className={theme === 'light' ? 'cmdk-item-light' : 'cmdk-item'}
-							>
-								<span
-									className={cx('cmd-item-icon', it.id === 'ai-assistant' && 'noz-icon')}
+		<>
+			<CommandDialog
+				open={open}
+				onOpenChange={setOpen}
+				position="top"
+				offset={110}
+			>
+				<CommandInput placeholder="Search…" className="cmdk-input-wrapper" />
+				<CommandList className="cmdk-list-scroll">
+					<CommandEmpty>No results</CommandEmpty>
+					{grouped.map(([section, items]) => (
+						<CommandGroup
+							key={section}
+							heading={section}
+							className="cmdk-section-heading"
+						>
+							{items.map((it) => (
+								<CommandItem
+									key={it.id}
+									onSelect={(): void => handleInvoke(it)}
+									value={it.name}
+									className={theme === 'light' ? 'cmdk-item-light' : 'cmdk-item'}
 								>
-									{it.icon}
-								</span>
-								{it.name}
-								{it.shortcut && it.shortcut.length > 0 && (
-									<CommandShortcut>{it.shortcut.join(' • ')}</CommandShortcut>
-								)}
-							</CommandItem>
-						))}
-					</CommandGroup>
-				))}
-			</CommandList>
-		</CommandDialog>
+									<span
+										className={cx(
+											'cmd-item-icon',
+											it.id === 'ai-assistant' && 'noz-icon',
+										)}
+									>
+										{it.icon}
+									</span>
+									{it.name}
+									{it.shortcut && it.shortcut.length > 0 && (
+										<CommandShortcut>{it.shortcut.join(' • ')}</CommandShortcut>
+									)}
+								</CommandItem>
+							))}
+						</CommandGroup>
+					))}
+				</CommandList>
+			</CommandDialog>
+			{IS_DEV && AuthZDevModal && (
+				<React.Suspense fallback={null}>
+					<AuthZDevModal />
+				</React.Suspense>
+			)}
+			{IS_DEV && AuthZDevFloatingIndicator && (
+				<React.Suspense fallback={null}>
+					<AuthZDevFloatingIndicator />
+				</React.Suspense>
+			)}
+		</>
 	);
 }

frontend/src/constants/routes.ts

@@ -89,10 +89,8 @@ const ROUTES = {
 	AI_ASSISTANT_BASE: '/ai-assistant',
 	AI_ASSISTANT_ICON_PREVIEW: '/ai-assistant-icon-preview',
 	MCP_SERVER: '/settings/mcp-server',
-	LLM_OBSERVABILITY_ATTRIBUTE_MAPPING: '/llm-observability/attribute-mapping',
 	LLM_OBSERVABILITY_BASE: '/llm-observability',
-	LLM_OBSERVABILITY_OVERVIEW: '/llm-observability/overview',
-	LLM_OBSERVABILITY_CONFIGURATION: '/llm-observability/configuration',
+	LLM_OBSERVABILITY_MODEL_PRICING: '/llm-observability/settings/model-pricing',
 } as const;
 
 export default ROUTES;

frontend/src/constants/shortcutActions.tsx

@@ -43,10 +43,17 @@ type ActionDeps = {
 	aiAssistant?: {
 		open: () => void;
 	};
+	/**
+	 * Provided only in development mode. Opens the AuthZ DevTools modal
+	 * for testing permission overrides.
+	 */
+	authzDevTools?: {
+		open: () => void;
+	};
 };
 
 export function createShortcutActions(deps: ActionDeps): CmdAction[] {
-	const { navigate, handleThemeChange, aiAssistant } = deps;
+	const { navigate, handleThemeChange, aiAssistant, authzDevTools } = deps;
 
 	const actions: CmdAction[] = [
 		{
@@ -302,5 +309,17 @@ export function createShortcutActions(deps: ActionDeps): CmdAction[] {
 		});
 	}
 
+	if (authzDevTools) {
+		actions.push({
+			id: 'authz-devtools',
+			name: 'AuthZ DevTools',
+			keywords: 'authz permissions rbac debug devtools override testing',
+			section: 'Dev',
+			icon: <Settings size={14} />,
+			roles: ['ADMIN', 'EDITOR', 'VIEWER'],
+			perform: authzDevTools.open,
+		});
+	}
+
 	return actions;
 }

frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/AttributeMappingsTab.module.scss

@@ -1,7 +0,0 @@
-.pageError {
-	padding: var(--padding-3) var(--padding-4);
-	border-radius: var(--radius-2);
-	background: var(--callout-error-background);
-	color: var(--callout-error-title);
-	font-size: var(--periscope-font-size-base);
-}

frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/AttributeMappingsTab.tsx

@@ -1,24 +0,0 @@
-import MapperGroupsTable from './components/MapperGroupsTable';
-import { useAttributeMappingStore } from './hooks/useAttributeMappingStore';
-import styles from './AttributeMappingsTab.module.scss';
-
-// "Attribute mappings" tab: the mapping-groups listing, its load/error states
-// and footer summary. Lives in its own tab so siblings (e.g. "Test") can be
-// added alongside without entangling this view's data fetching.
-function AttributeMappingsTab(): JSX.Element {
-	const store = useAttributeMappingStore();
-
-	return (
-		<div data-testid="attribute-mappings-tab">
-			{store.isError && (
-				<div className={styles.pageError} role="alert">
-					Failed to load mapping groups. Please try again.
-				</div>
-			)}
-
-			<MapperGroupsTable store={store} />
-		</div>
-	);
-}
-
-export default AttributeMappingsTab;

frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/__tests__/AttributeMappingsTab.test.tsx

@@ -1,75 +0,0 @@
-import { rest, server } from 'mocks-server/server';
-import { render, screen, userEvent, waitFor } from 'tests/test-utils';
-
-import {
-	GROUPS_ENDPOINT,
-	makeGroupsResponse,
-	makeMappersResponse,
-	mappersEndpoint,
-	mockGroups,
-	mockMappers,
-} from '../../__tests__/fixtures';
-import AttributeMappingsTab from '../AttributeMappingsTab';
-
-function setupGroups(): void {
-	server.use(
-		rest.get(GROUPS_ENDPOINT, (_req, res, ctx) =>
-			res(ctx.status(200), ctx.json(makeGroupsResponse(mockGroups))),
-		),
-	);
-}
-
-describe('AttributeMappingsTab (integration)', () => {
-	beforeEach(() => {
-		window.history.pushState(null, '', '/');
-	});
-
-	afterEach(() => {
-		server.resetHandlers();
-	});
-
-	it('renders no error banner on a successful load', async () => {
-		setupGroups();
-		render(<AttributeMappingsTab />);
-
-		await waitFor(() =>
-			expect(screen.getByTestId('group-name-group-1')).toBeInTheDocument(),
-		);
-		expect(screen.queryByRole('alert')).not.toBeInTheDocument();
-	});
-
-	it('shows an error banner when the groups request fails', async () => {
-		server.use(
-			rest.get(GROUPS_ENDPOINT, (_req, res, ctx) => res(ctx.status(500))),
-		);
-		render(<AttributeMappingsTab />);
-
-		await expect(screen.findByRole('alert')).resolves.toHaveTextContent(
-			'Failed to load mapping groups. Please try again.',
-		);
-	});
-
-	it("lazily fetches and renders a group's mappers on first expand", async () => {
-		const user = userEvent.setup({ pointerEventsCheck: 0 });
-		setupGroups();
-		server.use(
-			rest.get(mappersEndpoint('group-1'), (_req, res, ctx) =>
-				res(ctx.status(200), ctx.json(makeMappersResponse(mockMappers))),
-			),
-		);
-		render(<AttributeMappingsTab />);
-
-		await waitFor(() =>
-			expect(screen.getByTestId('group-name-group-1')).toBeInTheDocument(),
-		);
-		expect(
-			screen.queryByTestId('mapper-target-mapper-1'),
-		).not.toBeInTheDocument();
-
-		await user.click(screen.getByTestId('group-expand-group-1'));
-
-		await expect(
-			screen.findByTestId('mapper-target-mapper-1'),
-		).resolves.toHaveTextContent('gen_ai.request.model');
-	});
-});

frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/IndexBadge/IndexBadge.module.scss

@@ -1,13 +0,0 @@
-.indexBadge {
-	display: inline-flex;
-	align-items: center;
-	justify-content: center;
-	min-width: 22px;
-	height: 22px;
-	padding: 0 var(--spacing-3);
-	border-radius: 999px;
-	background: var(--accent-primary);
-	color: var(--accent-primary-foreground);
-	font-size: var(--font-size-xs);
-	font-weight: var(--font-weight-semibold);
-}

frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/IndexBadge/IndexBadge.tsx

@@ -1,12 +0,0 @@
-import styles from './IndexBadge.module.scss';
-
-interface IndexBadgeProps {
-	index: number;
-}
-
-// Small positional badge mirroring the Pipelines list ordering chip.
-function IndexBadge({ index }: IndexBadgeProps): JSX.Element {
-	return <span className={styles.indexBadge}>{index + 1}</span>;
-}
-
-export default IndexBadge;

frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/IndexBadge/__tests__/IndexBadge.test.tsx

@@ -1,17 +0,0 @@
-import { render, screen } from 'tests/test-utils';
-
-import IndexBadge from '../IndexBadge';
-
-describe('IndexBadge', () => {
-	it('renders a 1-based label for a 0-based index', () => {
-		render(<IndexBadge index={0} />);
-
-		expect(screen.getByText('1')).toBeInTheDocument();
-	});
-
-	it('renders the correct label for a later index', () => {
-		render(<IndexBadge index={4} />);
-
-		expect(screen.getByText('5')).toBeInTheDocument();
-	});
-});

frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/IndexBadge/index.ts

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

frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MapperGroupsTable/MapperGroupsTable.module.scss

@@ -1,16 +0,0 @@
-.groupsTableWrapper {
-	// Reserve a stable row height so short skeleton rows and taller loaded rows
-	// (multi-line filter cells) share a height and the table doesn't jump on load.
-	// Acts as a floor — richer rows still grow. 48px matches the model-costs table.
-	--tanstack-table-row-height: var(--spacing-24);
-	display: flex;
-	flex-direction: column;
-	gap: var(--spacing-4);
-}
-
-.tableEmpty {
-	padding: var(--spacing-12) var(--spacing-6);
-	text-align: center;
-	color: var(--l3-foreground);
-	font-size: var(--periscope-font-size-base);
-}

frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MapperGroupsTable/MapperGroupsTable.tsx

@@ -1,48 +0,0 @@
-import { useMemo } from 'react';
-import TanStackTable from 'components/TanStackTableView';
-
-import { DraftGroup } from '../../../types';
-import { AttributeMappingStore } from '../../hooks/useAttributeMappingStore';
-import MappersTable from '../MappersTable';
-import styles from './MapperGroupsTable.module.scss';
-import { getMapperGroupsColumns } from './TableConfig';
-
-const SKELETON_ROW_COUNT = 5;
-
-interface MapperGroupsTableProps {
-	store: AttributeMappingStore;
-}
-
-// Top-level listing of mapping groups. Each row expands to reveal its mappers,
-// which MappersTable fetches lazily on first open. Built on the shared
-// TanStackTable with virtual scroll disabled — this is a small, content-height
-// list, and nested expanded tables need to grow with their content rather than
-// live inside a fixed-height viewport.
-function MapperGroupsTable({ store }: MapperGroupsTableProps): JSX.Element {
-	const columns = useMemo(() => getMapperGroupsColumns(), []);
-
-	if (!store.isLoading && store.groups.length === 0) {
-		return (
-			<div className={styles.tableEmpty} data-testid="mapper-groups-empty">
-				No mapping groups yet.
-			</div>
-		);
-	}
-
-	return (
-		<TanStackTable<DraftGroup>
-			className={styles.groupsTableWrapper}
-			data={store.groups}
-			columns={columns}
-			isLoading={store.isLoading}
-			skeletonRowCount={SKELETON_ROW_COUNT}
-			getRowKey={(row): string => row.localId}
-			getRowCanExpand={(): boolean => true}
-			renderExpandedRow={(row): JSX.Element => <MappersTable group={row} />}
-			disableVirtualScroll
-			testId="mapper-groups-table"
-		/>
-	);
-}
-
-export default MapperGroupsTable;

frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MapperGroupsTable/TableConfig/index.ts

@@ -1 +0,0 @@
-export { getMapperGroupsColumns } from './mapperGroups.config';

frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MapperGroupsTable/TableConfig/mapperGroups.config.tsx

@@ -1,97 +0,0 @@
-import { Badge } from '@signozhq/ui/badge';
-import { Button } from '@signozhq/ui/button';
-import { ChevronDown, ChevronRight } from '@signozhq/icons';
-import type { TableColumnDef } from 'components/TanStackTableView';
-
-import type { DraftGroup } from '../../../../types';
-import { conditionFiltersFromGroup } from '../../../../utils';
-import styles from './tableConfig.module.scss';
-
-// Column definitions for the mapping-groups TanStackTable. Sorting is off across
-// the board — the groups list API returns the full set unordered, so there's no
-// server-side ordering to back a sortable header yet.
-export function getMapperGroupsColumns(): TableColumnDef<DraftGroup>[] {
-	return [
-		{
-			id: 'name',
-			header: 'Group name',
-			accessorFn: (row): string => row.name,
-			width: { min: 240, default: '100%' },
-			enableMove: false,
-			enableRemove: false,
-			cell: ({ row, isExpanded, toggleExpanded }): JSX.Element => (
-				<div className={styles.groupsTableNameCell}>
-					<Button
-						variant="ghost"
-						color="secondary"
-						size="icon"
-						aria-label={isExpanded ? 'Collapse group' : 'Expand group'}
-						onClick={(): void => toggleExpanded()}
-						testId={`group-expand-${row.localId}`}
-					>
-						{isExpanded ? <ChevronDown size={14} /> : <ChevronRight size={14} />}
-					</Button>
-					<span
-						className={styles.groupsTableName}
-						data-testid={`group-name-${row.localId}`}
-					>
-						{row.name}
-					</span>
-				</div>
-			),
-		},
-		{
-			id: 'filters',
-			header: 'Filters',
-			width: { min: 200, default: '100%' },
-			enableMove: false,
-			cell: ({ row }): JSX.Element => {
-				const filters = conditionFiltersFromGroup(row);
-				if (filters.length === 0) {
-					return (
-						<span
-							className={styles.muted}
-							data-testid={`group-filters-${row.localId}`}
-						>
-							No condition · always runs
-						</span>
-					);
-				}
-				return (
-					<div
-						className={styles.groupsTableFilters}
-						data-testid={`group-filters-${row.localId}`}
-					>
-						{filters.map((filter) => (
-							<div
-								className={styles.groupsTableFilter}
-								key={`${filter.context}:${filter.key}`}
-							>
-								<Badge
-									color={filter.context === 'resource' ? 'amber' : 'robin'}
-									variant="outline"
-								>
-									{filter.context}
-								</Badge>
-								<span className={styles.groupsTableFilterKey}>
-									contains {filter.key}
-								</span>
-							</div>
-						))}
-					</div>
-				);
-			},
-		},
-		{
-			id: 'status',
-			header: 'Status',
-			width: { min: 120, ignoreLastColumnFill: true },
-			enableMove: false,
-			cell: ({ row }): JSX.Element => (
-				<Badge color={row.enabled ? 'forest' : 'vanilla'} variant="outline">
-					{row.enabled ? 'Enabled' : 'Disabled'}
-				</Badge>
-			),
-		},
-	];
-}

frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MapperGroupsTable/TableConfig/tableConfig.module.scss

@@ -1,43 +0,0 @@
-.groupsTableNameCell {
-	display: flex;
-	align-items: center;
-	gap: var(--spacing-4);
-}
-
-.groupsTableName {
-	font-weight: var(--font-weight-semibold);
-}
-
-.groupsTableFilters {
-	display: flex;
-	flex-direction: column;
-	gap: var(--spacing-3);
-	// Allow this column to shrink within the cell so long keys wrap
-	// instead of forcing the cell wider than its allotted width.
-	min-width: 0;
-}
-
-.groupsTableFilter {
-	display: flex;
-	align-items: flex-start;
-	gap: var(--spacing-4);
-	font-size: var(--periscope-font-size-base);
-	min-width: 0;
-
-	// Keep the context badge at full width; only the key text flexes.
-	> *:first-child {
-		flex-shrink: 0;
-	}
-}
-
-.groupsTableFilterKey {
-	min-width: 0;
-	font-family: 'Geist Mono', monospace;
-	white-space: nowrap;
-	overflow: hidden;
-	text-overflow: ellipsis;
-}
-
-.muted {
-	color: var(--l3-foreground);
-}

frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MapperGroupsTable/__tests__/MapperGroupsTable.test.tsx

@@ -1,98 +0,0 @@
-import { render, screen, userEvent } from 'tests/test-utils';
-
-import { AttributeMappingStore } from '../../../hooks/useAttributeMappingStore';
-import { buildDraftGroup } from '../../../../utils';
-import { makeGroup } from '../../../../__tests__/fixtures';
-import MapperGroupsTable from '../MapperGroupsTable';
-
-function storeWith(
-	overrides: Partial<AttributeMappingStore>,
-): AttributeMappingStore {
-	return { groups: [], isLoading: false, isError: false, ...overrides };
-}
-
-describe('MapperGroupsTable', () => {
-	beforeEach(() => {
-		// The shared TanStackTable owns page/limit URL state via nuqs, which
-		// reads window.location — jsdom shares that across tests in a file.
-		window.history.pushState(null, '', '/');
-	});
-
-	it('renders the empty state when not loading and there are no groups', () => {
-		render(<MapperGroupsTable store={storeWith({ groups: [] })} />);
-
-		expect(screen.getByTestId('mapper-groups-empty')).toHaveTextContent(
-			'No mapping groups yet.',
-		);
-	});
-
-	it('does not show the empty state while loading even with no groups', () => {
-		render(
-			<MapperGroupsTable store={storeWith({ groups: [], isLoading: true })} />,
-		);
-
-		expect(screen.queryByTestId('mapper-groups-empty')).not.toBeInTheDocument();
-		expect(screen.getByTestId('mapper-groups-table')).toBeInTheDocument();
-	});
-
-	it('renders a row with its name, condition filters and enabled status', () => {
-		const group = buildDraftGroup(
-			makeGroup({
-				id: 'group-1',
-				name: 'demo',
-				enabled: true,
-				condition: {
-					attributes: ['ai.embeddings'],
-					resource: ['cloud.account.id'],
-				},
-			}),
-			[],
-		);
-		render(<MapperGroupsTable store={storeWith({ groups: [group] })} />);
-
-		expect(screen.getByTestId('group-name-group-1')).toHaveTextContent('demo');
-		const filters = screen.getByTestId('group-filters-group-1');
-		expect(filters).toHaveTextContent('attribute');
-		expect(filters).toHaveTextContent('contains ai.embeddings');
-		expect(filters).toHaveTextContent('resource');
-		expect(filters).toHaveTextContent('contains cloud.account.id');
-		expect(screen.getByText('Enabled')).toBeInTheDocument();
-	});
-
-	it('shows a disabled badge for a disabled group', () => {
-		const group = buildDraftGroup(
-			makeGroup({ id: 'group-2', enabled: false, condition: null }),
-			[],
-		);
-		render(<MapperGroupsTable store={storeWith({ groups: [group] })} />);
-
-		expect(screen.getByText('Disabled')).toBeInTheDocument();
-	});
-
-	it('shows the no-condition placeholder when a group has no attribute/resource keys', () => {
-		const group = buildDraftGroup(
-			makeGroup({ id: 'group-3', condition: null }),
-			[],
-		);
-		render(<MapperGroupsTable store={storeWith({ groups: [group] })} />);
-
-		expect(screen.getByTestId('group-filters-group-3')).toHaveTextContent(
-			'No condition · always runs',
-		);
-	});
-
-	it('toggles the expand button label when a row is expanded and collapsed', async () => {
-		const user = userEvent.setup({ pointerEventsCheck: 0 });
-		const group = buildDraftGroup(makeGroup({ id: 'group-1' }), []);
-		render(<MapperGroupsTable store={storeWith({ groups: [group] })} />);
-
-		const expandButton = screen.getByTestId('group-expand-group-1');
-		expect(expandButton).toHaveAccessibleName('Expand group');
-
-		await user.click(expandButton);
-		expect(expandButton).toHaveAccessibleName('Collapse group');
-
-		await user.click(expandButton);
-		expect(expandButton).toHaveAccessibleName('Expand group');
-	});
-});

frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MapperGroupsTable/index.ts

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

frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappersTable/MappersTable.module.scss

@@ -1,22 +0,0 @@
-.mappersTableWrapper {
-	--tanstack-expansion-first-col-padding-left: var(--spacing-6);
-	--tanstack-table-row-height: auto;
-
-	display: flex;
-	flex-direction: column;
-	gap: var(--spacing-4);
-	margin: var(--spacing-2) var(--spacing-6) var(--spacing-6) var(--spacing-12);
-	padding: var(--spacing-4) 0;
-	border: 1px solid var(--l2-border);
-	border-radius: var(--radius-2);
-	background: var(--l2-background);
-	// Clip content while the panel grows during its expand (height) animation.
-	overflow: hidden;
-}
-
-.tableEmpty {
-	padding: var(--spacing-12) var(--spacing-6);
-	text-align: center;
-	color: var(--l3-foreground);
-	font-size: var(--periscope-font-size-base);
-}

frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappersTable/MappersTable.tsx

@@ -1,86 +0,0 @@
-import { useMemo } from 'react';
-import type { SpantypesSpanMapperDTO } from 'api/generated/services/sigNoz.schemas';
-import { useListSpanMappers } from 'api/generated/services/spanmapper';
-import TanStackTable from 'components/TanStackTableView';
-import { motion, useReducedMotion } from 'motion/react';
-
-import { DraftGroup, DraftMapper } from '../../../types';
-import { buildDraftMapper } from '../../../utils';
-import styles from './MappersTable.module.scss';
-import { getMappersColumns } from './TableConfig';
-
-const SKELETON_ROW_COUNT = 3;
-
-// Expand reveal: the panel mounts already-open, so this mount transition IS the
-// group's expand animation (height + fade).
-const EXPAND_TRANSITION = { duration: 0.18, ease: 'easeOut' } as const;
-
-interface MappersTableProps {
-	group: DraftGroup;
-}
-
-// Nested table of a group's mappers, rendered inside the group's expanded row.
-// This component only mounts when its group row is expanded, so the fetch is
-// lazy by construction — a group's mappers load on first open and are then
-// cached by react-query. New (unsaved) groups have no serverId, so skip.
-function MappersTable({ group }: MappersTableProps): JSX.Element {
-	const prefersReducedMotion = useReducedMotion();
-	const { data, isLoading, isError } = useListSpanMappers(
-		{ groupId: group.serverId ?? '' },
-		{ query: { enabled: group.serverId !== null } },
-	);
-
-	const mappers = useMemo<DraftMapper[]>(() => {
-		const items = (data?.data?.items ??
-			[]) as unknown as SpantypesSpanMapperDTO[];
-		return items.map(buildDraftMapper);
-	}, [data]);
-
-	const columns = useMemo(() => getMappersColumns(), []);
-
-	let content: JSX.Element;
-	if (!isLoading && isError) {
-		content = (
-			<div
-				className={styles.tableEmpty}
-				data-testid={`mappers-error-${group.localId}`}
-			>
-				Failed to load mappings. Please try again.
-			</div>
-		);
-	} else if (!isLoading && mappers.length === 0) {
-		content = (
-			<div
-				className={styles.tableEmpty}
-				data-testid={`mappers-empty-${group.localId}`}
-			>
-				No mappings in this group yet.
-			</div>
-		);
-	} else {
-		content = (
-			<TanStackTable<DraftMapper>
-				data={mappers}
-				columns={columns}
-				isLoading={isLoading}
-				skeletonRowCount={SKELETON_ROW_COUNT}
-				getRowKey={(row): string => row.localId}
-				disableVirtualScroll
-				testId={`mappers-table-${group.localId}`}
-			/>
-		);
-	}
-
-	return (
-		<motion.div
-			className={styles.mappersTableWrapper}
-			initial={prefersReducedMotion ? false : { height: 0, opacity: 0 }}
-			animate={{ height: 'auto', opacity: 1 }}
-			transition={EXPAND_TRANSITION}
-		>
-			{content}
-		</motion.div>
-	);
-}
-
-export default MappersTable;

frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappersTable/TableConfig/index.ts

@@ -1 +0,0 @@
-export { getMappersColumns } from './mappers.config';

frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappersTable/TableConfig/mappers.config.tsx

@@ -1,108 +0,0 @@
-import { Badge } from '@signozhq/ui/badge';
-import { SpantypesFieldContextDTO } from 'api/generated/services/sigNoz.schemas';
-import { Typography } from '@signozhq/ui/typography';
-import type { TableColumnDef } from 'components/TanStackTableView';
-import cx from 'classnames';
-
-import { DraftMapper } from '../../../../types';
-import styles from './tableConfig.module.scss';
-
-const MAX_VISIBLE_SOURCES = 3;
-
-// Column definitions for the per-group mappers TanStackTable (rendered inside an
-// expanded group row). Sorting is off — priority order is positional (top wins)
-// and surfaced by the leading index column.
-export function getMappersColumns(): TableColumnDef<DraftMapper>[] {
-	return [
-		{
-			id: 'target',
-			header: 'Target',
-			accessorFn: (row): string => row.name,
-			width: { min: 200, default: '100%' },
-			enableMove: false,
-			cell: ({ row }): JSX.Element => (
-				<Typography.Text
-					weight="semibold"
-					data-testid={`mapper-target-${row.localId}`}
-				>
-					{row.name}
-				</Typography.Text>
-			),
-		},
-		{
-			id: 'sources',
-			header: 'Sources',
-			width: { min: 220, default: '100%' },
-			enableMove: false,
-			cell: ({ row }): JSX.Element => {
-				// Skeleton placeholder rows reach the cell before real data, so
-				// `sources` can be undefined — default to empty.
-				const sources = row.sources ?? [];
-				if (sources.length === 0) {
-					return (
-						<span
-							className={styles.muted}
-							data-testid={`mapper-sources-${row.localId}`}
-						>
-							—
-						</span>
-					);
-				}
-				const visible = sources.slice(0, MAX_VISIBLE_SOURCES);
-				const remaining = sources.length - visible.length;
-				return (
-					<div
-						className={styles.mappersTableSources}
-						data-testid={`mapper-sources-${row.localId}`}
-					>
-						{visible.map((source) => (
-							<Badge
-								variant="outline"
-								color="vanilla"
-								className={styles.mappersTableSourceChip}
-								key={`${source.context}:${source.key}`}
-							>
-								{source.key}
-							</Badge>
-						))}
-						{remaining > 0 && (
-							<span className={cx(styles.mappersTableSourceMore, styles.muted)}>
-								+{remaining} more
-							</span>
-						)}
-					</div>
-				);
-			},
-		},
-		{
-			id: 'writesTo',
-			header: 'Writes to',
-			width: { min: 130 },
-			enableMove: false,
-			cell: ({ row }): JSX.Element => (
-				<Badge
-					color={
-						row.fieldContext === SpantypesFieldContextDTO.resource ? 'amber' : 'robin'
-					}
-					variant="outline"
-				>
-					{row.fieldContext}
-				</Badge>
-			),
-		},
-		{
-			id: 'status',
-			header: 'Status',
-			// Opt the trailing column out of the "last column fills 100%" rule so the
-			// spare width flows into Target / Sources instead of leaving a large empty
-			// Status column on the right.
-			width: { min: 120, ignoreLastColumnFill: true },
-			enableMove: false,
-			cell: ({ row }): JSX.Element => (
-				<Badge color={row.enabled ? 'forest' : 'vanilla'} variant="outline">
-					{row.enabled ? 'Enabled' : 'Disabled'}
-				</Badge>
-			),
-		},
-	];
-}

frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappersTable/TableConfig/tableConfig.module.scss

@@ -1,22 +0,0 @@
-.mappersTableSources {
-	display: flex;
-	flex-wrap: wrap;
-	align-items: center;
-	gap: var(--spacing-3);
-}
-
-.mappersTableSourceChip {
-	// Badge's outline/vanilla variant supplies the border, background, radius and
-	// padding; textEllipsis measures against this max-width to truncate long keys.
-	max-width: 220px;
-	font-family: 'Geist Mono', monospace;
-}
-
-.mappersTableSourceMore {
-	font-size: var(--font-size-xs);
-	white-space: nowrap;
-}
-
-.muted {
-	color: var(--l3-foreground);
-}

frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappersTable/__tests__/MappersTable.test.tsx

@@ -1,119 +0,0 @@
-import {
-	SpantypesFieldContextDTO as FieldContext,
-	SpantypesSpanMapperOperationDTO as MapperOperation,
-} from 'api/generated/services/sigNoz.schemas';
-import { rest, server } from 'mocks-server/server';
-import { render, screen, waitFor } from 'tests/test-utils';
-
-import {
-	makeGroup,
-	makeMapper,
-	makeMappersResponse,
-	mappersEndpoint,
-} from '../../../../__tests__/fixtures';
-import { buildDraftGroup } from '../../../../utils';
-import MappersTable from '../MappersTable';
-
-const GROUP = buildDraftGroup(makeGroup({ id: 'group-1' }), []);
-
-function setupMappers(mappers = [makeMapper()]): void {
-	server.use(
-		rest.get(mappersEndpoint('group-1'), (_req, res, ctx) =>
-			res(ctx.status(200), ctx.json(makeMappersResponse(mappers))),
-		),
-	);
-}
-
-describe('MappersTable', () => {
-	afterEach(() => {
-		server.resetHandlers();
-	});
-
-	it('shows the error state when the mappers request fails', async () => {
-		server.use(
-			rest.get(mappersEndpoint('group-1'), (_req, res, ctx) =>
-				res(ctx.status(500)),
-			),
-		);
-		render(<MappersTable group={GROUP} />);
-
-		await expect(
-			screen.findByTestId('mappers-error-group-1'),
-		).resolves.toHaveTextContent('Failed to load mappings. Please try again.');
-	});
-
-	it('shows the empty state when the group has no mappers', async () => {
-		setupMappers([]);
-		render(<MappersTable group={GROUP} />);
-
-		await expect(
-			screen.findByTestId('mappers-empty-group-1'),
-		).resolves.toHaveTextContent('No mappings in this group yet.');
-	});
-
-	it('does not fetch and shows the empty state for a group with no server id', () => {
-		const fetchSpy = jest.fn();
-		server.use(
-			rest.get(mappersEndpoint('group-1'), (_req, res, ctx) => {
-				fetchSpy();
-				return res(ctx.status(200), ctx.json(makeMappersResponse([])));
-			}),
-		);
-		const draftGroup = { ...GROUP, serverId: null };
-
-		render(<MappersTable group={draftGroup} />);
-
-		expect(screen.getByTestId('mappers-empty-group-1')).toBeInTheDocument();
-		expect(fetchSpy).not.toHaveBeenCalled();
-	});
-
-	it('renders a mapper row with target, sources, field context and status', async () => {
-		const mapper = makeMapper({
-			id: 'mapper-1',
-			name: 'gen_ai.request.model',
-			enabled: true,
-		});
-		setupMappers([mapper]);
-		render(<MappersTable group={GROUP} />);
-
-		await waitFor(() =>
-			expect(screen.getByTestId('mapper-target-mapper-1')).toBeInTheDocument(),
-		);
-		expect(screen.getByTestId('mapper-target-mapper-1')).toHaveTextContent(
-			'gen_ai.request.model',
-		);
-		const sources = screen.getByTestId('mapper-sources-mapper-1');
-		expect(sources).toHaveTextContent('genai.model');
-		expect(sources).toHaveTextContent('llm.model');
-		expect(screen.getByText('attribute')).toBeInTheDocument();
-		expect(screen.getByText('Enabled')).toBeInTheDocument();
-	});
-
-	it('collapses extra sources into a "+N more" label beyond the visible cap', async () => {
-		const mapper = makeMapper({
-			id: 'mapper-1',
-			config: {
-				sources: [1, 2, 3, 4, 5].map((priority) => ({
-					key: `source-${priority}`,
-					context: FieldContext.attribute,
-					operation: MapperOperation.copy,
-					priority,
-				})),
-			},
-		});
-		setupMappers([mapper]);
-		render(<MappersTable group={GROUP} />);
-
-		await expect(screen.findByText('+2 more')).resolves.toBeInTheDocument();
-	});
-
-	it('shows a muted placeholder when a mapper has no sources', async () => {
-		const mapper = makeMapper({ id: 'mapper-1', config: { sources: [] } });
-		setupMappers([mapper]);
-		render(<MappersTable group={GROUP} />);
-
-		await waitFor(() =>
-			expect(screen.getByTestId('mapper-sources-mapper-1')).toHaveTextContent('—'),
-		);
-	});
-});

frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/components/MappersTable/index.ts

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

frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/hooks/__tests__/useAttributeMappingStore.test.tsx

@@ -1,89 +0,0 @@
-import { QueryClient, QueryClientProvider } from 'react-query';
-import { renderHook, waitFor } from '@testing-library/react';
-import { rest, server } from 'mocks-server/server';
-
-import {
-	GROUPS_ENDPOINT,
-	makeGroupsResponse,
-	mockGroups,
-} from '../../../__tests__/fixtures';
-import { useAttributeMappingStore } from '../useAttributeMappingStore';
-
-function createWrapper(): ({
-	children,
-}: {
-	children: React.ReactNode;
-}) => React.ReactElement {
-	const queryClient = new QueryClient({
-		defaultOptions: { queries: { retry: false } },
-	});
-	return function Wrapper({
-		children,
-	}: {
-		children: React.ReactNode;
-	}): React.ReactElement {
-		return (
-			<QueryClientProvider client={queryClient}>{children}</QueryClientProvider>
-		);
-	};
-}
-
-function renderStore(): ReturnType<
-	typeof renderHook<ReturnType<typeof useAttributeMappingStore>, unknown>
-> {
-	return renderHook(() => useAttributeMappingStore(), {
-		wrapper: createWrapper(),
-	});
-}
-
-describe('useAttributeMappingStore', () => {
-	afterEach(() => {
-		server.resetHandlers();
-	});
-
-	it('starts loading with no groups', () => {
-		server.use(
-			rest.get(GROUPS_ENDPOINT, (_req, res, ctx) =>
-				res(ctx.status(200), ctx.json(makeGroupsResponse(mockGroups))),
-			),
-		);
-		const { result } = renderStore();
-
-		expect(result.current.isLoading).toBe(true);
-		expect(result.current.groups).toStrictEqual([]);
-	});
-
-	it('builds a draft tree from the server groups once loaded', async () => {
-		server.use(
-			rest.get(GROUPS_ENDPOINT, (_req, res, ctx) =>
-				res(ctx.status(200), ctx.json(makeGroupsResponse(mockGroups))),
-			),
-		);
-		const { result } = renderStore();
-
-		await waitFor(() => expect(result.current.isLoading).toBe(false));
-
-		expect(result.current.groups).toHaveLength(2);
-		expect(result.current.groups[0]).toStrictEqual({
-			localId: 'group-1',
-			serverId: 'group-1',
-			name: 'demo',
-			attributes: ['ai.embeddings'],
-			resource: ['cloud.account.id'],
-			enabled: true,
-			mappers: [],
-		});
-		expect(result.current.isError).toBe(false);
-	});
-
-	it('surfaces isError when the groups request fails', async () => {
-		server.use(
-			rest.get(GROUPS_ENDPOINT, (_req, res, ctx) => res(ctx.status(500))),
-		);
-		const { result } = renderStore();
-
-		await waitFor(() => expect(result.current.isError).toBe(true));
-
-		expect(result.current.groups).toStrictEqual([]);
-	});
-});

frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/hooks/useAttributeMappingStore.ts

@@ -1,34 +0,0 @@
-import { useMemo } from 'react';
-import { SpantypesSpanMapperGroupDTO } from 'api/generated/services/sigNoz.schemas';
-import { useListSpanMapperGroups } from 'api/generated/services/spanmapper';
-
-import { DraftGroup } from '../../types';
-import { buildDraftGroup } from '../../utils';
-
-export interface AttributeMappingStore {
-	groups: DraftGroup[];
-	isLoading: boolean;
-	isError: boolean;
-}
-
-// Read-only store for the listing view: loads the server groups only. Each
-// group's mappers are fetched lazily when its row is expanded (see
-// MappersTable), so page load is a single request instead of an N+1 fan-out
-// across every group. Editing (draft mutations, save/discard) is layered on in
-// a later PR.
-export function useAttributeMappingStore(): AttributeMappingStore {
-	const groupsQuery = useListSpanMapperGroups();
-
-	const groups = useMemo<DraftGroup[]>(() => {
-		const serverGroups: SpantypesSpanMapperGroupDTO[] =
-			groupsQuery.data?.data?.items ?? [];
-		// Mappers load lazily per group, so seed the tree with empty mappers.
-		return serverGroups.map((group) => buildDraftGroup(group, []));
-	}, [groupsQuery.data]);
-
-	return {
-		groups,
-		isLoading: groupsQuery.isLoading,
-		isError: groupsQuery.isError,
-	};
-}

frontend/src/container/LLMObservability/AttributeMapping/AttributeMappingsTab/index.ts

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

frontend/src/container/LLMObservability/AttributeMapping/LLMObservabilityAttributeMapping.module.scss

@@ -1,6 +0,0 @@
-.llmObservabilityAttributeMapping {
-	display: flex;
-	flex-direction: column;
-	gap: var(--spacing-8);
-	padding: var(--spacing-12);
-}

frontend/src/container/LLMObservability/AttributeMapping/LLMObservabilityAttributeMapping.tsx

@@ -1,46 +0,0 @@
-import { Tabs } from '@signozhq/ui/tabs';
-
-import AttributeMappingHeader from './components/AttributeMappingHeader';
-import AttributeMappingsTab from './AttributeMappingsTab';
-import styles from './LLMObservabilityAttributeMapping.module.scss';
-
-const noop = (): void => undefined;
-
-function LLMObservabilityAttributeMapping(): JSX.Element {
-	const tabItems = [
-		{
-			key: 'attribute-mappings',
-			label: 'Attribute mappings',
-			children: <AttributeMappingsTab />,
-		},
-		{
-			key: 'test',
-			label: 'Test',
-			disabled: true,
-			disabledReason: 'Coming soon',
-			children: null,
-		},
-	];
-
-	return (
-		<div
-			className={styles.llmObservabilityAttributeMapping}
-			data-testid="llm-observability-attribute-mapping-page"
-		>
-			<AttributeMappingHeader
-				isDirty={false}
-				isSaving={false}
-				onDiscard={noop}
-				onSave={noop}
-			/>
-
-			<Tabs
-				testId="attribute-mapping-tabs"
-				defaultValue="attribute-mappings"
-				items={tabItems}
-			/>
-		</div>
-	);
-}
-
-export default LLMObservabilityAttributeMapping;

frontend/src/container/LLMObservability/AttributeMapping/__tests__/LLMObservabilityAttributeMapping.test.tsx

@@ -1,67 +0,0 @@
-import { rest, server } from 'mocks-server/server';
-import { render, screen } from 'tests/test-utils';
-
-import LLMObservabilityAttributeMapping from '../LLMObservabilityAttributeMapping';
-import { GROUPS_ENDPOINT, makeGroupsResponse, mockGroups } from './fixtures';
-
-function setupGroups(): void {
-	server.use(
-		rest.get(GROUPS_ENDPOINT, (_req, res, ctx) =>
-			res(ctx.status(200), ctx.json(makeGroupsResponse(mockGroups))),
-		),
-	);
-}
-
-describe('LLMObservabilityAttributeMapping', () => {
-	beforeEach(() => {
-		window.history.pushState(null, '', '/');
-		setupGroups();
-	});
-
-	afterEach(() => {
-		server.resetHandlers();
-	});
-
-	it('renders the page shell', () => {
-		render(<LLMObservabilityAttributeMapping />);
-
-		expect(
-			screen.getByTestId('llm-observability-attribute-mapping-page'),
-		).toBeInTheDocument();
-	});
-
-	it('shows the attribute-mappings and test sub-tab labels', () => {
-		render(<LLMObservabilityAttributeMapping />);
-
-		expect(
-			screen.getByRole('tab', { name: 'Attribute mappings' }),
-		).toBeInTheDocument();
-		expect(screen.getByRole('tab', { name: 'Test' })).toBeInTheDocument();
-	});
-
-	it('activates the attribute-mappings tab by default and renders its content', async () => {
-		render(<LLMObservabilityAttributeMapping />);
-
-		const attributeMappingsTab = screen.getByRole('tab', {
-			name: 'Attribute mappings',
-		});
-		expect(attributeMappingsTab).toHaveAttribute('data-state', 'active');
-		await expect(
-			screen.findByTestId('attribute-mappings-tab'),
-		).resolves.toBeInTheDocument();
-	});
-
-	it('disables the test tab', () => {
-		render(<LLMObservabilityAttributeMapping />);
-
-		expect(screen.getByRole('tab', { name: 'Test' })).toBeDisabled();
-	});
-
-	it('renders the header with Save/Discard disabled by default', () => {
-		render(<LLMObservabilityAttributeMapping />);
-
-		expect(screen.getByTestId('save-changes-btn')).toBeDisabled();
-		expect(screen.getByTestId('discard-changes-btn')).toBeDisabled();
-		expect(screen.queryByTestId('unsaved-changes')).not.toBeInTheDocument();
-	});
-});

frontend/src/container/LLMObservability/AttributeMapping/__tests__/fixtures.ts

@@ -1,93 +0,0 @@
-import {
-	SpantypesFieldContextDTO as FieldContext,
-	SpantypesSpanMapperDTO as Mapper,
-	SpantypesSpanMapperGroupDTO as MapperGroup,
-	SpantypesSpanMapperOperationDTO as MapperOperation,
-} from 'api/generated/services/sigNoz.schemas';
-
-// Endpoint globs used by MSW handlers. The generated client hits relative
-// `/api/v1/span_mapper_groups[...]`, so the `*` prefix matches regardless of
-// base URL.
-export const GROUPS_ENDPOINT = '*/api/v1/span_mapper_groups';
-export function mappersEndpoint(groupId: string): string {
-	return `*/api/v1/span_mapper_groups/${groupId}/span_mappers`;
-}
-
-export function makeGroup(overrides: Partial<MapperGroup> = {}): MapperGroup {
-	return {
-		id: 'group-1',
-		orgId: 'org-1',
-		name: 'demo',
-		enabled: true,
-		condition: {
-			attributes: ['ai.embeddings'],
-			resource: ['cloud.account.id'],
-		},
-		...overrides,
-	};
-}
-
-export function makeMapper(overrides: Partial<Mapper> = {}): Mapper {
-	return {
-		id: 'mapper-1',
-		group_id: 'group-1',
-		name: 'gen_ai.request.model',
-		enabled: true,
-		fieldContext: FieldContext.attribute,
-		config: {
-			sources: [
-				{
-					key: 'genai.model',
-					context: FieldContext.attribute,
-					operation: MapperOperation.copy,
-					priority: 2,
-				},
-				{
-					key: 'llm.model',
-					context: FieldContext.attribute,
-					operation: MapperOperation.move,
-					priority: 1,
-				},
-			],
-		},
-		...overrides,
-	};
-}
-
-// Both list endpoints share the same `{ status, data: { items } }` envelope —
-// the generated schema mis-types the mappers response with the groups DTO
-// (see MappersTable), but the runtime envelope shape is identical.
-export function makeGroupsResponse(groups: MapperGroup[]): {
-	status: string;
-	data: { items: MapperGroup[] };
-} {
-	return { status: 'ok', data: { items: groups } };
-}
-
-export function makeMappersResponse(mappers: Mapper[]): {
-	status: string;
-	data: { items: Mapper[] };
-} {
-	return { status: 'ok', data: { items: mappers } };
-}
-
-export const mockGroups: MapperGroup[] = [
-	makeGroup({
-		id: 'group-1',
-		name: 'demo',
-		condition: {
-			attributes: ['ai.embeddings'],
-			resource: ['cloud.account.id'],
-		},
-	}),
-	makeGroup({
-		id: 'group-2',
-		name: 'Tool',
-		enabled: false,
-		condition: { attributes: null, resource: null },
-	}),
-];
-
-export const mockMappers: Mapper[] = [
-	makeMapper({ id: 'mapper-1', group_id: 'group-1' }),
-];

frontend/src/container/LLMObservability/AttributeMapping/__tests__/utils.test.ts

@@ -1,114 +0,0 @@
-import {
-	SpantypesFieldContextDTO as FieldContext,
-	SpantypesSpanMapperOperationDTO as MapperOperation,
-} from 'api/generated/services/sigNoz.schemas';
-
-import {
-	buildDraftGroup,
-	buildDraftMapper,
-	conditionFiltersFromGroup,
-	getMapperSources,
-} from '../utils';
-import { makeGroup, makeMapper } from './fixtures';
-
-describe('conditionFiltersFromGroup', () => {
-	it('lists attribute keys before resource keys', () => {
-		const filters = conditionFiltersFromGroup({
-			attributes: ['ai.embeddings'],
-			resource: ['cloud.account.id'],
-		});
-
-		expect(filters).toStrictEqual([
-			{ context: 'attribute', key: 'ai.embeddings' },
-			{ context: 'resource', key: 'cloud.account.id' },
-		]);
-	});
-
-	it('defaults missing attributes/resource to no filters', () => {
-		expect(conditionFiltersFromGroup({})).toStrictEqual([]);
-	});
-});
-
-describe('getMapperSources', () => {
-	it('orders sources by priority, highest first', () => {
-		const mapper = makeMapper({
-			config: {
-				sources: [
-					{
-						key: 'llm.model',
-						context: FieldContext.attribute,
-						operation: MapperOperation.move,
-						priority: 1,
-					},
-					{
-						key: 'genai.model',
-						context: FieldContext.attribute,
-						operation: MapperOperation.copy,
-						priority: 2,
-					},
-				],
-			},
-		});
-
-		expect(getMapperSources(mapper)).toStrictEqual([
-			{
-				key: 'genai.model',
-				context: FieldContext.attribute,
-				operation: MapperOperation.copy,
-			},
-			{
-				key: 'llm.model',
-				context: FieldContext.attribute,
-				operation: MapperOperation.move,
-			},
-		]);
-	});
-
-	it('defaults a null sources config to an empty list', () => {
-		const mapper = makeMapper({ config: { sources: null } });
-
-		expect(getMapperSources(mapper)).toStrictEqual([]);
-	});
-});
-
-describe('buildDraftMapper', () => {
-	it('maps the server mapper into a draft node keyed by the server id', () => {
-		const mapper = makeMapper({ id: 'mapper-9', enabled: false });
-
-		const draft = buildDraftMapper(mapper);
-
-		expect(draft.localId).toBe('mapper-9');
-		expect(draft.serverId).toBe('mapper-9');
-		expect(draft.name).toBe(mapper.name);
-		expect(draft.enabled).toBe(false);
-		expect(draft.sources).toStrictEqual(getMapperSources(mapper));
-	});
-});
-
-describe('buildDraftGroup', () => {
-	it('maps the server group and its mappers into a draft tree', () => {
-		const group = makeGroup({
-			id: 'group-9',
-			condition: { attributes: ['a'], resource: ['b'] },
-		});
-		const mapper = makeMapper({ id: 'mapper-1' });
-
-		const draft = buildDraftGroup(group, [mapper]);
-
-		expect(draft.localId).toBe('group-9');
-		expect(draft.serverId).toBe('group-9');
-		expect(draft.attributes).toStrictEqual(['a']);
-		expect(draft.resource).toStrictEqual(['b']);
-		expect(draft.mappers).toHaveLength(1);
-		expect(draft.mappers[0].localId).toBe('mapper-1');
-	});
-
-	it('defaults a null condition to empty attributes/resource', () => {
-		const group = makeGroup({ condition: null });
-
-		const draft = buildDraftGroup(group, []);
-
-		expect(draft.attributes).toStrictEqual([]);
-		expect(draft.resource).toStrictEqual([]);
-	});
-});

frontend/src/container/LLMObservability/AttributeMapping/components/AttributeMappingHeader/AttributeMappingHeader.module.scss

@@ -1,17 +0,0 @@
-.pageHeader {
-	display: flex;
-	align-items: flex-start;
-	justify-content: space-between;
-	gap: var(--spacing-8);
-}
-
-.pageHeaderActions {
-	display: flex;
-	align-items: center;
-	gap: var(--spacing-6);
-}
-
-.unsavedChanges {
-	font-size: var(--periscope-font-size-base);
-	color: var(--accent-amber);
-}

frontend/src/container/LLMObservability/AttributeMapping/components/AttributeMappingHeader/AttributeMappingHeader.tsx

@@ -1,54 +0,0 @@
-import { Button } from '@signozhq/ui/button';
-import { Typography } from '@signozhq/ui/typography';
-
-import styles from './AttributeMappingHeader.module.scss';
-
-interface AttributeMappingHeaderProps {
-	isDirty: boolean;
-	isSaving: boolean;
-	onDiscard: () => void;
-	onSave: () => void;
-}
-
-function AttributeMappingHeader({
-	isDirty,
-	isSaving,
-	onDiscard,
-	onSave,
-}: AttributeMappingHeaderProps): JSX.Element {
-	return (
-		<header className={styles.pageHeader}>
-			<Typography.Text as="p" size="base" color="muted">
-				Configure source-to-target attribute remapping for LLM traces
-			</Typography.Text>
-			<div className={styles.pageHeaderActions}>
-				{isDirty && (
-					<span className={styles.unsavedChanges} data-testid="unsaved-changes">
-						Unsaved changes
-					</span>
-				)}
-				<Button
-					variant="outlined"
-					color="secondary"
-					onClick={onDiscard}
-					disabled={!isDirty || isSaving}
-					testId="discard-changes-btn"
-				>
-					Discard
-				</Button>
-				<Button
-					variant="solid"
-					color="primary"
-					onClick={onSave}
-					loading={isSaving}
-					disabled={!isDirty || isSaving}
-					testId="save-changes-btn"
-				>
-					{isSaving ? 'Saving…' : 'Save changes'}
-				</Button>
-			</div>
-		</header>
-	);
-}
-
-export default AttributeMappingHeader;

frontend/src/container/LLMObservability/AttributeMapping/components/AttributeMappingHeader/__tests__/AttributeMappingHeader.test.tsx

@@ -1,89 +0,0 @@
-import { render, screen, userEvent } from 'tests/test-utils';
-
-import AttributeMappingHeader from '../AttributeMappingHeader';
-
-describe('AttributeMappingHeader', () => {
-	it('renders the description copy', () => {
-		render(
-			<AttributeMappingHeader
-				isDirty={false}
-				isSaving={false}
-				onDiscard={jest.fn()}
-				onSave={jest.fn()}
-			/>,
-		);
-
-		expect(
-			screen.getByText(
-				'Configure source-to-target attribute remapping for LLM traces',
-			),
-		).toBeInTheDocument();
-	});
-
-	it('hides the unsaved-changes indicator and disables Save/Discard when not dirty', () => {
-		render(
-			<AttributeMappingHeader
-				isDirty={false}
-				isSaving={false}
-				onDiscard={jest.fn()}
-				onSave={jest.fn()}
-			/>,
-		);
-
-		expect(screen.queryByTestId('unsaved-changes')).not.toBeInTheDocument();
-		expect(screen.getByTestId('discard-changes-btn')).toBeDisabled();
-		expect(screen.getByTestId('save-changes-btn')).toBeDisabled();
-	});
-
-	it('shows the unsaved-changes indicator and enables Save/Discard when dirty', () => {
-		render(
-			<AttributeMappingHeader
-				isDirty
-				isSaving={false}
-				onDiscard={jest.fn()}
-				onSave={jest.fn()}
-			/>,
-		);
-
-		expect(screen.getByTestId('unsaved-changes')).toHaveTextContent(
-			'Unsaved changes',
-		);
-		expect(screen.getByTestId('discard-changes-btn')).toBeEnabled();
-		expect(screen.getByTestId('save-changes-btn')).toBeEnabled();
-	});
-
-	it('disables Save/Discard and shows the saving label while saving', () => {
-		render(
-			<AttributeMappingHeader
-				isDirty
-				isSaving
-				onDiscard={jest.fn()}
-				onSave={jest.fn()}
-			/>,
-		);
-
-		expect(screen.getByTestId('discard-changes-btn')).toBeDisabled();
-		expect(screen.getByTestId('save-changes-btn')).toBeDisabled();
-		expect(screen.getByTestId('save-changes-btn')).toHaveTextContent('Saving…');
-	});
-
-	it('calls onSave and onDiscard when their buttons are clicked', async () => {
-		const user = userEvent.setup({ pointerEventsCheck: 0 });
-		const onSave = jest.fn();
-		const onDiscard = jest.fn();
-		render(
-			<AttributeMappingHeader
-				isDirty
-				isSaving={false}
-				onDiscard={onDiscard}
-				onSave={onSave}
-			/>,
-		);
-
-		await user.click(screen.getByTestId('save-changes-btn'));
-		await user.click(screen.getByTestId('discard-changes-btn'));
-
-		expect(onSave).toHaveBeenCalledTimes(1);
-		expect(onDiscard).toHaveBeenCalledTimes(1);
-	});
-});

frontend/src/container/LLMObservability/AttributeMapping/components/AttributeMappingHeader/index.ts

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

frontend/src/container/LLMObservability/AttributeMapping/types.ts

@@ -1,66 +0,0 @@
-import {
-	SpantypesFieldContextDTO,
-	SpantypesSpanMapperOperationDTO,
-} from 'api/generated/services/sigNoz.schemas';
-
-// A single human-readable condition clause shown in the group's Filters column.
-export interface ConditionFilter {
-	context: 'attribute' | 'resource';
-	key: string;
-}
-
-export type MapperDraftMode = 'add' | 'edit';
-
-// One source candidate. `context` is where the key is read from (span
-// attribute or resource); `operation` is move (delete source) or copy (keep).
-// Priority is implicit in list order (top wins), derived on save.
-export interface SourceConfig {
-	key: string;
-	context: SpantypesFieldContextDTO;
-	operation: SpantypesSpanMapperOperationDTO;
-}
-
-// Editable form state for a mapper. `sources` is ordered highest priority
-// first; `fieldContext` is where the standardized target is written.
-export interface MapperDraft {
-	id: string | null;
-	name: string;
-	fieldContext: SpantypesFieldContextDTO;
-	sources: SourceConfig[];
-	enabled: boolean;
-}
-
-// Editable form state for a group. The group runs when a span carries a
-// span-attribute key matching `attributes` OR a resource key matching
-// `resource` (plain substring match).
-export interface GroupDraft {
-	id: string | null;
-	name: string;
-	attributes: string[];
-	resource: string[];
-	enabled: boolean;
-}
-
-// Working-copy node for a mapper. `localId` is a stable client key (the server
-// id once persisted, or a temporary id for not-yet-saved rows). `serverId` is
-// null until the row has been persisted.
-export interface DraftMapper {
-	localId: string;
-	serverId: string | null;
-	name: string;
-	fieldContext: SpantypesFieldContextDTO;
-	sources: SourceConfig[];
-	enabled: boolean;
-}
-
-// Working-copy node for a group, holding its mappers inline so the whole tree
-// can be staged locally and diffed against the server snapshot on save.
-export interface DraftGroup {
-	localId: string;
-	serverId: string | null;
-	name: string;
-	attributes: string[];
-	resource: string[];
-	enabled: boolean;
-	mappers: DraftMapper[];
-}

frontend/src/container/LLMObservability/AttributeMapping/utils.ts

@@ -1,75 +0,0 @@
-import {
-	SpantypesSpanMapperDTO,
-	SpantypesSpanMapperGroupDTO,
-} from 'api/generated/services/sigNoz.schemas';
-
-import {
-	ConditionFilter,
-	DraftGroup,
-	DraftMapper,
-	SourceConfig,
-} from './types';
-
-// Display clauses for a group's condition keys (span attribute keys first,
-// then resource keys).
-export function conditionFiltersFromGroup(group: {
-	attributes?: string[];
-	resource?: string[];
-}): ConditionFilter[] {
-	// TanStackTable renders skeleton placeholder rows through the cells on first
-	// render, so these arrays can be undefined before real data lands — default
-	// to empty rather than crashing the cell.
-	return [
-		...(group.attributes ?? []).map((key) => ({
-			context: 'attribute' as const,
-			key,
-		})),
-		...(group.resource ?? []).map((key) => ({
-			context: 'resource' as const,
-			key,
-		})),
-	];
-}
-
-// Source configs for a mapper, highest priority first (first match wins at
-// evaluation time).
-export function getMapperSources(
-	mapper: SpantypesSpanMapperDTO,
-): SourceConfig[] {
-	const sources = mapper.config?.sources ?? [];
-	return [...sources]
-		.sort((a, b) => b.priority - a.priority)
-		.map((source) => ({
-			key: source.key,
-			context: source.context,
-			operation: source.operation,
-		}));
-}
-
-// ---- working-copy (draft tree) helpers ----
-
-export function buildDraftMapper(mapper: SpantypesSpanMapperDTO): DraftMapper {
-	return {
-		localId: mapper.id,
-		serverId: mapper.id,
-		name: mapper.name,
-		fieldContext: mapper.fieldContext,
-		sources: getMapperSources(mapper),
-		enabled: mapper.enabled,
-	};
-}
-
-export function buildDraftGroup(
-	group: SpantypesSpanMapperGroupDTO,
-	mappers: SpantypesSpanMapperDTO[],
-): DraftGroup {
-	return {
-		localId: group.id,
-		serverId: group.id,
-		name: group.name,
-		attributes: group.condition?.attributes ?? [],
-		resource: group.condition?.resource ?? [],
-		enabled: group.enabled,
-		mappers: mappers.map(buildDraftMapper),
-	};
-}

frontend/src/container/LLMObservability/LLMObservability.module.scss

@@ -1,7 +1,27 @@
 .llmObservability {
 	display: flex;
 	flex-direction: column;
-	height: 100%;
-	margin-top: var(--spacing-2);
-	margin-left: var(--spacing-2);
+	gap: var(--spacing-8);
+	padding: var(--spacing-12) var(--spacing-16);
+}
+
+.pageHeader {
+	display: flex;
+	align-items: flex-start;
+	justify-content: space-between;
+	gap: var(--spacing-8);
+}
+
+.pageHeaderTitle {
+	.title {
+		margin: 0;
+		font-size: var(--font-size-xl);
+		font-weight: var(--font-weight-semibold);
+	}
+
+	.subtitle {
+		margin: var(--spacing-2) 0 0;
+		color: var(--text-vanilla-400);
+		font-size: var(--periscope-font-size-base);
+	}
 }

frontend/src/container/LLMObservability/LLMObservability.tsx

@@ -1,22 +1,16 @@
-import { Tabs } from '@signozhq/ui/tabs';
-
-import { useLLMObservabilityTabs } from './hooks/useLLMObservabilityTabs';
 import styles from './LLMObservability.module.scss';
 
-// Shell for the LLM Observability page: renders the top-level tab bar
-// (Overview / Configuration) using the SigNoz design-system Tabs, with
-// route-driven active state from useLLMObservabilityTabs.
 function LLMObservability(): JSX.Element {
-	const { items, activeTab, onTabChange } = useLLMObservabilityTabs();
-
 	return (
 		<div className={styles.llmObservability} data-testid="llm-observability-page">
-			<Tabs
-				items={items}
-				value={activeTab}
-				onChange={onTabChange}
-				testId="llm-observability-tabs"
-			/>
+			<header className={styles.pageHeader}>
+				<div className={styles.pageHeaderTitle}>
+					<h1 className={styles.title}>LLM Observability</h1>
+					<p className={styles.subtitle}>
+						Monitor and analyze your LLM usage, costs, and performance
+					</p>
+				</div>
+			</header>
 		</div>
 	);
 }

frontend/src/container/LLMObservability/Overview/Overview.module.scss

@@ -1,27 +0,0 @@
-.overview {
-	display: flex;
-	flex-direction: column;
-	gap: var(--spacing-8);
-	padding: var(--spacing-12) var(--spacing-16);
-}
-
-.pageHeader {
-	display: flex;
-	align-items: flex-start;
-	justify-content: space-between;
-	gap: var(--spacing-8);
-}
-
-.pageHeaderTitle {
-	.title {
-		margin: 0;
-		font-size: var(--font-size-xl);
-		font-weight: var(--font-weight-semibold);
-	}
-
-	.subtitle {
-		margin: var(--spacing-2) 0 0;
-		color: var(--text-vanilla-400);
-		font-size: var(--periscope-font-size-base);
-	}
-}

frontend/src/container/LLMObservability/Overview/Overview.tsx

@@ -1,20 +0,0 @@
-import styles from './Overview.module.scss';
-
-// Overview tab content for LLM Observability. Currently the feature's landing
-// surface; usage/cost/performance widgets land in later PRs.
-function Overview(): JSX.Element {
-	return (
-		<div className={styles.overview} data-testid="llm-observability-overview">
-			<header className={styles.pageHeader}>
-				<div className={styles.pageHeaderTitle}>
-					<h1 className={styles.title}>LLM Observability</h1>
-					<p className={styles.subtitle}>
-						Monitor and analyze your LLM usage, costs, and performance
-					</p>
-				</div>
-			</header>
-		</div>
-	);
-}
-
-export default Overview;

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

@@ -2,4 +2,29 @@
 	display: flex;
 	flex-direction: column;
 	gap: var(--spacing-8);
+	padding: var(--spacing-12) var(--spacing-16);
+}
+
+.pageHeader {
+	display: flex;
+	align-items: flex-start;
+	justify-content: space-between;
+	gap: var(--spacing-8);
+}
+
+.pageHeaderTitle {
+	display: flex;
+	flex-direction: column;
+	gap: var(--spacing-2);
+	.title {
+		margin: 0;
+		font-size: var(--font-size-xl);
+		font-weight: var(--font-weight-semibold);
+	}
+
+	.subtitle {
+		margin: var(--spacing-2) 0 0;
+		color: var(--text-vanilla-400);
+		font-size: var(--periscope-font-size-base);
+	}
 }

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

@@ -1,4 +1,5 @@
 import { Tabs } from '@signozhq/ui/tabs';
+import { Typography } from '@signozhq/ui/typography';
 
 import ModelCostTabPanel from './ModelCostTabPanel';
 import styles from './LLMObservabilityModelPricing.module.scss';
@@ -9,9 +10,20 @@ function LLMObservabilityModelPricing(): JSX.Element {
 			className={styles.llmObservabilityModelPricing}
 			data-testid="llm-observability-model-pricing-page"
 		>
+			<header className={styles.pageHeader}>
+				<div className={styles.pageHeaderTitle}>
+					<Typography.Text as="h1" size="large" weight="semibold">
+						Configuration
+					</Typography.Text>
+					<Typography.Text color="muted">
+						Model pricing and cost estimation settings
+					</Typography.Text>
+				</div>
+			</header>
+
 			<Tabs
 				// Model costs is the only enabled tab for now, so default to it. When
-				// the unpriced-models tab lands in a later PR.
+				// the unpriced-models tab lands, this can become a URL-backed param.
 				defaultValue="model-costs"
 				items={[
 					{

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

@@ -2,6 +2,7 @@ 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';
@@ -160,6 +161,12 @@ function ModelCostTabPanel(): JSX.Element {
 				onDelete={deletion.requestDelete}
 			/>
 
+			<footer>
+				<Typography.Text color="muted" size="small">
+					All prices per 1M tokens (USD)
+				</Typography.Text>
+			</footer>
+
 			{drawer.isOpen && (
 				<ModelCostDrawer
 					isOpen={drawer.isOpen}

frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/__tests__/ModelCostTabPanel.integration.test.tsx

@@ -1,229 +0,0 @@
-import { rest, server } from 'mocks-server/server';
-import { render, screen, userEvent, waitFor, within } from 'tests/test-utils';
-
-import {
-	LLM_PRICING_ENDPOINT,
-	LLM_PRICING_RULE_ENDPOINT,
-	makeListResponse,
-	mockRules,
-} from '../../__tests__/fixtures';
-import ModelCostTabPanel from '../ModelCostTabPanel';
-
-const toastSuccess = jest.fn();
-const toastError = jest.fn();
-jest.mock('@signozhq/ui/sonner', () => ({
-	...jest.requireActual('@signozhq/ui/sonner'),
-	toast: {
-		success: (...args: unknown[]): void => toastSuccess(...args),
-		error: (...args: unknown[]): void => toastError(...args),
-	},
-}));
-
-function setupList(items = mockRules, total = items.length): void {
-	server.use(
-		rest.get(LLM_PRICING_ENDPOINT, (_req, res, ctx) =>
-			res(ctx.status(200), ctx.json(makeListResponse(items, total))),
-		),
-	);
-}
-
-// The list panel keeps page/search/source in the URL via nuqs, which reads
-// window.location. jsdom shares that across tests in a file, so reset it.
-function resetUrl(): void {
-	window.history.pushState(null, '', '/');
-}
-
-// The row kebab is a DropdownMenuSimple trigger; its testId isn't forwarded, so
-// select it as the row's only button and open the Edit/Delete menu.
-async function openRowMenu(
-	user: ReturnType<typeof userEvent.setup>,
-	ruleId: string,
-): Promise<void> {
-	const row = screen.getByTestId(`model-cell-name-${ruleId}`).closest('tr');
-	await user.click(within(row as HTMLElement).getByRole('button'));
-}
-
-describe('ModelCostTabPanel (integration)', () => {
-	beforeEach(() => {
-		resetUrl();
-	});
-
-	afterEach(() => {
-		server.resetHandlers();
-	});
-
-	it('renders pricing rules returned by the list API', async () => {
-		setupList();
-		render(<ModelCostTabPanel />);
-
-		const openaiCell = await screen.findByTestId('model-cell-name-rule-openai');
-		expect(openaiCell).toHaveTextContent('gpt-4o');
-		expect(
-			screen.getByTestId('model-cell-name-rule-anthropic'),
-		).toHaveTextContent('claude-3-5-sonnet');
-		// Canonical id under the model name + provider column.
-		expect(screen.getByText('openai:gpt-4o')).toBeInTheDocument();
-		expect(screen.getAllByText('OpenAI').length).toBeGreaterThan(0);
-		// Source badges reflect the override flag.
-		expect(screen.getByTestId('source-badge-rule-openai')).toHaveTextContent(
-			'User override',
-		);
-		expect(screen.getByTestId('source-badge-rule-anthropic')).toHaveTextContent(
-			'Auto',
-		);
-	});
-
-	it('shows the empty state when there are no rules', async () => {
-		setupList([], 0);
-		render(<ModelCostTabPanel />);
-
-		const empty = await screen.findByTestId('model-costs-empty');
-		expect(empty).toHaveTextContent('No model costs yet.');
-	});
-
-	it('shows an error message when the list request fails', async () => {
-		server.use(
-			rest.get(LLM_PRICING_ENDPOINT, (_req, res, ctx) => res(ctx.status(500))),
-		);
-		render(<ModelCostTabPanel />);
-
-		const alert = await screen.findByRole('alert');
-		expect(alert).toHaveTextContent(
-			'Failed to load pricing rules. Please try again.',
-		);
-	});
-
-	it('sends the debounced search term as the q param', async () => {
-		const user = userEvent.setup({ pointerEventsCheck: 0 });
-		let lastParams: URLSearchParams | null = null;
-		server.use(
-			rest.get(LLM_PRICING_ENDPOINT, (req, res, ctx) => {
-				lastParams = req.url.searchParams;
-				return res(ctx.status(200), ctx.json(makeListResponse(mockRules)));
-			}),
-		);
-		render(<ModelCostTabPanel />);
-
-		await screen.findByTestId('model-cell-name-rule-openai');
-		await user.type(
-			screen.getByPlaceholderText('Search by model or provider'),
-			'claude',
-		);
-
-		await waitFor(() => expect(lastParams?.get('q')).toBe('claude'));
-	});
-
-	it('clears the search via the clear button', async () => {
-		const user = userEvent.setup({ pointerEventsCheck: 0 });
-		setupList();
-		render(<ModelCostTabPanel />);
-
-		const input = screen.getByPlaceholderText(
-			'Search by model or provider',
-		) as HTMLInputElement;
-		await user.type(input, 'gpt');
-		expect(input.value).toBe('gpt');
-
-		await user.click(screen.getByTestId('model-cost-search-clear'));
-		await waitFor(() => expect(input.value).toBe(''));
-	});
-
-	it('sends isOverride=true when the source filter is set to User override', async () => {
-		const user = userEvent.setup({ pointerEventsCheck: 0 });
-		let lastParams: URLSearchParams | null = null;
-		server.use(
-			rest.get(LLM_PRICING_ENDPOINT, (req, res, ctx) => {
-				lastParams = req.url.searchParams;
-				return res(ctx.status(200), ctx.json(makeListResponse(mockRules)));
-			}),
-		);
-		render(<ModelCostTabPanel />);
-
-		await screen.findByTestId('model-cell-name-rule-openai');
-		await user.click(screen.getByTestId('source-filter'));
-		// Scope to the listbox option — "User override" also appears as a row badge.
-		await user.click(
-			await screen.findByRole('option', { name: 'User override' }),
-		);
-
-		await waitFor(() => expect(lastParams?.get('isOverride')).toBe('true'));
-	});
-
-	it('opens the add drawer for a manager (ADMIN)', async () => {
-		const user = userEvent.setup({ pointerEventsCheck: 0 });
-		setupList();
-		render(<ModelCostTabPanel />);
-
-		await screen.findByTestId('model-cell-name-rule-openai');
-		await user.click(screen.getByTestId('add-model-cost-btn'));
-
-		const modelInput = await screen.findByTestId('drawer-model-id-input');
-		expect(modelInput).toBeInTheDocument();
-		expect(screen.getByTestId('drawer-save-btn')).toBeInTheDocument();
-	});
-
-	it('hides the add button and row actions for a viewer', async () => {
-		setupList();
-		render(<ModelCostTabPanel />, undefined, { role: 'VIEWER' });
-
-		const row = (
-			await screen.findByTestId('model-cell-name-rule-openai')
-		).closest('tr') as HTMLElement;
-		expect(screen.queryByTestId('add-model-cost-btn')).not.toBeInTheDocument();
-		// View-only rows render no action menu (no buttons in the row).
-		expect(within(row).queryByRole('button')).not.toBeInTheDocument();
-	});
-
-	it('opens the edit drawer prefilled from the row action menu', async () => {
-		const user = userEvent.setup({ pointerEventsCheck: 0 });
-		setupList();
-		render(<ModelCostTabPanel />);
-
-		await screen.findByTestId('model-cell-name-rule-openai');
-		await openRowMenu(user, 'rule-openai');
-		await user.click(await screen.findByText('Edit'));
-
-		const drawerTitle = await screen.findByText('Edit model cost');
-		expect(drawerTitle).toBeInTheDocument();
-		const modelInput = screen.getByTestId(
-			'drawer-model-id-input',
-		) as HTMLInputElement;
-		expect(modelInput.value).toBe('gpt-4o');
-		expect(modelInput).toBeDisabled();
-	});
-
-	it('deletes a rule through the confirm dialog', async () => {
-		const user = userEvent.setup({ pointerEventsCheck: 0 });
-		let deletedId: string | null = null;
-		setupList();
-		server.use(
-			rest.delete(LLM_PRICING_RULE_ENDPOINT, (req, res, ctx) => {
-				deletedId = req.params.id as string;
-				return res(ctx.status(200), ctx.json({ status: 'success' }));
-			}),
-		);
-		render(<ModelCostTabPanel />);
-
-		await screen.findByTestId('model-cell-name-rule-openai');
-		await openRowMenu(user, 'rule-openai');
-		await user.click(await screen.findByText('Delete'));
-
-		await user.click(await screen.findByTestId('drawer-delete-confirm-btn'));
-
-		await waitFor(() => expect(deletedId).toBe('rule-openai'));
-		await waitFor(() =>
-			expect(toastSuccess).toHaveBeenCalledWith('Model cost deleted'),
-		);
-	});
-
-	it('renders cache buckets for rules that have cache pricing', async () => {
-		setupList();
-		render(<ModelCostTabPanel />);
-
-		const anthropicRow = (
-			await screen.findByTestId('model-cell-name-rule-anthropic')
-		).closest('tr') as HTMLElement;
-		expect(within(anthropicRow).getByText(/Cache Read/i)).toBeInTheDocument();
-		expect(within(anthropicRow).getByText(/Cache Write/i)).toBeInTheDocument();
-	});
-});

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

@@ -1,87 +0,0 @@
-import { render, screen, userEvent } from 'tests/test-utils';
-
-import DeleteConfirmDialog from '../DeleteConfirmDialog';
-
-describe('DeleteConfirmDialog', () => {
-	it('renders the model name in the confirmation copy', () => {
-		render(
-			<DeleteConfirmDialog
-				open
-				modelName="gpt-4o"
-				isDeleting={false}
-				onConfirm={jest.fn()}
-				onCancel={jest.fn()}
-			/>,
-		);
-
-		expect(screen.getByText('gpt-4o')).toBeInTheDocument();
-	});
-
-	it('calls onConfirm when the confirm button is clicked', async () => {
-		const user = userEvent.setup({ pointerEventsCheck: 0 });
-		const onConfirm = jest.fn();
-		render(
-			<DeleteConfirmDialog
-				open
-				modelName="gpt-4o"
-				isDeleting={false}
-				onConfirm={onConfirm}
-				onCancel={jest.fn()}
-			/>,
-		);
-
-		await user.click(screen.getByTestId('drawer-delete-confirm-btn'));
-
-		expect(onConfirm).toHaveBeenCalledTimes(1);
-	});
-
-	it('calls onCancel when the cancel button is clicked', async () => {
-		const user = userEvent.setup({ pointerEventsCheck: 0 });
-		const onCancel = jest.fn();
-		render(
-			<DeleteConfirmDialog
-				open
-				modelName="gpt-4o"
-				isDeleting={false}
-				onConfirm={jest.fn()}
-				onCancel={onCancel}
-			/>,
-		);
-
-		await user.click(screen.getByTestId('drawer-delete-cancel-btn'));
-
-		expect(onCancel).toHaveBeenCalledTimes(1);
-	});
-
-	it('disables the confirm button while deleting', () => {
-		render(
-			<DeleteConfirmDialog
-				open
-				modelName="gpt-4o"
-				isDeleting
-				onConfirm={jest.fn()}
-				onCancel={jest.fn()}
-			/>,
-		);
-
-		expect(screen.getByTestId('drawer-delete-confirm-btn')).toBeDisabled();
-	});
-
-	it('calls onCancel when the dialog is dismissed via Escape', async () => {
-		const user = userEvent.setup({ pointerEventsCheck: 0 });
-		const onCancel = jest.fn();
-		render(
-			<DeleteConfirmDialog
-				open
-				modelName="gpt-4o"
-				isDeleting={false}
-				onConfirm={jest.fn()}
-				onCancel={onCancel}
-			/>,
-		);
-
-		await user.keyboard('{Escape}');
-
-		expect(onCancel).toHaveBeenCalledTimes(1);
-	});
-});

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

@@ -1,173 +0,0 @@
-import { render, screen, userEvent, waitFor } from 'tests/test-utils';
-
-import { makePricingRule } from '../../../../__tests__/fixtures';
-import { EMPTY_DRAFT } from '../../../../constants';
-import { draftFromRule } from '../../../../utils';
-import ModelCostDrawer from '../ModelCostDrawer';
-
-const editDraft = draftFromRule(
-	makePricingRule({
-		id: 'rule-openai',
-		modelName: 'gpt-4o',
-		provider: 'OpenAI',
-	}),
-);
-
-describe('ModelCostDrawer (integration)', () => {
-	it('renders the add title and a save button for a manager', () => {
-		render(
-			<ModelCostDrawer
-				isOpen
-				mode="add"
-				initialDraft={EMPTY_DRAFT}
-				onClose={jest.fn()}
-				onSave={jest.fn()}
-				isSaving={false}
-				saveError={null}
-				canManage
-			/>,
-		);
-
-		expect(screen.getByText('Add model cost')).toBeInTheDocument();
-		expect(screen.getByTestId('drawer-save-btn')).toBeInTheDocument();
-	});
-
-	it('disables save until the form is dirty', async () => {
-		const user = userEvent.setup({ pointerEventsCheck: 0 });
-		render(
-			<ModelCostDrawer
-				isOpen
-				mode="add"
-				initialDraft={EMPTY_DRAFT}
-				onClose={jest.fn()}
-				onSave={jest.fn()}
-				isSaving={false}
-				saveError={null}
-				canManage
-			/>,
-		);
-
-		expect(screen.getByTestId('drawer-save-btn')).toBeDisabled();
-
-		await user.type(screen.getByTestId('drawer-model-id-input'), 'openai:gpt-4o');
-
-		await waitFor(() =>
-			expect(screen.getByTestId('drawer-save-btn')).toBeEnabled(),
-		);
-	});
-
-	it('shows the model id required error and does not call onSave when the name is empty', async () => {
-		const user = userEvent.setup({ pointerEventsCheck: 0 });
-		const onSave = jest.fn();
-		render(
-			<ModelCostDrawer
-				isOpen
-				mode="add"
-				initialDraft={EMPTY_DRAFT}
-				onClose={jest.fn()}
-				onSave={onSave}
-				isSaving={false}
-				saveError={null}
-				canManage
-			/>,
-		);
-
-		// Make the form dirty without touching the model id: add a pattern, which
-		// mutates the `patterns` form field while leaving the name empty.
-		await user.type(screen.getByTestId('drawer-pattern-input'), 'gpt');
-		await user.click(screen.getByTestId('drawer-pattern-add-btn'));
-
-		await waitFor(() =>
-			expect(screen.getByTestId('drawer-save-btn')).toBeEnabled(),
-		);
-		await user.click(screen.getByTestId('drawer-save-btn'));
-
-		const error = await screen.findByText('Billing model ID is required.');
-		expect(error).toBeInTheDocument();
-		expect(onSave).not.toHaveBeenCalled();
-	});
-
-	it('calls onSave once on the happy path with valid model id and pricing', async () => {
-		const user = userEvent.setup({ pointerEventsCheck: 0 });
-		const onSave = jest.fn();
-		render(
-			<ModelCostDrawer
-				isOpen
-				mode="add"
-				initialDraft={EMPTY_DRAFT}
-				onClose={jest.fn()}
-				onSave={onSave}
-				isSaving={false}
-				saveError={null}
-				canManage
-			/>,
-		);
-
-		await user.type(screen.getByTestId('drawer-model-id-input'), 'openai:gpt-4o');
-		await user.type(screen.getByTestId('drawer-input-cost'), '3');
-		await user.type(screen.getByTestId('drawer-output-cost'), '9');
-
-		await user.click(screen.getByTestId('drawer-save-btn'));
-
-		await waitFor(() => expect(onSave).toHaveBeenCalledTimes(1));
-	});
-
-	it('renders the edit title with disabled, prefilled model id and disabled provider', () => {
-		render(
-			<ModelCostDrawer
-				isOpen
-				mode="edit"
-				initialDraft={editDraft}
-				onClose={jest.fn()}
-				onSave={jest.fn()}
-				isSaving={false}
-				saveError={null}
-				canManage
-			/>,
-		);
-
-		expect(screen.getByText('Edit model cost')).toBeInTheDocument();
-		const modelInput = screen.getByTestId(
-			'drawer-model-id-input',
-		) as HTMLInputElement;
-		expect(modelInput.value).toBe('gpt-4o');
-		expect(modelInput).toBeDisabled();
-		expect(screen.getByTestId('drawer-provider-select')).toBeDisabled();
-	});
-
-	it('renders a read-only view with a Close button and no save for a viewer', () => {
-		render(
-			<ModelCostDrawer
-				isOpen
-				mode="edit"
-				initialDraft={editDraft}
-				onClose={jest.fn()}
-				onSave={jest.fn()}
-				isSaving={false}
-				saveError={null}
-				canManage={false}
-			/>,
-		);
-
-		expect(screen.getByText('View model cost')).toBeInTheDocument();
-		expect(screen.queryByTestId('drawer-save-btn')).not.toBeInTheDocument();
-		expect(screen.getByTestId('drawer-cancel-btn')).toHaveTextContent('Close');
-	});
-
-	it('renders the save error text', () => {
-		render(
-			<ModelCostDrawer
-				isOpen
-				mode="add"
-				initialDraft={EMPTY_DRAFT}
-				onClose={jest.fn()}
-				onSave={jest.fn()}
-				isSaving={false}
-				saveError="boom"
-				canManage
-			/>,
-		);
-
-		expect(screen.getByText('boom')).toBeInTheDocument();
-	});
-});

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

@@ -1,120 +0,0 @@
-import { LlmpricingruletypesLLMPricingRuleCacheModeDTO as CacheModeDTO } from 'api/generated/services/sigNoz.schemas';
-import { fireEvent, render, screen, userEvent } from 'tests/test-utils';
-
-import type { DrawerDraft } from '../../../../../../types';
-import ExtraPricingBuckets from '../ExtraPricingBuckets';
-
-type Pricing = DrawerDraft['pricing'];
-
-function makePricing(overrides: Partial<Pricing> = {}): Pricing {
-	return {
-		input: 3,
-		output: 9,
-		cacheMode: CacheModeDTO.unknown,
-		cacheRead: null,
-		cacheWrite: null,
-		...overrides,
-	};
-}
-
-describe('ExtraPricingBuckets', () => {
-	it('shows only the add button when no bucket has a value', () => {
-		render(
-			<ExtraPricingBuckets
-				pricing={makePricing()}
-				isReadOnly={false}
-				onChange={jest.fn()}
-			/>,
-		);
-
-		expect(screen.getByTestId('drawer-add-bucket-btn')).toBeInTheDocument();
-		expect(
-			screen.queryByTestId('drawer-cache-read-cost'),
-		).not.toBeInTheDocument();
-		expect(screen.queryByTestId('drawer-cache-mode')).not.toBeInTheDocument();
-	});
-
-	it('opens the picker and adds a cache_read row with the cache mode select', async () => {
-		const user = userEvent.setup({ pointerEventsCheck: 0 });
-		render(
-			<ExtraPricingBuckets
-				pricing={makePricing()}
-				isReadOnly={false}
-				onChange={jest.fn()}
-			/>,
-		);
-
-		await user.click(screen.getByTestId('drawer-add-bucket-btn'));
-		expect(screen.getByTestId('drawer-bucket-picker')).toBeInTheDocument();
-
-		await user.click(screen.getByTestId('drawer-add-bucket-cache-read'));
-
-		expect(screen.getByTestId('drawer-cache-read-cost')).toBeInTheDocument();
-		expect(screen.getByTestId('drawer-cache-mode')).toBeInTheDocument();
-	});
-
-	it('calls onChange with the cache_read value typed into the row', async () => {
-		const user = userEvent.setup({ pointerEventsCheck: 0 });
-		const onChange = jest.fn();
-		render(
-			<ExtraPricingBuckets
-				pricing={makePricing()}
-				isReadOnly={false}
-				onChange={onChange}
-			/>,
-		);
-
-		await user.click(screen.getByTestId('drawer-add-bucket-btn'));
-		await user.click(screen.getByTestId('drawer-add-bucket-cache-read'));
-
-		fireEvent.change(screen.getByTestId('drawer-cache-read-cost'), {
-			target: { value: '2' },
-		});
-
-		expect(onChange).toHaveBeenCalledWith({ cacheRead: 2 });
-	});
-
-	it('calls onChange with cacheRead null when the row is removed', async () => {
-		const user = userEvent.setup({ pointerEventsCheck: 0 });
-		const onChange = jest.fn();
-		render(
-			<ExtraPricingBuckets
-				pricing={makePricing({ cacheRead: 2 })}
-				isReadOnly={false}
-				onChange={onChange}
-			/>,
-		);
-
-		await user.click(screen.getByTestId('drawer-remove-cache-read'));
-
-		expect(onChange).toHaveBeenCalledWith({ cacheRead: null });
-	});
-
-	it('renders the cache_read row on mount when pricing already has a value', () => {
-		render(
-			<ExtraPricingBuckets
-				pricing={makePricing({ cacheRead: 2 })}
-				isReadOnly={false}
-				onChange={jest.fn()}
-			/>,
-		);
-
-		expect(screen.getByTestId('drawer-cache-read-cost')).toBeInTheDocument();
-		expect(screen.getByTestId('drawer-cache-mode')).toBeInTheDocument();
-	});
-
-	it('hides the add and remove buttons when read-only', () => {
-		render(
-			<ExtraPricingBuckets
-				pricing={makePricing({ cacheRead: 2 })}
-				isReadOnly
-				onChange={jest.fn()}
-			/>,
-		);
-
-		expect(screen.queryByTestId('drawer-add-bucket-btn')).not.toBeInTheDocument();
-		expect(
-			screen.queryByTestId('drawer-remove-cache-read'),
-		).not.toBeInTheDocument();
-	});
-});

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

@@ -1,99 +0,0 @@
-import { fireEvent, render, screen, userEvent } from 'tests/test-utils';
-
-import PatternEditor from '../PatternEditor';
-
-describe('PatternEditor', () => {
-	it('adds a typed pattern via the Add button', async () => {
-		const user = userEvent.setup({ pointerEventsCheck: 0 });
-		const onChange = jest.fn();
-		render(
-			<PatternEditor
-				patterns={['gpt-4o']}
-				isReadOnly={false}
-				onChange={onChange}
-			/>,
-		);
-
-		await user.type(screen.getByTestId('drawer-pattern-input'), 'gpt-5');
-		await user.click(screen.getByTestId('drawer-pattern-add-btn'));
-
-		expect(onChange).toHaveBeenCalledWith(['gpt-4o', 'gpt-5']);
-	});
-
-	it('adds a pattern when Enter is pressed', () => {
-		const onChange = jest.fn();
-		render(
-			<PatternEditor patterns={[]} isReadOnly={false} onChange={onChange} />,
-		);
-
-		const input = screen.getByTestId('drawer-pattern-input');
-		fireEvent.change(input, { target: { value: 'claude' } });
-		fireEvent.keyDown(input, { key: 'Enter' });
-
-		expect(onChange).toHaveBeenCalledWith(['claude']);
-	});
-
-	it('does not call onChange for a duplicate and clears the input', async () => {
-		const user = userEvent.setup({ pointerEventsCheck: 0 });
-		const onChange = jest.fn();
-		render(
-			<PatternEditor
-				patterns={['gpt-4o']}
-				isReadOnly={false}
-				onChange={onChange}
-			/>,
-		);
-
-		const input = screen.getByTestId('drawer-pattern-input') as HTMLInputElement;
-		await user.type(input, 'gpt-4o');
-		await user.click(screen.getByTestId('drawer-pattern-add-btn'));
-
-		expect(onChange).not.toHaveBeenCalled();
-		expect(input.value).toBe('');
-	});
-
-	it('trims surrounding whitespace before adding', () => {
-		const onChange = jest.fn();
-		render(
-			<PatternEditor patterns={[]} isReadOnly={false} onChange={onChange} />,
-		);
-
-		const input = screen.getByTestId('drawer-pattern-input');
-		fireEvent.change(input, { target: { value: '  gemini  ' } });
-		fireEvent.keyDown(input, { key: 'Enter' });
-
-		expect(onChange).toHaveBeenCalledWith(['gemini']);
-	});
-
-	it('removes a pattern when its chip remove button is clicked', async () => {
-		const user = userEvent.setup({ pointerEventsCheck: 0 });
-		const onChange = jest.fn();
-		render(
-			<PatternEditor
-				patterns={['gpt-4o', 'gpt-5']}
-				isReadOnly={false}
-				onChange={onChange}
-			/>,
-		);
-
-		await user.click(
-			screen.getByRole('button', { name: 'Remove pattern gpt-4o' }),
-		);
-
-		expect(onChange).toHaveBeenCalledWith(['gpt-5']);
-	});
-
-	it('renders chips without remove buttons and no input when read-only', () => {
-		render(
-			<PatternEditor patterns={['gpt-4o']} isReadOnly onChange={jest.fn()} />,
-		);
-
-		expect(screen.queryByTestId('drawer-pattern-input')).not.toBeInTheDocument();
-		expect(
-			screen.queryByTestId('drawer-pattern-add-btn'),
-		).not.toBeInTheDocument();
-		expect(
-			screen.queryByRole('button', { name: 'Remove pattern gpt-4o' }),
-		).not.toBeInTheDocument();
-	});
-});

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

@@ -1,85 +0,0 @@
-import { LlmpricingruletypesLLMPricingRuleCacheModeDTO as CacheModeDTO } from 'api/generated/services/sigNoz.schemas';
-import { fireEvent, render, screen } from 'tests/test-utils';
-
-import type { DrawerDraft } from '../../../../../../types';
-import PricingFields from '../PricingFields';
-
-type Pricing = DrawerDraft['pricing'];
-
-function makePricing(overrides: Partial<Pricing> = {}): Pricing {
-	return {
-		input: null,
-		output: null,
-		cacheMode: CacheModeDTO.unknown,
-		cacheRead: null,
-		cacheWrite: null,
-		...overrides,
-	};
-}
-
-describe('PricingFields', () => {
-	it('calls onChange with the parsed input cost', () => {
-		const onChange = jest.fn();
-		render(
-			<PricingFields
-				pricing={makePricing()}
-				isReadOnly={false}
-				onChange={onChange}
-			/>,
-		);
-
-		fireEvent.change(screen.getByTestId('drawer-input-cost'), {
-			target: { value: '5' },
-		});
-
-		expect(onChange).toHaveBeenCalledWith({ input: 5 });
-	});
-
-	it('calls onChange with the parsed output cost', () => {
-		const onChange = jest.fn();
-		render(
-			<PricingFields
-				pricing={makePricing()}
-				isReadOnly={false}
-				onChange={onChange}
-			/>,
-		);
-
-		fireEvent.change(screen.getByTestId('drawer-output-cost'), {
-			target: { value: '12' },
-		});
-
-		expect(onChange).toHaveBeenCalledWith({ output: 12 });
-	});
-
-	it('calls onChange with null when the input is cleared', () => {
-		const onChange = jest.fn();
-		render(
-			<PricingFields
-				pricing={makePricing({ input: 5 })}
-				isReadOnly={false}
-				onChange={onChange}
-			/>,
-		);
-
-		fireEvent.change(screen.getByTestId('drawer-input-cost'), {
-			target: { value: '' },
-		});
-
-		expect(onChange).toHaveBeenCalledWith({ input: null });
-	});
-
-	it('disables the inputs and shows the read-only label when read-only', () => {
-		render(
-			<PricingFields
-				pricing={makePricing({ input: 3, output: 9 })}
-				isReadOnly
-				onChange={jest.fn()}
-			/>,
-		);
-
-		expect(screen.getByTestId('drawer-input-cost')).toBeDisabled();
-		expect(screen.getByTestId('drawer-output-cost')).toBeDisabled();
-		expect(screen.getByTestId('drawer-readonly-label')).toBeInTheDocument();
-	});
-});

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

@@ -1,76 +0,0 @@
-import { render, screen, userEvent } from 'tests/test-utils';
-
-import SourceSelector from '../SourceSelector';
-
-describe('SourceSelector', () => {
-	it('calls onChange(true) when picking override while currently auto', async () => {
-		const user = userEvent.setup({ pointerEventsCheck: 0 });
-		const onChange = jest.fn();
-		render(
-			<SourceSelector isOverride={false} isReadOnly={false} onChange={onChange} />,
-		);
-
-		await user.click(screen.getByTestId('drawer-source-override'));
-
-		expect(onChange).toHaveBeenCalledWith(true);
-	});
-
-	it('shows the reset confirm UI without calling onChange when switching to auto from override', async () => {
-		const user = userEvent.setup({ pointerEventsCheck: 0 });
-		const onChange = jest.fn();
-		render(<SourceSelector isOverride isReadOnly={false} onChange={onChange} />);
-
-		await user.click(screen.getByTestId('drawer-source-auto'));
-
-		expect(screen.getByTestId('drawer-reset-keep-btn')).toBeInTheDocument();
-		expect(screen.getByTestId('drawer-reset-confirm-btn')).toBeInTheDocument();
-		expect(onChange).not.toHaveBeenCalled();
-	});
-
-	it('hides the confirm UI and does not call onChange when Keep is clicked', async () => {
-		const user = userEvent.setup({ pointerEventsCheck: 0 });
-		const onChange = jest.fn();
-		render(<SourceSelector isOverride isReadOnly={false} onChange={onChange} />);
-
-		await user.click(screen.getByTestId('drawer-source-auto'));
-		await user.click(screen.getByTestId('drawer-reset-keep-btn'));
-
-		expect(
-			screen.queryByTestId('drawer-reset-confirm-btn'),
-		).not.toBeInTheDocument();
-		expect(onChange).not.toHaveBeenCalled();
-	});
-
-	it('calls onChange(false) when Reset is confirmed', async () => {
-		const user = userEvent.setup({ pointerEventsCheck: 0 });
-		const onChange = jest.fn();
-		render(<SourceSelector isOverride isReadOnly={false} onChange={onChange} />);
-
-		await user.click(screen.getByTestId('drawer-source-auto'));
-		await user.click(screen.getByTestId('drawer-reset-confirm-btn'));
-
-		expect(onChange).toHaveBeenCalledWith(false);
-		expect(
-			screen.queryByTestId('drawer-reset-confirm-btn'),
-		).not.toBeInTheDocument();
-	});
-
-	it('shows the managed label when read-only', () => {
-		render(<SourceSelector isOverride isReadOnly onChange={jest.fn()} />);
-
-		expect(screen.getByTestId('drawer-managed-label')).toBeInTheDocument();
-	});
-
-	it('disables the auto radio when disableAuto is set', () => {
-		render(
-			<SourceSelector
-				isOverride
-				isReadOnly={false}
-				disableAuto
-				onChange={jest.fn()}
-			/>,
-		);
-
-		expect(screen.getByTestId('drawer-source-auto')).toBeDisabled();
-	});
-});

frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostDrawer/hooks/__tests__/useModelCostDrawer.test.tsx

@@ -1,152 +0,0 @@
-import { QueryClient, QueryClientProvider } from 'react-query';
-import { act, renderHook, waitFor } from '@testing-library/react';
-import { rest, server } from 'mocks-server/server';
-
-import { EMPTY_DRAFT } from '../../../../../constants';
-import {
-	LLM_PRICING_ENDPOINT,
-	makePricingRule,
-} from '../../../../../__tests__/fixtures';
-import { draftFromRule } from '../../../../../utils';
-import { useModelCostDrawer } from '../useModelCostDrawer';
-
-const toastSuccess = jest.fn();
-const toastError = jest.fn();
-jest.mock('@signozhq/ui/sonner', () => ({
-	...jest.requireActual('@signozhq/ui/sonner'),
-	toast: {
-		success: (...args: unknown[]): void => toastSuccess(...args),
-		error: (...args: unknown[]): void => toastError(...args),
-	},
-}));
-
-function createWrapper(): ({
-	children,
-}: {
-	children: React.ReactNode;
-}) => React.ReactElement {
-	const queryClient = new QueryClient({
-		defaultOptions: {
-			queries: { retry: false },
-			mutations: { retry: false },
-		},
-	});
-	return function Wrapper({
-		children,
-	}: {
-		children: React.ReactNode;
-	}): React.ReactElement {
-		return (
-			<QueryClientProvider client={queryClient}>{children}</QueryClientProvider>
-		);
-	};
-}
-
-function renderUseModelCostDrawer(): ReturnType<
-	typeof renderHook<ReturnType<typeof useModelCostDrawer>, unknown>
-> {
-	return renderHook(() => useModelCostDrawer(), { wrapper: createWrapper() });
-}
-
-describe('useModelCostDrawer', () => {
-	afterEach(() => {
-		server.resetHandlers();
-	});
-
-	it('starts closed in add mode with no selected rule', () => {
-		const { result } = renderUseModelCostDrawer();
-
-		expect(result.current.isOpen).toBe(false);
-		expect(result.current.mode).toBe('add');
-		expect(result.current.selectedRuleId).toBeNull();
-	});
-
-	it('openForAdd opens the drawer in add mode with the empty draft', () => {
-		const { result } = renderUseModelCostDrawer();
-
-		act(() => {
-			result.current.openForAdd();
-		});
-
-		expect(result.current.isOpen).toBe(true);
-		expect(result.current.mode).toBe('add');
-		expect(result.current.selectedRuleId).toBeNull();
-		expect(result.current.initialDraft).toStrictEqual({
-			...EMPTY_DRAFT,
-			modelName: '',
-			patterns: [],
-		});
-	});
-
-	it('openForEdit opens the drawer in edit mode prefilled from the rule', () => {
-		const rule = makePricingRule({ id: 'rule-edit', modelName: 'gpt-4o' });
-		const { result } = renderUseModelCostDrawer();
-
-		act(() => {
-			result.current.openForEdit(rule);
-		});
-
-		expect(result.current.isOpen).toBe(true);
-		expect(result.current.mode).toBe('edit');
-		expect(result.current.selectedRuleId).toBe('rule-edit');
-		expect(result.current.initialDraft).toStrictEqual(draftFromRule(rule));
-	});
-
-	it('close resets the open state and selection', () => {
-		const rule = makePricingRule({ id: 'rule-edit' });
-		const { result } = renderUseModelCostDrawer();
-
-		act(() => {
-			result.current.openForEdit(rule);
-		});
-		act(() => {
-			result.current.close();
-		});
-
-		expect(result.current.isOpen).toBe(false);
-		expect(result.current.selectedRuleId).toBeNull();
-		expect(result.current.saveError).toBeNull();
-	});
-
-	it('save success closes the drawer and shows a success toast', async () => {
-		server.use(
-			rest.put(LLM_PRICING_ENDPOINT, (_req, res, ctx) =>
-				res(ctx.status(200), ctx.json({ status: 'success' })),
-			),
-		);
-		const { result } = renderUseModelCostDrawer();
-
-		act(() => {
-			result.current.openForAdd();
-		});
-
-		const draft = { ...EMPTY_DRAFT, modelName: 'gpt-4o' };
-		await act(async () => {
-			await result.current.save(draft);
-		});
-
-		await waitFor(() => expect(result.current.isOpen).toBe(false));
-		expect(toastSuccess).toHaveBeenCalledWith('Model cost added');
-		expect(result.current.saveError).toBeNull();
-	});
-
-	it('save failure sets saveError and keeps the drawer open', async () => {
-		server.use(
-			rest.put(LLM_PRICING_ENDPOINT, (_req, res, ctx) => res(ctx.status(500))),
-		);
-		const { result } = renderUseModelCostDrawer();
-
-		act(() => {
-			result.current.openForAdd();
-		});
-
-		const draft = { ...EMPTY_DRAFT, modelName: 'gpt-4o' };
-		await act(async () => {
-			await result.current.save(draft);
-		});
-
-		await waitFor(() => expect(result.current.saveError).not.toBeNull());
-		expect(result.current.isOpen).toBe(true);
-		expect(toastSuccess).not.toHaveBeenCalled();
-	});
-});

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

@@ -1,7 +1,7 @@
 .modelCostsTable {
 	margin-top: var(--spacing-8);
 	--tanstack-table-row-height: 48px;
-	height: calc(100vh - 170px);
+	height: calc(100vh - 250px);
 	overflow-y: auto;
 
 	:global(table) tbody tr {

frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostsTable/__tests__/ModelCostActionsMenu.test.tsx

@@ -1,73 +0,0 @@
-import { render, screen, userEvent } from 'tests/test-utils';
-
-import { makePricingRule } from '../../../../__tests__/fixtures';
-import ModelCostActionsMenu from '../ModelCostActionsMenu';
-
-const rule = makePricingRule({ id: 'rule-openai', modelName: 'gpt-4o' });
-
-describe('ModelCostActionsMenu', () => {
-	it('renders nothing when the user cannot manage', () => {
-		const { container } = render(
-			<ModelCostActionsMenu
-				rule={rule}
-				canManage={false}
-				onEdit={jest.fn()}
-				onDelete={jest.fn()}
-			/>,
-		);
-
-		expect(container.firstChild).toBeNull();
-		expect(screen.queryByRole('button')).not.toBeInTheDocument();
-	});
-
-	it('renders a trigger button when the user can manage', () => {
-		render(
-			<ModelCostActionsMenu
-				rule={rule}
-				canManage
-				onEdit={jest.fn()}
-				onDelete={jest.fn()}
-			/>,
-		);
-
-		expect(screen.getByRole('button')).toBeInTheDocument();
-	});
-
-	it('calls onEdit with the rule when clicking Edit', async () => {
-		const user = userEvent.setup({ pointerEventsCheck: 0 });
-		const onEdit = jest.fn();
-		render(
-			<ModelCostActionsMenu
-				rule={rule}
-				canManage
-				onEdit={onEdit}
-				onDelete={jest.fn()}
-			/>,
-		);
-
-		await user.click(screen.getByRole('button'));
-		await user.click(await screen.findByText('Edit'));
-
-		expect(onEdit).toHaveBeenCalledTimes(1);
-		expect(onEdit).toHaveBeenCalledWith(rule);
-	});
-
-	it('calls onDelete with the rule when clicking Delete', async () => {
-		const user = userEvent.setup({ pointerEventsCheck: 0 });
-		const onDelete = jest.fn();
-		render(
-			<ModelCostActionsMenu
-				rule={rule}
-				canManage
-				onEdit={jest.fn()}
-				onDelete={onDelete}
-			/>,
-		);
-
-		await user.click(screen.getByRole('button'));
-		await user.click(await screen.findByText('Delete'));
-
-		expect(onDelete).toHaveBeenCalledTimes(1);
-		expect(onDelete).toHaveBeenCalledWith(rule);
-	});
-});

frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/components/ModelCostsTable/__tests__/ModelCostsTable.test.tsx

@@ -1,115 +0,0 @@
-import { render, screen, within } from 'tests/test-utils';
-
-import { mockRules } from '../../../../__tests__/fixtures';
-import ModelCostsTable from '../ModelCostsTable';
-
-const noop = (): void => {};
-
-// The table owns page/limit URL state via nuqs, which reads window.location.
-// jsdom shares that across tests in a file, so reset it before each.
-function resetUrl(): void {
-	window.history.pushState(null, '', '/');
-}
-
-function getRow(ruleId: string): HTMLElement {
-	return screen
-		.getByTestId(`model-cell-name-${ruleId}`)
-		.closest('tr') as HTMLElement;
-}
-
-describe('ModelCostsTable', () => {
-	beforeEach(() => {
-		resetUrl();
-	});
-
-	it('renders the empty state when not loading and there are no rules', () => {
-		render(
-			<ModelCostsTable
-				rules={[]}
-				isLoading={false}
-				total={0}
-				selectedRuleId={null}
-				canManage
-				onEdit={noop}
-				onDelete={noop}
-			/>,
-		);
-
-		const empty = screen.getByTestId('model-costs-empty');
-		expect(empty).toHaveTextContent('No model costs yet.');
-	});
-
-	it('does not show the empty state while loading even with no rules', () => {
-		render(
-			<ModelCostsTable
-				rules={[]}
-				isLoading
-				total={0}
-				selectedRuleId={null}
-				canManage
-				onEdit={noop}
-				onDelete={noop}
-			/>,
-		);
-
-		expect(screen.queryByTestId('model-costs-empty')).not.toBeInTheDocument();
-		expect(screen.getByTestId('model-costs-table')).toBeInTheDocument();
-	});
-
-	it('renders rows from the rules with formatted prices, provider, canonical id and source badges', () => {
-		render(
-			<ModelCostsTable
-				rules={mockRules}
-				isLoading={false}
-				total={mockRules.length}
-				selectedRuleId={null}
-				canManage
-				onEdit={noop}
-				onDelete={noop}
-			/>,
-		);
-
-		// Model names.
-		expect(screen.getByTestId('model-cell-name-rule-openai')).toHaveTextContent(
-			'gpt-4o',
-		);
-		expect(
-			screen.getByTestId('model-cell-name-rule-anthropic'),
-		).toHaveTextContent('claude-3-5-sonnet');
-
-		// Canonical id under the model name.
-		expect(screen.getByText('openai:gpt-4o')).toBeInTheDocument();
-
-		// Provider column.
-		expect(screen.getAllByText('OpenAI').length).toBeGreaterThan(0);
-
-		// Formatted input price ($3.00) for the openai row.
-		const openaiRow = getRow('rule-openai');
-		expect(within(openaiRow).getByText('$3.00')).toBeInTheDocument();
-
-		// Source label badges reflect the override flag.
-		expect(screen.getByTestId('source-badge-rule-openai')).toHaveTextContent(
-			'User override',
-		);
-		expect(screen.getByTestId('source-badge-rule-anthropic')).toHaveTextContent(
-			'Auto',
-		);
-	});
-
-	it('renders no row action button when the user cannot manage', () => {
-		render(
-			<ModelCostsTable
-				rules={mockRules}
-				isLoading={false}
-				total={mockRules.length}
-				selectedRuleId={null}
-				canManage={false}
-				onEdit={noop}
-				onDelete={noop}
-			/>,
-		);
-
-		const openaiRow = getRow('rule-openai');
-		expect(within(openaiRow).queryByRole('button')).not.toBeInTheDocument();
-	});
-});

frontend/src/container/LLMObservability/Settings/ModelPricing/ModelCostTabPanel/hooks/__tests__/useModelCostDelete.test.tsx

@@ -1,123 +0,0 @@
-import { QueryClient, QueryClientProvider } from 'react-query';
-import { act, renderHook, waitFor } from '@testing-library/react';
-import { rest, server } from 'mocks-server/server';
-
-import { LLM_PRICING_RULE_ENDPOINT } from '../../../__tests__/fixtures';
-import { useModelCostDelete } from '../useModelCostDelete';
-
-const toastSuccess = jest.fn();
-const toastError = jest.fn();
-jest.mock('@signozhq/ui/sonner', () => ({
-	...jest.requireActual('@signozhq/ui/sonner'),
-	toast: {
-		success: (...args: unknown[]): void => toastSuccess(...args),
-		error: (...args: unknown[]): void => toastError(...args),
-	},
-}));
-
-function createWrapper(): ({
-	children,
-}: {
-	children: React.ReactNode;
-}) => React.ReactElement {
-	const queryClient = new QueryClient({
-		defaultOptions: {
-			queries: { retry: false },
-			mutations: { retry: false },
-		},
-	});
-	return function Wrapper({
-		children,
-	}: {
-		children: React.ReactNode;
-	}): React.ReactElement {
-		return (
-			<QueryClientProvider client={queryClient}>{children}</QueryClientProvider>
-		);
-	};
-}
-
-function renderUseModelCostDelete(): ReturnType<
-	typeof renderHook<ReturnType<typeof useModelCostDelete>, unknown>
-> {
-	return renderHook(() => useModelCostDelete(), { wrapper: createWrapper() });
-}
-
-const PENDING = { id: 'rule-openai', modelName: 'gpt-4o' };
-
-describe('useModelCostDelete', () => {
-	afterEach(() => {
-		server.resetHandlers();
-	});
-
-	it('starts with no pending delete', () => {
-		const { result } = renderUseModelCostDelete();
-
-		expect(result.current.pendingDelete).toBeNull();
-	});
-
-	it('requestDelete queues the rule for deletion', () => {
-		const { result } = renderUseModelCostDelete();
-
-		act(() => {
-			result.current.requestDelete(PENDING);
-		});
-
-		expect(result.current.pendingDelete).toStrictEqual(PENDING);
-	});
-
-	it('cancelDelete clears the pending delete', () => {
-		const { result } = renderUseModelCostDelete();
-
-		act(() => {
-			result.current.requestDelete(PENDING);
-		});
-		act(() => {
-			result.current.cancelDelete();
-		});
-
-		expect(result.current.pendingDelete).toBeNull();
-	});
-
-	it('confirmDelete success fires the DELETE, clears state and toasts success', async () => {
-		let deletedId: string | null = null;
-		server.use(
-			rest.delete(LLM_PRICING_RULE_ENDPOINT, (req, res, ctx) => {
-				deletedId = req.params.id as string;
-				return res(ctx.status(200), ctx.json({ status: 'success' }));
-			}),
-		);
-		const { result } = renderUseModelCostDelete();
-
-		act(() => {
-			result.current.requestDelete(PENDING);
-		});
-		await act(async () => {
-			await result.current.confirmDelete();
-		});
-
-		await waitFor(() => expect(deletedId).toBe('rule-openai'));
-		await waitFor(() => expect(result.current.pendingDelete).toBeNull());
-		expect(toastSuccess).toHaveBeenCalledWith('Model cost deleted');
-	});
-
-	it('confirmDelete failure keeps the pending delete and toasts an error', async () => {
-		server.use(
-			rest.delete(LLM_PRICING_RULE_ENDPOINT, (_req, res, ctx) =>
-				res(ctx.status(500)),
-			),
-		);
-		const { result } = renderUseModelCostDelete();
-
-		act(() => {
-			result.current.requestDelete(PENDING);
-		});
-		await act(async () => {
-			await result.current.confirmDelete();
-		});
-
-		await waitFor(() => expect(toastError).toHaveBeenCalled());
-		expect(result.current.pendingDelete).toStrictEqual(PENDING);
-		expect(toastSuccess).not.toHaveBeenCalled();
-	});
-});

frontend/src/container/LLMObservability/Settings/ModelPricing/__tests__/LLMObservabilityModelPricing.test.tsx

@@ -1,59 +0,0 @@
-import { rest, server } from 'mocks-server/server';
-import { render, screen } from 'tests/test-utils';
-
-import LLMObservabilityModelPricing from '../LLMObservabilityModelPricing';
-import { LLM_PRICING_ENDPOINT, makeListResponse, mockRules } from './fixtures';
-
-function setupList(items = mockRules): void {
-	server.use(
-		rest.get(LLM_PRICING_ENDPOINT, (_req, res, ctx) =>
-			res(ctx.status(200), ctx.json(makeListResponse(items))),
-		),
-	);
-}
-
-describe('LLMObservabilityModelPricing', () => {
-	beforeEach(() => {
-		window.history.pushState(null, '', '/');
-		setupList();
-	});
-
-	afterEach(() => {
-		server.resetHandlers();
-	});
-
-	it('renders the model-pricing page', () => {
-		render(<LLMObservabilityModelPricing />);
-
-		expect(
-			screen.getByTestId('llm-observability-model-pricing-page'),
-		).toBeInTheDocument();
-	});
-
-	it('shows the model-costs and unpriced-models sub-tab labels', () => {
-		render(<LLMObservabilityModelPricing />);
-
-		expect(screen.getByRole('tab', { name: 'Model costs' })).toBeInTheDocument();
-		expect(
-			screen.getByRole('tab', { name: /Unpriced models/ }),
-		).toBeInTheDocument();
-	});
-
-	it('activates the model-costs tab by default and renders its content', async () => {
-		render(<LLMObservabilityModelPricing />);
-
-		const modelCostsTab = screen.getByRole('tab', { name: 'Model costs' });
-		expect(modelCostsTab).toHaveAttribute('data-state', 'active');
-		const searchInput = await screen.findByPlaceholderText(
-			'Search by model or provider',
-		);
-		expect(searchInput).toBeInTheDocument();
-	});
-
-	it('disables the unpriced-models tab', () => {
-		render(<LLMObservabilityModelPricing />);
-
-		const unpricedTab = screen.getByRole('tab', { name: /Unpriced models/ });
-		expect(unpricedTab).toBeDisabled();
-	});
-});

frontend/src/container/LLMObservability/Settings/ModelPricing/__tests__/fixtures.ts

@@ -1,80 +0,0 @@
-import {
-	LlmpricingruletypesLLMPricingRuleCacheModeDTO as CacheModeDTO,
-	LlmpricingruletypesLLMPricingRuleUnitDTO as UnitDTO,
-	type ListLLMPricingRules200,
-} from 'api/generated/services/sigNoz.schemas';
-
-import type { PricingRule } from '../types';
-
-// Endpoint glob used by MSW handlers. The generated client hits a relative
-// `/api/v1/llm_pricing_rules`, so the `*` prefix matches regardless of base URL.
-export const LLM_PRICING_ENDPOINT = '*/api/v1/llm_pricing_rules';
-export const LLM_PRICING_RULE_ENDPOINT = '*/api/v1/llm_pricing_rules/:id';
-
-// Builds a valid pricing rule, with overrides merged shallowly. Pricing is
-// replaced wholesale when provided so callers can shape cache buckets freely.
-export function makePricingRule(
-	overrides: Partial<PricingRule> = {},
-): PricingRule {
-	const { pricing, ...rest } = overrides;
-	return {
-		id: 'rule-1',
-		enabled: true,
-		isOverride: true,
-		modelName: 'gpt-4o',
-		modelPattern: ['gpt-4o'],
-		orgId: 'org-1',
-		provider: 'OpenAI',
-		sourceId: 'source-1',
-		unit: UnitDTO.per_million_tokens,
-		createdAt: '2023-10-01T00:00:00.000Z',
-		updatedAt: '2023-10-10T00:00:00.000Z',
-		syncedAt: '2023-10-10T00:00:00.000Z',
-		pricing: {
-			input: 3,
-			output: 9,
-			...pricing,
-		},
-		...rest,
-	};
-}
-
-export const mockRules: PricingRule[] = [
-	makePricingRule({
-		id: 'rule-openai',
-		modelName: 'gpt-4o',
-		provider: 'OpenAI',
-		isOverride: true,
-		pricing: { input: 3, output: 9 },
-	}),
-	makePricingRule({
-		id: 'rule-anthropic',
-		modelName: 'claude-3-5-sonnet',
-		provider: 'Anthropic',
-		isOverride: false,
-		pricing: {
-			input: 2,
-			output: 30,
-			cache: { mode: CacheModeDTO.additive, read: 3, write: 6 },
-		},
-	}),
-];
-
-// Wraps items in the list response envelope the list query reads
-// (`data.data.items` / `data.data.total`).
-export function makeListResponse(
-	items: PricingRule[],
-	total = items.length,
-	offset = 0,
-	limit = 20,
-): ListLLMPricingRules200 {
-	return {
-		status: 'success',
-		data: {
-			items,
-			total,
-			offset,
-			limit,
-		},
-	};
-}

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

@@ -1,293 +0,0 @@
-import {
-	LlmpricingruletypesLLMPricingRuleCacheModeDTO as CacheModeDTO,
-	LlmpricingruletypesLLMPricingRuleUnitDTO as UnitDTO,
-} from 'api/generated/services/sigNoz.schemas';
-
-import { EMPTY_DRAFT } from '../constants';
-import type { DrawerDraft } from '../types';
-import {
-	buildPricingPayload,
-	buildRulePayload,
-	draftFromRule,
-	formatPricePerMillion,
-	getCanonicalId,
-	getExtraBuckets,
-	getRelativeLastSeen,
-	getSourceLabel,
-	parsePricingAmount,
-	validateModelName,
-	validatePricing,
-	validateProvider,
-} from '../utils';
-import { makePricingRule } from './fixtures';
-
-describe('parsePricingAmount', () => {
-	it('returns null for empty / whitespace-only input', () => {
-		expect(parsePricingAmount('')).toBeNull();
-		expect(parsePricingAmount('   ')).toBeNull();
-	});
-
-	it('parses numeric strings', () => {
-		expect(parsePricingAmount('3.5')).toBe(3.5);
-		expect(parsePricingAmount('0')).toBe(0);
-		expect(parsePricingAmount('-2')).toBe(-2);
-	});
-
-	it('returns 0 for non-numeric input', () => {
-		expect(parsePricingAmount('abc')).toBe(0);
-	});
-});
-
-describe('formatPricePerMillion', () => {
-	it('renders an em dash for missing values', () => {
-		expect(formatPricePerMillion(undefined)).toBe('—');
-		expect(formatPricePerMillion(null as unknown as undefined)).toBe('—');
-	});
-
-	it('formats numbers to 2dp with a dollar sign', () => {
-		expect(formatPricePerMillion(3)).toBe('$3.00');
-		expect(formatPricePerMillion(0)).toBe('$0.00');
-		expect(formatPricePerMillion(1.2345)).toBe('$1.23');
-	});
-});
-
-describe('getExtraBuckets', () => {
-	it('returns no buckets when there is no cache pricing', () => {
-		expect(
-			getExtraBuckets(makePricingRule({ pricing: { input: 1, output: 2 } })),
-		).toStrictEqual([]);
-	});
-
-	it('includes only buckets with a positive value', () => {
-		const rule = makePricingRule({
-			pricing: {
-				input: 1,
-				output: 2,
-				cache: { mode: CacheModeDTO.subtract, read: 5, write: 0 },
-			},
-		});
-		expect(getExtraBuckets(rule)).toStrictEqual([
-			{ key: 'cache_read', pricePerMillion: 5 },
-		]);
-	});
-
-	it('includes both read and write when both are positive', () => {
-		const rule = makePricingRule({
-			pricing: {
-				input: 1,
-				output: 2,
-				cache: { mode: CacheModeDTO.additive, read: 5, write: 7 },
-			},
-		});
-		expect(getExtraBuckets(rule)).toStrictEqual([
-			{ key: 'cache_read', pricePerMillion: 5 },
-			{ key: 'cache_write', pricePerMillion: 7 },
-		]);
-	});
-});
-
-describe('getSourceLabel', () => {
-	it('maps the override flag to a label', () => {
-		expect(getSourceLabel(makePricingRule({ isOverride: true }))).toBe(
-			'User override',
-		);
-		expect(getSourceLabel(makePricingRule({ isOverride: false }))).toBe('Auto');
-	});
-});
-
-describe('getCanonicalId', () => {
-	it('lowercases and trims provider:model', () => {
-		expect(
-			getCanonicalId(
-				makePricingRule({ provider: ' OpenAI ', modelName: ' GPT-4o ' }),
-			),
-		).toBe('openai:gpt-4o');
-	});
-
-	it('falls back to "unknown" for missing segments', () => {
-		expect(
-			getCanonicalId(
-				makePricingRule({
-					provider: '' as unknown as string,
-					modelName: '' as unknown as string,
-				}),
-			),
-		).toBe('unknown:unknown');
-	});
-});
-
-describe('getRelativeLastSeen', () => {
-	it('returns an em dash when no timestamps are present', () => {
-		const rule = makePricingRule({
-			updatedAt: undefined,
-			syncedAt: null,
-			createdAt: undefined,
-		});
-		expect(getRelativeLastSeen(rule)).toBe('—');
-	});
-
-	it('returns a relative string for a valid timestamp', () => {
-		const rule = makePricingRule({ updatedAt: '2023-10-10T00:00:00.000Z' });
-		expect(getRelativeLastSeen(rule)).not.toBe('—');
-		expect(typeof getRelativeLastSeen(rule)).toBe('string');
-	});
-});
-
-describe('draftFromRule', () => {
-	it('maps a rule to a drawer draft with cache defaults', () => {
-		const rule = makePricingRule({
-			id: 'r1',
-			sourceId: 's1',
-			modelName: 'gpt-4o',
-			provider: 'OpenAI',
-			modelPattern: ['gpt-4o', 'gpt-4'],
-			isOverride: true,
-			pricing: {
-				input: 3,
-				output: 9,
-				cache: { mode: CacheModeDTO.subtract, read: 1, write: 2 },
-			},
-		});
-		expect(draftFromRule(rule)).toStrictEqual({
-			id: 'r1',
-			sourceId: 's1',
-			modelName: 'gpt-4o',
-			provider: 'OpenAI',
-			patterns: ['gpt-4o', 'gpt-4'],
-			isOverride: true,
-			pricing: {
-				input: 3,
-				output: 9,
-				cacheMode: CacheModeDTO.subtract,
-				cacheRead: 1,
-				cacheWrite: 2,
-			},
-		});
-	});
-
-	it('defaults cache mode/values when cache is absent', () => {
-		const draft = draftFromRule(
-			makePricingRule({ modelPattern: null, pricing: { input: 1, output: 2 } }),
-		);
-		expect(draft.patterns).toStrictEqual([]);
-		expect(draft.pricing.cacheMode).toBe(CacheModeDTO.unknown);
-		expect(draft.pricing.cacheRead).toBeNull();
-		expect(draft.pricing.cacheWrite).toBeNull();
-	});
-});
-
-describe('buildPricingPayload', () => {
-	it('omits cache when neither bucket has a value', () => {
-		const draft: DrawerDraft = {
-			...EMPTY_DRAFT,
-			pricing: { ...EMPTY_DRAFT.pricing, input: 3, output: 9 },
-		};
-		expect(buildPricingPayload(draft)).toStrictEqual({ input: 3, output: 9 });
-	});
-
-	it('includes only the cache buckets that have a value', () => {
-		const draft: DrawerDraft = {
-			...EMPTY_DRAFT,
-			pricing: {
-				input: 3,
-				output: 9,
-				cacheMode: CacheModeDTO.additive,
-				cacheRead: 1,
-				cacheWrite: null,
-			},
-		};
-		expect(buildPricingPayload(draft)).toStrictEqual({
-			input: 3,
-			output: 9,
-			cache: { mode: CacheModeDTO.additive, read: 1 },
-		});
-	});
-});
-
-describe('buildRulePayload', () => {
-	it('trims names, sets defaults and patterns', () => {
-		const draft: DrawerDraft = {
-			...EMPTY_DRAFT,
-			id: 'r1',
-			sourceId: 's1',
-			modelName: '  gpt-4o  ',
-			provider: '  OpenAI  ',
-			patterns: ['gpt-4o'],
-			isOverride: true,
-			pricing: { ...EMPTY_DRAFT.pricing, input: 3, output: 9 },
-		};
-		expect(buildRulePayload(draft)).toStrictEqual({
-			id: 'r1',
-			sourceId: 's1',
-			modelName: 'gpt-4o',
-			provider: 'OpenAI',
-			modelPattern: ['gpt-4o'],
-			isOverride: true,
-			enabled: true,
-			unit: UnitDTO.per_million_tokens,
-			pricing: { input: 3, output: 9 },
-		});
-	});
-
-	it('drops empty id/sourceId to undefined', () => {
-		const payload = buildRulePayload({
-			...EMPTY_DRAFT,
-			modelName: 'm',
-			provider: 'p',
-			pricing: { ...EMPTY_DRAFT.pricing, input: 1, output: 1 },
-		});
-		expect(payload.id).toBeUndefined();
-		expect(payload.sourceId).toBeUndefined();
-	});
-});
-
-describe('validateModelName', () => {
-	it('requires a name only in add mode', () => {
-		expect(validateModelName('', 'add')).toBe('Billing model ID is required.');
-		expect(validateModelName('   ', 'add')).toBe('Billing model ID is required.');
-		expect(validateModelName('gpt-4o', 'add')).toBe(true);
-		expect(validateModelName('', 'edit')).toBe(true);
-	});
-});
-
-describe('validateProvider', () => {
-	it('requires a non-empty provider', () => {
-		expect(validateProvider('')).toBe('Provider is required.');
-		expect(validateProvider('   ')).toBe('Provider is required.');
-		expect(validateProvider('OpenAI')).toBe(true);
-	});
-});
-
-describe('validatePricing', () => {
-	const base = EMPTY_DRAFT.pricing;
-
-	it('skips validation when not an override', () => {
-		expect(validatePricing({ ...base, input: null, output: null }, false)).toBe(
-			true,
-		);
-	});
-
-	it('requires positive input and output when override', () => {
-		expect(validatePricing({ ...base, input: 0, output: 9 }, true)).toBe(
-			'Input cost must be greater than 0.',
-		);
-		expect(validatePricing({ ...base, input: 3, output: 0 }, true)).toBe(
-			'Output cost must be greater than 0.',
-		);
-	});
-
-	it('rejects negative cache values', () => {
-		expect(
-			validatePricing({ ...base, input: 3, output: 9, cacheRead: -1 }, true),
-		).toBe('Cache costs must be non-negative.');
-	});
-
-	it('passes for valid override pricing', () => {
-		expect(
-			validatePricing(
-				{ ...base, input: 3, output: 9, cacheRead: 1, cacheWrite: 2 },
-				true,
-			),
-		).toBe(true);
-	});
-});

frontend/src/container/LLMObservability/__tests__/LLMObservability.integration.test.tsx

@@ -1,95 +0,0 @@
-import { safeNavigateMock } from '__tests__/safeNavigateMock';
-import ROUTES from 'constants/routes';
-import { rest, server } from 'mocks-server/server';
-import { render, screen, userEvent, waitFor } from 'tests/test-utils';
-
-import {
-	LLM_PRICING_ENDPOINT,
-	makeListResponse,
-	mockRules,
-} from '../Settings/ModelPricing/__tests__/fixtures';
-import LLMObservability from '../LLMObservability';
-
-function setupList(items = mockRules): void {
-	server.use(
-		rest.get(LLM_PRICING_ENDPOINT, (_req, res, ctx) =>
-			res(ctx.status(200), ctx.json(makeListResponse(items))),
-		),
-	);
-}
-
-describe('LLMObservability (integration)', () => {
-	beforeEach(() => {
-		window.history.pushState(null, '', '/');
-	});
-
-	afterEach(() => {
-		server.resetHandlers();
-	});
-
-	it('renders the overview panel and the tab bar on the overview route', () => {
-		render(<LLMObservability />, undefined, {
-			initialRoute: ROUTES.LLM_OBSERVABILITY_OVERVIEW,
-		});
-
-		expect(screen.getByTestId('llm-observability-tabs')).toBeInTheDocument();
-		expect(screen.getByTestId('llm-observability-overview')).toBeInTheDocument();
-		expect(screen.getByText('LLM Observability')).toBeInTheDocument();
-		expect(screen.getByRole('tab', { name: 'Overview' })).toBeInTheDocument();
-		expect(
-			screen.getByRole('tab', { name: 'Model pricing' }),
-		).toBeInTheDocument();
-		expect(
-			screen.getByRole('tab', { name: 'Attribute Mapping' }),
-		).toBeInTheDocument();
-	});
-
-	it('navigates to the configuration route when the Model pricing tab is clicked', async () => {
-		const user = userEvent.setup({ pointerEventsCheck: 0 });
-		render(<LLMObservability />, undefined, {
-			initialRoute: ROUTES.LLM_OBSERVABILITY_OVERVIEW,
-		});
-
-		await user.click(screen.getByRole('tab', { name: 'Model pricing' }));
-
-		expect(safeNavigateMock).toHaveBeenCalledWith(
-			ROUTES.LLM_OBSERVABILITY_CONFIGURATION,
-		);
-	});
-
-	it('navigates to the attribute mapping route when that tab is clicked', async () => {
-		const user = userEvent.setup({ pointerEventsCheck: 0 });
-		render(<LLMObservability />, undefined, {
-			initialRoute: ROUTES.LLM_OBSERVABILITY_OVERVIEW,
-		});
-
-		await user.click(screen.getByRole('tab', { name: 'Attribute Mapping' }));
-
-		expect(safeNavigateMock).toHaveBeenCalledWith(
-			ROUTES.LLM_OBSERVABILITY_ATTRIBUTE_MAPPING,
-		);
-	});
-
-	it('renders the attribute mapping page on the attribute mapping route', () => {
-		render(<LLMObservability />, undefined, {
-			initialRoute: ROUTES.LLM_OBSERVABILITY_ATTRIBUTE_MAPPING,
-		});
-
-		expect(
-			screen.getByTestId('llm-observability-attribute-mapping-page'),
-		).toBeInTheDocument();
-	});
-
-	it('renders the model-pricing page on the configuration route', async () => {
-		setupList();
-		render(<LLMObservability />, undefined, {
-			initialRoute: ROUTES.LLM_OBSERVABILITY_CONFIGURATION,
-		});
-
-		await waitFor(() =>
-			expect(
-				screen.getByTestId('llm-observability-model-pricing-page'),
-			).toBeInTheDocument(),
-		);
-	});
-});

frontend/src/container/LLMObservability/hooks/__tests__/useLLMObservabilityTabs.test.tsx

@@ -1,67 +0,0 @@
-import { MemoryRouter } from 'react-router-dom';
-import { act, renderHook } from '@testing-library/react';
-import { safeNavigateMock } from '__tests__/safeNavigateMock';
-import ROUTES from 'constants/routes';
-
-import { useLLMObservabilityTabs } from '../useLLMObservabilityTabs';
-
-function renderTabsAt(
-	route: string,
-): ReturnType<
-	typeof renderHook<ReturnType<typeof useLLMObservabilityTabs>, unknown>
-> {
-	const wrapper = ({
-		children,
-	}: {
-		children: React.ReactNode;
-	}): React.ReactElement => (
-		<MemoryRouter initialEntries={[route]}>{children}</MemoryRouter>
-	);
-	return renderHook(() => useLLMObservabilityTabs(), { wrapper });
-}
-
-describe('useLLMObservabilityTabs', () => {
-	it('marks the overview tab active on the overview route', () => {
-		const { result } = renderTabsAt(ROUTES.LLM_OBSERVABILITY_OVERVIEW);
-
-		expect(result.current.activeTab).toBe(ROUTES.LLM_OBSERVABILITY_OVERVIEW);
-	});
-
-	it('marks the configuration tab active on the configuration route', () => {
-		const { result } = renderTabsAt(ROUTES.LLM_OBSERVABILITY_CONFIGURATION);
-
-		expect(result.current.activeTab).toBe(ROUTES.LLM_OBSERVABILITY_CONFIGURATION);
-	});
-
-	it('marks the attribute mapping tab active on the attribute mapping route', () => {
-		const { result } = renderTabsAt(ROUTES.LLM_OBSERVABILITY_ATTRIBUTE_MAPPING);
-
-		expect(result.current.activeTab).toBe(
-			ROUTES.LLM_OBSERVABILITY_ATTRIBUTE_MAPPING,
-		);
-	});
-
-	it('exposes all route-keyed tab items', () => {
-		const { result } = renderTabsAt(ROUTES.LLM_OBSERVABILITY_OVERVIEW);
-
-		expect(result.current.items).toHaveLength(3);
-		const keys = result.current.items.map((item) => item.key);
-		expect(keys).toStrictEqual([
-			ROUTES.LLM_OBSERVABILITY_OVERVIEW,
-			ROUTES.LLM_OBSERVABILITY_CONFIGURATION,
-			ROUTES.LLM_OBSERVABILITY_ATTRIBUTE_MAPPING,
-		]);
-	});
-
-	it('navigates to the selected tab key on change', () => {
-		const { result } = renderTabsAt(ROUTES.LLM_OBSERVABILITY_OVERVIEW);
-
-		act(() => {
-			result.current.onTabChange(ROUTES.LLM_OBSERVABILITY_CONFIGURATION);
-		});
-
-		expect(safeNavigateMock).toHaveBeenCalledWith(
-			ROUTES.LLM_OBSERVABILITY_CONFIGURATION,
-		);
-	});
-});

frontend/src/container/LLMObservability/hooks/useLLMObservabilityTabs.tsx

@@ -1,62 +0,0 @@
-import { useCallback } from 'react';
-import { useLocation } from 'react-router-dom';
-import { type TabItemProps } from '@signozhq/ui/tabs';
-import ROUTES from 'constants/routes';
-import { useSafeNavigate } from 'hooks/useSafeNavigate';
-
-import LLMObservabilityAttributeMapping from '../AttributeMapping/LLMObservabilityAttributeMapping';
-import Overview from '../Overview/Overview';
-import LLMObservabilityModelPricing from '../Settings/ModelPricing/LLMObservabilityModelPricing';
-
-const OVERVIEW_KEY = ROUTES.LLM_OBSERVABILITY_OVERVIEW;
-const CONFIGURATION_KEY = ROUTES.LLM_OBSERVABILITY_CONFIGURATION;
-const ATTRIBUTE_MAPPING_KEY = ROUTES.LLM_OBSERVABILITY_ATTRIBUTE_MAPPING;
-
-interface UseLLMObservabilityTabsResult {
-	items: TabItemProps[];
-	activeTab: string;
-	onTabChange: (key: string) => void;
-}
-
-// Drives the top-level LLM Observability tabs. Route-driven: the active tab is
-// derived from the pathname (each tab owns a URL) and changing tabs navigates,
-// so tabs stay shareable/back-button friendly while rendering with the SigNoz
-// design-system Tabs.
-export function useLLMObservabilityTabs(): UseLLMObservabilityTabsResult {
-	const { pathname } = useLocation();
-	const { safeNavigate } = useSafeNavigate();
-
-	let activeTab: string = OVERVIEW_KEY;
-	if (pathname.startsWith(CONFIGURATION_KEY)) {
-		activeTab = CONFIGURATION_KEY;
-	} else if (pathname.startsWith(ATTRIBUTE_MAPPING_KEY)) {
-		activeTab = ATTRIBUTE_MAPPING_KEY;
-	}
-
-	const onTabChange = useCallback(
-		(key: string): void => {
-			safeNavigate(key);
-		},
-		[safeNavigate],
-	);
-
-	const items: TabItemProps[] = [
-		{
-			key: OVERVIEW_KEY,
-			label: 'Overview',
-			children: <Overview />,
-		},
-		{
-			key: CONFIGURATION_KEY,
-			label: 'Model pricing',
-			children: <LLMObservabilityModelPricing />,
-		},
-		{
-			key: ATTRIBUTE_MAPPING_KEY,
-			label: 'Attribute Mapping',
-			children: <LLMObservabilityAttributeMapping />,
-		},
-	];
-
-	return { items, activeTab, onTabChange };
-}

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

@@ -1,4 +1,5 @@
 import { Gauge } from '@signozhq/icons';
+import { Tooltip } from 'antd';
 import { MetricreductionruletypesGettableReductionRuleDTO } from 'api/generated/services/sigNoz.schemas';
 
 import { Badge } from '@signozhq/ui/badge';
@@ -8,16 +9,26 @@ interface VolumeControlBadgeProps {
 }
 
 function VolumeControlBadge({ rule }: VolumeControlBadgeProps): JSX.Element {
-	return (
+	const badge = (
 		<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,6 +7,12 @@
 	padding: 12px 16px 0 16px;
 }
 
+.chartHeader {
+	display: flex;
+	flex-direction: column;
+	gap: 2px;
+}
+
 .chartTitle {
 	text-transform: uppercase;
 	letter-spacing: 0.05em;
@@ -15,3 +21,11 @@
 .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,5 +1,6 @@
 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';
@@ -25,7 +26,9 @@ interface VolumeControlChartProps {
 }
 
 function VolumeControlChart({ enabled }: VolumeControlChartProps): JSX.Element {
-	const { data } = useGetMetricReductionRuleTimeseries({ query: { enabled } });
+	const { data, isLoading, isError } = useGetMetricReductionRuleTimeseries({
+		query: { enabled },
+	});
 
 	const isDarkMode = useIsDarkMode();
 	const { timezone } = useTimezone();
@@ -65,11 +68,34 @@ function VolumeControlChart({ enabled }: VolumeControlChartProps): JSX.Element {
 
 	return (
 		<div className={styles.chart} data-testid="volume-control-chart">
-			<Typography.Text className={styles.chartTitle} size={'small'}>
-				Series volume over time · ingested vs retained
-			</Typography.Text>
+			<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>
 			<div className={styles.chartBody} ref={graphRef}>
-				{dimensions.width > 0 && (
+				{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 && (
 					<BarChart
 						config={config}
 						data={chartData}

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

@@ -17,11 +17,27 @@
 	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,6 +1,8 @@
+import { Info } from '@signozhq/icons';
 import { Typography } from '@signozhq/ui/typography';
-import { Spin } from 'antd';
+import { Spin, Tooltip } from 'antd';
 import { MetricreductionruletypesGettableReductionRulePreviewDTO } from 'api/generated/services/sigNoz.schemas';
+import { popupContainer } from 'utils/selectPopupContainer';
 
 import { formatCompact } from '../../../configUtils';
 import { RuleMode } from '../../../types';
@@ -27,6 +29,7 @@ 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;
@@ -40,31 +43,59 @@ function ImpactPanel({
 			{!isLoading && preview && (
 				<div className={styles.meterGrid}>
 					<div className={styles.meter}>
-						<Typography.Text size="xs" color="muted" className={styles.meterLabel}>
-							Current series
+						<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>
+					</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}>
-						<Typography.Text size="xs" color="muted" className={styles.meterLabel}>
-							Proposed series
-						</Typography.Text>
+						<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="2xl" className={styles.meterValue}>
 							{formatCompact(proposed)}
-						</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}
+							{deltaPct !== 0 && (
+								<Typography.Text
+									size="small"
+									color={deltaPct >= 0 ? 'success' : undefined}
+								>
+									{reductionLabel}
+								</Typography.Text>
+							)}
 						</Typography.Text>
 					</div>
 				</div>