[release-11.5.8] CloudMigrations: Report on prem event with grafana version (#109333)
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 ee99433c65)
Co-authored-by: Dana Axinte <53751979+dana-axinte@users.noreply.github.com>
This commit is contained in:
co-authored by
Dana Axinte
parent
e06e1e94e2
commit
71e1a8486f
@@ -80,6 +80,8 @@ type Service struct {
|
|||||||
api *api.CloudMigrationAPI
|
api *api.CloudMigrationAPI
|
||||||
tracer tracing.Tracer
|
tracer tracing.Tracer
|
||||||
metrics *Metrics
|
metrics *Metrics
|
||||||
|
|
||||||
|
grafanaVersion string
|
||||||
}
|
}
|
||||||
|
|
||||||
var LogPrefix = "cloudmigration.service"
|
var LogPrefix = "cloudmigration.service"
|
||||||
@@ -196,6 +198,8 @@ func ProvideService(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
s.grafanaVersion = cfg.BuildVersion
|
||||||
|
|
||||||
return s, nil
|
return s, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -858,9 +862,10 @@ func (s *Service) report(
|
|||||||
}
|
}
|
||||||
|
|
||||||
e := gmsclient.EventRequestDTO{
|
e := gmsclient.EventRequestDTO{
|
||||||
Event: t,
|
Event: t,
|
||||||
LocalID: id,
|
LocalID: id,
|
||||||
UserUID: userUID,
|
UserUID: userUID,
|
||||||
|
GrafanaVersion: s.grafanaVersion,
|
||||||
}
|
}
|
||||||
|
|
||||||
if d != 0 {
|
if d != 0 {
|
||||||
|
|||||||
@@ -51,6 +51,7 @@ type EventRequestDTO struct {
|
|||||||
Error string `json:"error"`
|
Error string `json:"error"`
|
||||||
DurationIfFinished time.Duration `json:"duration"`
|
DurationIfFinished time.Duration `json:"duration"`
|
||||||
UserUID string `json:"userUid"`
|
UserUID string `json:"userUid"`
|
||||||
|
GrafanaVersion string `json:"grafanaVersion"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type LocalEventType string
|
type LocalEventType string
|
||||||
|
|||||||
Reference in New Issue
Block a user