github
/
prometheus
mirror of https://github.com/prometheus/prometheus
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #15176 from jhesketh/jhesketh/round 

Round function should ignore native histograms
pull/15255/head
Björn Rabenstein 2024-10-22 19:14:16 +02:00 committed by GitHub
parent aa81210c8b 14ef1ce8ab
commit 7c7116fea8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
promql/functions.go
View File

@ -533,6 +533,10 @@ func funcRound(vals []parser.Value, args parser.Expressions, enh *EvalNodeHelper
toNearestInverse := 1.0 / toNearest toNearestInverse := 1.0 / toNearest
for _, el := range vec { for _, el := range vec {
if el.H != nil {
// Process only float samples.
continue
}
f := math.Floor(el.F*toNearestInverse+0.5) / toNearestInverse f := math.Floor(el.F*toNearestInverse+0.5) / toNearestInverse
enh.Out = append(enh.Out, Sample{ enh.Out = append(enh.Out, Sample{
Metric: el.Metric, Metric: el.Metric,

9
promql/promqltest/testdata/functions.test vendored
View File

@ -1258,3 +1258,12 @@ load 1m
# We expect the value to be 0 for t=0s to t=59s (inclusive), then 60 for t=60s and t=61s. # We expect the value to be 0 for t=0s to t=59s (inclusive), then 60 for t=60s and t=61s.
eval range from 0 to 61s step 1s timestamp(metric) eval range from 0 to 61s step 1s timestamp(metric)
{} 0x59 60 60 {} 0x59 60 60
clear
# Check round with mixed data types
load 1m
mixed_metric {{schema:0 sum:5 count:4 buckets:[1 2 1]}} 1 2 3 {{schema:0 sum:5 count:4 buckets:[1 2 1]}} {{schema:0 sum:8 count:6 buckets:[1 4 1]}}
eval range from 0 to 5m step 1m round(mixed_metric)
{} _ 1 2 3