From ee99433c65ee958875928e4f3d947503cdb569af Mon Sep 17 00:00:00 2001 From: Dana Axinte <53751979+dana-axinte@users.noreply.github.com> Date: Thu, 7 Aug 2025 10:41:19 +0100 Subject: [PATCH] CloudMigrations: Report on prem event with grafana version (#104515) * grafana version in on prem event report * store grafana version in cloud migration service --- .../cloudmigrationimpl/cloudmigration.go | 11 ++++++++--- pkg/services/cloudmigration/gmsclient/dtos.go | 1 + 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/pkg/services/cloudmigration/cloudmigrationimpl/cloudmigration.go b/pkg/services/cloudmigration/cloudmigrationimpl/cloudmigration.go index 163fcfbcb1b..1dadac3bcb9 100644 --- a/pkg/services/cloudmigration/cloudmigrationimpl/cloudmigration.go +++ b/pkg/services/cloudmigration/cloudmigrationimpl/cloudmigration.go @@ -81,6 +81,8 @@ type Service struct { api *api.CloudMigrationAPI tracer tracing.Tracer metrics *Metrics + + grafanaVersion string } var LogPrefix = "cloudmigration.service" @@ -191,6 +193,8 @@ func ProvideService( } } + s.grafanaVersion = cfg.BuildVersion + return s, nil } @@ -856,9 +860,10 @@ func (s *Service) report( } e := gmsclient.EventRequestDTO{ - Event: t, - LocalID: id, - UserUID: userUID, + Event: t, + LocalID: id, + UserUID: userUID, + GrafanaVersion: s.grafanaVersion, } if d != 0 { diff --git a/pkg/services/cloudmigration/gmsclient/dtos.go b/pkg/services/cloudmigration/gmsclient/dtos.go index 299e6a29edf..54332422fcd 100644 --- a/pkg/services/cloudmigration/gmsclient/dtos.go +++ b/pkg/services/cloudmigration/gmsclient/dtos.go @@ -51,6 +51,7 @@ type EventRequestDTO struct { Error string `json:"error"` DurationIfFinished time.Duration `json:"duration"` UserUID string `json:"userUid"` + GrafanaVersion string `json:"grafanaVersion"` } type LocalEventType string