mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-11-09 23:24:05 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

promql: Support histogram in value string representation

Browse source 
Signed-off-by: beorn7 <beorn@grafana.com>
This commit is contained in:
beorn7 2021-11-15 20:36:44 +01:00
parent 4c28d9fac7
commit 9b30ca2598
3 changed files with 25 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
promql/engine_test.go
View file

@ -2455,10 +2455,11 @@ func TestSparseHistogramRate(t *testing.T) {
require.NoError(t, test.Run())
engine := test.QueryEngine()
queryString := fmt.Sprintf("rate(%s[1m])", seriesName)
//queryString := fmt.Sprintf("rate(%s[1m])", seriesName)
queryString := fmt.Sprintf("%s", seriesName)
qry, err := engine.NewInstantQuery(test.Queryable(), queryString, timestamp.Time(int64(5*time.Minute/time.Millisecond)))
require.NoError(t, err)
res := qry.Exec(test.Context())
require.NoError(t, res.Err)
// fmt.Println(res)
fmt.Println(res)
}

10
promql/value.go
View file

@ -87,9 +87,13 @@ type Point struct {
}
func (p Point) String() string {
// TODO(beorn7): Support Histogram.
v := strconv.FormatFloat(p.V, 'f', -1, 64)
return fmt.Sprintf("%v @[%v]", v, p.T)
var s string
if p.H != nil {
s = p.H.String()
} else {
s = strconv.FormatFloat(p.V, 'f', -1, 64)
}
return fmt.Sprintf("%s @[%v]", s, p.T)
}
// MarshalJSON implements json.Marshaler.

12
storage/memoized_iterator.go
View file

@ -80,8 +80,12 @@ func (b *MemoizedSeriesIterator) Seek(t int64) bool {
if !b.ok {
return false
}
if b.it.ChunkEncoding() == chunkenc.EncHistogram {
b.lastTime, _ = b.it.AtHistogram()
} else {
b.lastTime, _ = b.it.At()
}
}
if b.lastTime >= t {
return true
@ -102,12 +106,20 @@ func (b *MemoizedSeriesIterator) Next() bool {
}
// Keep track of the previous element.
if b.it.ChunkEncoding() == chunkenc.EncHistogram {
b.prevTime, b.prev
} else {
b.prevTime, b.prevValue = b.it.At()
}
b.ok = b.it.Next()
if b.ok {
if b.it.ChunkEncoding() == chunkenc.EncHistogram {
b.lastTime, _ = b.it.AtHistogram()
} else {
b.lastTime, _ = b.it.At()
}
}
return b.ok
}