Skip to content

Commit

Permalink
chore(deps): bump go to 1.23 and bump go mods (#608)
Browse files Browse the repository at this point in the history
* 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]>
  • Loading branch information
wuhuizuo authored Oct 11, 2024
1 parent ea70fdf commit ed099c7
Show file tree
Hide file tree
Showing 26 changed files with 268 additions and 65,980 deletions.
29 changes: 15 additions & 14 deletions cmd/main.go
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
// package is used to automic generate directory of dashboards and alert rules.
// The monitor like this:
// monitor
// v2.1.8
// dashboards
// tidb.json
// ...
// rules
// pd.rule.yml
// ...
// Dockerfile
// init.sh
// ...
//
// v2.1.8
// dashboards
// tidb.json
// ...
// rules
// pd.rule.yml
// ...
// Dockerfile
// init.sh
// ...
package main

import (
Expand All @@ -22,6 +23,10 @@ import (
"strings"
"time"

"github.com/go-git/go-git/v5"
"github.com/go-git/go-git/v5/config"
"github.com/go-git/go-git/v5/plumbing"
"github.com/go-git/go-git/v5/storage/memory"
"github.com/hashicorp/go-version"
"github.com/pkg/errors"
"github.com/prometheus/common/model"
Expand All @@ -31,10 +36,6 @@ import (
"github.com/tidwall/sjson"
"github.com/youthlin/stream"
streamtypes "github.com/youthlin/stream/types"
"gopkg.in/src-d/go-git.v4"
"gopkg.in/src-d/go-git.v4/config"
"gopkg.in/src-d/go-git.v4/plumbing"
"gopkg.in/src-d/go-git.v4/storage/memory"
"gopkg.in/yaml.v2"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/monitoring.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"strings"
"time"

"github.com/google/go-github/github"
"github.com/google/go-github/v66/github"
"github.com/pkg/errors"
"github.com/spf13/cobra"
"github.com/youthlin/stream"
Expand Down
114 changes: 94 additions & 20 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,30 +1,104 @@
module github.com/pingcap/monitoring

go 1.12
go 1.23

require (
github.com/fsnotify/fsnotify v1.4.7
github.com/gin-gonic/gin v1.9.1
github.com/go-kit/kit v0.9.0 // indirect
github.com/google/go-github v17.0.0+incompatible
github.com/google/go-querystring v1.0.0
github.com/hashicorp/go-version v1.2.0
github.com/opentracing/opentracing-go v1.1.0 // indirect
github.com/pkg/errors v0.8.1
github.com/fsnotify/fsnotify v1.7.0
github.com/gin-gonic/gin v1.10.0
github.com/go-git/go-git/v5 v5.12.0
github.com/google/go-github/v66 v66.0.0
github.com/google/go-querystring v1.1.0
github.com/hashicorp/go-version v1.7.0
github.com/pkg/errors v0.9.1
github.com/prometheus/common v0.4.1
github.com/prometheus/prometheus v0.0.0-20190710134608-e5b22494857d
github.com/rakyll/statik v0.1.6
github.com/sirupsen/logrus v1.4.2 // indirect
github.com/spf13/cobra v0.0.5
github.com/tidwall/gjson v1.9.3
github.com/tidwall/sjson v1.0.4
github.com/rakyll/statik v0.1.7
github.com/spf13/cobra v1.8.1
github.com/tidwall/gjson v1.18.0
github.com/tidwall/sjson v1.2.5
github.com/youthlin/stream v0.0.3
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
gopkg.in/src-d/go-git.v4 v4.12.0
gopkg.in/yaml.v2 v2.2.8
k8s.io/api v0.0.0-20190720062849-3043179095b6 // indirect
golang.org/x/oauth2 v0.23.0
gopkg.in/yaml.v2 v2.4.0
k8s.io/client-go v12.0.0+incompatible
k8s.io/utils v0.0.0-20190607212802-c55fbcfc754a // indirect
)

replace github.com/ugorji/go v1.1.4 => github.com/ugorji/go/codec v0.0.0-20190204201341-e444a5086c43
require (
dario.cat/mergo v1.0.0 // indirect
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/ProtonMail/go-crypto v1.0.0 // indirect
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc // indirect
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf // indirect
github.com/beorn7/perks v1.0.0 // indirect
github.com/bytedance/sonic v1.11.6 // indirect
github.com/bytedance/sonic/loader v0.1.1 // indirect
github.com/cespare/xxhash v1.1.0 // indirect
github.com/cloudflare/circl v1.3.7 // indirect
github.com/cloudwego/base64x v0.1.4 // indirect
github.com/cloudwego/iasm v0.2.0 // indirect
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emirpasic/gods v1.18.1 // indirect
github.com/gabriel-vasile/mimetype v1.4.3 // indirect
github.com/gin-contrib/sse v0.1.0 // indirect
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
github.com/go-git/go-billy/v5 v5.5.0 // indirect
github.com/go-kit/kit v0.9.0 // indirect
github.com/go-logfmt/logfmt v0.4.0 // indirect
github.com/go-playground/locales v0.14.1 // indirect
github.com/go-playground/universal-translator v0.18.1 // indirect
github.com/go-playground/validator/v10 v10.20.0 // indirect
github.com/goccy/go-json v0.10.2 // indirect
github.com/gogo/protobuf v1.2.1 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.0 // indirect
github.com/golang/snappy v0.0.1 // indirect
github.com/google/gofuzz v1.0.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/kevinburke/ssh_config v1.2.0 // indirect
github.com/klauspost/cpuid/v2 v2.2.7 // indirect
github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515 // indirect
github.com/leodido/go-urn v1.4.0 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/oklog/ulid v1.3.1 // indirect
github.com/opentracing/opentracing-go v1.1.0 // indirect
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
github.com/pjbgf/sha1cd v0.3.0 // indirect
github.com/prometheus/client_golang v1.0.0 // indirect
github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90 // indirect
github.com/prometheus/procfs v0.0.2 // indirect
github.com/prometheus/tsdb v0.9.1 // indirect
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
github.com/sirupsen/logrus v1.9.0 // indirect
github.com/skeema/knownhosts v1.2.2 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/tidwall/match v1.1.1 // indirect
github.com/tidwall/pretty v1.2.0 // indirect
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
github.com/ugorji/go/codec v1.2.12 // indirect
github.com/xanzy/ssh-agent v0.3.3 // indirect
golang.org/x/arch v0.8.0 // indirect
golang.org/x/crypto v0.23.0 // indirect
golang.org/x/mod v0.12.0 // indirect
golang.org/x/net v0.25.0 // indirect
golang.org/x/sync v0.3.0 // indirect
golang.org/x/sys v0.20.0 // indirect
golang.org/x/term v0.20.0 // indirect
golang.org/x/text v0.15.0 // indirect
golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2 // indirect
golang.org/x/tools v0.13.0 // indirect
google.golang.org/protobuf v1.34.1 // indirect
gopkg.in/alecthomas/kingpin.v2 v2.2.6 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/api v0.0.0-20190720062849-3043179095b6 // indirect
k8s.io/apimachinery v0.0.0-20190719140911-bfcf53abc9f8 // indirect
k8s.io/klog v0.3.1 // indirect
k8s.io/utils v0.0.0-20190607212802-c55fbcfc754a // indirect
sigs.k8s.io/yaml v1.1.0 // indirect
)
Loading

0 comments on commit ed099c7

Please sign in to comment.