From 9354e3720380ddfee02a14b86018c023fe207c4f Mon Sep 17 00:00:00 2001 From: Ben Kochie Date: Sun, 19 Jun 2022 11:05:03 +0200 Subject: [PATCH] Update build * Update build to Go 1.18. * Update minimum version to 1.17. * Update machine image to latest. * Enable dependabot. * Simplify build in readme. Signed-off-by: Ben Kochie --- .circleci/config.yml | 6 +++--- .github/dependabot.yml | 6 ++++++ .promu.yml | 2 +- README.md | 2 +- go.mod | 31 +++++++++++++++++++++++++++++-- go.sum | 1 - 6 files changed, 40 insertions(+), 8 deletions(-) create mode 100644 .github/dependabot.yml diff --git a/.circleci/config.yml b/.circleci/config.yml index f5c08821..bbf6fbb9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,7 +7,7 @@ executors: # should also be updated. golang: docker: - - image: circleci/golang:1.17 + - image: cimg/go:1.18 jobs: test: executor: golang @@ -54,9 +54,9 @@ jobs: destination: /build test_docker: machine: - image: ubuntu-2004:202101-01 + image: ubuntu-2204:2022.04.2 environment: - DOCKER_TEST_IMAGE_NAME: quay.io/prometheus/golang-builder:1.16-base + DOCKER_TEST_IMAGE_NAME: quay.io/prometheus/golang-builder:1.18-base REPO_PATH: github.com/prometheus/node_exporter steps: - prometheus/setup_environment diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000..202ae236 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,6 @@ +version: 2 +updates: + - package-ecosystem: "gomod" + directory: "/" + schedule: + interval: "monthly" diff --git a/.promu.yml b/.promu.yml index 373000dd..9f97dec2 100644 --- a/.promu.yml +++ b/.promu.yml @@ -1,7 +1,7 @@ go: # Whenever the Go version is updated here, .circle/config.yml and # .promu-cgo.yml should also be updated. - version: 1.17 + version: 1.18 repository: path: github.com/prometheus/node_exporter build: diff --git a/README.md b/README.md index 5389f8a1..675a43d7 100644 --- a/README.md +++ b/README.md @@ -266,7 +266,7 @@ Building: git clone https://github.com/prometheus/node_exporter.git cd node_exporter - make + make build ./node_exporter To see all available configuration flags: diff --git a/go.mod b/go.mod index 6b44eea9..6bcf9dc4 100644 --- a/go.mod +++ b/go.mod @@ -1,5 +1,7 @@ module github.com/prometheus/node_exporter +go 1.17 + require ( github.com/beevik/ntp v0.3.0 github.com/coreos/go-systemd/v22 v22.3.2 @@ -20,10 +22,35 @@ require ( github.com/prometheus/exporter-toolkit v0.7.1 github.com/prometheus/procfs v0.7.4-0.20211011103944-1a7a2bd3279f github.com/safchain/ethtool v0.2.0 - github.com/siebenmann/go-kstat v0.0.0-20210513183136-173c9b0a9973 // indirect github.com/soundcloud/go-runit v0.0.0-20150630195641-06ad41a06c4a golang.org/x/sys v0.0.0-20220330033206-e17cdc41300f gopkg.in/alecthomas/kingpin.v2 v2.2.6 ) -go 1.14 +require ( + github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect + github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d // indirect + github.com/beorn7/perks v1.0.1 // indirect + github.com/cespare/xxhash/v2 v2.1.2 // indirect + github.com/go-logfmt/logfmt v0.5.1 // indirect + github.com/golang/protobuf v1.5.2 // indirect + github.com/google/go-cmp v0.5.7 // indirect + github.com/josharian/native v1.0.0 // indirect + github.com/jpillora/backoff v1.0.0 // indirect + github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect + github.com/mdlayher/genetlink v1.2.0 // indirect + github.com/mdlayher/socket v0.2.2 // indirect + github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/siebenmann/go-kstat v0.0.0-20210513183136-173c9b0a9973 // indirect + go.uber.org/atomic v1.7.0 // indirect + go.uber.org/multierr v1.6.0 // indirect + golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // 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 + golang.org/x/text v0.3.7 // indirect + google.golang.org/appengine v1.6.6 // indirect + google.golang.org/protobuf v1.26.0 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect +) diff --git a/go.sum b/go.sum index be0a3f88..22864c5d 100644 --- a/go.sum +++ b/go.sum @@ -69,7 +69,6 @@ github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymF github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/frankban/quicktest v1.14.0 h1:+cqqvzZV87b4adx/5ayVOaYZ2CrvM4ejQvUdBzPPUss= github.com/frankban/quicktest v1.14.0/go.mod h1:NeW+ay9A/U67EYXNFA1nPE8e/tnQv/09mUdL/ijj8og= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=