Merge branch 'main' into feat/query-builder

2025-12-17 15:36:48 +00:00 · 2025-07-18 18:41:53 +05:30 · 2025-07-18 18:41:53 +05:30 · 3ef1e884dc
commit 3ef1e884dc
parent 7bafe2d724 ff3bb04655
134 changed files with 3158 additions and 1028 deletions
--- a/.devenv/docker/clickhouse/compose.yaml
+++ b/.devenv/docker/clickhouse/compose.yaml
@ -40,7 +40,7 @@ services:
      timeout: 5s
      retries: 3
  schema-migrator-sync:
-    image: signoz/signoz-schema-migrator:v0.128.0
+    image: signoz/signoz-schema-migrator:v0.128.2
    container_name: schema-migrator-sync
    command:
      - sync
@ -53,7 +53,7 @@ services:
        condition: service_healthy
    restart: on-failure
  schema-migrator-async:
-    image: signoz/signoz-schema-migrator:v0.128.0
+    image: signoz/signoz-schema-migrator:v0.128.2
    container_name: schema-migrator-async
    command:
      - async
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@ -7,14 +7,38 @@
 /frontend/src/container/NewWidget/RightContainer/types.ts @srikanthccv
 /deploy/ @SigNoz/devops
 .github @SigNoz/devops
+
+# Scaffold Owners
 /pkg/config/ @grandwizard28
 /pkg/errors/ @grandwizard28
 /pkg/factory/ @grandwizard28
 /pkg/types/ @grandwizard28
+/pkg/valuer/ @grandwizard28
+/cmd/ @grandwizard28
 .golangci.yml @grandwizard28
+
+# Zeus Owners
 /pkg/zeus/ @vikrantgupta25
-/pkg/licensing/ @vikrantgupta25
-/pkg/sqlmigration/ @vikrantgupta25
 /ee/zeus/ @vikrantgupta25
+/pkg/licensing/ @vikrantgupta25
 /ee/licensing/ @vikrantgupta25
-/ee/sqlmigration/ @vikrantgupta25
+
+# SQL Owners
+/pkg/sqlmigration/ @vikrantgupta25
+/ee/sqlmigration/ @vikrantgupta25
+/pkg/sqlschema/ @vikrantgupta25
+/ee/sqlschema/ @vikrantgupta25
+
+# Analytics Owners
+/pkg/analytics/ @vikrantgupta25
+/pkg/statsreporter/ @vikrantgupta25
+
+# Querier Owners
+/pkg/querier/ @srikanthccv
+/pkg/variables/ @srikanthccv
+/pkg/types/querybuildertypes/ @srikanthccv
+/pkg/querybuilder/ @srikanthccv
+/pkg/telemetrylogs/ @srikanthccv
+/pkg/telemetrymetadata/ @srikanthccv
+/pkg/telemetrymetrics/ @srikanthccv
+/pkg/telemetrytraces/ @srikanthccv
--- a/.github/workflows/build-community.yaml
+++ b/.github/workflows/build-community.yaml
@ -66,7 +66,7 @@ jobs:
      GO_NAME: signoz-community
      GO_INPUT_ARTIFACT_CACHE_KEY: community-jsbuild-${{ github.sha }}
      GO_INPUT_ARTIFACT_PATH: frontend/build
-      GO_BUILD_CONTEXT: ./pkg/query-service
+      GO_BUILD_CONTEXT: ./cmd/community
      GO_BUILD_FLAGS: >-
        -tags timetzdata
        -ldflags='-linkmode external -extldflags \"-static\" -s -w
@ -78,6 +78,6 @@ jobs:
        -X github.com/SigNoz/signoz/pkg/analytics.key=9kRrJ7oPCGPEJLF6QjMPLt5bljFhRQBr'
      GO_CGO_ENABLED: 1
      DOCKER_BASE_IMAGES: '{"alpine": "alpine:3.20.3"}'
-      DOCKER_DOCKERFILE_PATH: ./pkg/query-service/Dockerfile.multi-arch
+      DOCKER_DOCKERFILE_PATH: ./cmd/community/Dockerfile.multi-arch
      DOCKER_MANIFEST: true
      DOCKER_PROVIDERS: dockerhub
--- a/.github/workflows/build-enterprise.yaml
+++ b/.github/workflows/build-enterprise.yaml
@ -96,7 +96,7 @@ jobs:
      GO_VERSION: 1.23
      GO_INPUT_ARTIFACT_CACHE_KEY: enterprise-jsbuild-${{ github.sha }}
      GO_INPUT_ARTIFACT_PATH: frontend/build
-      GO_BUILD_CONTEXT: ./ee/query-service
+      GO_BUILD_CONTEXT: ./cmd/enterprise
      GO_BUILD_FLAGS: >-
        -tags timetzdata
        -ldflags='-linkmode external -extldflags \"-static\" -s -w
@ -112,6 +112,6 @@ jobs:
        -X github.com/SigNoz/signoz/pkg/analytics.key=9kRrJ7oPCGPEJLF6QjMPLt5bljFhRQBr'
      GO_CGO_ENABLED: 1
      DOCKER_BASE_IMAGES: '{"alpine": "alpine:3.20.3"}'
-      DOCKER_DOCKERFILE_PATH: ./ee/query-service/Dockerfile.multi-arch
+      DOCKER_DOCKERFILE_PATH: ./cmd/enterprise/Dockerfile.multi-arch
      DOCKER_MANIFEST: true
      DOCKER_PROVIDERS: ${{ needs.prepare.outputs.docker_providers }}
--- a/.github/workflows/build-staging.yaml
+++ b/.github/workflows/build-staging.yaml
@ -95,7 +95,7 @@ jobs:
      GO_VERSION: 1.23
      GO_INPUT_ARTIFACT_CACHE_KEY: staging-jsbuild-${{ github.sha }}
      GO_INPUT_ARTIFACT_PATH: frontend/build
-      GO_BUILD_CONTEXT: ./ee/query-service
+      GO_BUILD_CONTEXT: ./cmd/enterprise
      GO_BUILD_FLAGS: >-
        -tags timetzdata
        -ldflags='-linkmode external -extldflags \"-static\" -s -w
@ -111,7 +111,7 @@ jobs:
        -X github.com/SigNoz/signoz/pkg/analytics.key=9kRrJ7oPCGPEJLF6QjMPLt5bljFhRQBr'
      GO_CGO_ENABLED: 1
      DOCKER_BASE_IMAGES: '{"alpine": "alpine:3.20.3"}'
-      DOCKER_DOCKERFILE_PATH: ./ee/query-service/Dockerfile.multi-arch
+      DOCKER_DOCKERFILE_PATH: ./cmd/enterprise/Dockerfile.multi-arch
      DOCKER_MANIFEST: true
      DOCKER_PROVIDERS: gcp
  staging:
--- a/.github/workflows/gor-signoz-community.yaml
+++ b/.github/workflows/gor-signoz-community.yaml
@ -36,7 +36,7 @@ jobs:
          - ubuntu-latest
          - macos-latest
    env:
-      CONFIG_PATH: pkg/query-service/.goreleaser.yaml
+      CONFIG_PATH: cmd/community/.goreleaser.yaml
    runs-on: ${{ matrix.os }}
    steps:
      - name: checkout
@ -100,7 +100,7 @@ jobs:
    needs: build
    env:
      DOCKER_CLI_EXPERIMENTAL: "enabled"
-      WORKDIR: pkg/query-service
+      WORKDIR: cmd/community
    steps:
      - name: checkout
        uses: actions/checkout@v4
--- a/.github/workflows/gor-signoz.yaml
+++ b/.github/workflows/gor-signoz.yaml
@ -50,7 +50,7 @@ jobs:
          - ubuntu-latest
          - macos-latest
    env:
-      CONFIG_PATH: ee/query-service/.goreleaser.yaml
+      CONFIG_PATH: cmd/enterprise/.goreleaser.yaml
    runs-on: ${{ matrix.os }}
    steps:
      - name: checkout
--- a/.github/workflows/integrationci.yaml
+++ b/.github/workflows/integrationci.yaml
@ -20,9 +20,9 @@ jobs:
          - sqlite
        clickhouse-version:
          - 24.1.2-alpine
-          - 24.12-alpine
+          - 25.5.6
        schema-migrator-version:
-          - v0.128.0
+          - v0.128.1
        postgres-version:
          - 15
    if: |
--- a/2
+++ b/2
@ -2,7 +2,7 @@ Copyright (c) 2020-present SigNoz Inc.

 Portions of this software are licensed as follows:

-* All content that resides under the "ee/" directory of this repository, if that directory exists, is licensed under the license defined in "ee/LICENSE".
+* All content that resides under the "ee/" and the "cmd/enterprise/" directory of this repository, if that directory exists, is licensed under the license defined in "ee/LICENSE".
 * All third party components incorporated into the SigNoz Software are licensed under the original license provided by the owner of the applicable component.
 * Content outside of the above mentioned directories or restrictions above is available under the "MIT Expat" license as defined below.

--- a/12
+++ b/12
@ -20,18 +20,18 @@ GO_BUILD_LDFLAG_LICENSE_SIGNOZ_IO 	= -X github.com/SigNoz/signoz/ee/zeus.depreca

 GO_BUILD_VERSION_LDFLAGS 		= -X github.com/SigNoz/signoz/pkg/version.version=$(VERSION) -X github.com/SigNoz/signoz/pkg/version.hash=$(COMMIT_SHORT_SHA) -X github.com/SigNoz/signoz/pkg/version.time=$(TIMESTAMP) -X github.com/SigNoz/signoz/pkg/version.branch=$(BRANCH_NAME)
 GO_BUILD_ARCHS_COMMUNITY 		= $(addprefix go-build-community-,$(ARCHS))
-GO_BUILD_CONTEXT_COMMUNITY 		= $(SRC)/pkg/query-service
+GO_BUILD_CONTEXT_COMMUNITY 		= $(SRC)/cmd/community
 GO_BUILD_LDFLAGS_COMMUNITY 		= $(GO_BUILD_VERSION_LDFLAGS) -X github.com/SigNoz/signoz/pkg/version.variant=community
 GO_BUILD_ARCHS_ENTERPRISE 		= $(addprefix go-build-enterprise-,$(ARCHS))
 GO_BUILD_ARCHS_ENTERPRISE_RACE  = $(addprefix go-build-enterprise-race-,$(ARCHS))
-GO_BUILD_CONTEXT_ENTERPRISE 	= $(SRC)/ee/query-service
+GO_BUILD_CONTEXT_ENTERPRISE 	= $(SRC)/cmd/enterprise
 GO_BUILD_LDFLAGS_ENTERPRISE 	= $(GO_BUILD_VERSION_LDFLAGS) -X github.com/SigNoz/signoz/pkg/version.variant=enterprise $(GO_BUILD_LDFLAG_ZEUS_URL) $(GO_BUILD_LDFLAG_LICENSE_SIGNOZ_IO)

 DOCKER_BUILD_ARCHS_COMMUNITY 	= $(addprefix docker-build-community-,$(ARCHS))
-DOCKERFILE_COMMUNITY 			= $(SRC)/pkg/query-service/Dockerfile
+DOCKERFILE_COMMUNITY 			= $(SRC)/cmd/community/Dockerfile
 DOCKER_REGISTRY_COMMUNITY 		?= docker.io/signoz/signoz-community
 DOCKER_BUILD_ARCHS_ENTERPRISE 	= $(addprefix docker-build-enterprise-,$(ARCHS))
-DOCKERFILE_ENTERPRISE 			= $(SRC)/ee/query-service/Dockerfile
+DOCKERFILE_ENTERPRISE 			= $(SRC)/cmd/enterprise/Dockerfile
 DOCKER_REGISTRY_ENTERPRISE 		?= docker.io/signoz/signoz
 JS_BUILD_CONTEXT 				= $(SRC)/frontend

@ -74,7 +74,7 @@ go-run-enterprise: ## Runs the enterprise go backend server
 	SIGNOZ_TELEMETRYSTORE_PROVIDER=clickhouse \
 	SIGNOZ_TELEMETRYSTORE_CLICKHOUSE_DSN=tcp://127.0.0.1:9000 \
 	go run -race \
