Merge branch 'main' into fix_web_tel_path

percona · Aug 18, 2022 · fac947f · fac947f
2 parents 7300b8c + 4d2143f
commit fac947f
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 166 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -22,21 +22,20 @@ jobs:
         go-version:
           - 1.17.x
         image:
-          - mongo:4.0
           - mongo:4.2
           - mongo:4.4
           - mongo:5.0
-          - percona/percona-server-mongodb:4.0
           - percona/percona-server-mongodb:4.2
           - percona/percona-server-mongodb:4.4
+          - percona/percona-server-mongodb:5.0
         os: [ubuntu-latest]
         may-fail: [false]
 
         include:
           # test only one image on tip to detect major Go changes earlier
           # without wasting too much time on CI
           - go-version: tip
-            image: mongo:4.2
+            image: mongo:4.4
             os: ubuntu-latest
             may-fail: true
 

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -23,14 +23,14 @@ jobs:
           go-version: 1.17
       -
         name: Login to Docker Hub
-        uses: percona-platform/login-action@v1
+        uses: percona-platform/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       -
         name: Login to GitHub Container Registry
-        uses: percona-platform/login-action@v1
+        uses: percona-platform/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -47,7 +47,7 @@ jobs:
 
       -
         name: Run GoReleaser
-        uses: percona-platform/goreleaser-action@v2
+        uses: percona-platform/goreleaser-action@v3
         with:
           version: latest
           args: release --rm-dist

diff --git a/exporter/serverstatus_collector.go b/exporter/serverstatus_collector.go
diff --git a/exporter/serverstatus_collector_test.go b/exporter/serverstatus_collector_test.go
diff --git a/go.mod b/go.mod
@@ -9,19 +9,19 @@ replace github.com/prometheus/client_golang v1.12.2 => github.com/Percona-Lab/cl
 
 require (
 	github.com/AlekSi/pointer v1.1.0
-	github.com/alecthomas/kong v0.5.0
+	github.com/alecthomas/kong v0.6.1
 	github.com/golang/snappy v0.0.3 // indirect
 	github.com/percona/exporter_shared v0.7.4-0.20211108113423-8555cdbac68b
 	github.com/percona/percona-toolkit v0.0.0-20211210121818-b2860eee3152
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.12.2
 	github.com/prometheus/client_model v0.2.0
-	github.com/prometheus/common v0.34.0
+	github.com/prometheus/common v0.37.0
 	github.com/prometheus/exporter-toolkit v0.7.1
 	github.com/shirou/gopsutil v3.21.8+incompatible // indirect
 	github.com/sirupsen/logrus v1.8.1
-	github.com/stretchr/testify v1.7.1
-	go.mongodb.org/mongo-driver v1.9.1
+	github.com/stretchr/testify v1.8.0
+	go.mongodb.org/mongo-driver v1.10.1
 )
 
 require (
@@ -32,24 +32,24 @@ require (
 	github.com/go-kit/log v0.2.0 // indirect
 	github.com/go-logfmt/logfmt v0.5.1 // indirect
 	github.com/go-ole/go-ole v1.2.4 // indirect
-	github.com/go-stack/stack v1.8.0 // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-cmp v0.5.6 // indirect
 	github.com/jpillora/backoff v1.0.0 // indirect
 	github.com/klauspost/compress v1.13.6 // indirect
 	github.com/kr/text v0.2.0 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
+	github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe // indirect
 	github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
 	github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/prometheus/procfs v0.7.3 // indirect
 	github.com/tklauser/go-sysconf v0.3.9 // indirect
 	github.com/tklauser/numcpus v0.3.0 // indirect
 	github.com/xdg-go/pbkdf2 v1.0.0 // indirect
-	github.com/xdg-go/scram v1.0.2 // indirect
-	github.com/xdg-go/stringprep v1.0.2 // indirect
+	github.com/xdg-go/scram v1.1.1 // indirect
+	github.com/xdg-go/stringprep v1.0.3 // indirect
 	github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
-	golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect
+	golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d // indirect
 	golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
 	golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
@@ -60,5 +60,5 @@ require (
 	gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
 	gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
-	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )