From 3c8cea0764af887649bc13da33163f5659b34ff1 Mon Sep 17 00:00:00 2001 From: Carl Bergquist Date: Tue, 3 Oct 2023 12:25:01 +0200 Subject: [PATCH] instrumentation: rename team to grafana_team to improve alert routing. (#75860) Signed-off-by: bergquist --- pkg/middleware/request_metadata_test.go | 2 +- pkg/middleware/request_metrics.go | 2 +- pkg/middleware/requestmeta/request_metadata.go | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/middleware/request_metadata_test.go b/pkg/middleware/request_metadata_test.go index 64cc37aec79..3acbc831107 100644 --- a/pkg/middleware/request_metadata_test.go +++ b/pkg/middleware/request_metadata_test.go @@ -16,7 +16,7 @@ func TestRequestMetaDefault(t *testing.T) { m.Get("/", func(rw http.ResponseWriter, req *http.Request) { v := requestmeta.GetRequestMetaData(req.Context()) - assert.Equal(t, requestmeta.TeamCore, v.Team) + assert.Equal(t, requestmeta.TeamBackend, v.Team) }) req, _ := http.NewRequest(http.MethodGet, "/", nil) diff --git a/pkg/middleware/request_metrics.go b/pkg/middleware/request_metrics.go index aed6d250751..56af07206cb 100644 --- a/pkg/middleware/request_metrics.go +++ b/pkg/middleware/request_metrics.go @@ -42,7 +42,7 @@ func RequestMetrics(features featuremgmt.FeatureToggles, cfg *setting.Cfg, promR } if cfg.MetricsIncludeTeamLabel { - histogramLabels = append(histogramLabels, "team") + histogramLabels = append(histogramLabels, "grafana_team") } if features.IsEnabled(featuremgmt.FlagHttpSLOLevels) { diff --git a/pkg/middleware/requestmeta/request_metadata.go b/pkg/middleware/requestmeta/request_metadata.go index e309483eb12..3e1fd160d6b 100644 --- a/pkg/middleware/requestmeta/request_metadata.go +++ b/pkg/middleware/requestmeta/request_metadata.go @@ -10,7 +10,7 @@ import ( const ( TeamAlerting = "alerting" TeamAuth = "auth" - TeamCore = "core" + TeamBackend = "backend" ) type StatusSource string @@ -119,7 +119,7 @@ func WithStatusSource(ctx context.Context, statusCode int) { func defaultRequestMetadata() RequestMetaData { return RequestMetaData{ - Team: TeamCore, + Team: TeamBackend, StatusSource: StatusSourceServer, SLOGroup: SLOGroupHighFast, }