chore: use v2

* feature: init open api ts code gen

* chore: update custom instance to a separate axios instance

* chore: update code owners

* chore: set up node version in CI

* fix: node version

* chore: update jsci.yaml

* chore: update goci.yaml

* chore: rename instance

* chore: resolve comments

.github/CODEOWNERS

@@ -55,7 +55,6 @@
 /pkg/telemetrymetrics/ @srikanthccv
 /pkg/telemetrytraces/ @srikanthccv
 
-
 # Metrics
 
 /pkg/types/metrictypes/ @srikanthccv
@@ -91,15 +90,31 @@
 # AuthN / AuthZ Owners
 
 /pkg/authz/ @vikrantgupta25
+/ee/authz/ @vikrantgupta25
+/pkg/authn/ @vikrantgupta25
+/ee/authn/ @vikrantgupta25
+/pkg/modules/user/ @vikrantgupta25
+/pkg/modules/session/ @vikrantgupta25
+/pkg/modules/organization/ @vikrantgupta25
+/pkg/modules/authdomain/ @vikrantgupta25
+/pkg/modules/role/ @vikrantgupta25
 
 # Integration tests
 
 /tests/integration/ @vikrantgupta25
 
+# OpenAPI types generator
+
+/frontend/src/api @SigNoz/frontend-maintainers
+
 # Dashboard Owners
 
 /frontend/src/hooks/dashboard/ @SigNoz/pulse-frontend
 
+## Dashboard Types
+
+/frontend/src/api/types/dashboard/ @SigNoz/pulse-frontend
+
 ## Dashboard List
 
 /frontend/src/pages/DashboardsListPage/ @SigNoz/pulse-frontend

.github/pull_request_template.md

@@ -6,6 +6,15 @@
 > Why does this change exist?  
 > What problem does it solve, and why is this the right approach?
 
+
+
+#### Screenshots / Screen Recordings (if applicable)
+> Include screenshots or screen recordings that clearly show the behavior before the change and the result after the change. This helps reviewers quickly understand the impact and verify the update.
+
+
+#### Issues closed by this PR
+> Reference issues using `Closes #issue-number` to enable automatic closure on merge.
+
 ---
 
 ### ✅ Change Type

.github/workflows/commitci.yaml

@@ -25,3 +25,10 @@ jobs:
           else
             echo "No references to 'ee' packages found in 'pkg' directory"
           fi
+
+          if grep -R --include="*.go" '.*/ee/.*' cmd/community/; then
+            echo "Error: Found references to 'ee' packages in 'cmd/community' directory"
+            exit 1
+          else
+            echo "No references to 'ee' packages found in 'cmd/community' directory"
+          fi

.github/workflows/goci.yaml

@@ -65,6 +65,10 @@ jobs:
           set -ex
           sudo apt-get update
           sudo apt-get install -y gcc-aarch64-linux-gnu musl-tools
+      - name: node-install
+        uses: actions/setup-node@v5
+        with:
+          node-version: "22"
       - name: docker-community
         shell: bash
         run: |

.github/workflows/integrationci.yaml

@@ -84,8 +84,11 @@ jobs:
           sudo rm /etc/apt/sources.list.d/google-chrome.list
           export CHROMEDRIVER_VERSION=`curl -s https://googlechromelabs.github.io/chrome-for-testing/LATEST_RELEASE_${CHROME_MAJOR_VERSION%%.*}`
           curl -L -O "https://storage.googleapis.com/chrome-for-testing-public/${CHROMEDRIVER_VERSION}/linux64/chromedriver-linux64.zip"
-          unzip chromedriver-linux64.zip && chmod +x chromedriver && sudo mv chromedriver /usr/local/bin
+          unzip chromedriver-linux64.zip
+          chmod +x chromedriver-linux64/chromedriver
+          sudo mv chromedriver-linux64/chromedriver /usr/local/bin/chromedriver
           chromedriver -version
+          google-chrome-stable --version
       - name: run
         run: |
           cd tests/integration && \

.github/workflows/jsci.yaml

@@ -17,10 +17,23 @@ jobs:
     steps:
       - name: checkout
         uses: actions/checkout@v4
+      - name: setup node
+        uses: actions/setup-node@v5
+        with:
+          node-version: "22"
       - name: install
         run: cd frontend && yarn install
       - name: tsc
         run: cd frontend && yarn tsc
+  tsc2:
+    if: |
+      (github.event_name == 'pull_request' && ! github.event.pull_request.head.repo.fork && github.event.pull_request.user.login != 'dependabot[bot]' && ! contains(github.event.pull_request.labels.*.name, 'safe-to-test')) ||
+      (github.event_name == 'pull_request_target' && contains(github.event.pull_request.labels.*.name, 'safe-to-test'))
+    uses: signoz/primus.workflows/.github/workflows/js-tsc.yaml@main
+    secrets: inherit
+    with:
+      PRIMUS_REF: main
+      JS_SRC: frontend
   test:
     if: |
       (github.event_name == 'pull_request' && ! github.event.pull_request.head.repo.fork && github.event.pull_request.user.login != 'dependabot[bot]' && ! contains(github.event.pull_request.labels.*.name, 'safe-to-test')) ||

.gitignore

@@ -1,6 +1,9 @@
 
 node_modules
 
+.vscode
+!.vscode/settings.json
+
 deploy/docker/environment_tiny/common_test
 frontend/node_modules
 frontend/.pnp
@@ -104,7 +107,6 @@ dist/
 downloads/
 eggs/
 .eggs/
-lib/
 lib64/
 parts/
 sdist/

.mockery.yml

@@ -4,7 +4,14 @@ packages:
   github.com/SigNoz/signoz/pkg/alertmanager:
     config:
       all: true
-      dir: '{{.InterfaceDir}}/mocks'
-      filename: "mocks.go"
+      dir: '{{.InterfaceDir}}/alertmanagertest'
+      filename: "alertmanager.go"
       structname: 'Mock{{.InterfaceName}}'
-      pkgname: '{{.SrcPackageName}}mock'
+      pkgname: '{{.SrcPackageName}}test'
+  github.com/SigNoz/signoz/pkg/tokenizer:
+    config:
+      all: true
+      dir: '{{.InterfaceDir}}/tokenizertest'
+      filename: "tokenizer.go"
+      structname: 'Mock{{.InterfaceName}}'
+      pkgname: '{{.SrcPackageName}}test'

.vscode/settings.json

@@ -5,5 +5,9 @@
 	"editor.codeActionsOnSave": {
 		"source.fixAll.eslint": "explicit"
 	},
-	"prettier.requireConfig": true
+	"prettier.requireConfig": true,
+	"[go]": {
+		"editor.formatOnSave": true,
+		"editor.defaultFormatter": "golang.go"
+	}
 }

Makefile

@@ -86,7 +86,7 @@ go-run-enterprise: ## Runs the enterprise go backend server
 	@SIGNOZ_INSTRUMENTATION_LOGS_LEVEL=debug \
 	SIGNOZ_SQLSTORE_SQLITE_PATH=signoz.db \
 	SIGNOZ_WEB_ENABLED=false \
-	SIGNOZ_JWT_SECRET=secret \
+	SIGNOZ_TOKENIZER_JWT_SECRET=secret \
 	SIGNOZ_ALERTMANAGER_PROVIDER=signoz \
 	SIGNOZ_TELEMETRYSTORE_PROVIDER=clickhouse \
 	SIGNOZ_TELEMETRYSTORE_CLICKHOUSE_DSN=tcp://127.0.0.1:9000 \
@@ -103,7 +103,7 @@ go-run-community: ## Runs the community go backend server
 	@SIGNOZ_INSTRUMENTATION_LOGS_LEVEL=debug \
 	SIGNOZ_SQLSTORE_SQLITE_PATH=signoz.db \
 	SIGNOZ_WEB_ENABLED=false \
-	SIGNOZ_JWT_SECRET=secret \
+	SIGNOZ_TOKENIZER_JWT_SECRET=secret \
 	SIGNOZ_ALERTMANAGER_PROVIDER=signoz \
 	SIGNOZ_TELEMETRYSTORE_PROVIDER=clickhouse \
 	SIGNOZ_TELEMETRYSTORE_CLICKHOUSE_DSN=tcp://127.0.0.1:9000 \
@@ -230,3 +230,12 @@ py-clean: ## Clear all pycache and pytest cache from tests directory recursively
 	@find tests -type f -name "*.pyc" -delete 2>/dev/null || true
 	@find tests -type f -name "*.pyo" -delete 2>/dev/null || true
 	@echo ">> python cache cleaned"
+
+
+##############################################################
+# generate commands
+##############################################################
+.PHONY: gen-mocks
+gen-mocks:
+	@echo ">> Generating mocks"
+	@mockery --config .mockery.yml

cmd/community/server.go