-		$(GO_BUILD_CONTEXT_ENTERPRISE)/main.go \
+		$(GO_BUILD_CONTEXT_ENTERPRISE)/*.go \
 		--config ./conf/prometheus.yml \
 		--cluster cluster

@ -92,7 +92,7 @@ go-run-community: ## Runs the community go backend server
 	SIGNOZ_TELEMETRYSTORE_PROVIDER=clickhouse \
 	SIGNOZ_TELEMETRYSTORE_CLICKHOUSE_DSN=tcp://127.0.0.1:9000 \
 	go run -race \
-		$(GO_BUILD_CONTEXT_COMMUNITY)/main.go \
+		$(GO_BUILD_CONTEXT_COMMUNITY)/*.go \
 		--config ./conf/prometheus.yml \
 		--cluster cluster

--- a/pkg/query-service/.goreleaser.yaml
+++ b/pkg/query-service/.goreleaser.yaml
@ -11,7 +11,7 @@ before:
 builds:
  - id: signoz
    binary: bin/signoz
-    main: pkg/query-service/main.go
+    main: cmd/community
    env:
      - CGO_ENABLED=1
      - >-
--- a/pkg/query-service/Dockerfile
+++ b/pkg/query-service/Dockerfile
@ -16,4 +16,4 @@ COPY frontend/build/ /etc/signoz/web/

 RUN chmod 755 /root /root/signoz

-ENTRYPOINT ["./signoz"]
+ENTRYPOINT ["./signoz", "server"]
--- a/pkg/query-service/Dockerfile.multi-arch
+++ b/pkg/query-service/Dockerfile.multi-arch
@ -17,4 +17,4 @@ COPY frontend/build/ /etc/signoz/web/

 RUN chmod 755 /root /root/signoz-community

-ENTRYPOINT ["./signoz-community"]
+ENTRYPOINT ["./signoz-community", "server"]
--- a/cmd/community/main.go
+++ b/cmd/community/main.go
@ -0,0 +1,18 @@
+package main
+
+import (
+	"log/slog"
+
+	"github.com/SigNoz/signoz/cmd"
+	"github.com/SigNoz/signoz/pkg/instrumentation"
+)
+
+func main() {
+	// initialize logger for logging in the cmd/ package. This logger is different from the logger used in the application.
+	logger := instrumentation.NewLogger(instrumentation.Config{Logs: instrumentation.LogsConfig{Level: slog.LevelInfo}})
+
+	// register a list of commands to the root command
+	registerServer(cmd.RootCmd, logger)
+
+	cmd.Execute(logger)
+}
--- a/cmd/community/server.go
+++ b/cmd/community/server.go
@ -0,0 +1,116 @@
+package main
+
+import (
+	"context"
+	"log/slog"
+	"time"
+
+	"github.com/SigNoz/signoz/cmd"
+	"github.com/SigNoz/signoz/ee/sqlstore/postgressqlstore"
+	"github.com/SigNoz/signoz/pkg/analytics"
+	"github.com/SigNoz/signoz/pkg/factory"
+	"github.com/SigNoz/signoz/pkg/licensing"
+	"github.com/SigNoz/signoz/pkg/licensing/nooplicensing"
+	"github.com/SigNoz/signoz/pkg/modules/organization"
+	"github.com/SigNoz/signoz/pkg/query-service/app"
+	"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"
+	"github.com/SigNoz/signoz/pkg/zeus/noopzeus"
+	"github.com/spf13/cobra"
+)
+
+func registerServer(parentCmd *cobra.Command, logger *slog.Logger) {
+	var flags signoz.DeprecatedFlags
+
+	serverCmd := &cobra.Command{
+		Use:                "server",
+		Short:              "Run the SigNoz server",
+		FParseErrWhitelist: cobra.FParseErrWhitelist{UnknownFlags: true},
+		RunE: func(currCmd *cobra.Command, args []string) error {
+			config, err := cmd.NewSigNozConfig(currCmd.Context(), flags)
+			if err != nil {
+				return err
+			}
+
+			return runServer(currCmd.Context(), config, logger)
+		},
+	}
+
+	flags.RegisterFlags(serverCmd)
+	parentCmd.AddCommand(serverCmd)
+}
+
+func runServer(ctx context.Context, config signoz.Config, logger *slog.Logger) error {
+	// 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
+	}
+
+	jwt := authtypes.NewJWT(cmd.NewJWTSecret(ctx, logger), 30*time.Minute, 30*24*time.Hour)
+
+	signoz, err := signoz.New(
+		ctx,
+		config,
+		jwt,
+		zeus.Config{},
+		noopzeus.NewProviderFactory(),
+		licensing.Config{},
+		func(_ sqlstore.SQLStore, _ zeus.Zeus, _ organization.Getter, _ analytics.Analytics) factory.ProviderFactory[licensing.Licensing, licensing.Config] {
+			return nooplicensing.NewFactory()
+		},
+		signoz.NewEmailingProviderFactories(),
+		signoz.NewCacheProviderFactories(),
+		signoz.NewWebProviderFactories(),
+		func(sqlstore sqlstore.SQLStore) factory.NamedMap[factory.ProviderFactory[sqlschema.SQLSchema, sqlschema.Config]] {
+			return signoz.NewSQLSchemaProviderFactories(sqlstore)
+		},
+		signoz.NewSQLStoreProviderFactories(),
+		signoz.NewTelemetryStoreProviderFactories(),
+	)
+	if err != nil {
+		logger.ErrorContext(ctx, "failed to create signoz", "error", err)
+		return err
+	}
+
+	server, err := app.NewServer(config, signoz, jwt)
+	if err != nil {
+		logger.ErrorContext(ctx, "failed to create server", "error", err)
+		return err
+	}
+
+	if err := server.Start(ctx); err != nil {
+		logger.ErrorContext(ctx, "failed to start server", "error", err)
+		return err
+	}
+
+	signoz.Start(ctx)
+
+	if err := signoz.Wait(ctx); err != nil {
+		logger.ErrorContext(ctx, "failed to start signoz", "error", err)
+		return err
+	}
+
+	err = server.Stop(ctx)
+	if err != nil {
+		logger.ErrorContext(ctx, "failed to stop server", "error", err)
+		return err
+	}
+
+	err = signoz.Stop(ctx)
+	if err != nil {
+		logger.ErrorContext(ctx, "failed to stop signoz", "error", err)
+		return err
+	}
+
+	return nil
+}
--- a/cmd/config.go
+++ b/cmd/config.go
@ -0,0 +1,45 @@
+package cmd
+
+import (
+	"context"
+	"fmt"
+	"log/slog"
+	"os"
+
+	"github.com/SigNoz/signoz/pkg/config"
+	"github.com/SigNoz/signoz/pkg/config/envprovider"
+	"github.com/SigNoz/signoz/pkg/config/fileprovider"
+	"github.com/SigNoz/signoz/pkg/signoz"
+)
+
+func NewSigNozConfig(ctx context.Context, flags signoz.DeprecatedFlags) (signoz.Config, error) {
+	config, err := signoz.NewConfig(
+		ctx,
+		config.ResolverConfig{
+			Uris: []string{"env:"},
+			ProviderFactories: []config.ProviderFactory{
+				envprovider.NewFactory(),
+				fileprovider.NewFactory(),
+			},
+		},
+		flags,
+	)
+	if err != nil {
+		return signoz.Config{}, err
+	}
+
+	return config, nil
+}
+
+func NewJWTSecret(_ context.Context, _ *slog.Logger) string {
+	jwtSecret := os.Getenv("SIGNOZ_JWT_SECRET")
+	if len(jwtSecret) == 0 {
+		fmt.Println("🚨 CRITICAL SECURITY ISSUE: No JWT secret key specified!")
+		fmt.Println("SIGNOZ_JWT_SECRET environment variable is not set. This has dire consequences for the security of the application.")
+		fmt.Println("Without a JWT secret, user sessions are vulnerable to tampering and unauthorized access.")
+		fmt.Println("Please set the SIGNOZ_JWT_SECRET environment variable immediately.")
+		fmt.Println("For more information, please refer to https://github.com/SigNoz/signoz/issues/8400.")
+	}
+
+	return jwtSecret
+}
--- a/ee/query-service/.goreleaser.yaml
+++ b/ee/query-service/.goreleaser.yaml
@ -11,7 +11,7 @@ before:
 builds:
  - id: signoz
    binary: bin/signoz
-    main: ee/query-service/main.go
+    main: cmd/enterprise
    env:
      - CGO_ENABLED=1
      - >-
--- a/ee/query-service/Dockerfile
+++ b/ee/query-service/Dockerfile
@ -16,4 +16,4 @@ COPY frontend/build/ /etc/signoz/web/

 RUN chmod 755 /root /root/signoz

-ENTRYPOINT ["./signoz"]
+ENTRYPOINT ["./signoz", "server"]
--- a/ee/query-service/Dockerfile.integration
+++ b/ee/query-service/Dockerfile.integration
@ -23,6 +23,7 @@ COPY go.mod go.sum ./

 RUN go mod download

+COPY ./cmd/ ./cmd/
 COPY ./ee/ ./ee/
 COPY ./pkg/ ./pkg/
 COPY ./templates/email /root/templates
@ -33,4 +34,4 @@ RUN mv /root/linux-${TARGETARCH}/signoz /root/signoz

 RUN chmod 755 /root /root/signoz

-ENTRYPOINT ["/root/signoz"]
+ENTRYPOINT ["/root/signoz", "server"]
--- a/ee/query-service/Dockerfile.multi-arch
+++ b/ee/query-service/Dockerfile.multi-arch
@ -17,4 +17,4 @@ COPY frontend/build/ /etc/signoz/web/

 RUN chmod 755 /root /root/signoz

-ENTRYPOINT ["./signoz"]
+ENTRYPOINT ["./signoz", "server"]
--- a/cmd/enterprise/main.go
+++ b/cmd/enterprise/main.go
@ -0,0 +1,18 @@
+package main
+
+import (
+	"log/slog"
+
+	"github.com/SigNoz/signoz/cmd"
+	"github.com/SigNoz/signoz/pkg/instrumentation"
+)
+
+func main() {
+	// initialize logger for logging in the cmd/ package. This logger is different from the logger used in the application.
+	logger := instrumentation.NewLogger(instrumentation.Config{Logs: instrumentation.LogsConfig{Level: slog.LevelInfo}})
+
+	// register a list of commands to the root command
+	registerServer(cmd.RootCmd, logger)
+
+	cmd.Execute(logger)
+}
--- a/cmd/enterprise/server.go
+++ b/cmd/enterprise/server.go
@ -0,0 +1,124 @@
+package main
+
+import (
+	"context"
+	"log/slog"
+	"time"
+
+	"github.com/SigNoz/signoz/cmd"
+	enterpriselicensing "github.com/SigNoz/signoz/ee/licensing"
+	"github.com/SigNoz/signoz/ee/licensing/httplicensing"
+	enterpriseapp "github.com/SigNoz/signoz/ee/query-service/app"
+	"github.com/SigNoz/signoz/ee/sqlschema/postgressqlschema"
+	"github.com/SigNoz/signoz/ee/sqlstore/postgressqlstore"
+	enterprisezeus "github.com/SigNoz/signoz/ee/zeus"
+	"github.com/SigNoz/signoz/ee/zeus/httpzeus"
+	"github.com/SigNoz/signoz/pkg/analytics"
+	"github.com/SigNoz/signoz/pkg/factory"
+	"github.com/SigNoz/signoz/pkg/licensing"
+	"github.com/SigNoz/signoz/pkg/modules/organization"
+	"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"
+	"github.com/spf13/cobra"
+)
+
+func registerServer(parentCmd *cobra.Command, logger *slog.Logger) {
+	var flags signoz.DeprecatedFlags
+
+	serverCmd := &cobra.Command{
+		Use:                "server",
+		Short:              "Run the SigNoz server",
+		FParseErrWhitelist: cobra.FParseErrWhitelist{UnknownFlags: true},
+		RunE: func(currCmd *cobra.Command, args []string) error {
+			config, err := cmd.NewSigNozConfig(currCmd.Context(), flags)
+			if err != nil {
+				return err
+			}
+
+			return runServer(currCmd.Context(), config, logger)
+		},
+	}
+
+	flags.RegisterFlags(serverCmd)
+	parentCmd.AddCommand(serverCmd)
+}
+
+func runServer(ctx context.Context, config signoz.Config, logger *slog.Logger) error {
+	// 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
+	}
+
+	jwt := authtypes.NewJWT(cmd.NewJWTSecret(ctx, logger), 30*time.Minute, 30*24*time.Hour)
+
+	signoz, err := signoz.New(
+		ctx,
+		config,
+		jwt,
+		enterprisezeus.Config(),
+		httpzeus.NewProviderFactory(),
+		enterpriselicensing.Config(24*time.Hour, 3),
+		func(sqlstore sqlstore.SQLStore, zeus zeus.Zeus, orgGetter organization.Getter, analytics analytics.Analytics) factory.ProviderFactory[licensing.Licensing, licensing.Config] {
+			return httplicensing.NewProviderFactory(sqlstore, zeus, orgGetter, analytics)
+		},
+		signoz.NewEmailingProviderFactories(),
+		signoz.NewCacheProviderFactories(),
+		signoz.NewWebProviderFactories(),
+		func(sqlstore sqlstore.SQLStore) factory.NamedMap[factory.ProviderFactory[sqlschema.SQLSchema, sqlschema.Config]] {
+			existingFactories := signoz.NewSQLSchemaProviderFactories(sqlstore)
+			if err := existingFactories.Add(postgressqlschema.NewFactory(sqlstore)); err != nil {
+				panic(err)
+			}
+
+			return existingFactories
+		},
+		sqlstoreFactories,
+		signoz.NewTelemetryStoreProviderFactories(),
+	)
+	if err != nil {
+		logger.ErrorContext(ctx, "failed to create signoz", "error", err)
+		return err
+	}
+
+	server, err := enterpriseapp.NewServer(config, signoz, jwt)
+	if err != nil {
+		logger.ErrorContext(ctx, "failed to create server", "error", err)
+		return err
+	}
+
+	if err := server.Start(ctx); err != nil {
+		logger.ErrorContext(ctx, "failed to start server", "error", err)
+		return err
+	}
+
+	signoz.Start(ctx)
+
+	if err := signoz.Wait(ctx); err != nil {
+		logger.ErrorContext(ctx, "failed to start signoz", "error", err)
+		return err
+	}
+
+	err = server.Stop(ctx)
+	if err != nil {
+		logger.ErrorContext(ctx, "failed to stop server", "error", err)
+		return err
+	}
+
+	err = signoz.Stop(ctx)
+	if err != nil {
+		logger.ErrorContext(ctx, "failed to stop signoz", "error", err)
+		return err
+	}
+
+	return nil
+}
--- a/cmd/root.go
+++ b/cmd/root.go
@ -0,0 +1,33 @@
+package cmd
+
+import (
+	"log/slog"
+	"os"
+
+	"github.com/SigNoz/signoz/pkg/version"
+	"github.com/spf13/cobra"
+	"go.uber.org/zap" //nolint:depguard
+)
+
+var RootCmd = &cobra.Command{
+	Use:               "signoz",
+	Short:             "OpenTelemetry-Native Logs, Metrics and Traces in a single pane",
+	Version:           version.Info.Version(),
+	SilenceUsage:      true,
+	SilenceErrors:     true,
+	CompletionOptions: cobra.CompletionOptions{DisableDefaultCmd: true},
+}
+
+func Execute(logger *slog.Logger) {
+	zapLogger := newZapLogger()
+	zap.ReplaceGlobals(zapLogger)
+	defer func() {
+		_ = zapLogger.Sync()
+	}()
+
+	err := RootCmd.Execute()
+	if err != nil {
+		logger.ErrorContext(RootCmd.Context(), "error running command", "error", err)
+		os.Exit(1)
+	}
+}
--- a/cmd/zap.go
+++ b/cmd/zap.go
@ -0,0 +1,15 @@
+package cmd
+
+import (
+	"go.uber.org/zap"         //nolint:depguard
+	"go.uber.org/zap/zapcore" //nolint:depguard
+)
+
+// Deprecated: Use `NewLogger` from `pkg/instrumentation` instead.
+func newZapLogger() *zap.Logger {
+	config := zap.NewProductionConfig()
+	config.EncoderConfig.TimeKey = "timestamp"
+	config.EncoderConfig.EncodeTime = zapcore.ISO8601TimeEncoder
+	logger, _ := config.Build()
+	return logger
+}
--- a/deploy/docker-swarm/docker-compose.ha.yaml
+++ b/deploy/docker-swarm/docker-compose.ha.yaml
@ -174,7 +174,7 @@ services:
      # - ../common/clickhouse/storage.xml:/etc/clickhouse-server/config.d/storage.xml
  signoz:
    !!merge <<: *db-depend
-    image: signoz/signoz:v0.89.0
+    image: signoz/signoz:v0.90.1
    command:
      - --config=/root/config/prometheus.yml
    ports:
@ -207,7 +207,7 @@ services:
      retries: 3
  otel-collector:
    !!merge <<: *db-depend
-    image: signoz/signoz-otel-collector:v0.128.0
+    image: signoz/signoz-otel-collector:v0.128.2
    command:
      - --config=/etc/otel-collector-config.yaml
      - --manager-config=/etc/manager-config.yaml
@ -231,7 +231,7 @@ services:
      - signoz
  schema-migrator:
    !!merge <<: *common
-    image: signoz/signoz-schema-migrator:v0.128.0
+    image: signoz/signoz-schema-migrator:v0.128.2
    deploy:
      restart_policy:
        condition: on-failure
--- a/deploy/docker-swarm/docker-compose.yaml
+++ b/deploy/docker-swarm/docker-compose.yaml
@ -115,7 +115,7 @@ services:
      # - ../common/clickhouse/storage.xml:/etc/clickhouse-server/config.d/storage.xml
  signoz:
    !!merge <<: *db-depend
-    image: signoz/signoz:v0.89.0
+    image: signoz/signoz:v0.90.1
    command:
      - --config=/root/config/prometheus.yml
    ports:
@ -148,7 +148,7 @@ services:
      retries: 3
  otel-collector:
    !!merge <<: *db-depend
-    image: signoz/signoz-otel-collector:v0.128.0
+    image: signoz/signoz-otel-collector:v0.128.2
    command:
      - --config=/etc/otel-collector-config.yaml
      - --manager-config=/etc/manager-config.yaml
@ -174,7 +174,7 @@ services:
      - signoz
  schema-migrator:
    !!merge <<: *common
-    image: signoz/signoz-schema-migrator:v0.128.0
+    image: signoz/signoz-schema-migrator:v0.128.2
    deploy:
      restart_policy:
        condition: on-failure
--- a/deploy/docker/docker-compose.ha.yaml
+++ b/deploy/docker/docker-compose.ha.yaml
@ -177,7 +177,7 @@ services:
      # - ../common/clickhouse/storage.xml:/etc/clickhouse-server/config.d/storage.xml
  signoz:
    !!merge <<: *db-depend
-    image: signoz/signoz:${VERSION:-v0.89.0}
+    image: signoz/signoz:${VERSION:-v0.90.1}
    container_name: signoz
    command:
      - --config=/root/config/prometheus.yml
@ -211,7 +211,7 @@ services:
  # TODO: support otel-collector multiple replicas. Nginx/Traefik for loadbalancing?
  otel-collector:
    !!merge <<: *db-depend
-    image: signoz/signoz-otel-collector:${OTELCOL_TAG:-v0.128.0}
+    image: signoz/signoz-otel-collector:${OTELCOL_TAG:-v0.128.2}
    container_name: signoz-otel-collector
    command:
      - --config=/etc/otel-collector-config.yaml
@ -237,7 +237,7 @@ services:
        condition: service_healthy
  schema-migrator-sync:
    !!merge <<: *common
-    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-v0.128.0}
+    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-v0.128.2}
    container_name: schema-migrator-sync
    command:
      - sync
@ -248,7 +248,7 @@ services:
        condition: service_healthy
  schema-migrator-async:
    !!merge <<: *db-depend
-    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-v0.128.0}
+    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-v0.128.2}
    container_name: schema-migrator-async
    command:
      - async
--- a/deploy/docker/docker-compose.yaml
+++ b/deploy/docker/docker-compose.yaml
@ -110,7 +110,7 @@ services:
      # - ../common/clickhouse/storage.xml:/etc/clickhouse-server/config.d/storage.xml
  signoz:
    !!merge <<: *db-depend
-    image: signoz/signoz:${VERSION:-v0.89.0}
+    image: signoz/signoz:${VERSION:-v0.90.1}
    container_name: signoz
    command:
      - --config=/root/config/prometheus.yml
@ -143,7 +143,7 @@ services:
      retries: 3
  otel-collector:
    !!merge <<: *db-depend
-    image: signoz/signoz-otel-collector:${OTELCOL_TAG:-v0.128.0}
+    image: signoz/signoz-otel-collector:${OTELCOL_TAG:-v0.128.2}
    container_name: signoz-otel-collector
    command:
      - --config=/etc/otel-collector-config.yaml
@ -165,7 +165,7 @@ services:
        condition: service_healthy
  schema-migrator-sync:
    !!merge <<: *common
-    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-v0.128.0}
+    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-v0.128.2}
    container_name: schema-migrator-sync
    command:
      - sync
@ -177,7 +177,7 @@ services:
    restart: on-failure
  schema-migrator-async:
    !!merge <<: *db-depend
-    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-v0.128.0}
+    image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-v0.128.2}
    container_name: schema-migrator-async
    command:
      - async
--- a/ee/query-service/.dockerignore
+++ b/ee/query-service/.dockerignore
@ -1,4 +0,0 @@
-.vscode
-README.md
-signoz.db
-bin
--- a/ee/query-service/main.go
+++ b/ee/query-service/main.go
@ -1,189 +0,0 @@
-package main
-
-import (
-	"context"
-	"flag"
-	"os"
-	"time"
-
-	"github.com/SigNoz/signoz/ee/licensing"
-	"github.com/SigNoz/signoz/ee/licensing/httplicensing"
-	"github.com/SigNoz/signoz/ee/query-service/app"
-	"github.com/SigNoz/signoz/ee/sqlschema/postgressqlschema"
-	"github.com/SigNoz/signoz/ee/sqlstore/postgressqlstore"
-	"github.com/SigNoz/signoz/ee/zeus"
-	"github.com/SigNoz/signoz/ee/zeus/httpzeus"
-	"github.com/SigNoz/signoz/pkg/analytics"
-	"github.com/SigNoz/signoz/pkg/config"
-	"github.com/SigNoz/signoz/pkg/config/envprovider"
-	"github.com/SigNoz/signoz/pkg/config/fileprovider"
-	"github.com/SigNoz/signoz/pkg/factory"
-	pkglicensing "github.com/SigNoz/signoz/pkg/licensing"
-	"github.com/SigNoz/signoz/pkg/modules/organization"
-	baseconst "github.com/SigNoz/signoz/pkg/query-service/constants"
-	"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"
-	pkgzeus "github.com/SigNoz/signoz/pkg/zeus"
-
-	"go.uber.org/zap"
-	"go.uber.org/zap/zapcore"
-)
-
-// Deprecated: Please use the logger from pkg/instrumentation.
-func initZapLog() *zap.Logger {
-	config := zap.NewProductionConfig()
-	config.EncoderConfig.TimeKey = "timestamp"
-	config.EncoderConfig.EncodeTime = zapcore.ISO8601TimeEncoder
-	logger, _ := config.Build()
-	return logger
-}
-
-func main() {
-	var promConfigPath, skipTopLvlOpsPath string
-
-	// disables rule execution but allows change to the rule definition
-	var disableRules bool
-
-	// the url used to build link in the alert messages in slack and other systems
-	var ruleRepoURL string
-	var cluster string
-
-	var useLogsNewSchema bool
-	var useTraceNewSchema bool
-	var cacheConfigPath, fluxInterval, fluxIntervalForTraceDetail string
-	var preferSpanMetrics bool
-
-	var maxIdleConns int
-	var maxOpenConns int
-	var dialTimeout time.Duration
-	var gatewayUrl string
-	var useLicensesV3 bool
-
-	// Deprecated
-	flag.BoolVar(&useLogsNewSchema, "use-logs-new-schema", false, "use logs_v2 schema for logs")
-	// Deprecated
-	flag.BoolVar(&useTraceNewSchema, "use-trace-new-schema", false, "use new schema for traces")
-	// Deprecated
-	flag.StringVar(&promConfigPath, "config", "./config/prometheus.yml", "(prometheus config to read metrics)")
-	// Deprecated
-	flag.StringVar(&skipTopLvlOpsPath, "skip-top-level-ops", "", "(config file to skip top level operations)")
-	// Deprecated
-	flag.BoolVar(&disableRules, "rules.disable", false, "(disable rule evaluation)")
-	flag.BoolVar(&preferSpanMetrics, "prefer-span-metrics", false, "(prefer span metrics for service level metrics)")
-	// Deprecated
-	flag.IntVar(&maxIdleConns, "max-idle-conns", 50, "(number of connections to maintain in the pool.)")
-	// Deprecated
-	flag.IntVar(&maxOpenConns, "max-open-conns", 100, "(max connections for use at any time.)")
-	// Deprecated
-	flag.DurationVar(&dialTimeout, "dial-timeout", 5*time.Second, "(the maximum time to establish a connection.)")
-	// Deprecated
-	flag.StringVar(&ruleRepoURL, "rules.repo-url", baseconst.AlertHelpPage, "(host address used to build rule link in alert messages)")
-	// Deprecated
-	flag.StringVar(&cacheConfigPath, "experimental.cache-config", "", "(cache config to use)")
-	flag.StringVar(&fluxInterval, "flux-interval", "5m", "(the interval to exclude data from being cached to avoid incorrect cache for data in motion)")
-	flag.StringVar(&fluxIntervalForTraceDetail, "flux-interval-trace-detail", "2m", "(the interval to exclude data from being cached to avoid incorrect cache for trace data in motion)")
-	flag.StringVar(&cluster, "cluster", "cluster", "(cluster name - defaults to 'cluster')")
-	flag.StringVar(&gatewayUrl, "gateway-url", "", "(url to the gateway)")
-	// Deprecated
-	flag.BoolVar(&useLicensesV3, "use-licenses-v3", false, "use licenses_v3 schema for licenses")
-	flag.Parse()
-
-	loggerMgr := initZapLog()
-	zap.ReplaceGlobals(loggerMgr)
-	defer loggerMgr.Sync() // flushes buffer, if any
-	ctx := context.Background()
-
-	config, err := signoz.NewConfig(ctx, config.ResolverConfig{
-		Uris: []string{"env:"},
-		ProviderFactories: []config.ProviderFactory{
-			envprovider.NewFactory(),
-			fileprovider.NewFactory(),
-		},
-	}, signoz.DeprecatedFlags{
-		MaxIdleConns:               maxIdleConns,
-		MaxOpenConns:               maxOpenConns,
-		DialTimeout:                dialTimeout,
-		Config:                     promConfigPath,
-		FluxInterval:               fluxInterval,
-		FluxIntervalForTraceDetail: fluxIntervalForTraceDetail,
-		Cluster:                    cluster,
-		GatewayUrl:                 gatewayUrl,
-	})
-	if err != nil {
-		zap.L().Fatal("Failed to create config", zap.Error(err))
-	}
-
-	version.Info.PrettyPrint(config.Version)
-
-	sqlStoreFactories := signoz.NewSQLStoreProviderFactories()
-	if err := sqlStoreFactories.Add(postgressqlstore.NewFactory(sqlstorehook.NewLoggingFactory())); err != nil {
-		zap.L().Fatal("Failed to add postgressqlstore factory", zap.Error(err))
-	}
-
-	jwtSecret := os.Getenv("SIGNOZ_JWT_SECRET")
-
-	if len(jwtSecret) == 0 {
-		zap.L().Warn("No JWT secret key is specified.")
-	} else {
-		zap.L().Info("JWT secret key set successfully.")
-	}
-
-	jwt := authtypes.NewJWT(jwtSecret, 30*time.Minute, 30*24*time.Hour)
-
-	signoz, err := signoz.New(
-		context.Background(),
-		config,
-		jwt,
-		zeus.Config(),
-		httpzeus.NewProviderFactory(),
-		licensing.Config(24*time.Hour, 3),
-		func(sqlstore sqlstore.SQLStore, zeus pkgzeus.Zeus, orgGetter organization.Getter, analytics analytics.Analytics) factory.ProviderFactory[pkglicensing.Licensing, pkglicensing.Config] {
-			return httplicensing.NewProviderFactory(sqlstore, zeus, orgGetter, analytics)
-		},
-		signoz.NewEmailingProviderFactories(),
-		signoz.NewCacheProviderFactories(),
-		signoz.NewWebProviderFactories(),
-		func(sqlstore sqlstore.SQLStore) factory.NamedMap[factory.ProviderFactory[sqlschema.SQLSchema, sqlschema.Config]] {
-			existingFactories := signoz.NewSQLSchemaProviderFactories(sqlstore)
-			if err := existingFactories.Add(postgressqlschema.NewFactory(sqlstore)); err != nil {
-				zap.L().Fatal("Failed to add postgressqlschema factory", zap.Error(err))
-			}
-
-			return existingFactories
-		},
-		sqlStoreFactories,
-		signoz.NewTelemetryStoreProviderFactories(),
-	)
-	if err != nil {
-		zap.L().Fatal("Failed to create signoz", zap.Error(err))
-	}
-
-	server, err := app.NewServer(config, signoz, jwt)
-	if err != nil {
-		zap.L().Fatal("Failed to create server", zap.Error(err))
-	}
-
-	if err := server.Start(ctx); err != nil {
-		zap.L().Fatal("Could not start server", zap.Error(err))
-	}
-
-	signoz.Start(ctx)
-
-	if err := signoz.Wait(ctx); err != nil {
-		zap.L().Fatal("Failed to start signoz", zap.Error(err))
-	}
-
-	err = server.Stop(ctx)
-	if err != nil {
-		zap.L().Fatal("Failed to stop server", zap.Error(err))
-	}
-
-	err = signoz.Stop(ctx)
-	if err != nil {
-		zap.L().Fatal("Failed to stop signoz", zap.Error(err))
-	}
-}
--- a/frontend/public/Logos/argocd.svg
+++ b/frontend/public/Logos/argocd.svg
--- a/frontend/public/Logos/azure-mysql.svg
+++ b/frontend/public/Logos/azure-mysql.svg
@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 18"><defs><linearGradient id="a" x1="2.59" y1="10.16" x2="15.41" y2="10.16" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#005ba1"/><stop offset=".07" stop-color="#0060a9"/><stop offset=".36" stop-color="#0071c8"/><stop offset=".52" stop-color="#0078d4"/><stop offset=".64" stop-color="#0074cd"/><stop offset=".82" stop-color="#006abb"/><stop offset="1" stop-color="#005ba1"/></linearGradient></defs><path d="M9 5.14c-3.54 0-6.41-1-6.41-2.32v12.36c0 1.27 2.82 2.3 6.32 2.32H9c3.54 0 6.41-1 6.41-2.32V2.82c0 1.29-2.87 2.32-6.41 2.32z" fill="url(#a)"/><path d="M15.41 2.82c0 1.29-2.87 2.32-6.41 2.32s-6.41-1-6.41-2.32S5.46.5 9 .5s6.41 1 6.41 2.32" fill="#e8e8e8"/><path d="M13.92 2.63c0 .82-2.21 1.48-4.92 1.48s-4.92-.66-4.92-1.48S6.29 1.16 9 1.16s4.92.66 4.92 1.47" fill="#50e6ff"/><path d="M9 3a11.55 11.55 0 00-3.89.57A11.42 11.42 0 009 4.11a11.15 11.15 0 003.89-.58A11.84 11.84 0 009 3z" fill="#198ab3"/><path d="M12.64 9v1.63h-1a.39.39 0 01-.29-.14V9H10v1.78a.92.92 0 001 .89h1.49l.26-.13s-.11.41-.26.43h-2.38v1h2.66A1.21 1.21 0 0014 11.7V9zM9.53 9v-.49a.7.7 0 00-.48-.77 1.74 1.74 0 00-.5-.08.94.94 0 00-.91.58l-.78 1.9-1-1.9A.93.93 0 005 7.66a1.44 1.44 0 00-.51.09c-.35.11-.43.34-.43.73v3.31h1.17V9.56l.63 1.57a1.08 1.08 0 001 .66c.44 0 .62-.26.8-.66l.67-1.51v2.15h1.18V9z" fill="#f2f2f2"/></svg>
--- a/frontend/public/Logos/cloudflare.svg
+++ b/frontend/public/Logos/cloudflare.svg
@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32" width="64" height="64"><path d="M8.16 23h21.177v-5.86l-4.023-2.307-.694-.3-16.46.113z" fill="#fff"/><path d="M22.012 22.222c.197-.675.122-1.294-.206-1.754-.3-.422-.807-.666-1.416-.694l-11.545-.15c-.075 0-.14-.038-.178-.094s-.047-.13-.028-.206c.038-.113.15-.197.272-.206l11.648-.15c1.38-.066 2.88-1.182 3.404-2.55l.666-1.735a.38.38 0 0 0 .02-.225c-.75-3.395-3.78-5.927-7.4-5.927-3.34 0-6.17 2.157-7.184 5.15-.657-.488-1.5-.75-2.392-.666-1.604.16-2.9 1.444-3.048 3.048a3.58 3.58 0 0 0 .084 1.191A4.84 4.84 0 0 0 0 22.1c0 .234.02.47.047.703.02.113.113.197.225.197H21.58a.29.29 0 0 0 .272-.206l.16-.572z" fill="#f38020"/><path d="M25.688 14.803l-.32.01c-.075 0-.14.056-.17.13l-.45 1.566c-.197.675-.122 1.294.206 1.754.3.422.807.666 1.416.694l2.457.15c.075 0 .14.038.178.094s.047.14.028.206c-.038.113-.15.197-.272.206l-2.56.15c-1.388.066-2.88 1.182-3.404 2.55l-.188.478c-.038.094.028.188.13.188h8.797a.23.23 0 0 0 .225-.169A6.41 6.41 0 0 0 32 21.106a6.32 6.32 0 0 0-6.312-6.302" fill="#faae40"/></svg>
--- a/frontend/public/Logos/dynamodb.svg
+++ b/frontend/public/Logos/dynamodb.svg
--- a/frontend/public/Logos/elk.svg
+++ b/frontend/public/Logos/elk.svg
@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg width="800px" height="800px" viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMinYMin meet"><path d="M255.96 134.393c0-21.521-13.373-40.117-33.223-47.43a75.239 75.239 0 0 0 1.253-13.791c0-39.909-32.386-72.295-72.295-72.295-23.193 0-44.923 11.074-58.505 30.088-6.686-5.224-14.835-7.94-23.402-7.94-21.104 0-38.446 17.133-38.446 38.446 0 4.597.836 9.194 2.298 13.373C13.582 81.739 0 100.962 0 122.274c0 21.522 13.373 40.327 33.431 47.64-.835 4.388-1.253 8.985-1.253 13.79 0 39.7 32.386 72.087 72.086 72.087 23.402 0 44.924-11.283 58.505-30.088 6.686 5.223 15.044 8.149 23.611 8.149 21.104 0 38.446-17.134 38.446-38.446 0-4.597-.836-9.194-2.298-13.373 19.64-7.104 33.431-26.327 33.431-47.64z" fill="#FFF"/><path d="M100.085 110.364l57.043 26.119 57.669-50.565a64.312 64.312 0 0 0 1.253-12.746c0-35.52-28.834-64.355-64.355-64.355-21.313 0-41.162 10.447-53.072 27.998l-9.612 49.73 11.074 23.82z" fill="#F4BD19"/><path d="M40.953 170.75c-.835 4.179-1.253 8.567-1.253 12.955 0 35.52 29.043 64.564 64.564 64.564 21.522 0 41.372-10.656 53.49-28.208l9.403-49.729-12.746-24.238-57.251-26.118-56.207 50.774z" fill="#3CBEB1"/><path d="M40.536 71.918l39.073 9.194 8.775-44.506c-5.432-4.179-11.91-6.268-18.805-6.268-16.925 0-30.924 13.79-30.924 30.924 0 3.552.627 7.313 1.88 10.656z" fill="#E9478C"/><path d="M37.192 81.32c-17.551 5.642-29.67 22.567-29.67 40.954 0 17.97 11.074 34.059 27.79 40.327l54.953-49.73-10.03-21.52-43.043-10.03z" fill="#2C458F"/><path d="M167.784 219.852c5.432 4.18 11.91 6.478 18.596 6.478 16.925 0 30.924-13.79 30.924-30.924 0-3.761-.627-7.314-1.88-10.657l-39.073-9.193-8.567 44.296z" fill="#95C63D"/><path d="M175.724 165.317l43.043 10.03c17.551-5.85 29.67-22.566 29.67-40.954 0-17.97-11.074-33.849-27.79-40.326l-56.415 49.311 11.492 21.94z" fill="#176655"/></svg>
--- a/frontend/public/Logos/external-api-monitoring.svg
+++ b/frontend/public/Logos/external-api-monitoring.svg
@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+
<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg version="1.1" baseProfile="tiny" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	   width="800px" height="800px" viewBox="0 0 24 24" overflow="visible" xml:space="preserve">
+<g >
+	<rect y="0" fill="none" width="24" height="24"/>
+	<g transform="translate(1.000000, 8.000000)">
+		<path fill-rule="evenodd" fill="#5C85DE" d="M2-1.9c-1.1,0-2.3,1.1-2.3,2.2V10H2V5.5h2.2V10h2.2V0.3c0-1.1-1.1-2.2-2.3-2.2H2
+			L2-1.9z M2,3.2v-3h2.2v3H2L2,3.2z"/>
+		<path fill-rule="evenodd" fill="#5C85DE" d="M10.3-2C9.1-2,8-0.9,8,0.2V10l2.2,0V5.5h2.2c1.1,0,2.3-1.1,2.3-2.2l0-3
+			c0-1.1-1.1-2.2-2.3-2.2H10.3L10.3-2z M10.2,3.2v-3h2.2v3H10.2L10.2,3.2z"/>
+		<polygon fill-rule="evenodd" fill="#5C85DE" points="18.5,0.3 18.5,7.8 16.2,7.8 16.2,10 23,10 23,7.8 20.8,7.8 20.8,0.3 23,0.3 
+			23,-1.9 16.2,-1.9 16.2,0.3 		"/>
+		<polygon fill-rule="evenodd" fill="#3367D6" points="2,5.5 2,3.2 3.5,3.2 		"/>
+		<polygon fill-rule="evenodd" fill="#3367D6" points="10.2,5.5 10.2,3.2 11.5,3.2 		"/>
+		<polygon fill-rule="evenodd" fill="#3367D6" points="18.5,1.8 18.5,1.8 18.5,0.3 20.8,0.3 		"/>
+	</g>
+</g>
+</svg>
--- a/frontend/public/Logos/github-actions.svg
+++ b/frontend/public/Logos/github-actions.svg
@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128"><path fill="#2088ff" d="M26.666 0C11.97 0 0 11.97 0 26.666c0 12.87 9.181 23.651 21.334 26.13v37.87c0 11.77 9.68 21.334 21.332 21.334h.195c1.302 9.023 9.1 16 18.473 16C71.612 128 80 119.612 80 109.334s-8.388-18.668-18.666-18.668c-9.372 0-17.17 6.977-18.473 16h-.195c-8.737 0-16-7.152-16-16V63.779a18.514 18.514 0 0 0 13.24 5.555h2.955c1.303 9.023 9.1 16 18.473 16 9.372 0 17.169-6.977 18.47-16h11.057c1.303 9.023 9.1 16 18.473 16 10.278 0 18.666-8.39 18.666-18.668C128 56.388 119.612 48 109.334 48c-9.373 0-17.171 6.977-18.473 16H79.805c-1.301-9.023-9.098-16-18.471-16s-17.171 6.977-18.473 16h-2.955c-6.433 0-11.793-4.589-12.988-10.672 14.58-.136 26.416-12.05 26.416-26.662C53.334 11.97 41.362 0 26.666 0zm0 5.334A21.292 21.292 0 0 1 48 26.666 21.294 21.294 0 0 1 26.666 48 21.292 21.292 0 0 1 5.334 26.666 21.29 21.29 0 0 1 26.666 5.334zm-5.215 7.541C18.67 12.889 16 15.123 16 18.166v17.043c0 4.043 4.709 6.663 8.145 4.533l13.634-8.455c3.257-2.02 3.274-7.002.032-9.045l-13.635-8.59a5.024 5.024 0 0 0-2.725-.777zm-.117 5.291 13.635 8.588-13.635 8.455V18.166zm40 35.168a13.29 13.29 0 0 1 13.332 13.332A13.293 13.293 0 0 1 61.334 80 13.294 13.294 0 0 1 48 66.666a13.293 13.293 0 0 1 13.334-13.332zm48 0a13.29 13.29 0 0 1 13.332 13.332A13.293 13.293 0 0 1 109.334 80 13.294 13.294 0 0 1 96 66.666a13.293 13.293 0 0 1 13.334-13.332zm-42.568 6.951a2.667 2.667 0 0 0-1.887.78l-6.3 6.294-2.093-2.084a2.667 2.667 0 0 0-3.771.006 2.667 2.667 0 0 0 .008 3.772l3.974 3.96a2.667 2.667 0 0 0 3.766-.001l8.185-8.174a2.667 2.667 0 0 0 .002-3.772 2.667 2.667 0 0 0-1.884-.78zm48 0a2.667 2.667 0 0 0-1.887.78l-6.3 6.294-2.093-2.084a2.667 2.667 0 0 0-3.771.006 2.667 2.667 0 0 0 .008 3.772l3.974 3.96a2.667 2.667 0 0 0 3.766-.001l8.185-8.174a2.667 2.667 0 0 0 .002-3.772 2.667 2.667 0 0 0-1.884-.78zM61.334 96a13.293 13.293 0 0 1 13.332 13.334 13.29 13.29 0 0 1-13.332 13.332A13.293 13.293 0 0 1 48 109.334 13.294 13.294 0 0 1 61.334 96zM56 105.334c-2.193 0-4 1.807-4 4 0 2.195 1.808 4 4 4s4-1.805 4-4c0-2.193-1.807-4-4-4zm10.666 0c-2.193 0-4 1.807-4 4 0 2.195 1.808 4 4 4s4-1.805 4-4c0-2.193-1.807-4-4-4zM56 108c.75 0 1.334.585 1.334 1.334 0 .753-.583 1.332-1.334 1.332-.75 0-1.334-.58-1.334-1.332 0-.75.585-1.334 1.334-1.334zm10.666 0c.75 0 1.334.585 1.334 1.334 0 .753-.583 1.332-1.334 1.332-.75 0-1.332-.58-1.332-1.332 0-.75.583-1.334 1.332-1.334z"/><path fill="#79b8ff" d="M109.334 90.666c-9.383 0-17.188 6.993-18.477 16.031a2.667 2.667 0 0 0-.265-.011l-2.7.09a2.667 2.667 0 0 0-2.578 2.751 2.667 2.667 0 0 0 2.752 2.578l2.7-.087a2.667 2.667 0 0 0 .097-.006C92.17 121.029 99.965 128 109.334 128c10.278 0 18.666-8.388 18.666-18.666s-8.388-18.668-18.666-18.668zm0 5.334a13.293 13.293 0 0 1 13.332 13.334 13.29 13.29 0 0 1-13.332 13.332A13.293 13.293 0 0 1 96 109.334 13.294 13.294 0 0 1 109.334 96z"/></svg>
--- a/frontend/public/Logos/github.svg
+++ b/frontend/public/Logos/github.svg
@ -0,0 +1,5 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="lucide/github">
+<path id="Vector" d="M15 22V18C15.1391 16.7473 14.7799 15.4901 14 14.5C17 14.5 20 12.5 20 9C20.08 7.75 19.73 6.52 19 5.5C19.28 4.35 19.28 3.15 19 2C19 2 18 2 16 3.5C13.36 3 10.64 3 8 3.5C6 2 5 2 5 2C4.7 3.15 4.7 4.35 5 5.5C4.27187 6.51588 3.91847 7.75279 4 9C4 12.5 7 14.5 10 14.5C9.61 14.99 9.32 15.55 9.15 16.15C8.98 16.75 8.93 17.38 9 18M9 18V22M9 18C4.49 20 4 16 2 16" stroke="#C0C1C3" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</g>
+</svg>
--- a/frontend/public/Logos/http-monitoring.svg
+++ b/frontend/public/Logos/http-monitoring.svg
@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 373.71 200"><defs><style type="text/css">.cls-1{fill:#008ec7;}.cls-2{fill:#005b9b;}.cls-3{fill:#fff;}</style></defs><title>IETF-Badge-HTTP</title><g id="Layer_2"><path class="cls-1" d="M326,0H47.73L0,100,47.73,200H326l47.73-100ZM310.05,183.36H58.22L18.43,100,58.22,16.64H310.05L349.84,100Z"/><polygon class="cls-2" points="349.84 100.01 310.05 183.37 58.22 183.37 18.43 100.01 58.22 16.64 310.05 16.64 349.84 100.01"/><path class="cls-3" d="M128.05,71.89v59.53H114.27V107h-27v24.41H73.46V71.89H87.23V95.36h27V71.89Z"/><path class="cls-3" d="M154.5,83.12H135.45V71.89h51.87V83.12h-19v48.3H154.5Z"/><path class="cls-3" d="M207.9,83.12H188.85V71.89h51.87V83.12H221.67v48.3H207.9Z"/><path class="cls-3" d="M287.62,74.53a20.45,20.45,0,0,1,9,7.48,20.67,20.67,0,0,1,3.14,11.48,20.73,20.73,0,0,1-3.14,11.44,20.06,20.06,0,0,1-9,7.48A33.55,33.55,0,0,1,273.88,115h-12v16.42H248.12V71.89h25.76A33.05,33.05,0,0,1,287.62,74.53Zm-5.06,26.57a9.33,9.33,0,0,0,3.23-7.61c0-3.34-1.08-5.91-3.23-7.69s-5.3-2.68-9.44-2.68H261.89v20.66h11.23Q279.33,103.78,282.56,101.1Z"/></g></svg>
--- a/frontend/public/Logos/jenkins.svg
+++ b/frontend/public/Logos/jenkins.svg
--- a/frontend/public/Logos/newrelic.svg
+++ b/frontend/public/Logos/newrelic.svg
@ -0,0 +1 @@
+<svg viewBox="0 0 832.8 959.8" xmlns="http://www.w3.org/2000/svg" width="2169" height="2500"><path d="M672.6 332.3l160.2-92.4v480L416.4 959.8V775.2l256.2-147.6z" fill="#00ac69"/><path d="M416.4 184.6L160.2 332.3 0 239.9 416.4 0l416.4 239.9-160.2 92.4z" fill="#1ce783"/><path d="M256.2 572.3L0 424.6V239.9l416.4 240v479.9l-160.2-92.2z" fill="#1d252c"/></svg>
--- a/frontend/public/Logos/openai.svg
+++ b/frontend/public/Logos/openai.svg
@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><path fill="#fff" d="M44.559 19.646a11.957 11.957 0 0 0-1.028-9.822 12.094 12.094 0 0 0-13.026-5.802A11.962 11.962 0 0 0 21.485 0 12.097 12.097 0 0 0 9.95 8.373a11.964 11.964 0 0 0-7.997 5.8A12.097 12.097 0 0 0 3.44 28.356a11.957 11.957 0 0 0 1.028 9.822 12.094 12.094 0 0 0 13.026 5.802 11.953 11.953 0 0 0 9.02 4.02 12.096 12.096 0 0 0 11.54-8.379 11.964 11.964 0 0 0 7.997-5.8 12.099 12.099 0 0 0-1.491-14.177zM26.517 44.863a8.966 8.966 0 0 1-5.759-2.082 6.85 6.85 0 0 0 .284-.16L30.6 37.1c.49-.278.79-.799.786-1.361V22.265l4.04 2.332a.141.141 0 0 1 .078.111v11.16a9.006 9.006 0 0 1-8.987 8.995zM7.191 36.608a8.957 8.957 0 0 1-1.073-6.027c.071.042.195.119.284.17l9.558 5.52a1.556 1.556 0 0 0 1.57 0l11.67-6.738v4.665a.15.15 0 0 1-.057.124l-9.662 5.579a9.006 9.006 0 0 1-12.288-3.293zM4.675 15.744a8.966 8.966 0 0 1 4.682-3.943c0 .082-.005.228-.005.33v11.042a1.555 1.555 0 0 0 .785 1.359l11.669 6.736-4.04 2.333a.143.143 0 0 1-.136.012L7.967 28.03a9.006 9.006 0 0 1-3.293-12.284zm33.19 7.724L26.196 16.73l4.04-2.331a.143.143 0 0 1 .136-.012l9.664 5.579c4.302 2.485 5.776 7.989 3.29 12.29a8.991 8.991 0 0 1-4.68 3.943V24.827a1.553 1.553 0 0 0-.78-1.36zm4.02-6.051c-.07-.044-.195-.119-.283-.17l-9.558-5.52a1.556 1.556 0 0 0-1.57 0l-11.67 6.738V13.8a.15.15 0 0 1 .057-.124l9.662-5.574a8.995 8.995 0 0 1 13.36 9.315zm-25.277 8.315-4.04-2.333a.141.141 0 0 1-.079-.11v-11.16a8.997 8.997 0 0 1 14.753-6.91c-.073.04-.2.11-.283.161L17.4 10.9a1.552 1.552 0 0 0-.786 1.36l-.006 13.469zM18.803 21l5.198-3.002 5.197 3V27l-5.197 3-5.198-3z"/></svg>
--- a/frontend/public/Logos/s3.svg
+++ b/frontend/public/Logos/s3.svg
@ -0,0 +1 @@
+<svg height="2500" width="2500" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 80 80"><linearGradient id="a" x1="0%" y1="100%" y2="0%"><stop offset="0" stop-color="#1b660f"/><stop offset="1" stop-color="#6cae3e"/></linearGradient><g fill="none" fill-rule="evenodd"><path d="M0 0h80v80H0z" fill="url(#a)"/><path d="M60.836 42.893l.384-2.704c3.54 2.12 3.587 2.997 3.586 3.02-.006.006-.61.51-3.97-.316zm-1.943-.54C52.773 40.5 44.25 36.59 40.8 34.96c0-.014.004-.027.004-.041a2.406 2.406 0 0 0-2.404-2.403c-1.324 0-2.402 1.078-2.402 2.403s1.078 2.403 2.402 2.403c.582 0 1.11-.217 1.527-.562 4.058 1.92 12.515 5.774 18.68 7.594L56.17 61.56a.955.955 0 0 0-.01.14c0 1.516-6.707 4.299-17.666 4.299-11.075 0-17.853-2.783-17.853-4.298 0-.046-.003-.091-.01-.136l-5.093-37.207c4.409 3.035 13.892 4.64 22.962 4.64 9.056 0 18.523-1.6 22.94-4.625zM15 20.478C15.072 19.162 22.634 14 38.5 14c15.864 0 23.427 5.16 23.5 6.478v.449C61.13 23.877 51.33 27 38.5 27c-12.852 0-22.657-3.132-23.5-6.087zm49 .022c0-3.465-9.934-8.5-25.5-8.5S13 17.035 13 20.5l.094.754 5.548 40.524C18.775 66.31 30.86 68 38.494 68c9.472 0 19.535-2.178 19.665-6.22l2.396-16.896c1.333.319 2.43.482 3.31.482 1.184 0 1.984-.29 2.469-.867a1.95 1.95 0 0 0 .436-1.66c-.26-1.383-1.902-2.875-5.248-4.784l2.376-16.762z" fill="#fff"/></g></svg>
--- a/frontend/public/Logos/snowflake.svg
+++ b/frontend/public/Logos/snowflake.svg
@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" fill="#29b5e8"><path d="M9.86 15.298l13.008 7.8a3.72 3.72 0 0 0 4.589-.601 4.01 4.01 0 0 0 1.227-2.908V3.956a3.81 3.81 0 0 0-1.861-3.42 3.81 3.81 0 0 0-3.893 0 3.81 3.81 0 0 0-1.861 3.42v8.896l-7.387-4.43a3.79 3.79 0 0 0-2.922-.4c-.986.265-1.818.94-2.3 1.844-1.057 1.9-.44 4.28 1.4 5.422m31.27 7.8l13.008-7.8c1.84-1.143 2.458-3.533 1.4-5.424a3.75 3.75 0 0 0-5.22-1.452l-7.3 4.37v-8.84a3.81 3.81 0 1 0-7.615 0v15.323a4.08 4.08 0 0 0 .494 2.367c.482.903 1.314 1.57 2.3 1.844a3.71 3.71 0 0 0 2.922-.4M29.552 31.97c.013-.25.108-.5.272-.68l1.52-1.58a1.06 1.06 0 0 1 .658-.282h.057a1.05 1.05 0 0 1 .656.282l1.52 1.58a1.12 1.12 0 0 1 .272.681v.06a1.13 1.13 0 0 1-.272.683l-1.52 1.58a1.04 1.04 0 0 1-.656.284h-.057c-.246-.014-.48-.115-.658-.284l-1.52-1.58a1.13 1.13 0 0 1-.272-.683zm-4.604-.65v1.364a1.54 1.54 0 0 0 .372.93l5.16 5.357a1.42 1.42 0 0 0 .895.386h1.312a1.42 1.42 0 0 0 .895-.386l5.16-5.357a1.54 1.54 0 0 0 .372-.93V31.32a1.54 1.54 0 0 0-.372-.93l-5.16-5.357a1.42 1.42 0 0 0-.895-.386h-1.312a1.42 1.42 0 0 0-.895.386L25.32 30.4a1.55 1.55 0 0 0-.372.93M3.13 27.62l7.365 4.417L3.13 36.45a4.06 4.06 0 0 0-1.399 5.424 3.75 3.75 0 0 0 2.3 1.844c.986.274 2.042.133 2.922-.392l13.008-7.8c1.2-.762 1.9-2.078 1.9-3.492a4.16 4.16 0 0 0-1.9-3.492l-13.008-7.8a3.79 3.79 0 0 0-2.922-.4c-.986.265-1.818.94-2.3 1.844-1.057 1.9-.44 4.278 1.4 5.422m38.995 4.442a4 4 0 0 0 1.91 3.477l13 7.8c.88.524 1.934.666 2.92.392s1.817-.94 2.3-1.843a4.05 4.05 0 0 0-1.4-5.424L53.5 32.038l7.365-4.417c1.84-1.143 2.457-3.53 1.4-5.422a3.74 3.74 0 0 0-2.3-1.844c-.987-.274-2.042-.134-2.92.4l-13 7.8a4 4 0 0 0-1.91 3.507M25.48 40.508a3.7 3.7 0 0 0-2.611.464l-13.008 7.8c-1.84 1.143-2.456 3.53-1.4 5.422.483.903 1.314 1.57 2.3 1.843a3.75 3.75 0 0 0 2.922-.392l7.387-4.43v8.83a3.81 3.81 0 1 0 7.614 0V44.4a3.91 3.91 0 0 0-3.205-3.903m28.66 8.276l-13.008-7.8a3.75 3.75 0 0 0-2.922-.392 3.74 3.74 0 0 0-2.3 1.843 4.09 4.09 0 0 0-.494 2.37v15.25a3.81 3.81 0 1 0 7.614 0V51.28l7.287 4.37a3.79 3.79 0 0 0 2.922.4c.986-.265 1.818-.94 2.3-1.844 1.057-1.9.44-4.28-1.4-5.422"/></svg>
--- a/frontend/public/Logos/sns.svg
+++ b/frontend/public/Logos/sns.svg
@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="80px" height="80px" viewBox="0 0 80 80" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 64 (93537) - https://sketch.com -->
+    <title>Icon-Architecture/64/Arch_AWS-Simple-Notification-Service_64</title>
+    <desc>Created with Sketch.</desc>
+    <defs>
+        <linearGradient x1="0%" y1="100%" x2="100%" y2="0%" id="linearGradient-1">
+            <stop stop-color="#B0084D" offset="0%"></stop>
+            <stop stop-color="#FF4F8B" offset="100%"></stop>
+        </linearGradient>
+    </defs>
+    <g id="Icon-Architecture/64/Arch_AWS-Simple-Notification-Service_64" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Icon-Architecture-BG/64/Application-Integration" fill="url(#linearGradient-1)">
+            <rect id="Rectangle" x="0" y="0" width="80" height="80"></rect>
+        </g>
+        <path d="M17,38 C18.103,38 19,38.897 19,40 C19,41.103 18.103,42 17,42 C15.897,42 15,41.103 15,40 C15,38.897 15.897,38 17,38 L17,38 Z M41,64 C29.314,64 19.289,55.466 17.194,43.98 C18.965,43.894 20.427,42.659 20.857,41 L27,41 L27,39 L20.857,39 C20.427,37.342 18.966,36.107 17.195,36.02 C19.285,24.71 29.511,16 41,16 C45.313,16 49.832,17.622 54.429,20.821 L55.571,19.179 C50.633,15.743 45.73,14 41,14 C28.27,14 16.949,23.865 15.063,36.521 C13.839,37.207 13,38.5 13,40 C13,41.5 13.839,42.793 15.063,43.478 C16.97,56.341 28.056,66 41,66 C46.407,66 51.942,64.157 56.585,60.811 L55.415,59.189 C51.11,62.292 45.991,64 41,64 L41,64 Z M30.101,36.442 C31.955,36.895 34.275,37 36,37 C37.642,37 39.823,36.905 41.629,36.506 L37.105,45.553 C37.036,45.691 37,45.845 37,46 L37,50.453 C36.199,50.964 34.833,51.812 34,51.986 L34,46 C34,45.868 33.974,45.737 33.923,45.615 L30.101,36.442 Z M36,33 C40.025,33 42.174,33.604 42.841,34 C42.174,34.396 40.025,35 36,35 C31.975,35 29.826,34.396 29.159,34 C29.826,33.604 31.975,33 36,33 L36,33 Z M33,54 L34,54 C34.043,54 34.086,53.997 34.128,53.992 C35.352,53.833 36.909,52.887 38.272,52.013 L38.535,51.845 C38.824,51.661 39,51.342 39,51 L39,46.236 L44.559,35.12 C44.833,34.801 45,34.434 45,34 C45,31.39 39.361,31 36,31 C32.639,31 27,31.39 27,34 C27,34.366 27.12,34.684 27.32,34.967 L32,46.2 L32,53 C32,53.552 32.447,54 33,54 L33,54 Z M62,53 C63.103,53 64,53.897 64,55 C64,56.103 63.103,57 62,57 C60.897,57 60,56.103 60,55 C60,53.897 60.897,53 62,53 L62,53 Z M62,23 C63.103,23 64,23.897 64,25 C64,26.103 63.103,27 62,27 C60.897,27 60,26.103 60,25 C60,23.897 60.897,23 62,23 L62,23 Z M64,38 C65.103,38 66,38.897 66,40 C66,41.103 65.103,42 64,42 C62.897,42 62,41.103 62,40 C62,38.897 62.897,38 64,38 L64,38 Z M54,41 L60.143,41 C60.589,42.72 62.142,44 64,44 C66.206,44 68,42.206 68,40 C68,37.794 66.206,36 64,36 C62.142,36 60.589,37.28 60.143,39 L54,39 L54,26 L58.143,26 C58.589,27.72 60.142,29 62,29 C64.206,29 66,27.206 66,25 C66,22.794 64.206,21 62,21 C60.142,21 58.589,22.28 58.143,24 L53,24 C52.447,24 52,24.448 52,25 L52,39 L45,39 L45,41 L52,41 L52,55 C52,55.552 52.447,56 53,56 L58.143,56 C58.589,57.72 60.142,59 62,59 C64.206,59 66,57.206 66,55 C66,52.794 64.206,51 62,51 C60.142,51 58.589,52.28 58.143,54 L54,54 L54,41 Z" id="AWS-Simple-Notification-Service_Icon_64_Squid" fill="#FFFFFF"></path>
+    </g>
+</svg>
--- a/frontend/public/Logos/sqs.svg
+++ b/frontend/public/Logos/sqs.svg
--- a/frontend/public/Logos/systemd.svg
+++ b/frontend/public/Logos/systemd.svg
@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="300" height="200">
+    <path fill="#fff" d="M0 0h300v200H0z"/>
+    <g transform="translate(30.667 -1141.475) scale(1.33333)">
+        <path d="M25 911.61v39h15v-6h-9v-27h9v-6zm114 0v6h9v27h-9v6h15v-39z" style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;white-space:normal;shape-padding:0;isolation:auto;mix-blend-mode:normal;solid-color:#000;solid-opacity:1" color="#000" font-weight="400" font-family="sans-serif" overflow="visible" fill="#201a26"/>
+        <path d="M92.5 931.11l27-15v30z" fill="#30d475"/>
+        <circle cx="70.002" cy="931.111" r="13.5" fill="#30d475"/>
+    </g>
+</svg>
--- a/frontend/public/Logos/wordpress.svg
+++ b/frontend/public/Logos/wordpress.svg
@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32" width="64" height="64" fill="#00749a"><path d="M2.26 16c0 5.45 3.13 10.145 7.7 12.348L3.478 10.435C2.725 12.174 2.26 14.03 2.26 16zm23.015-.696c0-1.68-.638-2.9-1.16-3.768-.696-1.16-1.333-2.087-1.333-3.246 0-1.275.986-2.435 2.32-2.435h.174C22.84 3.594 19.594 2.26 16 2.26A13.95 13.95 0 0 0 4.522 8.463h.87c1.45 0 3.652-.174 3.652-.174.754-.058.812 1.043.116 1.16 0 0-.754.116-1.565.116l4.986 14.84 3.014-8.986-2.145-5.855L12 9.45c-.754-.058-.638-1.16.058-1.16 0 0 2.26.174 3.594.174 1.45 0 3.652-.174 3.652-.174.754-.058.812 1.043.116 1.16 0 0-.754.116-1.565.116L22.84 24.35l1.4-4.58c.58-1.913 1.043-3.246 1.043-4.464zm-9.043 1.913L12.116 29.16c1.217.348 2.55.58 3.884.58 1.623 0 3.13-.3 4.58-.754-.058-.058-.058-.116-.116-.174zM28.058 9.45l.116 1.4c0 1.4-.232 2.957-1.043 4.928l-4.174 12.116c4.058-2.377 6.84-6.783 6.84-11.884-.058-2.377-.696-4.58-1.74-6.55zM16 0C7.188 0 0 7.188 0 16s7.188 16 16 16 16-7.188 16-16S24.812 0 16 0zm0 31.304C7.594 31.304.754 24.464.754 16A15.27 15.27 0 0 1 16 .754 15.27 15.27 0 0 1 31.246 16c0 8.464-6.84 15.304-15.246 15.304z"/></svg>
--- a/frontend/public/locales/en-GB/failedPayment.json
+++ b/frontend/public/locales/en-GB/failedPayment.json
@ -8,5 +8,6 @@
 	"actNow": "Act now to avoid any disruptions and continue where you left off.",
 	"contactAdmin": "Contact your admin to proceed with the upgrade.",
 	"continueMyJourney": "Settle your bill to continue",
-	"somethingWentWrong": "Something went wrong"
+	"somethingWentWrong": "Something went wrong",
+	"refreshPaymentStatus": "Refresh Status"
 }
--- a/frontend/public/locales/en/failedPayment.json
+++ b/frontend/public/locales/en/failedPayment.json
@ -8,5 +8,6 @@
 	"actNow": "Act now to avoid any disruptions and continue where you left off.",
 	"contactAdmin": "Contact your admin to proceed with the upgrade.",
 	"continueMyJourney": "Settle your bill to continue",
-	"somethingWentWrong": "Something went wrong"
+	"somethingWentWrong": "Something went wrong",
+	"refreshPaymentStatus": "Refresh Status"
 }
--- a/frontend/src/api/v3/licenses/post.ts
+++ b/frontend/src/api/v3/licenses/post.ts
@ -0,0 +1,24 @@
+import { ApiV3Instance as axios } from 'api';
+import { ErrorResponseHandlerV2 } from 'api/ErrorResponseHandlerV2';
+import { AxiosError } from 'axios';
+import { ErrorV2Resp, SuccessResponseV2 } from 'types/api';
+import { PayloadProps, Props } from 'types/api/licenses/apply';
+
+const apply = async (
+	props: Props,
+): Promise<SuccessResponseV2<PayloadProps>> => {
+	try {
+		const response = await axios.post<PayloadProps>('/licenses', {
+			key: props.key,
+		});
+
+		return {
+			httpStatusCode: response.status,
+			data: response.data,
+		};
+	} catch (error) {
+		ErrorResponseHandlerV2(error as AxiosError<ErrorV2Resp>);
+	}
+};
+
+export default apply;
--- a/frontend/src/api/v3/licenses/put.ts
+++ b/frontend/src/api/v3/licenses/put.ts
@ -2,15 +2,11 @@ import { ApiV3Instance as axios } from 'api';
 import { ErrorResponseHandlerV2 } from 'api/ErrorResponseHandlerV2';
 import { AxiosError } from 'axios';
 import { ErrorV2Resp, SuccessResponseV2 } from 'types/api';
-import { PayloadProps, Props } from 'types/api/licenses/apply';
+import { PayloadProps } from 'types/api/licenses/apply';

-const apply = async (
-	props: Props,
-): Promise<SuccessResponseV2<PayloadProps>> => {
+const apply = async (): Promise<SuccessResponseV2<PayloadProps>> => {
 	try {
-		const response = await axios.post<PayloadProps>('/licenses', {
-			key: props.key,
-		});
+		const response = await axios.put<PayloadProps>('/licenses');

 		return {
 			httpStatusCode: response.status,
--- a/frontend/src/components/Logs/TableView/config.ts
+++ b/frontend/src/components/Logs/TableView/config.ts
@ -15,6 +15,7 @@ export function getDefaultCellStyle(isDarkMode?: boolean): CSSProperties {
 		letterSpacing: '-0.07px',
 		marginBottom: '0px',
 		minWidth: '10rem',
+		width: '10rem',
 	};
 }

--- a/frontend/src/components/Logs/TableView/useTableView.tsx
+++ b/frontend/src/components/Logs/TableView/useTableView.tsx
@ -47,6 +47,14 @@ export const useTableView = (props: UseTableViewProps): UseTableViewResult => {

 	const { formatTimezoneAdjustedTimestamp } = useTimezone();

+	const bodyColumnStyle = useMemo(
+		() => ({
+			...defaultTableStyle,
+			...(fields.length > 2 ? { width: '50rem' } : {}),
+		}),
+		[fields.length],
+	);
+
 	const columns: ColumnsType<Record<string, unknown>> = useMemo(() => {
 		const fieldColumns: ColumnsType<Record<string, unknown>> = fields
 			.filter((e) => !['id', 'body', 'timestamp'].includes(e.name))
@ -136,7 +144,7 @@ export const useTableView = (props: UseTableViewProps): UseTableViewResult => {
 								field: string | number,
 							): ColumnTypeRender<Record<string, unknown>> => ({
 								props: {
-									style: defaultTableStyle,
+									style: bodyColumnStyle,
 								},
 								children: (
 									<TableBodyContent
@ -166,6 +174,7 @@ export const useTableView = (props: UseTableViewProps): UseTableViewResult => {
 		linesPerRow,
 		fontSize,
 		formatTimezoneAdjustedTimestamp,
+		bodyColumnStyle,
 	]);

 	return { columns, dataSource: flattenLogData };
--- a/frontend/src/components/RefreshPaymentStatus/RefreshPaymentStatus.tsx
+++ b/frontend/src/components/RefreshPaymentStatus/RefreshPaymentStatus.tsx
@ -0,0 +1,56 @@
+import { Button, Tooltip } from 'antd';
+import refreshPaymentStatus from 'api/v3/licenses/put';
+import cx from 'classnames';
+import { RefreshCcw } from 'lucide-react';
+import { useAppContext } from 'providers/App/App';
+import { useState } from 'react';
+import { useTranslation } from 'react-i18next';
+
+function RefreshPaymentStatus({
+	btnShape,
+	type,
+}: {
+	btnShape?: 'default' | 'round' | 'circle';
+	type?: 'button' | 'text' | 'tooltip';
+}): JSX.Element {
+	const { t } = useTranslation(['failedPayment']);
+	const { activeLicenseRefetch } = useAppContext();
+
+	const [isLoading, setIsLoading] = useState(false);
+
+	const handleRefreshPaymentStatus = async (): Promise<void> => {
+		setIsLoading(true);
+
+		try {
+			await refreshPaymentStatus();
+
+			await Promise.all([activeLicenseRefetch()]);
+		} catch (e) {
+			console.error(e);
+		}
+		setIsLoading(false);
+	};
+
+	return (
+		<span className="refresh-payment-status-btn-wrapper">
+			<Tooltip title={type === 'tooltip' ? t('refreshPaymentStatus') : ''}>
+				<Button
+					type={type === 'text' ? 'text' : 'default'}
+					shape={btnShape}
+					className={cx('periscope-btn', { text: type === 'text' })}
+					onClick={handleRefreshPaymentStatus}
+					icon={<RefreshCcw size={14} />}
+					loading={isLoading}
+				>
+					{type !== 'tooltip' ? t('refreshPaymentStatus') : ''}
+				</Button>
+			</Tooltip>
+		</span>
+	);
+}
+RefreshPaymentStatus.defaultProps = {
+	btnShape: 'default',
+	type: 'button',
+};
+
+export default RefreshPaymentStatus;
--- a/frontend/src/components/SignozRadioGroup/SignozRadioGroup.styles.scss
+++ b/frontend/src/components/SignozRadioGroup/SignozRadioGroup.styles.scss
@ -1,6 +1,12 @@
 .signoz-radio-group.ant-radio-group {
 	color: var(--text-vanilla-400);

+	&.ant-radio-group-disabled {
+		opacity: 0.5;
+		pointer-events: none;
+		cursor: not-allowed;
+	}
+
 	.view-title {
 		display: flex;
 		gap: var(--margin-2);
@ -37,6 +43,22 @@
 // Light mode styles
 .lightMode {
 	.signoz-radio-group {
+		&.ant-radio-group-disabled {
+			.tab,
+			.selected_view {
+				background: var(--bg-vanilla-200) !important;
+				border-color: var(--bg-vanilla-400) !important;
+				color: var(--text-ink-400) !important;
+			}
+
+			.tab:hover,
+			.selected_view:hover {
+				background: var(--bg-vanilla-200) !important;
+				border-color: var(--bg-vanilla-400) !important;
+				color: var(--text-ink-400) !important;
+			}
+		}
+
 		.tab {
 			background: var(--bg-vanilla-100);
 		}
--- a/frontend/src/components/SignozRadioGroup/SignozRadioGroup.tsx
+++ b/frontend/src/components/SignozRadioGroup/SignozRadioGroup.tsx
@ -13,6 +13,7 @@ interface SignozRadioGroupProps {
 	options: Option[];
 	onChange: (e: RadioChangeEvent) => void;
 	className?: string;
+	disabled?: boolean;
 }

 function SignozRadioGroup({
@ -20,6 +21,7 @@ function SignozRadioGroup({
 	options,
 	onChange,
 	className = '',
+	disabled = false,
 }: SignozRadioGroupProps): JSX.Element {
 	return (
 		<Radio.Group
@ -27,6 +29,7 @@ function SignozRadioGroup({
 			buttonStyle="solid"
 			className={`signoz-radio-group ${className}`}
 			onChange={onChange}
+			disabled={disabled}
 		>
 			{options.map((option) => (
 				<Radio.Button
@ -43,6 +46,7 @@ function SignozRadioGroup({

 SignozRadioGroup.defaultProps = {
 	className: '',
+	disabled: false,
 };

 export default SignozRadioGroup;
--- a/frontend/src/container/AllError/index.tsx
+++ b/frontend/src/container/AllError/index.tsx
@ -65,6 +65,7 @@ type QueryParams = {
 	pageSize: number;
 	exceptionType?: string;
 	serviceName?: string;
+	compositeQuery?: string;
 };

 function AllErrors(): JSX.Element {
@ -81,6 +82,7 @@ function AllErrors(): JSX.Element {
 		getUpdatedPageSize,
 		getUpdatedExceptionType,
 		getUpdatedServiceName,
+		getUpdatedCompositeQuery,
 	} = useMemo(
 		() => ({
 			updatedOrder: getOrder(params.get(urlKey.order)),
@ -89,6 +91,7 @@ function AllErrors(): JSX.Element {
 			getUpdatedPageSize: getUpdatePageSize(params.get(urlKey.pageSize)),
 			getUpdatedExceptionType: getFilterString(params.get(urlKey.exceptionType)),
 			getUpdatedServiceName: getFilterString(params.get(urlKey.serviceName)),
+			getUpdatedCompositeQuery: getFilterString(params.get(urlKey.compositeQuery)),
 		}),
 		[params],
 	);
@ -203,6 +206,7 @@ function AllErrors(): JSX.Element {
 				offset: getUpdatedOffset,
 				orderParam: getUpdatedParams,
 				pageSize: getUpdatedPageSize,
+				compositeQuery: getUpdatedCompositeQuery,
 			};

 			if (exceptionFilterValue && exceptionFilterValue !== 'undefined') {
@ -222,6 +226,7 @@ function AllErrors(): JSX.Element {
 			getUpdatedPageSize,
 			getUpdatedParams,
 			getUpdatedServiceName,
+			getUpdatedCompositeQuery,
 			pathname,
 			updatedOrder,
 		],
@ -430,6 +435,7 @@ function AllErrors(): JSX.Element {
 					serviceName: getFilterString(params.get(urlKey.serviceName)),
 					exceptionType: getFilterString(params.get(urlKey.exceptionType)),
 				});
+				const compositeQuery = params.get(urlKey.compositeQuery) || '';
 				history.replace(
 					`${pathname}?${createQueryParams({
 						order: updatedOrder,
@ -438,6 +444,7 @@ function AllErrors(): JSX.Element {
 						pageSize,
 						exceptionType,
 						serviceName,
+						compositeQuery,
 					})}`,
 				);
 			}
--- a/frontend/src/container/AllError/utils.ts
+++ b/frontend/src/container/AllError/utils.ts
@ -18,6 +18,7 @@ export const urlKey = {
 	pageSize: 'pageSize',
 	exceptionType: 'exceptionType',
 	serviceName: 'serviceName',
+	compositeQuery: 'compositeQuery',
 };

 export const isOrderParams = (orderBy: string | null): orderBy is OrderBy =>
--- a/frontend/src/container/AppLayout/AppLayout.styles.scss
+++ b/frontend/src/container/AppLayout/AppLayout.styles.scss
@ -4,6 +4,21 @@
 .app-banner-wrapper {
 	position: relative;
 	width: 100%;
+
+	.refresh-payment-status {
+		display: inline-flex;
+		align-items: center;
+		gap: 4px;
+		margin-left: 4px;
+
+		.refresh-payment-status-btn-wrapper {
+			display: inline-block;
+
+			&:hover {
+				text-decoration: underline;
+			}
+		}
+	}
 }

 .app-layout {
@ -12,24 +27,24 @@
 	width: 100%;

 	&.isWorkspaceRestricted {
-		height: calc(100% - 32px);
+		height: calc(100% - 48px);

 		// same styles as its either trial expired or payment failed
 		&.isTrialExpired {
-			height: calc(100% - 64px);
+			height: calc(100% - 96px);
 		}

 		&.isPaymentFailed {
-			height: calc(100% - 64px);
+			height: calc(100% - 96px);
 		}
 	}

 	&.isTrialExpired {
-		height: calc(100% - 32px);
+		height: calc(100% - 48px);
 	}

 	&.isPaymentFailed {
-		height: calc(100% - 32px);
+		height: calc(100% - 48px);
 	}

 	.app-content {
@ -196,5 +211,5 @@
 .workspace-restricted-banner,
 .trial-expiry-banner,
 .payment-failed-banner {
-	height: 32px;
+	height: 48px;
 }
--- a/frontend/src/container/AppLayout/index.tsx
+++ b/frontend/src/container/AppLayout/index.tsx
@ -16,6 +16,7 @@ import cx from 'classnames';
 import ChangelogModal from 'components/ChangelogModal/ChangelogModal';
 import ChatSupportGateway from 'components/ChatSupportGateway/ChatSupportGateway';
 import OverlayScrollbar from 'components/OverlayScrollbar/OverlayScrollbar';
+import RefreshPaymentStatus from 'components/RefreshPaymentStatus/RefreshPaymentStatus';
 import { Events } from 'constants/events';
 import { FeatureKeys } from 'constants/features';
 import { LOCALSTORAGE } from 'constants/localStorage';
@ -27,6 +28,7 @@ import dayjs from 'dayjs';
 import { useIsDarkMode } from 'hooks/useDarkMode';
 import { useGetTenantLicense } from 'hooks/useGetTenantLicense';
 import { useNotifications } from 'hooks/useNotifications';
+import useTabVisibility from 'hooks/useTabFocus';
 import history from 'lib/history';
 import { isNull } from 'lodash-es';
 import ErrorBoundaryFallback from 'pages/ErrorBoundaryFallback/ErrorBoundaryFallback';
@ -154,6 +156,8 @@ function AppLayout(props: AppLayoutProps): JSX.Element {
 			preference.name === USER_PREFERENCES.LAST_SEEN_CHANGELOG_VERSION,
 	)?.value as string;

+	const isVisible = useTabVisibility();
+
 	const [
 		getUserVersionResponse,
 		getUserLatestVersionResponse,
@ -177,6 +181,14 @@ function AppLayout(props: AppLayoutProps): JSX.Element {
 		},
 	]);

+	useEffect(() => {
+		// refetch the changelog only when the current tab becomes active + there isn't an active request
+		if (!getChangelogByVersionResponse.isLoading && isVisible) {
+			getChangelogByVersionResponse.refetch();
+		}
+		// eslint-disable-next-line react-hooks/exhaustive-deps
+	}, [isVisible]);
+
 	useEffect(() => {
 		let timer: ReturnType<typeof setTimeout>;
 		if (
@ -654,6 +666,10 @@ function AppLayout(props: AppLayoutProps): JSX.Element {
 										upgrade
 									</a>
 									to continue using SigNoz features.
+									<span className="refresh-payment-status">
+										{' '}
+										| Already upgraded? <RefreshPaymentStatus type="text" />
+									</span>
 								</span>
 							) : (
 								'Please contact your administrator for upgrading to a paid plan.'
@ -680,6 +696,10 @@ function AppLayout(props: AppLayoutProps): JSX.Element {
 										pay the bill
 									</a>
 									to continue using SigNoz features.
+									<span className="refresh-payment-status">
+										{' '}
+										| Already paid? <RefreshPaymentStatus type="text" />
+									</span>
 								</span>
 							) : (
 								' Please contact your administrator to pay the bill.'
--- a/frontend/src/container/BillingContainer/BillingContainer.tsx
+++ b/frontend/src/container/BillingContainer/BillingContainer.tsx
@ -20,6 +20,7 @@ import getUsage, { UsageResponsePayloadProps } from 'api/billing/getUsage';
 import logEvent from 'api/common/logEvent';
 import updateCreditCardApi from 'api/v1/checkout/create';
 import manageCreditCardApi from 'api/v1/portal/create';
+import RefreshPaymentStatus from 'components/RefreshPaymentStatus/RefreshPaymentStatus';
 import Spinner from 'components/Spinner';
 import { SOMETHING_WENT_WRONG } from 'constants/api';
 import { REACT_QUERY_KEY } from 'constants/reactQueryKeys';
@ -440,14 +441,15 @@ export default function BillingContainer(): JSX.Element {
 							</Typography.Text>
 						) : null}
 					</Flex>
-					<Flex gap={20}>
+					<Flex gap={8}>
 						<Button
-							type="dashed"
+							type="default"
 							size="middle"
 							loading={isLoadingBilling || isLoadingManageBilling}
 							disabled={isLoading || isFetchingBillingData}
 							onClick={handleCsvDownload}
 							icon={<CloudDownloadOutlined />}
+							className="periscope-btn"
 						>
 							Download CSV
 						</Button>
@ -463,6 +465,8 @@ export default function BillingContainer(): JSX.Element {
 								? t('manage_billing')
 								: t('upgrade_plan')}
 						</Button>
+
+						<RefreshPaymentStatus type="tooltip" />
 					</Flex>
 				</Flex>

--- a/frontend/src/container/CreateAlertChannels/CreateAlertChannels.styles.scss
+++ b/frontend/src/container/CreateAlertChannels/CreateAlertChannels.styles.scss
@ -13,3 +13,14 @@
 		margin-bottom: 16px;
 	}
 }
+
+.lightMode {
+	.create-alert-channels-container {
+		background: var(--bg-vanilla-100);
+		border-color: var(--bg-vanilla-300);
+
+		.form-alert-channels-title {
+			color: var(--bg-ink-100);
+		}
+	}
+}
--- a/frontend/src/container/Home/Home.tsx
+++ b/frontend/src/container/Home/Home.tsx
@ -2,7 +2,7 @@
 import './Home.styles.scss';

 import { Color } from '@signozhq/design-tokens';
-import { Alert, Button, Popover } from 'antd';
+import { Button, Popover } from 'antd';
 import logEvent from 'api/common/logEvent';
 import { HostListPayload } from 'api/infraMonitoring/getHostLists';
 import { K8sPodsListPayload } from 'api/infraMonitoring/getK8sPodsList';
@ -320,8 +320,6 @@ export default function Home(): JSX.Element {
 		}
 	}, [hostData, k8sPodsData, handleUpdateChecklistDoneItem]);

-	const { isCloudUser, isEnterpriseSelfHostedUser } = useGetTenantLicense();
-
 	useEffect(() => {
 		logEvent('Homepage: Visited', {});
 	}, []);
@ -706,33 +704,6 @@ export default function Home(): JSX.Element {
 					)}
 				</div>
 				<div className="home-right-content">
-					{(isCloudUser || isEnterpriseSelfHostedUser) && (
-						<div className="home-notifications-container">
-							<div className="notification">
-								<Alert
-									message={
-										<>
-											We&apos;re updating our metric ingestion processing pipeline.
-											Currently, metric names and labels are normalized to replace dots and
-											other special characters with underscores (_). This restriction will
-											soon be removed. Learn more{' '}
-											<a
-												href="https://signoz.io/guides/metrics-migration-cloud-users"
-												target="_blank"
-												rel="noopener noreferrer"
-											>
-												here
-											</a>
-											.
-										</>
-									}
-									type="warning"
-									showIcon
-								/>
-							</div>
-						</div>
-					)}
-
 					{!isWelcomeChecklistSkipped && !loadingUserPreferences && (
 						<AnimatePresence initial={false}>
 							<Card className="checklist-card">
--- a/frontend/src/container/Licenses/ApplyLicenseForm.tsx
+++ b/frontend/src/container/Licenses/ApplyLicenseForm.tsx
@ -1,5 +1,5 @@
 import { Button, Form, Input } from 'antd';
-import apply from 'api/v3/licenses/put';
+import apply from 'api/v3/licenses/post';
 import { useNotifications } from 'hooks/useNotifications';
 import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
--- a/frontend/src/container/LogsExplorerList/InfinityTableView/TableRow.tsx
+++ b/frontend/src/container/LogsExplorerList/InfinityTableView/TableRow.tsx
@ -57,6 +57,10 @@ export default function TableRow({
 		[currentLog, handleSetActiveContextLog],
 	);

+	const hasSingleColumn =
+		tableColumns.filter((column) => column.key !== 'state-indicator').length ===
+		1;
+
 	return (
 		<>
 			{tableColumns.map((column) => {
@ -80,9 +84,11 @@ export default function TableRow({
 					<TableCellStyled
 						$isDragColumn={false}
 						$isLogIndicator={column.key === 'state-indicator'}
+						$hasSingleColumn={hasSingleColumn}
 						$isDarkMode={isDarkMode}
 						key={column.key}
 						fontSize={fontSize}
+						columnKey={column.key as string}
 					>
 						{cloneElement(children, props)}
 					</TableCellStyled>
--- a/frontend/src/container/LogsExplorerList/InfinityTableView/index.tsx
+++ b/frontend/src/container/LogsExplorerList/InfinityTableView/index.tsx
@ -135,6 +135,7 @@ const InfinityTable = forwardRef<TableVirtuosoHandle, InfinityTableProps>(
 									fontSize={tableViewProps?.fontSize}
 									// eslint-disable-next-line react/jsx-props-no-spreading
 									{...(isDragColumn && { className: 'dragHandler' })}
+									columnKey={column.key as string}
 								>
 									{(column.title as string).replace(/^\w/, (c) => c.toUpperCase())}
 								</TableHeaderCellStyled>
--- a/frontend/src/container/LogsExplorerList/InfinityTableView/styles.ts
+++ b/frontend/src/container/LogsExplorerList/InfinityTableView/styles.ts
@ -8,13 +8,25 @@ interface TableHeaderCellStyledProps {
 	$isDragColumn: boolean;
 	$isDarkMode: boolean;
 	$isLogIndicator?: boolean;
+	$hasSingleColumn?: boolean;
 	fontSize?: FontSize;
+	columnKey?: string;
 }

 export const TableStyled = styled.table`
 	width: 100%;
 `;

+const getTimestampColumnWidth = (
+	columnKey?: string,
+	$hasSingleColumn?: boolean,
+): string =>
+	columnKey === 'timestamp'
+		? $hasSingleColumn
+			? 'width: 100%;'
+			: 'width: 10%;'
+		: '';
+
 export const TableCellStyled = styled.td<TableHeaderCellStyledProps>`
 	padding: 0.5rem;
 	${({ fontSize }): string =>
@ -29,9 +41,12 @@ export const TableCellStyled = styled.td<TableHeaderCellStyledProps>`
 		props.$isDarkMode ? 'inherit' : themeColors.whiteCream};

 	${({ $isLogIndicator }): string =>
-		$isLogIndicator ? 'padding: 0 0 0 8px;width: 15px;' : ''}
+		$isLogIndicator ? 'padding: 0 0 0 8px;width: 1%;' : ''}
 	color: ${(props): string =>
 		props.$isDarkMode ? themeColors.white : themeColors.bckgGrey};
+
+	${({ columnKey, $hasSingleColumn }): string =>
+		getTimestampColumnWidth(columnKey, $hasSingleColumn)}
 `;

 export const TableRowStyled = styled.tr<{
@ -86,7 +101,11 @@ export const TableHeaderCellStyled = styled.th<TableHeaderCellStyledProps>`
 			: fontSize === FontSize.LARGE
 			? `font-size:14px; line-height:24px; padding: 0.5rem;`
 			: ``};
-	${({ $isLogIndicator }): string => ($isLogIndicator ? 'padding: 0px; ' : '')}
+	${({ $isLogIndicator }): string =>
+		$isLogIndicator ? 'padding: 0px; width: 1%;' : ''}
 	color: ${(props): string =>
 		props.$isDarkMode ? 'var(--bg-vanilla-100, #fff)' : themeColors.bckgGrey};
+
+	${({ columnKey, $hasSingleColumn }): string =>
+		getTimestampColumnWidth(columnKey, $hasSingleColumn)}
 `;
--- a/frontend/src/container/OnboardingV2Container/AddDataSource/AddDataSource.tsx
+++ b/frontend/src/container/OnboardingV2Container/AddDataSource/AddDataSource.tsx
@ -434,6 +434,9 @@ function OnboardingAddDataSource(): JSX.Element {
 					history.push(ROUTES.LOGS);
 					break;
 				case 'metrics':
+					history.push(ROUTES.METRICS_EXPLORER);
+					break;
+				case 'dashboards':
 					history.push(ROUTES.ALL_DASHBOARD);
 					break;
 				case 'infra-monitoring-hosts':
@ -454,6 +457,9 @@ function OnboardingAddDataSource(): JSX.Element {
 				case 'home':
 					history.push(ROUTES.HOME);
 					break;
+				case 'api-monitoring':
+					history.push(ROUTES.API_MONITORING);
+					break;
 				default:
 					history.push(ROUTES.APPLICATION);
 			}
--- a/frontend/src/container/OnboardingV2Container/onboarding-configs/onboarding-config-with-links.json
+++ b/frontend/src/container/OnboardingV2Container/onboarding-configs/onboarding-config-with-links.json
@ -33,6 +33,60 @@
 		"imgUrl": "/Logos/grafana.svg",
 		"link": "https://signoz.io/docs/migration/migrate-from-grafana/"
 	},
+	{
+		"dataSource": "migrate-from-elk",
+		"label": "From ELK",
+		"tags": ["migrate to SigNoz"],
+		"module": "home",
+		"relatedSearchKeywords": [
+			"elk",
+			"elasticsearch",
+			"logstash",
+			"kibana",
+			"elastic stack",
+			"migration",
+			"elastic",
+			"opentelemetry"
+		],
+		"imgUrl": "/Logos/elk.svg",
+		"link": "https://signoz.io/docs/migration/migrate-from-elk-to-signoz/"
+	},
+	{
+		"dataSource": "migrate-from-newrelic",
+		"label": "From New Relic",
+		"tags": ["migrate to SigNoz"],
+		"module": "home",
+		"relatedSearchKeywords": [
+			"new relic",
+			"newrelic",
+			"apm migration",
+			"opentelemetry",
+			"migration guide",
+			"migrate",
+			"migration"
+		],
+		"imgUrl": "/Logos/newrelic.svg",
+		"link": "https://signoz.io/docs/migration/migrate-from-newrelic-to-signoz/"
+	},
+	{
+		"dataSource": "migrate-signoz-self-host-to-cloud",
+		"label": "From SigNoz Self-Host",
+		"tags": ["migrate to SigNoz"],
+		"module": "home",
+		"relatedSearchKeywords": [
+			"signoz self-hosted",
+			"signoz cloud",
+			"migration",
+			"self-host to cloud",
+			"data migration",
+			"migrate",
+			"migration",
+			"selfhosted signoz",
+			"self-host"
+		],
+		"imgUrl": "/Logos/signoz-brand-logo.svg",
+		"link": "https://signoz.io/docs/migration/migrate-from-signoz-self-host-to-signoz-cloud/"
+	},
 	{
 		"dataSource": "java",
 		"entityID": "dataSource",
@ -1139,6 +1193,57 @@
 		"relatedSearchKeywords": ["tracing", "nginx server", "nginx proxy", "nginx"],
 		"id": "nginx-tracing",
 		"link": "https://signoz.io/docs/instrumentation/opentelemetry-nginx/"
+	},
+		{
+		"dataSource": "opentelemetry-wordpress",
+		"label": "WordPress",
+		"imgUrl": "/Logos/wordpress.svg",
+		"tags": ["apm"],
+		"module": "apm",
+		"relatedSearchKeywords": [
+			"apm",
+			"wordpress",
+			"wordpress monitoring",
+			"wordpress tracing",
+			"wordpress performance",
+			"wordpress observability",
+			"opentelemetry wordpress",
+			"otel wordpress",
+			"wordpress instrumentation",
+			"monitor wordpress site",
+			"wordpress apm",
+			"wordpress metrics",
+			"wordpress php monitoring",
+			"wordpress plugin monitoring",
+			"wordpress to signoz"
+		],
+		"id": "opentelemetry-wordpress",
+		"link": "https://signoz.io/docs/instrumentation/opentelemetry-wordpress/"
+	},
+	{
+		"dataSource": "opentelemetry-cloudflare",
+		"label": "Cloudflare",
+		"imgUrl": "/Logos/cloudflare.svg",
+		"tags": ["apm"],
+		"module": "apm",
+		"relatedSearchKeywords": [
+			"apm",
+			"cloudflare",
+			"cloudflare workers",
+			"cloudflare monitoring",
+			"cloudflare tracing",
+			"cloudflare observability",
+			"opentelemetry cloudflare",
+			"otel cloudflare",
+			"cloudflare instrumentation",
+			"monitor cloudflare workers",
+			"cloudflare apm",
+			"cloudflare metrics",
+			"edge computing monitoring",
+			"cloudflare to signoz"
+		],
+		"id": "opentelemetry-cloudflare",
+		"link": "https://signoz.io/docs/instrumentation/opentelemetry-cloudflare/"
 	},
 	{
 		"dataSource": "kubernetes-pod-logs",
@ -1266,6 +1371,29 @@
 		"id": "syslogs",
 		"link": "https://signoz.io/docs/userguide/collecting_syslogs/"
 	},
+	{
+		"dataSource": "systemd-logs",
+		"label": "Systemd Logs",
+		"imgUrl": "/Logos/systemd.svg",
+		"tags": ["logs"],
+		"module": "logs",
+		"relatedSearchKeywords": [
+			"systemd logs",
+			"journalctl logs",
+			"collect systemd logs",
+			"systemd log monitoring",
+			"systemd log collection",
+			"systemd opentelemetry",
+			"systemd to otel",
+			"linux systemd monitoring",
+			"journald logs",
+			"systemd logs to signoz",
+			"systemctl",
+			"journald"
+		],
+		"id": "systemd-logs",
+		"link": "https://signoz.io/docs/logs-management/send-logs/collect-systemd-logs/"
+	},
 	{
 		"dataSource": "fluentd",
 		"label": "FluentD",
@ -1617,7 +1745,7 @@
 		"dataSource": "docker-container-metrics",
 		"label": "Docker Container Metrics",
 		"tags": ["metrics"],
-		"module": "metrics",
+		"module": "dashboards",
 		"relatedSearchKeywords": [
 			"docker container metrics",
 			"monitor docker containers",
@ -1657,7 +1785,7 @@
 		"dataSource": "ec2-infrastructure-metrics",
 		"label": "EC2 Infra Metrics",
 		"tags": ["AWS"],
-		"module": "metrics",
+		"module": "infra-monitoring-hosts",
 		"relatedSearchKeywords": [
 			"ec2 infrastructure metrics",
 			"monitor aws ec2",
@ -1677,7 +1805,7 @@
 		"dataSource": "ecs-ec2",
 		"label": "ECS EC2",
 		"tags": ["AWS"],
-		"module": "metrics",
+		"module": "dashboards",
 		"relatedSearchKeywords": [
 			"ecs ec2 monitoring",
 			"ecs ec2 logs and metrics",
@ -1697,7 +1825,7 @@
 		"dataSource": "ecs-external",
 		"label": "ECS External",
 		"tags": ["AWS"],
-		"module": "metrics",
+		"module": "dashboards",
 		"relatedSearchKeywords": [
 			"ecs external monitoring",
 			"external ecs observability",
@ -1717,7 +1845,7 @@
 		"dataSource": "ecs-fargate",
 		"label": "ECS Fargate",
 		"tags": ["AWS"],
-		"module": "metrics",
+		"module": "dashboards",
 		"relatedSearchKeywords": [
 			"ecs fargate monitoring",
 			"fargate logs and metrics",
@ -2065,6 +2193,26 @@
 			]
 		}
 	},
+	{
+		"dataSource": "azure-mysql-flexible-server",
+		"label": "Azure MySQL Flexible Server",
+		"tags": ["Azure"],
+		"module": "metrics",
+		"relatedSearchKeywords": [
+			"azure mysql flexible server",
+			"mysql flexible server monitoring",
+			"azure mysql metrics",
+			"mysql database monitoring azure",
+			"opentelemetry mysql azure",
+			"azure mysql observability",
+			"mysql flexible server logs",
+			"azure mysql telemetry",
+			"mysql azure performance monitoring",
+			"azure mysql to signoz"
+		],
+		"imgUrl": "/Logos/azure-mysql.svg",
+		"link": "https://signoz.io/docs/azure-monitoring/mysql-flexible-server/"
+	},
 	{
 		"dataSource": "cloud-functions",
 		"label": "Cloud functions",
@ -2465,6 +2613,29 @@
 			]
 		}
 	},
+	{
+		"dataSource": "openai-monitoring",
+		"label": "OpenAI Monitoring",
+		"imgUrl": "/Logos/openai.svg",
+		"tags": ["LLM Monitoring"],
+		"module": "apm",
+		"relatedSearchKeywords": [
+			"openai monitoring",
+			"openai tracing",
+			"openai observability",
+			"monitor openai api",
+			"openai performance monitoring",
+			"openai instrumentation",
+			"opentelemetry openai",
+			"otel openai",
+			"openai metrics",
+			"openai to signoz",
+			"openai logs",
+			"open ai",
+			"llm"
+		],
+		"link": "https://signoz.io/docs/llm/opentelemetry-openai-monitoring/"
+	},
 	{
 		"dataSource": "llm-monitoring",
 		"label": "LLM Monitoring",
@ -2485,6 +2656,226 @@
 		],
 		"link": "https://signoz.io/docs/community/llm-monitoring/"
 	},
+	{
+		"dataSource": "http-endpoints-monitoring",
+		"label": "HTTP Endpoints Monitoring",
+		"imgUrl": "/Logos/http-monitoring.svg",
+		"tags": ["Synthetic Monitoring"],
+		"module": "metrics",
+		"relatedSearchKeywords": [
+			"http endpoints monitoring",
+			"synthetic monitoring",
+			"uptime monitoring",
+			"endpoint health checks",
+			"api monitoring",
+			"website monitoring",
+			"http response monitoring",
+			"endpoint performance monitoring",
+			"synthetic tests",
+			"monitor http endpoints"
+		],
+		"link": "https://signoz.io/docs/monitor-http-endpoints/"
+	},
+	{
+		"dataSource": "external-api-monitoring-setup",
+		"label": "External API Monitoring Setup",
+		"imgUrl": "/Logos/external-api-monitoring.svg",
+		"tags": ["api-monitoring"],
+		"module": "api-monitoring",
+		"relatedSearchKeywords": [
+			"external api monitoring",
+			"api monitoring setup",
+			"monitor external apis",
+			"api observability",
+			"api performance monitoring",
+			"api health monitoring",
+			"third party api monitoring",
+			"api endpoint monitoring",
+			"api latency monitoring",
+			"api uptime monitoring",
+			"rest api monitoring",
+			"api metrics",
+			"api telemetry",
+			"monitor api calls",
+			"api monitoring configuration"
+		],
+		"link": "https://signoz.io/docs/external-api-monitoring/setup/"
+	},
+	{
+		"dataSource": "github-metrics",
+		"label": "GitHub Metrics",
+		"imgUrl": "/Logos/github.svg",
+		"tags": ["CICD"],
+		"module": "metrics",
+		"relatedSearchKeywords": [
+			"github metrics",
+			"github monitoring",
+			"github observability",
+			"monitor github repos",
+			"github telemetry",
+			"github api metrics",
+			"github repository monitoring",
+			"github to signoz",
+			"github cicd monitoring",
+			"github actions metrics"
+		],
+		"link": "https://signoz.io/docs/cicd/github/github-metrics/"
+	},
+	{
+		"dataSource": "github-actions-traces",
+		"label": "GitHub Actions Traces",
+		"imgUrl": "/Logos/github.svg",
+		"tags": ["CICD"],
+		"module": "apm",
+		"relatedSearchKeywords": [
+			"github actions traces",
+			"github actions monitoring",
+			"github actions observability",
+			"github actions tracing",
+			"monitor github actions",
+			"github workflow monitoring",
+			"github cicd tracing",
+			"github actions to signoz",
+			"github actions telemetry",
+			"github workflow observability"
+		],
+		"link": "https://signoz.io/docs/cicd/github/github-actions-traces/"
+	},
+	{
+		"dataSource": "jenkins-agent-node-monitoring",
+		"label": "Jenkins Agent Node Monitoring",
+		"imgUrl": "/Logos/jenkins.svg",
+		"tags": ["CICD"],
+		"module": "metrics",
+		"relatedSearchKeywords": [
+			"jenkins agent monitoring",
+			"jenkins node monitoring",
+			"jenkins observability",
+			"monitor jenkins agents",
+			"jenkins telemetry",
+			"jenkins infrastructure monitoring",
+			"jenkins agent metrics",
+			"jenkins to signoz",
+			"jenkins cicd monitoring",
+			"jenkins build agents"
+		],
+		"link": "https://signoz.io/docs/cicd/jenkins/agent-node-monitoring/"
+	},
+	{
+		"dataSource": "jenkins-tracing",
+		"label": "Jenkins Tracing",
+		"imgUrl": "/Logos/jenkins.svg",
+		"tags": ["CICD"],
+		"module": "apm",
+		"relatedSearchKeywords": [
+			"jenkins tracing",
+			"jenkins monitoring",
+			"jenkins observability",
+			"jenkins pipeline tracing",
+			"monitor jenkins builds",
+			"jenkins workflow monitoring",
+			"jenkins cicd tracing",
+			"jenkins to signoz",
+			"jenkins telemetry",
+			"jenkins pipeline observability"
+		],
+		"link": "https://signoz.io/docs/cicd/jenkins/jenkins-tracing/"
+	},
+	{
+		"dataSource": "argocd-metrics",
+		"label": "ArgoCD Metrics",
+		"imgUrl": "/Logos/argocd.svg",
+		"tags": ["CICD"],
+		"module": "dashboards",
+		"relatedSearchKeywords": [
+			"argocd metrics",
+			"argocd monitoring",
+			"argocd observability",
+			"monitor argocd",
+			"argocd telemetry",
+			"argocd gitops monitoring",
+			"argocd deployment monitoring",
+			"argocd to signoz",
+			"argocd cicd monitoring",
+			"gitops monitoring"
+		],
+		"link": "https://signoz.io/docs/cicd/argocd/argocd-metrics/"
+	},
+	{
+		"dataSource": "self-hosted-kafka",
+		"label": "Self-Hosted Kafka",
+		"imgUrl": "/Logos/kafka.svg",
+		"tags": ["Messaging Queues"],
+		"module": "messaging-queues-kafka",
+		"relatedSearchKeywords": [
+			"self hosted kafka",
+			"kafka setup",
+			"kafka open source",
+			"kafka observability",
+			"kafka integration"
+		],
+		"link": "https://signoz.io/docs/messaging-queues/kafka/"
+	},
+	{
+		"dataSource": "amazon-msk",
+		"label": "Amazon MSK",
+		"imgUrl": "/Logos/amazon-msk.svg",
+		"tags": ["Messaging Queues"],
+		"module": "messaging-queues-kafka",
+		"relatedSearchKeywords": [
+			"amazon msk",
+			"msk kafka",
+			"aws kafka",
+			"msk tracing",
+			"msk monitoring"
+		],
+		"link": "https://signoz.io/docs/messaging-queues/msk/"
+	},
+	{
+		"dataSource": "confluent-kafka",
+		"label": "Confluent Kafka",
+		"imgUrl": "/Logos/confluent-kafka.svg",
+		"tags": ["Messaging Queues"],
+		"module": "messaging-queues-kafka",
+		"relatedSearchKeywords": [
+			"confluent kafka",
+			"confluent cloud",
+			"kafka tracing",
+			"kafka cloud",
+			"kafka monitoring"
+		],
+		"link": "https://signoz.io/docs/messaging-queues/confluent-kafka/"
+	},
+	{
+		"dataSource": "strimzi-kafka",
+		"label": "Strimzi Kafka",
+		"imgUrl": "/Logos/strimzi.svg",
+		"tags": ["Messaging Queues"],
+		"module": "messaging-queues-kafka",
+		"relatedSearchKeywords": [
+			"strimzi kafka",
+			"kafka on kubernetes",
+			"strimzi operator",
+			"kafka helm chart",
+			"monitor kafka strimzi"
+		],
+		"link": "https://signoz.io/docs/messaging-queues/strimzi/"
+	},
+	{
+		"dataSource": "celery",
+		"label": "Celery",
+		"imgUrl": "/Logos/celery.svg",
+		"tags": ["Messaging Queues"],
+		"module": "messaging-queues-celery",
+		"relatedSearchKeywords": [
+			"celery python",
+			"celery tracing",
+			"celery monitoring",
+			"task queue tracing",
+			"celery opentelemetry"
+		],
+		"link": "https://signoz.io/docs/messaging-queues/celery-setup/"
+	},
 	{
 		"dataSource": "android-java",
 		"label": "Android Java",
@ -2605,87 +2996,17 @@
 		],
 		"link": "https://signoz.io/docs/frontend-monitoring/document-load/"
 	},
-	{
-		"dataSource": "self-hosted-kafka",
-		"label": "Self-Hosted Kafka",
-		"imgUrl": "/Logos/kafka.svg",
-		"tags": ["Messaging Queues"],
-		"module": "messaging-queues-kafka",
-		"relatedSearchKeywords": [
-			"self hosted kafka",
-			"kafka setup",
-			"kafka open source",
-			"kafka observability",
-			"kafka integration"
-		],
-		"link": "https://signoz.io/docs/messaging-queues/kafka/"
-	},
-	{
-		"dataSource": "amazon-msk",
-		"label": "Amazon MSK",
-		"imgUrl": "/Logos/amazon-msk.svg",
-		"tags": ["Messaging Queues"],
-		"module": "messaging-queues-kafka",
-		"relatedSearchKeywords": [
-			"amazon msk",
-			"msk kafka",
-			"aws kafka",
-			"msk tracing",
-			"msk monitoring"
-		],
-		"link": "https://signoz.io/docs/messaging-queues/msk/"
-	},
-	{
-		"dataSource": "confluent-kafka",
-		"label": "Confluent Kafka",
-		"imgUrl": "/Logos/confluent-kafka.svg",
-		"tags": ["Messaging Queues"],
-		"module": "messaging-queues-kafka",
-		"relatedSearchKeywords": [
-			"confluent kafka",
-			"confluent cloud",
-			"kafka tracing",
-			"kafka cloud",
-			"kafka monitoring"
-		],
-		"link": "https://signoz.io/docs/messaging-queues/confluent-kafka/"
-	},
-	{
-		"dataSource": "strimzi-kafka",
-		"label": "Strimzi Kafka",
-		"imgUrl": "/Logos/strimzi.svg",
-		"tags": ["Messaging Queues"],
-		"module": "messaging-queues-kafka",
-		"relatedSearchKeywords": [
-			"strimzi kafka",
-			"kafka on kubernetes",
-			"strimzi operator",
-			"kafka helm chart",
-			"monitor kafka strimzi"
-		],
-		"link": "https://signoz.io/docs/messaging-queues/strimzi/"
-	},
-	{
-		"dataSource": "celery",
-		"label": "Celery",
-		"imgUrl": "/Logos/celery.svg",
-		"tags": ["Messaging Queues"],
-		"module": "messaging-queues-celery",
-		"relatedSearchKeywords": [
-			"celery python",
-			"celery tracing",
-			"celery monitoring",
-			"task queue tracing",
-			"celery opentelemetry"
-		],
-		"link": "https://signoz.io/docs/messaging-queues/celery-setup/"
-	},
 	{
 		"dataSource": "redis",
 		"label": "Redis",
 		"tags": ["integrations", "database"],
 		"module": "integrations",
-		"relatedSearchKeywords": ["redis", "redis logs", "redis metrics", "database"],
+		"relatedSearchKeywords": [
+			"redis", 
+			"redis logs", 
+			"redis metrics", 
+			"database"
+		],
 		"imgUrl": "/Logos/redis.svg",
 		"link": "/integrations?integration=builtin-redis",
 		"internalRedirect": true
@ -2748,6 +3069,24 @@
 		"link": "/integrations?integration=builtin-clickhouse",
 		"internalRedirect": true
 	},
+	{
+		"dataSource": "snowflake",
+		"label": "Snowflake",
+		"tags": ["integrations", "metrics"],
+		"module": "metrics",
+		"relatedSearchKeywords": [
+			"snowflake",
+			"snowflake metrics",
+			"snowflake monitoring",
+			"snowflake observability",
+			"data warehouse monitoring",
+			"snowflake telemetry",
+			"snowflake performance monitoring",
+			"snowflake to signoz"
+		],
+		"imgUrl": "/Logos/snowflake.svg",
+		"link": "https://signoz.io/docs/integrations/snowflake/"
+	},
 	{
 		"dataSource": "aws-rds-postgresql",
 		"label": "AWS RDS (PostgreSQL)",
@ -2802,7 +3141,7 @@
 	{
 		"dataSource": "aws-alb",
 		"label": "AWS ALB - One Click",
-		"tags": ["integrations"],
+		"tags": ["integrations", "AWS"],
 		"module": "integrations",
 		"relatedSearchKeywords": [
 			"alb",
@ -2819,7 +3158,7 @@
 	{
 		"dataSource": "api-gateway",
 		"label": "AWS API Gateway - One Click",
-		"tags": ["integrations"],
+		"tags": ["integrations", "AWS"],
 		"module": "integrations",
 		"relatedSearchKeywords": [
 			"api gateway",
@ -2832,10 +3171,27 @@
 		"link": "/integrations?integration=aws-integration&service=api-gateway",
 		"internalRedirect": true
 	},
+	{
+		"dataSource": "aws-dynamodb",
+		"label": "DynamoDB - One Click",
+		"tags": ["integrations", "AWS"],
+		"module": "integrations",
+		"relatedSearchKeywords": [
+			"dynamodb",
+			"aws dynamodb",
+			"dynamodb logs",
+			"dynamodb metrics",
+			"nosql database",
+			"dynamodb monitoring"
+		],
+		"imgUrl": "/Logos/dynamodb.svg",
+		"link": "/integrations?integration=aws-integration&service=dynamodb",
+		"internalRedirect": true
+	},
 	{
 		"dataSource": "ec2",
 		"label": "EC2 - One Click",
-		"tags": ["integrations"],
+		"tags": ["integrations", "AWS"],
 		"module": "integrations",
 		"relatedSearchKeywords": [
 			"ec2",
@ -2848,10 +3204,61 @@
 		"link": "/integrations?integration=aws-integration&service=ec2",
 		"internalRedirect": true
 	},
+	{
+		"dataSource": "aws-ecs-one-click",
+		"label": "ECS - One Click",
+		"tags": ["integrations", "AWS"],
+		"module": "integrations",
+		"relatedSearchKeywords": [
+			"ecs",
+			"aws ecs",
+			"ecs logs",
+			"ecs metrics",
+			"container service",
+			"ecs monitoring"
+		],
+		"imgUrl": "/Logos/ecs.svg",
+		"link": "/integrations?integration=aws-integration&service=ecs",
+		"internalRedirect": true
+	},
+	{
+		"dataSource": "aws-eks-one-click",
+		"label": "EKS - One Click",
+		"tags": ["integrations", "AWS"],
+		"module": "integrations",
+		"relatedSearchKeywords": [
+			"eks",
+			"aws eks",
+			"eks logs",
+			"eks metrics",
+			"kubernetes service",
+			"eks monitoring"
+		],
+		"imgUrl": "/Logos/eks.svg",
+		"link": "/integrations?integration=aws-integration&service=eks",
+		"internalRedirect": true
+	},
+	{
+		"dataSource": "aws-elasticache-one-click",
+		"label": "ElastiCache - One Click",
+		"tags": ["integrations", "AWS"],
+		"module": "integrations",
+		"relatedSearchKeywords": [
+			"elasticache",
+			"aws elasticache",
+			"elasticache logs",
+			"elasticache metrics",
+			"cache service",
+			"elasticache monitoring"
+		],
+		"imgUrl": "/Logos/elasticache.svg",
+		"link": "/integrations?integration=aws-integration&service=elasticache",
+		"internalRedirect": true
+	},
 	{
 		"dataSource": "aws-lambda",
 		"label": "AWS Lambda - One Click",
-		"tags": ["integrations"],
+		"tags": ["integrations", "AWS"],
 		"module": "integrations",
 		"relatedSearchKeywords": [
 			"aws lambda",
@ -2867,7 +3274,7 @@
 	{
 		"dataSource": "amazon-msk",
 		"label": "Amazon MSK - One Click",
-		"tags": ["integrations"],
+		"tags": ["integrations", "AWS"],
 		"module": "integrations",
 		"relatedSearchKeywords": [
 			"amazon msk",
@ -2883,7 +3290,7 @@
 	{
 		"dataSource": "amazon-rds",
 		"label": "Amazon RDS - One Click",
-		"tags": ["integrations"],
+		"tags": ["integrations", "AWS"],
 		"module": "integrations",
 		"relatedSearchKeywords": [
 			"amazon rds",
@ -2896,6 +3303,57 @@
 		"link": "/integrations?integration=aws-integration&service=rds",
 		"internalRedirect": true
 	},
+	{
+		"dataSource": "aws-s3-sync",
+		"label": "S3 Sync - One Click",
+		"tags": ["integrations", "AWS"],
+		"module": "integrations",
+		"relatedSearchKeywords": [
+			"s3 sync",
+			"aws s3",
+			"s3 logs",
+			"s3 metrics",
+			"object storage",
+			"s3 monitoring"
+		],
+		"imgUrl": "/Logos/s3.svg",
+		"link": "/integrations?integration=aws-integration&service=s3sync",
+		"internalRedirect": true
+	},
+	{
+		"dataSource": "aws-sns",
+		"label": "SNS - One Click",
+		"tags": ["integrations", "AWS"],
+		"module": "integrations",
+		"relatedSearchKeywords": [
+			"sns",
+			"aws sns",
+			"sns logs",
+			"sns metrics",
+			"notification service",
+			"sns monitoring"
+		],
+		"imgUrl": "/Logos/sns.svg",
+		"link": "/integrations?integration=aws-integration&service=sns",
+		"internalRedirect": true
+	},
+	{
+		"dataSource": "aws-sqs",
+		"label": "SQS - One Click",
+		"tags": ["integrations", "AWS"],
+		"module": "integrations",
+		"relatedSearchKeywords": [
+			"sqs",
+			"aws sqs",
+			"sqs logs",
+			"sqs metrics",
+			"queue service",
+			"sqs monitoring"
+		],
+		"imgUrl": "/Logos/sqs.svg",
+		"link": "/integrations?integration=aws-integration&service=sqs",
+		"internalRedirect": true
+	},
 	{
 		"dataSource": "temporal",
 		"label": "Temporal",
--- a/frontend/src/container/TraceWaterfall/TraceWaterfallStates/Success/Success.tsx
+++ b/frontend/src/container/TraceWaterfall/TraceWaterfallStates/Success/Success.tsx
@ -22,6 +22,7 @@ import {
 	ChevronRight,
 	Leaf,
 } from 'lucide-react';
+import { useAppContext } from 'providers/App/App';
 import {
 	Dispatch,
 	SetStateAction,
@ -70,10 +71,10 @@ function SpanOverview({
 	handleCollapseUncollapse: (id: string, collapse: boolean) => void;
 	selectedSpan: Span | undefined;
 	setSelectedSpan: Dispatch<SetStateAction<Span | undefined>>;
-
 	handleAddSpanToFunnel: (span: Span) => void;
 }): JSX.Element {
 	const isRootSpan = span.level === 0;
+	const { hasEditPermission } = useAppContext();

 	let color = generateColor(span.serviceName, themeColors.traceDetailColors);
 	if (span.hasError) {
@ -152,23 +153,32 @@ function SpanOverview({
 					{!!span.serviceName && !!span.name && (
 						<div className="add-funnel-button">
 							<span className="add-funnel-button__separator">·</span>
-							<Button
-								type="text"
-								size="small"
-								className="add-funnel-button__button"
-								onClick={(e): void => {
-									e.preventDefault();
-									e.stopPropagation();
-									handleAddSpanToFunnel(span);
-								}}
-								icon={
-									<img
-										className="add-funnel-button__icon"
-										src="/Icons/funnel-add.svg"
-										alt="funnel-icon"
-									/>
+							<Tooltip
+								title={
+									!hasEditPermission
+										? 'You need editor or admin access to add spans to funnels'
+										: ''
 								}
-							/>
+							>
+								<Button
+									type="text"
+									size="small"
+									className="add-funnel-button__button"
+									onClick={(e): void => {
+										e.preventDefault();
+										e.stopPropagation();
+										handleAddSpanToFunnel(span);
+									}}
+									disabled={!hasEditPermission}
+									icon={
+										<img
+											className="add-funnel-button__icon"
+											src="/Icons/funnel-add.svg"
+											alt="funnel-icon"
+										/>
+									}
+								/>
+							</Tooltip>
 						</div>
 					)}
 				</section>
--- a/frontend/src/pages/ChannelsEdit/ChannelsEdit.styles.scss
+++ b/frontend/src/pages/ChannelsEdit/ChannelsEdit.styles.scss
@ -12,3 +12,14 @@
 		margin-bottom: 16px;
 	}
 }
+
+.lightMode {
+	.edit-alert-channels-container {
+		background: var(--bg-vanilla-100);
+		border-color: var(--bg-vanilla-300);
+
+		.form-alert-channels-title {
+			color: var(--bg-ink-100);
+		}
+	}
+}
--- a/frontend/src/pages/TracesFunnelDetails/components/FunnelConfiguration/FunnelConfiguration.tsx
+++ b/frontend/src/pages/TracesFunnelDetails/components/FunnelConfiguration/FunnelConfiguration.tsx
@ -8,6 +8,7 @@ import { PencilLine } from 'lucide-react';
 import FunnelItemPopover from 'pages/TracesFunnels/components/FunnelsList/FunnelItemPopover';
 import { useFunnelContext } from 'pages/TracesFunnels/FunnelContext';
 import CopyToClipboard from 'periscope/components/CopyToClipboard';
+import { useAppContext } from 'providers/App/App';
 import { memo, useState } from 'react';
 import { Span } from 'types/api/trace/getTraceV2';
 import { FunnelData } from 'types/api/traceFunnels';
@ -33,6 +34,7 @@ function FunnelConfiguration({
 	triggerAutoSave,
 	showNotifications,
 }: FunnelConfigurationProps): JSX.Element {
+	const { hasEditPermission } = useAppContext();
 	const { triggerSave } = useFunnelContext();
 	const {
 		isPopoverOpen,
@ -62,7 +64,10 @@ function FunnelConfiguration({
 					<div className="funnel-configuration__header-right">
 						<Tooltip
 							title={
-								funnel?.description
+								// eslint-disable-next-line no-nested-ternary
+								!hasEditPermission
+									? 'You need editor or admin access to edit funnel description'
+									: funnel?.description
 									? 'Edit funnel description'
 									: 'Add funnel description'
 							}
@ -73,6 +78,7 @@ function FunnelConfiguration({
 								icon={<PencilLine size={14} />}
 								onClick={(): void => setIsDescriptionModalOpen(true)}
 								aria-label="Edit Funnel Description"
+								disabled={!hasEditPermission}
 							/>
 						</Tooltip>
 						<CopyToClipboard textToCopy={window.location.href} />
--- a/frontend/src/pages/TracesFunnelDetails/components/FunnelConfiguration/FunnelStep.styles.scss
+++ b/frontend/src/pages/TracesFunnelDetails/components/FunnelConfiguration/FunnelStep.styles.scss
@ -10,6 +10,37 @@
 	border: 1px solid var(--bg-slate-500);
 	border-radius: 6px;
 	width: 100%;
+
+	&--readonly {
+		opacity: 0.7;
+
+		.filters {
+			pointer-events: none;
+			.ant-select-selector {
+				cursor: not-allowed;
+			}
+
+			.ant-select {
+				cursor: not-allowed;
+			}
+
+			.query-builder-search-v2 {
+				.ant-select-selector {
+					cursor: not-allowed;
+				}
+
+				.ant-select {
+					cursor: not-allowed;
+				}
+			}
+		}
+
+		.error__switch {
+			opacity: 0.5;
+			cursor: not-allowed;
+		}
+	}
+
 	.step-popover {
 		opacity: 0;
 		width: 22px;
--- a/frontend/src/pages/TracesFunnelDetails/components/FunnelConfiguration/FunnelStep.tsx
+++ b/frontend/src/pages/TracesFunnelDetails/components/FunnelConfiguration/FunnelStep.tsx
@ -1,12 +1,14 @@
 import './FunnelStep.styles.scss';

 import { Button, Divider, Form, Switch, Tooltip } from 'antd';
+import cx from 'classnames';
 import { FilterSelect } from 'components/CeleryOverview/CeleryOverviewConfigOptions/CeleryOverviewConfigOptions';
 import { QueryParams } from 'constants/query';
 import { initialQueriesMap } from 'constants/queryBuilder';
 import QueryBuilderSearchV2 from 'container/QueryBuilder/filters/QueryBuilderSearchV2/QueryBuilderSearchV2';
 import { HardHat, PencilLine } from 'lucide-react';
 import { useFunnelContext } from 'pages/TracesFunnels/FunnelContext';
+import { useAppContext } from 'providers/App/App';
 import { useMemo, useState } from 'react';
 import { FunnelStepData } from 'types/api/traceFunnels';
 import { DataSource } from 'types/common/queryBuilder';
@ -69,8 +71,14 @@ function FunnelStep({

 	const query = updatedCurrentQuery?.builder?.queryData[0] || null;

+	const { hasEditPermission } = useAppContext();
+
 	return (
-		<div className="funnel-step">
+		<div
+			className={cx('funnel-step', {
+				'funnel-step--readonly': !hasEditPermission,
+			})}
+		>
 			<Form form={form}>
 				<div className="funnel-step__header">
 					<div className="funnel-step-details">
@ -92,12 +100,19 @@ function FunnelStep({
 						)}
 					</div>
 					<div className="funnel-step-actions">
-						<Tooltip title="Add details to step">
+						<Tooltip
+							title={
+								!hasEditPermission
+									? 'You need editor or admin access to add details to step'
+									: 'Add details to step'
+							}
+						>
 							<Button
 								type="text"
 								className="funnel-item__action-btn"
 								icon={<PencilLine size={14} />}
 								onClick={(): void => setIsAddDetailsModalOpen(true)}
+								disabled={!hasEditPermission}
 							/>
 						</Tooltip>

@ -129,9 +144,13 @@ function FunnelStep({
 										shouldSetQueryParams={false}
 										values={stepData.service_name}
 										isMultiple={false}
-										onChange={(v): void => {
-											onStepChange(index, { service_name: (v ?? '') as string });
-										}}
+										onChange={
+											hasEditPermission
+												? (v): void => {
+														onStepChange(index, { service_name: (v ?? '') as string });
+												  }
+												: undefined
+										}
 									/>
 								</Form.Item>
 							</div>
@ -144,8 +163,11 @@ function FunnelStep({
 										shouldSetQueryParams={false}
 										values={stepData.span_name}
 										isMultiple={false}
-										onChange={(v): void =>
-											onStepChange(index, { span_name: (v ?? '') as string })
+										onChange={
+											hasEditPermission
+												? (v): void =>
+														onStepChange(index, { span_name: (v ?? '') as string })
+												: undefined
 										}
 									/>
 								</Form.Item>
@ -156,7 +178,11 @@ function FunnelStep({
 							<Form.Item name={['steps', stepData.id, 'filters']}>
 								<QueryBuilderSearchV2
 									query={query}
-									onChange={(query): void => onStepChange(index, { filters: query })}
+									onChange={
+										hasEditPermission
+											? (query): void => onStepChange(index, { filters: query })
+											: (): void => {}
+									}
 									hasPopupContainer={false}
 									placeholder="Search for filters..."
 									suffixIcon={<HardHat size={12} color="var(--bg-vanilla-400)" />}
@ -172,6 +198,7 @@ function FunnelStep({
 							className="error__switch"
 							size="small"
 							checked={stepData.has_errors}
+							disabled={!hasEditPermission}
 							onChange={(): void =>
 								onStepChange(index, { has_errors: !stepData.has_errors })
 							}
--- a/frontend/src/pages/TracesFunnelDetails/components/FunnelConfiguration/FunnelStepPopover.tsx
+++ b/frontend/src/pages/TracesFunnelDetails/components/FunnelConfiguration/FunnelStepPopover.tsx
@ -1,6 +1,7 @@
 import { Button, Popover, Tooltip } from 'antd';
 import cx from 'classnames';
 import { Ellipsis, PencilLine, Trash2 } from 'lucide-react';
+import { useAppContext } from 'providers/App/App';
 import { useState } from 'react';
 import { FunnelStepData } from 'types/api/traceFunnels';

@ -27,6 +28,7 @@ interface FunnelStepActionsProps {
 	setIsAddDetailsModalOpen: (isOpen: boolean) => void;
 	setIsDeleteModalOpen: (isOpen: boolean) => void;
 	stepsCount: number;
+	hasEditPermission: boolean;
 }

 function FunnelStepActions({
@ -34,6 +36,7 @@ function FunnelStepActions({
 	setIsAddDetailsModalOpen,
 	setIsDeleteModalOpen,
 	stepsCount,
+	hasEditPermission,
 }: FunnelStepActionsProps): JSX.Element {
 	return (
 		<div className="funnel-item__actions">
@ -41,6 +44,7 @@ function FunnelStepActions({
 				type="text"
 				className="funnel-item__action-btn"
 				icon={<PencilLine size={14} />}
+				disabled={!hasEditPermission}
 				onClick={(): void => {
 					setIsPopoverOpen(false);
 					setIsAddDetailsModalOpen(true);
@ -49,12 +53,21 @@ function FunnelStepActions({
 				Add details
 			</Button>

-			<Tooltip title={stepsCount <= 2 ? 'Minimum 2 steps required' : 'Delete'}>
+			<Tooltip
+				title={
+					// eslint-disable-next-line no-nested-ternary
+					!hasEditPermission
+						? 'You need editor or admin access to delete steps'
+						: stepsCount <= 2
+						? 'Minimum 2 steps required'
+						: 'Delete'
+				}
+			>
 				<Button
 					type="text"
 					className="funnel-item__action-btn funnel-item__action-btn--delete"
 					icon={<Trash2 size={14} />}
-					disabled={stepsCount <= 2}
+					disabled={stepsCount <= 2 || !hasEditPermission}
 					onClick={(): void => {
 						if (stepsCount > 2) {
 							setIsPopoverOpen(false);
@ -80,12 +93,26 @@ function FunnelStepPopover({
 	setIsAddDetailsModalOpen,
 }: FunnelStepPopoverProps): JSX.Element {
 	const [isDeleteModalOpen, setIsDeleteModalOpen] = useState<boolean>(false);
+	const { hasEditPermission } = useAppContext();

 	const preventDefault = (e: React.MouseEvent | React.KeyboardEvent): void => {
 		e.preventDefault();
 		e.stopPropagation();
 	};

+	if (!hasEditPermission) {
+		return (
+			<Tooltip title="You need editor or admin access to add details to step">
+				<Button
+					type="text"
+					className="funnel-item__action-btn"
+					icon={<Ellipsis size={14} />}
+					disabled
+				/>
+			</Tooltip>
+		);
+	}
+
 	return (
 		// eslint-disable-next-line jsx-a11y/click-events-have-key-events
 		<div onClick={preventDefault} role="button" tabIndex={0}>
@ -100,6 +127,7 @@ function FunnelStepPopover({
 						setIsPopoverOpen={setIsPopoverOpen}
 						setIsAddDetailsModalOpen={setIsAddDetailsModalOpen}
 						stepsCount={stepsCount}
+						hasEditPermission={hasEditPermission}
 					/>
 				}
 				placement="bottomRight"
--- a/frontend/src/pages/TracesFunnelDetails/components/FunnelConfiguration/InterStepConfig.tsx
+++ b/frontend/src/pages/TracesFunnelDetails/components/FunnelConfiguration/InterStepConfig.tsx
@ -3,6 +3,7 @@ import './InterStepConfig.styles.scss';
 import { Divider } from 'antd';
 import SignozRadioGroup from 'components/SignozRadioGroup/SignozRadioGroup';
 import { useFunnelContext } from 'pages/TracesFunnels/FunnelContext';
+import { useAppContext } from 'providers/App/App';
 import { FunnelStepData, LatencyOptions } from 'types/api/traceFunnels';

 function InterStepConfig({
@ -13,6 +14,7 @@ function InterStepConfig({
 	step: FunnelStepData;
 }): JSX.Element {
 	const { handleStepChange: onStepChange } = useFunnelContext();
+	const { hasEditPermission } = useAppContext();
 	const options = Object.entries(LatencyOptions).map(([key, value]) => ({
 		label: key,
 		value,
@ -28,11 +30,15 @@ function InterStepConfig({
 				<SignozRadioGroup
 					value={step.latency_type ?? LatencyOptions.P99}
 					options={options}
-					onChange={(e): void =>
-						onStepChange(index, {
-							...step,
-							latency_type: e.target.value,
-						})
+					disabled={!hasEditPermission}
+					onChange={
+						hasEditPermission
+							? (e): void =>
+									onStepChange(index, {
+										...step,
+										latency_type: e.target.value,
+									})
+							: (): void => {}
 					}
 				/>
 			</div>
--- a/frontend/src/pages/TracesFunnelDetails/components/FunnelConfiguration/StepsContent.tsx
+++ b/frontend/src/pages/TracesFunnelDetails/components/FunnelConfiguration/StepsContent.tsx
@ -1,9 +1,10 @@
 import './StepsContent.styles.scss';

-import { Button, Steps } from 'antd';
+import { Button, Steps, Tooltip } from 'antd';
 import logEvent from 'api/common/logEvent';
 import { PlusIcon, Undo2 } from 'lucide-react';
 import { useFunnelContext } from 'pages/TracesFunnels/FunnelContext';
+import { useAppContext } from 'providers/App/App';
 import { memo, useCallback } from 'react';
 import { Span } from 'types/api/trace/getTraceV2';

@ -20,9 +21,10 @@ function StepsContent({
 	span?: Span;
 }): JSX.Element {
 	const { steps, handleAddStep, handleReplaceStep } = useFunnelContext();
+	const { hasEditPermission } = useAppContext();

 	const handleAddForNewStep = useCallback(() => {
-		if (!span) return;
+		if (!span || !hasEditPermission) return;

 		const stepWasAdded = handleAddStep();
 		if (stepWasAdded) {
@ -32,7 +34,7 @@ function StepsContent({
 			'Trace Funnels: span added for a new step from trace details page',
 			{},
 		);
-	}, [span, handleAddStep, handleReplaceStep, steps.length]);
+	}, [span, handleAddStep, handleReplaceStep, steps.length, hasEditPermission]);

 	return (
 		<div className="steps-content">
@ -45,20 +47,29 @@ function StepsContent({
 								<div className="funnel-step-wrapper">
 									<FunnelStep stepData={step} index={index} stepsCount={steps.length} />
 									{isTraceDetailsPage && span && (
-										<Button
-											type="default"
-											className="funnel-step-wrapper__replace-button"
-											icon={<Undo2 size={12} />}
-											disabled={
-												step.service_name === span.serviceName &&
-												step.span_name === span.name
-											}
-											onClick={(): void =>
-												handleReplaceStep(index, span.serviceName, span.name)
+										<Tooltip
+											title={
+												!hasEditPermission
+													? 'You need editor or admin access to replace steps'
+													: ''
 											}
 										>
-											Replace
-										</Button>
+											<Button
+												type="default"
+												className="funnel-step-wrapper__replace-button"
+												icon={<Undo2 size={12} />}
+												disabled={
+													(step.service_name === span.serviceName &&
+														step.span_name === span.name) ||
+													!hasEditPermission
+												}
+												onClick={(): void =>
+													handleReplaceStep(index, span.serviceName, span.name)
+												}
+											>
+												Replace
+											</Button>
+										</Tooltip>
 									)}
 								</div>
 								{/* Display InterStepConfig only between steps */}
