Skip to content

Commit ed099c7

Browse files
authored
chore(deps): bump go to 1.23 and bump go mods (#608)
* chore(deps): bump go to 1.23 and bump go mods Signed-off-by: wuhuizuo <[email protected]> * chore(monitor-snapshot): delete the stale folder `v4.0.0-beta.1` Signed-off-by: wuhuizuo <[email protected]> * fix: fix vulnerability alerts intruduced by gopkg.in/src-d/go-git.v4 Signed-off-by: wuhuizuo <[email protected]> --------- Signed-off-by: wuhuizuo <[email protected]>
1 parent ea70fdf commit ed099c7

26 files changed

+268
-65980
lines changed

cmd/main.go

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
// package is used to automic generate directory of dashboards and alert rules.
22
// The monitor like this:
33
// monitor
4-
// v2.1.8
5-
// dashboards
6-
// tidb.json
7-
// ...
8-
// rules
9-
// pd.rule.yml
10-
// ...
11-
// Dockerfile
12-
// init.sh
13-
// ...
4+
//
5+
// v2.1.8
6+
// dashboards
7+
// tidb.json
8+
// ...
9+
// rules
10+
// pd.rule.yml
11+
// ...
12+
// Dockerfile
13+
// init.sh
14+
// ...
1415
package main
1516

1617
import (
@@ -22,6 +23,10 @@ import (
2223
"strings"
2324
"time"
2425

26+
"github.com/go-git/go-git/v5"
27+
"github.com/go-git/go-git/v5/config"
28+
"github.com/go-git/go-git/v5/plumbing"
29+
"github.com/go-git/go-git/v5/storage/memory"
2530
"github.com/hashicorp/go-version"
2631
"github.com/pkg/errors"
2732
"github.com/prometheus/common/model"
@@ -31,10 +36,6 @@ import (
3136
"github.com/tidwall/sjson"
3237
"github.com/youthlin/stream"
3338
streamtypes "github.com/youthlin/stream/types"
34-
"gopkg.in/src-d/go-git.v4"
35-
"gopkg.in/src-d/go-git.v4/config"
36-
"gopkg.in/src-d/go-git.v4/plumbing"
37-
"gopkg.in/src-d/go-git.v4/storage/memory"
3839
"gopkg.in/yaml.v2"
3940
)
4041

cmd/monitoring.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"strings"
1111
"time"
1212

13-
"github.com/google/go-github/github"
13+
"github.com/google/go-github/v66/github"
1414
"github.com/pkg/errors"
1515
"github.com/spf13/cobra"
1616
"github.com/youthlin/stream"

go.mod

Lines changed: 94 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,104 @@
11
module github.com/pingcap/monitoring
22

3-
go 1.12
3+
go 1.23
44

55
require (
6-
github.com/fsnotify/fsnotify v1.4.7
7-
github.com/gin-gonic/gin v1.9.1
8-
github.com/go-kit/kit v0.9.0 // indirect
9-
github.com/google/go-github v17.0.0+incompatible
10-
github.com/google/go-querystring v1.0.0
11-
github.com/hashicorp/go-version v1.2.0
12-
github.com/opentracing/opentracing-go v1.1.0 // indirect
13-
github.com/pkg/errors v0.8.1
6+
github.com/fsnotify/fsnotify v1.7.0
7+
github.com/gin-gonic/gin v1.10.0
8+
github.com/go-git/go-git/v5 v5.12.0
9+
github.com/google/go-github/v66 v66.0.0
10+
github.com/google/go-querystring v1.1.0
11+
github.com/hashicorp/go-version v1.7.0
12+
github.com/pkg/errors v0.9.1
1413
github.com/prometheus/common v0.4.1
1514
github.com/prometheus/prometheus v0.0.0-20190710134608-e5b22494857d
16-
github.com/rakyll/statik v0.1.6
17-
github.com/sirupsen/logrus v1.4.2 // indirect
18-
github.com/spf13/cobra v0.0.5
19-
github.com/tidwall/gjson v1.9.3
20-
github.com/tidwall/sjson v1.0.4
15+
github.com/rakyll/statik v0.1.7
16+
github.com/spf13/cobra v1.8.1
17+
github.com/tidwall/gjson v1.18.0
18+
github.com/tidwall/sjson v1.2.5
2119
github.com/youthlin/stream v0.0.3
22-
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
23-
gopkg.in/src-d/go-git.v4 v4.12.0
24-
gopkg.in/yaml.v2 v2.2.8
25-
k8s.io/api v0.0.0-20190720062849-3043179095b6 // indirect
20+
golang.org/x/oauth2 v0.23.0
21+
gopkg.in/yaml.v2 v2.4.0
2622
k8s.io/client-go v12.0.0+incompatible
27-
k8s.io/utils v0.0.0-20190607212802-c55fbcfc754a // indirect
2823
)
2924

30-
replace github.com/ugorji/go v1.1.4 => github.com/ugorji/go/codec v0.0.0-20190204201341-e444a5086c43
25+
require (
26+
dario.cat/mergo v1.0.0 // indirect
27+
github.com/Microsoft/go-winio v0.6.1 // indirect
28+
github.com/ProtonMail/go-crypto v1.0.0 // indirect
29+
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc // indirect
30+
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf // indirect
31+
github.com/beorn7/perks v1.0.0 // indirect
32+
github.com/bytedance/sonic v1.11.6 // indirect
33+
github.com/bytedance/sonic/loader v0.1.1 // indirect
34+
github.com/cespare/xxhash v1.1.0 // indirect
35+
github.com/cloudflare/circl v1.3.7 // indirect
36+
github.com/cloudwego/base64x v0.1.4 // indirect
37+
github.com/cloudwego/iasm v0.2.0 // indirect
38+
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
39+
github.com/davecgh/go-spew v1.1.1 // indirect
40+
github.com/emirpasic/gods v1.18.1 // indirect
41+
github.com/gabriel-vasile/mimetype v1.4.3 // indirect
42+
github.com/gin-contrib/sse v0.1.0 // indirect
43+
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
44+
github.com/go-git/go-billy/v5 v5.5.0 // indirect
45+
github.com/go-kit/kit v0.9.0 // indirect
46+
github.com/go-logfmt/logfmt v0.4.0 // indirect
47+
github.com/go-playground/locales v0.14.1 // indirect
48+
github.com/go-playground/universal-translator v0.18.1 // indirect
49+
github.com/go-playground/validator/v10 v10.20.0 // indirect
50+
github.com/goccy/go-json v0.10.2 // indirect
51+
github.com/gogo/protobuf v1.2.1 // indirect
52+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
53+
github.com/golang/protobuf v1.5.0 // indirect
54+
github.com/golang/snappy v0.0.1 // indirect
55+
github.com/google/gofuzz v1.0.0 // indirect
56+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
57+
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
58+
github.com/json-iterator/go v1.1.12 // indirect
59+
github.com/kevinburke/ssh_config v1.2.0 // indirect
60+
github.com/klauspost/cpuid/v2 v2.2.7 // indirect
61+
github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515 // indirect
62+
github.com/leodido/go-urn v1.4.0 // indirect
63+
github.com/mattn/go-isatty v0.0.20 // indirect
64+
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
65+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
66+
github.com/modern-go/reflect2 v1.0.2 // indirect
67+
github.com/oklog/ulid v1.3.1 // indirect
68+
github.com/opentracing/opentracing-go v1.1.0 // indirect
69+
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
70+
github.com/pjbgf/sha1cd v0.3.0 // indirect
71+
github.com/prometheus/client_golang v1.0.0 // indirect
72+
github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90 // indirect
73+
github.com/prometheus/procfs v0.0.2 // indirect
74+
github.com/prometheus/tsdb v0.9.1 // indirect
75+
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
76+
github.com/sirupsen/logrus v1.9.0 // indirect
77+
github.com/skeema/knownhosts v1.2.2 // indirect
78+
github.com/spf13/pflag v1.0.5 // indirect
79+
github.com/tidwall/match v1.1.1 // indirect
80+
github.com/tidwall/pretty v1.2.0 // indirect
81+
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
82+
github.com/ugorji/go/codec v1.2.12 // indirect
83+
github.com/xanzy/ssh-agent v0.3.3 // indirect
84+
golang.org/x/arch v0.8.0 // indirect
85+
golang.org/x/crypto v0.23.0 // indirect
86+
golang.org/x/mod v0.12.0 // indirect
87+
golang.org/x/net v0.25.0 // indirect
88+
golang.org/x/sync v0.3.0 // indirect
89+
golang.org/x/sys v0.20.0 // indirect
90+
golang.org/x/term v0.20.0 // indirect
91+
golang.org/x/text v0.15.0 // indirect
92+
golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2 // indirect
93+
golang.org/x/tools v0.13.0 // indirect
94+
google.golang.org/protobuf v1.34.1 // indirect
95+
gopkg.in/alecthomas/kingpin.v2 v2.2.6 // indirect
96+
gopkg.in/inf.v0 v0.9.1 // indirect
97+
gopkg.in/warnings.v0 v0.1.2 // indirect
98+
gopkg.in/yaml.v3 v3.0.1 // indirect
99+
k8s.io/api v0.0.0-20190720062849-3043179095b6 // indirect
100+
k8s.io/apimachinery v0.0.0-20190719140911-bfcf53abc9f8 // indirect
101+
k8s.io/klog v0.3.1 // indirect
102+
k8s.io/utils v0.0.0-20190607212802-c55fbcfc754a // indirect
103+
sigs.k8s.io/yaml v1.1.0 // indirect
104+
)

0 commit comments

Comments
 (0)