From 6379064a4f1923d8545c8d3e59329dd931b2b36a Mon Sep 17 00:00:00 2001 From: Rory Crispin Date: Fri, 21 Feb 2025 17:40:28 +0000 Subject: [PATCH 1/2] Enrich conn user agent with Grafana client username --- pkg/plugin/driver.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkg/plugin/driver.go b/pkg/plugin/driver.go index 0b086353..a3369e4b 100644 --- a/pkg/plugin/driver.go +++ b/pkg/plugin/driver.go @@ -80,6 +80,7 @@ func getPDCDialContext(settings Settings) (func(context.Context, string) (net.Co func getClientInfoProducts(ctx context.Context) (products []struct{ Name, Version string }) { version := backend.UserAgentFromContext(ctx).GrafanaVersion() + user := backend.UserFromContext(ctx) if version != "" { products = append(products, struct{ Name, Version string }{ @@ -88,6 +89,13 @@ func getClientInfoProducts(ctx context.Context) (products []struct{ Name, Versio }) } + if user != nil { + products = append(products, struct{ Name, Version string }{ + Name: "grafana_user", + Version: user.Login, + }) + } + if info, err := build.GetBuildInfo(); err == nil { products = append(products, struct{ Name, Version string }{ Name: "clickhouse-datasource", @@ -187,6 +195,7 @@ func (h *Clickhouse) Connect(ctx context.Context, config backend.DataSourceInsta Username: settings.Username, }, ClientInfo: clickhouse.ClientInfo{ + User: getClientInfoUser(ctx), Products: getClientInfoProducts(ctx), }, Compression: &clickhouse.Compression{ From 32a332e719d109e59d834a490cb7ddf5f3943a30 Mon Sep 17 00:00:00 2001 From: Rory Crispin Date: Fri, 21 Feb 2025 17:44:54 +0000 Subject: [PATCH 2/2] Update driver.go --- pkg/plugin/driver.go | 1 - 1 file changed, 1 deletion(-) diff --git a/pkg/plugin/driver.go b/pkg/plugin/driver.go index a3369e4b..9c3df0f4 100644 --- a/pkg/plugin/driver.go +++ b/pkg/plugin/driver.go @@ -195,7 +195,6 @@ func (h *Clickhouse) Connect(ctx context.Context, config backend.DataSourceInsta Username: settings.Username, }, ClientInfo: clickhouse.ClientInfo{ - User: getClientInfoUser(ctx), Products: getClientInfoProducts(ctx), }, Compression: &clickhouse.Compression{