Skip to content

fix(compactor): correct misleading help text for cortex_compactor_garbage_collected_blocks_total #7673

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Goutham-Annem wants to merge 1 commit into
base: master
Choose a base branch
from
+3 −2
Open

fix(compactor): correct misleading help text for cortex_compactor_garbage_collected_blocks_total #7673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
* [ENHANCEMENT] Ring: Cache `ShuffleShardWithLookback` subrings. The cached entry is invalidated on topology change or once `now` reaches the earliest `RegisteredTimestamp + lookbackPeriod` of any included instance. #7628
* [ENHANCEMENT] Query Frontend: Rename `time_taken` field to `time_taken_ms` and make it return millisecond count. #7649
* [ENHANCEMENT] Update prometheus alertmanager version to v0.33.0. #7647
* [BUGFIX] Compactor: Correct misleading help text for `cortex_compactor_garbage_collected_blocks_total` metric; it counted blocks garbage collected by the syncer, not all blocks marked for deletion. #3610
* [BUGFIX] Querier: Fix queryWithRetry and labelsWithRetry returning (nil, nil) on cancelled context by propagating ctx.Err(). #7370
* [BUGFIX] Metrics Helper: Fix non-deterministic bucket order in merged histograms by sorting buckets after map iteration, matching Prometheus client library behavior. #7380
* [BUGFIX] Distributor: Return HTTP 401 Unauthorized when tenant ID resolution fails in the Prometheus Remote Write 2.0 path. #7389
Expand Down
2 changes: 1 addition & 1 deletion pkg/compactor/compactor_metrics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ func newCompactorMetricsWithLabels(reg prometheus.Registerer, commonLabels []str
// Copied from Thanos, pkg/compact/compact.go.
m.syncerGarbageCollectedBlocks = promauto.With(reg).NewCounterVec(prometheus.CounterOpts{
Name: "cortex_compactor_garbage_collected_blocks_total",
Help: "Total number of blocks marked for deletion by compactor.",
Help: "Total number of blocks garbage collected (deleted after being marked) by the compactor syncer.",
}, nil)
m.syncerGarbageCollections = promauto.With(reg).NewCounterVec(prometheus.CounterOpts{
Name: "cortex_compactor_garbage_collection_total",
Expand Down
2 changes: 1 addition & 1 deletion pkg/compactor/compactor_metrics_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ func TestCompactorMetrics(t *testing.T) {
cortex_compactor_blocks_marked_for_deletion_total{reason="compaction",user="aaa"} 144430
cortex_compactor_blocks_marked_for_deletion_total{reason="compaction",user="bbb"} 155540
cortex_compactor_blocks_marked_for_deletion_total{reason="compaction",user="ccc"} 166650
# HELP cortex_compactor_garbage_collected_blocks_total Total number of blocks marked for deletion by compactor.
# HELP cortex_compactor_garbage_collected_blocks_total Total number of blocks garbage collected (deleted after being marked) by the compactor syncer.
# TYPE cortex_compactor_garbage_collected_blocks_total counter
cortex_compactor_garbage_collected_blocks_total 99990
# HELP cortex_compactor_garbage_collection_duration_seconds Time it took to perform garbage collection iteration.
Expand Down