@ -76,23 +87,41 @@ function StepsContent({
 						className="steps-content__add-step"
 						description={
 							!isTraceDetailsPage ? (
-								<Button
-									type="default"
-									className="steps-content__add-btn"
-									onClick={handleAddStep}
-									icon={<PlusIcon size={14} />}
+								<Tooltip
+									title={
+										!hasEditPermission
+											? 'You need editor or admin access to add steps'
+											: ''
+									}
 								>
-									Add Funnel Step
-								</Button>
+									<Button
+										type="default"
+										className="steps-content__add-btn"
+										onClick={handleAddStep}
+										icon={<PlusIcon size={14} />}
+										disabled={!hasEditPermission}
+									>
+										Add Funnel Step
+									</Button>
+								</Tooltip>
 							) : (
-								<Button
-									type="default"
-									className="steps-content__add-btn"
-									onClick={handleAddForNewStep}
-									icon={<PlusIcon size={14} />}
+								<Tooltip
+									title={
+										!hasEditPermission
+											? 'You need editor or admin access to add steps'
+											: ''
+									}
 								>
-									Add for new Step
-								</Button>
+									<Button
+										type="default"
+										className="steps-content__add-btn"
+										onClick={handleAddForNewStep}
+										icon={<PlusIcon size={14} />}
+										disabled={!hasEditPermission}
+									>
+										Add for new Step
+									</Button>
+								</Tooltip>
 							)
 						}
 					/>
--- a/frontend/src/pages/TracesFunnels/components/FunnelsEmptyState/FunnelsEmptyState.tsx
+++ b/frontend/src/pages/TracesFunnels/components/FunnelsEmptyState/FunnelsEmptyState.tsx
@ -3,6 +3,7 @@ import './FunnelsEmptyState.styles.scss';
 import { Button } from 'antd';
 import LearnMore from 'components/LearnMore/LearnMore';
 import { Plus } from 'lucide-react';
+import { useAppContext } from 'providers/App/App';

 interface FunnelsEmptyStateProps {
 	onCreateFunnel?: () => void;
@ -11,6 +12,8 @@ interface FunnelsEmptyStateProps {
 function FunnelsEmptyState({
 	onCreateFunnel,
 }: FunnelsEmptyStateProps): JSX.Element {
+	const { hasEditPermission } = useAppContext();
+
 	return (
 		<div className="funnels-empty">
 			<div className="funnels-empty__content">
@ -29,14 +32,16 @@ function FunnelsEmptyState({
 				</section>

 				<div className="funnels-empty__actions">
-					<Button
-						type="primary"
-						icon={<Plus size={16} />}
-						onClick={onCreateFunnel}
-						className="funnels-empty__new-btn"
-					>
-						New funnel
-					</Button>
+					{hasEditPermission && (
+						<Button
+							type="primary"
+							icon={<Plus size={16} />}
+							onClick={onCreateFunnel}
+							className="funnels-empty__new-btn"
+						>
+							New funnel
+						</Button>
+					)}
 					<LearnMore url="https://signoz.io/blog/tracing-funnels-observability-distributed-systems/" />
 				</div>
 			</div>
--- a/frontend/src/pages/TracesFunnels/components/FunnelsList/FunnelItemPopover.tsx
+++ b/frontend/src/pages/TracesFunnels/components/FunnelsList/FunnelItemPopover.tsx
@ -1,6 +1,7 @@
-import { Button, Popover } from 'antd';
+import { Button, Popover, Tooltip } from 'antd';
 import cx from 'classnames';
 import { Ellipsis, PencilLine, Trash2 } from 'lucide-react';
+import { useAppContext } from 'providers/App/App';
 import { useState } from 'react';
 import { FunnelData } from 'types/api/traceFunnels';

@ -61,6 +62,7 @@ function FunnelItemPopover({
 }: FunnelItemPopoverProps): JSX.Element {
 	const [isRenameModalOpen, setIsRenameModalOpen] = useState<boolean>(false);
 	const [isDeleteModalOpen, setIsDeleteModalOpen] = useState<boolean>(false);
+	const { hasEditPermission } = useAppContext();

 	const handleRenameCancel = (): void => {
 		setIsRenameModalOpen(false);
@ -71,6 +73,19 @@ function FunnelItemPopover({
 		e.stopPropagation();
 	};

+	if (!hasEditPermission) {
+		return (
+			<Tooltip title="You need editor or admin access to edit funnels">
+				<Button
+					type="text"
+					className="funnel-item__action-btn"
+					icon={<Ellipsis size={14} />}
+					disabled
+				/>
+			</Tooltip>
+		);
+	}
+
 	return (
 		// eslint-disable-next-line jsx-a11y/click-events-have-key-events
 		<div
--- a/frontend/src/pages/TracesFunnels/components/SearchBar/SearchBar.tsx
+++ b/frontend/src/pages/TracesFunnels/components/SearchBar/SearchBar.tsx
@ -1,6 +1,7 @@
 import { Color } from '@signozhq/design-tokens';
-import { Button, Input, Popover, Typography } from 'antd';
+import { Button, Input, Popover, Tooltip, Typography } from 'antd';
 import { ArrowDownWideNarrow, Check, Plus, Search } from 'lucide-react';
+import { useAppContext } from 'providers/App/App';
 import { ChangeEvent } from 'react';

 interface SearchBarProps {
@ -21,6 +22,8 @@ function SearchBar({
 	onSort,
 	onCreateFunnel,
 }: SearchBarProps): JSX.Element {
+	const { hasEditPermission } = useAppContext();
+
 	return (
 		<div className="search">
 			<Popover
@ -70,14 +73,23 @@ function SearchBar({
 				value={searchQuery}
 				onChange={onSearch}
 			/>
-			<Button
-				type="primary"
-				icon={<Plus size={16} />}
-				className="search__new-btn"
-				onClick={onCreateFunnel}
+			<Tooltip
+				title={
+					!hasEditPermission
+						? 'You need editor or admin access to create funnels'
+						: ''
+				}
 			>
-				New funnel
-			</Button>
+				<Button
+					type="primary"
+					icon={<Plus size={16} />}
+					className="search__new-btn"
+					onClick={onCreateFunnel}
+					disabled={!hasEditPermission}
+				>
+					New funnel
+				</Button>
+			</Tooltip>
 		</div>
 	);
 }
--- a/frontend/src/pages/WorkspaceLocked/WorkspaceLocked.styles.scss
+++ b/frontend/src/pages/WorkspaceLocked/WorkspaceLocked.styles.scss
@ -48,7 +48,7 @@ $dark-theme: 'darkMode';
 			&__actions {
 				display: flex;
 				align-items: center;
-				gap: 16px;
+				gap: 8px;

 				.ant-btn-link {
 					color: var(--text-vanilla-400);
--- a/frontend/src/pages/WorkspaceLocked/WorkspaceLocked.test.tsx
+++ b/frontend/src/pages/WorkspaceLocked/WorkspaceLocked.test.tsx
@ -24,9 +24,6 @@ describe('WorkspaceLocked', () => {
 		});
 		expect(workspaceLocked).toBeInTheDocument();

-		const gotQuestionText = await screen.findByText(/got question?/i);
-		expect(gotQuestionText).toBeInTheDocument();
-
 		const contactUsBtn = await screen.findByRole('button', {
 			name: /Contact Us/i,
 		});
--- a/frontend/src/pages/WorkspaceLocked/WorkspaceLocked.tsx
+++ b/frontend/src/pages/WorkspaceLocked/WorkspaceLocked.tsx
@ -18,6 +18,7 @@ import {
 } from 'antd';
 import logEvent from 'api/common/logEvent';
 import updateCreditCardApi from 'api/v1/checkout/create';
+import RefreshPaymentStatus from 'components/RefreshPaymentStatus/RefreshPaymentStatus';
 import ROUTES from 'constants/routes';
 import { useNotifications } from 'hooks/useNotifications';
 import history from 'lib/history';
@ -289,26 +290,28 @@ export default function WorkspaceBlocked(): JSX.Element {
 						</span>
 						<span className="workspace-locked__modal__header__actions">
 							{isAdmin && (
-								<Button
-									className="workspace-locked__modal__header__actions__billing"
-									type="link"
-									size="small"
-									role="button"
-									onClick={handleViewBilling}
-								>
-									View Billing
-								</Button>
+								<Flex gap={8} justify="center" align="center">
+									<Button
+										className="workspace-locked__modal__header__actions__billing"
+										type="link"
+										size="small"
+										role="button"
+										onClick={handleViewBilling}
+									>
+										View Billing
+									</Button>
+
+									<RefreshPaymentStatus btnShape="round" />
+								</Flex>
 							)}

-							<Typography.Text className="workspace-locked__modal__title">
-								Got Questions?
-							</Typography.Text>
 							<Button
 								type="default"
 								shape="round"
 								size="middle"
 								href="mailto:cloud-support@signoz.io"
 								role="button"
+								className="periscope-btn"
 								onClick={handleContactUsClick}
 							>
 								Contact Us
@ -349,7 +352,7 @@ export default function WorkspaceBlocked(): JSX.Element {
 									justify="center"
 									align="middle"
 									className="workspace-locked__modal__cta"
-									gutter={[16, 16]}
+									gutter={[8, 8]}
 								>
 									<Col>
 										<Alert
@ -360,34 +363,37 @@ export default function WorkspaceBlocked(): JSX.Element {
 								</Row>
 							)}
 							{isAdmin && (
-								<Row
-									justify="center"
-									align="middle"
-									className="workspace-locked__modal__cta"
-									gutter={[16, 16]}
-								>
-									<Col>
-										<Button
-											type="primary"
-											shape="round"
-											size="middle"
-											loading={isLoading}
-											onClick={handleUpdateCreditCard}
-										>
-											Continue my Journey
-										</Button>
-									</Col>
-									<Col>
-										<Button
-											type="default"
-											shape="round"
-											size="middle"
-											onClick={handleExtendTrial}
-										>
-											{t('needMoreTime')}
-										</Button>
-									</Col>
-								</Row>
+								<Flex gap={8} vertical justify="center" align="center">
+									<Row
+										justify="center"
+										align="middle"
+										className="workspace-locked__modal__cta"
+										gutter={[8, 8]}
+									>
+										<Col>
+											<Button
+												type="primary"
+												shape="round"
+												size="middle"
+												loading={isLoading}
+												onClick={handleUpdateCreditCard}
+											>
+												Continue my Journey
+											</Button>
+										</Col>
+										<Col>
+											<Button
+												type="default"
+												shape="round"
+												size="middle"
+												className="periscope-btn"
+												onClick={handleExtendTrial}
+											>
+												{t('needMoreTime')}
+											</Button>
+										</Col>
+									</Row>
+								</Flex>
 							)}

 							<div className="workspace-locked__tabs">
--- a/frontend/src/pages/WorkspaceSuspended/WorkspaceSuspended.tsx
+++ b/frontend/src/pages/WorkspaceSuspended/WorkspaceSuspended.tsx
@ -4,6 +4,7 @@ import {
 	Alert,
 	Button,
 	Col,
+	Flex,
 	Modal,
 	Row,
 	Skeleton,
@ -11,6 +12,7 @@ import {
 	Typography,
 } from 'antd';
 import manageCreditCardApi from 'api/v1/portal/create';
+import RefreshPaymentStatus from 'components/RefreshPaymentStatus/RefreshPaymentStatus';
 import ROUTES from 'constants/routes';
 import dayjs from 'dayjs';
 import { useNotifications } from 'hooks/useNotifications';
@ -146,9 +148,9 @@ function WorkspaceSuspended(): JSX.Element {
 									justify="center"
 									align="middle"
 									className="workspace-suspended__modal__cta"
-									gutter={[16, 16]}
+									gutter={[8, 8]}
 								>
-									<Col>
+									<Flex gap={8} justify="center" align="center">
 										<Button
 											type="primary"
 											shape="round"
@ -158,7 +160,8 @@ function WorkspaceSuspended(): JSX.Element {
 										>
 											{t('continueMyJourney')}
 										</Button>
-									</Col>
+										<RefreshPaymentStatus btnShape="round" />
+									</Flex>
 								</Row>
 							)}
 							<div className="workspace-suspended__creative">
--- a/frontend/src/periscope.scss
+++ b/frontend/src/periscope.scss
@ -62,6 +62,20 @@
 		}
 	}

+	&.text {
+		color: var(--bg-vanilla-100) !important;
+		background-color: transparent !important;
+		border: none;
+		box-shadow: none;
+		box-shadow: none;
+		padding: 4px 4px;
+
+		&:hover {
+			color: var(--bg-vanilla-300) !important;
+			background-color: transparent !important;
+		}
+	}
+
 	&.success {
 		color: var(--bg-forest-400) !important;
 		border-radius: 2px;
--- a/frontend/src/providers/App/App.tsx
+++ b/frontend/src/providers/App/App.tsx
@ -321,6 +321,8 @@ export function AppProvider({ children }: PropsWithChildren): JSX.Element {
 			updateChangelog,
 			toggleChangelogModal,
 			versionData: versionData?.payload || null,
+			hasEditPermission:
+				user?.role === USER_ROLES.ADMIN || user?.role === USER_ROLES.EDITOR,
 		}),
 		[
 			trialInfo,
--- a/frontend/src/providers/App/types.ts
+++ b/frontend/src/providers/App/types.ts
@ -37,6 +37,7 @@ export interface IAppContext {
 	updateChangelog(payload: ChangelogSchema): void;
 	toggleChangelogModal(): void;
 	versionData: PayloadProps | null;
+	hasEditPermission: boolean;
 }

 // User
--- a/frontend/src/tests/test-utils.tsx
+++ b/frontend/src/tests/test-utils.tsx
@ -22,7 +22,7 @@ import {
 	LicenseState,
 	LicenseStatus,
 } from 'types/api/licensesV3/getActive';
-import { ROLES } from 'types/roles';
+import { ROLES, USER_ROLES } from 'types/roles';

 const queryClient = new QueryClient({
 	defaultOptions: {
@ -162,6 +162,7 @@ export function getAppContextMock(
 				displayName: 'Pentagon',
 			},
 		],
+		hasEditPermission: role === USER_ROLES.ADMIN || role === USER_ROLES.EDITOR,
 		isFetchingUser: false,
 		userFetchError: null,
 		featureFlags: [
--- a/go.mod
+++ b/go.mod
@ -50,6 +50,7 @@ require (
 	github.com/sethvargo/go-password v0.2.0
 	github.com/smartystreets/goconvey v1.8.1
 	github.com/soheilhy/cmux v0.1.5
+	github.com/spf13/cobra v1.9.1
 	github.com/srikanthccv/ClickHouse-go-mock v0.12.0
 	github.com/stretchr/testify v1.10.0
 	github.com/tidwall/gjson v1.18.0
@ -206,7 +207,6 @@ require (
 	github.com/shurcooL/httpfs v0.0.0-20230704072500-f1e31cf0ba5c // indirect
 	github.com/shurcooL/vfsgen v0.0.0-20230704071429-0000e147ea92 // indirect
 	github.com/smarty/assertions v1.15.0 // indirect
-	github.com/spf13/cobra v1.9.1 // indirect
 	github.com/spf13/pflag v1.0.6 // indirect
 	github.com/stretchr/objx v0.5.2 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
--- a/grammar/FilterQuery.g4
+++ b/grammar/FilterQuery.g4
@ -208,7 +208,7 @@ QUOTED_TEXT
        )
    ;

-fragment SEGMENT      : [a-zA-Z$] [a-zA-Z0-9$_:\-]* ;
+fragment SEGMENT      : [a-zA-Z$_] [a-zA-Z0-9$_:\-/]* ;
 fragment EMPTY_BRACKS : '[' ']' ;
 fragment OLD_JSON_BRACKS: '[' '*' ']';

--- a/pkg/parser/grammar/FilterQueryLexer.interp
+++ b/pkg/parser/grammar/FilterQueryLexer.interp
--- a/pkg/parser/grammar/filterquery_lexer.go
+++ b/pkg/parser/grammar/filterquery_lexer.go
@ -110,118 +110,119 @@ func filterquerylexerLexerInit() {
 		67, 99, 99, 2, 0, 65, 65, 97, 97, 2, 0, 68, 68, 100, 100, 2, 0, 72, 72,
 		104, 104, 2, 0, 89, 89, 121, 121, 2, 0, 85, 85, 117, 117, 2, 0, 70, 70,
 		102, 102, 2, 0, 43, 43, 45, 45, 2, 0, 34, 34, 92, 92, 2, 0, 39, 39, 92,
-		92, 3, 0, 36, 36, 65, 90, 97, 122, 6, 0, 36, 36, 45, 45, 48, 58, 65, 90,
-		95, 95, 97, 122, 3, 0, 9, 10, 13, 13, 32, 32, 1, 0, 48, 57, 8, 0, 9, 10,
-		13, 13, 32, 34, 39, 41, 44, 44, 60, 62, 91, 91, 93, 93, 358, 0, 1, 1, 0,
-		0, 0, 0, 3, 1, 0, 0, 0, 0, 5, 1, 0, 0, 0, 0, 7, 1, 0, 0, 0, 0, 9, 1, 0,
-		0, 0, 0, 11, 1, 0, 0, 0, 0, 13, 1, 0, 0, 0, 0, 15, 1, 0, 0, 0, 0, 17, 1,
-		0, 0, 0, 0, 19, 1, 0, 0, 0, 0, 21, 1, 0, 0, 0, 0, 23, 1, 0, 0, 0, 0, 25,
-		1, 0, 0, 0, 0, 27, 1, 0, 0, 0, 0, 29, 1, 0, 0, 0, 0, 31, 1, 0, 0, 0, 0,
-		33, 1, 0, 0, 0, 0, 35, 1, 0, 0, 0, 0, 37, 1, 0, 0, 0, 0, 39, 1, 0, 0, 0,
-		0, 41, 1, 0, 0, 0, 0, 43, 1, 0, 0, 0, 0, 45, 1, 0, 0, 0, 0, 47, 1, 0, 0,
-		0, 0, 49, 1, 0, 0, 0, 0, 51, 1, 0, 0, 0, 0, 53, 1, 0, 0, 0, 0, 55, 1, 0,
-		0, 0, 0, 59, 1, 0, 0, 0, 0, 61, 1, 0, 0, 0, 0, 69, 1, 0, 0, 0, 0, 71, 1,
-		0, 0, 0, 0, 75, 1, 0, 0, 0, 1, 77, 1, 0, 0, 0, 3, 79, 1, 0, 0, 0, 5, 81,
-		1, 0, 0, 0, 7, 83, 1, 0, 0, 0, 9, 85, 1, 0, 0, 0, 11, 90, 1, 0, 0, 0, 13,
-		92, 1, 0, 0, 0, 15, 95, 1, 0, 0, 0, 17, 98, 1, 0, 0, 0, 19, 100, 1, 0,
-		0, 0, 21, 103, 1, 0, 0, 0, 23, 105, 1, 0, 0, 0, 25, 108, 1, 0, 0, 0, 27,
-		113, 1, 0, 0, 0, 29, 126, 1, 0, 0, 0, 31, 132, 1, 0, 0, 0, 33, 146, 1,
-		0, 0, 0, 35, 154, 1, 0, 0, 0, 37, 162, 1, 0, 0, 0, 39, 169, 1, 0, 0, 0,
-		41, 179, 1, 0, 0, 0, 43, 182, 1, 0, 0, 0, 45, 186, 1, 0, 0, 0, 47, 190,
-		1, 0, 0, 0, 49, 193, 1, 0, 0, 0, 51, 197, 1, 0, 0, 0, 53, 204, 1, 0, 0,
-		0, 55, 220, 1, 0, 0, 0, 57, 222, 1, 0, 0, 0, 59, 272, 1, 0, 0, 0, 61, 294,
-		1, 0, 0, 0, 63, 296, 1, 0, 0, 0, 65, 303, 1, 0, 0, 0, 67, 306, 1, 0, 0,
-		0, 69, 310, 1, 0, 0, 0, 71, 321, 1, 0, 0, 0, 73, 327, 1, 0, 0, 0, 75, 330,
-		1, 0, 0, 0, 77, 78, 5, 40, 0, 0, 78, 2, 1, 0, 0, 0, 79, 80, 5, 41, 0, 0,
-		80, 4, 1, 0, 0, 0, 81, 82, 5, 91, 0, 0, 82, 6, 1, 0, 0, 0, 83, 84, 5, 93,
-		0, 0, 84, 8, 1, 0, 0, 0, 85, 86, 5, 44, 0, 0, 86, 10, 1, 0, 0, 0, 87, 91,
-		5, 61, 0, 0, 88, 89, 5, 61, 0, 0, 89, 91, 5, 61, 0, 0, 90, 87, 1, 0, 0,
-		0, 90, 88, 1, 0, 0, 0, 91, 12, 1, 0, 0, 0, 92, 93, 5, 33, 0, 0, 93, 94,
-		5, 61, 0, 0, 94, 14, 1, 0, 0, 0, 95, 96, 5, 60, 0, 0, 96, 97, 5, 62, 0,
-		0, 97, 16, 1, 0, 0, 0, 98, 99, 5, 60, 0, 0, 99, 18, 1, 0, 0, 0, 100, 101,
-		5, 60, 0, 0, 101, 102, 5, 61, 0, 0, 102, 20, 1, 0, 0, 0, 103, 104, 5, 62,
-		0, 0, 104, 22, 1, 0, 0, 0, 105, 106, 5, 62, 0, 0, 106, 107, 5, 61, 0, 0,
-		107, 24, 1, 0, 0, 0, 108, 109, 7, 0, 0, 0, 109, 110, 7, 1, 0, 0, 110, 111,
-		7, 2, 0, 0, 111, 112, 7, 3, 0, 0, 112, 26, 1, 0, 0, 0, 113, 114, 7, 4,
-		0, 0, 114, 115, 7, 5, 0, 0, 115, 117, 7, 6, 0, 0, 116, 118, 7, 7, 0, 0,
-		117, 116, 1, 0, 0, 0, 118, 119, 1, 0, 0, 0, 119, 117, 1, 0, 0, 0, 119,
-		120, 1, 0, 0, 0, 120, 121, 1, 0, 0, 0, 121, 122, 7, 0, 0, 0, 122, 123,
-		7, 1, 0, 0, 123, 124, 7, 2, 0, 0, 124, 125, 7, 3, 0, 0, 125, 28, 1, 0,
-		0, 0, 126, 127, 7, 1, 0, 0, 127, 128, 7, 0, 0, 0, 128, 129, 7, 1, 0, 0,
-		129, 130, 7, 2, 0, 0, 130, 131, 7, 3, 0, 0, 131, 30, 1, 0, 0, 0, 132, 133,
-		7, 4, 0, 0, 133, 134, 7, 5, 0, 0, 134, 136, 7, 6, 0, 0, 135, 137, 7, 7,
-		0, 0, 136, 135, 1, 0, 0, 0, 137, 138, 1, 0, 0, 0, 138, 136, 1, 0, 0, 0,
-		138, 139, 1, 0, 0, 0, 139, 140, 1, 0, 0, 0, 140, 141, 7, 1, 0, 0, 141,
-		142, 7, 0, 0, 0, 142, 143, 7, 1, 0, 0, 143, 144, 7, 2, 0, 0, 144, 145,
-		7, 3, 0, 0, 145, 32, 1, 0, 0, 0, 146, 147, 7, 8, 0, 0, 147, 148, 7, 3,
-		0, 0, 148, 149, 7, 6, 0, 0, 149, 150, 7, 9, 0, 0, 150, 151, 7, 3, 0, 0,
-		151, 152, 7, 3, 0, 0, 152, 153, 7, 4, 0, 0, 153, 34, 1, 0, 0, 0, 154, 155,
-		7, 3, 0, 0, 155, 156, 7, 10, 0, 0, 156, 157, 7, 1, 0, 0, 157, 158, 7, 11,
-		0, 0, 158, 160, 7, 6, 0, 0, 159, 161, 7, 11, 0, 0, 160, 159, 1, 0, 0, 0,
-		160, 161, 1, 0, 0, 0, 161, 36, 1, 0, 0, 0, 162, 163, 7, 12, 0, 0, 163,
-		164, 7, 3, 0, 0, 164, 165, 7, 13, 0, 0, 165, 166, 7, 3, 0, 0, 166, 167,
-		7, 10, 0, 0, 167, 168, 7, 14, 0, 0, 168, 38, 1, 0, 0, 0, 169, 170, 7, 15,
-		0, 0, 170, 171, 7, 5, 0, 0, 171, 172, 7, 4, 0, 0, 172, 173, 7, 6, 0, 0,
-		173, 174, 7, 16, 0, 0, 174, 175, 7, 1, 0, 0, 175, 177, 7, 4, 0, 0, 176,
-		178, 7, 11, 0, 0, 177, 176, 1, 0, 0, 0, 177, 178, 1, 0, 0, 0, 178, 40,
-		1, 0, 0, 0, 179, 180, 7, 1, 0, 0, 180, 181, 7, 4, 0, 0, 181, 42, 1, 0,
-		0, 0, 182, 183, 7, 4, 0, 0, 183, 184, 7, 5, 0, 0, 184, 185, 7, 6, 0, 0,
-		185, 44, 1, 0, 0, 0, 186, 187, 7, 16, 0, 0, 187, 188, 7, 4, 0, 0, 188,
-		189, 7, 17, 0, 0, 189, 46, 1, 0, 0, 0, 190, 191, 7, 5, 0, 0, 191, 192,
-		7, 12, 0, 0, 192, 48, 1, 0, 0, 0, 193, 194, 7, 18, 0, 0, 194, 195, 7, 16,
-		0, 0, 195, 196, 7, 11, 0, 0, 196, 50, 1, 0, 0, 0, 197, 198, 7, 18, 0, 0,
-		198, 199, 7, 16, 0, 0, 199, 200, 7, 11, 0, 0, 200, 201, 7, 16, 0, 0, 201,
-		202, 7, 4, 0, 0, 202, 203, 7, 19, 0, 0, 203, 52, 1, 0, 0, 0, 204, 205,
-		7, 18, 0, 0, 205, 206, 7, 16, 0, 0, 206, 207, 7, 11, 0, 0, 207, 208, 7,
-		16, 0, 0, 208, 209, 7, 0, 0, 0, 209, 210, 7, 0, 0, 0, 210, 54, 1, 0, 0,
-		0, 211, 212, 7, 6, 0, 0, 212, 213, 7, 12, 0, 0, 213, 214, 7, 20, 0, 0,
-		214, 221, 7, 3, 0, 0, 215, 216, 7, 21, 0, 0, 216, 217, 7, 16, 0, 0, 217,
-		218, 7, 0, 0, 0, 218, 219, 7, 11, 0, 0, 219, 221, 7, 3, 0, 0, 220, 211,
-		1, 0, 0, 0, 220, 215, 1, 0, 0, 0, 221, 56, 1, 0, 0, 0, 222, 223, 7, 22,
-		0, 0, 223, 58, 1, 0, 0, 0, 224, 226, 3, 57, 28, 0, 225, 224, 1, 0, 0, 0,
-		225, 226, 1, 0, 0, 0, 226, 228, 1, 0, 0, 0, 227, 229, 3, 73, 36, 0, 228,
-		227, 1, 0, 0, 0, 229, 230, 1, 0, 0, 0, 230, 228, 1, 0, 0, 0, 230, 231,
-		1, 0, 0, 0, 231, 239, 1, 0, 0, 0, 232, 236, 5, 46, 0, 0, 233, 235, 3, 73,
-		36, 0, 234, 233, 1, 0, 0, 0, 235, 238, 1, 0, 0, 0, 236, 234, 1, 0, 0, 0,
-		236, 237, 1, 0, 0, 0, 237, 240, 1, 0, 0, 0, 238, 236, 1, 0, 0, 0, 239,
-		232, 1, 0, 0, 0, 239, 240, 1, 0, 0, 0, 240, 250, 1, 0, 0, 0, 241, 243,
-		7, 3, 0, 0, 242, 244, 3, 57, 28, 0, 243, 242, 1, 0, 0, 0, 243, 244, 1,
-		0, 0, 0, 244, 246, 1, 0, 0, 0, 245, 247, 3, 73, 36, 0, 246, 245, 1, 0,
-		0, 0, 247, 248, 1, 0, 0, 0, 248, 246, 1, 0, 0, 0, 248, 249, 1, 0, 0, 0,
-		249, 251, 1, 0, 0, 0, 250, 241, 1, 0, 0, 0, 250, 251, 1, 0, 0, 0, 251,
-		273, 1, 0, 0, 0, 252, 254, 3, 57, 28, 0, 253, 252, 1, 0, 0, 0, 253, 254,
-		1, 0, 0, 0, 254, 255, 1, 0, 0, 0, 255, 257, 5, 46, 0, 0, 256, 258, 3, 73,
-		36, 0, 257, 256, 1, 0, 0, 0, 258, 259, 1, 0, 0, 0, 259, 257, 1, 0, 0, 0,
-		259, 260, 1, 0, 0, 0, 260, 270, 1, 0, 0, 0, 261, 263, 7, 3, 0, 0, 262,
-		264, 3, 57, 28, 0, 263, 262, 1, 0, 0, 0, 263, 264, 1, 0, 0, 0, 264, 266,
-		1, 0, 0, 0, 265, 267, 3, 73, 36, 0, 266, 265, 1, 0, 0, 0, 267, 268, 1,
-		0, 0, 0, 268, 266, 1, 0, 0, 0, 268, 269, 1, 0, 0, 0, 269, 271, 1, 0, 0,
-		0, 270, 261, 1, 0, 0, 0, 270, 271, 1, 0, 0, 0, 271, 273, 1, 0, 0, 0, 272,
-		225, 1, 0, 0, 0, 272, 253, 1, 0, 0, 0, 273, 60, 1, 0, 0, 0, 274, 280, 5,
-		34, 0, 0, 275, 279, 8, 23, 0, 0, 276, 277, 5, 92, 0, 0, 277, 279, 9, 0,
-		0, 0, 278, 275, 1, 0, 0, 0, 278, 276, 1, 0, 0, 0, 279, 282, 1, 0, 0, 0,
-		280, 278, 1, 0, 0, 0, 280, 281, 1, 0, 0, 0, 281, 283, 1, 0, 0, 0, 282,
-		280, 1, 0, 0, 0, 283, 295, 5, 34, 0, 0, 284, 290, 5, 39, 0, 0, 285, 289,
-		8, 24, 0, 0, 286, 287, 5, 92, 0, 0, 287, 289, 9, 0, 0, 0, 288, 285, 1,
-		0, 0, 0, 288, 286, 1, 0, 0, 0, 289, 292, 1, 0, 0, 0, 290, 288, 1, 0, 0,
-		0, 290, 291, 1, 0, 0, 0, 291, 293, 1, 0, 0, 0, 292, 290, 1, 0, 0, 0, 293,
-		295, 5, 39, 0, 0, 294, 274, 1, 0, 0, 0, 294, 284, 1, 0, 0, 0, 295, 62,
-		1, 0, 0, 0, 296, 300, 7, 25, 0, 0, 297, 299, 7, 26, 0, 0, 298, 297, 1,
-		0, 0, 0, 299, 302, 1, 0, 0, 0, 300, 298, 1, 0, 0, 0, 300, 301, 1, 0, 0,
-		0, 301, 64, 1, 0, 0, 0, 302, 300, 1, 0, 0, 0, 303, 304, 5, 91, 0, 0, 304,
-		305, 5, 93, 0, 0, 305, 66, 1, 0, 0, 0, 306, 307, 5, 91, 0, 0, 307, 308,
-		5, 42, 0, 0, 308, 309, 5, 93, 0, 0, 309, 68, 1, 0, 0, 0, 310, 317, 3, 63,
-		31, 0, 311, 312, 5, 46, 0, 0, 312, 316, 3, 63, 31, 0, 313, 316, 3, 65,
-		32, 0, 314, 316, 3, 67, 33, 0, 315, 311, 1, 0, 0, 0, 315, 313, 1, 0, 0,
-		0, 315, 314, 1, 0, 0, 0, 316, 319, 1, 0, 0, 0, 317, 315, 1, 0, 0, 0, 317,
-		318, 1, 0, 0, 0, 318, 70, 1, 0, 0, 0, 319, 317, 1, 0, 0, 0, 320, 322, 7,
-		27, 0, 0, 321, 320, 1, 0, 0, 0, 322, 323, 1, 0, 0, 0, 323, 321, 1, 0, 0,
-		0, 323, 324, 1, 0, 0, 0, 324, 325, 1, 0, 0, 0, 325, 326, 6, 35, 0, 0, 326,
-		72, 1, 0, 0, 0, 327, 328, 7, 28, 0, 0, 328, 74, 1, 0, 0, 0, 329, 331, 8,
-		29, 0, 0, 330, 329, 1, 0, 0, 0, 331, 332, 1, 0, 0, 0, 332, 330, 1, 0, 0,
-		0, 332, 333, 1, 0, 0, 0, 333, 76, 1, 0, 0, 0, 30, 0, 90, 119, 138, 160,
-		177, 220, 225, 230, 236, 239, 243, 248, 250, 253, 259, 263, 268, 270, 272,
-		278, 280, 288, 290, 294, 300, 315, 317, 323, 332, 1, 6, 0, 0,
+		92, 4, 0, 36, 36, 65, 90, 95, 95, 97, 122, 6, 0, 36, 36, 45, 45, 47, 58,
+		65, 90, 95, 95, 97, 122, 3, 0, 9, 10, 13, 13, 32, 32, 1, 0, 48, 57, 8,
+		0, 9, 10, 13, 13, 32, 34, 39, 41, 44, 44, 60, 62, 91, 91, 93, 93, 358,
+		0, 1, 1, 0, 0, 0, 0, 3, 1, 0, 0, 0, 0, 5, 1, 0, 0, 0, 0, 7, 1, 0, 0, 0,
+		0, 9, 1, 0, 0, 0, 0, 11, 1, 0, 0, 0, 0, 13, 1, 0, 0, 0, 0, 15, 1, 0, 0,
+		0, 0, 17, 1, 0, 0, 0, 0, 19, 1, 0, 0, 0, 0, 21, 1, 0, 0, 0, 0, 23, 1, 0,
+		0, 0, 0, 25, 1, 0, 0, 0, 0, 27, 1, 0, 0, 0, 0, 29, 1, 0, 0, 0, 0, 31, 1,
+		0, 0, 0, 0, 33, 1, 0, 0, 0, 0, 35, 1, 0, 0, 0, 0, 37, 1, 0, 0, 0, 0, 39,
+		1, 0, 0, 0, 0, 41, 1, 0, 0, 0, 0, 43, 1, 0, 0, 0, 0, 45, 1, 0, 0, 0, 0,
+		47, 1, 0, 0, 0, 0, 49, 1, 0, 0, 0, 0, 51, 1, 0, 0, 0, 0, 53, 1, 0, 0, 0,
+		0, 55, 1, 0, 0, 0, 0, 59, 1, 0, 0, 0, 0, 61, 1, 0, 0, 0, 0, 69, 1, 0, 0,
+		0, 0, 71, 1, 0, 0, 0, 0, 75, 1, 0, 0, 0, 1, 77, 1, 0, 0, 0, 3, 79, 1, 0,
+		0, 0, 5, 81, 1, 0, 0, 0, 7, 83, 1, 0, 0, 0, 9, 85, 1, 0, 0, 0, 11, 90,
+		1, 0, 0, 0, 13, 92, 1, 0, 0, 0, 15, 95, 1, 0, 0, 0, 17, 98, 1, 0, 0, 0,
+		19, 100, 1, 0, 0, 0, 21, 103, 1, 0, 0, 0, 23, 105, 1, 0, 0, 0, 25, 108,
+		1, 0, 0, 0, 27, 113, 1, 0, 0, 0, 29, 126, 1, 0, 0, 0, 31, 132, 1, 0, 0,
+		0, 33, 146, 1, 0, 0, 0, 35, 154, 1, 0, 0, 0, 37, 162, 1, 0, 0, 0, 39, 169,
+		1, 0, 0, 0, 41, 179, 1, 0, 0, 0, 43, 182, 1, 0, 0, 0, 45, 186, 1, 0, 0,
+		0, 47, 190, 1, 0, 0, 0, 49, 193, 1, 0, 0, 0, 51, 197, 1, 0, 0, 0, 53, 204,
+		1, 0, 0, 0, 55, 220, 1, 0, 0, 0, 57, 222, 1, 0, 0, 0, 59, 272, 1, 0, 0,
+		0, 61, 294, 1, 0, 0, 0, 63, 296, 1, 0, 0, 0, 65, 303, 1, 0, 0, 0, 67, 306,
+		1, 0, 0, 0, 69, 310, 1, 0, 0, 0, 71, 321, 1, 0, 0, 0, 73, 327, 1, 0, 0,
+		0, 75, 330, 1, 0, 0, 0, 77, 78, 5, 40, 0, 0, 78, 2, 1, 0, 0, 0, 79, 80,
+		5, 41, 0, 0, 80, 4, 1, 0, 0, 0, 81, 82, 5, 91, 0, 0, 82, 6, 1, 0, 0, 0,
+		83, 84, 5, 93, 0, 0, 84, 8, 1, 0, 0, 0, 85, 86, 5, 44, 0, 0, 86, 10, 1,
+		0, 0, 0, 87, 91, 5, 61, 0, 0, 88, 89, 5, 61, 0, 0, 89, 91, 5, 61, 0, 0,
+		90, 87, 1, 0, 0, 0, 90, 88, 1, 0, 0, 0, 91, 12, 1, 0, 0, 0, 92, 93, 5,
+		33, 0, 0, 93, 94, 5, 61, 0, 0, 94, 14, 1, 0, 0, 0, 95, 96, 5, 60, 0, 0,
+		96, 97, 5, 62, 0, 0, 97, 16, 1, 0, 0, 0, 98, 99, 5, 60, 0, 0, 99, 18, 1,
+		0, 0, 0, 100, 101, 5, 60, 0, 0, 101, 102, 5, 61, 0, 0, 102, 20, 1, 0, 0,
+		0, 103, 104, 5, 62, 0, 0, 104, 22, 1, 0, 0, 0, 105, 106, 5, 62, 0, 0, 106,
+		107, 5, 61, 0, 0, 107, 24, 1, 0, 0, 0, 108, 109, 7, 0, 0, 0, 109, 110,
+		7, 1, 0, 0, 110, 111, 7, 2, 0, 0, 111, 112, 7, 3, 0, 0, 112, 26, 1, 0,
+		0, 0, 113, 114, 7, 4, 0, 0, 114, 115, 7, 5, 0, 0, 115, 117, 7, 6, 0, 0,
+		116, 118, 7, 7, 0, 0, 117, 116, 1, 0, 0, 0, 118, 119, 1, 0, 0, 0, 119,
+		117, 1, 0, 0, 0, 119, 120, 1, 0, 0, 0, 120, 121, 1, 0, 0, 0, 121, 122,
+		7, 0, 0, 0, 122, 123, 7, 1, 0, 0, 123, 124, 7, 2, 0, 0, 124, 125, 7, 3,
+		0, 0, 125, 28, 1, 0, 0, 0, 126, 127, 7, 1, 0, 0, 127, 128, 7, 0, 0, 0,
+		128, 129, 7, 1, 0, 0, 129, 130, 7, 2, 0, 0, 130, 131, 7, 3, 0, 0, 131,
+		30, 1, 0, 0, 0, 132, 133, 7, 4, 0, 0, 133, 134, 7, 5, 0, 0, 134, 136, 7,
+		6, 0, 0, 135, 137, 7, 7, 0, 0, 136, 135, 1, 0, 0, 0, 137, 138, 1, 0, 0,
+		0, 138, 136, 1, 0, 0, 0, 138, 139, 1, 0, 0, 0, 139, 140, 1, 0, 0, 0, 140,
+		141, 7, 1, 0, 0, 141, 142, 7, 0, 0, 0, 142, 143, 7, 1, 0, 0, 143, 144,
+		7, 2, 0, 0, 144, 145, 7, 3, 0, 0, 145, 32, 1, 0, 0, 0, 146, 147, 7, 8,
+		0, 0, 147, 148, 7, 3, 0, 0, 148, 149, 7, 6, 0, 0, 149, 150, 7, 9, 0, 0,
+		150, 151, 7, 3, 0, 0, 151, 152, 7, 3, 0, 0, 152, 153, 7, 4, 0, 0, 153,
+		34, 1, 0, 0, 0, 154, 155, 7, 3, 0, 0, 155, 156, 7, 10, 0, 0, 156, 157,
+		7, 1, 0, 0, 157, 158, 7, 11, 0, 0, 158, 160, 7, 6, 0, 0, 159, 161, 7, 11,
+		0, 0, 160, 159, 1, 0, 0, 0, 160, 161, 1, 0, 0, 0, 161, 36, 1, 0, 0, 0,
+		162, 163, 7, 12, 0, 0, 163, 164, 7, 3, 0, 0, 164, 165, 7, 13, 0, 0, 165,
+		166, 7, 3, 0, 0, 166, 167, 7, 10, 0, 0, 167, 168, 7, 14, 0, 0, 168, 38,
+		1, 0, 0, 0, 169, 170, 7, 15, 0, 0, 170, 171, 7, 5, 0, 0, 171, 172, 7, 4,
+		0, 0, 172, 173, 7, 6, 0, 0, 173, 174, 7, 16, 0, 0, 174, 175, 7, 1, 0, 0,
+		175, 177, 7, 4, 0, 0, 176, 178, 7, 11, 0, 0, 177, 176, 1, 0, 0, 0, 177,
+		178, 1, 0, 0, 0, 178, 40, 1, 0, 0, 0, 179, 180, 7, 1, 0, 0, 180, 181, 7,
+		4, 0, 0, 181, 42, 1, 0, 0, 0, 182, 183, 7, 4, 0, 0, 183, 184, 7, 5, 0,
+		0, 184, 185, 7, 6, 0, 0, 185, 44, 1, 0, 0, 0, 186, 187, 7, 16, 0, 0, 187,
+		188, 7, 4, 0, 0, 188, 189, 7, 17, 0, 0, 189, 46, 1, 0, 0, 0, 190, 191,
+		7, 5, 0, 0, 191, 192, 7, 12, 0, 0, 192, 48, 1, 0, 0, 0, 193, 194, 7, 18,
+		0, 0, 194, 195, 7, 16, 0, 0, 195, 196, 7, 11, 0, 0, 196, 50, 1, 0, 0, 0,
+		197, 198, 7, 18, 0, 0, 198, 199, 7, 16, 0, 0, 199, 200, 7, 11, 0, 0, 200,
+		201, 7, 16, 0, 0, 201, 202, 7, 4, 0, 0, 202, 203, 7, 19, 0, 0, 203, 52,
+		1, 0, 0, 0, 204, 205, 7, 18, 0, 0, 205, 206, 7, 16, 0, 0, 206, 207, 7,
+		11, 0, 0, 207, 208, 7, 16, 0, 0, 208, 209, 7, 0, 0, 0, 209, 210, 7, 0,
+		0, 0, 210, 54, 1, 0, 0, 0, 211, 212, 7, 6, 0, 0, 212, 213, 7, 12, 0, 0,
+		213, 214, 7, 20, 0, 0, 214, 221, 7, 3, 0, 0, 215, 216, 7, 21, 0, 0, 216,
+		217, 7, 16, 0, 0, 217, 218, 7, 0, 0, 0, 218, 219, 7, 11, 0, 0, 219, 221,
+		7, 3, 0, 0, 220, 211, 1, 0, 0, 0, 220, 215, 1, 0, 0, 0, 221, 56, 1, 0,
+		0, 0, 222, 223, 7, 22, 0, 0, 223, 58, 1, 0, 0, 0, 224, 226, 3, 57, 28,
+		0, 225, 224, 1, 0, 0, 0, 225, 226, 1, 0, 0, 0, 226, 228, 1, 0, 0, 0, 227,
+		229, 3, 73, 36, 0, 228, 227, 1, 0, 0, 0, 229, 230, 1, 0, 0, 0, 230, 228,
+		1, 0, 0, 0, 230, 231, 1, 0, 0, 0, 231, 239, 1, 0, 0, 0, 232, 236, 5, 46,
+		0, 0, 233, 235, 3, 73, 36, 0, 234, 233, 1, 0, 0, 0, 235, 238, 1, 0, 0,
+		0, 236, 234, 1, 0, 0, 0, 236, 237, 1, 0, 0, 0, 237, 240, 1, 0, 0, 0, 238,
+		236, 1, 0, 0, 0, 239, 232, 1, 0, 0, 0, 239, 240, 1, 0, 0, 0, 240, 250,
+		1, 0, 0, 0, 241, 243, 7, 3, 0, 0, 242, 244, 3, 57, 28, 0, 243, 242, 1,
+		0, 0, 0, 243, 244, 1, 0, 0, 0, 244, 246, 1, 0, 0, 0, 245, 247, 3, 73, 36,
+		0, 246, 245, 1, 0, 0, 0, 247, 248, 1, 0, 0, 0, 248, 246, 1, 0, 0, 0, 248,
+		249, 1, 0, 0, 0, 249, 251, 1, 0, 0, 0, 250, 241, 1, 0, 0, 0, 250, 251,
+		1, 0, 0, 0, 251, 273, 1, 0, 0, 0, 252, 254, 3, 57, 28, 0, 253, 252, 1,
+		0, 0, 0, 253, 254, 1, 0, 0, 0, 254, 255, 1, 0, 0, 0, 255, 257, 5, 46, 0,
+		0, 256, 258, 3, 73, 36, 0, 257, 256, 1, 0, 0, 0, 258, 259, 1, 0, 0, 0,
+		259, 257, 1, 0, 0, 0, 259, 260, 1, 0, 0, 0, 260, 270, 1, 0, 0, 0, 261,
+		263, 7, 3, 0, 0, 262, 264, 3, 57, 28, 0, 263, 262, 1, 0, 0, 0, 263, 264,
+		1, 0, 0, 0, 264, 266, 1, 0, 0, 0, 265, 267, 3, 73, 36, 0, 266, 265, 1,
+		0, 0, 0, 267, 268, 1, 0, 0, 0, 268, 266, 1, 0, 0, 0, 268, 269, 1, 0, 0,
+		0, 269, 271, 1, 0, 0, 0, 270, 261, 1, 0, 0, 0, 270, 271, 1, 0, 0, 0, 271,
+		273, 1, 0, 0, 0, 272, 225, 1, 0, 0, 0, 272, 253, 1, 0, 0, 0, 273, 60, 1,
+		0, 0, 0, 274, 280, 5, 34, 0, 0, 275, 279, 8, 23, 0, 0, 276, 277, 5, 92,
+		0, 0, 277, 279, 9, 0, 0, 0, 278, 275, 1, 0, 0, 0, 278, 276, 1, 0, 0, 0,
+		279, 282, 1, 0, 0, 0, 280, 278, 1, 0, 0, 0, 280, 281, 1, 0, 0, 0, 281,
+		283, 1, 0, 0, 0, 282, 280, 1, 0, 0, 0, 283, 295, 5, 34, 0, 0, 284, 290,
+		5, 39, 0, 0, 285, 289, 8, 24, 0, 0, 286, 287, 5, 92, 0, 0, 287, 289, 9,
+		0, 0, 0, 288, 285, 1, 0, 0, 0, 288, 286, 1, 0, 0, 0, 289, 292, 1, 0, 0,
+		0, 290, 288, 1, 0, 0, 0, 290, 291, 1, 0, 0, 0, 291, 293, 1, 0, 0, 0, 292,
+		290, 1, 0, 0, 0, 293, 295, 5, 39, 0, 0, 294, 274, 1, 0, 0, 0, 294, 284,
+		1, 0, 0, 0, 295, 62, 1, 0, 0, 0, 296, 300, 7, 25, 0, 0, 297, 299, 7, 26,
+		0, 0, 298, 297, 1, 0, 0, 0, 299, 302, 1, 0, 0, 0, 300, 298, 1, 0, 0, 0,
+		300, 301, 1, 0, 0, 0, 301, 64, 1, 0, 0, 0, 302, 300, 1, 0, 0, 0, 303, 304,
+		5, 91, 0, 0, 304, 305, 5, 93, 0, 0, 305, 66, 1, 0, 0, 0, 306, 307, 5, 91,
+		0, 0, 307, 308, 5, 42, 0, 0, 308, 309, 5, 93, 0, 0, 309, 68, 1, 0, 0, 0,
+		310, 317, 3, 63, 31, 0, 311, 312, 5, 46, 0, 0, 312, 316, 3, 63, 31, 0,
+		313, 316, 3, 65, 32, 0, 314, 316, 3, 67, 33, 0, 315, 311, 1, 0, 0, 0, 315,
+		313, 1, 0, 0, 0, 315, 314, 1, 0, 0, 0, 316, 319, 1, 0, 0, 0, 317, 315,
+		1, 0, 0, 0, 317, 318, 1, 0, 0, 0, 318, 70, 1, 0, 0, 0, 319, 317, 1, 0,
+		0, 0, 320, 322, 7, 27, 0, 0, 321, 320, 1, 0, 0, 0, 322, 323, 1, 0, 0, 0,
+		323, 321, 1, 0, 0, 0, 323, 324, 1, 0, 0, 0, 324, 325, 1, 0, 0, 0, 325,
+		326, 6, 35, 0, 0, 326, 72, 1, 0, 0, 0, 327, 328, 7, 28, 0, 0, 328, 74,
+		1, 0, 0, 0, 329, 331, 8, 29, 0, 0, 330, 329, 1, 0, 0, 0, 331, 332, 1, 0,
+		0, 0, 332, 330, 1, 0, 0, 0, 332, 333, 1, 0, 0, 0, 333, 76, 1, 0, 0, 0,
+		30, 0, 90, 119, 138, 160, 177, 220, 225, 230, 236, 239, 243, 248, 250,
+		253, 259, 263, 268, 270, 272, 278, 280, 288, 290, 294, 300, 315, 317, 323,
+		332, 1, 6, 0, 0,
 	}
 	deserializer := antlr.NewATNDeserializer(nil)
 	staticData.atn = deserializer.Deserialize(staticData.serializedATN)
--- a/pkg/prometheus/clickhouseprometheus/client.go
+++ b/pkg/prometheus/clickhouseprometheus/client.go
@ -188,10 +188,12 @@ func (client *client) querySamples(ctx context.Context, start int64, end int64,
 	var res []*prompb.TimeSeries
 	var ts *prompb.TimeSeries
 	var fingerprint, prevFingerprint uint64
-	var timestampMs int64
+	var timestampMs, prevTimestamp int64
 	var value float64
 	var flags uint32

+	prevTimestamp = math.MinInt64
+
 	for rows.Next() {
 		if err := rows.Scan(&metricName, &fingerprint, &timestampMs, &value, &flags); err != nil {
 			return nil, err
@ -209,12 +211,18 @@ func (client *client) querySamples(ctx context.Context, start int64, end int64,
 			ts = &prompb.TimeSeries{
 				Labels: labels,
 			}
+			prevTimestamp = math.MinInt64
 		}

 		if flags&1 == 1 {
 			value = math.Float64frombits(promValue.StaleNaN)
 		}

+		if timestampMs == prevTimestamp {
+			continue
+		}
+		prevTimestamp = timestampMs
+
 		// add samples to current time series
 		ts.Samples = append(ts.Samples, prompb.Sample{
 			Timestamp: timestampMs,
--- a/pkg/prometheus/clickhouseprometheus/client_query_test.go
+++ b/pkg/prometheus/clickhouseprometheus/client_query_test.go
@ -0,0 +1,113 @@
+package clickhouseprometheus
+
+import (
+	"context"
+	"github.com/SigNoz/signoz/pkg/telemetrystore/telemetrystoretest"
+	cmock "github.com/srikanthccv/ClickHouse-go-mock"
+	"testing"
+
+	"github.com/DATA-DOG/go-sqlmock"
+	"github.com/SigNoz/signoz/pkg/telemetrystore"
+	"github.com/prometheus/prometheus/prompb"
+	"github.com/stretchr/testify/assert"
+)
+
+// Test for querySamples method
+func TestClient_QuerySamples(t *testing.T) {
+	ctx := context.Background()
+	cols := make([]cmock.ColumnType, 0)
+	cols = append(cols, cmock.ColumnType{Name: "metric_name", Type: "String"})
+	cols = append(cols, cmock.ColumnType{Name: "fingerprint", Type: "UInt64"})
+	cols = append(cols, cmock.ColumnType{Name: "unix_milli", Type: "Int64"})
+	cols = append(cols, cmock.ColumnType{Name: "value", Type: "Float64"})
+	cols = append(cols, cmock.ColumnType{Name: "flags", Type: "UInt32"})
+	tests := []struct {
+		name               string
+		start              int64
+		end                int64
+		fingerprints       map[uint64][]prompb.Label
+		metricName         string
+		subQuery           string
+		args               []any
+		setupMock          func(mock cmock.ClickConnMockCommon, args ...any)
+		expectedTimeSeries int
+		expectError        bool
+		description        string
+		result             []*prompb.TimeSeries
+	}{
+		{
+			name:  "successful samples retrieval",
+			start: int64(1000),
+			end:   int64(2000),
+			fingerprints: map[uint64][]prompb.Label{
+				123: {
+					{Name: "__name__", Value: "cpu_usage"},
+					{Name: "instance", Value: "localhost:9090"},
+				},
+				456: {
+					{Name: "__name__", Value: "cpu_usage"},
+					{Name: "instance", Value: "localhost:9091"},
+				},
+			},
+			metricName:         "cpu_usage",
+			subQuery:           "SELECT metric_name, fingerprint, unix_milli, value, flags",
+			expectedTimeSeries: 2,
+			expectError:        false,
+			description:        "Should successfully retrieve samples for multiple time series",
+			setupMock: func(mock cmock.ClickConnMockCommon, args ...any) {
+				values := [][]interface{}{
+					{"cpu_usage", uint64(123), int64(1001), float64(1.1), uint32(0)},
+					{"cpu_usage", uint64(123), int64(1001), float64(1.1), uint32(0)},
+					{"cpu_usage", uint64(456), int64(1001), float64(1.2), uint32(0)},
+					{"cpu_usage", uint64(456), int64(1001), float64(1.2), uint32(0)},
+					{"cpu_usage", uint64(456), int64(1001), float64(1.2), uint32(0)},
+				}
+				mock.ExpectQuery("SELECT metric_name, fingerprint, unix_milli, value, flags").WithArgs(args...).WillReturnRows(
+					cmock.NewRows(cols, values),
+				)
+			},
+			result: []*prompb.TimeSeries{
+				{
+					Labels: []prompb.Label{
+						{Name: "__name__", Value: "cpu_usage"},
+						{Name: "instance", Value: "localhost:9090"},
+					},
+					Samples: []prompb.Sample{
+						{Timestamp: 1001, Value: 1.1},
+					},
+				},
+				{
+					Labels: []prompb.Label{
+						{Name: "__name__", Value: "cpu_usage"},
+						{Name: "instance", Value: "localhost:9091"},
+					},
+					Samples: []prompb.Sample{
+						{Timestamp: 1001, Value: 1.2},
+					},
+				},
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			telemetryStore := telemetrystoretest.New(telemetrystore.Config{Provider: "clickhouse"}, sqlmock.QueryMatcherRegexp)
+			readClient := client{telemetryStore: telemetryStore}
+			if tt.setupMock != nil {
+				tt.setupMock(telemetryStore.Mock(), tt.metricName, tt.start, tt.end)
+
+			}
+			result, err := readClient.querySamples(ctx, tt.start, tt.end, tt.fingerprints, tt.metricName, tt.subQuery, tt.args)
+
+			if tt.expectError {
+				assert.Error(t, err)
+				assert.Nil(t, result)
+			} else {
+				assert.NoError(t, err)
+				assert.Equal(t, tt.expectedTimeSeries, len(result))
+				assert.Equal(t, result, tt.result)
+			}
+
+		})
+	}
+}
--- a/pkg/querier/builder_query.go
+++ b/pkg/querier/builder_query.go
@ -89,6 +89,12 @@ func (q *builderQuery[T]) Fingerprint() string {
 	// Add filter if present
 	if q.spec.Filter != nil && q.spec.Filter.Expression != "" {
 		parts = append(parts, fmt.Sprintf("filter=%s", q.spec.Filter.Expression))
+
+		for name, item := range q.variables {
+			if strings.Contains(q.spec.Filter.Expression, "$"+name) {
+				parts = append(parts, fmt.Sprintf("%s=%s", name, fmt.Sprint(item.Value)))
+			}
+		}
 	}

 	// Add group by keys
@ -210,6 +216,15 @@ func (q *builderQuery[T]) executeWithContext(ctx context.Context, query string,
 			return nil, errors.Newf(errors.TypeTimeout, errors.CodeTimeout, "Query timed out").
 				WithAdditional("Try refining your search by adding relevant resource attributes filtering")
 		}
+
+		if !errors.Is(err, context.Canceled) {
+			return nil, errors.Newf(
+				errors.TypeInternal,
+				errors.CodeInternal,
+				"Something went wrong on our end. It's not you, it's us. Our team is notified about it. Reach out to support if issue persists.",
+			)
+		}
+
 		return nil, err
 	}
 	defer rows.Close()
--- a/pkg/querier/consume.go
+++ b/pkg/querier/consume.go
@ -5,6 +5,7 @@ import (
 	"math"
 	"reflect"
 	"regexp"
+	"slices"
 	"sort"
 	"strconv"
 	"strings"
@ -17,6 +18,10 @@ import (

 var (
 	aggRe = regexp.MustCompile(`^__result_(\d+)$`)
+	// legacyReservedColumnTargetAliases identifies result value from a user
+	// written clickhouse query. The column alias indcate which value is
+	// to be considered as final result (or target)
+	legacyReservedColumnTargetAliases = []string{"__result", "__value", "result", "res", "value"}
 )

 // consume reads every row and shapes it into the payload expected for the
@ -131,6 +136,9 @@ func readAsTimeSeries(rows driver.Rows, queryWindow *qbtypes.TimeRange, step qbt
 				} else if numericColsCount == 1 { // classic single-value query
 					fallbackValue = val
 					fallbackSeen = true
+				} else if slices.Contains(legacyReservedColumnTargetAliases, name) {
+					fallbackValue = val
+					fallbackSeen = true
 				} else {
 					// numeric label
 					lblVals = append(lblVals, fmt.Sprint(val))
@ -150,6 +158,9 @@ func readAsTimeSeries(rows driver.Rows, queryWindow *qbtypes.TimeRange, step qbt
 					} else if numericColsCount == 1 { // classic single-value query
 						fallbackValue = val
 						fallbackSeen = true
+					} else if slices.Contains(legacyReservedColumnTargetAliases, name) {
+						fallbackValue = val
+						fallbackSeen = true
 					} else {
 						// numeric label
 						lblVals = append(lblVals, fmt.Sprint(val))
--- a/pkg/querier/postprocess.go
+++ b/pkg/querier/postprocess.go
@ -9,6 +9,7 @@ import (
 	"strings"

 	"github.com/SigNoz/govaluate"
+	"github.com/SigNoz/signoz/pkg/querybuilder"
 	qbtypes "github.com/SigNoz/signoz/pkg/types/querybuildertypes/querybuildertypesv5"
 	"github.com/SigNoz/signoz/pkg/types/telemetrytypes"
 )
@ -44,6 +45,73 @@ func getQueryName(spec any) string {
 	return getqueryInfo(spec).Name
 }

+func StepIntervalForQuery(req *qbtypes.QueryRangeRequest, name string) int64 {
+	stepsMap := make(map[string]int64)
+	for _, query := range req.CompositeQuery.Queries {
+		switch spec := query.Spec.(type) {
+		case qbtypes.QueryBuilderQuery[qbtypes.TraceAggregation]:
+			stepsMap[spec.Name] = int64(spec.StepInterval.Seconds())
+		case qbtypes.QueryBuilderQuery[qbtypes.LogAggregation]:
+			stepsMap[spec.Name] = int64(spec.StepInterval.Seconds())
+		case qbtypes.QueryBuilderQuery[qbtypes.MetricAggregation]:
+			stepsMap[spec.Name] = int64(spec.StepInterval.Seconds())
+		case qbtypes.PromQuery:
+			stepsMap[spec.Name] = int64(spec.Step.Seconds())
+		}
+	}
+
+	if step, ok := stepsMap[name]; ok {
+		return step
+	}
+
+	exprStr := ""
+
+	for _, query := range req.CompositeQuery.Queries {
+		switch spec := query.Spec.(type) {
+		case qbtypes.QueryBuilderFormula:
+			if spec.Name == name {
+				exprStr = spec.Expression
+			}
+		}
+	}
+
+	expression, _ := govaluate.NewEvaluableExpressionWithFunctions(exprStr, qbtypes.EvalFuncs())
+
+	steps := []int64{}
+
+	for _, v := range expression.Vars() {
+		steps = append(steps, stepsMap[v])
+	}
+
+	return querybuilder.LCMList(steps)
+}
+
+func NumAggregationForQuery(req *qbtypes.QueryRangeRequest, name string) int64 {
+	numAgg := 0
+	for _, query := range req.CompositeQuery.Queries {
+		switch spec := query.Spec.(type) {
+		case qbtypes.QueryBuilderQuery[qbtypes.TraceAggregation]:
+			if spec.Name == name {
+				numAgg += 1
+			}
+		case qbtypes.QueryBuilderQuery[qbtypes.LogAggregation]:
+			if spec.Name == name {
+				numAgg += 1
+			}
+		case qbtypes.QueryBuilderQuery[qbtypes.MetricAggregation]:
+			if spec.Name == name {
+				numAgg += 1
+			}
+		case qbtypes.QueryBuilderFormula:
+			if spec.Name == name {
+				numAgg += 1
+			}
+		}
+	}
+
+	return int64(numAgg)
+}
+
 func (q *querier) postProcessResults(ctx context.Context, results map[string]any, req *qbtypes.QueryRangeRequest) (map[string]any, error) {
 	// Convert results to typed format for processing
 	typedResults := make(map[string]*qbtypes.Result)
@ -81,6 +149,18 @@ func (q *querier) postProcessResults(ctx context.Context, results map[string]any

 	// Apply table formatting for UI if requested
 	if req.FormatOptions != nil && req.FormatOptions.FormatTableResultForUI && req.RequestType == qbtypes.RequestTypeScalar {
+
+		// merge result only needed for non-CH query
+		if len(req.CompositeQuery.Queries) == 1 {
+			if req.CompositeQuery.Queries[0].Type == qbtypes.QueryTypeClickHouseSQL {
+				retResult := map[string]any{}
+				for name, v := range typedResults {
+					retResult[name] = v.Value
+				}
+				return retResult, nil
+			}
+		}
+
 		// Format results as a table - this merges all queries into a single table
 		tableResult := q.formatScalarResultsAsTable(typedResults, req)

@ -96,6 +176,36 @@ func (q *querier) postProcessResults(ctx context.Context, results map[string]any
 		return tableResult, nil
 	}

+	if req.RequestType == qbtypes.RequestTypeTimeSeries && req.FormatOptions != nil && req.FormatOptions.FillGaps {
+		for name := range typedResults {
+			funcs := []qbtypes.Function{{Name: qbtypes.FunctionNameFillZero}}
+			funcs = q.prepareFillZeroArgsWithStep(funcs, req, StepIntervalForQuery(req, name))
+			// empty time series if it doesn't exist
+			tsData, ok := typedResults[name].Value.(*qbtypes.TimeSeriesData)
+			if !ok {
+				tsData = &qbtypes.TimeSeriesData{}
+			}
+
+			if len(tsData.Aggregations) == 0 {
+				numAgg := NumAggregationForQuery(req, name)
+				tsData.Aggregations = make([]*qbtypes.AggregationBucket, numAgg)
+				for idx := range numAgg {
+					tsData.Aggregations[idx] = &qbtypes.AggregationBucket{
+						Index: int(idx),
+						Series: []*qbtypes.TimeSeries{
+							{
+								Labels: make([]*qbtypes.Label, 0),
+								Values: make([]*qbtypes.TimeSeriesValue, 0),
+							},
+						},
+					}
+				}
+			}
+
+			typedResults[name] = q.applyFunctions(typedResults[name], funcs)
+		}
+	}
+
 	// Convert back to map[string]any
 	finalResults := make(map[string]any)
 	for name, result := range typedResults {
@ -131,6 +241,19 @@ func postProcessMetricQuery(
 	req *qbtypes.QueryRangeRequest,
 ) *qbtypes.Result {

+	config := query.Aggregations[0]
+	spaceAggOrderBy := fmt.Sprintf("%s(%s)", config.SpaceAggregation.StringValue(), config.MetricName)
+	timeAggOrderBy := fmt.Sprintf("%s(%s)", config.TimeAggregation.StringValue(), config.MetricName)
+	timeSpaceAggOrderBy := fmt.Sprintf("%s(%s(%s))", config.SpaceAggregation.StringValue(), config.TimeAggregation.StringValue(), config.MetricName)
+
+	for idx := range query.Order {
+		if query.Order[idx].Key.Name == spaceAggOrderBy ||
+			query.Order[idx].Key.Name == timeAggOrderBy ||
+			query.Order[idx].Key.Name == timeSpaceAggOrderBy {
+			query.Order[idx].Key.Name = qbtypes.DefaultOrderByKey
+		}
+	}
+
 	if query.Limit > 0 {
 		result = q.applySeriesLimit(result, query.Limit, query.Order)
 	}
@ -224,6 +347,13 @@ func (q *querier) applyFormulas(ctx context.Context, results map[string]*qbtypes

 	// Process each formula
 	for name, formula := range formulaQueries {
+
+		for idx := range formula.Order {
+			if formula.Order[idx].Key.Name == formula.Name || formula.Order[idx].Key.Name == formula.Expression {
+				formula.Order[idx].Key.Name = qbtypes.DefaultOrderByKey
+			}
+		}
+
 		// Check if we're dealing with time series or scalar data
 		if req.RequestType == qbtypes.RequestTypeTimeSeries {
 			result := q.processTimeSeriesFormula(ctx, results, formula, req)
--- a/pkg/querier/querier.go
+++ b/pkg/querier/querier.go
@ -162,6 +162,17 @@ func (q *querier) QueryRange(ctx context.Context, orgID valuer.UUID, req *qbtype
 						Duration: time.Second * time.Duration(querybuilder.MinAllowedStepIntervalForMetric(req.Start, req.End)),
 					}
 				}
+
+				req.CompositeQuery.Queries[idx].Spec = spec
+			}
+		} else if query.Type == qbtypes.QueryTypePromQL {
+			switch spec := query.Spec.(type) {
+			case qbtypes.PromQuery:
+				if spec.Step.Seconds() == 0 {
+					spec.Step = qbtypes.Step{
+						Duration: time.Second * time.Duration(querybuilder.RecommendedStepIntervalForMetric(req.Start, req.End)),
+					}
+				}
 				req.CompositeQuery.Queries[idx].Spec = spec
 			}
 		}
--- a/pkg/query-service/.dockerignore
+++ b/pkg/query-service/.dockerignore
@ -1,3 +0,0 @@
-.vscode
-README.md
-signoz.db
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 18"><defs><linearGradient id="a" x1="2.59" y1="10.16" x2="15.41" y2="10.16" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#005ba1"/><stop offset=".07" stop-color="#0060a9"/><stop offset=".36" stop-color="#0071c8"/><stop offset=".52" stop-color="#0078d4"/><stop offset=".64" stop-color="#0074cd"/><stop offset=".82" stop-color="#006abb"/><stop offset="1" stop-color="#005ba1"/></linearGradient></defs><path d="M9 5.14c-3.54 0-6.41-1-6.41-2.32v12.36c0 1.27 2.82 2.3 6.32 2.32H9c3.54 0 6.41-1 6.41-2.32V2.82c0 1.29-2.87 2.32-6.41 2.32z" fill="url(#a)"/><path d="M15.41 2.82c0 1.29-2.87 2.32-6.41 2.32s-6.41-1-6.41-2.32S5.46.5 9 .5s6.41 1 6.41 2.32" fill="#e8e8e8"/><path d="M13.92 2.63c0 .82-2.21 1.48-4.92 1.48s-4.92-.66-4.92-1.48S6.29 1.16 9 1.16s4.92.66 4.92 1.47" fill="#50e6ff"/><path d="M9 3a11.55 11.55 0 00-3.89.57A11.42 11.42 0 009 4.11a11.15 11.15 0 003.89-.58A11.84 11.84 0 009 3z" fill="#198ab3"/><path d="M12.64 9v1.63h-1a.39.39 0 01-.29-.14V9H10v1.78a.92.92 0 001 .89h1.49l.26-.13s-.11.41-.26.43h-2.38v1h2.66A1.21 1.21 0 0014 11.7V9zM9.53 9v-.49a.7.7 0 00-.48-.77 1.74 1.74 0 00-.5-.08.94.94 0 00-.91.58l-.78 1.9-1-1.9A.93.93 0 005 7.66a1.44 1.44 0 00-.51.09c-.35.11-.43.34-.43.73v3.31h1.17V9.56l.63 1.57a1.08 1.08 0 001 .66c.44 0 .62-.26.8-.66l.67-1.51v2.15h1.18V9z" fill="#f2f2f2"/></svg>
				`@ -0,0 +1 @@`
				`<svg viewBox="0 0 832.8 959.8" xmlns="http://www.w3.org/2000/svg" width="2169" height="2500"><path d="M672.6 332.3l160.2-92.4v480L416.4 959.8V775.2l256.2-147.6z" fill="#00ac69"/><path d="M416.4 184.6L160.2 332.3 0 239.9 416.4 0l416.4 239.9-160.2 92.4z" fill="#1ce783"/><path d="M256.2 572.3L0 424.6V239.9l416.4 240v479.9l-160.2-92.2z" fill="#1d252c"/></svg>`
				`@ -0,0 +1 @@`
				<svg height="2500" width="2500" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 80 80"><linearGradient id="a" x1="0%" y1="100%" y2="0%"><stop offset="0" stop-color="#1b660f"/><stop offset="1" stop-color="#6cae3e"/></linearGradient><g fill="none" fill-rule="evenodd"><path d="M0 0h80v80H0z" fill="url(#a)"/><path d="M60.836 42.893l.384-2.704c3.54 2.12 3.587 2.997 3.586 3.02-.006.006-.61.51-3.97-.316zm-1.943-.54C52.773 40.5 44.25 36.59 40.8 34.96c0-.014.004-.027.004-.041a2.406 2.406 0 0 0-2.404-2.403c-1.324 0-2.402 1.078-2.402 2.403s1.078 2.403 2.402 2.403c.582 0 1.11-.217 1.527-.562 4.058 1.92 12.515 5.774 18.68 7.594L56.17 61.56a.955.955 0 0 0-.01.14c0 1.516-6.707 4.299-17.666 4.299-11.075 0-17.853-2.783-17.853-4.298 0-.046-.003-.091-.01-.136l-5.093-37.207c4.409 3.035 13.892 4.64 22.962 4.64 9.056 0 18.523-1.6 22.94-4.625zM15 20.478C15.072 19.162 22.634 14 38.5 14c15.864 0 23.427 5.16 23.5 6.478v.449C61.13 23.877 51.33 27 38.5 27c-12.852 0-22.657-3.132-23.5-6.087zm49 .022c0-3.465-9.934-8.5-25.5-8.5S13 17.035 13 20.5l.094.754 5.548 40.524C18.775 66.31 30.86 68 38.494 68c9.472 0 19.535-2.178 19.665-6.22l2.396-16.896c1.333.319 2.43.482 3.31.482 1.184 0 1.984-.29 2.469-.867a1.95 1.95 0 0 0 .436-1.66c-.26-1.383-1.902-2.875-5.248-4.784l2.376-16.762z" fill="#fff"/></g></svg>