Skip to content

Commit e509089

Browse files
committed
review go.mod
1 parent 5d1d816 commit e509089

File tree

2 files changed

+23
-954
lines changed

2 files changed

+23
-954
lines changed

go.mod

+9-8
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,6 @@ require (
278278
cloud.google.com/go/compute/metadata v0.5.2 // indirect
279279
cloud.google.com/go/iam v1.1.10 // indirect
280280
dario.cat/mergo v1.0.0 // indirect
281-
filippo.io/edwards25519 v1.1.0 // indirect
282281
github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
283282
github.com/99designs/keyring v1.2.2 // indirect
284283
github.com/AlekSi/pointer v1.1.0 // indirect
@@ -709,6 +708,7 @@ require (
709708
github.com/prometheus-community/go-runit v0.1.0 // indirect
710709
github.com/prometheus-community/prom-label-proxy v0.6.0 // indirect
711710
github.com/prometheus/alertmanager v0.27.0 // indirect
711+
github.com/prometheus/exporter-toolkit v0.13.1 // indirect
712712
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
713713
github.com/relvacode/iso8601 v1.4.0 // indirect
714714
github.com/remeh/sizedwaitgroup v1.0.0 // indirect
@@ -824,16 +824,18 @@ require (
824824
)
825825

826826
require (
827+
filippo.io/edwards25519 v1.1.0 // indirect
827828
github.com/Azure/go-amqp v1.2.0 // indirect
828829
github.com/DataDog/datadog-agent/comp/core/log/def v0.57.1 // indirect
829830
github.com/antchfx/xmlquery v1.4.2 // indirect
830831
github.com/antchfx/xpath v1.3.2 // indirect
831832
github.com/ebitengine/purego v0.8.0 // indirect
832833
github.com/elastic/lunes v0.1.0 // indirect
834+
github.com/mdlayher/vsock v1.2.1 // indirect
833835
github.com/moby/sys/userns v0.1.0 // indirect
836+
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/syslogexporter v0.112.0 // indirect
834837
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/kafka/topic v0.112.0 // indirect
835838
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
836-
github.com/prometheus/exporter-toolkit v0.13.1 // indirect
837839
go.opentelemetry.io/collector/connector/connectorprofiles v0.112.0 // indirect
838840
go.opentelemetry.io/collector/consumer/consumererror v0.112.0 // indirect
839841
go.opentelemetry.io/collector/consumer/consumererror/consumererrorprofiles v0.112.0 // indirect
@@ -850,10 +852,7 @@ require (
850852
go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.7.0 // indirect
851853
)
852854

853-
require (
854-
github.com/mackerelio/go-osstat v0.2.5
855-
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/syslogexporter v0.112.0
856-
)
855+
require github.com/mackerelio/go-osstat v0.2.5
857856

858857
// NOTE: replace directives below must always be *temporary*.
859858
//
@@ -909,9 +908,11 @@ replace (
909908
// https://github.com/grafana/cadvisor/tree/grafana-v0.47-noglobals
910909
github.com/google/cadvisor => github.com/grafana/cadvisor v0.0.0-20240729082359-1f04a91701e2
911910

912-
github.com/prometheus-community/postgres_exporter => github.com/grafana/postgres_exporter v0.15.1-0.20240417113938-9358270470dd
911+
// TODO(dehaansa): integrate the changes from the exporter-package-v0.15.0 branch into at least the
912+
// grafana fork of the exporter, or completely into upstream
913+
github.com/prometheus-community/postgres_exporter => github.com/grafana/postgres_exporter v0.15.1-0.20241105053755-e0a51174f168
913914

914-
// Needed until a bunch of exporters are updated, because 0.13.0 breaks compatibility in web.ListenAndServe
915+
// Needed until a bunch of exporters are updated, because 0.13.0 breaks compatibility in web.ListenAndServe
915916
github.com/prometheus/exporter-toolkit => github.com/prometheus/exporter-toolkit v0.11.0
916917

917918
// TODO(marctc): remove once this PR is merged upstream: https://github.com/prometheus/mysqld_exporter/pull/774

0 commit comments

Comments
 (0)