Skip to content

chore(deps): adopt fork template and tracing prerequisites #717

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yuri-tceretian merged 1 commit into from
Oct 14, 2026
+10 −9
Merged

chore(deps): adopt fork template and tracing prerequisites #717

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/historian/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,4 +172,4 @@ require (
)

// Use our fork of the upstream Alertmanager.
replace github.com/prometheus/alertmanager => github.com/grafana/prometheus-alertmanager v0.25.1-0.20260929181320-b34047c225ee
replace github.com/prometheus/alertmanager => github.com/grafana/prometheus-alertmanager v0.25.1-0.20261009142442-7daeb08a4623
4 changes: 2 additions & 2 deletions apps/historian/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,8 +343,8 @@ github.com/grafana/loki/pkg/push v0.0.0-20250823105456-332df2b20000 h1:/5LKSYgLm
github.com/grafana/loki/pkg/push v0.0.0-20250823105456-332df2b20000/go.mod h1:/ZklAgE1i4f3Z8uriXwESmCr1VLF8lBGaJspuaGuf78=
github.com/grafana/otel-profiling-go v0.5.1 h1:stVPKAFZSa7eGiqbYuG25VcqYksR6iWvF3YH66t4qL8=
github.com/grafana/otel-profiling-go v0.5.1/go.mod h1:ftN/t5A/4gQI19/8MoWurBEtC6gFw8Dns1sJZ9W4Tls=
github.com/grafana/prometheus-alertmanager v0.25.1-0.20260929181320-b34047c225ee h1:ZwdBMaicyR2uViGjKTAeOXYa8nCG5QC0IVwREifQ1jc=
github.com/grafana/prometheus-alertmanager v0.25.1-0.20260929181320-b34047c225ee/go.mod h1:zvcfvXbBCOpviFiPtQ1KClxQXJiteuDUwleRwaPUIZ0=
github.com/grafana/prometheus-alertmanager v0.25.1-0.20261009142442-7daeb08a4623 h1:bHvgpgiN5QEnJTA8F6/REFyBB7s/OwAjlU/f6C+0eEY=
github.com/grafana/prometheus-alertmanager v0.25.1-0.20261009142442-7daeb08a4623/go.mod h1:zvcfvXbBCOpviFiPtQ1KClxQXJiteuDUwleRwaPUIZ0=
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0 h1:5VipnvEpbqr2gA2VbM+nYVbkIF28c5ZQfqCBQ5g2xfk=
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ require (
)

// Using a fork of the Alertmanager with Alerting Squad specific changes.
replace github.com/prometheus/alertmanager => github.com/grafana/prometheus-alertmanager v0.25.1-0.20260929181320-b34047c225ee
replace github.com/prometheus/alertmanager => github.com/grafana/prometheus-alertmanager v0.25.1-0.20261009142442-7daeb08a4623

replace github.com/Unknwon/com v1.0.1 => github.com/unknwon/com v1.0.1

Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -881,8 +881,8 @@ github.com/grafana/loki/pkg/push v0.0.0-20250823105456-332df2b20000 h1:/5LKSYgLm
github.com/grafana/loki/pkg/push v0.0.0-20250823105456-332df2b20000/go.mod h1:/ZklAgE1i4f3Z8uriXwESmCr1VLF8lBGaJspuaGuf78=
github.com/grafana/otel-profiling-go v0.5.1 h1:stVPKAFZSa7eGiqbYuG25VcqYksR6iWvF3YH66t4qL8=
github.com/grafana/otel-profiling-go v0.5.1/go.mod h1:ftN/t5A/4gQI19/8MoWurBEtC6gFw8Dns1sJZ9W4Tls=
github.com/grafana/prometheus-alertmanager v0.25.1-0.20260929181320-b34047c225ee h1:ZwdBMaicyR2uViGjKTAeOXYa8nCG5QC0IVwREifQ1jc=
github.com/grafana/prometheus-alertmanager v0.25.1-0.20260929181320-b34047c225ee/go.mod h1:zvcfvXbBCOpviFiPtQ1KClxQXJiteuDUwleRwaPUIZ0=
github.com/grafana/prometheus-alertmanager v0.25.1-0.20261009142442-7daeb08a4623 h1:bHvgpgiN5QEnJTA8F6/REFyBB7s/OwAjlU/f6C+0eEY=
github.com/grafana/prometheus-alertmanager v0.25.1-0.20261009142442-7daeb08a4623/go.mod h1:zvcfvXbBCOpviFiPtQ1KClxQXJiteuDUwleRwaPUIZ0=
github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
Expand Down
2 changes: 1 addition & 1 deletion receivers/jira/v0mimir1/jira_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -783,7 +783,7 @@ func TestJiraPriority(t *testing.T) {
tmpl.ExternalURL = u

var (
data = tmpl.Data("jira", model.LabelSet{}, tc.alerts...)
data = tmpl.Data("jira", model.LabelSet{}, nil, notify.ReasonFirstNotification.String(), tc.alerts...)

tmplTextErr error
tmplText = notify.TmplText(tmpl, data, &tmplTextErr)
Expand Down
2 changes: 1 addition & 1 deletion receivers/webhook/v0mimir1/webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ func New(conf *Config, t *template.Template, l log.Logger, httpOpts ...commoncfg
}

// instrument for tracing
client.Transport = tracing.Transport(client.Transport, "webhook")
client.Transport = tracing.Transport(client.Transport)

@moustafab moustafab Oct 14, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are we losing something with this?

@yuri-tceretian yuri-tceretian Oct 14, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

two side-effects:

  • span will not contain integration type, which is ok because only webhook has tracing for now.
  • the new tracing otelhttp produces more spans and more informative than the old one.


return &Notifier{
conf: conf,
Expand Down
3 changes: 2 additions & 1 deletion templates/mimir_template_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"testing"

"github.com/go-kit/log"
"github.com/prometheus/alertmanager/notify"
"github.com/prometheus/alertmanager/template"
"github.com/prometheus/alertmanager/types"
"github.com/prometheus/common/model"
Expand Down Expand Up @@ -179,7 +180,7 @@ func templateDataForTests(t *testing.T, tmpl *Template) *template.Data {

eurl, _ := url.Parse("http://localhost:9090")
tmpl.ExternalURL = eurl // This is done externally, by the system using the templates.
return tmpl.Data("receiver", model.LabelSet{}, &types.Alert{
return tmpl.Data("receiver", model.LabelSet{}, nil, notify.ReasonFirstNotification.String(), &types.Alert{
Alert: model.Alert{
GeneratorURL: "http://localhost:9090",
},
Expand Down
Loading