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

Merge pull request #12994 from prometheus/beorn7/release 

Merge release-2.48 back into main
pull/12957/head
Björn Rabenstein 2023-10-18 00:36:13 +02:00 committed by GitHub
parent f33bffa788 ca450a6d79
commit 16af86734f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
promql/functions.go
View File

@ -88,7 +88,7 @@ func extrapolatedRate(vals []parser.Value, args parser.Expressions, enh *EvalNod
return enh.Out, annos.Add(annotations.NewMixedFloatsHistogramsWarning(metricName, args[0].PositionRange())) return enh.Out, annos.Add(annotations.NewMixedFloatsHistogramsWarning(metricName, args[0].PositionRange()))
} }
if isCounter && if isCounter && metricName != "" && len(samples.Floats) > 0 &&
!strings.HasSuffix(metricName, "_total") && !strings.HasSuffix(metricName, "_total") &&
!strings.HasSuffix(metricName, "_sum") && !strings.HasSuffix(metricName, "_sum") &&
!strings.HasSuffix(metricName, "_count") && !strings.HasSuffix(metricName, "_count") &&

4
util/annotations/annotations.go
View File

@ -156,8 +156,8 @@ func NewMixedClassicNativeHistogramsWarning(metricName string, pos posrange.Posi
} }
} }
// NewPossibleNonCounterInfo is used when a counter metric does not have the suffixes // NewPossibleNonCounterInfo is used when a named counter metric with only float samples does not
// _total, _sum, _count, or _bucket. // have the suffixes _total, _sum, _count, or _bucket.
func NewPossibleNonCounterInfo(metricName string, pos posrange.PositionRange) annoErr { func NewPossibleNonCounterInfo(metricName string, pos posrange.PositionRange) annoErr {
return annoErr{ return annoErr{
PositionRange: pos, PositionRange: pos,