diff --git a/cmd/defaults.yaml b/cmd/defaults.yaml
index 45d598ee86..0f56ddb8ba 100644
--- a/cmd/defaults.yaml
+++ b/cmd/defaults.yaml
@@ -25,6 +25,18 @@ Tracing:
# The endpoint of the otel collector endpoint
Endpoint: "" #ZITADEL_TRACING_ENDPOINT
+# Profiler enables capturing profiling data (CPU, Memory, ...) for performance analysis
+Profiler:
+ # Choose one of "google" and "none"
+ # Depending on the type there are different configuration options
+ # for type 'google'
+ # ProjectID: google-project-id
+ #
+ # type 'none' or '' disables profiling
+ Type: none # ZITADEL_PROFILER_TYPE
+ # projectID for google
+ ProjectID: '' # ZITADEL_PROFILER_PROJECTID
+
Telemetry:
# As long as Enabled is true, ZITADEL tries to send usage data to the configured Telemetry.Endpoints.
# Data is projected by ZITADEL even if Enabled is false.
diff --git a/cmd/start/config.go b/cmd/start/config.go
index 71175024e6..1e36d3310a 100644
--- a/cmd/start/config.go
+++ b/cmd/start/config.go
@@ -31,6 +31,7 @@ import (
"github.com/zitadel/zitadel/internal/query/projection"
static_config "github.com/zitadel/zitadel/internal/static/config"
metrics "github.com/zitadel/zitadel/internal/telemetry/metrics/config"
+ profiler "github.com/zitadel/zitadel/internal/telemetry/profiler/config"
tracing "github.com/zitadel/zitadel/internal/telemetry/tracing/config"
)
@@ -49,6 +50,7 @@ type Config struct {
Database database.Config
Tracing tracing.Config
Metrics metrics.Config
+ Profiler profiler.Config
Projections projection.Config
Auth auth_es.Config
Admin admin_es.Config
@@ -114,6 +116,9 @@ func MustNewConfig(v *viper.Viper) *Config {
err = config.Metrics.NewMeter()
logging.OnError(err).Fatal("unable to set meter")
+ err = config.Profiler.NewProfiler()
+ logging.OnError(err).Fatal("unable to set profiler")
+
id.Configure(config.Machine)
actions.SetHTTPConfig(&config.Actions.HTTP)
diff --git a/console/src/app/pages/users/user-list/user-table/user-table.component.html b/console/src/app/pages/users/user-list/user-table/user-table.component.html
index d7bfecb8ad..cc81a4d4c0 100644
--- a/console/src/app/pages/users/user-list/user-table/user-table.component.html
+++ b/console/src/app/pages/users/user-list/user-table/user-table.component.html
@@ -57,11 +57,14 @@
-
+
+
+