From 3bc640a6bb8d32966a6cadc2b410094388c02bd8 Mon Sep 17 00:00:00 2001
From: "grafana-delivery-bot[bot]"
 <132647405+grafana-delivery-bot[bot]@users.noreply.github.com>
Date: Thu, 7 Aug 2025 14:33:47 +0100
Subject: [PATCH] [release-12.0.4] CloudMigrations: Report on prem event with
 grafana version (#109331)

CloudMigrations: Report on prem event with grafana version (#104515)

* grafana version in on prem event report

* store grafana version in cloud migration service

(cherry picked from commit ee99433c65ee958875928e4f3d947503cdb569af)

Co-authored-by: Dana Axinte <53751979+dana-axinte@users.noreply.github.com>
---
 .../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 a2342c9338e..1525105358b 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
 }
 
@@ -854,9 +858,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