mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-03-05 20:59:13 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fix/update metrics

Browse source
This commit is contained in:
Fabian Reinartz 2017-01-09 19:14:21 +01:00
parent 0dffd52238
commit 142c89b8b0
2 changed files with 6 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
compact.go
View file

@ -56,10 +56,10 @@ type compactableBlocks interface {
compactable() []block compactable() []block
} }
func newCompactor(blocks compactableBlocks) (*compactor, error) { func newCompactor(blocks compactableBlocks, r prometheus.Registerer) (*compactor, error) {
c := &compactor{ c := &compactor{
blocks: blocks, blocks: blocks,
metrics: newCompactorMetrics(nil), metrics: newCompactorMetrics(r),
} }
return c, nil return c, nil

19
db.go
View file

@ -83,8 +83,6 @@ type DB struct {
} }
type dbMetrics struct { type dbMetrics struct {
persistences prometheus.Counter
persistenceDuration prometheus.Histogram
samplesAppended prometheus.Counter samplesAppended prometheus.Counter
compactionsTriggered prometheus.Counter compactionsTriggered prometheus.Counter
} }
@ -92,15 +90,6 @@ type dbMetrics struct {
func newDBMetrics(r prometheus.Registerer) *dbMetrics { func newDBMetrics(r prometheus.Registerer) *dbMetrics {
m := &dbMetrics{} m := &dbMetrics{}
m.persistences = prometheus.NewCounter(prometheus.CounterOpts{
Name: "tsdb_persistences_total",
Help: "Total number of head persistances that ran so far.",
})
m.persistenceDuration = prometheus.NewHistogram(prometheus.HistogramOpts{
Name: "tsdb_persistence_duration_seconds",
Help: "Duration of persistences in seconddb.",
Buckets: prometheus.ExponentialBuckets(0.25, 2, 5),
})
m.samplesAppended = prometheus.NewCounter(prometheus.CounterOpts{ m.samplesAppended = prometheus.NewCounter(prometheus.CounterOpts{
Name: "tsdb_samples_appended_total", Name: "tsdb_samples_appended_total",
Help: "Total number of appended sampledb.", Help: "Total number of appended sampledb.",
@ -112,9 +101,8 @@ func newDBMetrics(r prometheus.Registerer) *dbMetrics {
if r != nil { if r != nil {
r.MustRegister( r.MustRegister(
m.persistences,
m.persistenceDuration,
m.samplesAppended, m.samplesAppended,
m.compactionsTriggered,
) )
} }
return m return m
@ -128,11 +116,12 @@ func Open(dir string, logger log.Logger) (db *DB, err error) {
return nil, err return nil, err
} }
} }
r := prometheus.DefaultRegisterer
db = &DB{ db = &DB{
dir: dir, dir: dir,
logger: logger, logger: logger,
metrics: newDBMetrics(nil), metrics: newDBMetrics(r),
compactc: make(chan struct{}, 1), compactc: make(chan struct{}, 1),
cutc: make(chan struct{}, 1), cutc: make(chan struct{}, 1),
donec: make(chan struct{}), donec: make(chan struct{}),
@ -142,7 +131,7 @@ func Open(dir string, logger log.Logger) (db *DB, err error) {
if err := db.initBlocks(); err != nil { if err := db.initBlocks(); err != nil {
return nil, err return nil, err
} }
if db.compactor, err = newCompactor(db); err != nil { if db.compactor, err = newCompactor(db, r); err != nil {
return nil, err return nil, err
} }