From 9276f1138838c137e33b163a57d50941a9b52a0b Mon Sep 17 00:00:00 2001 From: Dan Cech Date: Tue, 7 Mar 2023 09:24:04 -0500 Subject: [PATCH] Chore: Add stat for remote cache config (#64276) * add stat for remote cache config --- pkg/infra/usagestats/statscollector/service.go | 3 +++ pkg/infra/usagestats/statscollector/service_test.go | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/pkg/infra/usagestats/statscollector/service.go b/pkg/infra/usagestats/statscollector/service.go index feaf31bdd81..b14e1242374 100644 --- a/pkg/infra/usagestats/statscollector/service.go +++ b/pkg/infra/usagestats/statscollector/service.go @@ -173,6 +173,9 @@ func (s *Service) collectSystemStats(ctx context.Context) (map[string]interface{ } m["stats.avg_auth_token_per_user.count"] = avgAuthTokensPerUser + if s.cfg.RemoteCacheOptions != nil && s.cfg.RemoteCacheOptions.Name != "" { + m["stats.remote_cache."+s.cfg.RemoteCacheOptions.Name+".count"] = 1 + } m["stats.packaging."+s.cfg.Packaging+".count"] = 1 m["stats.distributor."+s.cfg.ReportingDistributor+".count"] = 1 diff --git a/pkg/infra/usagestats/statscollector/service_test.go b/pkg/infra/usagestats/statscollector/service_test.go index 3d35e591ee3..7f298de52e9 100644 --- a/pkg/infra/usagestats/statscollector/service_test.go +++ b/pkg/infra/usagestats/statscollector/service_test.go @@ -152,6 +152,9 @@ func TestCollectingUsageStats(t *testing.T) { AuthProxyEnabled: true, Packaging: "deb", ReportingDistributor: "hosted-grafana", + RemoteCacheOptions: &setting.RemoteCacheOptions{ + Name: "database", + }, }, sqlStore, statsService, withDatasources(mockDatasourceService{datasources: expectedDataSources})) @@ -179,6 +182,7 @@ func TestCollectingUsageStats(t *testing.T) { assert.EqualValues(t, 11, metrics["stats.data_keys.count"]) assert.EqualValues(t, 3, metrics["stats.active_data_keys.count"]) assert.EqualValues(t, 5, metrics["stats.public_dashboards.count"]) + assert.EqualValues(t, 1, metrics["stats.remote_cache.database.count"]) assert.InDelta(t, int64(65), metrics["stats.uptime"], 6) }