From 3bc6c670fa0dc41e540f3cb238e37e8fd0dcddab Mon Sep 17 00:00:00 2001 From: beorn7 Date: Tue, 18 Sep 2018 19:17:41 +0200 Subject: [PATCH] Revert "Remove `prometheus_` prefix from metrics" This reverts commit 98fe30438ce2f33372fda366fc8205f4b86bfc5c. After some discussion, it was concluded that we want the full `prometheus_tsdb_...` prefix hardcoded in the library. Signed-off-by: beorn7 --- compact.go | 12 ++++++------ db.go | 18 +++++++++--------- head.go | 26 +++++++++++++------------- wal.go | 4 ++-- wal/wal.go | 6 +++--- 5 files changed, 33 insertions(+), 33 deletions(-) diff --git a/compact.go b/compact.go index cffb0aca4..1b8f20fa5 100644 --- a/compact.go +++ b/compact.go @@ -84,30 +84,30 @@ func newCompactorMetrics(r prometheus.Registerer) *compactorMetrics { m := &compactorMetrics{} m.ran = prometheus.NewCounter(prometheus.CounterOpts{ - Name: "tsdb_compactions_total", + Name: "prometheus_tsdb_compactions_total", Help: "Total number of compactions that were executed for the partition.", }) m.failed = prometheus.NewCounter(prometheus.CounterOpts{ - Name: "tsdb_compactions_failed_total", + Name: "prometheus_tsdb_compactions_failed_total", Help: "Total number of compactions that failed for the partition.", }) m.duration = prometheus.NewHistogram(prometheus.HistogramOpts{ - Name: "tsdb_compaction_duration_seconds", + Name: "prometheus_tsdb_compaction_duration_seconds", Help: "Duration of compaction runs", Buckets: prometheus.ExponentialBuckets(1, 2, 10), }) m.chunkSize = prometheus.NewHistogram(prometheus.HistogramOpts{ - Name: "tsdb_compaction_chunk_size_bytes", + Name: "prometheus_tsdb_compaction_chunk_size_bytes", Help: "Final size of chunks on their first compaction", Buckets: prometheus.ExponentialBuckets(32, 1.5, 12), }) m.chunkSamples = prometheus.NewHistogram(prometheus.HistogramOpts{ - Name: "tsdb_compaction_chunk_samples", + Name: "prometheus_tsdb_compaction_chunk_samples", Help: "Final number of samples on their first compaction", Buckets: prometheus.ExponentialBuckets(4, 1.5, 12), }) m.chunkRange = prometheus.NewHistogram(prometheus.HistogramOpts{ - Name: "tsdb_compaction_chunk_range_seconds", + Name: "prometheus_tsdb_compaction_chunk_range_seconds", Help: "Final time range of chunks on their first compaction", Buckets: prometheus.ExponentialBuckets(100, 4, 10), }) diff --git a/db.go b/db.go index 2655bd199..059ef06ea 100644 --- a/db.go +++ b/db.go @@ -133,7 +133,7 @@ func newDBMetrics(db *DB, r prometheus.Registerer) *dbMetrics { m := &dbMetrics{} m.loadedBlocks = prometheus.NewGaugeFunc(prometheus.GaugeOpts{ - Name: "tsdb_blocks_loaded", + Name: "prometheus_tsdb_blocks_loaded", Help: "Number of currently loaded data blocks", }, func() float64 { db.mtx.RLock() @@ -141,7 +141,7 @@ func newDBMetrics(db *DB, r prometheus.Registerer) *dbMetrics { return float64(len(db.blocks)) }) m.symbolTableSize = prometheus.NewGaugeFunc(prometheus.GaugeOpts{ - Name: "tsdb_symbol_table_size_bytes", + Name: "prometheus_tsdb_symbol_table_size_bytes", Help: "Size of symbol table on disk (in bytes)", }, func() float64 { db.mtx.RLock() @@ -154,27 +154,27 @@ func newDBMetrics(db *DB, r prometheus.Registerer) *dbMetrics { return float64(symTblSize) }) m.reloads = prometheus.NewCounter(prometheus.CounterOpts{ - Name: "tsdb_reloads_total", + Name: "prometheus_tsdb_reloads_total", Help: "Number of times the database reloaded block data from disk.", }) m.reloadsFailed = prometheus.NewCounter(prometheus.CounterOpts{ - Name: "tsdb_reloads_failures_total", + Name: "prometheus_tsdb_reloads_failures_total", Help: "Number of times the database failed to reload block data from disk.", }) m.compactionsTriggered = prometheus.NewCounter(prometheus.CounterOpts{ - Name: "tsdb_compactions_triggered_total", + Name: "prometheus_tsdb_compactions_triggered_total", Help: "Total number of triggered compactions for the partition.", }) m.cutoffs = prometheus.NewCounter(prometheus.CounterOpts{ - Name: "tsdb_retention_cutoffs_total", + Name: "prometheus_tsdb_retention_cutoffs_total", Help: "Number of times the database cut off block data from disk.", }) m.cutoffsFailed = prometheus.NewCounter(prometheus.CounterOpts{ - Name: "tsdb_retention_cutoffs_failures_total", + Name: "prometheus_tsdb_retention_cutoffs_failures_total", Help: "Number of times the database failed to cut off block data from disk.", }) m.startTime = prometheus.NewGaugeFunc(prometheus.GaugeOpts{ - Name: "tsdb_lowest_timestamp", + Name: "prometheus_tsdb_lowest_timestamp", Help: "Lowest timestamp value stored in the database.", }, func() float64 { db.mtx.RLock() @@ -185,7 +185,7 @@ func newDBMetrics(db *DB, r prometheus.Registerer) *dbMetrics { return float64(db.blocks[0].meta.MinTime) }) m.tombCleanTimer = prometheus.NewHistogram(prometheus.HistogramOpts{ - Name: "tsdb_tombstone_cleanup_seconds", + Name: "prometheus_tsdb_tombstone_cleanup_seconds", Help: "The time taken to recompact blocks to remove tombstones.", }) diff --git a/head.go b/head.go index 0a5f3c151..b342c8f57 100644 --- a/head.go +++ b/head.go @@ -95,59 +95,59 @@ func newHeadMetrics(h *Head, r prometheus.Registerer) *headMetrics { m := &headMetrics{} m.activeAppenders = prometheus.NewGauge(prometheus.GaugeOpts{ - Name: "tsdb_head_active_appenders", + Name: "prometheus_tsdb_head_active_appenders", Help: "Number of currently active appender transactions", }) m.series = prometheus.NewGauge(prometheus.GaugeOpts{ - Name: "tsdb_head_series", + Name: "prometheus_tsdb_head_series", Help: "Total number of series in the head block.", }) m.seriesCreated = prometheus.NewCounter(prometheus.CounterOpts{ - Name: "tsdb_head_series_created_total", + Name: "prometheus_tsdb_head_series_created_total", Help: "Total number of series created in the head", }) m.seriesRemoved = prometheus.NewCounter(prometheus.CounterOpts{ - Name: "tsdb_head_series_removed_total", + Name: "prometheus_tsdb_head_series_removed_total", Help: "Total number of series removed in the head", }) m.seriesNotFound = prometheus.NewCounter(prometheus.CounterOpts{ - Name: "tsdb_head_series_not_found_total", + Name: "prometheus_tsdb_head_series_not_found_total", Help: "Total number of requests for series that were not found.", }) m.chunks = prometheus.NewGauge(prometheus.GaugeOpts{ - Name: "tsdb_head_chunks", + Name: "prometheus_tsdb_head_chunks", Help: "Total number of chunks in the head block.", }) m.chunksCreated = prometheus.NewCounter(prometheus.CounterOpts{ - Name: "tsdb_head_chunks_created_total", + Name: "prometheus_tsdb_head_chunks_created_total", Help: "Total number of chunks created in the head", }) m.chunksRemoved = prometheus.NewCounter(prometheus.CounterOpts{ - Name: "tsdb_head_chunks_removed_total", + Name: "prometheus_tsdb_head_chunks_removed_total", Help: "Total number of chunks removed in the head", }) m.gcDuration = prometheus.NewSummary(prometheus.SummaryOpts{ - Name: "tsdb_head_gc_duration_seconds", + Name: "prometheus_tsdb_head_gc_duration_seconds", Help: "Runtime of garbage collection in the head block.", }) m.maxTime = prometheus.NewGaugeFunc(prometheus.GaugeOpts{ - Name: "tsdb_head_max_time", + Name: "prometheus_tsdb_head_max_time", Help: "Maximum timestamp of the head block.", }, func() float64 { return float64(h.MaxTime()) }) m.minTime = prometheus.NewGaugeFunc(prometheus.GaugeOpts{ - Name: "tsdb_head_min_time", + Name: "prometheus_tsdb_head_min_time", Help: "Minimum time bound of the head block.", }, func() float64 { return float64(h.MinTime()) }) m.walTruncateDuration = prometheus.NewSummary(prometheus.SummaryOpts{ - Name: "tsdb_wal_truncate_duration_seconds", + Name: "prometheus_tsdb_wal_truncate_duration_seconds", Help: "Duration of WAL truncation.", }) m.samplesAppended = prometheus.NewCounter(prometheus.CounterOpts{ - Name: "tsdb_head_samples_appended_total", + Name: "prometheus_tsdb_head_samples_appended_total", Help: "Total number of appended samples.", }) diff --git a/wal.go b/wal.go index f44dbf0ad..ff978766c 100644 --- a/wal.go +++ b/wal.go @@ -64,11 +64,11 @@ func newWalMetrics(wal *SegmentWAL, r prometheus.Registerer) *walMetrics { m := &walMetrics{} m.fsyncDuration = prometheus.NewSummary(prometheus.SummaryOpts{ - Name: "tsdb_wal_fsync_duration_seconds", + Name: "prometheus_tsdb_wal_fsync_duration_seconds", Help: "Duration of WAL fsync.", }) m.corruptions = prometheus.NewCounter(prometheus.CounterOpts{ - Name: "tsdb_wal_corruptions_total", + Name: "prometheus_tsdb_wal_corruptions_total", Help: "Total number of WAL corruptions.", }) diff --git a/wal/wal.go b/wal/wal.go index af1304f4f..0e95ba2a7 100644 --- a/wal/wal.go +++ b/wal/wal.go @@ -190,15 +190,15 @@ func NewSize(logger log.Logger, reg prometheus.Registerer, dir string, segmentSi stopc: make(chan chan struct{}), } w.fsyncDuration = prometheus.NewSummary(prometheus.SummaryOpts{ - Name: "tsdb_wal_fsync_duration_seconds", + Name: "prometheus_tsdb_wal_fsync_duration_seconds", Help: "Duration of WAL fsync.", }) w.pageFlushes = prometheus.NewCounter(prometheus.CounterOpts{ - Name: "tsdb_wal_page_flushes_total", + Name: "prometheus_tsdb_wal_page_flushes_total", Help: "Total number of page flushes.", }) w.pageCompletions = prometheus.NewCounter(prometheus.CounterOpts{ - Name: "tsdb_wal_completed_pages_total", + Name: "prometheus_tsdb_wal_completed_pages_total", Help: "Total number of completed pages.", }) if reg != nil {