From 38927f071938dd159e9f19cd4fdf5604347f4e3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Philippe=20Qu=C3=A9m=C3=A9ner?= Date: Wed, 15 Jan 2025 16:01:31 +0100 Subject: [PATCH] fix(indexer): reduce cardinality of indexer metric (#99018) --- pkg/storage/unified/resource/bleve_index_metrics.go | 2 +- pkg/storage/unified/search/bleve.go | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkg/storage/unified/resource/bleve_index_metrics.go b/pkg/storage/unified/resource/bleve_index_metrics.go index c6a96e5dd6d..caa0499bcb8 100644 --- a/pkg/storage/unified/resource/bleve_index_metrics.go +++ b/pkg/storage/unified/resource/bleve_index_metrics.go @@ -72,7 +72,7 @@ func NewIndexMetrics(indexDir string, searchBackend SearchBackend) *BleveIndexMe Namespace: "index_server", Name: "index_tenants", Help: "Number of tenants in the index", - }, []string{"namespace", "index_storage"}), // index_storage is either "file" or "memory" + }, []string{"index_storage"}), // index_storage is either "file" or "memory" } }) diff --git a/pkg/storage/unified/search/bleve.go b/pkg/storage/unified/search/bleve.go index edbe93b7312..916593eeb01 100644 --- a/pkg/storage/unified/search/bleve.go +++ b/pkg/storage/unified/search/bleve.go @@ -18,6 +18,7 @@ import ( "k8s.io/apimachinery/pkg/selection" "github.com/grafana/authlib/authz" + "github.com/grafana/grafana/pkg/storage/unified/resource" ) @@ -138,10 +139,10 @@ func (b *bleveBackend) BuildIndex(ctx context.Context, index, err = bleve.New(dir, mapper) } - resource.IndexMetrics.IndexTenants.WithLabelValues(key.Namespace, "file").Inc() + resource.IndexMetrics.IndexTenants.WithLabelValues("file").Inc() } else { index, err = bleve.NewMemOnly(mapper) - resource.IndexMetrics.IndexTenants.WithLabelValues(key.Namespace, "memory").Inc() + resource.IndexMetrics.IndexTenants.WithLabelValues("memory").Inc() } if err != nil { return nil, err