diff --git a/tsdb/block.go b/tsdb/block.go index 7d243f8bf7..8d7badef9e 100644 --- a/tsdb/block.go +++ b/tsdb/block.go @@ -188,10 +188,11 @@ type BlockMeta struct { // BlockStats contains stats about contents of a block. type BlockStats struct { - NumSamples uint64 `json:"numSamples,omitempty"` - NumSeries uint64 `json:"numSeries,omitempty"` - NumChunks uint64 `json:"numChunks,omitempty"` - NumTombstones uint64 `json:"numTombstones,omitempty"` + NumSamples uint64 `json:"numSamples,omitempty"` + NumHistogramSamples uint64 `json:"numHistogramSamples,omitempty"` + NumSeries uint64 `json:"numSeries,omitempty"` + NumChunks uint64 `json:"numChunks,omitempty"` + NumTombstones uint64 `json:"numTombstones,omitempty"` } // BlockDesc describes a block by ULID and time range. diff --git a/tsdb/compact.go b/tsdb/compact.go index 602958eaeb..c3d3770bff 100644 --- a/tsdb/compact.go +++ b/tsdb/compact.go @@ -896,6 +896,10 @@ func (c DefaultBlockPopulator) PopulateBlock(ctx context.Context, metrics *Compa meta.Stats.NumSeries++ for _, chk := range chks { meta.Stats.NumSamples += uint64(chk.Chunk.NumSamples()) + enc := chk.Chunk.Encoding() + if enc == chunkenc.EncHistogram || enc == chunkenc.EncFloatHistogram { + meta.Stats.NumHistogramSamples += uint64(chk.Chunk.NumSamples()) + } } for _, chk := range chks { diff --git a/tsdb/compact_test.go b/tsdb/compact_test.go index 655cfa408b..4f376c2c1a 100644 --- a/tsdb/compact_test.go +++ b/tsdb/compact_test.go @@ -1098,6 +1098,11 @@ func TestCompaction_populateBlock(t *testing.T) { s.NumChunks += uint64(len(series.chunks)) for _, chk := range series.chunks { s.NumSamples += uint64(len(chk)) + for _, smpl := range chk { + if smpl.h != nil || smpl.fh != nil { + s.NumHistogramSamples++ + } + } } } require.Equal(t, s, meta.Stats)