Skip to content

Commit 001be76

Browse files
mchromeLomonosov Romanlomik
authored
Fix Prometheus 2.54.1, remove vendoring (#292)
* prometheus 2.54.1 * remove vendoring, prom ui from https://github.com/lomik/prometheus-ui-static * don't keep last point * remove prometheus replace * remove -mod=vendor * remove -tags builtinassets --------- Co-authored-by: Lomonosov Roman <[email protected]> Co-authored-by: lomik <[email protected]>
1 parent d0d8c08 commit 001be76

File tree

3,215 files changed

+283
-1046875
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,215 files changed

+283
-1046875
lines changed

Diff for: ‎Makefile

+2-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ DESCRIPTION:="Graphite cluster backend with ClickHouse support"
33
MODULE:=github.com/lomik/graphite-clickhouse
44

55
GO ?= go
6-
export GOFLAGS += -mod=vendor
76
export GO111MODULE := on
87
TEMPDIR:=$(shell mktemp -d)
98

@@ -26,10 +25,10 @@ clean:
2625
rm -f sha256sum md5sum
2726

2827
$(NAME): $(SRCS)
29-
$(GO) build -tags builtinassets -ldflags '-X main.BuildVersion=$(VERSION)' $(MODULE)
28+
$(GO) build -ldflags '-X main.BuildVersion=$(VERSION)' $(MODULE)
3029

3130
debug: $(SRCS)
32-
$(GO) build -tags builtinassets -ldflags '-X main.BuildVersion=$(VERSION)' -gcflags=all='-N -l' $(MODULE)
31+
$(GO) build -ldflags '-X main.BuildVersion=$(VERSION)' -gcflags=all='-N -l' $(MODULE)
3332

3433
deploy/doc/graphite-clickhouse.conf: $(NAME)
3534
./$(NAME) -config-print-default > $@

Diff for: ‎go.mod

+79-52
Original file line numberDiff line numberDiff line change
@@ -1,81 +1,94 @@
11
module github.com/lomik/graphite-clickhouse
22

3-
go 1.21
3+
go 1.23.1
44

55
require (
66
github.com/BurntSushi/toml v0.3.1
7-
github.com/bradfitz/gomemcache v0.0.0-20220106215444-fb4bf637b56d
8-
github.com/cactus/go-statsd-client/v5 v5.0.0
9-
github.com/go-graphite/carbonapi v0.15.7-0.20221103163928-b07075b57524
7+
github.com/bradfitz/gomemcache v0.0.0-20230905024940-24af94b03874
8+
github.com/cactus/go-statsd-client/v5 v5.1.0
9+
github.com/go-graphite/carbonapi v0.16.1
1010
github.com/go-graphite/protocol v1.0.0
1111
github.com/gogo/protobuf v1.3.2
12-
github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd
12+
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc
1313
github.com/json-iterator/go v1.1.12
14-
github.com/klauspost/compress v1.17.7
15-
github.com/lomik/carbon-clickhouse v0.11.7
14+
github.com/klauspost/compress v1.17.9
15+
github.com/lomik/carbon-clickhouse v0.11.8
1616
github.com/lomik/graphite-pickle v0.0.0-20171221213606-614e8df42119
1717
github.com/lomik/og-rek v0.0.0-20170411191824-628eefeb8d80
18+
github.com/lomik/prometheus-ui-static v0.2.54-1.1
1819
github.com/lomik/zapwriter v0.0.0-20210624082824-c1161d1eb463
1920
github.com/msaf1980/go-expirecache v0.0.2
2021
github.com/msaf1980/go-metrics v0.0.14
2122
github.com/msaf1980/go-stringutils v0.1.6
2223
github.com/msaf1980/go-syncutils v0.0.3
23-
github.com/msaf1980/go-timeutils v0.0.3
24+
github.com/msaf1980/go-timeutils v0.0.4
2425
github.com/pelletier/go-toml v1.9.5
2526
github.com/pkg/errors v0.9.1
26-
github.com/prometheus/client_golang v1.19.0
27-
github.com/prometheus/client_model v0.6.0
28-
github.com/prometheus/prometheus v0.51.1
27+
github.com/prometheus/client_golang v1.20.3
28+
github.com/prometheus/client_model v0.6.1
29+
github.com/prometheus/common/assets v0.2.0
30+
github.com/prometheus/prometheus v0.0.0-20240827104400-e6cfa720fbe6
2931
github.com/stretchr/testify v1.9.0
30-
go.uber.org/zap v1.21.0
31-
golang.org/x/sync v0.6.0
32+
go.uber.org/zap v1.24.0
33+
golang.org/x/sync v0.8.0
3234
)
3335

3436
require (
35-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.10.0 // indirect
36-
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.1 // indirect
37-
github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.2 // indirect
38-
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.1 // indirect
39-
github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9 // indirect
37+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.14.0 // indirect
38+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0 // indirect
39+
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
40+
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
41+
github.com/alecthomas/units v0.0.0-20240626203959-61d1e3462e30 // indirect
4042
github.com/ansel1/merry v1.6.2 // indirect
41-
github.com/ansel1/merry/v2 v2.0.1 // indirect
43+
github.com/ansel1/merry/v2 v2.0.2 // indirect
4244
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
43-
github.com/aws/aws-sdk-go v1.50.32 // indirect
45+
github.com/aws/aws-sdk-go v1.55.5 // indirect
4446
github.com/bboreham/go-loser v0.0.0-20230920113527-fcc2c21820a3 // indirect
4547
github.com/beorn7/perks v1.0.1 // indirect
46-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
48+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
4749
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
4850
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
4951
github.com/dennwc/varint v1.0.0 // indirect
52+
github.com/digitalocean/godo v1.122.0 // indirect
53+
github.com/docker/docker v27.2.0+incompatible // indirect
5054
github.com/edsrzf/mmap-go v1.1.0 // indirect
55+
github.com/envoyproxy/go-control-plane v0.13.0 // indirect
56+
github.com/envoyproxy/protoc-gen-validate v1.1.0 // indirect
5157
github.com/facette/natsort v0.0.0-20181210072756-2cd4dd1e2dcb // indirect
5258
github.com/felixge/httpsnoop v1.0.4 // indirect
5359
github.com/go-kit/log v0.2.1 // indirect
5460
github.com/go-logfmt/logfmt v0.6.0 // indirect
55-
github.com/go-logr/logr v1.4.1 // indirect
61+
github.com/go-logr/logr v1.4.2 // indirect
5662
github.com/go-logr/stdr v1.2.2 // indirect
5763
github.com/go-openapi/analysis v0.22.2 // indirect
58-
github.com/go-openapi/errors v0.21.1 // indirect
64+
github.com/go-openapi/errors v0.22.0 // indirect
5965
github.com/go-openapi/jsonpointer v0.20.2 // indirect
6066
github.com/go-openapi/jsonreference v0.20.4 // indirect
6167
github.com/go-openapi/loads v0.21.5 // indirect
6268
github.com/go-openapi/spec v0.20.14 // indirect
63-
github.com/go-openapi/strfmt v0.22.2 // indirect
69+
github.com/go-openapi/strfmt v0.23.0 // indirect
6470
github.com/go-openapi/swag v0.22.9 // indirect
6571
github.com/go-openapi/validate v0.23.0 // indirect
66-
github.com/golang-jwt/jwt/v5 v5.2.0 // indirect
67-
github.com/golang/protobuf v1.5.3 // indirect
72+
github.com/go-zookeeper/zk v1.0.4 // indirect
73+
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
6874
github.com/golang/snappy v0.0.4 // indirect
6975
github.com/google/go-cmp v0.6.0 // indirect
7076
github.com/google/uuid v1.6.0 // indirect
71-
github.com/hashicorp/go-version v1.6.0 // indirect
77+
github.com/gophercloud/gophercloud v1.14.0 // indirect
78+
github.com/hashicorp/consul/api v1.29.4 // indirect
79+
github.com/hetznercloud/hcloud-go/v2 v2.13.1 // indirect
80+
github.com/ionos-cloud/sdk-go/v6 v6.2.1 // indirect
7281
github.com/jmespath/go-jmespath v0.4.0 // indirect
7382
github.com/josharian/intern v1.0.0 // indirect
7483
github.com/jpillora/backoff v1.0.0 // indirect
7584
github.com/julienschmidt/httprouter v1.3.0 // indirect
7685
github.com/kylelemons/godebug v1.1.0 // indirect
86+
github.com/linode/linodego v1.40.0 // indirect
7787
github.com/lomik/stop v0.0.0-20161127103810-188e98d969bd // indirect
7888
github.com/mailru/easyjson v0.7.7 // indirect
89+
github.com/mdlayher/socket v0.4.1 // indirect
90+
github.com/mdlayher/vsock v1.2.1 // indirect
91+
github.com/miekg/dns v1.1.62 // indirect
7992
github.com/mitchellh/mapstructure v1.5.0 // indirect
8093
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
8194
github.com/modern-go/reflect2 v1.0.2 // indirect
@@ -85,39 +98,53 @@ require (
8598
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
8699
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
87100
github.com/prometheus/alertmanager v0.27.0 // indirect
88-
github.com/prometheus/common v0.49.1-0.20240306132007-4199f18c3e92 // indirect
89-
github.com/prometheus/common/assets v0.2.0 // indirect
101+
github.com/prometheus/common v0.59.1 // indirect
90102
github.com/prometheus/common/sigv4 v0.1.0 // indirect
91-
github.com/prometheus/exporter-toolkit v0.11.0 // indirect
92-
github.com/prometheus/procfs v0.12.0 // indirect
103+
github.com/prometheus/exporter-toolkit v0.12.0 // indirect
104+
github.com/prometheus/procfs v0.15.1 // indirect
105+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.30 // indirect
93106
github.com/shurcooL/httpfs v0.0.0-20230704072500-f1e31cf0ba5c // indirect
94107
github.com/stretchr/objx v0.5.2 // indirect
95108
go.mongodb.org/mongo-driver v1.14.0 // indirect
96-
go.opentelemetry.io/collector/featuregate v1.3.0 // indirect
97-
go.opentelemetry.io/collector/pdata v1.3.0 // indirect
98-
go.opentelemetry.io/collector/semconv v0.96.0 // indirect
99-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
100-
go.opentelemetry.io/otel v1.24.0 // indirect
101-
go.opentelemetry.io/otel/metric v1.24.0 // indirect
102-
go.opentelemetry.io/otel/trace v1.24.0 // indirect
109+
go.opentelemetry.io/collector/pdata v1.14.1 // indirect
110+
go.opentelemetry.io/collector/semconv v0.108.1 // indirect
111+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
112+
go.opentelemetry.io/otel v1.29.0 // indirect
113+
go.opentelemetry.io/otel/metric v1.29.0 // indirect
114+
go.opentelemetry.io/otel/trace v1.29.0 // indirect
103115
go.uber.org/atomic v1.11.0 // indirect
104116
go.uber.org/goleak v1.3.0 // indirect
105117
go.uber.org/multierr v1.11.0 // indirect
106-
golang.org/x/crypto v0.21.0 // indirect
118+
golang.org/x/crypto v0.26.0 // indirect
107119
golang.org/x/exp v0.0.0-20240119083558-1b970713d09a // indirect
108-
golang.org/x/net v0.23.0 // indirect
109-
golang.org/x/oauth2 v0.18.0 // indirect
110-
golang.org/x/sys v0.18.0 // indirect
111-
golang.org/x/text v0.14.0 // indirect
112-
golang.org/x/time v0.5.0 // indirect
113-
google.golang.org/appengine v1.6.8 // indirect
114-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240304161311-37d4d3c04a78 // indirect
115-
google.golang.org/grpc v1.62.1 // indirect
116-
google.golang.org/protobuf v1.33.0 // indirect
120+
golang.org/x/net v0.28.0 // indirect
121+
golang.org/x/oauth2 v0.23.0 // indirect
122+
golang.org/x/sys v0.25.0 // indirect
123+
golang.org/x/text v0.18.0 // indirect
124+
golang.org/x/time v0.6.0 // indirect
125+
golang.org/x/tools v0.24.0 // indirect
126+
google.golang.org/genproto/googleapis/api v0.0.0-20240827150818-7e3bb234dfed // indirect
127+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
128+
google.golang.org/grpc v1.66.0 // indirect
129+
google.golang.org/protobuf v1.34.2 // indirect
117130
gopkg.in/yaml.v2 v2.4.0 // indirect
118131
gopkg.in/yaml.v3 v3.0.1 // indirect
119-
k8s.io/apimachinery v0.29.2 // indirect
120-
k8s.io/client-go v0.29.2 // indirect
121-
k8s.io/klog/v2 v2.120.1 // indirect
122-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
132+
k8s.io/apimachinery v0.31.0 // indirect
133+
k8s.io/client-go v0.31.0 // indirect
134+
k8s.io/klog/v2 v2.130.1 // indirect
135+
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
136+
)
137+
138+
replace (
139+
k8s.io/klog => github.com/simonpasquier/klog-gokit v0.3.0
140+
k8s.io/klog/v2 => github.com/simonpasquier/klog-gokit/v3 v3.5.0
141+
)
142+
143+
// Exclude linodego v1.0.0 as it is no longer published on github.
144+
exclude github.com/linode/linodego v1.0.0
145+
146+
// Exclude grpc v1.30.0 because of breaking changes. See #7621.
147+
exclude (
148+
github.com/grpc-ecosystem/grpc-gateway v1.14.7
149+
google.golang.org/api v0.30.0
123150
)

0 commit comments

Comments
 (0)