From 97f0f20aad2d18ebc318f0f6dc763331a23c09d6 Mon Sep 17 00:00:00 2001 From: alanprot Date: Tue, 14 May 2024 15:25:31 -0700 Subject: [PATCH 1/2] Fix cortex_ingester_tsdb_head_samples_appended_total metric dimentions Signed-off-by: alanprot --- pkg/ingester/metrics.go | 2 +- pkg/ingester/metrics_test.go | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/ingester/metrics.go b/pkg/ingester/metrics.go index ac06433bd3..5e4bff2889 100644 --- a/pkg/ingester/metrics.go +++ b/pkg/ingester/metrics.go @@ -460,7 +460,7 @@ func newTSDBMetrics(r prometheus.Registerer) *tsdbMetrics { tsdbSamplesAppended: prometheus.NewDesc( "cortex_ingester_tsdb_head_samples_appended_total", "Total number of appended samples.", - []string{"type", "user"}, nil), + []string{"user", "type"}, nil), tsdbOutOfOrderSamplesAppended: prometheus.NewDesc( "cortex_ingester_tsdb_head_out_of_order_samples_appended_total", "Total number of appended out of order samples.", diff --git a/pkg/ingester/metrics_test.go b/pkg/ingester/metrics_test.go index 94f6746f39..b0f40a5c52 100644 --- a/pkg/ingester/metrics_test.go +++ b/pkg/ingester/metrics_test.go @@ -252,9 +252,9 @@ func TestTSDBMetrics(t *testing.T) { cortex_ingester_tsdb_head_out_of_order_samples_appended_total{user="user3"} 102 # HELP cortex_ingester_tsdb_head_samples_appended_total Total number of appended samples. # TYPE cortex_ingester_tsdb_head_samples_appended_total counter - cortex_ingester_tsdb_head_samples_appended_total{type="user1",user="float"} 101 - cortex_ingester_tsdb_head_samples_appended_total{type="user2",user="float"} 101 - cortex_ingester_tsdb_head_samples_appended_total{type="user3",user="float"} 101 + cortex_ingester_tsdb_head_samples_appended_total{type="float",user="user1"} 101 + cortex_ingester_tsdb_head_samples_appended_total{type="float",user="user2"} 101 + cortex_ingester_tsdb_head_samples_appended_total{type="float",user="user3"} 101 # HELP cortex_ingester_tsdb_checkpoint_deletions_failed_total Total number of TSDB checkpoint deletions that failed. # TYPE cortex_ingester_tsdb_checkpoint_deletions_failed_total counter cortex_ingester_tsdb_checkpoint_deletions_failed_total 1586096 @@ -496,8 +496,8 @@ func TestTSDBMetricsWithRemoval(t *testing.T) { cortex_ingester_tsdb_head_out_of_order_samples_appended_total{user="user2"} 102 # HELP cortex_ingester_tsdb_head_samples_appended_total Total number of appended samples. # TYPE cortex_ingester_tsdb_head_samples_appended_total counter - cortex_ingester_tsdb_head_samples_appended_total{type="user1",user="float"} 101 - cortex_ingester_tsdb_head_samples_appended_total{type="user2",user="float"} 101 + cortex_ingester_tsdb_head_samples_appended_total{type="float",user="user1"} 101 + cortex_ingester_tsdb_head_samples_appended_total{type="float",user="user2"} 101 # HELP cortex_ingester_tsdb_checkpoint_deletions_failed_total Total number of TSDB checkpoint deletions that failed. # TYPE cortex_ingester_tsdb_checkpoint_deletions_failed_total counter From 125e1c4c5f2c08567a88d547c6d16ad5553f0b06 Mon Sep 17 00:00:00 2001 From: alanprot Date: Tue, 14 May 2024 15:27:49 -0700 Subject: [PATCH 2/2] changelog Signed-off-by: alanprot --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c724e00d72..f357319ce7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ * [ENHANCEMENT] KV: Etcd Added etcd.ping-without-stream-allowed parameter to disable/enable PermitWithoutStream #5933 * [CHANGE] Upgrade Dockerfile Node version from 14x to 18x. #5906 * [BUGFIX] Configsdb: Fix endline issue in db password. #5920 +* [BUGFIX] Ingester: Fix `user` and `type` labels for the `cortex_ingester_tsdb_head_samples_appended_total` TSDB metric. #5952 ## 1.17.0 2024-04-30