mudhorn/node_exporter
1
0
Fork 0
mirror of https://github.com/prometheus/node_exporter.git synced 2024-12-28 23:19:46 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add Darwin arm64 build

Browse source 
Add darwin/arm64 to the CGO crossbuilder list.
* Update Makefile.common to pick up new promu.
* Fix possible nil pointer caught by staticcheck.
* Update collector build tags.

https://github.com/prometheus/node_exporter/issues/1997

Signed-off-by: Ben Kochie <superq@gmail.com>
This commit is contained in:
Ben Kochie 2021-04-12 18:46:27 +02:00
parent a5908bf82b
commit 7b5cc3e505
No known key found for this signature in database
GPG key ID: C646B23C9E3245F1
6 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.promu-cgo.yml
View file

@ -22,5 +22,6 @@ tarball:
crossbuild: crossbuild:
platforms: platforms:
- darwin/amd64 - darwin/amd64
- darwin/arm64
- netbsd/amd64 - netbsd/amd64
- netbsd/386 - netbsd/386

4
Makefile.common
View file

@ -78,12 +78,12 @@ ifneq ($(shell which gotestsum),)
endif endif
endif endif
PROMU_VERSION ?= 0.11.1 PROMU_VERSION ?= 0.12.0
PROMU_URL := https://github.com/prometheus/promu/releases/download/v$(PROMU_VERSION)/promu-$(PROMU_VERSION).$(GO_BUILD_PLATFORM).tar.gz PROMU_URL := https://github.com/prometheus/promu/releases/download/v$(PROMU_VERSION)/promu-$(PROMU_VERSION).$(GO_BUILD_PLATFORM).tar.gz
GOLANGCI_LINT := GOLANGCI_LINT :=
GOLANGCI_LINT_OPTS ?= GOLANGCI_LINT_OPTS ?=
GOLANGCI_LINT_VERSION ?= v1.36.0 GOLANGCI_LINT_VERSION ?= v1.39.0
# golangci-lint only supports linux, darwin and windows platforms on i386/amd64. # golangci-lint only supports linux, darwin and windows platforms on i386/amd64.
# windows isn't included here because of the path separator being different. # windows isn't included here because of the path separator being different.
ifeq ($(GOHOSTOS),$(filter $(GOHOSTOS),linux darwin)) ifeq ($(GOHOSTOS),$(filter $(GOHOSTOS),linux darwin))

2
collector/filesystem_bsd.go
View file

@ -11,7 +11,7 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
// +build openbsd,!amd64 darwin,amd64 dragonfly // +build openbsd,!amd64 darwin dragonfly
// +build !nofilesystem // +build !nofilesystem
package collector package collector

2
collector/filesystem_common.go
View file

@ -12,7 +12,7 @@
// limitations under the License. // limitations under the License.
// +build !nofilesystem // +build !nofilesystem
// +build linux freebsd openbsd darwin,amd64 dragonfly // +build linux freebsd openbsd darwin dragonfly
package collector package collector

2
collector/filesystem_openbsd_amd64.go
View file

@ -11,7 +11,7 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
// +build openbsd darwin,amd64 dragonfly // +build openbsd
// +build !nofilesystem // +build !nofilesystem
package collector package collector

7
collector/zfs_linux.go
View file

@ -102,7 +102,7 @@ func (c *zfsCollector) updatePoolStats(ch chan<- prometheus.Metric) error {
for _, zpoolPath := range zpoolObjsetPaths { for _, zpoolPath := range zpoolObjsetPaths {
file, err := os.Open(zpoolPath) file, err := os.Open(zpoolPath)
if err != nil { if err != nil {
// this file should exist, but there is a race where an exporting pool can remove the files -- ok to ignore // This file should exist, but there is a race where an exporting pool can remove the files. Ok to ignore.
level.Debug(c.logger).Log("msg", "Cannot open file for reading", "path", zpoolPath) level.Debug(c.logger).Log("msg", "Cannot open file for reading", "path", zpoolPath)
return errZFSNotAvailable return errZFSNotAvailable
} }
@ -122,13 +122,14 @@ func (c *zfsCollector) updatePoolStats(ch chan<- prometheus.Metric) error {
} }
if zpoolStatePaths == nil { if zpoolStatePaths == nil {
level.Debug(c.logger).Log("msg", "Not found pool state files") level.Debug(c.logger).Log("msg", "No pool state files found")
return nil
} }
for _, zpoolPath := range zpoolStatePaths { for _, zpoolPath := range zpoolStatePaths {
file, err := os.Open(zpoolPath) file, err := os.Open(zpoolPath)
if err != nil { if err != nil {
// this file should exist, but there is a race where an exporting pool can remove the files -- ok to ignore // This file should exist, but there is a race where an exporting pool can remove the files. Ok to ignore.
level.Debug(c.logger).Log("msg", "Cannot open file for reading", "path", zpoolPath) level.Debug(c.logger).Log("msg", "Cannot open file for reading", "path", zpoolPath)
return errZFSNotAvailable return errZFSNotAvailable
} }