@@ -231,6 +230,8 @@ Not sure how to get started? Just ping us on `#contributing` in our [slack commu
- [Shaheer Kochai](https://github.com/ahmadshaheer)
- [Amlan Kumar Nandy](https://github.com/amlannandy)
- [Sahil Khan](https://github.com/sawhil)
+- [Aditya Singh](https://github.com/aks07)
+- [Abhi Kumar](https://github.com/ahrefabhi)
#### DevOps
diff --git a/pkg/query-service/.goreleaser.yaml b/cmd/community/.goreleaser.yaml
similarity index 97%
rename from pkg/query-service/.goreleaser.yaml
rename to cmd/community/.goreleaser.yaml
index 3ffd74d07f76..16a7fe7d95e4 100644
--- a/pkg/query-service/.goreleaser.yaml
+++ b/cmd/community/.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
- >-
diff --git a/pkg/query-service/Dockerfile b/cmd/community/Dockerfile
similarity index 91%
rename from pkg/query-service/Dockerfile
rename to cmd/community/Dockerfile
index 38609cc182fa..22433506f6a2 100644
--- a/pkg/query-service/Dockerfile
+++ b/cmd/community/Dockerfile
@@ -16,4 +16,4 @@ COPY frontend/build/ /etc/signoz/web/
RUN chmod 755 /root /root/signoz
-ENTRYPOINT ["./signoz"]
+ENTRYPOINT ["./signoz", "server"]
\ No newline at end of file
diff --git a/pkg/query-service/Dockerfile.multi-arch b/cmd/community/Dockerfile.multi-arch
similarity index 90%
rename from pkg/query-service/Dockerfile.multi-arch
rename to cmd/community/Dockerfile.multi-arch
index 229b50d84349..3a6c479a604e 100644
--- a/pkg/query-service/Dockerfile.multi-arch
+++ b/cmd/community/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"]
diff --git a/cmd/community/main.go b/cmd/community/main.go
new file mode 100644
index 000000000000..e188635734d3
--- /dev/null
+++ 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)
+}
diff --git a/cmd/community/server.go b/cmd/community/server.go
new file mode 100644
index 000000000000..9def8a147ace
--- /dev/null
+++ 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
+}
diff --git a/cmd/config.go b/cmd/config.go
new file mode 100644
index 000000000000..4e627c4f91d1
--- /dev/null
+++ 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
+}
diff --git a/ee/query-service/.goreleaser.yaml b/cmd/enterprise/.goreleaser.yaml
similarity index 98%
rename from ee/query-service/.goreleaser.yaml
rename to cmd/enterprise/.goreleaser.yaml
index e3982597d11c..43d3e9d34025 100644
--- a/ee/query-service/.goreleaser.yaml
+++ b/cmd/enterprise/.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
- >-
diff --git a/ee/query-service/Dockerfile b/cmd/enterprise/Dockerfile
similarity index 90%
rename from ee/query-service/Dockerfile
rename to cmd/enterprise/Dockerfile
index 2c8a7cd809fe..798055afb1fa 100644
--- a/ee/query-service/Dockerfile
+++ b/cmd/enterprise/Dockerfile
@@ -16,4 +16,4 @@ COPY frontend/build/ /etc/signoz/web/
RUN chmod 755 /root /root/signoz
-ENTRYPOINT ["./signoz"]
\ No newline at end of file
+ENTRYPOINT ["./signoz", "server"]
diff --git a/ee/query-service/Dockerfile.integration b/cmd/enterprise/Dockerfile.integration
similarity index 92%
rename from ee/query-service/Dockerfile.integration
rename to cmd/enterprise/Dockerfile.integration
index 40a76a5bbca6..fe3eb583f7c3 100644
--- a/ee/query-service/Dockerfile.integration
+++ b/cmd/enterprise/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"]
diff --git a/ee/query-service/Dockerfile.multi-arch b/cmd/enterprise/Dockerfile.multi-arch
similarity index 92%
rename from ee/query-service/Dockerfile.multi-arch
rename to cmd/enterprise/Dockerfile.multi-arch
index 1bf8b8b43d08..776548fcb9da 100644
--- a/ee/query-service/Dockerfile.multi-arch
+++ b/cmd/enterprise/Dockerfile.multi-arch
@@ -17,4 +17,4 @@ COPY frontend/build/ /etc/signoz/web/
RUN chmod 755 /root /root/signoz
-ENTRYPOINT ["./signoz"]
+ENTRYPOINT ["./signoz", "server"]
diff --git a/cmd/enterprise/main.go b/cmd/enterprise/main.go
new file mode 100644
index 000000000000..e188635734d3
--- /dev/null
+++ 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)
+}
diff --git a/cmd/enterprise/server.go b/cmd/enterprise/server.go
new file mode 100644
index 000000000000..56344ea8b2eb
--- /dev/null
+++ 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
+}
diff --git a/cmd/root.go b/cmd/root.go
new file mode 100644
index 000000000000..a080b3764505
--- /dev/null
+++ 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)
+ }
+}
diff --git a/cmd/zap.go b/cmd/zap.go
new file mode 100644
index 000000000000..4f043eaf6bcf
--- /dev/null
+++ 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
+}
diff --git a/deploy/docker-swarm/docker-compose.ha.yaml b/deploy/docker-swarm/docker-compose.ha.yaml
index e9731b79b91f..9ad2cd558772 100644
--- 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.88.1
+ image: signoz/signoz:v0.90.1
command:
- --config=/root/config/prometheus.yml
ports:
@@ -194,6 +194,7 @@ services:
- TELEMETRY_ENABLED=true
- DEPLOYMENT_TYPE=docker-swarm
- SIGNOZ_JWT_SECRET=secret
+ - DOT_METRICS_ENABLED=true
healthcheck:
test:
- CMD
@@ -206,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
@@ -230,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
diff --git a/deploy/docker-swarm/docker-compose.yaml b/deploy/docker-swarm/docker-compose.yaml
index a3b7e678a2c3..1d9f518d8178 100644
--- 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.88.1
+ image: signoz/signoz:v0.90.1
command:
- --config=/root/config/prometheus.yml
ports:
@@ -135,6 +135,7 @@ services:
- GODEBUG=netdns=go
- TELEMETRY_ENABLED=true
- DEPLOYMENT_TYPE=docker-swarm
+ - DOT_METRICS_ENABLED=true
healthcheck:
test:
- CMD
@@ -147,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
@@ -173,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
diff --git a/deploy/docker-swarm/otel-collector-config.yaml b/deploy/docker-swarm/otel-collector-config.yaml
index 93e07f9bd10d..48baa16b34c1 100644
--- a/deploy/docker-swarm/otel-collector-config.yaml
+++ b/deploy/docker-swarm/otel-collector-config.yaml
@@ -26,7 +26,7 @@ processors:
detectors: [env, system]
timeout: 2s
signozspanmetrics/delta:
- metrics_exporter: clickhousemetricswrite, signozclickhousemetrics
+ metrics_exporter: signozclickhousemetrics
metrics_flush_interval: 60s
latency_histogram_buckets: [100us, 1ms, 2ms, 6ms, 10ms, 50ms, 100ms, 250ms, 500ms, 1000ms, 1400ms, 2000ms, 5s, 10s, 20s, 40s, 60s ]
dimensions_cache_size: 100000
@@ -60,14 +60,6 @@ exporters:
datasource: tcp://clickhouse:9000/signoz_traces
low_cardinal_exception_grouping: ${env:LOW_CARDINAL_EXCEPTION_GROUPING}
use_new_schema: true
- clickhousemetricswrite:
- endpoint: tcp://clickhouse:9000/signoz_metrics
- resource_to_telemetry_conversion:
- enabled: true
- disable_v2: true
- clickhousemetricswrite/prometheus:
- endpoint: tcp://clickhouse:9000/signoz_metrics
- disable_v2: true
signozclickhousemetrics:
dsn: tcp://clickhouse:9000/signoz_metrics
clickhouselogsexporter:
@@ -89,11 +81,11 @@ service:
metrics:
receivers: [otlp]
processors: [batch]
- exporters: [clickhousemetricswrite, signozclickhousemetrics]
+ exporters: [signozclickhousemetrics]
metrics/prometheus:
receivers: [prometheus]
processors: [batch]
- exporters: [clickhousemetricswrite/prometheus, signozclickhousemetrics]
+ exporters: [signozclickhousemetrics]
logs:
receivers: [otlp]
processors: [batch]
diff --git a/deploy/docker/docker-compose.ha.yaml b/deploy/docker/docker-compose.ha.yaml
index 4e660b7aa1c8..215b0eed073d 100644
--- 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.88.1}
+ image: signoz/signoz:${VERSION:-v0.90.1}
container_name: signoz
command:
- --config=/root/config/prometheus.yml
@@ -197,6 +197,7 @@ services:
- GODEBUG=netdns=go
- TELEMETRY_ENABLED=true
- DEPLOYMENT_TYPE=docker-standalone-amd
+ - DOT_METRICS_ENABLED=true
healthcheck:
test:
- CMD
@@ -210,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
@@ -236,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
@@ -247,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
diff --git a/deploy/docker/docker-compose.yaml b/deploy/docker/docker-compose.yaml
index e4a8abb29d52..7bc052176f5c 100644
--- 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.88.1}
+ image: signoz/signoz:${VERSION:-v0.90.1}
container_name: signoz
command:
- --config=/root/config/prometheus.yml
@@ -130,6 +130,7 @@ services:
- GODEBUG=netdns=go
- TELEMETRY_ENABLED=true
- DEPLOYMENT_TYPE=docker-standalone-amd
+ - DOT_METRICS_ENABLED=true
healthcheck:
test:
- CMD
@@ -142,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
@@ -164,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
@@ -176,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
diff --git a/deploy/docker/otel-collector-config.yaml b/deploy/docker/otel-collector-config.yaml
index a9e6db66044f..48baa16b34c1 100644
--- a/deploy/docker/otel-collector-config.yaml
+++ b/deploy/docker/otel-collector-config.yaml
@@ -26,7 +26,7 @@ processors:
detectors: [env, system]
timeout: 2s
signozspanmetrics/delta:
- metrics_exporter: clickhousemetricswrite, signozclickhousemetrics
+ metrics_exporter: signozclickhousemetrics
metrics_flush_interval: 60s
latency_histogram_buckets: [100us, 1ms, 2ms, 6ms, 10ms, 50ms, 100ms, 250ms, 500ms, 1000ms, 1400ms, 2000ms, 5s, 10s, 20s, 40s, 60s ]
dimensions_cache_size: 100000
@@ -60,14 +60,6 @@ exporters:
datasource: tcp://clickhouse:9000/signoz_traces
low_cardinal_exception_grouping: ${env:LOW_CARDINAL_EXCEPTION_GROUPING}
use_new_schema: true
- clickhousemetricswrite:
- endpoint: tcp://clickhouse:9000/signoz_metrics
- disable_v2: true
- resource_to_telemetry_conversion:
- enabled: true
- clickhousemetricswrite/prometheus:
- endpoint: tcp://clickhouse:9000/signoz_metrics
- disable_v2: true
signozclickhousemetrics:
dsn: tcp://clickhouse:9000/signoz_metrics
clickhouselogsexporter:
@@ -89,11 +81,11 @@ service:
metrics:
receivers: [otlp]
processors: [batch]
- exporters: [clickhousemetricswrite, signozclickhousemetrics]
+ exporters: [signozclickhousemetrics]
metrics/prometheus:
receivers: [prometheus]
processors: [batch]
- exporters: [clickhousemetricswrite/prometheus, signozclickhousemetrics]
+ exporters: [signozclickhousemetrics]
logs:
receivers: [otlp]
processors: [batch]
diff --git a/docs/otel-demo-docs.md b/docs/otel-demo-docs.md
index af989efbfdc5..2c0fc92ec522 100644
--- a/docs/otel-demo-docs.md
+++ b/docs/otel-demo-docs.md
@@ -16,7 +16,7 @@ __Table of Contents__
- [Prerequisites](#prerequisites-1)
- [Install Helm Repo and Charts](#install-helm-repo-and-charts)
- [Start the OpenTelemetry Demo App](#start-the-opentelemetry-demo-app-1)
- - [Moniitor with SigNoz (Kubernetes)](#monitor-with-signoz-kubernetes)
+ - [Monitor with SigNoz (Kubernetes)](#monitor-with-signoz-kubernetes)
- [What's next](#whats-next)
diff --git a/ee/query-service/.dockerignore b/ee/query-service/.dockerignore
deleted file mode 100644
index 9521c5060b39..000000000000
--- a/ee/query-service/.dockerignore
+++ /dev/null
@@ -1,4 +0,0 @@
-.vscode
-README.md
-signoz.db
-bin
\ No newline at end of file
diff --git a/ee/query-service/main.go b/ee/query-service/main.go
deleted file mode 100644
index c7b6b2d23e6d..000000000000
--- a/ee/query-service/main.go
+++ /dev/null
@@ -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))
- }
-}
diff --git a/frontend/package.json b/frontend/package.json
index f4707155990d..1dd5ea7c94f0 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -213,7 +213,9 @@
"eslint-plugin-simple-import-sort": "^7.0.0",
"eslint-plugin-sonarjs": "^0.12.0",
"husky": "^7.0.4",
- "image-webpack-loader": "8.1.0",
+ "image-minimizer-webpack-plugin": "^4.0.0",
+ "imagemin": "^8.0.1",
+ "imagemin-svgo": "^10.0.1",
"is-ci": "^3.0.1",
"jest-styled-components": "^7.0.8",
"lint-staged": "^12.5.0",
@@ -230,6 +232,7 @@
"redux-mock-store": "1.5.4",
"sass": "1.66.1",
"sass-loader": "13.3.2",
+ "sharp": "^0.33.4",
"ts-jest": "^27.1.5",
"ts-node": "^10.2.1",
"typescript-plugin-css-modules": "5.0.1",
@@ -254,6 +257,7 @@
"cross-spawn": "7.0.5",
"cookie": "^0.7.1",
"serialize-javascript": "6.0.2",
- "prismjs": "1.30.0"
+ "prismjs": "1.30.0",
+ "got": "11.8.5"
}
}
diff --git a/frontend/public/Logos/argocd.svg b/frontend/public/Logos/argocd.svg
new file mode 100644
index 000000000000..ef6eff54507a
--- /dev/null
+++ b/frontend/public/Logos/argocd.svg
@@ -0,0 +1 @@
+
diff --git a/frontend/public/Logos/azure-mysql.svg b/frontend/public/Logos/azure-mysql.svg
new file mode 100644
index 000000000000..d1504cc763fa
--- /dev/null
+++ b/frontend/public/Logos/azure-mysql.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/frontend/public/Logos/cloudflare.svg b/frontend/public/Logos/cloudflare.svg
new file mode 100644
index 000000000000..84ce0dc01650
--- /dev/null
+++ b/frontend/public/Logos/cloudflare.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/frontend/public/Logos/dynamodb.svg b/frontend/public/Logos/dynamodb.svg
new file mode 100644
index 000000000000..bd4f2c30f503
--- /dev/null
+++ b/frontend/public/Logos/dynamodb.svg
@@ -0,0 +1,18 @@
+
+
\ No newline at end of file
diff --git a/frontend/public/Logos/elk.svg b/frontend/public/Logos/elk.svg
new file mode 100644
index 000000000000..d240ad568c88
--- /dev/null
+++ b/frontend/public/Logos/elk.svg
@@ -0,0 +1,2 @@
+
+
\ No newline at end of file
diff --git a/frontend/public/Logos/external-api-monitoring.svg b/frontend/public/Logos/external-api-monitoring.svg
new file mode 100644
index 000000000000..327eaa950649
--- /dev/null
+++ b/frontend/public/Logos/external-api-monitoring.svg
@@ -0,0 +1,19 @@
+
+
+
\ No newline at end of file
diff --git a/frontend/public/Logos/github-actions.svg b/frontend/public/Logos/github-actions.svg
new file mode 100644
index 000000000000..2929e024f398
--- /dev/null
+++ b/frontend/public/Logos/github-actions.svg
@@ -0,0 +1 @@
+
diff --git a/frontend/public/Logos/github.svg b/frontend/public/Logos/github.svg
new file mode 100644
index 000000000000..3ff1cee7c9b8
--- /dev/null
+++ b/frontend/public/Logos/github.svg
@@ -0,0 +1,5 @@
+
diff --git a/frontend/public/Logos/http-monitoring.svg b/frontend/public/Logos/http-monitoring.svg
new file mode 100644
index 000000000000..b495ddf19894
--- /dev/null
+++ b/frontend/public/Logos/http-monitoring.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/frontend/public/Logos/jenkins.svg b/frontend/public/Logos/jenkins.svg
new file mode 100644
index 000000000000..c4e7b880d36b
--- /dev/null
+++ b/frontend/public/Logos/jenkins.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/frontend/public/Logos/newrelic.svg b/frontend/public/Logos/newrelic.svg
new file mode 100644
index 000000000000..e2d586bf7184
--- /dev/null
+++ b/frontend/public/Logos/newrelic.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/frontend/public/Logos/openai.svg b/frontend/public/Logos/openai.svg
new file mode 100644
index 000000000000..94eb50385dc9
--- /dev/null
+++ b/frontend/public/Logos/openai.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/frontend/public/Logos/s3.svg b/frontend/public/Logos/s3.svg
new file mode 100644
index 000000000000..cd203eaad6e8
--- /dev/null
+++ b/frontend/public/Logos/s3.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/frontend/public/Logos/snowflake.svg b/frontend/public/Logos/snowflake.svg
new file mode 100644
index 000000000000..f491c273133e
--- /dev/null
+++ b/frontend/public/Logos/snowflake.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/frontend/public/Logos/sns.svg b/frontend/public/Logos/sns.svg
new file mode 100644
index 000000000000..6cb54adab20c
--- /dev/null
+++ b/frontend/public/Logos/sns.svg
@@ -0,0 +1,18 @@
+
+
\ No newline at end of file
diff --git a/frontend/public/Logos/sqs.svg b/frontend/public/Logos/sqs.svg
new file mode 100644
index 000000000000..b19102943cd7
--- /dev/null
+++ b/frontend/public/Logos/sqs.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/frontend/public/Logos/systemd.svg b/frontend/public/Logos/systemd.svg
new file mode 100644
index 000000000000..4a9d9492ff72
--- /dev/null
+++ b/frontend/public/Logos/systemd.svg
@@ -0,0 +1,8 @@
+
diff --git a/frontend/public/Logos/wordpress.svg b/frontend/public/Logos/wordpress.svg
new file mode 100644
index 000000000000..916903f23b17
--- /dev/null
+++ b/frontend/public/Logos/wordpress.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/frontend/public/locales/en-GB/failedPayment.json b/frontend/public/locales/en-GB/failedPayment.json
index a624e47c7db0..05ec0cc68d47 100644
--- 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"
}
diff --git a/frontend/public/locales/en/failedPayment.json b/frontend/public/locales/en/failedPayment.json
index a624e47c7db0..05ec0cc68d47 100644
--- 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"
}
diff --git a/frontend/src/api/changelog/getChangelogByVersion.ts b/frontend/src/api/changelog/getChangelogByVersion.ts
index 849c3a9f15ed..b9b3f1f9c935 100644
--- a/frontend/src/api/changelog/getChangelogByVersion.ts
+++ b/frontend/src/api/changelog/getChangelogByVersion.ts
@@ -1,14 +1,32 @@
import { ErrorResponseHandler } from 'api/ErrorResponseHandler';
import axios, { AxiosError } from 'axios';
import { ErrorResponse, SuccessResponse } from 'types/api';
-import { ChangelogSchema } from 'types/api/changelog/getChangelogByVersion';
+import {
+ ChangelogSchema,
+ DeploymentType,
+} from 'types/api/changelog/getChangelogByVersion';
const getChangelogByVersion = async (
versionId: string,
+ deployment_type?: DeploymentType,
): Promise
- } onClick={onClose}>
- Skip for now
-
- }
- onClick={onClickUpdateWorkspace}
- >
- Update my workspace
-
-
+ {!isCloudUser && (
+
+ } onClick={onClose}>
+ Skip for now
+
+ }
+ onClick={onClickUpdateWorkspace}
+ >
+ Update my workspace
+
+
+ )}
{changelog && (
- {(isCloudUser || isEnterpriseSelfHostedUser) && (
-
diff --git a/frontend/src/container/IngestionSettings/MultiIngestionSettings.tsx b/frontend/src/container/IngestionSettings/MultiIngestionSettings.tsx
index ef95b76afbbc..f82a8e5a1d72 100644
--- a/frontend/src/container/IngestionSettings/MultiIngestionSettings.tsx
+++ b/frontend/src/container/IngestionSettings/MultiIngestionSettings.tsx
@@ -38,6 +38,7 @@ import dayjs from 'dayjs';
import { useGetDeploymentsData } from 'hooks/CustomDomain/useGetDeploymentsData';
import { useGetAllIngestionsKeys } from 'hooks/IngestionKeys/useGetAllIngestionKeys';
import useDebouncedFn from 'hooks/useDebouncedFunction';
+import { useGetTenantLicense } from 'hooks/useGetTenantLicense';
import { useNotifications } from 'hooks/useNotifications';
import { isNil, isUndefined } from 'lodash-es';
import {
@@ -167,6 +168,8 @@ function MultiIngestionSettings(): JSX.Element {
const [totalIngestionKeys, setTotalIngestionKeys] = useState(0);
+ const { isEnterpriseSelfHostedUser } = useGetTenantLicense();
+
const [
hasCreateLimitForIngestionKeyError,
setHasCreateLimitForIngestionKeyError,
@@ -293,7 +296,7 @@ function MultiIngestionSettings(): JSX.Element {
isLoading: isLoadingDeploymentsData,
isFetching: isFetchingDeploymentsData,
isError: isErrorDeploymentsData,
- } = useGetDeploymentsData(true);
+ } = useGetDeploymentsData(!isEnterpriseSelfHostedUser);
const {
mutate: createIngestionKey,
@@ -1308,7 +1311,8 @@ function MultiIngestionSettings(): JSX.Element {
{!isErrorDeploymentsData &&
!isLoadingDeploymentsData &&
- !isFetchingDeploymentsData && (
+ !isFetchingDeploymentsData &&
+ deploymentsData && (
+
diff --git a/frontend/src/container/LogDetailedView/TableView/TableViewActions.styles.scss b/frontend/src/container/LogDetailedView/TableView/TableViewActions.styles.scss
index f5a45ef41655..5f5e94c74bb3 100644
--- a/frontend/src/container/LogDetailedView/TableView/TableViewActions.styles.scss
+++ b/frontend/src/container/LogDetailedView/TableView/TableViewActions.styles.scss
@@ -11,6 +11,18 @@
}
}
+.selectable-tree {
+ .ant-tree-node-content-wrapper {
+ user-select: text !important;
+ cursor: text !important;
+ }
+
+ .ant-tree-title {
+ user-select: text !important;
+ cursor: text !important;
+ }
+}
+
.table-view-actions-content {
.ant-popover-inner {
border-radius: 4px;
diff --git a/frontend/src/container/LogDetailedView/TableView/TableViewActions.tsx b/frontend/src/container/LogDetailedView/TableView/TableViewActions.tsx
index f09e9a5c5771..af0a75e78517 100644
--- a/frontend/src/container/LogDetailedView/TableView/TableViewActions.tsx
+++ b/frontend/src/container/LogDetailedView/TableView/TableViewActions.tsx
@@ -53,7 +53,12 @@ const convert = new Convert();
// Memoized Tree Component
const MemoizedTree = React.memo<{ treeData: any[] }>(({ treeData }) => (
-
{cloneElement(children, props)}
diff --git a/frontend/src/container/LogsExplorerList/InfinityTableView/index.tsx b/frontend/src/container/LogsExplorerList/InfinityTableView/index.tsx
index 9aa982abe700..339bdf135b12 100644
--- a/frontend/src/container/LogsExplorerList/InfinityTableView/index.tsx
+++ b/frontend/src/container/LogsExplorerList/InfinityTableView/index.tsx
@@ -135,6 +135,7 @@ const InfinityTable = forwardRef(
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())}
diff --git a/frontend/src/container/LogsExplorerList/InfinityTableView/styles.ts b/frontend/src/container/LogsExplorerList/InfinityTableView/styles.ts
index a22e7a4cc0c6..5d5d7477339d 100644
--- 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`
padding: 0.5rem;
${({ fontSize }): string =>
@@ -29,9 +41,12 @@ export const TableCellStyled = styled.td`
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`
: 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)}
`;
diff --git a/frontend/src/container/MetricsApplication/Tabs/Overview/ApDex/ApDexMetricsApplication.tsx b/frontend/src/container/MetricsApplication/Tabs/Overview/ApDex/ApDexMetricsApplication.tsx
index 9241f8293829..548b59848bbf 100644
--- a/frontend/src/container/MetricsApplication/Tabs/Overview/ApDex/ApDexMetricsApplication.tsx
+++ b/frontend/src/container/MetricsApplication/Tabs/Overview/ApDex/ApDexMetricsApplication.tsx
@@ -3,9 +3,11 @@ import { useGetMetricMeta } from 'hooks/apDex/useGetMetricMeta';
import useErrorNotification from 'hooks/useErrorNotification';
import { useParams } from 'react-router-dom';
+import { FeatureKeys } from '../../../../../constants/features';
+import { useAppContext } from '../../../../../providers/App/App';
+import { WidgetKeys } from '../../../constant';
import { IServiceName } from '../../types';
import ApDexMetrics from './ApDexMetrics';
-import { metricMeta } from './constants';
import { ApDexDataSwitcherProps } from './types';
function ApDexMetricsApplication({
@@ -18,7 +20,19 @@ function ApDexMetricsApplication({
const { servicename: encodedServiceName } = useParams();
const servicename = decodeURIComponent(encodedServiceName);
- const { data, isLoading, error } = useGetMetricMeta(metricMeta, servicename);
+ const { featureFlags } = useAppContext();
+ const dotMetricsEnabled =
+ featureFlags?.find((flag) => flag.name === FeatureKeys.DOT_METRICS_ENABLED)
+ ?.active || false;
+
+ const signozLatencyBucketMetrics = dotMetricsEnabled
+ ? WidgetKeys.Signoz_latency_bucket
+ : WidgetKeys.Signoz_latency_bucket_norm;
+
+ const { data, isLoading, error } = useGetMetricMeta(
+ signozLatencyBucketMetrics,
+ servicename,
+ );
useErrorNotification(error);
if (isLoading) {
diff --git a/frontend/src/container/MetricsApplication/Tabs/Overview/ApDex/constants.ts b/frontend/src/container/MetricsApplication/Tabs/Overview/ApDex/constants.ts
deleted file mode 100644
index 91467b372fcb..000000000000
--- a/frontend/src/container/MetricsApplication/Tabs/Overview/ApDex/constants.ts
+++ /dev/null
@@ -1 +0,0 @@
-export const metricMeta = 'signoz_latency_bucket';
diff --git a/frontend/src/container/OnboardingQuestionaire/index.tsx b/frontend/src/container/OnboardingQuestionaire/index.tsx
index 905132b4bfdb..57832e28c2c5 100644
--- a/frontend/src/container/OnboardingQuestionaire/index.tsx
+++ b/frontend/src/container/OnboardingQuestionaire/index.tsx
@@ -254,7 +254,7 @@ function OnboardingQuestionaire(): JSX.Element {
setCurrentStep(2);
}}
onNext={handleUpdateProfile}
- onWillDoLater={(): void => setCurrentStep(4)}
+ onWillDoLater={handleUpdateProfile}
/>
)}
diff --git a/frontend/src/container/OnboardingV2Container/AddDataSource/AddDataSource.tsx b/frontend/src/container/OnboardingV2Container/AddDataSource/AddDataSource.tsx
index 55f368f977ed..f7ed864621c3 100644
--- 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);
}
diff --git a/frontend/src/container/OnboardingV2Container/onboarding-configs/onboarding-config-with-links.json b/frontend/src/container/OnboardingV2Container/onboarding-configs/onboarding-config-with-links.json
index af4c43c0d8a7..59facfca98a7 100644
--- 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",
diff --git a/frontend/src/container/PipelinePage/PipelineListsView/AddNewProcessor/FormFields/JsonFlattening.styles.scss b/frontend/src/container/PipelinePage/PipelineListsView/AddNewProcessor/FormFields/JsonFlattening.styles.scss
new file mode 100644
index 000000000000..546b6d95eab6
--- /dev/null
+++ b/frontend/src/container/PipelinePage/PipelineListsView/AddNewProcessor/FormFields/JsonFlattening.styles.scss
@@ -0,0 +1,6 @@
+.json-flattening-form {
+ margin-top: 16px;
+ &__item {
+ margin-bottom: 12px;
+ }
+}
diff --git a/frontend/src/container/PipelinePage/PipelineListsView/AddNewProcessor/FormFields/JsonFlattening.tsx b/frontend/src/container/PipelinePage/PipelineListsView/AddNewProcessor/FormFields/JsonFlattening.tsx
new file mode 100644
index 000000000000..cfdc16fe4362
--- /dev/null
+++ b/frontend/src/container/PipelinePage/PipelineListsView/AddNewProcessor/FormFields/JsonFlattening.tsx
@@ -0,0 +1,110 @@
+import './JsonFlattening.styles.scss';
+
+import { InfoCircleOutlined } from '@ant-design/icons';
+import { Form, Input, Space, Switch, Tooltip } from 'antd';
+import { useEffect, useState } from 'react';
+import { ProcessorData } from 'types/api/pipeline/def';
+
+import { PREDEFINED_MAPPING } from '../config';
+import KeyValueList from './KeyValueList';
+
+interface JsonFlatteningProps {
+ selectedProcessorData?: ProcessorData;
+ isAdd: boolean;
+}
+
+function JsonFlattening({
+ selectedProcessorData,
+ isAdd,
+}: JsonFlatteningProps): JSX.Element | null {
+ const form = Form.useFormInstance();
+ const mappingValue = selectedProcessorData?.mapping || {};
+ const enableFlattening = Form.useWatch('enable_flattening', form);
+ const enablePaths = Form.useWatch('enable_paths', form);
+
+ const [enableMapping, setEnableMapping] = useState(
+ !!mappingValue && Object.keys(mappingValue).length > 0,
+ );
+
+ const selectedMapping = selectedProcessorData?.mapping;
+ useEffect(() => {
+ if (!enableMapping) {
+ form.setFieldsValue({ mapping: undefined });
+ } else if (form.getFieldValue('mapping') === undefined) {
+ form.setFieldsValue({
+ mapping: selectedMapping || PREDEFINED_MAPPING,
+ });
+ }
+ }, [enableMapping, form, selectedMapping]);
+
+ const handleEnableMappingChange = (checked: boolean): void => {
+ setEnableMapping(checked);
+ };
+
+ const handleEnablePathsChange = (checked: boolean): void => {
+ form.setFieldValue('enable_paths', checked);
+ };
+
+ if (!enableFlattening) {
+ return null;
+ }
+
+ return (
+ ;
+ onChange?: (value: Record) => void;
+}
+
+function KeyValueList({
+ value = PREDEFINED_MAPPING,
+ onChange,
+}: KeyValueListProps): JSX.Element {
+ const handleValueChange = (key: string, newValue: string[]): void => {
+ const newMapping = {
+ ...value,
+ [key]: newValue,
+ };
+ if (onChange) {
+ onChange(newMapping);
+ }
+ };
+
+ return (
+
- {fieldData.fieldName}}
- name={fieldData.name}
- initialValue={fieldData.initialValue}
- rules={fieldData.rules ? fieldData.rules : formValidationRules}
- dependencies={fieldData.dependencies || []}
- >
- {inputField}
-
+ {fieldData.name === 'enable_flattening' ? (
+
+
+ {
+ form.setFieldValue('enable_flattening', checked);
+ }}
+ />
+ {fieldData.fieldName}
+
+
+ ) : (
+ {fieldData.fieldName}}
+ name={fieldData.name}
+ initialValue={fieldData.initialValue}
+ rules={fieldData.rules ? fieldData.rules : formValidationRules}
+ dependencies={fieldData.dependencies || []}
+ >
+ {inputField}
+
+ )}
+ {fieldData.name === 'enable_flattening' && inputField}
);
}
+ProcessorFieldInput.defaultProps = {
+ selectedProcessorData: undefined,
+};
+
interface ProcessorFieldInputProps {
fieldData: ProcessorFormField;
+ selectedProcessorData?: ProcessorData;
+ isAdd: boolean;
}
-function ProcessorForm({ processorType }: ProcessorFormProps): JSX.Element {
+function ProcessorForm({
+ processorType,
+ selectedProcessorData,
+ isAdd,
+}: ProcessorFormProps): JSX.Element {
return (
} = {
name: 'parse_to',
initialValue: 'attributes',
},
+ {
+ id: 4,
+ fieldName: 'Enable Flattening',
+ placeholder: '',
+ name: 'enable_flattening',
+ initialValue: false,
+ },
],
regex_parser: [
{
@@ -458,3 +465,14 @@ export const processorFields: { [key: string]: Array } = {
},
],
};
+
+export const PREDEFINED_MAPPING = {
+ environment: ['service.env', 'environment', 'env'],
+ host: ['host', 'hostname', 'host.name'],
+ message: ['message', 'msg', 'log'],
+ service: ['service', 'appname'],
+ severity: ['status', 'severity', 'level'],
+ span_id: ['span_id', 'span.id'],
+ trace_flags: ['flags'],
+ trace_id: ['trace_id', 'trace.id'],
+};
diff --git a/frontend/src/container/PipelinePage/PipelineListsView/AddNewProcessor/index.tsx b/frontend/src/container/PipelinePage/PipelineListsView/AddNewProcessor/index.tsx
index 661fc4043ae9..7d9edbc48bec 100644
--- a/frontend/src/container/PipelinePage/PipelineListsView/AddNewProcessor/index.tsx
+++ b/frontend/src/container/PipelinePage/PipelineListsView/AddNewProcessor/index.tsx
@@ -160,6 +160,7 @@ function AddNewProcessor({
width={800}
footer={null}
onCancel={onCancelModal}
+ destroyOnClose
>
+
+
+
+
+ 3
+
+
+
+
+
+
diff --git a/frontend/src/container/PipelinePage/tests/__snapshots__/PipelinePageLayout.test.tsx.snap b/frontend/src/container/PipelinePage/tests/__snapshots__/PipelinePageLayout.test.tsx.snap
index 1261f7282c83..de2cf63c5f4a 100644
--- a/frontend/src/container/PipelinePage/tests/__snapshots__/PipelinePageLayout.test.tsx.snap
+++ b/frontend/src/container/PipelinePage/tests/__snapshots__/PipelinePageLayout.test.tsx.snap
@@ -118,7 +118,7 @@ exports[`PipelinePage container test should render PipelinePageLayout section 1`
learn_moreÂ
here
diff --git a/frontend/src/container/SideNav/SideNav.styles.scss b/frontend/src/container/SideNav/SideNav.styles.scss
index aad45823f9db..6a1ad75ff6a0 100644
--- a/frontend/src/container/SideNav/SideNav.styles.scss
+++ b/frontend/src/container/SideNav/SideNav.styles.scss
@@ -133,12 +133,6 @@
margin-right: 4px;
}
- &.cloud-user {
- .version {
- cursor: default;
- }
- }
-
&.version-update-notification {
.license-type {
background: var(--bg-robin-500);
@@ -829,6 +823,20 @@
}
}
+.nav-item-label-container {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+
+ & span {
+ display: block;
+ max-width: 170px;
+ white-space: nowrap; /* Prevents line breaks */
+ overflow: hidden; /* Hides overflowing content */
+ text-overflow: ellipsis;
+ }
+}
+
.nav-dropdown-overlay {
.ant-dropdown-menu {
margin-left: 8px !important;
diff --git a/frontend/src/container/SideNav/SideNav.tsx b/frontend/src/container/SideNav/SideNav.tsx
index 27f653d59cdd..5fcbe51e6be5 100644
--- a/frontend/src/container/SideNav/SideNav.tsx
+++ b/frontend/src/container/SideNav/SideNav.tsx
@@ -23,7 +23,6 @@ import logEvent from 'api/common/logEvent';
import { Logout } from 'api/utils';
import updateUserPreference from 'api/v1/user/preferences/name/update';
import cx from 'classnames';
-import ChangelogModal from 'components/ChangelogModal/ChangelogModal';
import { FeatureKeys } from 'constants/features';
import ROUTES from 'constants/routes';
import { GlobalShortcuts } from 'constants/shortcuts/globalShortcuts';
@@ -35,16 +34,20 @@ import { useNotifications } from 'hooks/useNotifications';
import history from 'lib/history';
import { isArray } from 'lodash-es';
import {
+ ArrowUpRight,
Check,
ChevronDown,
ChevronsDown,
ChevronUp,
Cog,
Ellipsis,
+ GitCommitVertical,
GripVertical,
+ LampDesk,
Logs,
MousePointerClick,
PackagePlus,
+ ScrollText,
X,
} from 'lucide-react';
import { useAppContext } from 'providers/App/App';
@@ -74,7 +77,11 @@ import {
primaryMenuItems,
} from './menuItems';
import NavItem from './NavItem/NavItem';
-import { SidebarItem } from './sideNav.types';
+import {
+ CHANGELOG_LABEL,
+ DropdownSeparator,
+ SidebarItem,
+} from './sideNav.types';
import { getActiveMenuKeyFromPath } from './sideNav.utils';
function SortableFilter({ item }: { item: SidebarItem }): JSX.Element {
@@ -126,6 +133,7 @@ function SideNav({ isPinned }: { isPinned: boolean }): JSX.Element {
isLoggedIn,
userPreferences,
changelog,
+ toggleChangelogModal,
updateUserPreferenceInContext,
} = useAppContext();
@@ -143,7 +151,9 @@ function SideNav({ isPinned }: { isPinned: boolean }): JSX.Element {
const [
helpSupportDropdownMenuItems,
setHelpSupportDropdownMenuItems,
- ] = useState
-
- )}
-
{!isWelcomeChecklistSkipped && !loadingUserPreferences && (
-
- We'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{' '}
-
- here
-
- .
-
- }
- type="warning"
- showIcon
- />
-
- Ingestion URL
diff --git a/frontend/src/container/Licenses/ApplyLicenseForm.tsx b/frontend/src/container/Licenses/ApplyLicenseForm.tsx
index 38d774f549f6..48e2b454fb7e 100644
--- 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';
diff --git a/frontend/src/container/LogDetailedView/BodyTitleRenderer.styles.ts b/frontend/src/container/LogDetailedView/BodyTitleRenderer.styles.ts
index f5d157ee2e54..1f7502b92555 100644
--- a/frontend/src/container/LogDetailedView/BodyTitleRenderer.styles.ts
+++ b/frontend/src/container/LogDetailedView/BodyTitleRenderer.styles.ts
@@ -1,6 +1,9 @@
import styled from 'styled-components';
export const TitleWrapper = styled.span`
+ user-select: text !important;
+ cursor: text;
+
.hover-reveal {
visibility: hidden;
}
diff --git a/frontend/src/container/LogDetailedView/BodyTitleRenderer.tsx b/frontend/src/container/LogDetailedView/BodyTitleRenderer.tsx
index 856c2b01dc28..8eb1b9aa8c61 100644
--- a/frontend/src/container/LogDetailedView/BodyTitleRenderer.tsx
+++ b/frontend/src/container/LogDetailedView/BodyTitleRenderer.tsx
@@ -71,8 +71,13 @@ function BodyTitleRenderer({
onClick: onClickHandler,
};
+ const handleTextSelection = (e: React.MouseEvent): void => {
+ // Prevent tree node click when user is trying to select text
+ e.stopPropagation();
+ };
+
return (
-
+
+
+
+
+
+ {enablePaths && (
+
+
+
+ )}
+
+
+
+
+
+
+
+
+ {enableMapping && (
+
+
+ )}
+
+ );
+}
+
+JsonFlattening.defaultProps = {
+ selectedProcessorData: undefined,
+};
+
+export default JsonFlattening;
diff --git a/frontend/src/container/PipelinePage/PipelineListsView/AddNewProcessor/FormFields/KeyValueList.tsx b/frontend/src/container/PipelinePage/PipelineListsView/AddNewProcessor/FormFields/KeyValueList.tsx
new file mode 100644
index 000000000000..b8a4c952ed1c
--- /dev/null
+++ b/frontend/src/container/PipelinePage/PipelineListsView/AddNewProcessor/FormFields/KeyValueList.tsx
@@ -0,0 +1,47 @@
+import { Form, Select } from 'antd';
+
+import { PREDEFINED_MAPPING } from '../config';
+
+interface KeyValueListProps {
+ value?: Record
+ {Object.keys(value).map((key) => (
+
+
+ ))}
+
+ );
+}
+
+KeyValueList.defaultProps = {
+ value: PREDEFINED_MAPPING,
+ onChange: (): void => {},
+};
+
+export default KeyValueList;
diff --git a/frontend/src/container/PipelinePage/PipelineListsView/AddNewProcessor/ProcessorForm.tsx b/frontend/src/container/PipelinePage/PipelineListsView/AddNewProcessor/ProcessorForm.tsx
index 1d3b12e2c0c5..fbe0f98c5676 100644
--- a/frontend/src/container/PipelinePage/PipelineListsView/AddNewProcessor/ProcessorForm.tsx
+++ b/frontend/src/container/PipelinePage/PipelineListsView/AddNewProcessor/ProcessorForm.tsx
@@ -1,16 +1,21 @@
import './styles.scss';
-import { Form, Input, Select } from 'antd';
+import { Form, Input, Select, Space, Switch } from 'antd';
import { ModalFooterTitle } from 'container/PipelinePage/styles';
import { useTranslation } from 'react-i18next';
+import { ProcessorData } from 'types/api/pipeline/def';
import { formValidationRules } from '../config';
import { processorFields, ProcessorFormField } from './config';
import CSVInput from './FormFields/CSVInput';
+import JsonFlattening from './FormFields/JsonFlattening';
import { FormWrapper, PipelineIndexIcon, StyledSelect } from './styles';
+// eslint-disable-next-line sonarjs/cognitive-complexity
function ProcessorFieldInput({
fieldData,
+ selectedProcessorData,
+ isAdd,
}: ProcessorFieldInputProps): JSX.Element | null {
const { t } = useTranslation('pipeline');
@@ -50,6 +55,13 @@ function ProcessorFieldInput({
);
} else if (Array.isArray(fieldData?.initialValue)) {
inputField =
{processorFields[processorType]?.map((fieldData: ProcessorFormField) => (
);
}
+ProcessorForm.defaultProps = {
+ selectedProcessorData: undefined,
+};
+
interface ProcessorFormProps {
processorType: string;
+ selectedProcessorData?: ProcessorData;
+ isAdd: boolean;
}
export default ProcessorForm;
diff --git a/frontend/src/container/PipelinePage/PipelineListsView/AddNewProcessor/config.ts b/frontend/src/container/PipelinePage/PipelineListsView/AddNewProcessor/config.ts
index 2c9a67689849..4205de722e4f 100644
--- a/frontend/src/container/PipelinePage/PipelineListsView/AddNewProcessor/config.ts
+++ b/frontend/src/container/PipelinePage/PipelineListsView/AddNewProcessor/config.ts
@@ -136,6 +136,13 @@ export const processorFields: { [key: string]: Array
+ json parser
+
+
+ {feature.title}
+
+ ),
+ icon: idx === 0 ?
+ {CHANGELOG_LABEL}
+
+ ),
+ icon:
+ {CHANGELOG_LABEL}
+
+ ),
+ icon:
·
-
)}
@@ -215,6 +225,27 @@ export function SpanDuration({
setHasActionButtons(false);
};
+ // Calculate text positioning to handle overflow cases
+ const textStyle = useMemo(() => {
+ const spanRightEdge = leftOffset + width;
+ const textWidthApprox = 8; // Approximate text width in percentage
+
+ // If span would cause text overflow, right-align text to span end
+ if (leftOffset > 100 - textWidthApprox) {
+ return {
+ right: `${100 - spanRightEdge}%`,
+ color,
+ textAlign: 'right' as const,
+ };
+ }
+
+ // Default: left-align text to span start
+ return {
+ left: `${leftOffset}%`,
+ color,
+ };
+ }, [leftOffset, width, color]);
+
return (
{`${toFixed(time, 2)} ${timeUnitName}`}
@@ -311,6 +342,16 @@ function getWaterfallColumns({
/>
),
size: 450,
+ /**
+ * Note: The TanStack table currently does not support percentage-based column sizing.
+ * Therefore, we specify both `minSize` and `maxSize` for the "span-name" column to ensure
+ * that its width remains between 240px and 900px. Setting a `maxSize` here is important
+ * because the "span-duration" column has column resizing disabled, making it difficult
+ * to enforce a minimum width for that column. By constraining the "span-name" column,
+ * we indirectly control the minimum width available for the "span-duration" column.
+ */
+ minSize: 240,
+ maxSize: 900,
}),
columnDefHelper.display({
id: 'span-duration',
diff --git a/frontend/src/pages/ChannelsEdit/ChannelsEdit.styles.scss b/frontend/src/pages/ChannelsEdit/ChannelsEdit.styles.scss
index 25ed5659e7e0..c16f11449008 100644
--- 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);
+ }
+ }
+}
diff --git a/frontend/src/pages/Settings/Settings.tsx b/frontend/src/pages/Settings/Settings.tsx
index 4117e995545c..0b5252e519fc 100644
--- a/frontend/src/pages/Settings/Settings.tsx
+++ b/frontend/src/pages/Settings/Settings.tsx
@@ -110,7 +110,7 @@ function SettingsPage(): JSX.Element {
item.key === ROUTES.INTEGRATIONS ||
item.key === ROUTES.API_KEYS ||
item.key === ROUTES.ORG_SETTINGS ||
- item.key === ROUTES.SHORTCUTS
+ item.key === ROUTES.INGESTION_SETTINGS
? true
: item.isEnabled,
}));
@@ -120,7 +120,11 @@ function SettingsPage(): JSX.Element {
// eslint-disable-next-line sonarjs/no-identical-functions
updatedItems = updatedItems.map((item) => ({
...item,
- isEnabled: item.key === ROUTES.INTEGRATIONS ? true : item.isEnabled,
+ isEnabled:
+ item.key === ROUTES.INTEGRATIONS ||
+ item.key === ROUTES.INGESTION_SETTINGS
+ ? true
+ : item.isEnabled,
}));
}
}
@@ -130,9 +134,7 @@ function SettingsPage(): JSX.Element {
updatedItems = updatedItems.map((item) => ({
...item,
isEnabled:
- item.key === ROUTES.API_KEYS ||
- item.key === ROUTES.ORG_SETTINGS ||
- item.key === ROUTES.SHORTCUTS
+ item.key === ROUTES.API_KEYS || item.key === ROUTES.ORG_SETTINGS
? true
: item.isEnabled,
}));
diff --git a/frontend/src/pages/TracesFunnelDetails/components/FunnelConfiguration/FunnelConfiguration.tsx b/frontend/src/pages/TracesFunnelDetails/components/FunnelConfiguration/FunnelConfiguration.tsx
index 799e53dda786..824de35b03ae 100644
--- 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({
+