IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Alerting: Rename caps to captures as cap is a reserved word (#63432)

Browse Source
This commit is contained in:
George Robinson 2023-02-20 10:08:36 +00:00 committed by GitHub
parent aacf9da969
commit c637a5543e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkg/services/ngalert/eval/extract_md.go
View File

@ -42,23 +42,23 @@ func extractEvalString(frame *data.Frame) (s string) {
return sb.String()
}
if caps, ok := frame.Meta.Custom.([]NumberValueCapture); ok {
if captures, ok := frame.Meta.Custom.([]NumberValueCapture); ok {
sb := strings.Builder{}
for i, c := range caps {
for i, capture := range captures {
sb.WriteString("[ ")
sb.WriteString(fmt.Sprintf("var='%s' ", c.Var))
sb.WriteString(fmt.Sprintf("labels={%s} ", c.Labels))
sb.WriteString(fmt.Sprintf("var='%s' ", capture.Var))
sb.WriteString(fmt.Sprintf("labels={%s} ", capture.Labels))
valString := "null"
if c.Value != nil {
valString = fmt.Sprintf("%v", *c.Value)
if capture.Value != nil {
valString = fmt.Sprintf("%v", *capture.Value)
}
sb.WriteString(fmt.Sprintf("value=%v ", valString))
sb.WriteString("]")
if i < len(caps)-1 {
if i < len(captures)-1 {
sb.WriteString(", ")
}
}
@ -97,10 +97,10 @@ func extractValues(frame *data.Frame) map[string]NumberValueCapture {
return v
}
if caps, ok := frame.Meta.Custom.([]NumberValueCapture); ok {
v := make(map[string]NumberValueCapture, len(caps))
for _, c := range caps {
v[c.Var] = c
if captures, ok := frame.Meta.Custom.([]NumberValueCapture); ok {
v := make(map[string]NumberValueCapture, len(captures))
for _, capture := range captures {
v[capture.Var] = capture
}
return v
}

10
pkg/services/ngalert/state/template/template.go
View File

@ -49,20 +49,20 @@ func (v Value) String() string {
return strconv.FormatFloat(v.Value, 'f', -1, 64)
}
func NewValues(caps map[string]eval.NumberValueCapture) map[string]Value {
func NewValues(captures map[string]eval.NumberValueCapture) map[string]Value {
values := make(map[string]Value)
for refID, cap := range caps {
for refID, capture := range captures {
var f float64
// A RefID might be missing a value if there was no data or an error.
// If that is the case, use "not a number". We don't use 0, or -1, as
// either of those are possible values for a RefID.
if cap.Value != nil {
f = *cap.Value
if capture.Value != nil {
f = *capture.Value
} else {
f = math.NaN()
}
values[refID] = Value{
Labels: Labels(cap.Labels),
Labels: Labels(capture.Labels),
Value: f,
}
}