Skip to content
This repository was archived by the owner on Sep 30, 2024. It is now read-only.

Commit 174c08c

Browse files
sourcegraph-release-botbobheadxi
sourcegraph-release-bot
and
bobheadxi
authored
[Backport 5.5.x] fix/alertmanager: downgrade prometheus/common to fix generated config (#63793)
The OTEL upgrade https://github.com/sourcegraph/sourcegraph/pull/63171 bumps the `prometheus/common` package too far via transitive deps, causing us to generate configuration for alertmanager that altertmanager doesn&#39;t accept, at least until the alertmanager project cuts a new release with a newer version of `promethues/common`. For now we forcibly downgrade with a replace. Everything still builds, so we should be good to go. ## Test plan `sg start` and `sg run prometheus`. On `main`, editing `observability.alerts` will cause Alertmanager to refuse to accept the generated configuration. With this patch, all is well it seems - config changes go through as expected. This is a similar test plan for https://github.com/sourcegraph/sourcegraph/pull/63329 ## Changelog - Fix Prometheus Alertmanager configuration failing to apply `observability.alerts` from site config <br> Backport ffa873f from #63790 Co-authored-by: Robert Lin <[email protected]>
1 parent 8ee4149 commit 174c08c

File tree

3 files changed

+1201
-38
lines changed

3 files changed

+1201
-38
lines changed

‎deps.bzl

Lines changed: 198 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ def go_dependencies():
3434
name = "co_honnef_go_tools",
3535
build_file_proto_mode = "disable_global",
3636
importpath = "honnef.co/go/tools",
37-
sum = "h1:UoveltGrhghAA7ePc+e+QYDHXrBps2PqFZiHkGR/xK8=",
38-
version = "v0.0.1-2020.1.4",
37+
sum = "h1:qTakTkI6ni6LFD5sBwwsdSO+AQqbSIxOauHTTQKZ/7o=",
38+
version = "v0.1.3",
3939
)
4040
go_repository(
4141
name = "com_connectrpc_connect",
@@ -93,6 +93,20 @@ def go_dependencies():
9393
sum = "h1:QY8M92nrzkmr798gCo3kmMyqXFzdQVpxLlGPRBij0P8=",
9494
version = "v1.1.1",
9595
)
96+
go_repository(
97+
name = "com_github_ajstarks_deck",
98+
build_file_proto_mode = "disable_global",
99+
importpath = "github.com/ajstarks/deck",
100+
sum = "h1:7kQgkwGRoLzC9K0oyXdJo7nve/bynv/KwUsxbiTlzAM=",
101+
version = "v0.0.0-20200831202436-30c9fc6549a9",
102+
)
103+
go_repository(
104+
name = "com_github_ajstarks_deck_generate",
105+
build_file_proto_mode = "disable_global",
106+
importpath = "github.com/ajstarks/deck/generate",
107+
sum = "h1:iXUgAaqDcIUGbRoy2TdeofRG/j1zpGRSEmNK05T+bi8=",
108+
version = "v0.0.0-20210309230005-c3f852c02e19",
109+
)
96110
go_repository(
97111
name = "com_github_ajstarks_svgo",
98112
build_file_proto_mode = "disable_global",
@@ -275,6 +289,20 @@ def go_dependencies():
275289
sum = "h1:7fpzNGoJ3VA8qcrm++XEE1QUe0mIwNeLa02Nwq7RDkg=",
276290
version = "v1.0.1",
277291
)
292+
go_repository(
293+
name = "com_github_apache_arrow_go_v10",
294+
build_file_proto_mode = "disable_global",
295+
importpath = "github.com/apache/arrow/go/v10",
296+
sum = "h1:n9dERvixoC/1JjDmBcs9FPaEryoANa2sCgVFo6ez9cI=",
297+
version = "v10.0.1",
298+
)
299+
go_repository(
300+
name = "com_github_apache_arrow_go_v11",
301+
build_file_proto_mode = "disable_global",
302+
importpath = "github.com/apache/arrow/go/v11",
303+
sum = "h1:hqauxvFQxww+0mEU/2XHG6LT7eZternCZq+A5Yly2uM=",
304+
version = "v11.0.0",
305+
)
278306
go_repository(
279307
name = "com_github_apache_arrow_go_v14",
280308
build_file_proto_mode = "disable_global",
@@ -793,6 +821,13 @@ def go_dependencies():
793821
sum = "h1:RmdPFa+slIr4SCBg4st/l/vZWVe9QJKMXGO60Bxbe04=",
794822
version = "v0.0.0-20180917114910-cd5dcc76aeff",
795823
)
824+
go_repository(
825+
name = "com_github_boombuler_barcode",
826+
build_file_proto_mode = "disable_global",
827+
importpath = "github.com/boombuler/barcode",
828+
sum = "h1:NDBbPmhS+EqABEs5Kg3n/5ZNjy73Pz7SIV+KCeqyXcs=",
829+
version = "v1.0.1",
830+
)
796831
go_repository(
797832
name = "com_github_bradfitz_gomemcache",
798833
build_file_proto_mode = "disable_global",
@@ -1087,8 +1122,8 @@ def go_dependencies():
10871122
name = "com_github_cncf_udpa_go",
10881123
build_file_proto_mode = "disable_global",
10891124
importpath = "github.com/cncf/udpa/go",
1090-
sum = "h1:hzAQntlaYRkVSFEfj9OTWlVV1H155FMD8BTKktLv0QI=",
1091-
version = "v0.0.0-20210930031921-04548b0d99d4",
1125+
sum = "h1:QQ3GSy+MqSHxm/d8nCtnAiZdYFd45cYZPs8vOOIYKfk=",
1126+
version = "v0.0.0-20220112060539-c52dc94e7fbe",
10921127
)
10931128
go_repository(
10941129
name = "com_github_cncf_xds_go",
@@ -1902,6 +1937,13 @@ def go_dependencies():
19021937
sum = "h1:gv+5Pe3vaSVmiJvh/BZa82b7/00YUGm0PIyVVLop0Hw=",
19031938
version = "v4.0.2",
19041939
)
1940+
go_repository(
1941+
name = "com_github_fogleman_gg",
1942+
build_file_proto_mode = "disable_global",
1943+
importpath = "github.com/fogleman/gg",
1944+
sum = "h1:/7zJX8F6AaYQc57WQCyN9cAIz+4bCJGO9B+dyW29am8=",
1945+
version = "v1.3.0",
1946+
)
19051947
go_repository(
19061948
name = "com_github_form3tech_oss_jwt_go",
19071949
build_file_proto_mode = "disable_global",
@@ -2043,6 +2085,13 @@ def go_dependencies():
20432085
sum = "h1:nNIPOBkprlKzkThvS/0YaX8Zs9KewLCOSFQS5BU06FI=",
20442086
version = "v0.6.1",
20452087
)
2088+
go_repository(
2089+
name = "com_github_go_fonts_dejavu",
2090+
build_file_proto_mode = "disable_global",
2091+
importpath = "github.com/go-fonts/dejavu",
2092+
sum = "h1:JSajPXURYqpr+Cu8U9bt8K+XcACIHWqWrvWCKyeFmVQ=",
2093+
version = "v0.1.0",
2094+
)
20462095
go_repository(
20472096
name = "com_github_go_fonts_latin_modern",
20482097
build_file_proto_mode = "disable_global",
@@ -2057,6 +2106,13 @@ def go_dependencies():
20572106
sum = "h1:XuwG0vGHFBPRRI8Qwbi5tIvR3cku9LUfZGq/Ar16wlQ=",
20582107
version = "v0.3.2",
20592108
)
2109+
go_repository(
2110+
name = "com_github_go_fonts_stix",
2111+
build_file_proto_mode = "disable_global",
2112+
importpath = "github.com/go-fonts/stix",
2113+
sum = "h1:UlZlgrvvmT/58o573ot7NFw0vZasZ5I6bcIft/oMdgg=",
2114+
version = "v0.1.0",
2115+
)
20602116
go_repository(
20612117
name = "com_github_go_git_gcfg",
20622118
build_file_proto_mode = "disable_global",
@@ -2782,6 +2838,13 @@ def go_dependencies():
27822838
sum = "h1:9fHAtK0uDfpveeqqo1hkEZJcFvYXAiCN3UutL8F9xHw=",
27832839
version = "v0.5.5",
27842840
)
2841+
go_repository(
2842+
name = "com_github_googleapis_go_type_adapters",
2843+
build_file_proto_mode = "disable_global",
2844+
importpath = "github.com/googleapis/go-type-adapters",
2845+
sum = "h1:9XdMn+d/G57qq1s8dNc5IesGCXHf6V2HZ2JwRxfA2tA=",
2846+
version = "v1.0.0",
2847+
)
27852848
go_repository(
27862849
name = "com_github_googleapis_google_cloud_go_testing",
27872850
build_file_proto_mode = "disable_global",
@@ -3920,8 +3983,8 @@ def go_dependencies():
39203983
name = "com_github_konsorten_go_windows_terminal_sequences",
39213984
build_file_proto_mode = "disable_global",
39223985
importpath = "github.com/konsorten/go-windows-terminal-sequences",
3923-
sum = "h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8=",
3924-
version = "v1.0.3",
3986+
sum = "h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s=",
3987+
version = "v1.0.2",
39253988
)
39263989
go_repository(
39273990
name = "com_github_kr_fs",
@@ -4098,6 +4161,13 @@ def go_dependencies():
40984161
sum = "h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4=",
40994162
version = "v0.0.0-20211012122336-39d0f177ccd0",
41004163
)
4164+
go_repository(
4165+
name = "com_github_lyft_protoc_gen_star",
4166+
build_file_proto_mode = "disable_global",
4167+
importpath = "github.com/lyft/protoc-gen-star",
4168+
sum = "h1:erE0rdztuaDq3bpGifD95wfoPrSZc95nGA6tbiNYh6M=",
4169+
version = "v0.6.1",
4170+
)
41014171
go_repository(
41024172
name = "com_github_lyft_protoc_gen_star_v2",
41034173
build_file_proto_mode = "disable_global",
@@ -4935,6 +5005,20 @@ def go_dependencies():
49355005
sum = "h1:s2+RH8EGuI/mI4QwrWGSYQCRz7uNgip9BaM04HKu5kc=",
49365006
version = "v1.1.0",
49375007
)
5008+
go_repository(
5009+
name = "com_github_phpdave11_gofpdf",
5010+
build_file_proto_mode = "disable_global",
5011+
importpath = "github.com/phpdave11/gofpdf",
5012+
sum = "h1:KPKiIbfwbvC/wOncwhrpRdXVj2CZTCFlw4wnoyjtHfQ=",
5013+
version = "v1.4.2",
5014+
)
5015+
go_repository(
5016+
name = "com_github_phpdave11_gofpdi",
5017+
build_file_proto_mode = "disable_global",
5018+
importpath = "github.com/phpdave11/gofpdi",
5019+
sum = "h1:o61duiW8M9sMlkVXWlvP92sZJtGKENvW3VExs6dZukQ=",
5020+
version = "v1.0.13",
5021+
)
49385022
go_repository(
49395023
name = "com_github_pierrec_lz4",
49405024
build_file_proto_mode = "disable_global",
@@ -5087,8 +5171,9 @@ def go_dependencies():
50875171
name = "com_github_prometheus_common",
50885172
build_file_proto_mode = "disable_global",
50895173
importpath = "github.com/prometheus/common",
5090-
sum = "h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8=",
5091-
version = "v0.54.0",
5174+
replace = "github.com/prometheus/common",
5175+
sum = "h1:QO8U2CdOzSn1BBsmXJXduaaW+dY/5QLjfB8svtSzKKE=",
5176+
version = "v0.48.0",
50925177
)
50935178
go_repository(
50945179
name = "com_github_prometheus_common_assets",
@@ -5381,6 +5466,13 @@ def go_dependencies():
53815466
sum = "h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=",
53825467
version = "v2.1.0",
53835468
)
5469+
go_repository(
5470+
name = "com_github_ruudk_golang_pdf417",
5471+
build_file_proto_mode = "disable_global",
5472+
importpath = "github.com/ruudk/golang-pdf417",
5473+
sum = "h1:K1Xf3bKttbF+koVGaX5xngRIZ5bVjbmPnaxE/dR08uY=",
5474+
version = "v0.0.0-20201230142125-a7e3863a1245",
5475+
)
53845476
go_repository(
53855477
name = "com_github_ryanuber_columnize",
53865478
build_file_proto_mode = "disable_global",
@@ -6621,6 +6713,13 @@ def go_dependencies():
66216713
sum = "h1:l8VFHdNMC+9Q4EHKye2eOZBu5IwddXF6ufAXI7D+PB8=",
66226714
version = "v0.8.4",
66236715
)
6716+
go_repository(
6717+
name = "com_google_cloud_go_apikeys",
6718+
build_file_proto_mode = "disable_global",
6719+
importpath = "cloud.google.com/go/apikeys",
6720+
sum = "h1:B9CdHFZTFjVti89tmyXXrO+7vSNo2jvZuHG8zD5trdQ=",
6721+
version = "v0.6.0",
6722+
)
66246723
go_repository(
66256724
name = "com_google_cloud_go_appengine",
66266725
build_file_proto_mode = "disable_global",
@@ -6831,6 +6930,13 @@ def go_dependencies():
68316930
sum = "h1:Ob8NPT1UcB4kDaDx7/UdsRfZ8xUvUggZshXUlGWDahk=",
68326931
version = "v1.15.0",
68336932
)
6933+
go_repository(
6934+
name = "com_google_cloud_go_dataproc",
6935+
build_file_proto_mode = "disable_global",
6936+
importpath = "cloud.google.com/go/dataproc",
6937+
sum = "h1:W47qHL3W4BPkAIbk4SWmIERwsWBaNnWm0P2sdx3YgGU=",
6938+
version = "v1.12.0",
6939+
)
68346940
go_repository(
68356941
name = "com_google_cloud_go_dataproc_v2",
68366942
build_file_proto_mode = "disable_global",
@@ -6943,6 +7049,13 @@ def go_dependencies():
69437049
sum = "h1:0kcko/2AKwm4USnWcGs/W/k++PAYPA3dYaQw1y5Xg3M=",
69447050
version = "v1.16.1",
69457051
)
7052+
go_repository(
7053+
name = "com_google_cloud_go_gaming",
7054+
build_file_proto_mode = "disable_global",
7055+
importpath = "cloud.google.com/go/gaming",
7056+
sum = "h1:7vEhFnZmd931Mo7sZ6pJy7uQPDxF7m7v8xtBheG08tc=",
7057+
version = "v1.9.0",
7058+
)
69467059
go_repository(
69477060
name = "com_google_cloud_go_gkebackup",
69487061
build_file_proto_mode = "disable_global",
@@ -6971,6 +7084,13 @@ def go_dependencies():
69717084
sum = "h1:CFBoDcQi9zLOkzM6xqmRzljZhF4A6A47QaQ0WtNd+DA=",
69727085
version = "v1.1.2",
69737086
)
7087+
go_repository(
7088+
name = "com_google_cloud_go_grafeas",
7089+
build_file_proto_mode = "disable_global",
7090+
importpath = "cloud.google.com/go/grafeas",
7091+
sum = "h1:CYjC+xzdPvbV65gi6Dr4YowKcmLo045pm18L0DhdELM=",
7092+
version = "v0.2.0",
7093+
)
69747094
go_repository(
69757095
name = "com_google_cloud_go_gsuiteaddons",
69767096
build_file_proto_mode = "disable_global",
@@ -7188,6 +7308,13 @@ def go_dependencies():
71887308
sum = "h1:pX+idpWMIH30/K7c0epN6V703xpIcMXWRjKJsz0tYGY=",
71897309
version = "v1.8.1",
71907310
)
7311+
go_repository(
7312+
name = "com_google_cloud_go_recaptchaenterprise",
7313+
build_file_proto_mode = "disable_global",
7314+
importpath = "cloud.google.com/go/recaptchaenterprise",
7315+
sum = "h1:u6EznTGzIdsyOsvm+Xkw0aSuKFXQlyjGE9a4exk6iNQ=",
7316+
version = "v1.3.1",
7317+
)
71917318
go_repository(
71927319
name = "com_google_cloud_go_recaptchaenterprise_v2",
71937320
build_file_proto_mode = "disable_global",
@@ -7272,13 +7399,34 @@ def go_dependencies():
72727399
sum = "h1:NpEJeFbm3ad3ibpbpIBKXJS7eQq1cZhtt9nrDTMO/QQ=",
72737400
version = "v1.28.0",
72747401
)
7402+
go_repository(
7403+
name = "com_google_cloud_go_servicecontrol",
7404+
build_file_proto_mode = "disable_global",
7405+
importpath = "cloud.google.com/go/servicecontrol",
7406+
sum = "h1:d0uV7Qegtfaa7Z2ClDzr9HJmnbJW7jn0WhZ7wOX6hLE=",
7407+
version = "v1.11.1",
7408+
)
72757409
go_repository(
72767410
name = "com_google_cloud_go_servicedirectory",
72777411
build_file_proto_mode = "disable_global",
72787412
importpath = "cloud.google.com/go/servicedirectory",
72797413
sum = "h1:gkzx9Cd+OTOD+zY4u5vtbdvOx7vrvHYdeDiNdC6vKyw=",
72807414
version = "v1.11.5",
72817415
)
7416+
go_repository(
7417+
name = "com_google_cloud_go_servicemanagement",
7418+
build_file_proto_mode = "disable_global",
7419+
importpath = "cloud.google.com/go/servicemanagement",
7420+
sum = "h1:fopAQI/IAzlxnVeiKn/8WiV6zKndjFkvi+gzu+NjywY=",
7421+
version = "v1.8.0",
7422+
)
7423+
go_repository(
7424+
name = "com_google_cloud_go_serviceusage",
7425+
build_file_proto_mode = "disable_global",
7426+
importpath = "cloud.google.com/go/serviceusage",
7427+
sum = "h1:rXyq+0+RSIm3HFypctp7WoXxIA563rn206CfMWdqXX4=",
7428+
version = "v1.6.0",
7429+
)
72827430
go_repository(
72837431
name = "com_google_cloud_go_shell",
72847432
build_file_proto_mode = "disable_global",
@@ -7363,6 +7511,13 @@ def go_dependencies():
73637511
sum = "h1:P0Sa8+5KOEAVk/fazUNjVPzRCijCheZWJ8wL8xBn9Uk=",
73647512
version = "v1.11.6",
73657513
)
7514+
go_repository(
7515+
name = "com_google_cloud_go_vision",
7516+
build_file_proto_mode = "disable_global",
7517+
importpath = "cloud.google.com/go/vision",
7518+
sum = "h1:/CsSTkbmO9HC8iQpxbK8ATms3OQaX3YQUeTMGCxlaK4=",
7519+
version = "v1.2.0",
7520+
)
73667521
go_repository(
73677522
name = "com_google_cloud_go_vision_v2",
73687523
build_file_proto_mode = "disable_global",
@@ -8548,6 +8703,13 @@ def go_dependencies():
85488703
sum = "h1:2lYxjRbTYyxkJxlhC+LvJIx3SsANPdRybu1tGj9/OrQ=",
85498704
version = "v0.15.0",
85508705
)
8706+
go_repository(
8707+
name = "org_gonum_v1_netlib",
8708+
build_file_proto_mode = "disable_global",
8709+
importpath = "gonum.org/v1/netlib",
8710+
sum = "h1:OE9mWmgKkjJyEmDAAtGMPjXu+YNeGvK9VTSHY6+Qihc=",
8711+
version = "v0.0.0-20190313105609-8cb42192e0e0",
8712+
)
85518713
go_repository(
85528714
name = "org_gonum_v1_plot",
85538715
build_file_proto_mode = "disable_global",
@@ -8597,6 +8759,13 @@ def go_dependencies():
85978759
sum = "h1:6wrtRozgrhCxieCeJh85QsxkX/2FFrT9hdaWPlbn4Zo=",
85988760
version = "v4.17.10",
85998761
)
8762+
go_repository(
8763+
name = "org_modernc_ccorpus",
8764+
build_file_proto_mode = "disable_global",
8765+
importpath = "modernc.org/ccorpus",
8766+
sum = "h1:J16RXiiqiCgua6+ZvQot4yUuUy8zxgqbqEEUuGPlISk=",
8767+
version = "v1.11.6",
8768+
)
86008769
go_repository(
86018770
name = "org_modernc_fileutil",
86028771
build_file_proto_mode = "disable_global",
@@ -8618,6 +8787,13 @@ def go_dependencies():
86188787
sum = "h1:5D53IMaUuA5InSeMu9eJtlQXS2NxAhyWQvkKEgXZhHI=",
86198788
version = "v3.0.0-20240107210532-573471604cb6",
86208789
)
8790+
go_repository(
8791+
name = "org_modernc_httpfs",
8792+
build_file_proto_mode = "disable_global",
8793+
importpath = "modernc.org/httpfs",
8794+
sum = "h1:AAgIpFZRXuYnkjftxTAZwMIiwEqAfk8aVB2/oA6nAeM=",
8795+
version = "v1.0.6",
8796+
)
86218797
go_repository(
86228798
name = "org_modernc_libc",
86238799
build_file_proto_mode = "disable_global",
@@ -8667,13 +8843,27 @@ def go_dependencies():
86678843
sum = "h1:agBi9dp1I+eOnxXeiZawM8F4LawKv4NzGWSaLfyeNZA=",
86688844
version = "v1.2.0",
86698845
)
8846+
go_repository(
8847+
name = "org_modernc_tcl",
8848+
build_file_proto_mode = "disable_global",
8849+
importpath = "modernc.org/tcl",
8850+
sum = "h1:npxzTwFTZYM8ghWicVIX1cRWzj7Nd8i6AqqX2p+IYao=",
8851+
version = "v1.13.1",
8852+
)
86708853
go_repository(
86718854
name = "org_modernc_token",
86728855
build_file_proto_mode = "disable_global",
86738856
importpath = "modernc.org/token",
86748857
sum = "h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y=",
86758858
version = "v1.1.0",
86768859
)
8860+
go_repository(
8861+
name = "org_modernc_z",
8862+
build_file_proto_mode = "disable_global",
8863+
importpath = "modernc.org/z",
8864+
sum = "h1:RTNHdsrOpeoSeOF4FbzTo8gBYByaJ5xT7NgZ9ZqRiJM=",
8865+
version = "v1.5.1",
8866+
)
86778867
go_repository(
86788868
name = "org_mongodb_go_mongo_driver",
86798869
build_file_proto_mode = "disable_global",

0 commit comments

Comments
 (0)