Skip to content

Commit b9ee777

Browse files
Update alerting from 3e20fda3b872 to 863b09716e60
1 parent 7a789d3 commit b9ee777

File tree

8 files changed

+19
-13
lines changed

8 files changed

+19
-13
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ require (
6262
github.com/google/go-github/v57 v57.0.0
6363
github.com/google/uuid v1.6.0
6464
github.com/grafana-tools/sdk v0.0.0-20220919052116-6562121319fc
65-
github.com/grafana/alerting v0.0.0-20250610043455-3e20fda3b872
65+
github.com/grafana/alerting v0.0.0-20250620095611-863b09716e60
6666
github.com/grafana/regexp v0.0.0-20240607082908-2cb410fa05da
6767
github.com/hashicorp/golang-lru/v2 v2.0.7
6868
github.com/hashicorp/vault/api v1.16.0
@@ -371,7 +371,7 @@ replace github.com/opentracing-contrib/go-stdlib => github.com/grafana/opentraci
371371
replace github.com/opentracing-contrib/go-grpc => github.com/charleskorn/go-grpc v0.0.0-20231024023642-e9298576254f
372372

373373
// Replacing prometheus/alertmanager with our fork.
374-
replace github.com/prometheus/alertmanager => github.com/grafana/prometheus-alertmanager v0.25.1-0.20250604130045-92c8f6389b36
374+
replace github.com/prometheus/alertmanager => github.com/grafana/prometheus-alertmanager v0.25.1-0.20250620093340-be61a673dee6
375375

376376
// Use Mimir fork of prometheus/otlptranslator to allow for higher velocity of upstream development,
377377
// while allowing Mimir to move at a more conservative pace.

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -559,8 +559,8 @@ github.com/gosimple/slug v1.1.1 h1:fRu/digW+NMwBIP+RmviTK97Ho/bEj/C9swrCspN3D4=
559559
github.com/gosimple/slug v1.1.1/go.mod h1:ER78kgg1Mv0NQGlXiDe57DpCyfbNywXXZ9mIorhxAf0=
560560
github.com/grafana-tools/sdk v0.0.0-20220919052116-6562121319fc h1:PXZQA2WCxe85Tnn+WEvr8fDpfwibmEPgfgFEaC87G24=
561561
github.com/grafana-tools/sdk v0.0.0-20220919052116-6562121319fc/go.mod h1:AHHlOEv1+GGQ3ktHMlhuTUwo3zljV3QJbC0+8o2kn+4=
562-
github.com/grafana/alerting v0.0.0-20250610043455-3e20fda3b872 h1:bhUBPxMHtQB+AJaPcASElgwC7WFjWQvEiD3FoMEAv0E=
563-
github.com/grafana/alerting v0.0.0-20250610043455-3e20fda3b872/go.mod h1:VANfU4LMnOR4Gv4hkCN9fGyQ/8Lf2DKOvzG70vI2IS4=
562+
github.com/grafana/alerting v0.0.0-20250620095611-863b09716e60 h1:Mq8e+e10y1862/6auV6UqqE5QLgeLvd7SYEwAwMrB5A=
563+
github.com/grafana/alerting v0.0.0-20250620095611-863b09716e60/go.mod h1:WR+F4ifQQmoEzyfTBUxBD7XjVzmoQXs3IWZG9VlkhDw=
564564
github.com/grafana/dskit v0.0.0-20250616075643-3b7e2f87d946 h1:tZDbS7/qgfpUVWJg5wplmH3osIiwohOE55ahuwEXmdg=
565565
github.com/grafana/dskit v0.0.0-20250616075643-3b7e2f87d946/go.mod h1:JO5e0gs13dzqKYIF5cSa5YCNU5ydrziLP6dDzw0mPqc=
566566
github.com/grafana/e2e v0.1.2-0.20250428181430-708d63bcc673 h1:Va04sDlP33f1SFUHRTho4QJfDlGTz+/HnBIpYwlqV9Q=
@@ -579,8 +579,8 @@ github.com/grafana/opentracing-contrib-go-stdlib v0.0.0-20230509071955-f410e79da
579579
github.com/grafana/opentracing-contrib-go-stdlib v0.0.0-20230509071955-f410e79da956/go.mod h1:qtI1ogk+2JhVPIXVc6q+NHziSmy2W5GbdQZFUHADCBU=
580580
github.com/grafana/otel-profiling-go v0.5.1 h1:stVPKAFZSa7eGiqbYuG25VcqYksR6iWvF3YH66t4qL8=
581581
github.com/grafana/otel-profiling-go v0.5.1/go.mod h1:ftN/t5A/4gQI19/8MoWurBEtC6gFw8Dns1sJZ9W4Tls=
582-
github.com/grafana/prometheus-alertmanager v0.25.1-0.20250604130045-92c8f6389b36 h1:AjZ58JRw1ZieFH/SdsddF5BXtsDKt5kSrKNPWrzYz3Y=
583-
github.com/grafana/prometheus-alertmanager v0.25.1-0.20250604130045-92c8f6389b36/go.mod h1:O/QP1BCm0HHIzbKvgMzqb5sSyH88rzkFk84F4TfJjBU=
582+
github.com/grafana/prometheus-alertmanager v0.25.1-0.20250620093340-be61a673dee6 h1:oJnbhG6ZNy10AjsgNeAtAKeGHogIGOMfAsBH6fYYa5M=
583+
github.com/grafana/prometheus-alertmanager v0.25.1-0.20250620093340-be61a673dee6/go.mod h1:O/QP1BCm0HHIzbKvgMzqb5sSyH88rzkFk84F4TfJjBU=
584584
github.com/grafana/pyroscope-go/godeltaprof v0.1.8 h1:iwOtYXeeVSAeYefJNaxDytgjKtUuKQbJqgAIjlnicKg=
585585
github.com/grafana/pyroscope-go/godeltaprof v0.1.8/go.mod h1:2+l7K7twW49Ct4wFluZD3tZ6e0SjanjcUUBPVD/UuGU=
586586
github.com/grafana/regexp v0.0.0-20240531075221-3685f1377d7b h1:oMAq12GxTpwo9jxbnG/M4F/HdpwbibTaVoxNA0NZprY=

vendor/github.com/grafana/alerting/http/client.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/grafana/alerting/notify/testing.go

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/grafana/alerting/receivers/oncall/testing.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/prometheus/alertmanager/config/notifiers.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/prometheus/alertmanager/notify/webhook/webhook.go

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/modules.txt

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)