From 74c1c0ab7d27c75e853ffe5321c14b3cae2926ea Mon Sep 17 00:00:00 2001 From: "alerting-team[bot]" <158350966+alerting-team[bot]@users.noreply.github.com> Date: Tue, 3 Feb 2026 20:28:05 +0000 Subject: [PATCH] Alerting: Update alerting module to 8b17916e8173e80a809a0224495ffe4310064f6a (#117334) [create-pull-request] automated change Co-authored-by: yuri-tceretian <25988953+yuri-tceretian@users.noreply.github.com> --- apps/dashvalidator/go.mod | 2 +- apps/dashvalidator/go.sum | 4 ++-- apps/plugins/go.mod | 2 +- apps/plugins/go.sum | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- .../ngalert/api/tooling/definitions/alertmanager.go | 10 +++++----- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/apps/dashvalidator/go.mod b/apps/dashvalidator/go.mod index 99bbd33c68c..5e8d1ba8038 100644 --- a/apps/dashvalidator/go.mod +++ b/apps/dashvalidator/go.mod @@ -80,7 +80,7 @@ require ( github.com/google/gnostic-models v0.7.1 // indirect github.com/google/go-cmp v0.7.0 // indirect github.com/google/uuid v1.6.0 // indirect - github.com/grafana/alerting v0.0.0-20260129164026-85d7010c64b8 // indirect + github.com/grafana/alerting v0.0.0-20260203165836-8b17916e8173 // indirect github.com/grafana/authlib v0.0.0-20260203131350-b83e80394acc // indirect github.com/grafana/authlib/types v0.0.0-20260203131350-b83e80394acc // indirect github.com/grafana/dataplane/sdata v0.0.9 // indirect diff --git a/apps/dashvalidator/go.sum b/apps/dashvalidator/go.sum index 26108978057..9fc34770e80 100644 --- a/apps/dashvalidator/go.sum +++ b/apps/dashvalidator/go.sum @@ -342,8 +342,8 @@ github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+ github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/mux v1.7.1/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= -github.com/grafana/alerting v0.0.0-20260129164026-85d7010c64b8 h1:964kdD/6Xyzr4g910nZnMtj0z16ijsvpA8Ju4sFOLjA= -github.com/grafana/alerting v0.0.0-20260129164026-85d7010c64b8/go.mod h1:Ji0SfJChcwjgq8ljy6Y5CcYfHfAYKXjKYeysOoDS/6s= +github.com/grafana/alerting v0.0.0-20260203165836-8b17916e8173 h1:nrQnGVRvBQK1zmg9rB6TA6tOeS0sSsUUV9JS1erkw2Q= +github.com/grafana/alerting v0.0.0-20260203165836-8b17916e8173/go.mod h1:Ji0SfJChcwjgq8ljy6Y5CcYfHfAYKXjKYeysOoDS/6s= github.com/grafana/authlib v0.0.0-20260203131350-b83e80394acc h1:s9+L7EMTJIQxkhrR2m5HrOUKjeJDxEE4E09hPWKnfwQ= github.com/grafana/authlib v0.0.0-20260203131350-b83e80394acc/go.mod h1:za8MGa5J9Bbgm2XorXc+FbGe72ln46OpN5o8P1uX9Og= github.com/grafana/authlib/types v0.0.0-20260203131350-b83e80394acc h1:wagsf4me4j/UFNocyMJHz5/803XpnfGJtNj8/YWy0j0= diff --git a/apps/plugins/go.mod b/apps/plugins/go.mod index 70cfeed92d6..66b3a74b9dd 100644 --- a/apps/plugins/go.mod +++ b/apps/plugins/go.mod @@ -98,7 +98,7 @@ require ( github.com/google/gnostic-models v0.7.1 // indirect github.com/google/go-cmp v0.7.0 // indirect github.com/google/uuid v1.6.0 // indirect - github.com/grafana/alerting v0.0.0-20260129164026-85d7010c64b8 // indirect + github.com/grafana/alerting v0.0.0-20260203165836-8b17916e8173 // indirect github.com/grafana/authlib v0.0.0-20260203131350-b83e80394acc // indirect github.com/grafana/authlib/types v0.0.0-20260203131350-b83e80394acc // indirect github.com/grafana/dataplane/sdata v0.0.9 // indirect diff --git a/apps/plugins/go.sum b/apps/plugins/go.sum index 9a9d4f5a78f..78cb6abe7c5 100644 --- a/apps/plugins/go.sum +++ b/apps/plugins/go.sum @@ -217,8 +217,8 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 h1:JeSE6pjso5THxAzdVpqr6/geYxZytqFMBCOtn/ujyeo= github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674/go.mod h1:r4w70xmWCQKmi1ONH4KIaBptdivuRPyosB9RmPlGEwA= -github.com/grafana/alerting v0.0.0-20260129164026-85d7010c64b8 h1:964kdD/6Xyzr4g910nZnMtj0z16ijsvpA8Ju4sFOLjA= -github.com/grafana/alerting v0.0.0-20260129164026-85d7010c64b8/go.mod h1:Ji0SfJChcwjgq8ljy6Y5CcYfHfAYKXjKYeysOoDS/6s= +github.com/grafana/alerting v0.0.0-20260203165836-8b17916e8173 h1:nrQnGVRvBQK1zmg9rB6TA6tOeS0sSsUUV9JS1erkw2Q= +github.com/grafana/alerting v0.0.0-20260203165836-8b17916e8173/go.mod h1:Ji0SfJChcwjgq8ljy6Y5CcYfHfAYKXjKYeysOoDS/6s= github.com/grafana/authlib v0.0.0-20260203131350-b83e80394acc h1:s9+L7EMTJIQxkhrR2m5HrOUKjeJDxEE4E09hPWKnfwQ= github.com/grafana/authlib v0.0.0-20260203131350-b83e80394acc/go.mod h1:za8MGa5J9Bbgm2XorXc+FbGe72ln46OpN5o8P1uX9Og= github.com/grafana/authlib/types v0.0.0-20260203131350-b83e80394acc h1:wagsf4me4j/UFNocyMJHz5/803XpnfGJtNj8/YWy0j0= diff --git a/go.mod b/go.mod index ae411097f36..505f0fb32a9 100644 --- a/go.mod +++ b/go.mod @@ -88,7 +88,7 @@ require ( github.com/googleapis/gax-go/v2 v2.15.0 // @grafana/grafana-backend-group github.com/gorilla/mux v1.8.1 // @grafana/grafana-backend-group github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // @grafana/grafana-app-platform-squad - github.com/grafana/alerting v0.0.0-20260129164026-85d7010c64b8 // @grafana/alerting-backend + github.com/grafana/alerting v0.0.0-20260203165836-8b17916e8173 // @grafana/alerting-backend github.com/grafana/authlib v0.0.0-20260203131350-b83e80394acc // @grafana/identity-access-team github.com/grafana/authlib/types v0.0.0-20260203131350-b83e80394acc // @grafana/identity-access-team github.com/grafana/dataplane/examples v0.0.1 // @grafana/observability-metrics diff --git a/go.sum b/go.sum index 4669096feec..fc7ca0143b9 100644 --- a/go.sum +++ b/go.sum @@ -1600,8 +1600,8 @@ github.com/gorilla/sessions v1.2.1 h1:DHd3rPN5lE3Ts3D8rKkQ8x/0kqfeNmBAaiSi+o7Fsg github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM= github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 h1:JeSE6pjso5THxAzdVpqr6/geYxZytqFMBCOtn/ujyeo= github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674/go.mod h1:r4w70xmWCQKmi1ONH4KIaBptdivuRPyosB9RmPlGEwA= -github.com/grafana/alerting v0.0.0-20260129164026-85d7010c64b8 h1:964kdD/6Xyzr4g910nZnMtj0z16ijsvpA8Ju4sFOLjA= -github.com/grafana/alerting v0.0.0-20260129164026-85d7010c64b8/go.mod h1:Ji0SfJChcwjgq8ljy6Y5CcYfHfAYKXjKYeysOoDS/6s= +github.com/grafana/alerting v0.0.0-20260203165836-8b17916e8173 h1:nrQnGVRvBQK1zmg9rB6TA6tOeS0sSsUUV9JS1erkw2Q= +github.com/grafana/alerting v0.0.0-20260203165836-8b17916e8173/go.mod h1:Ji0SfJChcwjgq8ljy6Y5CcYfHfAYKXjKYeysOoDS/6s= github.com/grafana/authlib v0.0.0-20260203131350-b83e80394acc h1:s9+L7EMTJIQxkhrR2m5HrOUKjeJDxEE4E09hPWKnfwQ= github.com/grafana/authlib v0.0.0-20260203131350-b83e80394acc/go.mod h1:za8MGa5J9Bbgm2XorXc+FbGe72ln46OpN5o8P1uX9Og= github.com/grafana/authlib/types v0.0.0-20260203131350-b83e80394acc h1:wagsf4me4j/UFNocyMJHz5/803XpnfGJtNj8/YWy0j0= diff --git a/pkg/services/ngalert/api/tooling/definitions/alertmanager.go b/pkg/services/ngalert/api/tooling/definitions/alertmanager.go index ef5904de9f0..c5e072ac44b 100644 --- a/pkg/services/ngalert/api/tooling/definitions/alertmanager.go +++ b/pkg/services/ngalert/api/tooling/definitions/alertmanager.go @@ -272,20 +272,20 @@ type ( type MergeResult definition.MergeResult func (m MergeResult) LogContext() []any { - if len(m.RenamedReceivers) == 0 && len(m.RenamedTimeIntervals) == 0 { + if len(m.Receivers) == 0 && len(m.TimeIntervals) == 0 { return nil } logCtx := make([]any, 0, 4) - if len(m.RenamedReceivers) > 0 { + if len(m.Receivers) > 0 { rcvBuilder := strings.Builder{} - for from, to := range m.RenamedReceivers { + for from, to := range m.Receivers { rcvBuilder.WriteString(fmt.Sprintf("'%s'->'%s',", from, to)) } logCtx = append(logCtx, "renamedReceivers", fmt.Sprintf("[%s]", rcvBuilder.String()[0:rcvBuilder.Len()-1])) } - if len(m.RenamedTimeIntervals) > 0 { + if len(m.TimeIntervals) > 0 { intervalBuilder := strings.Builder{} - for from, to := range m.RenamedTimeIntervals { + for from, to := range m.TimeIntervals { intervalBuilder.WriteString(fmt.Sprintf("'%s'->'%s',", from, to)) } logCtx = append(logCtx, "renamedTimeIntervals", fmt.Sprintf("[%s]", intervalBuilder.String()[0:intervalBuilder.Len()-1]))