@@ -5,13 +5,14 @@ import (
 	"log/slog"
 
 	"github.com/SigNoz/signoz/cmd"
-	"github.com/SigNoz/signoz/ee/authz/openfgaauthz"
-	"github.com/SigNoz/signoz/ee/authz/openfgaschema"
-	"github.com/SigNoz/signoz/ee/sqlstore/postgressqlstore"
 	"github.com/SigNoz/signoz/pkg/analytics"
 	"github.com/SigNoz/signoz/pkg/authn"
 	"github.com/SigNoz/signoz/pkg/authz"
+	"github.com/SigNoz/signoz/pkg/authz/openfgaauthz"
+	"github.com/SigNoz/signoz/pkg/authz/openfgaschema"
 	"github.com/SigNoz/signoz/pkg/factory"
+	"github.com/SigNoz/signoz/pkg/gateway"
+	"github.com/SigNoz/signoz/pkg/gateway/noopgateway"
 	"github.com/SigNoz/signoz/pkg/licensing"
 	"github.com/SigNoz/signoz/pkg/licensing/nooplicensing"
 	"github.com/SigNoz/signoz/pkg/modules/dashboard"
@@ -24,7 +25,6 @@ import (
 	"github.com/SigNoz/signoz/pkg/signoz"
 	"github.com/SigNoz/signoz/pkg/sqlschema"
 	"github.com/SigNoz/signoz/pkg/sqlstore"
-	"github.com/SigNoz/signoz/pkg/sqlstore/sqlstorehook"
 	"github.com/SigNoz/signoz/pkg/types/authtypes"
 	"github.com/SigNoz/signoz/pkg/version"
 	"github.com/SigNoz/signoz/pkg/zeus"
@@ -57,13 +57,6 @@ func runServer(ctx context.Context, config signoz.Config, logger *slog.Logger) e
 	// print the version
 	version.Info.PrettyPrint(config.Version)
 
-	// add enterprise sqlstore factories to the community sqlstore factories
-	sqlstoreFactories := signoz.NewSQLStoreProviderFactories()
-	if err := sqlstoreFactories.Add(postgressqlstore.NewFactory(sqlstorehook.NewLoggingFactory())); err != nil {
-		logger.ErrorContext(ctx, "failed to add postgressqlstore factory", "error", err)
-		return err
-	}
-
 	signoz, err := signoz.New(
 		ctx,
 		config,
@@ -90,6 +83,9 @@ func runServer(ctx context.Context, config signoz.Config, logger *slog.Logger) e
 		func(store sqlstore.SQLStore, settings factory.ProviderSettings, analytics analytics.Analytics, orgGetter organization.Getter, _ role.Module, queryParser queryparser.QueryParser, _ querier.Querier, _ licensing.Licensing) dashboard.Module {
 			return impldashboard.NewModule(impldashboard.NewStore(store), settings, analytics, orgGetter, queryParser)
 		},
+		func(_ licensing.Licensing) factory.ProviderFactory[gateway.Gateway, gateway.Config] {
+			return noopgateway.NewProviderFactory()
+		},
 	)
 	if err != nil {
 		logger.ErrorContext(ctx, "failed to create signoz", "error", err)

cmd/enterprise/server.go

@@ -10,6 +10,7 @@ import (
 	"github.com/SigNoz/signoz/ee/authn/callbackauthn/samlcallbackauthn"
 	"github.com/SigNoz/signoz/ee/authz/openfgaauthz"
 	"github.com/SigNoz/signoz/ee/authz/openfgaschema"
+	"github.com/SigNoz/signoz/ee/gateway/httpgateway"
 	enterpriselicensing "github.com/SigNoz/signoz/ee/licensing"
 	"github.com/SigNoz/signoz/ee/licensing/httplicensing"
 	"github.com/SigNoz/signoz/ee/modules/dashboard/impldashboard"
@@ -22,6 +23,7 @@ import (
 	"github.com/SigNoz/signoz/pkg/authn"
 	"github.com/SigNoz/signoz/pkg/authz"
 	"github.com/SigNoz/signoz/pkg/factory"
+	"github.com/SigNoz/signoz/pkg/gateway"
 	"github.com/SigNoz/signoz/pkg/licensing"
 	"github.com/SigNoz/signoz/pkg/modules/dashboard"
 	pkgimpldashboard "github.com/SigNoz/signoz/pkg/modules/dashboard/impldashboard"
@@ -120,6 +122,9 @@ func runServer(ctx context.Context, config signoz.Config, logger *slog.Logger) e
 		func(store sqlstore.SQLStore, settings factory.ProviderSettings, analytics analytics.Analytics, orgGetter organization.Getter, role role.Module, queryParser queryparser.QueryParser, querier querier.Querier, licensing licensing.Licensing) dashboard.Module {
 			return impldashboard.NewModule(pkgimpldashboard.NewStore(store), settings, analytics, orgGetter, role, queryParser, querier, licensing)
 		},
+		func(licensing licensing.Licensing) factory.ProviderFactory[gateway.Gateway, gateway.Config] {
+			return httpgateway.NewProviderFactory(licensing)
+		},
 	)
 	if err != nil {
 		logger.ErrorContext(ctx, "failed to create signoz", "error", err)

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

@@ -176,7 +176,7 @@ services:
       # - ../common/clickhouse/storage.xml:/etc/clickhouse-server/config.d/storage.xml
   signoz:
     !!merge <<: *db-depend
-    image: signoz/signoz:v0.107.0
+    image: signoz/signoz:v0.108.0
     command:
       - --config=/root/config/prometheus.yml
     ports:
@@ -195,7 +195,7 @@ services:
       - GODEBUG=netdns=go
       - TELEMETRY_ENABLED=true
       - DEPLOYMENT_TYPE=docker-swarm
-      - SIGNOZ_JWT_SECRET=secret
+      - SIGNOZ_TOKENIZER_JWT_SECRET=secret
       - DOT_METRICS_ENABLED=true
     healthcheck:
       test:

deploy/docker-swarm/docker-compose.yaml

@@ -117,7 +117,7 @@ services:
       # - ../common/clickhouse/storage.xml:/etc/clickhouse-server/config.d/storage.xml
   signoz:
     !!merge <<: *db-depend
-    image: signoz/signoz:v0.107.0
+    image: signoz/signoz:v0.108.0
     command:
       - --config=/root/config/prometheus.yml
     ports:

deploy/docker/docker-compose.ha.yaml

@@ -179,7 +179,7 @@ services:
       # - ../common/clickhouse/storage.xml:/etc/clickhouse-server/config.d/storage.xml
   signoz:
     !!merge <<: *db-depend
-    image: signoz/signoz:${VERSION:-v0.107.0}
+    image: signoz/signoz:${VERSION:-v0.108.0}
     container_name: signoz
     command:
       - --config=/root/config/prometheus.yml

deploy/docker/docker-compose.yaml

@@ -111,7 +111,7 @@ services:
       # - ../common/clickhouse/storage.xml:/etc/clickhouse-server/config.d/storage.xml
   signoz:
     !!merge <<: *db-depend
-    image: signoz/signoz:${VERSION:-v0.107.0}
+    image: signoz/signoz:${VERSION:-v0.108.0}
     container_name: signoz
     command:
       - --config=/root/config/prometheus.yml

docs/api/openapi.yml

@@ -1007,43 +1007,6 @@ paths:
       summary: Create bulk invite
       tags:
       - users
-  /api/v1/login:
-    post:
-      deprecated: true
-      description: This endpoint is deprecated and will be removed in the future
-      operationId: DeprecatedCreateSessionByEmailPassword
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/AuthtypesDeprecatedPostableLogin'
-      responses:
-        "200":
-          content:
-            application/json:
-              schema:
-                properties:
-                  data:
-                    $ref: '#/components/schemas/AuthtypesDeprecatedGettableLogin'
-                  status:
-                    type: string
-                type: object
-          description: OK
-        "400":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/RenderErrorResponse'
-          description: Bad Request
-        "500":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/RenderErrorResponse'
-          description: Internal Server Error
-      summary: Deprecated create session by email password
-      tags:
-      - sessions
   /api/v1/logs/promote_paths:
     get:
       deprecated: false
@@ -2067,6 +2030,361 @@ paths:
       summary: Get features
       tags:
       - features
+  /api/v2/gateway/ingestion_keys:
+    get:
+      deprecated: false
+      description: This endpoint returns the ingestion keys for a workspace
+      operationId: GetIngestionKeys
+      responses:
+        "200":
+          content:
+            application/json:
+              schema:
+                properties:
+                  data:
+                    $ref: '#/components/schemas/GatewaytypesGettableIngestionKeys'
+                  status:
+                    type: string
+                type: object
+          description: OK
+        "401":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RenderErrorResponse'
+          description: Unauthorized
+        "403":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RenderErrorResponse'
+          description: Forbidden
+        "500":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RenderErrorResponse'
+          description: Internal Server Error
+      security:
+      - api_key:
+        - ADMIN
+      - tokenizer:
+        - ADMIN
+      summary: Get ingestion keys for workspace
+      tags:
+      - gateway
+    post:
+      deprecated: false
+      description: This endpoint creates an ingestion key for the workspace
+      operationId: CreateIngestionKey
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/GatewaytypesPostableIngestionKey'
+      responses:
+        "200":
+          content:
+            application/json:
+              schema:
+                properties:
+                  data:
+                    $ref: '#/components/schemas/GatewaytypesGettableCreatedIngestionKey'
+                  status:
+                    type: string
+                type: object
+          description: OK
+        "401":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RenderErrorResponse'
+          description: Unauthorized
+        "403":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RenderErrorResponse'
+          description: Forbidden
+        "500":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RenderErrorResponse'
+          description: Internal Server Error
+      security:
+      - api_key:
+        - ADMIN
+      - tokenizer:
+        - ADMIN
+      summary: Create ingestion key for workspace
+      tags:
+      - gateway
+  /api/v2/gateway/ingestion_keys/{keyId}:
+    delete:
+      deprecated: false
+      description: This endpoint deletes an ingestion key for the workspace
+      operationId: DeleteIngestionKey
+      parameters:
+      - in: path
+        name: keyId
+        required: true
+        schema:
+          type: string
+      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
+        "500":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RenderErrorResponse'
+          description: Internal Server Error
+      security:
+      - api_key:
+        - ADMIN
+      - tokenizer:
+        - ADMIN
+      summary: Delete ingestion key for workspace
+      tags:
+      - gateway
+    patch:
+      deprecated: false
+      description: This endpoint updates an ingestion key for the workspace
+      operationId: UpdateIngestionKey
+      parameters:
+      - in: path
+        name: keyId
+        required: true
+        schema:
+          type: string
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/GatewaytypesPostableIngestionKey'
+      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
+        "500":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RenderErrorResponse'
+          description: Internal Server Error
+      security:
+      - api_key:
+        - ADMIN
+      - tokenizer:
+        - ADMIN
+      summary: Update ingestion key for workspace
+      tags:
+      - gateway
+  /api/v2/gateway/ingestion_keys/{keyId}/limits:
+    post:
+      deprecated: false
+      description: This endpoint creates an ingestion key limit
+      operationId: CreateIngestionKeyLimit
+      parameters:
+      - in: path
+        name: keyId
+        required: true
+        schema:
+          type: string
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/GatewaytypesPostableIngestionKeyLimit'
+      responses:
+        "201":
+          content:
+            application/json:
+              schema:
+                properties:
+                  data:
+                    $ref: '#/components/schemas/GatewaytypesGettableCreatedIngestionKeyLimit'
+                  status:
+                    type: string
+                type: object
+          description: Created
+        "401":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RenderErrorResponse'
+          description: Unauthorized
+        "403":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RenderErrorResponse'
+          description: Forbidden
+        "500":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RenderErrorResponse'
+          description: Internal Server Error
+      security:
+      - api_key:
+        - ADMIN
+      - tokenizer:
+        - ADMIN
+      summary: Create limit for the ingestion key
+      tags:
+      - gateway
+  /api/v2/gateway/ingestion_keys/limits/{limitId}:
+    delete:
+      deprecated: false
+      description: This endpoint deletes an ingestion key limit
+      operationId: DeleteIngestionKeyLimit
+      parameters:
+      - in: path
+        name: limitId
+        required: true
+        schema:
+          type: string
+      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
+        "500":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RenderErrorResponse'
+          description: Internal Server Error
+      security:
+      - api_key:
+        - ADMIN
+      - tokenizer:
+        - ADMIN
+      summary: Delete limit for the ingestion key
+      tags:
+      - gateway
+    patch:
+      deprecated: false
+      description: This endpoint updates an ingestion key limit
+      operationId: UpdateIngestionKeyLimit
+      parameters:
+      - in: path
+        name: limitId
+        required: true
+        schema:
+          type: string
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/GatewaytypesUpdatableIngestionKeyLimit'
+      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
+        "500":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RenderErrorResponse'
+          description: Internal Server Error
+      security:
+      - api_key:
+        - ADMIN
+      - tokenizer:
+        - ADMIN
+      summary: Update limit for the ingestion key
+      tags:
+      - gateway
+  /api/v2/gateway/ingestion_keys/search:
+    get:
+      deprecated: false
+      description: This endpoint returns the ingestion keys for a workspace
+      operationId: SearchIngestionKeys
+      responses:
+        "200":
+          content:
+            application/json:
+              schema:
+                properties:
+                  data:
+                    $ref: '#/components/schemas/GatewaytypesGettableIngestionKeys'
+                  status:
+                    type: string
+                type: object
+          description: OK
+        "401":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RenderErrorResponse'
+          description: Unauthorized
+        "403":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RenderErrorResponse'
+          description: Forbidden
+        "500":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RenderErrorResponse'
+          description: Internal Server Error
+      security:
+      - api_key:
+        - ADMIN
+      - tokenizer:
+        - ADMIN
+      summary: Search ingestion keys for workspace
+      tags:
+      - gateway
   /api/v2/metric/alerts:
     get:
       deprecated: false
@@ -2736,12 +3054,25 @@ paths:
       - sessions
 components:
   schemas:
+    AuthtypesAttributeMapping:
+      properties:
+        email:
+          type: string
+        groups:
+          type: string
+        name:
+          type: string
+        role:
+          type: string
+      type: object
     AuthtypesAuthDomainConfig:
       properties:
         googleAuthConfig:
           $ref: '#/components/schemas/AuthtypesGoogleConfig'
         oidcConfig:
           $ref: '#/components/schemas/AuthtypesOIDCConfig'
+        roleMapping:
+          $ref: '#/components/schemas/AuthtypesRoleMapping'
         samlConfig:
           $ref: '#/components/schemas/AuthtypesSamlConfig'
         ssoEnabled:
@@ -2775,25 +3106,6 @@ components:
         url:
           type: string
       type: object
-    AuthtypesClaimMapping:
-      properties:
-        email:
-          type: string
-      type: object
-    AuthtypesDeprecatedGettableLogin:
-      properties:
-        accessJwt:
-          type: string
-        userId:
-          type: string
-      type: object
-    AuthtypesDeprecatedPostableLogin:
-      properties:
-        email:
-          type: string
-        password:
-          type: string
-      type: object
     AuthtypesGettableAuthDomain:
       properties:
         authNProviderInfo:
@@ -2811,6 +3123,8 @@ components:
           $ref: '#/components/schemas/AuthtypesOIDCConfig'
         orgId:
           type: string
+        roleMapping:
+          $ref: '#/components/schemas/AuthtypesRoleMapping'
         samlConfig:
           $ref: '#/components/schemas/AuthtypesSamlConfig'
         ssoEnabled:
@@ -2834,17 +3148,33 @@ components:
       type: object
     AuthtypesGoogleConfig:
       properties:
+        allowedGroups:
+          items:
+            type: string
+          type: array
         clientId:
           type: string
         clientSecret:
           type: string
+        domainToAdminEmail:
+          additionalProperties:
+            type: string
+          type: object
+        fetchGroups:
+          type: boolean
+        fetchTransitiveGroupMembership:
+          type: boolean
+        insecureSkipEmailVerified:
+          type: boolean
         redirectURI:
           type: string
+        serviceAccountJson:
+          type: string
       type: object
     AuthtypesOIDCConfig:
       properties:
         claimMapping:
-          $ref: '#/components/schemas/AuthtypesClaimMapping'
+          $ref: '#/components/schemas/AuthtypesAttributeMapping'
         clientId:
           type: string
         clientSecret:
@@ -2895,8 +3225,22 @@ components:
         refreshToken:
           type: string
       type: object
+    AuthtypesRoleMapping:
+      properties:
+        defaultRole:
+          type: string
+        groupMappings:
+          additionalProperties:
+            type: string
+          nullable: true
+          type: object
+        useRoleAttribute:
+          type: boolean
+      type: object
     AuthtypesSamlConfig:
       properties:
+        attributeMapping:
+          $ref: '#/components/schemas/AuthtypesAttributeMapping'
         insecureSkipAuthNRequestsSigned:
           type: boolean
         samlCert:
@@ -3011,6 +3355,160 @@ components:
           nullable: true
           type: object
       type: object
+    GatewaytypesGettableCreatedIngestionKey:
+      properties:
+        id:
+          type: string
+        value:
+          type: string
+      type: object
+    GatewaytypesGettableCreatedIngestionKeyLimit:
+      properties:
+        id:
+          type: string
+      type: object
+    GatewaytypesGettableIngestionKeys:
+      properties:
+        _pagination:
+          $ref: '#/components/schemas/GatewaytypesPagination'
+        keys:
+          items:
+            $ref: '#/components/schemas/GatewaytypesIngestionKey'
+          nullable: true
+          type: array
+      type: object
+    GatewaytypesIngestionKey:
+      properties:
+        created_at:
+          format: date-time
+          type: string
+        expires_at:
+          format: date-time
+          type: string
+        id:
+          type: string
+        limits:
+          items:
+            $ref: '#/components/schemas/GatewaytypesLimit'
+          nullable: true
+          type: array
+        name:
+          type: string
+        tags:
+          items:
+            type: string
+          nullable: true
+          type: array
+        updated_at:
+          format: date-time
+          type: string
+        value:
+          type: string
+        workspace_id:
+          type: string
+      type: object
+    GatewaytypesLimit:
+      properties:
+        config:
+          $ref: '#/components/schemas/GatewaytypesLimitConfig'
+        created_at:
+          format: date-time
+          type: string
+        id:
+          type: string
+        key_id:
+          type: string
+        metric:
+          $ref: '#/components/schemas/GatewaytypesLimitMetric'
+        signal:
+          type: string
+        tags:
+          items:
+            type: string
+          nullable: true
+          type: array
+        updated_at:
+          format: date-time
+          type: string
+      type: object
+    GatewaytypesLimitConfig:
+      properties:
+        day:
+          $ref: '#/components/schemas/GatewaytypesLimitValue'
+        second:
+          $ref: '#/components/schemas/GatewaytypesLimitValue'
+      type: object
+    GatewaytypesLimitMetric:
+      properties:
+        day:
+          $ref: '#/components/schemas/GatewaytypesLimitMetricValue'
+        second:
+          $ref: '#/components/schemas/GatewaytypesLimitMetricValue'
+      type: object
+    GatewaytypesLimitMetricValue:
+      properties:
+        count:
+          format: int64
+          type: integer
+        size:
+          format: int64
+          type: integer
+      type: object
+    GatewaytypesLimitValue:
+      properties:
+        count:
+          format: int64
+          type: integer
+        size:
+          format: int64
+          type: integer
+      type: object
+    GatewaytypesPagination:
+      properties:
+        page:
+          type: integer
+        pages:
+          type: integer
+        per_page:
+          type: integer
+        total:
+          type: integer
+      type: object
+    GatewaytypesPostableIngestionKey:
+      properties:
+        expires_at:
+          format: date-time
+          type: string
+        name:
+          type: string
+        tags:
+          items:
+            type: string
+          nullable: true
+          type: array
+      type: object
+    GatewaytypesPostableIngestionKeyLimit:
+      properties:
+        config:
+          $ref: '#/components/schemas/GatewaytypesLimitConfig'
+        signal:
+          type: string
+        tags:
+          items:
+            type: string
+          nullable: true
+          type: array
+      type: object
+    GatewaytypesUpdatableIngestionKeyLimit:
+      properties:
+        config:
+          $ref: '#/components/schemas/GatewaytypesLimitConfig'
+        tags:
+          items:
+            type: string
+          nullable: true
+          type: array
+      type: object
     MetricsexplorertypesMetricAlert:
       properties:
         alertId:

ee/authn/callbackauthn/oidccallbackauthn/authn.go

@@ -2,6 +2,7 @@ package oidccallbackauthn
 
 import (
 	"context"
+	"fmt"
 	"net/url"
 
 	"github.com/SigNoz/signoz/pkg/authn"
@@ -19,25 +20,27 @@ const (
 	redirectPath string = "/api/v1/complete/oidc"
 )
 
-var (
-	scopes []string = []string{"email", oidc.ScopeOpenID}
-)
+var defaultScopes []string = []string{"email", "profile", oidc.ScopeOpenID}
 
 var _ authn.CallbackAuthN = (*AuthN)(nil)
 
 type AuthN struct {
+	settings   factory.ScopedProviderSettings
 	store      authtypes.AuthNStore
 	licensing  licensing.Licensing
 	httpClient *client.Client
 }
 
 func New(store authtypes.AuthNStore, licensing licensing.Licensing, providerSettings factory.ProviderSettings) (*AuthN, error) {
+	settings := factory.NewScopedProviderSettings(providerSettings, "github.com/SigNoz/signoz/ee/authn/callbackauthn/oidccallbackauthn")
+
 	httpClient, err := client.New(providerSettings.Logger, providerSettings.TracerProvider, providerSettings.MeterProvider)
 	if err != nil {
 		return nil, err
 	}
 
 	return &AuthN{
+		settings:   settings,
 		store:      store,
 		licensing:  licensing,
 		httpClient: httpClient,
@@ -126,7 +129,40 @@ func (a *AuthN) HandleCallback(ctx context.Context, query url.Values) (*authtype
 		}
 	}
 
-	return authtypes.NewCallbackIdentity("", email, authDomain.StorableAuthDomain().OrgID, state), nil
+	name := ""
+	if nameClaim := authDomain.AuthDomainConfig().OIDC.ClaimMapping.Name; nameClaim != "" {
+		if n, ok := claims[nameClaim].(string); ok {
+			name = n
+		}
+	}
+
+	var groups []string
+	if groupsClaim := authDomain.AuthDomainConfig().OIDC.ClaimMapping.Groups; groupsClaim != "" {
+		if claimValue, exists := claims[groupsClaim]; exists {
+			switch g := claimValue.(type) {
+			case []any:
+				for _, group := range g {
+					if gs, ok := group.(string); ok {
+						groups = append(groups, gs)
+					}
+				}
+			case string:
+				// Some IDPs return a single group as a string instead of an array
+				groups = append(groups, g)
+			default:
+				a.settings.Logger().WarnContext(ctx, "oidc: unsupported groups type", "type", fmt.Sprintf("%T", claimValue))
+			}
+		}
+	}
+
+	role := ""
+	if roleClaim := authDomain.AuthDomainConfig().OIDC.ClaimMapping.Role; roleClaim != "" {
+		if r, ok := claims[roleClaim].(string); ok {
+			role = r
+		}
+	}
+
+	return authtypes.NewCallbackIdentity(name, email, authDomain.StorableAuthDomain().OrgID, state, groups, role), nil
 }
 
 func (a *AuthN) ProviderInfo(ctx context.Context, authDomain *authtypes.AuthDomain) *authtypes.AuthNProviderInfo {
@@ -145,6 +181,13 @@ func (a *AuthN) oidcProviderAndoauth2Config(ctx context.Context, siteURL *url.UR
 		return nil, nil, err
 	}
 
+	scopes := make([]string, len(defaultScopes))
+	copy(scopes, defaultScopes)
+
+	if authDomain.AuthDomainConfig().RoleMapping != nil && len(authDomain.AuthDomainConfig().RoleMapping.GroupMappings) > 0 {
+		scopes = append(scopes, "groups")
+	}
+
 	return oidcProvider, &oauth2.Config{
 		ClientID:     authDomain.AuthDomainConfig().OIDC.ClientID,
 		ClientSecret: authDomain.AuthDomainConfig().OIDC.ClientSecret,

ee/authn/callbackauthn/samlcallbackauthn/authn.go

@@ -96,7 +96,26 @@ func (a *AuthN) HandleCallback(ctx context.Context, formValues url.Values) (*aut
 		return nil, errors.New(errors.TypeInvalidInput, errors.CodeInvalidInput, "saml: invalid email").WithAdditional("The nameID assertion is used to retrieve the email address, please check your IDP configuration and try again.")
 	}
 
-	return authtypes.NewCallbackIdentity("", email, authDomain.StorableAuthDomain().OrgID, state), nil
+	name := ""
+	if nameAttribute := authDomain.AuthDomainConfig().SAML.AttributeMapping.Name; nameAttribute != "" {
+		if val := assertionInfo.Values.Get(nameAttribute); val != "" {
+			name = val
+		}
+	}
+
+	var groups []string
+	if groupAttribute := authDomain.AuthDomainConfig().SAML.AttributeMapping.Groups; groupAttribute != "" {
+		groups = assertionInfo.Values.GetAll(groupAttribute)
+	}
+
+	role := ""
+	if roleAttribute := authDomain.AuthDomainConfig().SAML.AttributeMapping.Role; roleAttribute != "" {
+		if val := assertionInfo.Values.Get(roleAttribute); val != "" {
+			role = val
+		}
+	}
+
+	return authtypes.NewCallbackIdentity(name, email, authDomain.StorableAuthDomain().OrgID, state, groups, role), nil
 }
 
 func (a *AuthN) ProviderInfo(ctx context.Context, authDomain *authtypes.AuthDomain) *authtypes.AuthNProviderInfo {

ee/gateway/httpgateway/provider.go

@@ -0,0 +1,282 @@
+package httpgateway
+
+import (
+	"bytes"
+	"context"
+	"encoding/json"
+	"io"
+	"net/http"
+	"net/url"
+	"strconv"
+	"time"
+
+	"github.com/SigNoz/signoz/pkg/errors"
+	"github.com/SigNoz/signoz/pkg/factory"
+	"github.com/SigNoz/signoz/pkg/gateway"
+	"github.com/SigNoz/signoz/pkg/http/client"
+	"github.com/SigNoz/signoz/pkg/licensing"
+	"github.com/SigNoz/signoz/pkg/types/gatewaytypes"
+	"github.com/SigNoz/signoz/pkg/valuer"
+	"github.com/tidwall/gjson"
+)
+
+type Provider struct {
+	settings   factory.ScopedProviderSettings
+	config     gateway.Config
+	httpClient *client.Client
+	licensing  licensing.Licensing
+}
+
+func NewProviderFactory(licensing licensing.Licensing) factory.ProviderFactory[gateway.Gateway, gateway.Config] {
+	return factory.NewProviderFactory(factory.MustNewName("http"), func(ctx context.Context, ps factory.ProviderSettings, c gateway.Config) (gateway.Gateway, error) {
+		return New(ctx, ps, c, licensing)
+	})
+}
+
+func New(ctx context.Context, providerSettings factory.ProviderSettings, config gateway.Config, licensing licensing.Licensing) (gateway.Gateway, error) {
+	settings := factory.NewScopedProviderSettings(providerSettings, "github.com/SigNoz/signoz/ee/gateway/httpgateway")
+
+	httpClient, err := client.New(
+		settings.Logger(),
+		providerSettings.TracerProvider,
+		providerSettings.MeterProvider,
+		client.WithRequestResponseLog(true),
+		client.WithRetryCount(3),
+	)
+	if err != nil {
+		return nil, err
+	}
+
+	return &Provider{
+		settings:   settings,
+		config:     config,
+		httpClient: httpClient,
+		licensing:  licensing,
+	}, nil
+}
+
+func (provider *Provider) GetIngestionKeys(ctx context.Context, orgID valuer.UUID, page, perPage int) (*gatewaytypes.GettableIngestionKeys, error) {
+	qParams := url.Values{}
+	qParams.Add("page", strconv.Itoa(page))
+	qParams.Add("per_page", strconv.Itoa(perPage))
+
+	responseBody, err := provider.do(ctx, orgID, http.MethodGet, "/v1/workspaces/me/keys", qParams, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	var ingestionKeys []gatewaytypes.IngestionKey
+	if err := json.Unmarshal([]byte(gjson.GetBytes(responseBody, "data").String()), &ingestionKeys); err != nil {
+		return nil, err
+	}
+
+	var pagination gatewaytypes.Pagination
+	if err := json.Unmarshal([]byte(gjson.GetBytes(responseBody, "_pagination").String()), &pagination); err != nil {
+		return nil, err
+	}
+
+	return &gatewaytypes.GettableIngestionKeys{
+		Keys:       ingestionKeys,
+		Pagination: pagination,
+	}, nil
+}
+
+func (provider *Provider) SearchIngestionKeysByName(ctx context.Context, orgID valuer.UUID, name string, page, perPage int) (*gatewaytypes.GettableIngestionKeys, error) {
+	qParams := url.Values{}
+	qParams.Add("name", name)
+	qParams.Add("page", strconv.Itoa(page))
+	qParams.Add("per_page", strconv.Itoa(perPage))
+
+	responseBody, err := provider.do(ctx, orgID, http.MethodGet, "/v1/workspaces/me/keys/search", qParams, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	var ingestionKeys []gatewaytypes.IngestionKey
+	if err := json.Unmarshal([]byte(gjson.GetBytes(responseBody, "data").String()), &ingestionKeys); err != nil {
+		return nil, err
+	}
+
+	var pagination gatewaytypes.Pagination
+	if err := json.Unmarshal([]byte(gjson.GetBytes(responseBody, "_pagination").String()), &pagination); err != nil {
+		return nil, err
+	}
+
+	return &gatewaytypes.GettableIngestionKeys{
+		Keys:       ingestionKeys,
+		Pagination: pagination,
+	}, nil
+}
+
+func (provider *Provider) CreateIngestionKey(ctx context.Context, orgID valuer.UUID, name string, tags []string, expiresAt time.Time) (*gatewaytypes.GettableCreatedIngestionKey, error) {
+	requestBody := gatewaytypes.PostableIngestionKey{
+		Name:      name,
+		Tags:      tags,
+		ExpiresAt: expiresAt,
+	}
+	requestBodyBytes, err := json.Marshal(requestBody)
+	if err != nil {
+		return nil, err
+	}
+
+	responseBody, err := provider.do(ctx, orgID, http.MethodPost, "/v1/workspaces/me/keys", nil, requestBodyBytes)
+	if err != nil {
+		return nil, err
+	}
+
+	var createdKeyResponse gatewaytypes.GettableCreatedIngestionKey
+	if err := json.Unmarshal([]byte(gjson.GetBytes(responseBody, "data").String()), &createdKeyResponse); err != nil {
+		return nil, err
+	}
+
+	return &createdKeyResponse, nil
+}
+
+func (provider *Provider) UpdateIngestionKey(ctx context.Context, orgID valuer.UUID, keyID string, name string, tags []string, expiresAt time.Time) error {
+	requestBody := gatewaytypes.PostableIngestionKey{
+		Name:      name,
+		Tags:      tags,
+		ExpiresAt: expiresAt,
+	}
+	requestBodyBytes, err := json.Marshal(requestBody)
+	if err != nil {
+		return err
+	}
+
+	_, err = provider.do(ctx, orgID, http.MethodPatch, "/v1/workspaces/me/keys/"+keyID, nil, requestBodyBytes)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (provider *Provider) DeleteIngestionKey(ctx context.Context, orgID valuer.UUID, keyID string) error {
+	_, err := provider.do(ctx, orgID, http.MethodDelete, "/v1/workspaces/me/keys/"+keyID, nil, nil)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (provider *Provider) CreateIngestionKeyLimit(ctx context.Context, orgID valuer.UUID, keyID string, signal string, limitConfig gatewaytypes.LimitConfig, tags []string) (*gatewaytypes.GettableCreatedIngestionKeyLimit, error) {
+	requestBody := gatewaytypes.PostableIngestionKeyLimit{
+		Signal: signal,
+		Config: limitConfig,
+		Tags:   tags,
+	}
+	requestBodyBytes, err := json.Marshal(requestBody)
+	if err != nil {
+		return nil, err
+	}
+
+	responseBody, err := provider.do(ctx, orgID, http.MethodPost, "/v1/workspaces/me/keys/"+keyID+"/limits", nil, requestBodyBytes)
+	if err != nil {
+		return nil, err
+	}
+
+	var createdIngestionKeyLimitResponse gatewaytypes.GettableCreatedIngestionKeyLimit
+	if err := json.Unmarshal([]byte(gjson.GetBytes(responseBody, "data").String()), &createdIngestionKeyLimitResponse); err != nil {
+		return nil, err
+	}
+
+	return &createdIngestionKeyLimitResponse, nil
+}
+
+func (provider *Provider) UpdateIngestionKeyLimit(ctx context.Context, orgID valuer.UUID, limitID string, limitConfig gatewaytypes.LimitConfig, tags []string) error {
+	requestBody := gatewaytypes.UpdatableIngestionKeyLimit{
+		Config: limitConfig,
+		Tags:   tags,
+	}
+	requestBodyBytes, err := json.Marshal(requestBody)
+	if err != nil {
+		return err
+	}
+
+	_, err = provider.do(ctx, orgID, http.MethodPatch, "/v1/workspaces/me/limits/"+limitID, nil, requestBodyBytes)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (provider *Provider) DeleteIngestionKeyLimit(ctx context.Context, orgID valuer.UUID, limitID string) error {
+	_, err := provider.do(ctx, orgID, http.MethodDelete, "/v1/workspaces/me/limits/"+limitID, nil, nil)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (provider *Provider) do(ctx context.Context, orgID valuer.UUID, method string, path string, queryParams url.Values, body []byte) ([]byte, error) {
+	license, err := provider.licensing.GetActive(ctx, orgID)
+	if err != nil {
+		return nil, errors.New(errors.TypeLicenseUnavailable, errors.CodeLicenseUnavailable, "no valid license found").WithAdditional("this feature requires a valid license").WithAdditional(err.Error())
+	}
+
+	// build url
+	requestURL := provider.config.URL.JoinPath(path)
+
+	// add query params to the url
+	if queryParams != nil {
+		requestURL.RawQuery = queryParams.Encode()
+	}
+
+	// build request
+	request, err := http.NewRequestWithContext(ctx, method, requestURL.String(), bytes.NewBuffer(body))
+	if err != nil {
+		return nil, err
+	}
+
+	// add headers needed to call gateway
+	request.Header.Set("Content-Type", "application/json")
+	request.Header.Set("X-Signoz-Cloud-Api-Key", license.Key)
+	request.Header.Set("X-Consumer-Username", "lid:00000000-0000-0000-0000-000000000000")
+	request.Header.Set("X-Consumer-Groups", "ns:default")
+
+	// execute request
+	response, err := provider.httpClient.Do(request)
+	if err != nil {
+		return nil, err
+	}
+
+	// read response
+	defer response.Body.Close()
+	responseBody, err := io.ReadAll(response.Body)
+	if err != nil {
+		return nil, err
+	}
+
+	// only 2XX
+	if response.StatusCode/100 == 2 {
+		return responseBody, nil
+	}
+
+	errorMessage := gjson.GetBytes(responseBody, "error").String()
+	if errorMessage == "" {
+		errorMessage = "an unknown error occurred"
+	}
+
+	// return error for non 2XX
+	return nil, provider.errFromStatusCode(response.StatusCode, errorMessage)
+}
+
+func (provider *Provider) errFromStatusCode(code int, errorMessage string) error {
+	switch code {
+	case http.StatusBadRequest:
+		return errors.New(errors.TypeInvalidInput, errors.CodeInvalidInput, errorMessage)
+	case http.StatusUnauthorized:
+		return errors.New(errors.TypeUnauthenticated, errors.CodeUnauthenticated, errorMessage)
+	case http.StatusForbidden:
+		return errors.New(errors.TypeForbidden, errors.CodeForbidden, errorMessage)
+	case http.StatusNotFound:
+		return errors.New(errors.TypeNotFound, errors.CodeNotFound, errorMessage)
+	case http.StatusConflict:
+		return errors.New(errors.TypeAlreadyExists, errors.CodeAlreadyExists, errorMessage)
+	}
+
+	return errors.New(errors.TypeInternal, errors.CodeInternal, errorMessage)
+}

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

@@ -10,6 +10,7 @@ import (
 	"github.com/SigNoz/signoz/ee/query-service/usage"
 	"github.com/SigNoz/signoz/pkg/alertmanager"
 	"github.com/SigNoz/signoz/pkg/apis/fields"
+	"github.com/SigNoz/signoz/pkg/global"
 	"github.com/SigNoz/signoz/pkg/http/middleware"
 	querierAPI "github.com/SigNoz/signoz/pkg/querier"
 	baseapp "github.com/SigNoz/signoz/pkg/query-service/app"
@@ -36,6 +37,7 @@ type APIHandlerOptions struct {
 	GatewayUrl                    string
 	// Querier Influx Interval
 	FluxInterval time.Duration
+	GlobalConfig global.Config
 }
 
 type APIHandler struct {

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

@@ -76,7 +76,7 @@ func (ah *APIHandler) CloudIntegrationsGenerateConnectionParams(w http.ResponseW
 		return
 	}
 
-	ingestionUrl, signozApiUrl, apiErr := ah.getIngestionUrlAndSigNozAPIUrl(r.Context(), license.Key)
+	signozApiUrl, apiErr := ah.getIngestionUrlAndSigNozAPIUrl(r.Context(), license.Key)
 	if apiErr != nil {
 		RespondError(w, basemodel.WrapApiError(
 			apiErr, "couldn't deduce ingestion url and signoz api url",
@@ -84,7 +84,7 @@ func (ah *APIHandler) CloudIntegrationsGenerateConnectionParams(w http.ResponseW
 		return
 	}
 
-	result.IngestionUrl = ingestionUrl
+	result.IngestionUrl = ah.opts.GlobalConfig.IngestionURL.String()
 	result.SigNozAPIUrl = signozApiUrl
 
 	gatewayUrl := ah.opts.GatewayUrl
@@ -186,7 +186,7 @@ func (ah *APIHandler) getOrCreateCloudIntegrationUser(
 }
 
 func (ah *APIHandler) getIngestionUrlAndSigNozAPIUrl(ctx context.Context, licenseKey string) (
-	string, string, *basemodel.ApiError,
+	string, *basemodel.ApiError,
 ) {
 	// TODO: remove this struct from here
 	type deploymentResponse struct {
@@ -200,7 +200,7 @@ func (ah *APIHandler) getIngestionUrlAndSigNozAPIUrl(ctx context.Context, licens
 
 	respBytes, err := ah.Signoz.Zeus.GetDeployment(ctx, licenseKey)
 	if err != nil {
-		return "", "", basemodel.InternalError(fmt.Errorf(
+		return "", basemodel.InternalError(fmt.Errorf(
 			"couldn't query for deployment info: error: %w", err,
 		))
 	}
@@ -209,7 +209,7 @@ func (ah *APIHandler) getIngestionUrlAndSigNozAPIUrl(ctx context.Context, licens
 
 	err = json.Unmarshal(respBytes, resp)
 	if err != nil {
-		return "", "", basemodel.InternalError(fmt.Errorf(
+		return "", basemodel.InternalError(fmt.Errorf(
 			"couldn't unmarshal deployment info response: error: %w", err,
 		))
 	}
@@ -219,16 +219,14 @@ func (ah *APIHandler) getIngestionUrlAndSigNozAPIUrl(ctx context.Context, licens
 
 	if len(regionDns) < 1 || len(deploymentName) < 1 {
 		// Fail early if actual response structure and expectation here ever diverge
-		return "", "", basemodel.InternalError(fmt.Errorf(
+		return "", basemodel.InternalError(fmt.Errorf(
 			"deployment info response not in expected shape. couldn't determine region dns and deployment name",
 		))
 	}
 
-	ingestionUrl := fmt.Sprintf("https://ingest.%s", regionDns)
-
 	signozApiUrl := fmt.Sprintf("https://%s.%s", deploymentName, regionDns)
 
-	return ingestionUrl, signozApiUrl, nil
+	return signozApiUrl, nil
 }
 
 type ingestionKey struct {

ee/query-service/app/server.go

@@ -172,6 +172,7 @@ func NewServer(config signoz.Config, signoz *signoz.SigNoz) (*Server, error) {
 		FluxInterval:                  config.Querier.FluxInterval,
 		Gateway:                       gatewayProxy,
 		GatewayUrl:                    config.Gateway.URL.String(),
+		GlobalConfig:                  config.Global,
 	}
 
 	apiHandler, err := api.NewAPIHandler(apiOpts, signoz)

ee/query-service/rules/anomaly.go

@@ -240,11 +240,9 @@ func (r *AnomalyRule) buildAndRunQuery(ctx context.Context, orgID valuer.UUID, t
 	r.logger.InfoContext(ctx, "anomaly scores", "scores", string(scoresJSON))
 
 	for _, series := range queryResult.AnomalyScores {
-		if r.Condition() != nil && r.Condition().RequireMinPoints {
-			if len(series.Points) < r.Condition().RequiredNumPoints {
-				r.logger.InfoContext(ctx, "not enough data points to evaluate series, skipping", "ruleid", r.ID(), "numPoints", len(series.Points), "requiredPoints", r.Condition().RequiredNumPoints)
-				continue
-			}
+		if !r.Condition().ShouldEval(series) {
+			r.logger.InfoContext(ctx, "not enough data points to evaluate series, skipping", "ruleid", r.ID(), "numPoints", len(series.Points), "requiredPoints", r.Condition().RequiredNumPoints)
+			continue
 		}
 		results, err := r.Threshold.Eval(*series, r.Unit(), ruletypes.EvalData{
 			ActiveAlerts:  r.ActiveAlertsLabelFP(),
@@ -305,11 +303,9 @@ func (r *AnomalyRule) buildAndRunQueryV5(ctx context.Context, orgID valuer.UUID,
 	}
 
 	for _, series := range seriesToProcess {
-		if r.Condition().RequireMinPoints {
-			if len(series.Points) < r.Condition().RequiredNumPoints {
-				r.logger.InfoContext(ctx, "not enough data points to evaluate series, skipping", "ruleid", r.ID(), "numPoints", len(series.Points), "requiredPoints", r.Condition().RequiredNumPoints)
-				continue
-			}
+		if !r.Condition().ShouldEval(series) {
+			r.logger.InfoContext(ctx, "not enough data points to evaluate series, skipping", "ruleid", r.ID(), "numPoints", len(series.Points), "requiredPoints", r.Condition().RequiredNumPoints)
+			continue
 		}
 		results, err := r.Threshold.Eval(*series, r.Unit(), ruletypes.EvalData{
 			ActiveAlerts:  r.ActiveAlertsLabelFP(),
@@ -323,7 +319,7 @@ func (r *AnomalyRule) buildAndRunQueryV5(ctx context.Context, orgID valuer.UUID,
 	return resultVector, nil
 }
 
-func (r *AnomalyRule) Eval(ctx context.Context, ts time.Time) (interface{}, error) {
+func (r *AnomalyRule) Eval(ctx context.Context, ts time.Time) (int, error) {
 
 	prevState := r.State()
 
@@ -340,7 +336,7 @@ func (r *AnomalyRule) Eval(ctx context.Context, ts time.Time) (interface{}, erro
 		res, err = r.buildAndRunQuery(ctx, r.OrgID(), ts)
 	}
 	if err != nil {
-		return nil, err
+		return 0, err
 	}
 
 	r.mtx.Lock()
@@ -415,7 +411,7 @@ func (r *AnomalyRule) Eval(ctx context.Context, ts time.Time) (interface{}, erro
 		if _, ok := alerts[h]; ok {
 			r.logger.ErrorContext(ctx, "the alert query returns duplicate records", "rule_id", r.ID(), "alert", alerts[h])
 			err = fmt.Errorf("duplicate alert found, vector contains metrics with the same labelset after applying alert labels")
-			return nil, err
+			return 0, err
 		}
 
 		alerts[h] = &ruletypes.Alert{

ee/query-service/rules/manager.go

@@ -10,7 +10,7 @@ import (
 	basemodel "github.com/SigNoz/signoz/pkg/query-service/model"
 	baserules "github.com/SigNoz/signoz/pkg/query-service/rules"
 	"github.com/SigNoz/signoz/pkg/query-service/utils/labels"
-	ruletypes "github.com/SigNoz/signoz/pkg/types/ruletypes"
+	"github.com/SigNoz/signoz/pkg/types/ruletypes"
 	"github.com/SigNoz/signoz/pkg/valuer"
 	"github.com/google/uuid"
 	"go.uber.org/zap"
@@ -47,7 +47,7 @@ func PrepareTaskFunc(opts baserules.PrepareTaskOptions) (baserules.Task, error)
 
 		rules = append(rules, tr)
 
-		// create ch rule task for evalution
+		// create ch rule task for evaluation
 		task = newTask(baserules.TaskTypeCh, opts.TaskName, time.Duration(evaluation.GetFrequency()), rules, opts.ManagerOpts, opts.NotifyFunc, opts.MaintenanceStore, opts.OrgID)
 
 	} else if opts.Rule.RuleType == ruletypes.RuleTypeProm {
@@ -71,7 +71,7 @@ func PrepareTaskFunc(opts baserules.PrepareTaskOptions) (baserules.Task, error)
 
 		rules = append(rules, pr)
 
-		// create promql rule task for evalution
+		// create promql rule task for evaluation
 		task = newTask(baserules.TaskTypeProm, opts.TaskName, time.Duration(evaluation.GetFrequency()), rules, opts.ManagerOpts, opts.NotifyFunc, opts.MaintenanceStore, opts.OrgID)
 
 	} else if opts.Rule.RuleType == ruletypes.RuleTypeAnomaly {
@@ -95,7 +95,7 @@ func PrepareTaskFunc(opts baserules.PrepareTaskOptions) (baserules.Task, error)
 
 		rules = append(rules, ar)
 
-		// create anomaly rule task for evalution
+		// create anomaly rule task for evaluation
 		task = newTask(baserules.TaskTypeCh, opts.TaskName, time.Duration(evaluation.GetFrequency()), rules, opts.ManagerOpts, opts.NotifyFunc, opts.MaintenanceStore, opts.OrgID)
 
 	} else {
@@ -203,16 +203,12 @@ func TestNotification(opts baserules.PrepareTestRuleOptions) (int, *basemodel.Ap
 	// set timestamp to current utc time
 	ts := time.Now().UTC()
 
-	count, err := rule.Eval(ctx, ts)
+	alertsFound, err := rule.Eval(ctx, ts)
 	if err != nil {
 		zap.L().Error("evaluating rule failed", zap.String("rule", rule.Name()), zap.Error(err))
 		return 0, basemodel.InternalError(fmt.Errorf("rule evaluation failed"))
 	}
-	alertsFound, ok := count.(int)
-	if !ok {
-		return 0, basemodel.InternalError(fmt.Errorf("something went wrong"))
-	}
-	rule.SendAlerts(ctx, ts, 0, time.Duration(1*time.Minute), opts.NotifyFunc)
+	rule.SendAlerts(ctx, ts, 0, time.Minute, opts.NotifyFunc)
 
 	return alertsFound, nil
 }

ee/query-service/rules/manager_test.go

@@ -9,7 +9,7 @@ import (
 	"time"
 
 	"github.com/SigNoz/signoz/pkg/alertmanager"
-	alertmanagermock "github.com/SigNoz/signoz/pkg/alertmanager/mocks"
+	alertmanagermock "github.com/SigNoz/signoz/pkg/alertmanager/alertmanagertest"
 	"github.com/SigNoz/signoz/pkg/instrumentation/instrumentationtest"
 	"github.com/SigNoz/signoz/pkg/prometheus"
 	"github.com/SigNoz/signoz/pkg/prometheus/prometheustest"

frontend/.eslintignore

@@ -2,4 +2,6 @@ node_modules
 build
 *.typegen.ts
 i18-generate-hash.js
-src/parser/TraceOperatorParser/**
+src/parser/TraceOperatorParser/**
+
+orval.config.ts

frontend/.eslintrc.js

@@ -124,4 +124,16 @@ module.exports = {
 		],
 		'react/jsx-props-no-spreading': 'off',
 	},
+	overrides: [
+		{
+			files: ['src/api/generated/**/*.ts'],
+			rules: {
+				'@typescript-eslint/explicit-function-return-type': 'off',
+				'@typescript-eslint/explicit-module-boundary-types': 'off',
+				'no-nested-ternary': 'off',
+				'@typescript-eslint/no-unused-vars': 'warn',
+				'sonarjs/no-duplicate-string': 'off',
+			},
+		},
+	],
 };

frontend/orval.config.ts

@@ -0,0 +1,97 @@
+/**
+ * When making changes to this file, remove this the file name from .eslintignore and tsconfig.json
+ * The reason this is required because of the moduleResolution being "node". Changing this is a more detailed effort.
+ * So, until then, we will keep this file ignored for eslint and typescript.
+ */
+
+import { defineConfig } from 'orval';
+
+export default defineConfig({
+	signoz: {
+		input: {
+			target: '../docs/api/openapi.yml',
+		},
+		output: {
+			target: './src/api/generated/services',
+			client: 'react-query',
+			httpClient: 'axios',
+			mode: 'tags-split',
+			prettier: true,
+			headers: true,
+			clean: true,
+			override: {
+				query: {
+					useQuery: true,
+					useMutation: true,
+					useInvalidate: true,
+					signal: true,
+					useOperationIdAsQueryKey: true,
+				},
+				useDates: true,
+				useNamedParameters: true,
+				enumGenerationType: 'enum',
+				mutator: {
+					path: './src/api/index.ts',
+					name: 'GeneratedAPIInstance',
+				},
+
+				jsDoc: {
+					filter: (schema) => {
+						const allowlist = [
+							'type',
+							'format',
+							'maxLength',
+							'minLength',
+							'description',
+							'minimum',
+							'maximum',
+							'exclusiveMinimum',
+							'exclusiveMaximum',
+							'pattern',
+							'nullable',
+							'enum',
+						];
+						return Object.entries(schema || {})
+							.filter(([key]) => allowlist.includes(key))
+							.map(([key, value]: [string, any]) => ({
+								key,
+								value,
+							}))
+							.sort((a, b) => a.key.length - b.key.length);
+					},
+				},
+
+				components: {
+					schemas: {
+						suffix: 'DTO',
+					},
+					responses: {
+						suffix: 'Response',
+					},
+					parameters: {
+						suffix: 'Params',
+					},
+					requestBodies: {
+						suffix: 'Body',
+					},
+				},
+
+				// info is of type InfoObject from openapi spec
+				header: (info: { title: string; version: string }): string[] => [
+					`! Do not edit manually`,
+					`* The file has been auto-generated using Orval for SigNoz`,
+					`* regenerate with 'yarn generate:api'`,
+					...(info.title ? [info.title] : []),
+					...(info.version ? [`OpenAPI spec version: ${info.version}`] : []),
+				],
+
+				// @ts-expect-error
+				// propertySortOrder, urlEncodeParameters, aliasCombinedTypes
+				// are valid options in the document without types
+				propertySortOrder: 'Alphabetical',
+				urlEncodeParameters: true,
+				aliasCombinedTypes: true,
+			},
+		},
+	},
+});

frontend/package.json

@@ -18,7 +18,8 @@
 		"husky:configure": "cd .. && husky install frontend/.husky && cd frontend && chmod ug+x .husky/*",
 		"commitlint": "commitlint --edit $1",
 		"test": "jest",
-		"test:changedsince": "jest --changedSince=main --coverage --silent"
+		"test:changedsince": "jest --changedSince=main --coverage --silent",
+		"generate:api": "orval --config ./orval.config.ts && sh scripts/post-types-generation.sh && prettier --write src/api/generated && (eslint --fix src/api/generated || true)"
 	},
 	"engines": {
 		"node": ">=16.15.0"
@@ -48,6 +49,7 @@
 		"@signozhq/calendar": "0.0.0",
 		"@signozhq/callout": "0.0.2",
 		"@signozhq/checkbox": "0.0.2",
+		"@signozhq/combobox": "0.0.2",
 		"@signozhq/command": "0.0.0",
 		"@signozhq/design-tokens": "1.1.4",
 		"@signozhq/input": "0.0.2",
@@ -237,6 +239,7 @@
 		"lint-staged": "^12.5.0",
 		"msw": "1.3.2",
 		"npm-run-all": "latest",
+		"orval": "7.18.0",
 		"portfinder-sync": "^0.0.2",
 		"postcss": "8.4.38",
 		"prettier": "2.2.1",

frontend/scripts/post-types-generation.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+# Rename tag files to index.ts in services directories
+# tags-split creates: services/tagName/tagName.ts -> rename to services/tagName/index.ts
+find src/api/generated/services -mindepth 1 -maxdepth 1 -type d | while read -r dir; do
+  dirname=$(basename "$dir")
+  tagfile="$dir/$dirname.ts"
+  if [ -f "$tagfile" ]; then
+    mv "$tagfile" "$dir/index.ts"
+    echo "Renamed $tagfile -> $dir/index.ts"
+  fi
+done
+
+echo "Tag files renamed to index.ts"

frontend/src/AppRoutes/pageComponents.ts

@@ -202,6 +202,10 @@ export const PasswordReset = Loadable(
 	() => import(/* webpackChunkName: "ResetPassword" */ 'pages/ResetPassword'),
 );
 
+export const ForgotPassword = Loadable(
+	() => import(/* webpackChunkName: "ForgotPassword" */ 'pages/ForgotPassword'),
+);
+
 export const SomethingWentWrong = Loadable(
 	() =>
 		import(

frontend/src/AppRoutes/routes.ts

@@ -17,6 +17,7 @@ import {
 	DashboardWidget,
 	EditRulesPage,
 	ErrorDetails,
+	ForgotPassword,
 	Home,
 	InfrastructureMonitoring,
 	InstalledIntegrations,
@@ -353,6 +354,13 @@ const routes: AppRoutes[] = [
 		key: 'PASSWORD_RESET',
 		isPrivate: false,
 	},
+	{
+		path: ROUTES.FORGOT_PASSWORD,
+		exact: true,
+		component: ForgotPassword,
+		key: 'FORGOT_PASSWORD',
+		isPrivate: false,
+	},
 	{
 		path: ROUTES.SOMETHING_WENT_WRONG,
 		exact: true,

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

@@ -0,0 +1,371 @@
+/**
+ * ! Do not edit manually
+ * * The file has been auto-generated using Orval for SigNoz
+ * * regenerate with 'yarn generate:api'
+ * SigNoz
+ */
+import type {
+	InvalidateOptions,
+	MutationFunction,
+	QueryClient,
+	QueryFunction,
+	QueryKey,
+	UseMutationOptions,
+	UseMutationResult,
+	UseQueryOptions,
+	UseQueryResult,
+} from 'react-query';
+import { useMutation, useQuery } from 'react-query';
+
+import { GeneratedAPIInstance } from '../../../index';
+import type {
+	AuthtypesPostableAuthDomainDTO,
+	AuthtypesUpdateableAuthDomainDTO,
+	CreateAuthDomain200,
+	DeleteAuthDomainPathParameters,
+	ListAuthDomains200,
+	RenderErrorResponseDTO,
+	UpdateAuthDomainPathParameters,
+} from '../sigNoz.schemas';
+
+type AwaitedInput<T> = PromiseLike<T> | T;
+
+type Awaited<O> = O extends AwaitedInput<infer T> ? T : never;
+
+/**
+ * This endpoint lists all auth domains
+ * @summary List all auth domains
+ */
+export const listAuthDomains = (signal?: AbortSignal) =>
+	GeneratedAPIInstance<ListAuthDomains200>({
+		url: `/api/v1/domains`,
+		method: 'GET',
+		signal,
+	});
+
+export const getListAuthDomainsQueryKey = () => ['listAuthDomains'] as const;
+
+export const getListAuthDomainsQueryOptions = <
+	TData = Awaited<ReturnType<typeof listAuthDomains>>,
+	TError = RenderErrorResponseDTO
+>(options?: {
+	query?: UseQueryOptions<
+		Awaited<ReturnType<typeof listAuthDomains>>,
+		TError,
+		TData
+	>;
+}) => {
+	const { query: queryOptions } = options ?? {};
+
+	const queryKey = queryOptions?.queryKey ?? getListAuthDomainsQueryKey();
+
+	const queryFn: QueryFunction<Awaited<ReturnType<typeof listAuthDomains>>> = ({
+		signal,
+	}) => listAuthDomains(signal);
+
+	return { queryKey, queryFn, ...queryOptions } as UseQueryOptions<
+		Awaited<ReturnType<typeof listAuthDomains>>,
+		TError,
+		TData
+	> & { queryKey: QueryKey };
+};
+
+export type ListAuthDomainsQueryResult = NonNullable<
+	Awaited<ReturnType<typeof listAuthDomains>>
+>;
+export type ListAuthDomainsQueryError = RenderErrorResponseDTO;
+
+/**
+ * @summary List all auth domains
+ */
+
+export function useListAuthDomains<
+	TData = Awaited<ReturnType<typeof listAuthDomains>>,
+	TError = RenderErrorResponseDTO
+>(options?: {
+	query?: UseQueryOptions<
+		Awaited<ReturnType<typeof listAuthDomains>>,
+		TError,
+		TData
+	>;
+}): UseQueryResult<TData, TError> & { queryKey: QueryKey } {
+	const queryOptions = getListAuthDomainsQueryOptions(options);
+
+	const query = useQuery(queryOptions) as UseQueryResult<TData, TError> & {
+		queryKey: QueryKey;
+	};
+
+	query.queryKey = queryOptions.queryKey;
+
+	return query;
+}
+
+/**
+ * @summary List all auth domains
+ */
+export const invalidateListAuthDomains = async (
+	queryClient: QueryClient,
+	options?: InvalidateOptions,
+): Promise<QueryClient> => {
+	await queryClient.invalidateQueries(
+		{ queryKey: getListAuthDomainsQueryKey() },
+		options,
+	);
+
+	return queryClient;
+};
+
+/**
+ * This endpoint creates an auth domain
+ * @summary Create auth domain
+ */
+export const createAuthDomain = (
+	authtypesPostableAuthDomainDTO: AuthtypesPostableAuthDomainDTO,
+	signal?: AbortSignal,
+) =>
+	GeneratedAPIInstance<CreateAuthDomain200>({
+		url: `/api/v1/domains`,
+		method: 'POST',
+		headers: { 'Content-Type': 'application/json' },
+		data: authtypesPostableAuthDomainDTO,
+		signal,
+	});
+
+export const getCreateAuthDomainMutationOptions = <
+	TError = RenderErrorResponseDTO,
+	TContext = unknown
+>(options?: {
+	mutation?: UseMutationOptions<
+		Awaited<ReturnType<typeof createAuthDomain>>,
+		TError,
+		{ data: AuthtypesPostableAuthDomainDTO },
+		TContext
+	>;
+}): UseMutationOptions<
+	Awaited<ReturnType<typeof createAuthDomain>>,
+	TError,
+	{ data: AuthtypesPostableAuthDomainDTO },
+	TContext
+> => {
+	const mutationKey = ['createAuthDomain'];
+	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 createAuthDomain>>,
+		{ data: AuthtypesPostableAuthDomainDTO }
+	> = (props) => {
+		const { data } = props ?? {};
+
+		return createAuthDomain(data);
+	};
+
+	return { mutationFn, ...mutationOptions };
+};
+
+export type CreateAuthDomainMutationResult = NonNullable<
+	Awaited<ReturnType<typeof createAuthDomain>>
+>;
+export type CreateAuthDomainMutationBody = AuthtypesPostableAuthDomainDTO;
+export type CreateAuthDomainMutationError = RenderErrorResponseDTO;
+
+/**
+ * @summary Create auth domain
+ */
+export const useCreateAuthDomain = <
+	TError = RenderErrorResponseDTO,
+	TContext = unknown
+>(options?: {
+	mutation?: UseMutationOptions<
+		Awaited<ReturnType<typeof createAuthDomain>>,
+		TError,
+		{ data: AuthtypesPostableAuthDomainDTO },
+		TContext
+	>;
+}): UseMutationResult<
+	Awaited<ReturnType<typeof createAuthDomain>>,
+	TError,
+	{ data: AuthtypesPostableAuthDomainDTO },
+	TContext
+> => {
+	const mutationOptions = getCreateAuthDomainMutationOptions(options);
+
+	return useMutation(mutationOptions);
+};
+/**
+ * This endpoint deletes an auth domain
+ * @summary Delete auth domain
+ */
+export const deleteAuthDomain = ({ id }: DeleteAuthDomainPathParameters) =>
+	GeneratedAPIInstance<void>({
+		url: `/api/v1/domains/${id}`,
+		method: 'DELETE',
+	});
+
+export const getDeleteAuthDomainMutationOptions = <
+	TError = RenderErrorResponseDTO,
+	TContext = unknown
+>(options?: {
+	mutation?: UseMutationOptions<
+		Awaited<ReturnType<typeof deleteAuthDomain>>,
+		TError,
+		{ pathParams: DeleteAuthDomainPathParameters },
+		TContext
+	>;
+}): UseMutationOptions<
+	Awaited<ReturnType<typeof deleteAuthDomain>>,
+	TError,
+	{ pathParams: DeleteAuthDomainPathParameters },
+	TContext
+> => {
+	const mutationKey = ['deleteAuthDomain'];
+	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 deleteAuthDomain>>,
+		{ pathParams: DeleteAuthDomainPathParameters }
+	> = (props) => {
+		const { pathParams } = props ?? {};
+
+		return deleteAuthDomain(pathParams);
+	};
+
+	return { mutationFn, ...mutationOptions };
+};
+
+export type DeleteAuthDomainMutationResult = NonNullable<
+	Awaited<ReturnType<typeof deleteAuthDomain>>
+>;
+
+export type DeleteAuthDomainMutationError = RenderErrorResponseDTO;
+
+/**
+ * @summary Delete auth domain
+ */
+export const useDeleteAuthDomain = <
+	TError = RenderErrorResponseDTO,
+	TContext = unknown
+>(options?: {
+	mutation?: UseMutationOptions<
+		Awaited<ReturnType<typeof deleteAuthDomain>>,
+		TError,
+		{ pathParams: DeleteAuthDomainPathParameters },
+		TContext
+	>;
+}): UseMutationResult<
+	Awaited<ReturnType<typeof deleteAuthDomain>>,
+	TError,
+	{ pathParams: DeleteAuthDomainPathParameters },
+	TContext
+> => {
+	const mutationOptions = getDeleteAuthDomainMutationOptions(options);
+
+	return useMutation(mutationOptions);
+};
+/**
+ * This endpoint updates an auth domain
+ * @summary Update auth domain
+ */
+export const updateAuthDomain = (
+	{ id }: UpdateAuthDomainPathParameters,
+	authtypesUpdateableAuthDomainDTO: AuthtypesUpdateableAuthDomainDTO,
+) =>
+	GeneratedAPIInstance<void>({
+		url: `/api/v1/domains/${id}`,
+		method: 'PUT',
+		headers: { 'Content-Type': 'application/json' },
+		data: authtypesUpdateableAuthDomainDTO,
+	});
+
+export const getUpdateAuthDomainMutationOptions = <
+	TError = RenderErrorResponseDTO,
+	TContext = unknown
+>(options?: {
+	mutation?: UseMutationOptions<
+		Awaited<ReturnType<typeof updateAuthDomain>>,
+		TError,
+		{
+			pathParams: UpdateAuthDomainPathParameters;
+			data: AuthtypesUpdateableAuthDomainDTO;
+		},
+		TContext
+	>;
+}): UseMutationOptions<
+	Awaited<ReturnType<typeof updateAuthDomain>>,
+	TError,
+	{
+		pathParams: UpdateAuthDomainPathParameters;
+		data: AuthtypesUpdateableAuthDomainDTO;
+	},
+	TContext
+> => {
+	const mutationKey = ['updateAuthDomain'];
+	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 updateAuthDomain>>,
+		{
+			pathParams: UpdateAuthDomainPathParameters;
+			data: AuthtypesUpdateableAuthDomainDTO;
+		}
+	> = (props) => {
+		const { pathParams, data } = props ?? {};
+
+		return updateAuthDomain(pathParams, data);
+	};
+
+	return { mutationFn, ...mutationOptions };
+};
+
+export type UpdateAuthDomainMutationResult = NonNullable<
+	Awaited<ReturnType<typeof updateAuthDomain>>
+>;
+export type UpdateAuthDomainMutationBody = AuthtypesUpdateableAuthDomainDTO;
+export type UpdateAuthDomainMutationError = RenderErrorResponseDTO;
+
+/**
+ * @summary Update auth domain
+ */
+export const useUpdateAuthDomain = <
+	TError = RenderErrorResponseDTO,
+	TContext = unknown
+>(options?: {
+	mutation?: UseMutationOptions<
+		Awaited<ReturnType<typeof updateAuthDomain>>,
+		TError,
+		{
+			pathParams: UpdateAuthDomainPathParameters;
+			data: AuthtypesUpdateableAuthDomainDTO;
+		},
+		TContext
+	>;
+}): UseMutationResult<
+	Awaited<ReturnType<typeof updateAuthDomain>>,
+	TError,
+	{
+		pathParams: UpdateAuthDomainPathParameters;
+		data: AuthtypesUpdateableAuthDomainDTO;
+	},
+	TContext
+> => {
+	const mutationOptions = getUpdateAuthDomainMutationOptions(options);
+
+	return useMutation(mutationOptions);
+};

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

@@ -0,0 +1,620 @@
+/**
+ * ! Do not edit manually
+ * * The file has been auto-generated using Orval for SigNoz
+ * * regenerate with 'yarn generate:api'
+ * SigNoz
+ */
+import type {
+	InvalidateOptions,
+	MutationFunction,
+	QueryClient,
+	QueryFunction,
+	QueryKey,
+	UseMutationOptions,
+	UseMutationResult,
+	UseQueryOptions,
+	UseQueryResult,
+} from 'react-query';
+import { useMutation, useQuery } from 'react-query';
+
+import { GeneratedAPIInstance } from '../../../index';
+import type {
+	CreatePublicDashboard201,
+	CreatePublicDashboardPathParameters,
+	DashboardtypesPostablePublicDashboardDTO,
+	DashboardtypesUpdatablePublicDashboardDTO,
+	DeletePublicDashboardPathParameters,
+	GetPublicDashboard200,
+	GetPublicDashboardData200,
+	GetPublicDashboardDataPathParameters,
+	GetPublicDashboardPathParameters,
+	GetPublicDashboardWidgetQueryRange200,
+	GetPublicDashboardWidgetQueryRangePathParameters,
+	RenderErrorResponseDTO,
+	UpdatePublicDashboardPathParameters,
+} from '../sigNoz.schemas';
+
+type AwaitedInput<T> = PromiseLike<T> | T;
+
+type Awaited<O> = O extends AwaitedInput<infer T> ? T : never;
+
+/**
+ * This endpoints deletes the public sharing config and disables the public sharing of a dashboard
+ * @summary Delete public dashboard
+ */
+export const deletePublicDashboard = ({
+	id,
+}: DeletePublicDashboardPathParameters) =>
+	GeneratedAPIInstance<string>({
+		url: `/api/v1/dashboards/${id}/public`,
+		method: 'DELETE',
+	});
+
+export const getDeletePublicDashboardMutationOptions = <
+	TError = RenderErrorResponseDTO,
+	TContext = unknown
+>(options?: {
+	mutation?: UseMutationOptions<
+		Awaited<ReturnType<typeof deletePublicDashboard>>,
+		TError,
+		{ pathParams: DeletePublicDashboardPathParameters },
+		TContext
+	>;
+}): UseMutationOptions<
+	Awaited<ReturnType<typeof deletePublicDashboard>>,
+	TError,
+	{ pathParams: DeletePublicDashboardPathParameters },
+	TContext
+> => {
+	const mutationKey = ['deletePublicDashboard'];
+	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 deletePublicDashboard>>,
+		{ pathParams: DeletePublicDashboardPathParameters }
+	> = (props) => {
+		const { pathParams } = props ?? {};
+
+		return deletePublicDashboard(pathParams);
+	};
+
+	return { mutationFn, ...mutationOptions };
+};
+
+export type DeletePublicDashboardMutationResult = NonNullable<
+	Awaited<ReturnType<typeof deletePublicDashboard>>
+>;
+
+export type DeletePublicDashboardMutationError = RenderErrorResponseDTO;
+
+/**
+ * @summary Delete public dashboard
+ */
+export const useDeletePublicDashboard = <
+	TError = RenderErrorResponseDTO,
+	TContext = unknown
+>(options?: {
+	mutation?: UseMutationOptions<
+		Awaited<ReturnType<typeof deletePublicDashboard>>,
+		TError,
+		{ pathParams: DeletePublicDashboardPathParameters },
+		TContext
+	>;
+}): UseMutationResult<
+	Awaited<ReturnType<typeof deletePublicDashboard>>,
+	TError,
+	{ pathParams: DeletePublicDashboardPathParameters },
+	TContext
+> => {
+	const mutationOptions = getDeletePublicDashboardMutationOptions(options);
+
+	return useMutation(mutationOptions);
+};
+/**
+ * This endpoints returns public sharing config for a dashboard
+ * @summary Get public dashboard
+ */
+export const getPublicDashboard = (
+	{ id }: GetPublicDashboardPathParameters,
+	signal?: AbortSignal,
+) =>
+	GeneratedAPIInstance<GetPublicDashboard200>({
+		url: `/api/v1/dashboards/${id}/public`,
+		method: 'GET',
+		signal,
+	});
+
+export const getGetPublicDashboardQueryKey = ({
+	id,
+}: GetPublicDashboardPathParameters) => ['getPublicDashboard'] as const;
+
+export const getGetPublicDashboardQueryOptions = <
+	TData = Awaited<ReturnType<typeof getPublicDashboard>>,
+	TError = RenderErrorResponseDTO
+>(
+	{ id }: GetPublicDashboardPathParameters,
+	options?: {
+		query?: UseQueryOptions<
+			Awaited<ReturnType<typeof getPublicDashboard>>,
+			TError,
+			TData
+		>;
+	},
+) => {
+	const { query: queryOptions } = options ?? {};
+
+	const queryKey =
+		queryOptions?.queryKey ?? getGetPublicDashboardQueryKey({ id });
+
+	const queryFn: QueryFunction<
+		Awaited<ReturnType<typeof getPublicDashboard>>
+	> = ({ signal }) => getPublicDashboard({ id }, signal);
+
+	return {
+		queryKey,
+		queryFn,
+		enabled: !!id,
+		...queryOptions,
+	} as UseQueryOptions<
+		Awaited<ReturnType<typeof getPublicDashboard>>,
+		TError,
+		TData
+	> & { queryKey: QueryKey };
+};
+
+export type GetPublicDashboardQueryResult = NonNullable<
+	Awaited<ReturnType<typeof getPublicDashboard>>
+>;
+export type GetPublicDashboardQueryError = RenderErrorResponseDTO;
+
+/**
+ * @summary Get public dashboard
+ */
+
+export function useGetPublicDashboard<
+	TData = Awaited<ReturnType<typeof getPublicDashboard>>,
+	TError = RenderErrorResponseDTO
+>(
+	{ id }: GetPublicDashboardPathParameters,
+	options?: {
+		query?: UseQueryOptions<
+			Awaited<ReturnType<typeof getPublicDashboard>>,
+			TError,
+			TData
+		>;
+	},
+): UseQueryResult<TData, TError> & { queryKey: QueryKey } {
+	const queryOptions = getGetPublicDashboardQueryOptions({ id }, options);
+
+	const query = useQuery(queryOptions) as UseQueryResult<TData, TError> & {
+		queryKey: QueryKey;
+	};
+
+	query.queryKey = queryOptions.queryKey;
+
+	return query;
+}
+
+/**
+ * @summary Get public dashboard
+ */
+export const invalidateGetPublicDashboard = async (
+	queryClient: QueryClient,
+	{ id }: GetPublicDashboardPathParameters,
+	options?: InvalidateOptions,
+): Promise<QueryClient> => {
+	await queryClient.invalidateQueries(
+		{ queryKey: getGetPublicDashboardQueryKey({ id }) },
+		options,
+	);
+
+	return queryClient;
+};
+
+/**
+ * This endpoints creates public sharing config and enables public sharing of the dashboard
+ * @summary Create public dashboard
+ */
+export const createPublicDashboard = (
+	{ id }: CreatePublicDashboardPathParameters,
+	dashboardtypesPostablePublicDashboardDTO: DashboardtypesPostablePublicDashboardDTO,
+	signal?: AbortSignal,
+) =>
+	GeneratedAPIInstance<CreatePublicDashboard201>({
+		url: `/api/v1/dashboards/${id}/public`,
+		method: 'POST',
+		headers: { 'Content-Type': 'application/json' },
+		data: dashboardtypesPostablePublicDashboardDTO,
+		signal,
+	});
+
+export const getCreatePublicDashboardMutationOptions = <
+	TError = RenderErrorResponseDTO,
+	TContext = unknown
+>(options?: {
+	mutation?: UseMutationOptions<
+		Awaited<ReturnType<typeof createPublicDashboard>>,
+		TError,
+		{
+			pathParams: CreatePublicDashboardPathParameters;
+			data: DashboardtypesPostablePublicDashboardDTO;
+		},
+		TContext
+	>;
+}): UseMutationOptions<
+	Awaited<ReturnType<typeof createPublicDashboard>>,
+	TError,
+	{
+		pathParams: CreatePublicDashboardPathParameters;
+		data: DashboardtypesPostablePublicDashboardDTO;
+	},
+	TContext
+> => {
+	const mutationKey = ['createPublicDashboard'];
+	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 createPublicDashboard>>,
+		{
+			pathParams: CreatePublicDashboardPathParameters;
+			data: DashboardtypesPostablePublicDashboardDTO;
+		}
+	> = (props) => {
+		const { pathParams, data } = props ?? {};
+
+		return createPublicDashboard(pathParams, data);
+	};
+
+	return { mutationFn, ...mutationOptions };
+};
+
+export type CreatePublicDashboardMutationResult = NonNullable<
+	Awaited<ReturnType<typeof createPublicDashboard>>
+>;
+export type CreatePublicDashboardMutationBody = DashboardtypesPostablePublicDashboardDTO;
+export type CreatePublicDashboardMutationError = RenderErrorResponseDTO;
+
+/**
+ * @summary Create public dashboard
+ */
+export const useCreatePublicDashboard = <
+	TError = RenderErrorResponseDTO,
+	TContext = unknown
+>(options?: {
+	mutation?: UseMutationOptions<
+		Awaited<ReturnType<typeof createPublicDashboard>>,
+		TError,
+		{
+			pathParams: CreatePublicDashboardPathParameters;
+			data: DashboardtypesPostablePublicDashboardDTO;
+		},
+		TContext
+	>;
+}): UseMutationResult<
+	Awaited<ReturnType<typeof createPublicDashboard>>,
+	TError,
+	{
+		pathParams: CreatePublicDashboardPathParameters;
+		data: DashboardtypesPostablePublicDashboardDTO;
+	},
+	TContext
+> => {
+	const mutationOptions = getCreatePublicDashboardMutationOptions(options);
+
+	return useMutation(mutationOptions);
+};
+/**
+ * This endpoints updates the public sharing config for a dashboard
+ * @summary Update public dashboard
+ */
+export const updatePublicDashboard = (
+	{ id }: UpdatePublicDashboardPathParameters,
+	dashboardtypesUpdatablePublicDashboardDTO: DashboardtypesUpdatablePublicDashboardDTO,
+) =>
+	GeneratedAPIInstance<string>({
+		url: `/api/v1/dashboards/${id}/public`,
+		method: 'PUT',
+		headers: { 'Content-Type': 'application/json' },
+		data: dashboardtypesUpdatablePublicDashboardDTO,
+	});
+
+export const getUpdatePublicDashboardMutationOptions = <
+	TError = RenderErrorResponseDTO,
+	TContext = unknown
+>(options?: {
+	mutation?: UseMutationOptions<
+		Awaited<ReturnType<typeof updatePublicDashboard>>,
+		TError,
+		{
+			pathParams: UpdatePublicDashboardPathParameters;
+			data: DashboardtypesUpdatablePublicDashboardDTO;
+		},
+		TContext
+	>;
+}): UseMutationOptions<
+	Awaited<ReturnType<typeof updatePublicDashboard>>,
+	TError,
+	{
+		pathParams: UpdatePublicDashboardPathParameters;
+		data: DashboardtypesUpdatablePublicDashboardDTO;
+	},
+	TContext
+> => {
+	const mutationKey = ['updatePublicDashboard'];
+	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 updatePublicDashboard>>,
+		{
+			pathParams: UpdatePublicDashboardPathParameters;
+			data: DashboardtypesUpdatablePublicDashboardDTO;
+		}
+	> = (props) => {
+		const { pathParams, data } = props ?? {};
+
+		return updatePublicDashboard(pathParams, data);
+	};
+
+	return { mutationFn, ...mutationOptions };
+};
+
+export type UpdatePublicDashboardMutationResult = NonNullable<
+	Awaited<ReturnType<typeof updatePublicDashboard>>
+>;
+export type UpdatePublicDashboardMutationBody = DashboardtypesUpdatablePublicDashboardDTO;
+export type UpdatePublicDashboardMutationError = RenderErrorResponseDTO;
+
+/**
+ * @summary Update public dashboard
+ */
+export const useUpdatePublicDashboard = <
+	TError = RenderErrorResponseDTO,
+	TContext = unknown
+>(options?: {
+	mutation?: UseMutationOptions<
+		Awaited<ReturnType<typeof updatePublicDashboard>>,
+		TError,
+		{
+			pathParams: UpdatePublicDashboardPathParameters;
+			data: DashboardtypesUpdatablePublicDashboardDTO;
+		},
+		TContext
+	>;
+}): UseMutationResult<
+	Awaited<ReturnType<typeof updatePublicDashboard>>,
+	TError,
+	{
+		pathParams: UpdatePublicDashboardPathParameters;
+		data: DashboardtypesUpdatablePublicDashboardDTO;
+	},
+	TContext
+> => {
+	const mutationOptions = getUpdatePublicDashboardMutationOptions(options);
+
+	return useMutation(mutationOptions);
+};
+/**
+ * This endpoints returns the sanitized dashboard data for public access
+ * @summary Get public dashboard data
+ */
+export const getPublicDashboardData = (
+	{ id }: GetPublicDashboardDataPathParameters,
+	signal?: AbortSignal,
+) =>
+	GeneratedAPIInstance<GetPublicDashboardData200>({
+		url: `/api/v1/public/dashboards/${id}`,
+		method: 'GET',
+		signal,
+	});
+
+export const getGetPublicDashboardDataQueryKey = ({
+	id,
+}: GetPublicDashboardDataPathParameters) => ['getPublicDashboardData'] as const;
+
+export const getGetPublicDashboardDataQueryOptions = <
+	TData = Awaited<ReturnType<typeof getPublicDashboardData>>,
+	TError = RenderErrorResponseDTO
+>(
+	{ id }: GetPublicDashboardDataPathParameters,
+	options?: {
+		query?: UseQueryOptions<
+			Awaited<ReturnType<typeof getPublicDashboardData>>,
+			TError,
+			TData
+		>;
+	},
+) => {
+	const { query: queryOptions } = options ?? {};
+
+	const queryKey =
+		queryOptions?.queryKey ?? getGetPublicDashboardDataQueryKey({ id });
+
+	const queryFn: QueryFunction<
+		Awaited<ReturnType<typeof getPublicDashboardData>>
+	> = ({ signal }) => getPublicDashboardData({ id }, signal);
+
+	return {
+		queryKey,
+		queryFn,
+		enabled: !!id,
+		...queryOptions,
+	} as UseQueryOptions<
+		Awaited<ReturnType<typeof getPublicDashboardData>>,
+		TError,
+		TData
+	> & { queryKey: QueryKey };
+};
+
+export type GetPublicDashboardDataQueryResult = NonNullable<
+	Awaited<ReturnType<typeof getPublicDashboardData>>
+>;
+export type GetPublicDashboardDataQueryError = RenderErrorResponseDTO;
+
+/**
+ * @summary Get public dashboard data
+ */
+
+export function useGetPublicDashboardData<
+	TData = Awaited<ReturnType<typeof getPublicDashboardData>>,
+	TError = RenderErrorResponseDTO
+>(
+	{ id }: GetPublicDashboardDataPathParameters,
+	options?: {
+		query?: UseQueryOptions<
+			Awaited<ReturnType<typeof getPublicDashboardData>>,
+			TError,
+			TData
+		>;
+	},
+): UseQueryResult<TData, TError> & { queryKey: QueryKey } {
+	const queryOptions = getGetPublicDashboardDataQueryOptions({ id }, options);
+
+	const query = useQuery(queryOptions) as UseQueryResult<TData, TError> & {
+		queryKey: QueryKey;
+	};
+
+	query.queryKey = queryOptions.queryKey;
+
+	return query;
+}
+
+/**
+ * @summary Get public dashboard data
+ */
+export const invalidateGetPublicDashboardData = async (
+	queryClient: QueryClient,
+	{ id }: GetPublicDashboardDataPathParameters,
+	options?: InvalidateOptions,
+): Promise<QueryClient> => {
+	await queryClient.invalidateQueries(
+		{ queryKey: getGetPublicDashboardDataQueryKey({ id }) },
+		options,
+	);
+
+	return queryClient;
+};
+
+/**
+ * This endpoint return query range results for a widget of public dashboard
+ * @summary Get query range result
+ */
+export const getPublicDashboardWidgetQueryRange = (
+	{ id, idx }: GetPublicDashboardWidgetQueryRangePathParameters,
+	signal?: AbortSignal,
+) =>
+	GeneratedAPIInstance<GetPublicDashboardWidgetQueryRange200>({
+		url: `/api/v1/public/dashboards/${id}/widgets/${idx}/query_range`,
+		method: 'GET',
+		signal,
+	});
+
+export const getGetPublicDashboardWidgetQueryRangeQueryKey = ({
+	id,
+	idx,
+}: GetPublicDashboardWidgetQueryRangePathParameters) =>
+	['getPublicDashboardWidgetQueryRange'] as const;
+
+export const getGetPublicDashboardWidgetQueryRangeQueryOptions = <
+	TData = Awaited<ReturnType<typeof getPublicDashboardWidgetQueryRange>>,
+	TError = RenderErrorResponseDTO
+>(
+	{ id, idx }: GetPublicDashboardWidgetQueryRangePathParameters,
+	options?: {
+		query?: UseQueryOptions<
+			Awaited<ReturnType<typeof getPublicDashboardWidgetQueryRange>>,
+			TError,
+			TData
+		>;
+	},
+) => {
+	const { query: queryOptions } = options ?? {};
+
+	const queryKey =
+		queryOptions?.queryKey ??
+		getGetPublicDashboardWidgetQueryRangeQueryKey({ id, idx });
+
+	const queryFn: QueryFunction<
+		Awaited<ReturnType<typeof getPublicDashboardWidgetQueryRange>>
+	> = ({ signal }) => getPublicDashboardWidgetQueryRange({ id, idx }, signal);
+
+	return {
+		queryKey,
+		queryFn,
+		enabled: !!(id && idx),
+		...queryOptions,
+	} as UseQueryOptions<
+		Awaited<ReturnType<typeof getPublicDashboardWidgetQueryRange>>,
+		TError,
+		TData
+	> & { queryKey: QueryKey };
+};
+
+export type GetPublicDashboardWidgetQueryRangeQueryResult = NonNullable<
+	Awaited<ReturnType<typeof getPublicDashboardWidgetQueryRange>>
+>;
+export type GetPublicDashboardWidgetQueryRangeQueryError = RenderErrorResponseDTO;
+
+/**
+ * @summary Get query range result
+ */
+
+export function useGetPublicDashboardWidgetQueryRange<
+	TData = Awaited<ReturnType<typeof getPublicDashboardWidgetQueryRange>>,
+	TError = RenderErrorResponseDTO
+>(
+	{ id, idx }: GetPublicDashboardWidgetQueryRangePathParameters,
+	options?: {
+		query?: UseQueryOptions<
+			Awaited<ReturnType<typeof getPublicDashboardWidgetQueryRange>>,
+			TError,
+			TData
+		>;
+	},
+): UseQueryResult<TData, TError> & { queryKey: QueryKey } {
+	const queryOptions = getGetPublicDashboardWidgetQueryRangeQueryOptions(
+		{ id, idx },
+		options,
+	);
+
+	const query = useQuery(queryOptions) as UseQueryResult<TData, TError> & {
+		queryKey: QueryKey;
+	};
+
+	query.queryKey = queryOptions.queryKey;
+
+	return query;
+}
+
+/**
+ * @summary Get query range result
+ */
+export const invalidateGetPublicDashboardWidgetQueryRange = async (
+	queryClient: QueryClient,
+	{ id, idx }: GetPublicDashboardWidgetQueryRangePathParameters,
+	options?: InvalidateOptions,
+): Promise<QueryClient> => {
+	await queryClient.invalidateQueries(
+		{ queryKey: getGetPublicDashboardWidgetQueryRangeQueryKey({ id, idx }) },
+		options,
+	);
+
+	return queryClient;
+};

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

@@ -0,0 +1,105 @@
+/**
+ * ! Do not edit manually
+ * * The file has been auto-generated using Orval for SigNoz
+ * * regenerate with 'yarn generate:api'
+ * SigNoz
+ */
+import type {
+	InvalidateOptions,
+	QueryClient,
+	QueryFunction,
+	QueryKey,
+	UseQueryOptions,
+	UseQueryResult,
+} from 'react-query';
+import { useQuery } from 'react-query';
+
+import { GeneratedAPIInstance } from '../../../index';
+import type { GetFeatures200, RenderErrorResponseDTO } from '../sigNoz.schemas';
+
+type AwaitedInput<T> = PromiseLike<T> | T;
+
+type Awaited<O> = O extends AwaitedInput<infer T> ? T : never;
+
+/**
+ * This endpoint returns the supported features and their details
+ * @summary Get features
+ */
+export const getFeatures = (signal?: AbortSignal) =>
+	GeneratedAPIInstance<GetFeatures200>({
+		url: `/api/v2/features`,
+		method: 'GET',
+		signal,
+	});
+
+export const getGetFeaturesQueryKey = () => ['getFeatures'] as const;
+
+export const getGetFeaturesQueryOptions = <
+	TData = Awaited<ReturnType<typeof getFeatures>>,
+	TError = RenderErrorResponseDTO
+>(options?: {
+	query?: UseQueryOptions<
+		Awaited<ReturnType<typeof getFeatures>>,
+		TError,
+		TData
+	>;
+}) => {
+	const { query: queryOptions } = options ?? {};
+
+	const queryKey = queryOptions?.queryKey ?? getGetFeaturesQueryKey();
+
+	const queryFn: QueryFunction<Awaited<ReturnType<typeof getFeatures>>> = ({
+		signal,
+	}) => getFeatures(signal);
+
+	return { queryKey, queryFn, ...queryOptions } as UseQueryOptions<
+		Awaited<ReturnType<typeof getFeatures>>,
+		TError,
+		TData
+	> & { queryKey: QueryKey };
+};
+
+export type GetFeaturesQueryResult = NonNullable<
+	Awaited<ReturnType<typeof getFeatures>>
+>;
+export type GetFeaturesQueryError = RenderErrorResponseDTO;
+
+/**
+ * @summary Get features
+ */
+
+export function useGetFeatures<
+	TData = Awaited<ReturnType<typeof getFeatures>>,
+	TError = RenderErrorResponseDTO
+>(options?: {
+	query?: UseQueryOptions<
+		Awaited<ReturnType<typeof getFeatures>>,
+		TError,
+		TData
+	>;
+}): UseQueryResult<TData, TError> & { queryKey: QueryKey } {
+	const queryOptions = getGetFeaturesQueryOptions(options);
+
+	const query = useQuery(queryOptions) as UseQueryResult<TData, TError> & {
+		queryKey: QueryKey;
+	};
+
+	query.queryKey = queryOptions.queryKey;
+
+	return query;
+}
+
+/**
+ * @summary Get features
+ */
+export const invalidateGetFeatures = async (
+	queryClient: QueryClient,
+	options?: InvalidateOptions,
+): Promise<QueryClient> => {
+	await queryClient.invalidateQueries(
+		{ queryKey: getGetFeaturesQueryKey() },
+		options,
+	);
+
+	return queryClient;
+};

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

@@ -0,0 +1,734 @@
+/**
+ * ! Do not edit manually
+ * * The file has been auto-generated using Orval for SigNoz
+ * * regenerate with 'yarn generate:api'
+ * SigNoz
+ */
+import type {
+	InvalidateOptions,
+	MutationFunction,
+	QueryClient,
+	QueryFunction,
+	QueryKey,
+	UseMutationOptions,
+	UseMutationResult,
+	UseQueryOptions,
+	UseQueryResult,
+} from 'react-query';
+import { useMutation, useQuery } from 'react-query';
+
+import { GeneratedAPIInstance } from '../../../index';
+import type {
+	CreateIngestionKey200,
+	CreateIngestionKeyLimit201,
+	CreateIngestionKeyLimitPathParameters,
+	DeleteIngestionKeyLimitPathParameters,
+	DeleteIngestionKeyPathParameters,
+	GatewaytypesPostableIngestionKeyDTO,
+	GatewaytypesPostableIngestionKeyLimitDTO,
+	GatewaytypesUpdatableIngestionKeyLimitDTO,
+	GetIngestionKeys200,
+	RenderErrorResponseDTO,
+	SearchIngestionKeys200,
+	UpdateIngestionKeyLimitPathParameters,
+	UpdateIngestionKeyPathParameters,
+} from '../sigNoz.schemas';
+
+type AwaitedInput<T> = PromiseLike<T> | T;
+
+type Awaited<O> = O extends AwaitedInput<infer T> ? T : never;
+
+/**
+ * This endpoint returns the ingestion keys for a workspace
+ * @summary Get ingestion keys for workspace
+ */
+export const getIngestionKeys = (signal?: AbortSignal) =>
+	GeneratedAPIInstance<GetIngestionKeys200>({
+		url: `/api/v2/gateway/ingestion_keys`,
+		method: 'GET',
+		signal,
+	});
+
+export const getGetIngestionKeysQueryKey = () => ['getIngestionKeys'] as const;
+
+export const getGetIngestionKeysQueryOptions = <
+	TData = Awaited<ReturnType<typeof getIngestionKeys>>,
+	TError = RenderErrorResponseDTO
+>(options?: {
+	query?: UseQueryOptions<
+		Awaited<ReturnType<typeof getIngestionKeys>>,
+		TError,
+		TData
+	>;
+}) => {
+	const { query: queryOptions } = options ?? {};
+
+	const queryKey = queryOptions?.queryKey ?? getGetIngestionKeysQueryKey();
+
+	const queryFn: QueryFunction<Awaited<ReturnType<typeof getIngestionKeys>>> = ({
+		signal,
+	}) => getIngestionKeys(signal);
+
+	return { queryKey, queryFn, ...queryOptions } as UseQueryOptions<
+		Awaited<ReturnType<typeof getIngestionKeys>>,
+		TError,
+		TData
+	> & { queryKey: QueryKey };
+};
+
+export type GetIngestionKeysQueryResult = NonNullable<
+	Awaited<ReturnType<typeof getIngestionKeys>>
+>;
+export type GetIngestionKeysQueryError = RenderErrorResponseDTO;
+
+/**
+ * @summary Get ingestion keys for workspace
+ */
+
+export function useGetIngestionKeys<
+	TData = Awaited<ReturnType<typeof getIngestionKeys>>,
+	TError = RenderErrorResponseDTO
+>(options?: {
+	query?: UseQueryOptions<
+		Awaited<ReturnType<typeof getIngestionKeys>>,
+		TError,
+		TData
+	>;
+}): UseQueryResult<TData, TError> & { queryKey: QueryKey } {
+	const queryOptions = getGetIngestionKeysQueryOptions(options);
+
+	const query = useQuery(queryOptions) as UseQueryResult<TData, TError> & {
+		queryKey: QueryKey;
+	};
+
+	query.queryKey = queryOptions.queryKey;
+
+	return query;
+}
+
+/**
+ * @summary Get ingestion keys for workspace
+ */
+export const invalidateGetIngestionKeys = async (
+	queryClient: QueryClient,
+	options?: InvalidateOptions,
+): Promise<QueryClient> => {
+	await queryClient.invalidateQueries(
+		{ queryKey: getGetIngestionKeysQueryKey() },
+		options,
+	);
+
+	return queryClient;
+};
+
+/**
+ * This endpoint creates an ingestion key for the workspace
+ * @summary Create ingestion key for workspace
+ */
+export const createIngestionKey = (
+	gatewaytypesPostableIngestionKeyDTO: GatewaytypesPostableIngestionKeyDTO,
+	signal?: AbortSignal,
+) =>
+	GeneratedAPIInstance<CreateIngestionKey200>({
+		url: `/api/v2/gateway/ingestion_keys`,
+		method: 'POST',
+		headers: { 'Content-Type': 'application/json' },
+		data: gatewaytypesPostableIngestionKeyDTO,
+		signal,
+	});
+
+export const getCreateIngestionKeyMutationOptions = <
+	TError = RenderErrorResponseDTO,
+	TContext = unknown
+>(options?: {
+	mutation?: UseMutationOptions<
+		Awaited<ReturnType<typeof createIngestionKey>>,
+		TError,
+		{ data: GatewaytypesPostableIngestionKeyDTO },
+		TContext
+	>;
+}): UseMutationOptions<
+	Awaited<ReturnType<typeof createIngestionKey>>,
+	TError,
+	{ data: GatewaytypesPostableIngestionKeyDTO },
+	TContext
+> => {
+	const mutationKey = ['createIngestionKey'];
+	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 createIngestionKey>>,
+		{ data: GatewaytypesPostableIngestionKeyDTO }
+	> = (props) => {
+		const { data } = props ?? {};
+
+		return createIngestionKey(data);
+	};
+
+	return { mutationFn, ...mutationOptions };
+};
+
+export type CreateIngestionKeyMutationResult = NonNullable<
+	Awaited<ReturnType<typeof createIngestionKey>>
+>;
+export type CreateIngestionKeyMutationBody = GatewaytypesPostableIngestionKeyDTO;
+export type CreateIngestionKeyMutationError = RenderErrorResponseDTO;
+
+/**
+ * @summary Create ingestion key for workspace
+ */
+export const useCreateIngestionKey = <
+	TError = RenderErrorResponseDTO,
+	TContext = unknown
+>(options?: {
+	mutation?: UseMutationOptions<
+		Awaited<ReturnType<typeof createIngestionKey>>,
+		TError,
+		{ data: GatewaytypesPostableIngestionKeyDTO },
+		TContext
+	>;
+}): UseMutationResult<
+	Awaited<ReturnType<typeof createIngestionKey>>,
+	TError,
+	{ data: GatewaytypesPostableIngestionKeyDTO },
+	TContext
+> => {
+	const mutationOptions = getCreateIngestionKeyMutationOptions(options);
+
+	return useMutation(mutationOptions);
+};
+/**
+ * This endpoint deletes an ingestion key for the workspace
+ * @summary Delete ingestion key for workspace
+ */
+export const deleteIngestionKey = ({
+	keyId,
+}: DeleteIngestionKeyPathParameters) =>
+	GeneratedAPIInstance<void>({
+		url: `/api/v2/gateway/ingestion_keys/${keyId}`,
+		method: 'DELETE',
+	});
+
+export const getDeleteIngestionKeyMutationOptions = <
+	TError = RenderErrorResponseDTO,
+	TContext = unknown
+>(options?: {
+	mutation?: UseMutationOptions<
+		Awaited<ReturnType<typeof deleteIngestionKey>>,
+		TError,
+		{ pathParams: DeleteIngestionKeyPathParameters },
+		TContext
+	>;
+}): UseMutationOptions<
+	Awaited<ReturnType<typeof deleteIngestionKey>>,
+	TError,
+	{ pathParams: DeleteIngestionKeyPathParameters },
+	TContext
+> => {
+	const mutationKey = ['deleteIngestionKey'];
+	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 deleteIngestionKey>>,
+		{ pathParams: DeleteIngestionKeyPathParameters }
+	> = (props) => {
+		const { pathParams } = props ?? {};
+
+		return deleteIngestionKey(pathParams);
+	};
+
+	return { mutationFn, ...mutationOptions };
+};
+
+export type DeleteIngestionKeyMutationResult = NonNullable<
+	Awaited<ReturnType<typeof deleteIngestionKey>>
+>;
+
+export type DeleteIngestionKeyMutationError = RenderErrorResponseDTO;
+
+/**
+ * @summary Delete ingestion key for workspace
+ */
+export const useDeleteIngestionKey = <
+	TError = RenderErrorResponseDTO,
+	TContext = unknown
+>(options?: {
+	mutation?: UseMutationOptions<
+		Awaited<ReturnType<typeof deleteIngestionKey>>,
+		TError,
+		{ pathParams: DeleteIngestionKeyPathParameters },
+		TContext
+	>;
+}): UseMutationResult<
+	Awaited<ReturnType<typeof deleteIngestionKey>>,
+	TError,
+	{ pathParams: DeleteIngestionKeyPathParameters },
+	TContext
+> => {
+	const mutationOptions = getDeleteIngestionKeyMutationOptions(options);
+
+	return useMutation(mutationOptions);
+};
+/**
+ * This endpoint updates an ingestion key for the workspace
+ * @summary Update ingestion key for workspace
+ */
+export const updateIngestionKey = (
+	{ keyId }: UpdateIngestionKeyPathParameters,
+	gatewaytypesPostableIngestionKeyDTO: GatewaytypesPostableIngestionKeyDTO,
+) =>
+	GeneratedAPIInstance<void>({
+		url: `/api/v2/gateway/ingestion_keys/${keyId}`,
+		method: 'PATCH',
+		headers: { 'Content-Type': 'application/json' },
+		data: gatewaytypesPostableIngestionKeyDTO,
+	});
+
+export const getUpdateIngestionKeyMutationOptions = <
+	TError = RenderErrorResponseDTO,
+	TContext = unknown
+>(options?: {
+	mutation?: UseMutationOptions<
+		Awaited<ReturnType<typeof updateIngestionKey>>,
+		TError,
+		{
+			pathParams: UpdateIngestionKeyPathParameters;
+			data: GatewaytypesPostableIngestionKeyDTO;
+		},
+		TContext
+	>;
+}): UseMutationOptions<
+	Awaited<ReturnType<typeof updateIngestionKey>>,
+	TError,
+	{
+		pathParams: UpdateIngestionKeyPathParameters;
+		data: GatewaytypesPostableIngestionKeyDTO;
+	},
+	TContext
+> => {
+	const mutationKey = ['updateIngestionKey'];
+	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 updateIngestionKey>>,
+		{
+			pathParams: UpdateIngestionKeyPathParameters;
+			data: GatewaytypesPostableIngestionKeyDTO;
+		}
+	> = (props) => {
+		const { pathParams, data } = props ?? {};
+
+		return updateIngestionKey(pathParams, data);
+	};
+
+	return { mutationFn, ...mutationOptions };
+};
+
+export type UpdateIngestionKeyMutationResult = NonNullable<
+	Awaited<ReturnType<typeof updateIngestionKey>>
+>;
+export type UpdateIngestionKeyMutationBody = GatewaytypesPostableIngestionKeyDTO;
+export type UpdateIngestionKeyMutationError = RenderErrorResponseDTO;
+
+/**
+ * @summary Update ingestion key for workspace
+ */
+export const useUpdateIngestionKey = <
+	TError = RenderErrorResponseDTO,
+	TContext = unknown
+>(options?: {
+	mutation?: UseMutationOptions<
+		Awaited<ReturnType<typeof updateIngestionKey>>,
+		TError,
+		{
+			pathParams: UpdateIngestionKeyPathParameters;
+			data: GatewaytypesPostableIngestionKeyDTO;
+		},
+		TContext
+	>;
+}): UseMutationResult<
+	Awaited<ReturnType<typeof updateIngestionKey>>,
+	TError,
+	{
+		pathParams: UpdateIngestionKeyPathParameters;
+		data: GatewaytypesPostableIngestionKeyDTO;
+	},
+	TContext
+> => {
+	const mutationOptions = getUpdateIngestionKeyMutationOptions(options);
+
+	return useMutation(mutationOptions);
+};
+/**
+ * This endpoint creates an ingestion key limit
+ * @summary Create limit for the ingestion key
+ */
+export const createIngestionKeyLimit = (
+	{ keyId }: CreateIngestionKeyLimitPathParameters,
+	gatewaytypesPostableIngestionKeyLimitDTO: GatewaytypesPostableIngestionKeyLimitDTO,
+	signal?: AbortSignal,
+) =>
+	GeneratedAPIInstance<CreateIngestionKeyLimit201>({
+		url: `/api/v2/gateway/ingestion_keys/${keyId}/limits`,
+		method: 'POST',
+		headers: { 'Content-Type': 'application/json' },
+		data: gatewaytypesPostableIngestionKeyLimitDTO,
+		signal,
+	});
+
+export const getCreateIngestionKeyLimitMutationOptions = <
+	TError = RenderErrorResponseDTO,
+	TContext = unknown
+>(options?: {
+	mutation?: UseMutationOptions<
+		Awaited<ReturnType<typeof createIngestionKeyLimit>>,
+		TError,
+		{
+			pathParams: CreateIngestionKeyLimitPathParameters;
+			data: GatewaytypesPostableIngestionKeyLimitDTO;
+		},
+		TContext
+	>;
+}): UseMutationOptions<
+	Awaited<ReturnType<typeof createIngestionKeyLimit>>,
+	TError,
+	{
+		pathParams: CreateIngestionKeyLimitPathParameters;
+		data: GatewaytypesPostableIngestionKeyLimitDTO;
+	},
+	TContext
+> => {
+	const mutationKey = ['createIngestionKeyLimit'];
+	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 createIngestionKeyLimit>>,
+		{
+			pathParams: CreateIngestionKeyLimitPathParameters;
+			data: GatewaytypesPostableIngestionKeyLimitDTO;
+		}
+	> = (props) => {
+		const { pathParams, data } = props ?? {};
+
+		return createIngestionKeyLimit(pathParams, data);
+	};
+
+	return { mutationFn, ...mutationOptions };
+};
+
+export type CreateIngestionKeyLimitMutationResult = NonNullable<
+	Awaited<ReturnType<typeof createIngestionKeyLimit>>
+>;
+export type CreateIngestionKeyLimitMutationBody = GatewaytypesPostableIngestionKeyLimitDTO;
+export type CreateIngestionKeyLimitMutationError = RenderErrorResponseDTO;
+
+/**
+ * @summary Create limit for the ingestion key
+ */
+export const useCreateIngestionKeyLimit = <
+	TError = RenderErrorResponseDTO,
+	TContext = unknown
+>(options?: {
+	mutation?: UseMutationOptions<
+		Awaited<ReturnType<typeof createIngestionKeyLimit>>,
+		TError,
+		{
+			pathParams: CreateIngestionKeyLimitPathParameters;
+			data: GatewaytypesPostableIngestionKeyLimitDTO;
+		},
+		TContext
+	>;
+}): UseMutationResult<
+	Awaited<ReturnType<typeof createIngestionKeyLimit>>,
+	TError,
+	{
+		pathParams: CreateIngestionKeyLimitPathParameters;
+		data: GatewaytypesPostableIngestionKeyLimitDTO;
+	},
+	TContext
+> => {
+	const mutationOptions = getCreateIngestionKeyLimitMutationOptions(options);
+
+	return useMutation(mutationOptions);
+};
+/**
+ * This endpoint deletes an ingestion key limit
+ * @summary Delete limit for the ingestion key
+ */
+export const deleteIngestionKeyLimit = ({
+	limitId,
+}: DeleteIngestionKeyLimitPathParameters) =>
+	GeneratedAPIInstance<void>({
+		url: `/api/v2/gateway/ingestion_keys/limits/${limitId}`,
+		method: 'DELETE',
+	});
+
+export const getDeleteIngestionKeyLimitMutationOptions = <
+	TError = RenderErrorResponseDTO,
+	TContext = unknown
+>(options?: {
+	mutation?: UseMutationOptions<
+		Awaited<ReturnType<typeof deleteIngestionKeyLimit>>,
+		TError,
+		{ pathParams: DeleteIngestionKeyLimitPathParameters },
+		TContext
+	>;
+}): UseMutationOptions<
+	Awaited<ReturnType<typeof deleteIngestionKeyLimit>>,
+	TError,
+	{ pathParams: DeleteIngestionKeyLimitPathParameters },
+	TContext
+> => {
+	const mutationKey = ['deleteIngestionKeyLimit'];
+	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 deleteIngestionKeyLimit>>,
+		{ pathParams: DeleteIngestionKeyLimitPathParameters }
+	> = (props) => {
+		const { pathParams } = props ?? {};
+
+		return deleteIngestionKeyLimit(pathParams);
+	};
+
+	return { mutationFn, ...mutationOptions };
+};
+
+export type DeleteIngestionKeyLimitMutationResult = NonNullable<
+	Awaited<ReturnType<typeof deleteIngestionKeyLimit>>
+>;
+
+export type DeleteIngestionKeyLimitMutationError = RenderErrorResponseDTO;
+
+/**
+ * @summary Delete limit for the ingestion key
+ */
+export const useDeleteIngestionKeyLimit = <
+	TError = RenderErrorResponseDTO,
+	TContext = unknown
+>(options?: {
+	mutation?: UseMutationOptions<
+		Awaited<ReturnType<typeof deleteIngestionKeyLimit>>,
+		TError,
+		{ pathParams: DeleteIngestionKeyLimitPathParameters },
+		TContext
+	>;
+}): UseMutationResult<
+	Awaited<ReturnType<typeof deleteIngestionKeyLimit>>,
+	TError,
+	{ pathParams: DeleteIngestionKeyLimitPathParameters },
+	TContext
+> => {
+	const mutationOptions = getDeleteIngestionKeyLimitMutationOptions(options);
+
+	return useMutation(mutationOptions);
+};
+/**
+ * This endpoint updates an ingestion key limit
+ * @summary Update limit for the ingestion key
+ */
+export const updateIngestionKeyLimit = (
+	{ limitId }: UpdateIngestionKeyLimitPathParameters,
+	gatewaytypesUpdatableIngestionKeyLimitDTO: GatewaytypesUpdatableIngestionKeyLimitDTO,
+) =>
+	GeneratedAPIInstance<void>({
+		url: `/api/v2/gateway/ingestion_keys/limits/${limitId}`,
+		method: 'PATCH',
+		headers: { 'Content-Type': 'application/json' },
+		data: gatewaytypesUpdatableIngestionKeyLimitDTO,
+	});
+
+export const getUpdateIngestionKeyLimitMutationOptions = <
+	TError = RenderErrorResponseDTO,
+	TContext = unknown
+>(options?: {
+	mutation?: UseMutationOptions<
+		Awaited<ReturnType<typeof updateIngestionKeyLimit>>,
+		TError,
+		{
+			pathParams: UpdateIngestionKeyLimitPathParameters;
+			data: GatewaytypesUpdatableIngestionKeyLimitDTO;
+		},
+		TContext
+	>;
+}): UseMutationOptions<
+	Awaited<ReturnType<typeof updateIngestionKeyLimit>>,
+	TError,
+	{
+		pathParams: UpdateIngestionKeyLimitPathParameters;
+		data: GatewaytypesUpdatableIngestionKeyLimitDTO;
+	},
+	TContext
+> => {
+	const mutationKey = ['updateIngestionKeyLimit'];
+	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 updateIngestionKeyLimit>>,
+		{
+			pathParams: UpdateIngestionKeyLimitPathParameters;
+			data: GatewaytypesUpdatableIngestionKeyLimitDTO;
+		}
+	> = (props) => {
+		const { pathParams, data } = props ?? {};
+
+		return updateIngestionKeyLimit(pathParams, data);
+	};
+
+	return { mutationFn, ...mutationOptions };
+};
+
+export type UpdateIngestionKeyLimitMutationResult = NonNullable<
+	Awaited<ReturnType<typeof updateIngestionKeyLimit>>
+>;
+export type UpdateIngestionKeyLimitMutationBody = GatewaytypesUpdatableIngestionKeyLimitDTO;
+export type UpdateIngestionKeyLimitMutationError = RenderErrorResponseDTO;
+
+/**
+ * @summary Update limit for the ingestion key
+ */
+export const useUpdateIngestionKeyLimit = <
+	TError = RenderErrorResponseDTO,
+	TContext = unknown
+>(options?: {
+	mutation?: UseMutationOptions<
+		Awaited<ReturnType<typeof updateIngestionKeyLimit>>,
+		TError,
+		{
+			pathParams: UpdateIngestionKeyLimitPathParameters;
+			data: GatewaytypesUpdatableIngestionKeyLimitDTO;
+		},
+		TContext
+	>;
+}): UseMutationResult<
+	Awaited<ReturnType<typeof updateIngestionKeyLimit>>,
+	TError,
+	{
+		pathParams: UpdateIngestionKeyLimitPathParameters;
+		data: GatewaytypesUpdatableIngestionKeyLimitDTO;
+	},
+	TContext
+> => {
+	const mutationOptions = getUpdateIngestionKeyLimitMutationOptions(options);
+
+	return useMutation(mutationOptions);
+};
+/**
+ * This endpoint returns the ingestion keys for a workspace
+ * @summary Search ingestion keys for workspace
+ */
+export const searchIngestionKeys = (signal?: AbortSignal) =>
+	GeneratedAPIInstance<SearchIngestionKeys200>({
+		url: `/api/v2/gateway/ingestion_keys/search`,
+		method: 'GET',
+		signal,
+	});
+
+export const getSearchIngestionKeysQueryKey = () =>
+	['searchIngestionKeys'] as const;
+
+export const getSearchIngestionKeysQueryOptions = <
+	TData = Awaited<ReturnType<typeof searchIngestionKeys>>,
+	TError = RenderErrorResponseDTO
+>(options?: {
+	query?: UseQueryOptions<
+		Awaited<ReturnType<typeof searchIngestionKeys>>,
+		TError,
+		TData
+	>;
+}) => {
+	const { query: queryOptions } = options ?? {};
+
+	const queryKey = queryOptions?.queryKey ?? getSearchIngestionKeysQueryKey();
+
+	const queryFn: QueryFunction<
+		Awaited<ReturnType<typeof searchIngestionKeys>>
+	> = ({ signal }) => searchIngestionKeys(signal);
+
+	return { queryKey, queryFn, ...queryOptions } as UseQueryOptions<
+		Awaited<ReturnType<typeof searchIngestionKeys>>,
+		TError,
+		TData
+	> & { queryKey: QueryKey };
+};
+
+export type SearchIngestionKeysQueryResult = NonNullable<
+	Awaited<ReturnType<typeof searchIngestionKeys>>
+>;
+export type SearchIngestionKeysQueryError = RenderErrorResponseDTO;
+
+/**
+ * @summary Search ingestion keys for workspace
+ */
+
+export function useSearchIngestionKeys<
+	TData = Awaited<ReturnType<typeof searchIngestionKeys>>,
+	TError = RenderErrorResponseDTO
+>(options?: {
+	query?: UseQueryOptions<
+		Awaited<ReturnType<typeof searchIngestionKeys>>,
+		TError,
+		TData
+	>;
+}): UseQueryResult<TData, TError> & { queryKey: QueryKey } {
+	const queryOptions = getSearchIngestionKeysQueryOptions(options);
+
+	const query = useQuery(queryOptions) as UseQueryResult<TData, TError> & {
+		queryKey: QueryKey;
+	};
+
+	query.queryKey = queryOptions.queryKey;
+
+	return query;
+}
+
+/**
+ * @summary Search ingestion keys for workspace
+ */
+export const invalidateSearchIngestionKeys = async (
+	queryClient: QueryClient,
+	options?: InvalidateOptions,
+): Promise<QueryClient> => {
+	await queryClient.invalidateQueries(
+		{ queryKey: getSearchIngestionKeysQueryKey() },
+		options,
+	);
+
+	return queryClient;
+};

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

@@ -0,0 +1,108 @@
+/**
+ * ! Do not edit manually
+ * * The file has been auto-generated using Orval for SigNoz
+ * * regenerate with 'yarn generate:api'
+ * SigNoz
+ */
+import type {
+	InvalidateOptions,
+	QueryClient,
+	QueryFunction,
+	QueryKey,
+	UseQueryOptions,
+	UseQueryResult,
+} from 'react-query';
+import { useQuery } from 'react-query';
+
+import { GeneratedAPIInstance } from '../../../index';
+import type {
+	GetGlobalConfig200,
+	RenderErrorResponseDTO,
+} from '../sigNoz.schemas';
+
+type AwaitedInput<T> = PromiseLike<T> | T;
+
+type Awaited<O> = O extends AwaitedInput<infer T> ? T : never;
+
+/**
+ * This endpoints returns global config
+ * @summary Get global config
+ */
+export const getGlobalConfig = (signal?: AbortSignal) =>
+	GeneratedAPIInstance<GetGlobalConfig200>({
+		url: `/api/v1/global/config`,
+		method: 'GET',
+		signal,
+	});
+
+export const getGetGlobalConfigQueryKey = () => ['getGlobalConfig'] as const;
+
+export const getGetGlobalConfigQueryOptions = <
+	TData = Awaited<ReturnType<typeof getGlobalConfig>>,
+	TError = RenderErrorResponseDTO
+>(options?: {
+	query?: UseQueryOptions<
+		Awaited<ReturnType<typeof getGlobalConfig>>,
+		TError,
+		TData
+	>;
+}) => {
+	const { query: queryOptions } = options ?? {};
+
+	const queryKey = queryOptions?.queryKey ?? getGetGlobalConfigQueryKey();
+
+	const queryFn: QueryFunction<Awaited<ReturnType<typeof getGlobalConfig>>> = ({
+		signal,
+	}) => getGlobalConfig(signal);
+
+	return { queryKey, queryFn, ...queryOptions } as UseQueryOptions<
+		Awaited<ReturnType<typeof getGlobalConfig>>,
+		TError,
+		TData
+	> & { queryKey: QueryKey };
+};
+
+export type GetGlobalConfigQueryResult = NonNullable<
+	Awaited<ReturnType<typeof getGlobalConfig>>
+>;
+export type GetGlobalConfigQueryError = RenderErrorResponseDTO;
+
+/**
+ * @summary Get global config
+ */
+
+export function useGetGlobalConfig<
+	TData = Awaited<ReturnType<typeof getGlobalConfig>>,
+	TError = RenderErrorResponseDTO
+>(options?: {
+	query?: UseQueryOptions<
+		Awaited<ReturnType<typeof getGlobalConfig>>,
+		TError,
+		TData
+	>;
+}): UseQueryResult<TData, TError> & { queryKey: QueryKey } {
+	const queryOptions = getGetGlobalConfigQueryOptions(options);
+
+	const query = useQuery(queryOptions) as UseQueryResult<TData, TError> & {
+		queryKey: QueryKey;
+	};
+
+	query.queryKey = queryOptions.queryKey;
+
+	return query;
+}
+
+/**
+ * @summary Get global config
+ */
+export const invalidateGetGlobalConfig = async (
+	queryClient: QueryClient,
+	options?: InvalidateOptions,
+): Promise<QueryClient> => {
+	await queryClient.invalidateQueries(
+		{ queryKey: getGetGlobalConfigQueryKey() },
+		options,
+	);
+
+	return queryClient;
+};

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

@@ -0,0 +1,199 @@
+/**
+ * ! Do not edit manually
+ * * The file has been auto-generated using Orval for SigNoz
+ * * regenerate with 'yarn generate:api'
+ * SigNoz
+ */
+import type {
+	InvalidateOptions,
+	MutationFunction,
+	QueryClient,
+	QueryFunction,
+	QueryKey,
+	UseMutationOptions,
+	UseMutationResult,
+	UseQueryOptions,
+	UseQueryResult,
+} from 'react-query';
+import { useMutation, useQuery } from 'react-query';
+
+import { GeneratedAPIInstance } from '../../../index';
+import type {
+	ListPromotedAndIndexedPaths200,
+	PromotetypesPromotePathDTO,
+	RenderErrorResponseDTO,
+} from '../sigNoz.schemas';
+
+type AwaitedInput<T> = PromiseLike<T> | T;
+
+type Awaited<O> = O extends AwaitedInput<infer T> ? T : never;
+
+/**
+ * This endpoints promotes and indexes paths
+ * @summary Promote and index paths
+ */
+export const listPromotedAndIndexedPaths = (signal?: AbortSignal) =>
+	GeneratedAPIInstance<ListPromotedAndIndexedPaths200>({
+		url: `/api/v1/logs/promote_paths`,
+		method: 'GET',
+		signal,
+	});
+
+export const getListPromotedAndIndexedPathsQueryKey = () =>
+	['listPromotedAndIndexedPaths'] as const;
+
+export const getListPromotedAndIndexedPathsQueryOptions = <
+	TData = Awaited<ReturnType<typeof listPromotedAndIndexedPaths>>,
+	TError = RenderErrorResponseDTO
+>(options?: {
+	query?: UseQueryOptions<
+		Awaited<ReturnType<typeof listPromotedAndIndexedPaths>>,
+		TError,
+		TData
+	>;
+}) => {
+	const { query: queryOptions } = options ?? {};
+
+	const queryKey =
+		queryOptions?.queryKey ?? getListPromotedAndIndexedPathsQueryKey();
+
+	const queryFn: QueryFunction<
+		Awaited<ReturnType<typeof listPromotedAndIndexedPaths>>
+	> = ({ signal }) => listPromotedAndIndexedPaths(signal);
+
+	return { queryKey, queryFn, ...queryOptions } as UseQueryOptions<
+		Awaited<ReturnType<typeof listPromotedAndIndexedPaths>>,
+		TError,
+		TData
+	> & { queryKey: QueryKey };
+};
+
+export type ListPromotedAndIndexedPathsQueryResult = NonNullable<
+	Awaited<ReturnType<typeof listPromotedAndIndexedPaths>>
+>;
+export type ListPromotedAndIndexedPathsQueryError = RenderErrorResponseDTO;
+
+/**
+ * @summary Promote and index paths
+ */
+
+export function useListPromotedAndIndexedPaths<
+	TData = Awaited<ReturnType<typeof listPromotedAndIndexedPaths>>,
+	TError = RenderErrorResponseDTO
+>(options?: {
+	query?: UseQueryOptions<
+		Awaited<ReturnType<typeof listPromotedAndIndexedPaths>>,
+		TError,
+		TData
+	>;
+}): UseQueryResult<TData, TError> & { queryKey: QueryKey } {
+	const queryOptions = getListPromotedAndIndexedPathsQueryOptions(options);
+
+	const query = useQuery(queryOptions) as UseQueryResult<TData, TError> & {
+		queryKey: QueryKey;
+	};
+
+	query.queryKey = queryOptions.queryKey;
+
+	return query;
+}
+
+/**
+ * @summary Promote and index paths
+ */
+export const invalidateListPromotedAndIndexedPaths = async (
+	queryClient: QueryClient,
+	options?: InvalidateOptions,
+): Promise<QueryClient> => {
+	await queryClient.invalidateQueries(
+		{ queryKey: getListPromotedAndIndexedPathsQueryKey() },
+		options,
+	);
+
+	return queryClient;
+};
+
+/**
+ * This endpoints promotes and indexes paths
+ * @summary Promote and index paths
+ */
+export const handlePromoteAndIndexPaths = (
+	promotetypesPromotePathDTONull: PromotetypesPromotePathDTO[] | null,
+	signal?: AbortSignal,
+) =>
+	GeneratedAPIInstance<void>({
+		url: `/api/v1/logs/promote_paths`,
+		method: 'POST',
+		headers: { 'Content-Type': 'application/json' },
+		data: promotetypesPromotePathDTONull,
+		signal,
+	});
+
+export const getHandlePromoteAndIndexPathsMutationOptions = <
+	TError = RenderErrorResponseDTO,
+	TContext = unknown
+>(options?: {
+	mutation?: UseMutationOptions<
+		Awaited<ReturnType<typeof handlePromoteAndIndexPaths>>,
+		TError,
+		{ data: PromotetypesPromotePathDTO[] | null },
+		TContext
+	>;
+}): UseMutationOptions<
+	Awaited<ReturnType<typeof handlePromoteAndIndexPaths>>,
+	TError,
+	{ data: PromotetypesPromotePathDTO[] | null },
+	TContext
+> => {
+	const mutationKey = ['handlePromoteAndIndexPaths'];
+	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 handlePromoteAndIndexPaths>>,
+		{ data: PromotetypesPromotePathDTO[] | null }
+	> = (props) => {
+		const { data } = props ?? {};
+
+		return handlePromoteAndIndexPaths(data);
+	};
+
+	return { mutationFn, ...mutationOptions };
+};
+
+export type HandlePromoteAndIndexPathsMutationResult = NonNullable<
+	Awaited<ReturnType<typeof handlePromoteAndIndexPaths>>
+>;
+export type HandlePromoteAndIndexPathsMutationBody =
+	| PromotetypesPromotePathDTO[]
+	| null;
+export type HandlePromoteAndIndexPathsMutationError = RenderErrorResponseDTO;
+
+/**
+ * @summary Promote and index paths
+ */
+export const useHandlePromoteAndIndexPaths = <
+	TError = RenderErrorResponseDTO,
+	TContext = unknown
+>(options?: {
+	mutation?: UseMutationOptions<
+		Awaited<ReturnType<typeof handlePromoteAndIndexPaths>>,
+		TError,
+		{ data: PromotetypesPromotePathDTO[] | null },
+		TContext
+	>;
+}): UseMutationResult<
+	Awaited<ReturnType<typeof handlePromoteAndIndexPaths>>,
+	TError,
+	{ data: PromotetypesPromotePathDTO[] | null },
+	TContext
+> => {
+	const mutationOptions = getHandlePromoteAndIndexPathsMutationOptions(options);
+
+	return useMutation(mutationOptions);
+};

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

@@ -0,0 +1,719 @@
+/**
+ * ! Do not edit manually
+ * * The file has been auto-generated using Orval for SigNoz
+ * * regenerate with 'yarn generate:api'
+ * SigNoz
+ */
+import type {
+	InvalidateOptions,
+	MutationFunction,
+	QueryClient,
+	QueryFunction,
+	QueryKey,
+	UseMutationOptions,
+	UseMutationResult,
+	UseQueryOptions,
+	UseQueryResult,
+} from 'react-query';
+import { useMutation, useQuery } from 'react-query';
+
+import { GeneratedAPIInstance } from '../../../index';
+import type {
+	GetMetricAlerts200,
+	GetMetricAttributes200,
+	GetMetricDashboards200,
+	GetMetricHighlights200,
+	GetMetricMetadata200,
+	GetMetricsStats200,
+	GetMetricsTreemap200,
+	MetricsexplorertypesMetricAttributesRequestDTO,
+	MetricsexplorertypesStatsRequestDTO,
+	MetricsexplorertypesTreemapRequestDTO,
+	MetricsexplorertypesUpdateMetricMetadataRequestDTO,
+	RenderErrorResponseDTO,
+	UpdateMetricMetadataPathParameters,
+} from '../sigNoz.schemas';
+
+type AwaitedInput<T> = PromiseLike<T> | T;
+
+type Awaited<O> = O extends AwaitedInput<infer T> ? T : never;
+
+/**
+ * This endpoint returns associated alerts for a specified metric
+ * @summary Get metric alerts
+ */
+export const getMetricAlerts = (signal?: AbortSignal) =>
+	GeneratedAPIInstance<GetMetricAlerts200>({
+		url: `/api/v2/metric/alerts`,
+		method: 'GET',
+		signal,
+	});
+
+export const getGetMetricAlertsQueryKey = () => ['getMetricAlerts'] as const;
+
+export const getGetMetricAlertsQueryOptions = <
+	TData = Awaited<ReturnType<typeof getMetricAlerts>>,
+	TError = RenderErrorResponseDTO
+>(options?: {
+	query?: UseQueryOptions<
+		Awaited<ReturnType<typeof getMetricAlerts>>,
+		TError,
+		TData
+	>;
+}) => {
+	const { query: queryOptions } = options ?? {};
+
+	const queryKey = queryOptions?.queryKey ?? getGetMetricAlertsQueryKey();
+
+	const queryFn: QueryFunction<Awaited<ReturnType<typeof getMetricAlerts>>> = ({
+		signal,
+	}) => getMetricAlerts(signal);
+
+	return { queryKey, queryFn, ...queryOptions } as UseQueryOptions<
+		Awaited<ReturnType<typeof getMetricAlerts>>,
+		TError,
+		TData
+	> & { queryKey: QueryKey };
+};
+
+export type GetMetricAlertsQueryResult = NonNullable<
+	Awaited<ReturnType<typeof getMetricAlerts>>
+>;
+export type GetMetricAlertsQueryError = RenderErrorResponseDTO;
+
+/**
+ * @summary Get metric alerts
+ */
+
+export function useGetMetricAlerts<
+	TData = Awaited<ReturnType<typeof getMetricAlerts>>,
+	TError = RenderErrorResponseDTO
+>(options?: {
+	query?: UseQueryOptions<
+		Awaited<ReturnType<typeof getMetricAlerts>>,
+		TError,
+		TData
+	>;
+}): UseQueryResult<TData, TError> & { queryKey: QueryKey } {
+	const queryOptions = getGetMetricAlertsQueryOptions(options);
+
+	const query = useQuery(queryOptions) as UseQueryResult<TData, TError> & {
+		queryKey: QueryKey;
+	};
+
+	query.queryKey = queryOptions.queryKey;
+
+	return query;
+}
+
+/**
+ * @summary Get metric alerts
+ */
+export const invalidateGetMetricAlerts = async (
+	queryClient: QueryClient,
+	options?: InvalidateOptions,
+): Promise<QueryClient> => {
+	await queryClient.invalidateQueries(
+		{ queryKey: getGetMetricAlertsQueryKey() },
+		options,
+	);
+
+	return queryClient;
+};
+
+/**
+ * This endpoint returns associated dashboards for a specified metric
+ * @summary Get metric dashboards
+ */
+export const getMetricDashboards = (signal?: AbortSignal) =>
+	GeneratedAPIInstance<GetMetricDashboards200>({
+		url: `/api/v2/metric/dashboards`,
+		method: 'GET',
+		signal,
+	});
+
+export const getGetMetricDashboardsQueryKey = () =>
+	['getMetricDashboards'] as const;
+
+export const getGetMetricDashboardsQueryOptions = <
+	TData = Awaited<ReturnType<typeof getMetricDashboards>>,
+	TError = RenderErrorResponseDTO
+>(options?: {
+	query?: UseQueryOptions<
+		Awaited<ReturnType<typeof getMetricDashboards>>,
+		TError,
+		TData
+	>;
+}) => {
+	const { query: queryOptions } = options ?? {};
+
+	const queryKey = queryOptions?.queryKey ?? getGetMetricDashboardsQueryKey();
+
+	const queryFn: QueryFunction<
+		Awaited<ReturnType<typeof getMetricDashboards>>
+	> = ({ signal }) => getMetricDashboards(signal);
+
+	return { queryKey, queryFn, ...queryOptions } as UseQueryOptions<
+		Awaited<ReturnType<typeof getMetricDashboards>>,
+		TError,
+		TData
+	> & { queryKey: QueryKey };
+};
+
+export type GetMetricDashboardsQueryResult = NonNullable<
+	Awaited<ReturnType<typeof getMetricDashboards>>
+>;
+export type GetMetricDashboardsQueryError = RenderErrorResponseDTO;
+
+/**
+ * @summary Get metric dashboards
+ */
+
+export function useGetMetricDashboards<
+	TData = Awaited<ReturnType<typeof getMetricDashboards>>,
+	TError = RenderErrorResponseDTO
+>(options?: {
+	query?: UseQueryOptions<
+		Awaited<ReturnType<typeof getMetricDashboards>>,
+		TError,
+		TData
+	>;
+}): UseQueryResult<TData, TError> & { queryKey: QueryKey } {
+	const queryOptions = getGetMetricDashboardsQueryOptions(options);
+
+	const query = useQuery(queryOptions) as UseQueryResult<TData, TError> & {
+		queryKey: QueryKey;
+	};
+
+	query.queryKey = queryOptions.queryKey;
+
+	return query;
+}
+
+/**
+ * @summary Get metric dashboards
+ */
+export const invalidateGetMetricDashboards = async (
+	queryClient: QueryClient,
+	options?: InvalidateOptions,
+): Promise<QueryClient> => {
+	await queryClient.invalidateQueries(
+		{ queryKey: getGetMetricDashboardsQueryKey() },
+		options,
+	);
+
+	return queryClient;
+};
+
+/**
+ * This endpoint returns highlights like number of datapoints, totaltimeseries, active time series, last received time for a specified metric
+ * @summary Get metric highlights
+ */
+export const getMetricHighlights = (signal?: AbortSignal) =>
+	GeneratedAPIInstance<GetMetricHighlights200>({
+		url: `/api/v2/metric/highlights`,
+		method: 'GET',
+		signal,
+	});
+
+export const getGetMetricHighlightsQueryKey = () =>
+	['getMetricHighlights'] as const;
+
+export const getGetMetricHighlightsQueryOptions = <
+	TData = Awaited<ReturnType<typeof getMetricHighlights>>,
+	TError = RenderErrorResponseDTO
+>(options?: {
+	query?: UseQueryOptions<
+		Awaited<ReturnType<typeof getMetricHighlights>>,
+		TError,
+		TData
+	>;
+}) => {
+	const { query: queryOptions } = options ?? {};
+
+	const queryKey = queryOptions?.queryKey ?? getGetMetricHighlightsQueryKey();
+
+	const queryFn: QueryFunction<
+		Awaited<ReturnType<typeof getMetricHighlights>>
+	> = ({ signal }) => getMetricHighlights(signal);
+
+	return { queryKey, queryFn, ...queryOptions } as UseQueryOptions<
+		Awaited<ReturnType<typeof getMetricHighlights>>,
+		TError,
+		TData
+	> & { queryKey: QueryKey };
+};
+
+export type GetMetricHighlightsQueryResult = NonNullable<
+	Awaited<ReturnType<typeof getMetricHighlights>>
+>;
+export type GetMetricHighlightsQueryError = RenderErrorResponseDTO;
+
+/**
+ * @summary Get metric highlights
+ */
+
+export function useGetMetricHighlights<
+	TData = Awaited<ReturnType<typeof getMetricHighlights>>,
+	TError = RenderErrorResponseDTO
+>(options?: {
+	query?: UseQueryOptions<
+		Awaited<ReturnType<typeof getMetricHighlights>>,
+		TError,
+		TData
+	>;
+}): UseQueryResult<TData, TError> & { queryKey: QueryKey } {
+	const queryOptions = getGetMetricHighlightsQueryOptions(options);
+
+	const query = useQuery(queryOptions) as UseQueryResult<TData, TError> & {
+		queryKey: QueryKey;
+	};
+
+	query.queryKey = queryOptions.queryKey;
+
+	return query;
+}
+
+/**
+ * @summary Get metric highlights
+ */
+export const invalidateGetMetricHighlights = async (
+	queryClient: QueryClient,
+	options?: InvalidateOptions,
+): Promise<QueryClient> => {
+	await queryClient.invalidateQueries(
+		{ queryKey: getGetMetricHighlightsQueryKey() },
+		options,
+	);
+
+	return queryClient;
+};
+
+/**
+ * This endpoint helps to update metadata information like metric description, unit, type, temporality, monotonicity for a specified metric
+ * @summary Update metric metadata
+ */
+export const updateMetricMetadata = (
+	{ metricName }: UpdateMetricMetadataPathParameters,
+	metricsexplorertypesUpdateMetricMetadataRequestDTO: MetricsexplorertypesUpdateMetricMetadataRequestDTO,
+	signal?: AbortSignal,
+) =>
+	GeneratedAPIInstance<string>({
+		url: `/api/v2/metrics/${metricName}/metadata`,
+		method: 'POST',
+		headers: { 'Content-Type': 'application/json' },
+		data: metricsexplorertypesUpdateMetricMetadataRequestDTO,
+		signal,
+	});
+
+export const getUpdateMetricMetadataMutationOptions = <
+	TError = RenderErrorResponseDTO,
+	TContext = unknown
+>(options?: {
+	mutation?: UseMutationOptions<
+		Awaited<ReturnType<typeof updateMetricMetadata>>,
+		TError,
+		{
+			pathParams: UpdateMetricMetadataPathParameters;
+			data: MetricsexplorertypesUpdateMetricMetadataRequestDTO;
+		},
+		TContext
+	>;
+}): UseMutationOptions<
+	Awaited<ReturnType<typeof updateMetricMetadata>>,
+	TError,
+	{
+		pathParams: UpdateMetricMetadataPathParameters;
+		data: MetricsexplorertypesUpdateMetricMetadataRequestDTO;
+	},
+	TContext
+> => {
+	const mutationKey = ['updateMetricMetadata'];
+	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 updateMetricMetadata>>,
+		{
+			pathParams: UpdateMetricMetadataPathParameters;
+			data: MetricsexplorertypesUpdateMetricMetadataRequestDTO;
+		}
+	> = (props) => {
+		const { pathParams, data } = props ?? {};
+
+		return updateMetricMetadata(pathParams, data);
+	};
+
+	return { mutationFn, ...mutationOptions };
+};
+
+export type UpdateMetricMetadataMutationResult = NonNullable<
+	Awaited<ReturnType<typeof updateMetricMetadata>>
+>;
+export type UpdateMetricMetadataMutationBody = MetricsexplorertypesUpdateMetricMetadataRequestDTO;
+export type UpdateMetricMetadataMutationError = RenderErrorResponseDTO;
+
+/**
+ * @summary Update metric metadata
+ */
+export const useUpdateMetricMetadata = <
+	TError = RenderErrorResponseDTO,
+	TContext = unknown
+>(options?: {
+	mutation?: UseMutationOptions<
+		Awaited<ReturnType<typeof updateMetricMetadata>>,
+		TError,
+		{
+			pathParams: UpdateMetricMetadataPathParameters;
+			data: MetricsexplorertypesUpdateMetricMetadataRequestDTO;
+		},
+		TContext
+	>;
+}): UseMutationResult<
+	Awaited<ReturnType<typeof updateMetricMetadata>>,
+	TError,
+	{
+		pathParams: UpdateMetricMetadataPathParameters;
+		data: MetricsexplorertypesUpdateMetricMetadataRequestDTO;
+	},
+	TContext
+> => {
+	const mutationOptions = getUpdateMetricMetadataMutationOptions(options);
+
+	return useMutation(mutationOptions);
+};
+/**
+ * This endpoint returns attribute keys and their unique values for a specified metric
+ * @summary Get metric attributes
+ */
+export const getMetricAttributes = (
+	metricsexplorertypesMetricAttributesRequestDTO: MetricsexplorertypesMetricAttributesRequestDTO,
+	signal?: AbortSignal,
+) =>
+	GeneratedAPIInstance<GetMetricAttributes200>({
+		url: `/api/v2/metrics/attributes`,
+		method: 'POST',
+		headers: { 'Content-Type': 'application/json' },
+		data: metricsexplorertypesMetricAttributesRequestDTO,
+		signal,
+	});
+
+export const getGetMetricAttributesMutationOptions = <
+	TError = RenderErrorResponseDTO,
+	TContext = unknown
+>(options?: {
+	mutation?: UseMutationOptions<
+		Awaited<ReturnType<typeof getMetricAttributes>>,
+		TError,
+		{ data: MetricsexplorertypesMetricAttributesRequestDTO },
+		TContext
+	>;
+}): UseMutationOptions<
+	Awaited<ReturnType<typeof getMetricAttributes>>,
+	TError,
+	{ data: MetricsexplorertypesMetricAttributesRequestDTO },
+	TContext
+> => {
+	const mutationKey = ['getMetricAttributes'];
+	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 getMetricAttributes>>,
+		{ data: MetricsexplorertypesMetricAttributesRequestDTO }
+	> = (props) => {
+		const { data } = props ?? {};
+
+		return getMetricAttributes(data);
+	};
+
+	return { mutationFn, ...mutationOptions };
+};
+
+export type GetMetricAttributesMutationResult = NonNullable<
+	Awaited<ReturnType<typeof getMetricAttributes>>
+>;
+export type GetMetricAttributesMutationBody = MetricsexplorertypesMetricAttributesRequestDTO;
+export type GetMetricAttributesMutationError = RenderErrorResponseDTO;
+
+/**
+ * @summary Get metric attributes
+ */
+export const useGetMetricAttributes = <
+	TError = RenderErrorResponseDTO,
+	TContext = unknown
+>(options?: {
+	mutation?: UseMutationOptions<
+		Awaited<ReturnType<typeof getMetricAttributes>>,
+		TError,
+		{ data: MetricsexplorertypesMetricAttributesRequestDTO },
+		TContext
+	>;
+}): UseMutationResult<
+	Awaited<ReturnType<typeof getMetricAttributes>>,
+	TError,
+	{ data: MetricsexplorertypesMetricAttributesRequestDTO },
+	TContext
+> => {
+	const mutationOptions = getGetMetricAttributesMutationOptions(options);
+
+	return useMutation(mutationOptions);
+};
+/**
+ * This endpoint returns metadata information like metric description, unit, type, temporality, monotonicity for a specified metric
+ * @summary Get metric metadata
+ */
+export const getMetricMetadata = (signal?: AbortSignal) =>
+	GeneratedAPIInstance<GetMetricMetadata200>({
+		url: `/api/v2/metrics/metadata`,
+		method: 'GET',
+		signal,
+	});
+
+export const getGetMetricMetadataQueryKey = () =>
+	['getMetricMetadata'] as const;
+
+export const getGetMetricMetadataQueryOptions = <
+	TData = Awaited<ReturnType<typeof getMetricMetadata>>,
+	TError = RenderErrorResponseDTO
+>(options?: {
+	query?: UseQueryOptions<
+		Awaited<ReturnType<typeof getMetricMetadata>>,
+		TError,
+		TData
+	>;
+}) => {
+	const { query: queryOptions } = options ?? {};
+
+	const queryKey = queryOptions?.queryKey ?? getGetMetricMetadataQueryKey();
+
+	const queryFn: QueryFunction<
+		Awaited<ReturnType<typeof getMetricMetadata>>
+	> = ({ signal }) => getMetricMetadata(signal);
+
+	return { queryKey, queryFn, ...queryOptions } as UseQueryOptions<
+		Awaited<ReturnType<typeof getMetricMetadata>>,
+		TError,
+		TData
+	> & { queryKey: QueryKey };
+};
+
+export type GetMetricMetadataQueryResult = NonNullable<
+	Awaited<ReturnType<typeof getMetricMetadata>>
+>;
+export type GetMetricMetadataQueryError = RenderErrorResponseDTO;
+
+/**
+ * @summary Get metric metadata
+ */
+
+export function useGetMetricMetadata<
+	TData = Awaited<ReturnType<typeof getMetricMetadata>>,
+	TError = RenderErrorResponseDTO
+>(options?: {
+	query?: UseQueryOptions<
+		Awaited<ReturnType<typeof getMetricMetadata>>,
+		TError,
+		TData
+	>;
+}): UseQueryResult<TData, TError> & { queryKey: QueryKey } {
+	const queryOptions = getGetMetricMetadataQueryOptions(options);
+
+	const query = useQuery(queryOptions) as UseQueryResult<TData, TError> & {
+		queryKey: QueryKey;
+	};
+
+	query.queryKey = queryOptions.queryKey;
+
+	return query;
+}
+
+/**
+ * @summary Get metric metadata
+ */
+export const invalidateGetMetricMetadata = async (
+	queryClient: QueryClient,
+	options?: InvalidateOptions,
+): Promise<QueryClient> => {
+	await queryClient.invalidateQueries(
+		{ queryKey: getGetMetricMetadataQueryKey() },
+		options,
+	);
+
+	return queryClient;
+};
+
+/**
+ * This endpoint provides list of metrics with their number of samples and timeseries for the given time range
+ * @summary Get metrics statistics
+ */
+export const getMetricsStats = (
+	metricsexplorertypesStatsRequestDTO: MetricsexplorertypesStatsRequestDTO,
+	signal?: AbortSignal,
+) =>
+	GeneratedAPIInstance<GetMetricsStats200>({
+		url: `/api/v2/metrics/stats`,
+		method: 'POST',
+		headers: { 'Content-Type': 'application/json' },
+		data: metricsexplorertypesStatsRequestDTO,
+		signal,
+	});
+
+export const getGetMetricsStatsMutationOptions = <
+	TError = RenderErrorResponseDTO,
+	TContext = unknown
+>(options?: {
+	mutation?: UseMutationOptions<
+		Awaited<ReturnType<typeof getMetricsStats>>,
+		TError,
+		{ data: MetricsexplorertypesStatsRequestDTO },
+		TContext
+	>;
+}): UseMutationOptions<
+	Awaited<ReturnType<typeof getMetricsStats>>,
+	TError,
+	{ data: MetricsexplorertypesStatsRequestDTO },
+	TContext
+> => {
+	const mutationKey = ['getMetricsStats'];
+	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 getMetricsStats>>,
+		{ data: MetricsexplorertypesStatsRequestDTO }
+	> = (props) => {
+		const { data } = props ?? {};
+
+		return getMetricsStats(data);
+	};
+
+	return { mutationFn, ...mutationOptions };
+};
+
+export type GetMetricsStatsMutationResult = NonNullable<
+	Awaited<ReturnType<typeof getMetricsStats>>
+>;
+export type GetMetricsStatsMutationBody = MetricsexplorertypesStatsRequestDTO;
+export type GetMetricsStatsMutationError = RenderErrorResponseDTO;
+
+/**
+ * @summary Get metrics statistics
+ */
+export const useGetMetricsStats = <
+	TError = RenderErrorResponseDTO,
+	TContext = unknown
+>(options?: {
+	mutation?: UseMutationOptions<
+		Awaited<ReturnType<typeof getMetricsStats>>,
+		TError,
+		{ data: MetricsexplorertypesStatsRequestDTO },
+		TContext
+	>;
+}): UseMutationResult<
+	Awaited<ReturnType<typeof getMetricsStats>>,
+	TError,
+	{ data: MetricsexplorertypesStatsRequestDTO },
+	TContext
+> => {
+	const mutationOptions = getGetMetricsStatsMutationOptions(options);
+
+	return useMutation(mutationOptions);
+};
+/**
+ * This endpoint returns a treemap visualization showing the proportional distribution of metrics by sample count or time series count
+ * @summary Get metrics treemap
+ */
+export const getMetricsTreemap = (
+	metricsexplorertypesTreemapRequestDTO: MetricsexplorertypesTreemapRequestDTO,
+	signal?: AbortSignal,
+) =>
+	GeneratedAPIInstance<GetMetricsTreemap200>({
+		url: `/api/v2/metrics/treemap`,
+		method: 'POST',
+		headers: { 'Content-Type': 'application/json' },
+		data: metricsexplorertypesTreemapRequestDTO,
+		signal,
+	});
+
+export const getGetMetricsTreemapMutationOptions = <
+	TError = RenderErrorResponseDTO,
+	TContext = unknown
+>(options?: {
+	mutation?: UseMutationOptions<
+		Awaited<ReturnType<typeof getMetricsTreemap>>,
+		TError,
+		{ data: MetricsexplorertypesTreemapRequestDTO },
+		TContext
+	>;
+}): UseMutationOptions<
+	Awaited<ReturnType<typeof getMetricsTreemap>>,
+	TError,
+	{ data: MetricsexplorertypesTreemapRequestDTO },
+	TContext
+> => {
+	const mutationKey = ['getMetricsTreemap'];
+	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 getMetricsTreemap>>,
+		{ data: MetricsexplorertypesTreemapRequestDTO }
+	> = (props) => {
+		const { data } = props ?? {};
+
+		return getMetricsTreemap(data);
+	};
+
+	return { mutationFn, ...mutationOptions };
+};
+
+export type GetMetricsTreemapMutationResult = NonNullable<
+	Awaited<ReturnType<typeof getMetricsTreemap>>
+>;
+export type GetMetricsTreemapMutationBody = MetricsexplorertypesTreemapRequestDTO;
+export type GetMetricsTreemapMutationError = RenderErrorResponseDTO;
+
+/**
+ * @summary Get metrics treemap
+ */
+export const useGetMetricsTreemap = <
+	TError = RenderErrorResponseDTO,
+	TContext = unknown
+>(options?: {
+	mutation?: UseMutationOptions<
+		Awaited<ReturnType<typeof getMetricsTreemap>>,
+		TError,
+		{ data: MetricsexplorertypesTreemapRequestDTO },
+		TContext
+	>;
+}): UseMutationResult<
+	Awaited<ReturnType<typeof getMetricsTreemap>>,
+	TError,
+	{ data: MetricsexplorertypesTreemapRequestDTO },
+	TContext
+> => {
+	const mutationOptions = getGetMetricsTreemapMutationOptions(options);
+
+	return useMutation(mutationOptions);
+};

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

@@ -0,0 +1,194 @@
+/**
+ * ! Do not edit manually
+ * * The file has been auto-generated using Orval for SigNoz
+ * * regenerate with 'yarn generate:api'
+ * SigNoz
+ */
+import type {
+	InvalidateOptions,
+	MutationFunction,
+	QueryClient,
+	QueryFunction,
+	QueryKey,
+	UseMutationOptions,
+	UseMutationResult,
+	UseQueryOptions,
+	UseQueryResult,
+} from 'react-query';
+import { useMutation, useQuery } from 'react-query';
+
+import { GeneratedAPIInstance } from '../../../index';
+import type {
+	GetMyOrganization200,
+	RenderErrorResponseDTO,
+	TypesOrganizationDTO,
+} from '../sigNoz.schemas';
+
+type AwaitedInput<T> = PromiseLike<T> | T;
+
+type Awaited<O> = O extends AwaitedInput<infer T> ? T : never;
+
+/**
+ * This endpoint returns the organization I belong to
+ * @summary Get my organization
+ */
+export const getMyOrganization = (signal?: AbortSignal) =>
+	GeneratedAPIInstance<GetMyOrganization200>({
+		url: `/api/v2/orgs/me`,
+		method: 'GET',
+		signal,
+	});
+
+export const getGetMyOrganizationQueryKey = () =>
+	['getMyOrganization'] as const;
+
+export const getGetMyOrganizationQueryOptions = <
+	TData = Awaited<ReturnType<typeof getMyOrganization>>,
+	TError = RenderErrorResponseDTO
+>(options?: {
+	query?: UseQueryOptions<
+		Awaited<ReturnType<typeof getMyOrganization>>,
+		TError,
+		TData
+	>;
+}) => {
+	const { query: queryOptions } = options ?? {};
+
+	const queryKey = queryOptions?.queryKey ?? getGetMyOrganizationQueryKey();
+
+	const queryFn: QueryFunction<
+		Awaited<ReturnType<typeof getMyOrganization>>
+	> = ({ signal }) => getMyOrganization(signal);
+
+	return { queryKey, queryFn, ...queryOptions } as UseQueryOptions<
+		Awaited<ReturnType<typeof getMyOrganization>>,
+		TError,
+		TData
+	> & { queryKey: QueryKey };
+};
+
+export type GetMyOrganizationQueryResult = NonNullable<
+	Awaited<ReturnType<typeof getMyOrganization>>
+>;
+export type GetMyOrganizationQueryError = RenderErrorResponseDTO;
+
+/**
+ * @summary Get my organization
+ */
+
+export function useGetMyOrganization<
+	TData = Awaited<ReturnType<typeof getMyOrganization>>,
+	TError = RenderErrorResponseDTO
+>(options?: {
+	query?: UseQueryOptions<
+		Awaited<ReturnType<typeof getMyOrganization>>,
+		TError,
+		TData
+	>;
+}): UseQueryResult<TData, TError> & { queryKey: QueryKey } {
+	const queryOptions = getGetMyOrganizationQueryOptions(options);
+
+	const query = useQuery(queryOptions) as UseQueryResult<TData, TError> & {
+		queryKey: QueryKey;
+	};
+
+	query.queryKey = queryOptions.queryKey;
+
+	return query;
+}
+
+/**
+ * @summary Get my organization
+ */
+export const invalidateGetMyOrganization = async (
+	queryClient: QueryClient,
+	options?: InvalidateOptions,
+): Promise<QueryClient> => {
+	await queryClient.invalidateQueries(
+		{ queryKey: getGetMyOrganizationQueryKey() },
+		options,
+	);
+
+	return queryClient;
+};
+
+/**
+ * This endpoint updates the organization I belong to
+ * @summary Update my organization
+ */
+export const updateMyOrganization = (
+	typesOrganizationDTO: TypesOrganizationDTO,
+) =>
+	GeneratedAPIInstance<void>({
+		url: `/api/v2/orgs/me`,
+		method: 'PUT',
+		headers: { 'Content-Type': 'application/json' },
+		data: typesOrganizationDTO,
+	});
+
+export const getUpdateMyOrganizationMutationOptions = <
+	TError = RenderErrorResponseDTO,
+	TContext = unknown
+>(options?: {
+	mutation?: UseMutationOptions<
+		Awaited<ReturnType<typeof updateMyOrganization>>,
+		TError,
+		{ data: TypesOrganizationDTO },
+		TContext
+	>;
+}): UseMutationOptions<
+	Awaited<ReturnType<typeof updateMyOrganization>>,
+	TError,
+	{ data: TypesOrganizationDTO },
+	TContext
+> => {
+	const mutationKey = ['updateMyOrganization'];
+	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 updateMyOrganization>>,
+		{ data: TypesOrganizationDTO }
+	> = (props) => {
+		const { data } = props ?? {};
+
+		return updateMyOrganization(data);
+	};
+
+	return { mutationFn, ...mutationOptions };
+};
+
+export type UpdateMyOrganizationMutationResult = NonNullable<
+	Awaited<ReturnType<typeof updateMyOrganization>>
+>;
+export type UpdateMyOrganizationMutationBody = TypesOrganizationDTO;
+export type UpdateMyOrganizationMutationError = RenderErrorResponseDTO;
+
+/**
+ * @summary Update my organization
+ */
+export const useUpdateMyOrganization = <
+	TError = RenderErrorResponseDTO,
+	TContext = unknown
+>(options?: {
+	mutation?: UseMutationOptions<
+		Awaited<ReturnType<typeof updateMyOrganization>>,
+		TError,
+		{ data: TypesOrganizationDTO },
+		TContext
+	>;
+}): UseMutationResult<
+	Awaited<ReturnType<typeof updateMyOrganization>>,
+	TError,
+	{ data: TypesOrganizationDTO },
+	TContext
+> => {
+	const mutationOptions = getUpdateMyOrganizationMutationOptions(options);
+
+	return useMutation(mutationOptions);
+};

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

@@ -0,0 +1,599 @@
+/**
+ * ! Do not edit manually
+ * * The file has been auto-generated using Orval for SigNoz
+ * * regenerate with 'yarn generate:api'
+ * SigNoz
+ */
+import type {
+	InvalidateOptions,
+	MutationFunction,
+	QueryClient,
+	QueryFunction,
+	QueryKey,
+	UseMutationOptions,
+	UseMutationResult,
+	UseQueryOptions,
+	UseQueryResult,
+} from 'react-query';
+import { useMutation, useQuery } from 'react-query';
+
+import { GeneratedAPIInstance } from '../../../index';
+import type {
+	GetOrgPreference200,
+	GetOrgPreferencePathParameters,
+	GetUserPreference200,
+	GetUserPreferencePathParameters,
+	ListOrgPreferences200,
+	ListUserPreferences200,
+	PreferencetypesUpdatablePreferenceDTO,
+	RenderErrorResponseDTO,
+	UpdateOrgPreferencePathParameters,
+	UpdateUserPreferencePathParameters,
+} from '../sigNoz.schemas';
+
+type AwaitedInput<T> = PromiseLike<T> | T;
+
+type Awaited<O> = O extends AwaitedInput<infer T> ? T : never;
+
+/**
+ * This endpoint lists all org preferences
+ * @summary List org preferences
+ */
+export const listOrgPreferences = (signal?: AbortSignal) =>
+	GeneratedAPIInstance<ListOrgPreferences200>({
+		url: `/api/v1/org/preferences`,
+		method: 'GET',
+		signal,
+	});
+
+export const getListOrgPreferencesQueryKey = () =>
+	['listOrgPreferences'] as const;
+
+export const getListOrgPreferencesQueryOptions = <
+	TData = Awaited<ReturnType<typeof listOrgPreferences>>,
+	TError = RenderErrorResponseDTO
+>(options?: {
+	query?: UseQueryOptions<
+		Awaited<ReturnType<typeof listOrgPreferences>>,
+		TError,
+		TData
+	>;
+}) => {
+	const { query: queryOptions } = options ?? {};
+
+	const queryKey = queryOptions?.queryKey ?? getListOrgPreferencesQueryKey();
+
+	const queryFn: QueryFunction<
+		Awaited<ReturnType<typeof listOrgPreferences>>
+	> = ({ signal }) => listOrgPreferences(signal);
+
+	return { queryKey, queryFn, ...queryOptions } as UseQueryOptions<
+		Awaited<ReturnType<typeof listOrgPreferences>>,
+		TError,
+		TData
+	> & { queryKey: QueryKey };
+};
+
+export type ListOrgPreferencesQueryResult = NonNullable<
+	Awaited<ReturnType<typeof listOrgPreferences>>
+>;
+export type ListOrgPreferencesQueryError = RenderErrorResponseDTO;
+
+/**
+ * @summary List org preferences
+ */
+
+export function useListOrgPreferences<
+	TData = Awaited<ReturnType<typeof listOrgPreferences>>,
+	TError = RenderErrorResponseDTO
+>(options?: {
+	query?: UseQueryOptions<
+		Awaited<ReturnType<typeof listOrgPreferences>>,
+		TError,
+		TData
+	>;
+}): UseQueryResult<TData, TError> & { queryKey: QueryKey } {
+	const queryOptions = getListOrgPreferencesQueryOptions(options);
+
+	const query = useQuery(queryOptions) as UseQueryResult<TData, TError> & {
+		queryKey: QueryKey;
+	};
+
+	query.queryKey = queryOptions.queryKey;
+
+	return query;
+}
+
+/**
+ * @summary List org preferences
+ */
+export const invalidateListOrgPreferences = async (
+	queryClient: QueryClient,
+	options?: InvalidateOptions,
+): Promise<QueryClient> => {
+	await queryClient.invalidateQueries(
+		{ queryKey: getListOrgPreferencesQueryKey() },
+		options,
+	);
+
+	return queryClient;
+};
+
+/**
+ * This endpoint returns the org preference by name
+ * @summary Get org preference
+ */
+export const getOrgPreference = (
+	{ name }: GetOrgPreferencePathParameters,
+	signal?: AbortSignal,
+) =>
+	GeneratedAPIInstance<GetOrgPreference200>({
+		url: `/api/v1/org/preferences/${name}`,
+		method: 'GET',
+		signal,
+	});
+
+export const getGetOrgPreferenceQueryKey = ({
+	name,
+}: GetOrgPreferencePathParameters) => ['getOrgPreference'] as const;
+
+export const getGetOrgPreferenceQueryOptions = <
+	TData = Awaited<ReturnType<typeof getOrgPreference>>,
+	TError = RenderErrorResponseDTO
+>(
+	{ name }: GetOrgPreferencePathParameters,
+	options?: {
+		query?: UseQueryOptions<
+			Awaited<ReturnType<typeof getOrgPreference>>,
+			TError,
+			TData
+		>;
+	},
+) => {
+	const { query: queryOptions } = options ?? {};
+
+	const queryKey =
+		queryOptions?.queryKey ?? getGetOrgPreferenceQueryKey({ name });
+
+	const queryFn: QueryFunction<Awaited<ReturnType<typeof getOrgPreference>>> = ({
+		signal,
+	}) => getOrgPreference({ name }, signal);
+
+	return {
+		queryKey,
+		queryFn,
+		enabled: !!name,
+		...queryOptions,
+	} as UseQueryOptions<
+		Awaited<ReturnType<typeof getOrgPreference>>,
+		TError,
+		TData
+	> & { queryKey: QueryKey };
+};
+
+export type GetOrgPreferenceQueryResult = NonNullable<
+	Awaited<ReturnType<typeof getOrgPreference>>
+>;
+export type GetOrgPreferenceQueryError = RenderErrorResponseDTO;
+
+/**
+ * @summary Get org preference
+ */
+
+export function useGetOrgPreference<
+	TData = Awaited<ReturnType<typeof getOrgPreference>>,
+	TError = RenderErrorResponseDTO
+>(
+	{ name }: GetOrgPreferencePathParameters,
+	options?: {
+		query?: UseQueryOptions<
+			Awaited<ReturnType<typeof getOrgPreference>>,
+			TError,
+			TData
+		>;
+	},
+): UseQueryResult<TData, TError> & { queryKey: QueryKey } {
+	const queryOptions = getGetOrgPreferenceQueryOptions({ name }, options);
+
+	const query = useQuery(queryOptions) as UseQueryResult<TData, TError> & {
+		queryKey: QueryKey;
+	};
+
+	query.queryKey = queryOptions.queryKey;
+
+	return query;
+}
+
+/**
+ * @summary Get org preference
+ */
+export const invalidateGetOrgPreference = async (
+	queryClient: QueryClient,
+	{ name }: GetOrgPreferencePathParameters,
+	options?: InvalidateOptions,
+): Promise<QueryClient> => {
+	await queryClient.invalidateQueries(
+		{ queryKey: getGetOrgPreferenceQueryKey({ name }) },
+		options,
+	);
+
+	return queryClient;
+};
+
+/**
+ * This endpoint updates the org preference by name
+ * @summary Update org preference
+ */
+export const updateOrgPreference = (
+	{ name }: UpdateOrgPreferencePathParameters,
+	preferencetypesUpdatablePreferenceDTO: PreferencetypesUpdatablePreferenceDTO,
+) =>
+	GeneratedAPIInstance<void>({
+		url: `/api/v1/org/preferences/${name}`,
+		method: 'PUT',
+		headers: { 'Content-Type': 'application/json' },
+		data: preferencetypesUpdatablePreferenceDTO,
+	});
+
+export const getUpdateOrgPreferenceMutationOptions = <
+	TError = RenderErrorResponseDTO,
+	TContext = unknown
+>(options?: {
+	mutation?: UseMutationOptions<
+		Awaited<ReturnType<typeof updateOrgPreference>>,
+		TError,
+		{
+			pathParams: UpdateOrgPreferencePathParameters;
+			data: PreferencetypesUpdatablePreferenceDTO;
+		},
+		TContext
+	>;
+}): UseMutationOptions<
+	Awaited<ReturnType<typeof updateOrgPreference>>,
+	TError,
+	{
+		pathParams: UpdateOrgPreferencePathParameters;
+		data: PreferencetypesUpdatablePreferenceDTO;
+	},
+	TContext
+> => {
+	const mutationKey = ['updateOrgPreference'];
+	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 updateOrgPreference>>,
+		{
+			pathParams: UpdateOrgPreferencePathParameters;
+			data: PreferencetypesUpdatablePreferenceDTO;
+		}
+	> = (props) => {
+		const { pathParams, data } = props ?? {};
+
+		return updateOrgPreference(pathParams, data);
+	};
+
+	return { mutationFn, ...mutationOptions };
+};
+
+export type UpdateOrgPreferenceMutationResult = NonNullable<
+	Awaited<ReturnType<typeof updateOrgPreference>>
+>;
+export type UpdateOrgPreferenceMutationBody = PreferencetypesUpdatablePreferenceDTO;
+export type UpdateOrgPreferenceMutationError = RenderErrorResponseDTO;
+
+/**
+ * @summary Update org preference
+ */
+export const useUpdateOrgPreference = <
+	TError = RenderErrorResponseDTO,
+	TContext = unknown
+>(options?: {
+	mutation?: UseMutationOptions<
+		Awaited<ReturnType<typeof updateOrgPreference>>,
+		TError,
+		{
+			pathParams: UpdateOrgPreferencePathParameters;
+			data: PreferencetypesUpdatablePreferenceDTO;
+		},
+		TContext
+	>;
+}): UseMutationResult<
+	Awaited<ReturnType<typeof updateOrgPreference>>,
+	TError,
+	{
+		pathParams: UpdateOrgPreferencePathParameters;
+		data: PreferencetypesUpdatablePreferenceDTO;
+	},
+	TContext
+> => {
+	const mutationOptions = getUpdateOrgPreferenceMutationOptions(options);
+
+	return useMutation(mutationOptions);
+};
+/**
+ * This endpoint lists all user preferences
+ * @summary List user preferences
+ */
+export const listUserPreferences = (signal?: AbortSignal) =>
+	GeneratedAPIInstance<ListUserPreferences200>({
+		url: `/api/v1/user/preferences`,
+		method: 'GET',
+		signal,
+	});
+
+export const getListUserPreferencesQueryKey = () =>
+	['listUserPreferences'] as const;
+
+export const getListUserPreferencesQueryOptions = <
+	TData = Awaited<ReturnType<typeof listUserPreferences>>,
+	TError = RenderErrorResponseDTO
+>(options?: {
+	query?: UseQueryOptions<
+		Awaited<ReturnType<typeof listUserPreferences>>,
+		TError,
+		TData
+	>;
+}) => {
+	const { query: queryOptions } = options ?? {};
+
+	const queryKey = queryOptions?.queryKey ?? getListUserPreferencesQueryKey();
+
+	const queryFn: QueryFunction<
+		Awaited<ReturnType<typeof listUserPreferences>>
+	> = ({ signal }) => listUserPreferences(signal);
+
+	return { queryKey, queryFn, ...queryOptions } as UseQueryOptions<
+		Awaited<ReturnType<typeof listUserPreferences>>,
+		TError,
+		TData
+	> & { queryKey: QueryKey };
+};
+
+export type ListUserPreferencesQueryResult = NonNullable<
+	Awaited<ReturnType<typeof listUserPreferences>>
+>;
+export type ListUserPreferencesQueryError = RenderErrorResponseDTO;
+
+/**
+ * @summary List user preferences
+ */
+
+export function useListUserPreferences<
+	TData = Awaited<ReturnType<typeof listUserPreferences>>,
+	TError = RenderErrorResponseDTO
+>(options?: {
+	query?: UseQueryOptions<
+		Awaited<ReturnType<typeof listUserPreferences>>,
+		TError,
+		TData
+	>;
+}): UseQueryResult<TData, TError> & { queryKey: QueryKey } {
+	const queryOptions = getListUserPreferencesQueryOptions(options);
+
+	const query = useQuery(queryOptions) as UseQueryResult<TData, TError> & {
+		queryKey: QueryKey;
+	};
+
+	query.queryKey = queryOptions.queryKey;
+
+	return query;
+}
+
+/**
+ * @summary List user preferences
+ */
+export const invalidateListUserPreferences = async (
+	queryClient: QueryClient,
+	options?: InvalidateOptions,
+): Promise<QueryClient> => {
+	await queryClient.invalidateQueries(
+		{ queryKey: getListUserPreferencesQueryKey() },
+		options,
+	);
+
+	return queryClient;
+};
+
+/**
+ * This endpoint returns the user preference by name
+ * @summary Get user preference
+ */
+export const getUserPreference = (
+	{ name }: GetUserPreferencePathParameters,
+	signal?: AbortSignal,
+) =>
+	GeneratedAPIInstance<GetUserPreference200>({
+		url: `/api/v1/user/preferences/${name}`,
+		method: 'GET',
+		signal,
+	});
+
+export const getGetUserPreferenceQueryKey = ({
+	name,
+}: GetUserPreferencePathParameters) => ['getUserPreference'] as const;
+
+export const getGetUserPreferenceQueryOptions = <
+	TData = Awaited<ReturnType<typeof getUserPreference>>,
+	TError = RenderErrorResponseDTO
+>(
+	{ name }: GetUserPreferencePathParameters,
+	options?: {
+		query?: UseQueryOptions<
+			Awaited<ReturnType<typeof getUserPreference>>,
+			TError,
+			TData
+		>;
+	},
+) => {
+	const { query: queryOptions } = options ?? {};
+
+	const queryKey =
+		queryOptions?.queryKey ?? getGetUserPreferenceQueryKey({ name });
+
+	const queryFn: QueryFunction<
+		Awaited<ReturnType<typeof getUserPreference>>
+	> = ({ signal }) => getUserPreference({ name }, signal);
+
+	return {
+		queryKey,
+		queryFn,
+		enabled: !!name,
+		...queryOptions,
+	} as UseQueryOptions<
+		Awaited<ReturnType<typeof getUserPreference>>,
+		TError,
+		TData
+	> & { queryKey: QueryKey };
+};
+
+export type GetUserPreferenceQueryResult = NonNullable<
+	Awaited<ReturnType<typeof getUserPreference>>
+>;
+export type GetUserPreferenceQueryError = RenderErrorResponseDTO;
+
+/**
+ * @summary Get user preference
+ */
+
+export function useGetUserPreference<
+	TData = Awaited<ReturnType<typeof getUserPreference>>,
+	TError = RenderErrorResponseDTO
+>(
+	{ name }: GetUserPreferencePathParameters,
+	options?: {
+		query?: UseQueryOptions<
+			Awaited<ReturnType<typeof getUserPreference>>,
+			TError,
+			TData
+		>;
+	},
+): UseQueryResult<TData, TError> & { queryKey: QueryKey } {
+	const queryOptions = getGetUserPreferenceQueryOptions({ name }, options);
+
+	const query = useQuery(queryOptions) as UseQueryResult<TData, TError> & {
+		queryKey: QueryKey;
+	};
+
+	query.queryKey = queryOptions.queryKey;
+
+	return query;
+}
+
+/**
+ * @summary Get user preference
+ */
+export const invalidateGetUserPreference = async (
+	queryClient: QueryClient,
+	{ name }: GetUserPreferencePathParameters,
+	options?: InvalidateOptions,
+): Promise<QueryClient> => {
+	await queryClient.invalidateQueries(
+		{ queryKey: getGetUserPreferenceQueryKey({ name }) },
+		options,
+	);
+
+	return queryClient;
+};
+
+/**
+ * This endpoint updates the user preference by name
+ * @summary Update user preference
+ */
+export const updateUserPreference = (
+	{ name }: UpdateUserPreferencePathParameters,
+	preferencetypesUpdatablePreferenceDTO: PreferencetypesUpdatablePreferenceDTO,
+) =>
+	GeneratedAPIInstance<void>({
+		url: `/api/v1/user/preferences/${name}`,
+		method: 'PUT',
+		headers: { 'Content-Type': 'application/json' },
+		data: preferencetypesUpdatablePreferenceDTO,
+	});
+
+export const getUpdateUserPreferenceMutationOptions = <
+	TError = RenderErrorResponseDTO,
+	TContext = unknown
+>(options?: {
+	mutation?: UseMutationOptions<
+		Awaited<ReturnType<typeof updateUserPreference>>,
+		TError,
+		{
+			pathParams: UpdateUserPreferencePathParameters;
+			data: PreferencetypesUpdatablePreferenceDTO;
+		},
+		TContext
+	>;
+}): UseMutationOptions<
+	Awaited<ReturnType<typeof updateUserPreference>>,
+	TError,
+	{
+		pathParams: UpdateUserPreferencePathParameters;
+		data: PreferencetypesUpdatablePreferenceDTO;
+	},
+	TContext
+> => {
+	const mutationKey = ['updateUserPreference'];
+	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 updateUserPreference>>,
+		{
+			pathParams: UpdateUserPreferencePathParameters;
+			data: PreferencetypesUpdatablePreferenceDTO;
+		}
+	> = (props) => {
+		const { pathParams, data } = props ?? {};
+
+		return updateUserPreference(pathParams, data);
+	};
+
+	return { mutationFn, ...mutationOptions };
+};
+
+export type UpdateUserPreferenceMutationResult = NonNullable<
+	Awaited<ReturnType<typeof updateUserPreference>>
+>;
+export type UpdateUserPreferenceMutationBody = PreferencetypesUpdatablePreferenceDTO;
+export type UpdateUserPreferenceMutationError = RenderErrorResponseDTO;
+
+/**
+ * @summary Update user preference
+ */
+export const useUpdateUserPreference = <
+	TError = RenderErrorResponseDTO,
+	TContext = unknown
+>(options?: {
+	mutation?: UseMutationOptions<
+		Awaited<ReturnType<typeof updateUserPreference>>,
+		TError,
+		{
+			pathParams: UpdateUserPreferencePathParameters;
+			data: PreferencetypesUpdatablePreferenceDTO;
+		},
+		TContext
+	>;
+}): UseMutationResult<
+	Awaited<ReturnType<typeof updateUserPreference>>,
+	TError,
+	{
+		pathParams: UpdateUserPreferencePathParameters;
+		data: PreferencetypesUpdatablePreferenceDTO;
+	},
+	TContext
+> => {
+	const mutationOptions = getUpdateUserPreferenceMutationOptions(options);
+
+	return useMutation(mutationOptions);
+};

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

@@ -0,0 +1,738 @@
+/**
+ * ! Do not edit manually
+ * * The file has been auto-generated using Orval for SigNoz
+ * * regenerate with 'yarn generate:api'
+ * SigNoz
+ */
+import type {
+	InvalidateOptions,
+	MutationFunction,
+	QueryClient,
+	QueryFunction,
+	QueryKey,
+	UseMutationOptions,
+	UseMutationResult,
+	UseQueryOptions,
+	UseQueryResult,
+} from 'react-query';
+import { useMutation, useQuery } from 'react-query';
+
+import { GeneratedAPIInstance } from '../../../index';
+import type {
+	AuthtypesDeprecatedPostableLoginDTO,
+	AuthtypesPostableEmailPasswordSessionDTO,
+	AuthtypesPostableRotateTokenDTO,
+	CreateSessionByEmailPassword200,
+	CreateSessionByGoogleCallback303,
+	CreateSessionByOIDCCallback303,
+	CreateSessionBySAMLCallback303,
+	CreateSessionBySAMLCallbackBody,
+	CreateSessionBySAMLCallbackParams,
+	DeprecatedCreateSessionByEmailPassword200,
+	GetSessionContext200,
+	RenderErrorResponseDTO,
+	RotateSession200,
+} from '../sigNoz.schemas';
+
+type AwaitedInput<T> = PromiseLike<T> | T;
+
+type Awaited<O> = O extends AwaitedInput<infer T> ? T : never;
+
+/**
+ * This endpoint creates a session for a user using google callback
+ * @summary Create session by google callback
+ */
+export const createSessionByGoogleCallback = (signal?: AbortSignal) =>
+	GeneratedAPIInstance<unknown>({
+		url: `/api/v1/complete/google`,
+		method: 'GET',
+		signal,
+	});
+
+export const getCreateSessionByGoogleCallbackQueryKey = () =>
+	['createSessionByGoogleCallback'] as const;
+
+export const getCreateSessionByGoogleCallbackQueryOptions = <
+	TData = Awaited<ReturnType<typeof createSessionByGoogleCallback>>,
+	TError = CreateSessionByGoogleCallback303 | RenderErrorResponseDTO
+>(options?: {
+	query?: UseQueryOptions<
+		Awaited<ReturnType<typeof createSessionByGoogleCallback>>,
+		TError,
+		TData
+	>;
+}) => {
+	const { query: queryOptions } = options ?? {};
+
+	const queryKey =
+		queryOptions?.queryKey ?? getCreateSessionByGoogleCallbackQueryKey();
+
+	const queryFn: QueryFunction<
+		Awaited<ReturnType<typeof createSessionByGoogleCallback>>
+	> = ({ signal }) => createSessionByGoogleCallback(signal);
+
+	return { queryKey, queryFn, ...queryOptions } as UseQueryOptions<
+		Awaited<ReturnType<typeof createSessionByGoogleCallback>>,
+		TError,
+		TData
+	> & { queryKey: QueryKey };
+};
+
+export type CreateSessionByGoogleCallbackQueryResult = NonNullable<
+	Awaited<ReturnType<typeof createSessionByGoogleCallback>>
+>;
+export type CreateSessionByGoogleCallbackQueryError =
+	| CreateSessionByGoogleCallback303
+	| RenderErrorResponseDTO;
+
+/**
+ * @summary Create session by google callback
+ */
+
+export function useCreateSessionByGoogleCallback<
+	TData = Awaited<ReturnType<typeof createSessionByGoogleCallback>>,
+	TError = CreateSessionByGoogleCallback303 | RenderErrorResponseDTO
+>(options?: {
+	query?: UseQueryOptions<
+		Awaited<ReturnType<typeof createSessionByGoogleCallback>>,
+		TError,
+		TData
+	>;
+}): UseQueryResult<TData, TError> & { queryKey: QueryKey } {
+	const queryOptions = getCreateSessionByGoogleCallbackQueryOptions(options);
+
+	const query = useQuery(queryOptions) as UseQueryResult<TData, TError> & {
+		queryKey: QueryKey;
+	};
+
+	query.queryKey = queryOptions.queryKey;
+
+	return query;
+}
+
+/**
+ * @summary Create session by google callback
+ */
+export const invalidateCreateSessionByGoogleCallback = async (
+	queryClient: QueryClient,
+	options?: InvalidateOptions,
+): Promise<QueryClient> => {
+	await queryClient.invalidateQueries(
+		{ queryKey: getCreateSessionByGoogleCallbackQueryKey() },
+		options,
+	);
+
+	return queryClient;
+};
+
+/**
+ * This endpoint creates a session for a user using oidc callback
+ * @summary Create session by oidc callback
+ */
+export const createSessionByOIDCCallback = (signal?: AbortSignal) =>
+	GeneratedAPIInstance<unknown>({
+		url: `/api/v1/complete/oidc`,
+		method: 'GET',
+		signal,
+	});
+
+export const getCreateSessionByOIDCCallbackQueryKey = () =>
+	['createSessionByOIDCCallback'] as const;
+
+export const getCreateSessionByOIDCCallbackQueryOptions = <
+	TData = Awaited<ReturnType<typeof createSessionByOIDCCallback>>,
+	TError = CreateSessionByOIDCCallback303 | RenderErrorResponseDTO
+>(options?: {
+	query?: UseQueryOptions<
+		Awaited<ReturnType<typeof createSessionByOIDCCallback>>,
+		TError,
+		TData
+	>;
+}) => {
+	const { query: queryOptions } = options ?? {};
+
+	const queryKey =
+		queryOptions?.queryKey ?? getCreateSessionByOIDCCallbackQueryKey();
+
+	const queryFn: QueryFunction<
+		Awaited<ReturnType<typeof createSessionByOIDCCallback>>
+	> = ({ signal }) => createSessionByOIDCCallback(signal);
+
+	return { queryKey, queryFn, ...queryOptions } as UseQueryOptions<
+		Awaited<ReturnType<typeof createSessionByOIDCCallback>>,
+		TError,
+		TData
+	> & { queryKey: QueryKey };
+};
+
+export type CreateSessionByOIDCCallbackQueryResult = NonNullable<
+	Awaited<ReturnType<typeof createSessionByOIDCCallback>>
+>;
+export type CreateSessionByOIDCCallbackQueryError =
+	| CreateSessionByOIDCCallback303
+	| RenderErrorResponseDTO;
+
+/**
+ * @summary Create session by oidc callback
+ */
+
+export function useCreateSessionByOIDCCallback<
+	TData = Awaited<ReturnType<typeof createSessionByOIDCCallback>>,
+	TError = CreateSessionByOIDCCallback303 | RenderErrorResponseDTO
+>(options?: {
+	query?: UseQueryOptions<
+		Awaited<ReturnType<typeof createSessionByOIDCCallback>>,
+		TError,
+		TData
+	>;
+}): UseQueryResult<TData, TError> & { queryKey: QueryKey } {
+	const queryOptions = getCreateSessionByOIDCCallbackQueryOptions(options);
+
+	const query = useQuery(queryOptions) as UseQueryResult<TData, TError> & {
+		queryKey: QueryKey;
+	};
+
+	query.queryKey = queryOptions.queryKey;
+
+	return query;
+}
+
+/**
+ * @summary Create session by oidc callback
+ */
+export const invalidateCreateSessionByOIDCCallback = async (
+	queryClient: QueryClient,
+	options?: InvalidateOptions,
+): Promise<QueryClient> => {
+	await queryClient.invalidateQueries(
+		{ queryKey: getCreateSessionByOIDCCallbackQueryKey() },
+		options,
+	);
+
+	return queryClient;
+};
+
+/**
+ * This endpoint creates a session for a user using saml callback
+ * @summary Create session by saml callback
+ */
+export const createSessionBySAMLCallback = (
+	createSessionBySAMLCallbackBody: CreateSessionBySAMLCallbackBody,
+	params?: CreateSessionBySAMLCallbackParams,
+	signal?: AbortSignal,
+) => {
+	const formUrlEncoded = new URLSearchParams();
+	if (createSessionBySAMLCallbackBody.RelayState !== undefined) {
+		formUrlEncoded.append(
+			`RelayState`,
+			createSessionBySAMLCallbackBody.RelayState,
+		);
+	}
+	if (createSessionBySAMLCallbackBody.SAMLResponse !== undefined) {
+		formUrlEncoded.append(
+			`SAMLResponse`,
+			createSessionBySAMLCallbackBody.SAMLResponse,
+		);
+	}
+
+	return GeneratedAPIInstance<unknown>({
+		url: `/api/v1/complete/saml`,
+		method: 'POST',
+		headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+		data: formUrlEncoded,
+		params,
+		signal,
+	});
+};
+
+export const getCreateSessionBySAMLCallbackMutationOptions = <
+	TError = CreateSessionBySAMLCallback303 | RenderErrorResponseDTO,
+	TContext = unknown
+>(options?: {
+	mutation?: UseMutationOptions<
+		Awaited<ReturnType<typeof createSessionBySAMLCallback>>,
+		TError,
+		{
+			data: CreateSessionBySAMLCallbackBody;
+			params?: CreateSessionBySAMLCallbackParams;
+		},
+		TContext
+	>;
+}): UseMutationOptions<
+	Awaited<ReturnType<typeof createSessionBySAMLCallback>>,
+	TError,
+	{
+		data: CreateSessionBySAMLCallbackBody;
+		params?: CreateSessionBySAMLCallbackParams;
+	},
+	TContext
+> => {
+	const mutationKey = ['createSessionBySAMLCallback'];
+	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 createSessionBySAMLCallback>>,
+		{
+			data: CreateSessionBySAMLCallbackBody;
+			params?: CreateSessionBySAMLCallbackParams;
+		}
+	> = (props) => {
+		const { data, params } = props ?? {};
+
+		return createSessionBySAMLCallback(data, params);
+	};
+
+	return { mutationFn, ...mutationOptions };
+};
+
+export type CreateSessionBySAMLCallbackMutationResult = NonNullable<
+	Awaited<ReturnType<typeof createSessionBySAMLCallback>>
+>;
+export type CreateSessionBySAMLCallbackMutationBody = CreateSessionBySAMLCallbackBody;
+export type CreateSessionBySAMLCallbackMutationError =
+	| CreateSessionBySAMLCallback303
+	| RenderErrorResponseDTO;
+
+/**
+ * @summary Create session by saml callback
+ */
+export const useCreateSessionBySAMLCallback = <
+	TError = CreateSessionBySAMLCallback303 | RenderErrorResponseDTO,
+	TContext = unknown
+>(options?: {
+	mutation?: UseMutationOptions<
+		Awaited<ReturnType<typeof createSessionBySAMLCallback>>,
+		TError,
+		{
+			data: CreateSessionBySAMLCallbackBody;
+			params?: CreateSessionBySAMLCallbackParams;
+		},
+		TContext
+	>;
+}): UseMutationResult<
+	Awaited<ReturnType<typeof createSessionBySAMLCallback>>,
+	TError,
+	{
+		data: CreateSessionBySAMLCallbackBody;
+		params?: CreateSessionBySAMLCallbackParams;
+	},
+	TContext
+> => {
+	const mutationOptions = getCreateSessionBySAMLCallbackMutationOptions(options);
+
+	return useMutation(mutationOptions);
+};
+/**
+ * This endpoint is deprecated and will be removed in the future
+ * @deprecated
+ * @summary Deprecated create session by email password
+ */
+export const deprecatedCreateSessionByEmailPassword = (
+	authtypesDeprecatedPostableLoginDTO: AuthtypesDeprecatedPostableLoginDTO,
+	signal?: AbortSignal,
+) =>
+	GeneratedAPIInstance<DeprecatedCreateSessionByEmailPassword200>({
+		url: `/api/v1/login`,
+		method: 'POST',
+		headers: { 'Content-Type': 'application/json' },
+		data: authtypesDeprecatedPostableLoginDTO,
+		signal,
+	});
+
+export const getDeprecatedCreateSessionByEmailPasswordMutationOptions = <
+	TError = RenderErrorResponseDTO,
+	TContext = unknown
+>(options?: {
+	mutation?: UseMutationOptions<
+		Awaited<ReturnType<typeof deprecatedCreateSessionByEmailPassword>>,
+		TError,
+		{ data: AuthtypesDeprecatedPostableLoginDTO },
+		TContext
+	>;
+}): UseMutationOptions<
+	Awaited<ReturnType<typeof deprecatedCreateSessionByEmailPassword>>,
+	TError,
+	{ data: AuthtypesDeprecatedPostableLoginDTO },
+	TContext
+> => {
+	const mutationKey = ['deprecatedCreateSessionByEmailPassword'];
+	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 deprecatedCreateSessionByEmailPassword>>,
+		{ data: AuthtypesDeprecatedPostableLoginDTO }
+	> = (props) => {
+		const { data } = props ?? {};
+
+		return deprecatedCreateSessionByEmailPassword(data);
+	};
+
+	return { mutationFn, ...mutationOptions };
+};
+
+export type DeprecatedCreateSessionByEmailPasswordMutationResult = NonNullable<
+	Awaited<ReturnType<typeof deprecatedCreateSessionByEmailPassword>>
+>;
+export type DeprecatedCreateSessionByEmailPasswordMutationBody = AuthtypesDeprecatedPostableLoginDTO;
+export type DeprecatedCreateSessionByEmailPasswordMutationError = RenderErrorResponseDTO;
+
+/**
+ * @deprecated
+ * @summary Deprecated create session by email password
+ */
+export const useDeprecatedCreateSessionByEmailPassword = <
+	TError = RenderErrorResponseDTO,
+	TContext = unknown
+>(options?: {
+	mutation?: UseMutationOptions<
+		Awaited<ReturnType<typeof deprecatedCreateSessionByEmailPassword>>,
+		TError,
+		{ data: AuthtypesDeprecatedPostableLoginDTO },
+		TContext
+	>;
+}): UseMutationResult<
+	Awaited<ReturnType<typeof deprecatedCreateSessionByEmailPassword>>,
+	TError,
+	{ data: AuthtypesDeprecatedPostableLoginDTO },
+	TContext
+> => {
+	const mutationOptions = getDeprecatedCreateSessionByEmailPasswordMutationOptions(
+		options,
+	);
+
+	return useMutation(mutationOptions);
+};
+/**
+ * This endpoint deletes the session
+ * @summary Delete session
+ */
+export const deleteSession = () =>
+	GeneratedAPIInstance<void>({
+		url: `/api/v2/sessions`,
+		method: 'DELETE',
+	});
+
+export const getDeleteSessionMutationOptions = <
+	TError = RenderErrorResponseDTO,
+	TContext = unknown
+>(options?: {
+	mutation?: UseMutationOptions<
+		Awaited<ReturnType<typeof deleteSession>>,
+		TError,
+		void,
+		TContext
+	>;
+}): UseMutationOptions<
+	Awaited<ReturnType<typeof deleteSession>>,
+	TError,
+	void,
+	TContext
+> => {
+	const mutationKey = ['deleteSession'];
+	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 deleteSession>>,
+		void
+	> = () => deleteSession();
+
+	return { mutationFn, ...mutationOptions };
+};
+
+export type DeleteSessionMutationResult = NonNullable<
+	Awaited<ReturnType<typeof deleteSession>>
+>;
+
+export type DeleteSessionMutationError = RenderErrorResponseDTO;
+
+/**
+ * @summary Delete session
+ */
+export const useDeleteSession = <
+	TError = RenderErrorResponseDTO,
+	TContext = unknown
+>(options?: {
+	mutation?: UseMutationOptions<
+		Awaited<ReturnType<typeof deleteSession>>,
+		TError,
+		void,
+		TContext
+	>;
+}): UseMutationResult<
+	Awaited<ReturnType<typeof deleteSession>>,
+	TError,
+	void,
+	TContext
+> => {
+	const mutationOptions = getDeleteSessionMutationOptions(options);
+
+	return useMutation(mutationOptions);
+};
+/**
+ * This endpoint returns the context for the session
+ * @summary Get session context
+ */
+export const getSessionContext = (signal?: AbortSignal) =>
+	GeneratedAPIInstance<GetSessionContext200>({
+		url: `/api/v2/sessions/context`,
+		method: 'GET',
+		signal,
+	});
+
+export const getGetSessionContextQueryKey = () =>
+	['getSessionContext'] as const;
+
+export const getGetSessionContextQueryOptions = <
+	TData = Awaited<ReturnType<typeof getSessionContext>>,
+	TError = RenderErrorResponseDTO
+>(options?: {
+	query?: UseQueryOptions<
+		Awaited<ReturnType<typeof getSessionContext>>,
+		TError,
+		TData
+	>;
+}) => {
+	const { query: queryOptions } = options ?? {};
+
+	const queryKey = queryOptions?.queryKey ?? getGetSessionContextQueryKey();
+
+	const queryFn: QueryFunction<
+		Awaited<ReturnType<typeof getSessionContext>>
+	> = ({ signal }) => getSessionContext(signal);
+
+	return { queryKey, queryFn, ...queryOptions } as UseQueryOptions<
+		Awaited<ReturnType<typeof getSessionContext>>,
+		TError,
+		TData
+	> & { queryKey: QueryKey };
+};
+
+export type GetSessionContextQueryResult = NonNullable<
+	Awaited<ReturnType<typeof getSessionContext>>
+>;
+export type GetSessionContextQueryError = RenderErrorResponseDTO;
+
+/**
+ * @summary Get session context
+ */
+
+export function useGetSessionContext<
+	TData = Awaited<ReturnType<typeof getSessionContext>>,
+	TError = RenderErrorResponseDTO
+>(options?: {
+	query?: UseQueryOptions<
+		Awaited<ReturnType<typeof getSessionContext>>,
+		TError,
+		TData
+	>;
+}): UseQueryResult<TData, TError> & { queryKey: QueryKey } {
+	const queryOptions = getGetSessionContextQueryOptions(options);
+
+	const query = useQuery(queryOptions) as UseQueryResult<TData, TError> & {
+		queryKey: QueryKey;
+	};
+
+	query.queryKey = queryOptions.queryKey;
+
+	return query;
+}
+
+/**
+ * @summary Get session context
+ */
+export const invalidateGetSessionContext = async (
+	queryClient: QueryClient,
+	options?: InvalidateOptions,
+): Promise<QueryClient> => {
+	await queryClient.invalidateQueries(
+		{ queryKey: getGetSessionContextQueryKey() },
+		options,
+	);
+
+	return queryClient;
+};
+
+/**
+ * This endpoint creates a session for a user using email and password.
+ * @summary Create session by email and password
+ */
+export const createSessionByEmailPassword = (
+	authtypesPostableEmailPasswordSessionDTO: AuthtypesPostableEmailPasswordSessionDTO,
+	signal?: AbortSignal,
+) =>
+	GeneratedAPIInstance<CreateSessionByEmailPassword200>({
+		url: `/api/v2/sessions/email_password`,
+		method: 'POST',
+		headers: { 'Content-Type': 'application/json' },
+		data: authtypesPostableEmailPasswordSessionDTO,
+		signal,
+	});
+
+export const getCreateSessionByEmailPasswordMutationOptions = <
+	TError = RenderErrorResponseDTO,
+	TContext = unknown
+>(options?: {
+	mutation?: UseMutationOptions<
+		Awaited<ReturnType<typeof createSessionByEmailPassword>>,
+		TError,
+		{ data: AuthtypesPostableEmailPasswordSessionDTO },
+		TContext
+	>;
+}): UseMutationOptions<
+	Awaited<ReturnType<typeof createSessionByEmailPassword>>,
+	TError,
+	{ data: AuthtypesPostableEmailPasswordSessionDTO },
+	TContext
+> => {
+	const mutationKey = ['createSessionByEmailPassword'];
+	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 createSessionByEmailPassword>>,
+		{ data: AuthtypesPostableEmailPasswordSessionDTO }
+	> = (props) => {
+		const { data } = props ?? {};
+
+		return createSessionByEmailPassword(data);
+	};
+
+	return { mutationFn, ...mutationOptions };
+};
+
+export type CreateSessionByEmailPasswordMutationResult = NonNullable<
+	Awaited<ReturnType<typeof createSessionByEmailPassword>>
+>;
+export type CreateSessionByEmailPasswordMutationBody = AuthtypesPostableEmailPasswordSessionDTO;
+export type CreateSessionByEmailPasswordMutationError = RenderErrorResponseDTO;
+
+/**
+ * @summary Create session by email and password
+ */
+export const useCreateSessionByEmailPassword = <
+	TError = RenderErrorResponseDTO,
+	TContext = unknown
+>(options?: {
+	mutation?: UseMutationOptions<
+		Awaited<ReturnType<typeof createSessionByEmailPassword>>,
+		TError,
+		{ data: AuthtypesPostableEmailPasswordSessionDTO },
+		TContext
+	>;
+}): UseMutationResult<
+	Awaited<ReturnType<typeof createSessionByEmailPassword>>,
+	TError,
+	{ data: AuthtypesPostableEmailPasswordSessionDTO },
+	TContext
+> => {
+	const mutationOptions = getCreateSessionByEmailPasswordMutationOptions(
+		options,
+	);
+
+	return useMutation(mutationOptions);
+};
+/**
+ * This endpoint rotates the session
+ * @summary Rotate session
+ */
+export const rotateSession = (
+	authtypesPostableRotateTokenDTO: AuthtypesPostableRotateTokenDTO,
+	signal?: AbortSignal,
+) =>
+	GeneratedAPIInstance<RotateSession200>({
+		url: `/api/v2/sessions/rotate`,
+		method: 'POST',
+		headers: { 'Content-Type': 'application/json' },
+		data: authtypesPostableRotateTokenDTO,
+		signal,
+	});
+
+export const getRotateSessionMutationOptions = <
+	TError = RenderErrorResponseDTO,
+	TContext = unknown
+>(options?: {
+	mutation?: UseMutationOptions<
+		Awaited<ReturnType<typeof rotateSession>>,
+		TError,
+		{ data: AuthtypesPostableRotateTokenDTO },
+		TContext
+	>;
+}): UseMutationOptions<
+	Awaited<ReturnType<typeof rotateSession>>,
+	TError,
+	{ data: AuthtypesPostableRotateTokenDTO },
+	TContext
+> => {
+	const mutationKey = ['rotateSession'];
+	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 rotateSession>>,
+		{ data: AuthtypesPostableRotateTokenDTO }
+	> = (props) => {
+		const { data } = props ?? {};
+
+		return rotateSession(data);
+	};
+
+	return { mutationFn, ...mutationOptions };
+};
+
+export type RotateSessionMutationResult = NonNullable<
+	Awaited<ReturnType<typeof rotateSession>>
+>;
+export type RotateSessionMutationBody = AuthtypesPostableRotateTokenDTO;
+export type RotateSessionMutationError = RenderErrorResponseDTO;
+
+/**
+ * @summary Rotate session
+ */
+export const useRotateSession = <
+	TError = RenderErrorResponseDTO,
+	TContext = unknown
+>(options?: {
+	mutation?: UseMutationOptions<
+		Awaited<ReturnType<typeof rotateSession>>,
+		TError,
+		{ data: AuthtypesPostableRotateTokenDTO },
+		TContext
+	>;
+}): UseMutationResult<
+	Awaited<ReturnType<typeof rotateSession>>,
+	TError,
+	{ data: AuthtypesPostableRotateTokenDTO },
+	TContext
+> => {
+	const mutationOptions = getRotateSessionMutationOptions(options);
+
+	return useMutation(mutationOptions);
+};

frontend/src/api/index.ts

@@ -229,6 +229,17 @@ export const GatewayApiV2Instance = axios.create({
 	baseURL: `${ENVIRONMENT.baseURL}${gatewayApiV2}`,
 });
 
+// generated API Instance
+export const GeneratedAPIInstance = axios.create({
+	baseURL: ENVIRONMENT.baseURL,
+});
+
+GeneratedAPIInstance.interceptors.request.use(interceptorsRequestResponse);
+GeneratedAPIInstance.interceptors.response.use(
+	interceptorsResponse,
+	interceptorRejected,
+);
+
 GatewayApiV2Instance.interceptors.response.use(
 	interceptorsResponse,
 	interceptorRejected,

frontend/src/api/v2/factor_password/forgotPassword.ts

@@ -0,0 +1,15 @@
+import { ApiV2Instance } from 'api';
+
+interface ForgotPasswordPayload {
+	orgId: string;
+	email: string;
+	frontendBaseURL: string;
+}
+
+const forgotPassword = async (
+	payload: ForgotPasswordPayload,
+): Promise<void> => {
+	await ApiV2Instance.post('/factor_password/forgot', payload);
+};
+
+export default forgotPassword;

frontend/src/auto-import-registry.d.ts

@@ -15,6 +15,7 @@ import '@signozhq/button';
 import '@signozhq/calendar';
 import '@signozhq/callout';
 import '@signozhq/checkbox';
+import '@signozhq/combobox';
 import '@signozhq/command';
 import '@signozhq/design-tokens';
 import '@signozhq/input';

frontend/src/components/CustomTimePicker/CustomTimePicker.tsx

@@ -12,7 +12,7 @@ import {
 	FixedDurationSuggestionOptions,
 	Options,
 	RelativeDurationSuggestionOptions,
-} from 'container/TopNav/DateTimeSelectionV2/config';
+} from 'container/TopNav/DateTimeSelectionV2/constants';
 import dayjs from 'dayjs';
 import { isValidShortHandDateTimeFormat } from 'lib/getMinMax';
 import { defaultTo, isFunction, noop } from 'lodash-es';

frontend/src/components/CustomTimePicker/CustomTimePickerPopoverContent.tsx

@@ -8,11 +8,11 @@ import { DATE_TIME_FORMATS } from 'constants/dateTimeFormats';
 import { QueryParams } from 'constants/query';
 import ROUTES from 'constants/routes';
 import { DateTimeRangeType } from 'container/TopNav/CustomDateTimeModal';
+import { RelativeDurationSuggestionOptions } from 'container/TopNav/DateTimeSelectionV2/constants';
 import {
 	LexicalContext,
 	Option,
-	RelativeDurationSuggestionOptions,
-} from 'container/TopNav/DateTimeSelectionV2/config';
+} from 'container/TopNav/DateTimeSelectionV2/types';
 import dayjs from 'dayjs';
 import { Clock, PenLine, TriangleAlertIcon } from 'lucide-react';
 import { useTimezone } from 'providers/Timezone';

frontend/src/components/CustomTimePicker/RangePickerModal.tsx

@@ -8,7 +8,7 @@ import {
 	CustomTimeType,
 	LexicalContext,
 	Time,
-} from 'container/TopNav/DateTimeSelectionV2/config';
+} from 'container/TopNav/DateTimeSelectionV2/types';
 import dayjs, { Dayjs } from 'dayjs';
 import { useTimezone } from 'providers/Timezone';
 import { Dispatch, SetStateAction, useMemo } from 'react';

frontend/src/components/HostMetricsDetail/HostMetricTraces/HostMetricTraces.tsx

@@ -13,7 +13,7 @@ import DateTimeSelectionV2 from 'container/TopNav/DateTimeSelectionV2';
 import {
 	CustomTimeType,
 	Time,
-} from 'container/TopNav/DateTimeSelectionV2/config';
+} from 'container/TopNav/DateTimeSelectionV2/types';
 import TraceExplorerControls from 'container/TracesExplorer/Controls';
 import { PER_PAGE_OPTIONS } from 'container/TracesExplorer/ListView/configs';
 import { TracesLoading } from 'container/TracesExplorer/TraceLoading/TraceLoading';

frontend/src/components/HostMetricsDetail/HostMetricsDetails.tsx

@@ -24,7 +24,7 @@ import { INFRA_MONITORING_K8S_PARAMS_KEYS } from 'container/InfraMonitoringK8s/c
 import {
 	CustomTimeType,
 	Time,
-} from 'container/TopNav/DateTimeSelectionV2/config';
+} from 'container/TopNav/DateTimeSelectionV2/types';
 import { useIsDarkMode } from 'hooks/useDarkMode';
 import useUrlQuery from 'hooks/useUrlQuery';
 import GetMinMax from 'lib/getMinMax';

frontend/src/components/HostMetricsDetail/HostMetricsLogs/HostMetricLogsDetailedView.tsx

@@ -5,7 +5,7 @@ import DateTimeSelectionV2 from 'container/TopNav/DateTimeSelectionV2';
 import {
 	CustomTimeType,
 	Time,
-} from 'container/TopNav/DateTimeSelectionV2/config';
+} from 'container/TopNav/DateTimeSelectionV2/types';
 import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
 import { useMemo } from 'react';
 import { IBuilderQuery } from 'types/api/queryBuilder/queryBuilderData';

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

@@ -12,7 +12,7 @@ import DateTimeSelectionV2 from 'container/TopNav/DateTimeSelectionV2';
 import {
 	CustomTimeType,
 	Time,
-} from 'container/TopNav/DateTimeSelectionV2/config';
+} from 'container/TopNav/DateTimeSelectionV2/types';
 import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
 import { useIsDarkMode } from 'hooks/useDarkMode';
 import { useResizeObserver } from 'hooks/useDimensions';

frontend/src/components/NewSelect/__test__/VariableItem.integration.test.tsx

@@ -211,7 +211,10 @@ describe('VariableItem Integration Tests', () => {
 			await user.clear(textInput);
 			await user.type(textInput, 'new-text-value');
 
-			// Should call onValueUpdate after debounce
+			// Blur the input to trigger the value update
+			await user.tab();
+
+			// Should call onValueUpdate after blur
 			await waitFor(
 				() => {
 					expect(mockOnValueUpdate).toHaveBeenCalledWith(

frontend/src/components/QueryBuilderV2/QueryBuilderV2.tsx

@@ -4,7 +4,7 @@ import { OPERATORS, PANEL_TYPES } from 'constants/queryBuilder';
 import { Formula } from 'container/QueryBuilder/components/Formula';
 import { QueryBuilderProps } from 'container/QueryBuilder/QueryBuilder.interfaces';
 import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
-import { memo, useEffect, useMemo, useRef } from 'react';
+import { memo, useCallback, useEffect, useMemo, useRef } from 'react';
 import { IBuilderTraceOperator } from 'types/api/queryBuilder/queryBuilderData';
 import { DataSource } from 'types/common/queryBuilder';
 
@@ -33,6 +33,7 @@ export const QueryBuilderV2 = memo(function QueryBuilderV2({
 		addTraceOperator,
 		panelType,
 		initialDataSource,
+		handleRunQuery,
 	} = useQueryBuilder();
 
 	const containerRef = useRef(null);
@@ -157,10 +158,29 @@ export const QueryBuilderV2 = memo(function QueryBuilderV2({
 		[showTraceOperator, traceOperator, hasAtLeastOneTraceQuery],
 	);
 
+	const handleKeyDown = useCallback(
+		(e: React.KeyboardEvent<HTMLDivElement>): void => {
+			const target = e.target as HTMLElement | null;
+			const tagName = target?.tagName || '';
+
+			const isInputElement =
+				['INPUT', 'TEXTAREA', 'SELECT'].includes(tagName) ||
+				(target?.getAttribute('contenteditable') || '').toLowerCase() === 'true';
+
+			// Allow input elements in qb to run the query when Cmd/Ctrl + Enter is pressed
+			if (isInputElement && (e.metaKey || e.ctrlKey) && e.key === 'Enter') {
+				e.preventDefault();
+				e.stopPropagation();
+				handleRunQuery();
+			}
+		},
+		[handleRunQuery],
+	);
+
 	return (
 		<QueryBuilderV2Provider>
 			<div className="query-builder-v2">
-				<div className="qb-content-container">
+				<div className="qb-content-container" onKeyDownCapture={handleKeyDown}>
 					{!isMultiQueryAllowed ? (
 						<QueryV2
 							ref={containerRef}

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

@@ -11,7 +11,7 @@ import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
 import { useQueryOperations } from 'hooks/queryBuilder/useQueryBuilderOperations';
 import { get, isEmpty } from 'lodash-es';
 import { BarChart2, ChevronUp, ExternalLink, ScrollText } from 'lucide-react';
-import { useCallback, useEffect, useState } from 'react';
+import { useCallback, useEffect, useRef, useState } from 'react';
 import { IBuilderQuery } from 'types/api/queryBuilder/queryBuilderData';
 import { MetricAggregation } from 'types/api/v5/queryRange';
 import { DataSource, ReduceOperators } from 'types/common/queryBuilder';
@@ -171,6 +171,9 @@ function QueryAddOns({
 
 	const [selectedViews, setSelectedViews] = useState<AddOn[]>([]);
 
+	const initializedRef = useRef(false);
+	const prevAvailableKeysRef = useRef<Set<string> | null>(null);
+
 	const { handleChangeQueryData } = useQueryOperations({
 		index,
 		query,
@@ -213,23 +216,41 @@ function QueryAddOns({
 		}
 		setAddOns(filteredAddOns);
 
-		const activeAddOnKeys = new Set(
-			Object.entries(ADD_ONS_KEYS_TO_QUERY_PATH)
-				.filter(([, path]) => hasValue(get(query, path)))
-				.map(([key]) => key),
-		);
+		const availableAddOnKeys = new Set(filteredAddOns.map((a) => a.key));
+		const previousKeys = prevAvailableKeysRef.current;
+		const hasAvailabilityItemsChanged =
+			previousKeys !== null &&
+			(previousKeys.size !== availableAddOnKeys.size ||
+				[...availableAddOnKeys].some((key) => !previousKeys.has(key)));
+		prevAvailableKeysRef.current = availableAddOnKeys;
 
-		const availableAddOnKeys = new Set(filteredAddOns.map((addOn) => addOn.key));
-		// Filter and set selected views: add-ons that are both active and available
-		setSelectedViews(
-			filteredAddOns.filter(
-				(addOn) =>
-					activeAddOnKeys.has(addOn.key) && availableAddOnKeys.has(addOn.key),
+		if (!initializedRef.current || hasAvailabilityItemsChanged) {
+			initializedRef.current = true;
+
+			const activeAddOnKeys = new Set(
+				Object.entries(ADD_ONS_KEYS_TO_QUERY_PATH)
+					.filter(([, path]) => hasValue(get(query, path)))
+					.map(([key]) => key),
+			);
+
+			// Initial seeding from query values on mount
+			setSelectedViews(
+				filteredAddOns.filter(
+					(addOn) =>
+						activeAddOnKeys.has(addOn.key) && availableAddOnKeys.has(addOn.key),
+				),
+			);
+			return;
+		}
+
+		setSelectedViews((prev) =>
+			prev.filter((view) =>
+				filteredAddOns.some((addOn) => addOn.key === view.key),
 			),
 		);
 
 		// eslint-disable-next-line react-hooks/exhaustive-deps
-	}, [panelType, isListViewPanel, query]);
+	}, [panelType, isListViewPanel, query, showReduceTo]);
 
 	const handleOptionClick = (e: RadioChangeEvent): void => {
 		if (selectedViews.find((view) => view.key === e.target.value.key)) {

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

@@ -1379,8 +1379,6 @@ function QuerySearch({
 									run: (): boolean => {
 										if (onRun && typeof onRun === 'function') {
 											onRun(getCurrentExpression());
-										} else {
-											handleRunQuery();
 										}
 										return true;
 									},

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

@@ -410,8 +410,6 @@ function TraceOperatorEditor({
 									run: (): boolean => {
 										if (onRun && typeof onRun === 'function') {
 											onRun(value);
-										} else {
-											handleRunQuery();
 										}
 										return true;
 									},

frontend/src/components/QueryBuilderV2/QueryV2/__tests__/QuerySearch.test.tsx

@@ -270,44 +270,6 @@ describe('QuerySearch (Integration with Real CodeMirror)', () => {
 		await waitFor(() => expect(onRun).toHaveBeenCalled(), { timeout: 2000 });
 	});
 
-	it('calls handleRunQuery when Mod-Enter without onRun', async () => {
-		const mockedHandleRunQuery = handleRunQueryMock as jest.MockedFunction<
-			() => void
-		>;
-		mockedHandleRunQuery.mockClear();
-
-		render(
-			<QuerySearch
-				onChange={jest.fn() as jest.MockedFunction<(v: string) => void>}
-				queryData={initialQueriesMap.logs.builder.queryData[0]}
-				dataSource={DataSource.LOGS}
-			/>,
-		);
-
-		// Wait for CodeMirror to initialize
-		await waitFor(() => {
-			const editor = document.querySelector(CM_EDITOR_SELECTOR);
-			expect(editor).toBeInTheDocument();
-		});
-
-		const editor = document.querySelector(CM_EDITOR_SELECTOR) as HTMLElement;
-		await userEvent.click(editor);
-		await userEvent.type(editor, SAMPLE_VALUE_TYPING_COMPLETE);
-
-		// Use fireEvent for keyboard shortcuts as userEvent might not work well with CodeMirror
-		const modKey = navigator.platform.includes('Mac') ? 'metaKey' : 'ctrlKey';
-		fireEvent.keyDown(editor, {
-			key: 'Enter',
-			code: 'Enter',
-			[modKey]: true,
-			keyCode: 13,
-		});
-
-		await waitFor(() => expect(mockedHandleRunQuery).toHaveBeenCalled(), {
-			timeout: 2000,
-		});
-	});
-
 	it('initializes CodeMirror with expression from queryData.filter.expression on mount', async () => {
 		const testExpression =
 			"http.status_code >= 500 AND service.name = 'frontend'";

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

@@ -3,14 +3,21 @@
 import '@testing-library/jest-dom';
 
 import { jest } from '@jest/globals';
+import { fireEvent, waitFor } from '@testing-library/react';
+import { PANEL_TYPES } from 'constants/queryBuilder';
 import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
 import { useQueryOperations } from 'hooks/queryBuilder/useQueryBuilderOperations';
-import { render, screen } from 'tests/test-utils';
-import { Having, IBuilderQuery } from 'types/api/queryBuilder/queryBuilderData';
+import { render, screen, userEvent } from 'tests/test-utils';
+import {
+	Having,
+	IBuilderQuery,
+	Query,
+} from 'types/api/queryBuilder/queryBuilderData';
+import { EQueryType } from 'types/common/dashboard';
 import { UseQueryOperations } from 'types/common/operations.types';
 import { DataSource, QueryBuilderContextType } from 'types/common/queryBuilder';
 
-import { QueryV2 } from '../QueryV2';
+import { QueryBuilderV2 } from '../../QueryBuilderV2';
 
 // Local mocks for domain-specific heavy child components
 jest.mock(
@@ -36,16 +43,87 @@ const mockedUseQueryOperations = jest.mocked(
 	useQueryOperations,
 ) as jest.MockedFunction<UseQueryOperations>;
 
-describe('QueryV2 - base render', () => {
+describe('QueryBuilderV2 + QueryV2 - base render', () => {
+	let handleRunQueryMock: jest.MockedFunction<() => void>;
+
 	beforeEach(() => {
 		const mockCloneQuery = jest.fn() as jest.MockedFunction<
 			(type: string, q: IBuilderQuery) => void
 		>;
+		handleRunQueryMock = jest.fn() as jest.MockedFunction<() => void>;
+		const baseQuery: IBuilderQuery = {
+			queryName: 'A',
+			dataSource: DataSource.LOGS,
+			aggregateOperator: '',
+			aggregations: [],
+			timeAggregation: '',
+			spaceAggregation: '',
+			temporality: '',
+			functions: [],
+			filter: undefined,
+			filters: { items: [], op: 'AND' },
+			groupBy: [],
+			expression: '',
+			disabled: false,
+			having: [] as Having[],
+			limit: 10,
+			stepInterval: null,
+			orderBy: [],
+			legend: 'A',
+		};
+
+		const currentQueryObj: Query = {
+			id: 'test',
+			unit: undefined,
+			queryType: EQueryType.CLICKHOUSE,
+			promql: [],
+			clickhouse_sql: [],
+			builder: {
+				queryData: [baseQuery],
+				queryFormulas: [],
+				queryTraceOperator: [],
+			},
+		};
+
+		const updateAllQueriesOperators: QueryBuilderContextType['updateAllQueriesOperators'] = (
+			q,
+		) => q;
+		const updateQueriesData: QueryBuilderContextType['updateQueriesData'] = (q) =>
+			q;
 
 		mockedUseQueryBuilder.mockReturnValue(({
-			// Only fields used by QueryV2
+			currentQuery: currentQueryObj,
+			stagedQuery: null,
+			lastUsedQuery: null,
+			setLastUsedQuery: jest.fn(),
+			supersetQuery: currentQueryObj,
+			setSupersetQuery: jest.fn(),
+			initialDataSource: null,
+			panelType: PANEL_TYPES.TABLE,
+			isEnabledQuery: true,
+			handleSetQueryData: jest.fn(),
+			handleSetTraceOperatorData: jest.fn(),
+			handleSetFormulaData: jest.fn(),
+			handleSetQueryItemData: jest.fn(),
+			handleSetConfig: jest.fn(),
+			removeQueryBuilderEntityByIndex: jest.fn(),
+			removeAllQueryBuilderEntities: jest.fn(),
+			removeQueryTypeItemByIndex: jest.fn(),
+			addNewBuilderQuery: jest.fn(),
+			addNewFormula: jest.fn(),
+			removeTraceOperator: jest.fn(),
+			addTraceOperator: jest.fn(),
 			cloneQuery: mockCloneQuery,
-			panelType: null,
+			addNewQueryItem: jest.fn(),
+			redirectWithQueryBuilderData: jest.fn(),
+			handleRunQuery: handleRunQueryMock,
+			resetQuery: jest.fn(),
+			handleOnUnitsChange: jest.fn(),
+			updateAllQueriesOperators,
+			updateQueriesData,
+			initQueryBuilderData: jest.fn(),
+			isStagedQueryUpdated: jest.fn(() => false),
+			isDefaultQuery: jest.fn(() => false),
 		} as unknown) as QueryBuilderContextType);
 
 		mockedUseQueryOperations.mockReturnValue({
@@ -71,40 +149,7 @@ describe('QueryV2 - base render', () => {
 	});
 
 	it('renders limit input when dataSource is logs', () => {
-		const baseQuery: IBuilderQuery = {
-			queryName: 'A',
-			dataSource: DataSource.LOGS,
-			aggregateOperator: '',
-			aggregations: [],
-			timeAggregation: '',
-			spaceAggregation: '',
-			temporality: '',
-			functions: [],
-			filter: undefined,
-			filters: { items: [], op: 'AND' },
-			groupBy: [],
-			expression: '',
-			disabled: false,
-			having: [] as Having[],
-			limit: 10,
-			stepInterval: null,
-			orderBy: [],
-			legend: 'A',
-		};
-
-		render(
-			<QueryV2
-				index={0}
-				isAvailableToDisable
-				query={baseQuery}
-				version="v4"
-				onSignalSourceChange={jest.fn() as jest.MockedFunction<(v: string) => void>}
-				signalSourceChangeEnabled={false}
-				queriesCount={1}
-				showTraceOperator={false}
-				hasTraceOperator={false}
-			/>,
-		);
+		render(<QueryBuilderV2 panelType={PANEL_TYPES.TABLE} version="v4" />);
 
 		// Ensure the Limit add-on input is present and is of type number
 		const limitInput = screen.getByPlaceholderText(
@@ -115,4 +160,43 @@ describe('QueryV2 - base render', () => {
 		expect(limitInput).toHaveAttribute('name', 'limit');
 		expect(limitInput).toHaveAttribute('data-testid', 'input-Limit');
 	});
+
+	it('Cmd+Enter on an input triggers handleRunQuery via container handler', async () => {
+		render(<QueryBuilderV2 panelType={PANEL_TYPES.TABLE} version="v4" />);
+
+		const limitInput = screen.getByPlaceholderText('Enter limit');
+		fireEvent.keyDown(limitInput, {
+			key: 'Enter',
+			code: 'Enter',
+			metaKey: true,
+		});
+
+		expect(handleRunQueryMock).toHaveBeenCalled();
+
+		const legendInput = screen.getByPlaceholderText('Write legend format');
+		fireEvent.keyDown(legendInput, {
+			key: 'Enter',
+			code: 'Enter',
+			metaKey: true,
+		});
+
+		expect(handleRunQueryMock).toHaveBeenCalled();
+
+		const CM_EDITOR_SELECTOR = '.cm-editor .cm-content';
+		// Wait for CodeMirror to initialize
+		await waitFor(() => {
+			const editor = document.querySelector(CM_EDITOR_SELECTOR);
+			expect(editor).toBeInTheDocument();
+		});
+
+		const editor = document.querySelector(CM_EDITOR_SELECTOR) as HTMLElement;
+		await userEvent.click(editor);
+		fireEvent.keyDown(editor, {
+			key: 'Enter',
+			code: 'Enter',
+			metaKey: true,
+		});
+
+		expect(handleRunQueryMock).toHaveBeenCalled();
+	});
 });

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

@@ -43,6 +43,12 @@ interface MockFilterConfig {
 }
 
 const SERVICE_NAME_KEY = 'service.name';
+const OTEL_DEMO = 'otel-demo';
+const SAMPLE_FLASK = 'sample-flask';
+const OTLP_PYTHON = 'otlp-python';
+const MQ_KAFKA = 'mq-kafka';
+
+const MOCK_SERVICE_NAMES = [MQ_KAFKA, OTEL_DEMO, OTLP_PYTHON, SAMPLE_FLASK];
 
 const createMockFilter = (
 	overrides: Partial<MockFilterConfig> = {},
@@ -76,7 +82,7 @@ const createMockQueryBuilderData = (hasActiveFilters = false): any => ({
 											type: 'resource',
 										},
 										op: 'in',
-										value: ['otel-demo', 'sample-flask'],
+										value: [OTEL_DEMO, SAMPLE_FLASK],
 									},
 							  ]
 							: [],
@@ -93,24 +99,32 @@ describe('CheckboxFilter - User Flows', () => {
 		// Reset all mocks
 		jest.clearAllMocks();
 
-		// Default mock implementations using the same structure as existing tests
-		mockUseGetAggregateValues.mockReturnValue({
+		// Default mock implementations for useGetAggregateValues
+		mockUseGetAggregateValues.mockReturnValue(({
 			data: {
 				payload: {
-					stringAttributeValues: [
-						'mq-kafka',
-						'otel-demo',
-						'otlp-python',
-						'sample-flask',
-					],
+					stringAttributeValues: MOCK_SERVICE_NAMES,
 				},
 			},
 			isLoading: false,
-		} as UseQueryResult<SuccessResponse<IAttributeValuesResponse>>);
+			refetch: jest.fn(),
+		} as unknown) as UseQueryResult<SuccessResponse<IAttributeValuesResponse>>);
 
+		// Default mock implementations for useGetQueryKeyValueSuggestions
+		// Returns data in the format expected by the hook
 		mockUseGetQueryKeyValueSuggestions.mockReturnValue({
-			data: null,
+			data: {
+				data: {
+					data: {
+						values: {
+							stringValues: MOCK_SERVICE_NAMES,
+							numberValues: [],
+						},
+					},
+				},
+			},
 			isLoading: false,
+			refetch: jest.fn(),
 		} as any);
 
 		// Setup MSW server for API calls

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

@@ -12,7 +12,10 @@ import {
 	QuickFiltersSource,
 } from 'components/QuickFilters/types';
 import { OPERATORS } from 'constants/antlrQueryConstants';
-import { DATA_TYPE_VS_ATTRIBUTE_VALUES_KEY } from 'constants/queryBuilder';
+import {
+	DATA_TYPE_VS_ATTRIBUTE_VALUES_KEY,
+	PANEL_TYPES,
+} from 'constants/queryBuilder';
 import { DEBOUNCE_DELAY } from 'constants/queryBuilderFilterConfig';
 import { getOperatorValue } from 'container/QueryBuilder/filters/QueryBuilderSearch/utils';
 import { useGetAggregateValues } from 'hooks/queryBuilder/useGetAggregateValues';
@@ -62,17 +65,31 @@ export default function CheckboxFilter(props: ICheckboxProps): JSX.Element {
 		lastUsedQuery,
 		currentQuery,
 		redirectWithQueryBuilderData,
+		panelType,
 	} = useQueryBuilder();
 
+	// Determine if we're in ListView mode
+	const isListView = panelType === PANEL_TYPES.LIST;
+	// In ListView mode, use index 0 for most sources; for TRACES_EXPLORER, use lastUsedQuery
+	// Otherwise use lastUsedQuery for non-ListView modes
+	const activeQueryIndex = useMemo(() => {
+		if (isListView) {
+			return source === QuickFiltersSource.TRACES_EXPLORER
+				? lastUsedQuery || 0
+				: 0;
+		}
+		return lastUsedQuery || 0;
+	}, [isListView, source, lastUsedQuery]);
+
 	// Check if this filter has active filters in the query
 	const isSomeFilterPresentForCurrentAttribute = useMemo(
 		() =>
 			currentQuery.builder.queryData?.[
-				lastUsedQuery || 0
+				activeQueryIndex
 			]?.filters?.items?.some((item) =>
 				isEqual(item.key?.key, filter.attributeKey.key),
 			),
-		[currentQuery.builder.queryData, lastUsedQuery, filter.attributeKey.key],
+		[currentQuery.builder.queryData, activeQueryIndex, filter.attributeKey.key],
 	);
 
 	// Derive isOpen from filter state + user action
@@ -169,7 +186,7 @@ export default function CheckboxFilter(props: ICheckboxProps): JSX.Element {
 			false,
 		);
 		const filterSync = currentQuery?.builder.queryData?.[
-			lastUsedQuery || 0
+			activeQueryIndex
 		]?.filters?.items.find((item) =>
 			isEqual(item.key?.key, filter.attributeKey.key),
 		);
@@ -209,19 +226,19 @@ export default function CheckboxFilter(props: ICheckboxProps): JSX.Element {
 		attributeValues,
 		currentQuery?.builder.queryData,
 		filter.attributeKey,
-		lastUsedQuery,
+		activeQueryIndex,
 	]);
 
 	// disable the filter when there are multiple entries of the same attribute key present in the filter bar
 	const isFilterDisabled = useMemo(
 		() =>
 			(currentQuery?.builder?.queryData?.[
-				lastUsedQuery || 0
+				activeQueryIndex
 			]?.filters?.items?.filter((item) =>
 				isEqual(item.key?.key, filter.attributeKey.key),
 			)?.length || 0) > 1,
 
-		[currentQuery?.builder?.queryData, lastUsedQuery, filter.attributeKey],
+		[currentQuery?.builder?.queryData, activeQueryIndex, filter.attributeKey],
 	);
 
 	// variable to check if the current filter has multiple values to its name in the key op value section
@@ -260,7 +277,7 @@ export default function CheckboxFilter(props: ICheckboxProps): JSX.Element {
 					filters: {
 						...item.filters,
 						items:
-							idx === lastUsedQuery
+							idx === activeQueryIndex
 								? item.filters?.items?.filter(
 										(fil) => !isEqual(fil.key?.key, filter.attributeKey.key),
 								  ) || []
@@ -284,7 +301,7 @@ export default function CheckboxFilter(props: ICheckboxProps): JSX.Element {
 		isOnlyOrAllClicked: boolean,
 		// eslint-disable-next-line sonarjs/cognitive-complexity
 	): void => {
-		const query = cloneDeep(currentQuery.builder.queryData?.[lastUsedQuery || 0]);
+		const query = cloneDeep(currentQuery.builder.queryData?.[activeQueryIndex]);
 
 		// if only or all are clicked we do not need to worry about anything just override whatever we have
 		// by either adding a new IN operator value clause in case of ONLY or remove everything we have for ALL.
@@ -515,7 +532,7 @@ export default function CheckboxFilter(props: ICheckboxProps): JSX.Element {
 				...currentQuery.builder,
 				queryData: [
 					...currentQuery.builder.queryData.map((q, idx) => {
-						if (idx === lastUsedQuery) {
+						if (idx === activeQueryIndex) {
 							return query;
 						}
 						return q;

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

@@ -2,7 +2,11 @@
 import './Duration.styles.scss';
 
 import { Button, Collapse } from 'antd';
-import { IQuickFiltersConfig } from 'components/QuickFilters/types';
+import {
+	IQuickFiltersConfig,
+	QuickFiltersSource,
+} from 'components/QuickFilters/types';
+import { PANEL_TYPES } from 'constants/queryBuilder';
 import { getMs } from 'container/Trace/Filters/Panel/PanelBody/Duration/util';
 import { useGetCompositeQueryParam } from 'hooks/queryBuilder/useGetCompositeQueryParam';
 import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
@@ -27,9 +31,11 @@ export type FilterType = Record<
 function Duration({
 	filter,
 	onFilterChange,
+	source,
 }: {
 	filter: IQuickFiltersConfig;
 	onFilterChange?: (query: Query) => void;
+	source?: QuickFiltersSource;
 }): JSX.Element {
 	const [selectedFilters, setSelectedFilters] = useState<
 		Record<
@@ -41,13 +47,31 @@ function Duration({
 		filter.defaultOpen ? 'durationNano' : '',
 	]);
 
-	const { currentQuery, redirectWithQueryBuilderData } = useQueryBuilder();
+	const {
+		currentQuery,
+		redirectWithQueryBuilderData,
+		lastUsedQuery,
+		panelType,
+	} = useQueryBuilder();
 
 	const compositeQuery = useGetCompositeQueryParam();
 
+	const isListView = panelType === PANEL_TYPES.LIST;
+	// In ListView mode, use index 0 for most sources; for TRACES_EXPLORER, use lastUsedQuery
+	// Otherwise use lastUsedQuery for non-ListView modes
+	const activeQueryIndex = useMemo(() => {
+		if (isListView) {
+			return source === QuickFiltersSource.TRACES_EXPLORER
+				? lastUsedQuery || 0
+				: 0;
+		}
+		return lastUsedQuery || 0;
+	}, [isListView, source, lastUsedQuery]);
+
 	// eslint-disable-next-line sonarjs/cognitive-complexity
 	const syncSelectedFilters = useMemo((): FilterType => {
-		const filters = compositeQuery?.builder.queryData?.[0].filters;
+		const filters =
+			compositeQuery?.builder.queryData?.[activeQueryIndex]?.filters;
 		if (!filters) {
 			return {} as FilterType;
 		}
@@ -95,7 +119,7 @@ function Duration({
 
 				return acc;
 			}, {} as FilterType);
-	}, [compositeQuery]);
+	}, [compositeQuery, activeQueryIndex]);
 
 	useEffect(() => {
 		if (!isEqual(syncSelectedFilters, selectedFilters)) {
@@ -195,20 +219,25 @@ function Duration({
 				...currentQuery,
 				builder: {
 					...currentQuery.builder,
-					queryData: currentQuery.builder.queryData.map((item) => ({
-						...item,
-						filters: {
-							...item.filters,
-							items: props?.resetAll
-								? []
-								: (unionTagFilterItems(item.filters?.items || [], preparePostData())
-										.map((item) =>
-											item.key?.key === props?.clearByType ? undefined : item,
-										)
-										.filter((i) => i) as TagFilterItem[]),
-							op: item.filters?.op || 'AND',
-						},
-					})),
+					queryData: currentQuery.builder.queryData.map((item, idx) => {
+						if (idx !== activeQueryIndex) {
+							return item;
+						}
+						return {
+							...item,
+							filters: {
+								...item.filters,
+								items: props?.resetAll
+									? []
+									: (unionTagFilterItems(item.filters?.items || [], preparePostData())
+											.map((item) =>
+												item.key?.key === props?.clearByType ? undefined : item,
+											)
+											.filter((i) => i) as TagFilterItem[]),
+								op: item.filters?.op || 'AND',
+							},
+						};
+					}),
 				},
 			};
 
@@ -221,14 +250,18 @@ function Duration({
 			) {
 				return;
 			}
-
 			if (onFilterChange && isFunction(onFilterChange)) {
 				onFilterChange(preparedQuery);
 			} else {
 				redirectWithQueryBuilderData(preparedQuery);
 			}
 		},
-		[currentQuery, redirectWithQueryBuilderData, selectedFilters],
+		[
+			currentQuery,
+			redirectWithQueryBuilderData,
+			selectedFilters,
+			activeQueryIndex,
+		],
 	);
 
 	useEffect(() => {

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

@@ -38,9 +38,11 @@
 				font-weight: 400;
 				line-height: 18px;
 				letter-spacing: -0.07px;
+				min-width: 70px;
 			}
 
-			.sync-tag {
+			.sync-tag,
+			.select-box {
 				display: flex;
 				padding: 5px 9px;
 				flex-direction: column;
@@ -58,6 +60,19 @@
 				line-height: 18px;
 				text-transform: uppercase;
 			}
+			.select-box {
+				display: flex;
+				padding: 2px 5px;
+				flex-direction: row;
+				justify-content: center;
+				align-items: center;
+				gap: 3px;
+				height: 30px;
+			}
+
+			.select-box-item {
+				min-width: 60px;
+			}
 		}
 
 		.right-actions {

frontend/src/components/QuickFilters/QuickFilters.tsx

@@ -5,6 +5,14 @@ import {
 	SyncOutlined,
 	VerticalAlignTopOutlined,
 } from '@ant-design/icons';
+import {
+	Combobox,
+	ComboboxCommand,
+	ComboboxContent,
+	ComboboxItem,
+	ComboboxList,
+	ComboboxTrigger,
+} from '@signozhq/combobox';
 import { Skeleton, Switch, Tooltip, Typography } from 'antd';
 import getLocalStorageKey from 'api/browser/localstorage/get';
 import setLocalStorageKey from 'api/browser/localstorage/set';
@@ -12,9 +20,10 @@ import logEvent from 'api/common/logEvent';
 import classNames from 'classnames';
 import OverlayScrollbar from 'components/OverlayScrollbar/OverlayScrollbar';
 import { LOCALSTORAGE } from 'constants/localStorage';
+import { PANEL_TYPES } from 'constants/queryBuilder';
 import { useApiMonitoringParams } from 'container/ApiMonitoring/queryParams';
 import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
-import { cloneDeep, isFunction, isNull } from 'lodash-es';
+import { isFunction, isNull } from 'lodash-es';
 import { Frown, Settings2 as SettingsIcon } from 'lucide-react';
 import { useAppContext } from 'providers/App/App';
 import { useMemo, useState } from 'react';
@@ -57,8 +66,38 @@ export default function QuickFilters(props: IQuickFiltersProps): JSX.Element {
 	const {
 		currentQuery,
 		lastUsedQuery,
+		setLastUsedQuery,
 		redirectWithQueryBuilderData,
+		panelType,
 	} = useQueryBuilder();
+	const [open, setOpen] = useState(false);
+
+	// Sync lastUsedQuery when queries change (e.g., after deletion)
+	const validQueryIndex = useMemo(
+		() =>
+			Math.min(
+				lastUsedQuery || 0,
+				(currentQuery?.builder?.queryData?.length || 1) - 1,
+			),
+		[lastUsedQuery, currentQuery?.builder?.queryData?.length],
+	);
+
+	// Determine if we're in ListView mode
+	const isListView = panelType === PANEL_TYPES.LIST;
+
+	// Generate query options based on available queries
+	const queryOptions = useMemo(() => {
+		if (!currentQuery?.builder?.queryData) return [];
+
+		return currentQuery.builder.queryData.map((query, index) => ({
+			label: query.queryName || String.fromCharCode(65 + index),
+			value: index,
+		}));
+	}, [currentQuery?.builder?.queryData]);
+
+	// Show dropdown in ListView only for TRACES_EXPLORER source
+	const shouldShowDropdownInListView =
+		isListView && source === QuickFiltersSource.TRACES_EXPLORER;
 
 	const showAnnouncementTooltip = useMemo(() => {
 		const localStorageValue = getLocalStorageKey(
@@ -70,36 +109,45 @@ export default function QuickFilters(props: IQuickFiltersProps): JSX.Element {
 		return true;
 	}, []);
 
+	const activeQueryIndex = useMemo(() => {
+		if (isListView) {
+			return source === QuickFiltersSource.TRACES_EXPLORER
+				? lastUsedQuery || 0
+				: 0;
+		}
+		return lastUsedQuery || 0;
+	}, [isListView, source, lastUsedQuery]);
+
 	// clear all the filters for the query which is in sync with filters
 	const handleReset = (): void => {
-		const updatedQuery = cloneDeep(
-			currentQuery?.builder.queryData?.[lastUsedQuery || 0],
-		);
+		const activeQuery = currentQuery?.builder.queryData?.[activeQueryIndex];
 
-		if (!updatedQuery) {
+		if (!activeQuery) {
 			return;
 		}
 
-		if (updatedQuery?.filters?.items) {
-			updatedQuery.filters.items = [];
-		}
-
 		const preparedQuery: Query = {
 			...currentQuery,
 			builder: {
 				...currentQuery.builder,
-				queryData: currentQuery.builder.queryData.map((item, idx) => ({
-					...item,
-					filter: {
-						...item.filter,
-						expression: '',
-					},
-					filters: {
-						...item.filters,
-						items: idx === lastUsedQuery ? [] : [...(item.filters?.items || [])],
-						op: item.filters?.op || 'AND',
-					},
-				})),
+				queryData: currentQuery.builder.queryData.map((item, idx) => {
+					if (idx !== activeQueryIndex) {
+						return item;
+					}
+
+					return {
+						...item,
+						filter: {
+							...item.filter,
+							expression: '',
+						},
+						filters: {
+							...item.filters,
+							items: [],
+							op: item.filters?.op || 'AND',
+						},
+					};
+				}),
 			},
 		};
 
@@ -114,138 +162,195 @@ export default function QuickFilters(props: IQuickFiltersProps): JSX.Element {
 		showQueryName &&
 		currentQuery.builder.queryData?.[lastUsedQuery || 0]?.queryName;
 
+	// In ListView, always show the 0th query's name; otherwise use the active query's name
+	const displayedQueryName = isListView
+		? showQueryName && currentQuery.builder.queryData?.[0]?.queryName
+		: lastQueryName;
+
+	const handleQueryChange = (value: number): void => {
+		setLastUsedQuery(value);
+	};
+
+	// Helpers to reduce cognitive complexity in main render
+	const renderLeftActions = (): JSX.Element => (
+		<section className="left-actions">
+			<FilterOutlined />
+			<Typography.Text className="text">
+				{displayedQueryName ? 'Filters for' : 'Filters'}
+			</Typography.Text>
+			{queryOptions.length > 1 && (!isListView || shouldShowDropdownInListView) ? (
+				<Combobox open={open} onOpenChange={setOpen}>
+					<ComboboxTrigger
+						placeholder="Select a query"
+						value={queryOptions.find((f) => f.value === validQueryIndex)?.label || ''}
+						className="select-box"
+					/>
+					{open && (
+						<ComboboxContent>
+							<ComboboxCommand>
+								<ComboboxList>
+									{queryOptions.map((option) => (
+										<ComboboxItem
+											key={option.value}
+											value={String(option.value)}
+											onSelect={(): void => {
+												handleQueryChange(option.value);
+												setOpen(false);
+											}}
+											isSelected={validQueryIndex === option.value}
+											showCheck={false}
+										>
+											{option.label}
+										</ComboboxItem>
+									))}
+								</ComboboxList>
+							</ComboboxCommand>
+						</ComboboxContent>
+					)}
+				</Combobox>
+			) : (
+				displayedQueryName && (
+					<Tooltip
+						title={`Filter currently in sync with query ${displayedQueryName}`}
+					>
+						<Typography.Text className="sync-tag">
+							{displayedQueryName}
+						</Typography.Text>
+					</Tooltip>
+				)
+			)}
+		</section>
+	);
+
+	const renderRightActions = (): JSX.Element => (
+		<section className="right-actions">
+			<Tooltip title="Reset All">
+				<div className="right-action-icon-container">
+					<SyncOutlined className="sync-icon" onClick={handleReset} />
+				</div>
+			</Tooltip>
+			{showFilterCollapse && (
+				<Tooltip title="Collapse Filters">
+					<div className="right-action-icon-container">
+						<VerticalAlignTopOutlined
+							rotate={270}
+							onClick={handleFilterVisibilityChange}
+						/>
+					</div>
+				</Tooltip>
+			)}
+			{isDynamicFilters && isAdmin && (
+				<Tooltip title="Settings">
+					<div
+						className={classNames('right-action-icon-container', {
+							active: isSettingsOpen,
+						})}
+					>
+						<SettingsIcon
+							className="settings-icon"
+							data-testid="settings-icon"
+							width={14}
+							height={14}
+							onClick={(): void => setIsSettingsOpen(true)}
+						/>
+						<AnnouncementTooltip
+							show={showAnnouncementTooltip}
+							position={{ top: -5, left: 15 }}
+							title="Edit your quick filters"
+							message="You can now customize and re-arrange your quick filters panel. Select the quick filters you’d need and hide away the rest for faster exploration."
+							onClose={(): void => {
+								setLocalStorageKey(
+									LOCALSTORAGE.QUICK_FILTERS_SETTINGS_ANNOUNCEMENT,
+									'false',
+								);
+							}}
+						/>
+					</div>
+				</Tooltip>
+			)}
+		</section>
+	);
+
+	const renderContent = (): JSX.Element => (
+		<>
+			{source === QuickFiltersSource.API_MONITORING && (
+				<div className="api-quick-filters-header">
+					<Typography.Text>Show IP addresses</Typography.Text>
+					<Switch
+						size="small"
+						style={{ marginLeft: 'auto' }}
+						checked={showIP ?? true}
+						onClick={(): void => {
+							logEvent('API Monitoring: Show IP addresses clicked', {
+								showIP: !(showIP ?? true),
+							});
+							setParams({ showIP });
+						}}
+					/>
+				</div>
+			)}
+			<section className="filters">
+				{filterConfig.map((filter) => {
+					switch (filter.type) {
+						case FiltersType.CHECKBOX:
+							return (
+								<Checkbox
+									source={source}
+									filter={filter}
+									onFilterChange={onFilterChange}
+								/>
+							);
+						case FiltersType.DURATION:
+							return (
+								<Duration
+									filter={filter}
+									onFilterChange={onFilterChange}
+									source={source}
+								/>
+							);
+						case FiltersType.SLIDER:
+							return <Slider filter={filter} />;
+						// eslint-disable-next-line sonarjs/no-duplicated-branches
+						default:
+							return (
+								<Checkbox
+									source={source}
+									filter={filter}
+									onFilterChange={onFilterChange}
+								/>
+							);
+					}
+				})}
+
+				{filterConfig.length === 0 && (
+					<div className="no-filters-container">
+						<Frown size={16} />
+						<Typography.Text>No filters found</Typography.Text>
+					</div>
+				)}
+			</section>
+		</>
+	);
+
 	return (
 		<div className="quick-filters-container">
 			<div className="quick-filters">
 				{source !== QuickFiltersSource.INFRA_MONITORING && (
 					<section className="header">
-						<section className="left-actions">
-							<FilterOutlined />
-							<Typography.Text className="text">
-								{lastQueryName ? 'Filters for' : 'Filters'}
-							</Typography.Text>
-							{lastQueryName && (
-								<Tooltip title={`Filter currently in sync with query ${lastQueryName}`}>
-									<Typography.Text className="sync-tag">{lastQueryName}</Typography.Text>
-								</Tooltip>
-							)}
-						</section>
-
-						<section className="right-actions">
-							<Tooltip title="Reset All">
-								<div className="right-action-icon-container">
-									<SyncOutlined className="sync-icon" onClick={handleReset} />
-								</div>
-							</Tooltip>
-							{showFilterCollapse && (
-								<Tooltip title="Collapse Filters">
-									<div className="right-action-icon-container">
-										<VerticalAlignTopOutlined
-											rotate={270}
-											onClick={handleFilterVisibilityChange}
-										/>
-									</div>
-								</Tooltip>
-							)}
-							{isDynamicFilters && isAdmin && (
-								<Tooltip title="Settings">
-									<div
-										className={classNames('right-action-icon-container', {
-											active: isSettingsOpen,
-										})}
-									>
-										<SettingsIcon
-											className="settings-icon"
-											data-testid="settings-icon"
-											width={14}
-											height={14}
-											onClick={(): void => setIsSettingsOpen(true)}
-										/>
-										<AnnouncementTooltip
-											show={showAnnouncementTooltip}
-											position={{ top: -5, left: 15 }}
-											title="Edit your quick filters"
-											message="You can now customize and re-arrange your quick filters panel. Select the quick filters you’d need and hide away the rest for faster exploration."
-											onClose={(): void => {
-												setLocalStorageKey(
-													LOCALSTORAGE.QUICK_FILTERS_SETTINGS_ANNOUNCEMENT,
-													'false',
-												);
-											}}
-										/>
-									</div>
-								</Tooltip>
-							)}
-						</section>
+						{renderLeftActions()}
+						{renderRightActions()}
 					</section>
 				)}
 
 				{isCustomFiltersLoading ? (
 					<div className="quick-filters-skeleton">
 						{Array.from({ length: 5 }).map((_, index) => (
-							<Skeleton.Input
-								active
-								size="small"
-								// eslint-disable-next-line react/no-array-index-key
-								key={index}
-							/>
+							// eslint-disable-next-line react/no-array-index-key
+							<Skeleton.Input active size="small" key={index} />
 						))}
 					</div>
 				) : (
-					<OverlayScrollbar>
-						<>
-							{source === QuickFiltersSource.API_MONITORING && (
-								<div className="api-quick-filters-header">
-									<Typography.Text>Show IP addresses</Typography.Text>
-									<Switch
-										size="small"
-										style={{ marginLeft: 'auto' }}
-										checked={showIP ?? true}
-										onClick={(): void => {
-											logEvent('API Monitoring: Show IP addresses clicked', {
-												showIP: !(showIP ?? true),
-											});
-											setParams({ showIP });
-										}}
-									/>
-								</div>
-							)}
-							<section className="filters">
-								{filterConfig.map((filter) => {
-									switch (filter.type) {
-										case FiltersType.CHECKBOX:
-											return (
-												<Checkbox
-													source={source}
-													filter={filter}
-													onFilterChange={onFilterChange}
-												/>
-											);
-										case FiltersType.DURATION:
-											return <Duration filter={filter} onFilterChange={onFilterChange} />;
-										case FiltersType.SLIDER:
-											return <Slider filter={filter} />;
-										// eslint-disable-next-line sonarjs/no-duplicated-branches
-										default:
-											return (
-												<Checkbox
-													source={source}
-													filter={filter}
-													onFilterChange={onFilterChange}
-												/>
-											);
-									}
-								})}
-
-								{filterConfig.length === 0 && (
-									<div className="no-filters-container">
-										<Frown size={16} />
-										<Typography.Text>No filters found</Typography.Text>
-									</div>
-								)}
-							</section>
-						</>
-					</OverlayScrollbar>
+					<OverlayScrollbar>{renderContent()}</OverlayScrollbar>
 				)}
 			</div>
 			<div className="quick-filters-settings-container">

frontend/src/components/QuickFilters/tests/QuickFilters.test.tsx

@@ -122,6 +122,103 @@ describe('Quick Filters', () => {
 		expect(screen.getByText(QUERY_NAME)).toBeInTheDocument();
 	});
 
+	it('should display and allow selection from query dropdown when multiple queries exist', async () => {
+		const setLastUsedQuery = jest.fn();
+		const user = userEvent.setup({ pointerEventsCheck: 0 });
+
+		(useQueryBuilder as jest.Mock).mockReturnValue({
+			currentQuery: {
+				builder: {
+					queryData: [
+						{
+							queryName: 'Query A',
+							filters: { items: [] },
+						},
+						{
+							queryName: 'Query B',
+							filters: { items: [] },
+						},
+						{
+							queryName: 'Query C',
+							filters: { items: [] },
+						},
+					],
+				},
+			},
+			lastUsedQuery: 0,
+			setLastUsedQuery,
+			redirectWithQueryBuilderData,
+			panelType: 'graph', // not LIST view
+		});
+
+		render(<TestQuickFilters />);
+
+		// The dropdown trigger should show the first query name
+		const trigger = screen.getByText('Query A');
+		expect(trigger).toBeInTheDocument();
+
+		// Click to open the dropdown
+		await user.click(trigger);
+
+		// All query options should be visible
+		await waitFor(() => {
+			expect(screen.getByRole('option', { name: 'Query A' })).toBeInTheDocument();
+			expect(screen.getByRole('option', { name: 'Query B' })).toBeInTheDocument();
+			expect(screen.getByRole('option', { name: 'Query C' })).toBeInTheDocument();
+		});
+
+		// Select Query B
+		const queryBOption = screen.getByRole('option', { name: 'Query B' });
+		await user.click(queryBOption);
+
+		// Verify setLastUsedQuery was called with index 1
+		await waitFor(() => {
+			expect(setLastUsedQuery).toHaveBeenCalledWith(1);
+		});
+	});
+
+	it('should not display query dropdown in ListView', () => {
+		(useQueryBuilder as jest.Mock).mockReturnValue({
+			currentQuery: {
+				builder: {
+					queryData: [
+						{
+							queryName: 'Query A',
+							filters: { items: [] },
+						},
+						{
+							queryName: 'Query B',
+							filters: { items: [] },
+						},
+					],
+				},
+			},
+			lastUsedQuery: 0,
+			redirectWithQueryBuilderData,
+			panelType: 'list', // ListView
+		});
+
+		render(<TestQuickFilters />);
+
+		// Should show static query name without dropdown
+		expect(screen.getByText('Query A')).toBeInTheDocument();
+
+		// Dropdown trigger should not be interactive (no button/combobox)
+		const queryText = screen.getByText('Query A');
+		expect(queryText.tagName).not.toBe('BUTTON');
+	});
+
+	it('should display static query name when only one query exists', () => {
+		render(<TestQuickFilters />);
+
+		// Should show static query name
+		expect(screen.getByText(QUERY_NAME)).toBeInTheDocument();
+
+		// No dropdown should be present
+		const queryText = screen.getByText(QUERY_NAME);
+		expect(queryText.closest('[role="combobox"]')).not.toBeInTheDocument();
+	});
+
 	it('should add filter data to query when checkbox is clicked', async () => {
 		const user = userEvent.setup({ pointerEventsCheck: 0 });
 

frontend/src/constants/routes.ts

@@ -50,6 +50,7 @@ const ROUTES = {
 	LIVE_LOGS: '/logs/logs-explorer/live',
 	LOGS_PIPELINES: '/logs/pipelines',
 	PASSWORD_RESET: '/password-reset',
+	FORGOT_PASSWORD: '/forgot-password',
 	LIST_LICENSES: '/licenses',
 	LOGS_INDEX_FIELDS: '/logs-explorer/index-fields',
 	TRACE_EXPLORER: '/trace-explorer',

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

@@ -7,7 +7,7 @@ import DateTimeSelectionV2 from 'container/TopNav/DateTimeSelectionV2';
 import {
 	CustomTimeType,
 	Time,
-} from 'container/TopNav/DateTimeSelectionV2/config';
+} from 'container/TopNav/DateTimeSelectionV2/types';
 import { useIsDarkMode } from 'hooks/useDarkMode';
 import GetMinMax from 'lib/getMinMax';
 import { ArrowDown, ArrowUp, X } from 'lucide-react';

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

@@ -13,7 +13,7 @@ import QueryBuilderSearchV2 from 'container/QueryBuilder/filters/QueryBuilderSea
 import {
 	CustomTimeType,
 	Time,
-} from 'container/TopNav/DateTimeSelectionV2/config';
+} from 'container/TopNav/DateTimeSelectionV2/types';
 import { GetMetricQueryRange } from 'lib/dashboard/getQueryResults';
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import { useQueries } from 'react-query';

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

@@ -9,7 +9,7 @@ import {
 import {
 	CustomTimeType,
 	Time,
-} from 'container/TopNav/DateTimeSelectionV2/config';
+} from 'container/TopNav/DateTimeSelectionV2/types';
 import { useQueries } from 'react-query';
 import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse';
 import {

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

@@ -37,10 +37,7 @@ function ThresholdItem({
 		);
 		if (units.length === 0) {
 			component = (
-				<Tooltip
-					trigger="hover"
-					title="Please select a Y-axis unit for the query first"
-				>
+				<Tooltip trigger="hover" title="No compatible units available">
 					<Select
 						placeholder="Unit"
 						value={threshold.unit ? threshold.unit : null}

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

@@ -47,9 +47,17 @@ export function getCategoryByOptionId(id: string): string | undefined {
 }
 
 export function getCategorySelectOptionByName(
-	name: string,
+	name: string | undefined,
 ): DefaultOptionType[] {
+	if (!name) {
+		return [];
+	}
+
 	const categories = getYAxisCategories(YAxisSource.ALERTS);
+	if (!categories.length) {
+		return [];
+	}
+
 	return (
 		categories
 			.find((category) => category.name === name)

frontend/src/container/DashboardContainer/DashboardSettings/DashboardVariableSettings/VariableItem/VariableItem.test.tsx

@@ -1,6 +1,12 @@
 /* eslint-disable sonarjs/no-identical-functions */
 /* eslint-disable sonarjs/no-duplicate-string */
-import { fireEvent, render, screen, waitFor } from 'tests/test-utils';
+import {
+	fireEvent,
+	render,
+	screen,
+	userEvent,
+	waitFor,
+} from 'tests/test-utils';
 import {
 	IDashboardVariable,
 	TSortVariableValuesType,
@@ -639,4 +645,186 @@ describe('VariableItem Component', () => {
 			await expectCircularDependencyError();
 		});
 	});
+
+	describe('Textbox Variable Default Value Handling', () => {
+		test('saves textbox variable with defaultValue and selectedValue set to textboxValue', async () => {
+			const user = userEvent.setup();
+			const textboxVariable: IDashboardVariable = {
+				id: TEST_VAR_IDS.VAR1,
+				name: TEST_VAR_NAMES.VAR1,
+				description: 'Test Textbox Variable',
+				type: 'TEXTBOX',
+				textboxValue: 'my-default-value',
+				...VARIABLE_DEFAULTS,
+				order: 0,
+			};
+
+			renderVariableItem(textboxVariable);
+
+			// Click save button
+			const saveButton = screen.getByText(SAVE_BUTTON_TEXT);
+			await user.click(saveButton);
+
+			// Verify that onSave was called with defaultValue and selectedValue equal to textboxValue
+			expect(onSave).toHaveBeenCalledWith(
+				expect.anything(),
+				expect.objectContaining({
+					type: 'TEXTBOX',
+					textboxValue: 'my-default-value',
+					defaultValue: 'my-default-value',
+					selectedValue: 'my-default-value',
+				}),
+				expect.anything(),
+			);
+		});
+
+		test('saves textbox variable with empty values when textboxValue is empty', async () => {
+			const user = userEvent.setup();
+			const textboxVariable: IDashboardVariable = {
+				id: TEST_VAR_IDS.VAR1,
+				name: TEST_VAR_NAMES.VAR1,
+				description: 'Test Textbox Variable',
+				type: 'TEXTBOX',
+				textboxValue: '',
+				...VARIABLE_DEFAULTS,
+				order: 0,
+			};
+
+			renderVariableItem(textboxVariable);
+
+			// Click save button
+			const saveButton = screen.getByText(SAVE_BUTTON_TEXT);
+			await user.click(saveButton);
+
+			// Verify that onSave was called with empty defaultValue and selectedValue
+			expect(onSave).toHaveBeenCalledWith(
+				expect.anything(),
+				expect.objectContaining({
+					type: 'TEXTBOX',
+					textboxValue: '',
+					defaultValue: '',
+					selectedValue: '',
+				}),
+				expect.anything(),
+			);
+		});
+
+		test('updates textbox defaultValue and selectedValue when user changes textboxValue input', async () => {
+			const user = userEvent.setup();
+			const textboxVariable: IDashboardVariable = {
+				id: TEST_VAR_IDS.VAR1,
+				name: TEST_VAR_NAMES.VAR1,
+				description: 'Test Textbox Variable',
+				type: 'TEXTBOX',
+				textboxValue: 'initial-value',
+				...VARIABLE_DEFAULTS,
+				order: 0,
+			};
+
+			renderVariableItem(textboxVariable);
+
+			// Change the textbox value
+			const textboxInput = screen.getByPlaceholderText(
+				'Enter a default value (if any)...',
+			);
+			await user.clear(textboxInput);
+			await user.type(textboxInput, 'updated-value');
+
+			// Click save button
+			const saveButton = screen.getByText(SAVE_BUTTON_TEXT);
+			await user.click(saveButton);
+
+			// Verify that onSave was called with the updated defaultValue and selectedValue
+			expect(onSave).toHaveBeenCalledWith(
+				expect.anything(),
+				expect.objectContaining({
+					type: 'TEXTBOX',
+					textboxValue: 'updated-value',
+					defaultValue: 'updated-value',
+					selectedValue: 'updated-value',
+				}),
+				expect.anything(),
+			);
+		});
+
+		test('non-textbox variables use variableDefaultValue instead of textboxValue', async () => {
+			const user = userEvent.setup();
+			const queryVariable: IDashboardVariable = {
+				id: TEST_VAR_IDS.VAR1,
+				name: TEST_VAR_NAMES.VAR1,
+				description: 'Test Query Variable',
+				type: 'QUERY',
+				queryValue: 'SELECT * FROM test',
+				textboxValue: 'should-not-be-used',
+				defaultValue: 'query-default-value',
+				...VARIABLE_DEFAULTS,
+				order: 0,
+			};
+
+			renderVariableItem(queryVariable);
+
+			// Click save button
+			const saveButton = screen.getByText(SAVE_BUTTON_TEXT);
+			await user.click(saveButton);
+
+			// Verify that onSave was called with defaultValue not being textboxValue
+			expect(onSave).toHaveBeenCalledWith(
+				expect.anything(),
+				expect.objectContaining({
+					type: 'QUERY',
+					defaultValue: 'query-default-value',
+				}),
+				expect.anything(),
+			);
+
+			// Verify that defaultValue is NOT the textboxValue
+			const savedVariable = onSave.mock.calls[0][1];
+			expect(savedVariable.defaultValue).not.toBe('should-not-be-used');
+		});
+
+		test('switching to textbox type sets defaultValue and selectedValue correctly on save', async () => {
+			const user = userEvent.setup();
+			// Start with a QUERY variable
+			const queryVariable: IDashboardVariable = {
+				id: TEST_VAR_IDS.VAR1,
+				name: TEST_VAR_NAMES.VAR1,
+				description: 'Test Variable',
+				type: 'QUERY',
+				queryValue: 'SELECT * FROM test',
+				...VARIABLE_DEFAULTS,
+				order: 0,
+			};
+
+			renderVariableItem(queryVariable);
+
+			// Switch to TEXTBOX type
+			const textboxButton = findButtonByText(TEXT.TEXTBOX);
+			expect(textboxButton).toBeInTheDocument();
+			if (textboxButton) {
+				await user.click(textboxButton);
+			}
+
+			// Enter a default value in the textbox input
+			const textboxInput = screen.getByPlaceholderText(
+				'Enter a default value (if any)...',
+			);
+			await user.type(textboxInput, 'new-textbox-default');
+
+			// Click save button
+			const saveButton = screen.getByText(SAVE_BUTTON_TEXT);
+			await user.click(saveButton);
+
+			// Verify that onSave was called with type TEXTBOX and correct defaultValue and selectedValue
+			expect(onSave).toHaveBeenCalledWith(
+				expect.anything(),
+				expect.objectContaining({
+					type: 'TEXTBOX',
+					textboxValue: 'new-textbox-default',
+					defaultValue: 'new-textbox-default',
+					selectedValue: 'new-textbox-default',
+				}),
+				expect.anything(),
+			);
+		});
+	});
 });

frontend/src/container/DashboardContainer/DashboardSettings/DashboardVariableSettings/VariableItem/VariableItem.tsx

@@ -320,6 +320,10 @@ function VariableItem({
 	]);
 
 	const variableValue = useMemo(() => {
+		if (queryType === 'TEXTBOX') {
+			return variableTextboxValue;
+		}
+
 		if (variableMultiSelect) {
 			let value = variableData.selectedValue;
 			if (isEmpty(value)) {
@@ -352,6 +356,8 @@ function VariableItem({
 		variableData.selectedValue,
 		variableData.showALLOption,
 		variableDefaultValue,
+		variableTextboxValue,
+		queryType,
 		previewValues,
 	]);
 
@@ -367,13 +373,10 @@ function VariableItem({
 			multiSelect: variableMultiSelect,
 			showALLOption: queryType === 'DYNAMIC' ? true : variableShowALLOption,
 			sort: variableSortType,
-			...(queryType === 'TEXTBOX' && {
-				selectedValue: (variableData.selectedValue ||
-					variableTextboxValue) as never,
-			}),
-			...(queryType !== 'TEXTBOX' && {
-				defaultValue: variableDefaultValue as never,
-			}),
+			// the reason we need to do this is because defaultValues are treated differently in case of textbox type
+			// They are the exact same and not like the other types where defaultValue is a separate field
+			defaultValue:
+				queryType === 'TEXTBOX' ? variableTextboxValue : variableDefaultValue,
 			modificationUUID: generateUUID(),
 			id: variableData.id || generateUUID(),
 			order: variableData.order,

frontend/src/container/DashboardContainer/DashboardVariablesSelection/DashboardVariableSelection.styles.scss

@@ -25,6 +25,12 @@
 		}
 	}
 
+	&.focused {
+		.variable-value {
+			outline: 1px solid var(--bg-robin-400);
+		}
+	}
+
 	.variable-value {
 		display: flex;
 		min-width: 120px;
@@ -93,6 +99,12 @@
 
 .lightMode {
 	.variable-item {
+		&.focused {
+			.variable-value {
+				border: 1px solid var(--bg-robin-400);
+			}
+		}
+
 		.variable-name {
 			border: 1px solid var(--bg-vanilla-300);
 			background: var(--bg-vanilla-100);

frontend/src/container/DashboardContainer/DashboardVariablesSelection/DashboardVariableSelection.tsx

@@ -94,7 +94,7 @@ function DashboardVariableSelection(): JSX.Element | null {
 				cycleNodes,
 			});
 		}
-	}, [setVariablesToGetUpdated, variables, variablesTableData]);
+	}, [variables, variablesTableData]);
 
 	// this handles the case where the dependency order changes i.e. variable list updated via creation or deletion etc. and we need to refetch the variables
 	// also trigger when the global time changes

frontend/src/container/DashboardContainer/DashboardVariablesSelection/VariableItem.test.tsx

@@ -80,10 +80,12 @@ describe('VariableItem', () => {
 				/>
 			</MockQueryClientProvider>,
 		);
-		expect(screen.getByPlaceholderText('Enter value')).toBeInTheDocument();
+		expect(
+			screen.getByTestId('variable-textbox-test_variable'),
+		).toBeInTheDocument();
 	});
 
-	test('calls onChange event handler when Input value changes', async () => {
+	test('calls onValueUpdate when Input value changes and blurs', async () => {
 		render(
 			<MockQueryClientProvider>
 				<VariableItem
@@ -102,13 +104,19 @@ describe('VariableItem', () => {
 			</MockQueryClientProvider>,
 		);
 
+		const inputElement = screen.getByTestId('variable-textbox-test_variable');
+
+		// Change the value
 		act(() => {
-			const inputElement = screen.getByPlaceholderText('Enter value');
 			fireEvent.change(inputElement, { target: { value: 'newValue' } });
 		});
 
+		// Blur the input to trigger the update
+		act(() => {
+			fireEvent.blur(inputElement);
+		});
+
 		await waitFor(() => {
-			// expect(mockOnValueUpdate).toHaveBeenCalledTimes(1);
 			expect(mockOnValueUpdate).toHaveBeenCalledWith(
 				'testVariable',
 				'test_variable',

frontend/src/container/DashboardContainer/DashboardVariablesSelection/VariableItem.tsx

@@ -8,14 +8,14 @@ import './DashboardVariableSelection.styles.scss';
 
 import { orange } from '@ant-design/colors';
 import { InfoCircleOutlined, WarningOutlined } from '@ant-design/icons';
-import { Input, Popover, Tooltip, Typography } from 'antd';
+import { Input, InputRef, Popover, Tooltip, Typography } from 'antd';
 import dashboardVariablesQuery from 'api/dashboard/variables/dashboardVariablesQuery';
 import { CustomMultiSelect, CustomSelect } from 'components/NewSelect';
 import { REACT_QUERY_KEY } from 'constants/reactQueryKeys';
 import { commaValuesParser } from 'lib/dashbaordVariables/customCommaValuesParser';
 import sortValues from 'lib/dashbaordVariables/sortVariableValues';
 import { debounce, isArray, isEmpty, isString } from 'lodash-es';
-import { memo, useCallback, useEffect, useMemo, useState } from 'react';
+import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { useQuery } from 'react-query';
 import { useSelector } from 'react-redux';
 import { AppState } from 'store/reducers';
@@ -71,6 +71,15 @@ function VariableItem({
 		string | string[] | undefined
 	>(undefined);
 
+	// Local state for textbox input to ensure smooth editing experience
+	const [textboxInputValue, setTextboxInputValue] = useState<string>(
+		(variableData.selectedValue?.toString() ||
+			variableData.defaultValue?.toString()) ??
+			'',
+	);
+	const [isTextboxFocused, setIsTextboxFocused] = useState<boolean>(false);
+	const textboxInputRef = useRef<InputRef>(null);
+
 	const { maxTime, minTime } = useSelector<AppState, GlobalReducer>(
 		(state) => state.globalTime,
 	);
@@ -371,7 +380,7 @@ function VariableItem({
 	}, [variableData.type, variableData.customValue]);
 
 	return (
-		<div className="variable-item">
+		<div className={`variable-item${isTextboxFocused ? ' focused' : ''}`}>
 			<Typography.Text className="variable-name" ellipsis>
 				${variableData.name}
 				{variableData.description && (
@@ -384,16 +393,40 @@ function VariableItem({
 			<div className="variable-value">
 				{variableData.type === 'TEXTBOX' ? (
 					<Input
+						ref={textboxInputRef}
 						placeholder="Enter value"
+						data-testid={`variable-textbox-${variableData.id}`}
 						bordered={false}
-						key={variableData.selectedValue?.toString()}
-						defaultValue={variableData.selectedValue?.toString()}
+						value={textboxInputValue}
+						title={textboxInputValue}
 						onChange={(e): void => {
-							debouncedHandleChange(e.target.value || '');
+							setTextboxInputValue(e.target.value);
 						}}
-						style={{
-							width:
-								50 + ((variableData.selectedValue?.toString()?.length || 0) * 7 || 50),
+						onFocus={(): void => {
+							setIsTextboxFocused(true);
+						}}
+						onBlur={(e): void => {
+							setIsTextboxFocused(false);
+							const value = e.target.value.trim();
+							// If empty, reset to default value
+							if (!value && variableData.defaultValue) {
+								setTextboxInputValue(variableData.defaultValue.toString());
+								debouncedHandleChange(variableData.defaultValue.toString());
+							} else {
+								debouncedHandleChange(value);
+							}
+						}}
+						onKeyDown={(e): void => {
+							if (e.key === 'Enter') {
+								const value = textboxInputValue.trim();
+								if (!value && variableData.defaultValue) {
+									setTextboxInputValue(variableData.defaultValue.toString());
+									debouncedHandleChange(variableData.defaultValue.toString());
+								} else {
+									debouncedHandleChange(value);
+								}
+								textboxInputRef.current?.blur();
+							}
 						}}
 					/>
 				) : (

frontend/src/container/DashboardContainer/DashboardVariablesSelection/util.ts

@@ -257,6 +257,15 @@ export const onUpdateVariableNode = (
 ): void => {
 	const visited = new Set<string>();
 
+	// If nodeToUpdate is not in topologicalOrder (e.g., CUSTOM variable),
+	// we still need to mark its children as needing updates
+	if (!topologicalOrder.includes(nodeToUpdate)) {
+		// Mark direct children of the node as visited so they get processed
+		(graph[nodeToUpdate] || []).forEach((child) => {
+			visited.add(child);
+		});
+	}
+
 	// Start processing from the node to update
 	topologicalOrder.forEach((node) => {
 		if (node === nodeToUpdate || visited.has(node)) {

frontend/src/container/DashboardContainer/DashboardVariablesSelection/utils.test.ts

@@ -1,4 +1,4 @@
-import { areArraysEqual } from './util';
+import { areArraysEqual, onUpdateVariableNode, VariableGraph } from './util';
 
 describe('areArraysEqual', () => {
 	it('should return true for equal arrays with same order', () => {
@@ -31,3 +31,121 @@ describe('areArraysEqual', () => {
 		expect(areArraysEqual(array1, array2)).toBe(true);
 	});
 });
+
+describe('onUpdateVariableNode', () => {
+	// Graph structure:
+	// deployment -> namespace -> service -> pod
+	// deployment has no parents, namespace depends on deployment, etc.
+	const graph: VariableGraph = {
+		deployment: ['namespace'],
+		namespace: ['service'],
+		service: ['pod'],
+		pod: [],
+		customVar: ['namespace'], // CUSTOM variable that affects namespace
+	};
+
+	const topologicalOrder = ['deployment', 'namespace', 'service', 'pod'];
+
+	it('should call callback for the node and all its descendants', () => {
+		const visited: string[] = [];
+		const callback = (node: string): void => {
+			visited.push(node);
+		};
+
+		onUpdateVariableNode('deployment', graph, topologicalOrder, callback);
+
+		expect(visited).toEqual(['deployment', 'namespace', 'service', 'pod']);
+	});
+
+	it('should call callback starting from a middle node', () => {
+		const visited: string[] = [];
+		const callback = (node: string): void => {
+			visited.push(node);
+		};
+
+		onUpdateVariableNode('namespace', graph, topologicalOrder, callback);
+
+		expect(visited).toEqual(['namespace', 'service', 'pod']);
+	});
+
+	it('should only call callback for the leaf node when updating leaf', () => {
+		const visited: string[] = [];
+		const callback = (node: string): void => {
+			visited.push(node);
+		};
+
+		onUpdateVariableNode('pod', graph, topologicalOrder, callback);
+
+		expect(visited).toEqual(['pod']);
+	});
+
+	it('should handle CUSTOM variable not in topologicalOrder by updating its children', () => {
+		const visited: string[] = [];
+		const callback = (node: string): void => {
+			visited.push(node);
+		};
+
+		// customVar is not in topologicalOrder but has namespace as a child
+		onUpdateVariableNode('customVar', graph, topologicalOrder, callback);
+
+		// Should process namespace and its descendants (service, pod)
+		expect(visited).toEqual(['namespace', 'service', 'pod']);
+	});
+
+	it('should handle node not in graph gracefully', () => {
+		const visited: string[] = [];
+		const callback = (node: string): void => {
+			visited.push(node);
+		};
+
+		onUpdateVariableNode('unknownNode', graph, topologicalOrder, callback);
+
+		// Should not call callback for any node since unknownNode has no children
+		expect(visited).toEqual([]);
+	});
+
+	it('should handle empty graph', () => {
+		const visited: string[] = [];
+		const callback = (node: string): void => {
+			visited.push(node);
+		};
+
+		onUpdateVariableNode('deployment', {}, topologicalOrder, callback);
+
+		// deployment is in topologicalOrder, so callback is called for it
+		expect(visited).toEqual(['deployment']);
+	});
+
+	it('should handle empty topologicalOrder', () => {
+		const visited: string[] = [];
+		const callback = (node: string): void => {
+			visited.push(node);
+		};
+
+		onUpdateVariableNode('deployment', graph, [], callback);
+
+		expect(visited).toEqual([]);
+	});
+
+	it('should handle CUSTOM variable with multiple children', () => {
+		const graphWithMultipleChildren: VariableGraph = {
+			...graph,
+			customMulti: ['namespace', 'service'], // CUSTOM variable affecting multiple nodes
+		};
+
+		const visited: string[] = [];
+		const callback = (node: string): void => {
+			visited.push(node);
+		};
+
+		onUpdateVariableNode(
+			'customMulti',
+			graphWithMultipleChildren,
+			topologicalOrder,
+			callback,
+		);
+
+		// Should process namespace, service, and pod (descendants)
+		expect(visited).toEqual(['namespace', 'service', 'pod']);
+	});
+});

frontend/src/container/ForgotPassword/ForgotPassword.styles.scss

@@ -0,0 +1,68 @@
+.forgot-password-card {
+	width: 100%;
+	max-width: 400px;
+}
+
+.forgot-password-header {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	text-align: center;
+	margin-bottom: 24px;
+}
+
+.forgot-password-header-icon {
+	width: 64px;
+	height: 64px;
+	border-radius: 50%;
+	background: var(--bg-slate-400);
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	margin-bottom: 16px;
+	color: var(--text-vanilla-400);
+
+	&--success {
+		background: var(--bg-forest-400);
+		color: var(--text-forest-400);
+	}
+}
+
+.forgot-password-header-title {
+	margin-bottom: 8px !important;
+}
+
+.forgot-password-header-subtitle {
+	color: var(--text-vanilla-400);
+	margin-bottom: 0 !important;
+}
+
+.forgot-password-form-container {
+	margin-bottom: 16px;
+}
+
+.forgot-password-field-container {
+	margin-bottom: 16px;
+}
+
+.forgot-password-form-input {
+	height: 40px;
+}
+
+.forgot-password-warning-callout {
+	margin-bottom: 16px;
+}
+
+.forgot-password-form-actions {
+	display: flex;
+	gap: 12px;
+	justify-content: space-between;
+}
+
+.forgot-password-back-button {
+	flex: 0 0 auto;
+}
+
+.forgot-password-submit-button {
+	flex: 1;
+}

frontend/src/container/ForgotPassword/index.tsx

@@ -0,0 +1,179 @@
+import './ForgotPassword.styles.scss';
+
+import { Button } from '@signozhq/button';
+import { Callout } from '@signozhq/callout';
+import { Form, Input, Typography } from 'antd';
+import forgotPasswordApi from 'api/v2/factor_password/forgotPassword';
+import AuthError from 'components/AuthError/AuthError';
+import AuthPageContainer from 'components/AuthPageContainer';
+import ROUTES from 'constants/routes';
+import { useNotifications } from 'hooks/useNotifications';
+import history from 'lib/history';
+import { ArrowLeft, ArrowRight, CheckCircle, KeyRound } from 'lucide-react';
+import { Label } from 'pages/SignUp/styles';
+import { useState } from 'react';
+import { useLocation } from 'react-use';
+import APIError from 'types/api/error';
+
+import { FormContainer } from './styles';
+
+type FormValues = { email: string };
+
+function ForgotPassword(): JSX.Element {
+	const [loading, setLoading] = useState(false);
+	const [submitted, setSubmitted] = useState(false);
+	const [errorMessage, setErrorMessage] = useState<APIError | null>(null);
+	const { notifications } = useNotifications();
+
+	const { search } = useLocation();
+	const params = new URLSearchParams(search);
+	const emailFromQuery = params.get('email') || '';
+	const orgIdFromQuery = params.get('orgId') || '';
+
+	const [form] = Form.useForm<FormValues>();
+
+	const handleSubmit = async (): Promise<void> => {
+		try {
+			setLoading(true);
+			setErrorMessage(null);
+			const { email } = form.getFieldsValue();
+
+			await forgotPasswordApi({
+				email: email || emailFromQuery,
+				orgId: orgIdFromQuery,
+				frontendBaseURL: window.location.origin,
+			});
+
+			setSubmitted(true);
+			notifications.success({
+				message: 'Password reset email sent',
+			});
+		} catch (error) {
+			setErrorMessage(error as APIError);
+		} finally {
+			setLoading(false);
+		}
+	};
+
+	const handleBackToLogin = (): void => {
+		history.push(ROUTES.LOGIN);
+	};
+
+	// Success state after submission
+	if (submitted) {
+		return (
+			<AuthPageContainer>
+				<div className="forgot-password-card">
+					<div className="forgot-password-header">
+						<div className="forgot-password-header-icon forgot-password-header-icon--success">
+							<CheckCircle size={32} />
+						</div>
+						<Typography.Title level={4} className="forgot-password-header-title">
+							Check Your Email
+						</Typography.Title>
+						<Typography.Paragraph className="forgot-password-header-subtitle">
+							We have sent a password reset link to your email address. Please check
+							your inbox and follow the instructions to reset your password.
+						</Typography.Paragraph>
+					</div>
+
+					<div className="forgot-password-form-actions">
+						<Button
+							variant="solid"
+							color="primary"
+							onClick={handleBackToLogin}
+							className="forgot-password-submit-button"
+							prefixIcon={<ArrowLeft size={16} />}
+						>
+							Back to Login
+						</Button>
+					</div>
+				</div>
+			</AuthPageContainer>
+		);
+	}
+
+	return (
+		<AuthPageContainer>
+			<div className="forgot-password-card">
+				<div className="forgot-password-header">
+					<div className="forgot-password-header-icon">
+						<KeyRound size={32} />
+					</div>
+					<Typography.Title level={4} className="forgot-password-header-title">
+						Forgot Password?
+					</Typography.Title>
+					<Typography.Paragraph className="forgot-password-header-subtitle">
+						Enter your email address and we will send you a link to reset your
+						password.
+					</Typography.Paragraph>
+				</div>
+
+				<FormContainer
+					form={form}
+					onFinish={handleSubmit}
+					className="forgot-password-form"
+				>
+					<div className="forgot-password-form-container">
+						<div className="forgot-password-form-fields">
+							<div className="forgot-password-field-container">
+								<Label htmlFor="email">Email Address</Label>
+								<Form.Item
+									name="email"
+									initialValue={emailFromQuery}
+									rules={[
+										{ required: true, message: 'Please enter your email!' },
+										{ type: 'email', message: 'Please enter a valid email!' },
+									]}
+								>
+									<Input
+										type="email"
+										id="email"
+										data-testid="email"
+										placeholder="Enter your email address"
+										className="forgot-password-form-input"
+										disabled={!!emailFromQuery}
+									/>
+								</Form.Item>
+							</div>
+						</div>
+					</div>
+
+					{!orgIdFromQuery && (
+						<Callout
+							type="warning"
+							size="small"
+							className="forgot-password-warning-callout"
+							description="Please go back to the login page and enter your email first to reset your password."
+						/>
+					)}
+
+					{errorMessage && <AuthError error={errorMessage} />}
+
+					<div className="forgot-password-form-actions">
+						<Button
+							variant="ghost"
+							onClick={handleBackToLogin}
+							className="forgot-password-back-button"
+							prefixIcon={<ArrowLeft size={16} />}
+						>
+							Back to Login
+						</Button>
+						<Button
+							variant="solid"
+							color="primary"
+							type="submit"
+							disabled={loading || !orgIdFromQuery}
+							className="forgot-password-submit-button"
+							suffixIcon={<ArrowRight size={16} />}
+						>
+							{loading ? 'Sending...' : 'Send Reset Link'}
+						</Button>
+					</div>
+				</FormContainer>
+			</div>
+		</AuthPageContainer>
+	);
+}
+
+export default ForgotPassword;

frontend/src/container/ForgotPassword/styles.ts

@@ -0,0 +1,8 @@
+import { Form } from 'antd';
+import styled from 'styled-components';
+
+export const FormContainer = styled(Form)`
+	& .ant-form-item {
+		margin-bottom: 0px;
+	}
+`;

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

@@ -15,11 +15,10 @@ import GridPanelSwitch from 'container/GridPanelSwitch';
 import { populateMultipleResults } from 'container/NewWidget/LeftContainer/WidgetGraph/util';
 import { getFormatNameByOptionId } from 'container/NewWidget/RightContainer/alertFomatCategories';
 import { timePreferenceType } from 'container/NewWidget/RightContainer/timeItems';
-import { Time } from 'container/TopNav/DateTimeSelection/config';
 import {
 	CustomTimeType,
-	Time as TimeV2,
-} from 'container/TopNav/DateTimeSelectionV2/config';
+	Time,
+} from 'container/TopNav/DateTimeSelectionV2/types';
 import { useGetQueryRange } from 'hooks/queryBuilder/useGetQueryRange';
 import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
 import { useIsDarkMode } from 'hooks/useDarkMode';
@@ -60,7 +59,7 @@ export interface ChartPreviewProps {
 	query: Query | null;
 	graphType?: PANEL_TYPES;
 	selectedTime?: timePreferenceType;
-	selectedInterval?: Time | TimeV2 | CustomTimeType;
+	selectedInterval?: Time | CustomTimeType;
 	headline?: JSX.Element;
 	alertDef?: AlertDef;
 	userQueryKey?: string;

frontend/src/container/FormAlertRules/RuleOptions.styles.scss

@@ -4,3 +4,7 @@
 	gap: 8px;
 	align-items: center;
 }
+
+.rule-unit-selector {
+	width: 150px;
+}

frontend/src/container/FormAlertRules/RuleOptions.tsx

@@ -15,8 +15,7 @@ import { DefaultOptionType } from 'antd/es/select';
 import {
 	getCategoryByOptionId,
 	getCategorySelectOptionByName,
-} from 'container/NewWidget/RightContainer/alertFomatCategories';
-import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
+} from 'container/CreateAlertV2/AlertCondition/utils';
 import { useTranslation } from 'react-i18next';
 import {
 	AlertDef,
@@ -43,10 +42,10 @@ function RuleOptions({
 	setAlertDef,
 	queryCategory,
 	queryOptions,
+	yAxisUnit,
 }: RuleOptionsProps): JSX.Element {
 	// init namespace for translations
 	const { t } = useTranslation('alerts');
-	const { currentQuery } = useQueryBuilder();
 
 	const { ruleType } = alertDef;
 
@@ -365,11 +364,9 @@ function RuleOptions({
 		</InlineSelect>
 	);
 
-	const selectedCategory = getCategoryByOptionId(currentQuery?.unit || '');
+	const selectedCategory = getCategoryByOptionId(yAxisUnit);
 
-	const categorySelectOptions = getCategorySelectOptionByName(
-		selectedCategory?.name,
-	);
+	const categorySelectOptions = getCategorySelectOptionByName(selectedCategory);
 
 	const step3Label = alertDef.alertType === 'METRIC_BASED_ALERT' ? '3' : '2';
 
@@ -402,6 +399,7 @@ function RuleOptions({
 
 							<Form.Item noStyle>
 								<Select
+									className="rule-unit-selector"
 									getPopupContainer={popupContainer}
 									allowClear
 									showSearch
@@ -515,5 +513,6 @@ interface RuleOptionsProps {
 	setAlertDef: (a: AlertDef) => void;
 	queryCategory: EQueryType;
 	queryOptions: DefaultOptionType[];
+	yAxisUnit: string;
 }
 export default RuleOptions;

frontend/src/container/FormAlertRules/index.tsx

@@ -914,6 +914,7 @@ function FormAlertRules({
 							alertDef={alertDef}
 							setAlertDef={setAlertDef}
 							queryOptions={queryOptions}
+							yAxisUnit={yAxisUnit || ''}
 						/>
 
 						{renderBasicInfo()}

frontend/src/container/FormAlertRules/utils.ts

@@ -1,5 +1,5 @@
 import { SelectProps } from 'antd';
-import { Time } from 'container/TopNav/DateTimeSelection/config';
+import { Time } from 'container/TopNav/DateTimeSelectionV2/types';
 import getStartEndRangeTime from 'lib/getStartEndRangeTime';
 import getStep from 'lib/getStep';
 import {

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

@@ -3,7 +3,7 @@ import { DEFAULT_ENTITY_VERSION, ENTITY_VERSION_V5 } from 'constants/app';
 import { QueryParams } from 'constants/query';
 import { PANEL_TYPES } from 'constants/queryBuilder';
 import { populateMultipleResults } from 'container/NewWidget/LeftContainer/WidgetGraph/util';
-import { CustomTimeType } from 'container/TopNav/DateTimeSelectionV2/config';
+import { CustomTimeType } from 'container/TopNav/DateTimeSelectionV2/types';
 import { useGetQueryRange } from 'hooks/queryBuilder/useGetQueryRange';
 import { useIntersectionObserver } from 'hooks/useIntersectionObserver';
 import { getDashboardVariables } from 'lib/dashbaordVariables/getDashboardVariables';
@@ -318,7 +318,9 @@ function GridCardGraph({
 					version={version}
 					threshold={threshold}
 					headerMenuList={menuList}
-					isFetchingResponse={queryResponse.isFetching}
+					isFetchingResponse={
+						queryResponse.isFetching || variablesToGetUpdated.length > 0
+					}
 					setRequestData={setRequestData}
 					onClickHandler={onClickHandler}
 					onDragSelect={onDragSelect}

frontend/src/container/InfraMonitoringK8s/Clusters/ClusterDetails/ClusterDetails.tsx

@@ -26,7 +26,7 @@ import { QUERY_KEYS } from 'container/InfraMonitoringK8s/EntityDetailsUtils/util
 import {
 	CustomTimeType,
 	Time,
-} from 'container/TopNav/DateTimeSelectionV2/config';
+} from 'container/TopNav/DateTimeSelectionV2/types';
 import { useIsDarkMode } from 'hooks/useDarkMode';
 import useUrlQuery from 'hooks/useUrlQuery';
 import GetMinMax from 'lib/getMinMax';

frontend/src/container/InfraMonitoringK8s/DaemonSets/DaemonSetDetails/DaemonSetDetails.tsx

@@ -21,7 +21,7 @@ import {
 import {
 	CustomTimeType,
 	Time,
-} from 'container/TopNav/DateTimeSelectionV2/config';
+} from 'container/TopNav/DateTimeSelectionV2/types';
 import { useIsDarkMode } from 'hooks/useDarkMode';
 import useUrlQuery from 'hooks/useUrlQuery';
 import GetMinMax from 'lib/getMinMax';

frontend/src/container/InfraMonitoringK8s/Deployments/DeploymentDetails/DeploymentDetails.tsx

@@ -26,7 +26,7 @@ import { QUERY_KEYS } from 'container/InfraMonitoringK8s/EntityDetailsUtils/util
 import {
 	CustomTimeType,
 	Time,
-} from 'container/TopNav/DateTimeSelectionV2/config';
+} from 'container/TopNav/DateTimeSelectionV2/types';
 import { useIsDarkMode } from 'hooks/useDarkMode';
 import useUrlQuery from 'hooks/useUrlQuery';
 import GetMinMax from 'lib/getMinMax';

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

@@ -16,7 +16,7 @@ import DateTimeSelectionV2 from 'container/TopNav/DateTimeSelectionV2';
 import {
 	CustomTimeType,
 	Time,
-} from 'container/TopNav/DateTimeSelectionV2/config';
+} from 'container/TopNav/DateTimeSelectionV2/types';
 import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
 import { GetMetricQueryRange } from 'lib/dashboard/getQueryResults';
 import { isArray } from 'lodash-es';

frontend/src/container/InfraMonitoringK8s/EntityDetailsUtils/EntityEvents/__tests__/EntityEvents.test.tsx

@@ -4,7 +4,7 @@ import { fireEvent, render, screen } from '@testing-library/react';
 import { initialQueriesMap } from 'constants/queryBuilder';
 import ROUTES from 'constants/routes';
 import { K8sCategory } from 'container/InfraMonitoringK8s/constants';
-import { Time } from 'container/TopNav/DateTimeSelectionV2/config';
+import { Time } from 'container/TopNav/DateTimeSelectionV2/types';
 import * as useQueryBuilderHooks from 'hooks/queryBuilder/useQueryBuilder';
 import * as appContextHooks from 'providers/App/App';
 import { LicenseEvent } from 'types/api/licensesV3/getActive';

frontend/src/container/InfraMonitoringK8s/EntityDetailsUtils/EntityLogs/EntityLogsDetailedView.tsx

@@ -7,7 +7,7 @@ import DateTimeSelectionV2 from 'container/TopNav/DateTimeSelectionV2';
 import {
 	CustomTimeType,
 	Time,
-} from 'container/TopNav/DateTimeSelectionV2/config';
+} from 'container/TopNav/DateTimeSelectionV2/types';
 import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
 import { useMemo } from 'react';
 import { IBuilderQuery } from 'types/api/queryBuilder/queryBuilderData';

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

@@ -14,7 +14,7 @@ import DateTimeSelectionV2 from 'container/TopNav/DateTimeSelectionV2';
 import {
 	CustomTimeType,
 	Time,
-} from 'container/TopNav/DateTimeSelectionV2/config';
+} from 'container/TopNav/DateTimeSelectionV2/types';
 import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
 import { useIsDarkMode } from 'hooks/useDarkMode';
 import { useResizeObserver } from 'hooks/useDimensions';

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

@@ -2,7 +2,7 @@
 /* eslint-disable sonarjs/no-duplicate-string */
 import { render, screen } from '@testing-library/react';
 import { K8sCategory } from 'container/InfraMonitoringK8s/constants';
-import { Time } from 'container/TopNav/DateTimeSelectionV2/config';
+import { Time } from 'container/TopNav/DateTimeSelectionV2/types';
 import * as appContextHooks from 'providers/App/App';
 import { LicenseEvent } from 'types/api/licensesV3/getActive';
 

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

@@ -15,7 +15,7 @@ import DateTimeSelectionV2 from 'container/TopNav/DateTimeSelectionV2';
 import {
 	CustomTimeType,
 	Time,
-} from 'container/TopNav/DateTimeSelectionV2/config';
+} from 'container/TopNav/DateTimeSelectionV2/types';
 import TraceExplorerControls from 'container/TracesExplorer/Controls';
 import { PER_PAGE_OPTIONS } from 'container/TracesExplorer/ListView/configs';
 import { TracesLoading } from 'container/TracesExplorer/TraceLoading/TraceLoading';