From feb7b38fba1f8d694395efa803c742d2678eab7e Mon Sep 17 00:00:00 2001
From: Todd Treece <360020+toddtreece@users.noreply.github.com>
Date: Fri, 22 Dec 2023 06:02:52 -0500
Subject: [PATCH] Metrics: Add commit & version to grafana_environment_info
 (#79823)

---
 pkg/setting/setting.go | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go
index 63aed72c8e6..ed27c66ebb5 100644
--- a/pkg/setting/setting.go
+++ b/pkg/setting/setting.go
@@ -677,6 +677,13 @@ func (cfg *Cfg) readGrafanaEnvironmentMetrics() error {
 	keys := environmentMetricsSection.Keys()
 	cfg.MetricsGrafanaEnvironmentInfo = make(map[string]string, len(keys))
 
+	cfg.MetricsGrafanaEnvironmentInfo["version"] = cfg.BuildVersion
+	cfg.MetricsGrafanaEnvironmentInfo["commit"] = cfg.BuildCommit
+
+	if cfg.EnterpriseBuildCommit != "NA" && cfg.EnterpriseBuildCommit != "" {
+		cfg.MetricsGrafanaEnvironmentInfo["enterprise_commit"] = cfg.EnterpriseBuildCommit
+	}
+
 	for _, key := range keys {
 		labelName := model.LabelName(key.Name())
 		labelValue := model.LabelValue(key.Value())