testing/prometheus-node-exporter: upgrade to 0.18.0

3 files changed, 21 insertions, 50 deletions

diff --git a/testing/prometheus-node-exporter/APKBUILD b/testing/prometheus-node-exporter/APKBUILD
index 5db3e3ad7f..f0b54bdba7 100644
--- a/testing/prometheus-node-exporter/APKBUILD
+++ b/testing/prometheus-node-exporter/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Tiago Ilieve <tiago.myhro@gmail.com>
 pkgname=prometheus-node-exporter
 _pkgname=node_exporter
-pkgver=0.17.0
+pkgver=0.18.0
 pkgrel=0
 pkgdesc="Prometheus exporter for machine metrics"
 url="https://github.com/prometheus/node_exporter"
@@ -13,7 +13,6 @@ install="$pkgname.pre-install $pkgname.pre-upgrade"
 subpackages="$pkgname-openrc"
 source="$_pkgname-$pkgver.tar.gz::https://github.com/prometheus/node_exporter/archive/v$pkgver.tar.gz
 	disable-go-race-detector.patch
-	fix-go-sum.patch
 	node-exporter.confd
 	node-exporter.initd"
 builddir="$srcdir/$_pkgname-$pkgver"
@@ -39,8 +38,7 @@ package() {
 	install -Dm755 ./node_exporter "$pkgdir"/usr/bin/node_exporter
 }
 
-sha512sums="8650fa24014f317b23cdbe2a6f12da0912ffc74cab815d1c94fdc0a3dc01ac1dff42a454af2ebbd4d402b7834d227bcf91ebdefa630ebe997cfd478e05ee01e5  node_exporter-0.17.0.tar.gz
-82511dfe2d4d12a10d6c367225066e23a52d6389d977ecad6ceb26567f67a69b427b52e58c403d89e6f8f2ebb88879002b2ef7280f675e188a64421947b21ea0  disable-go-race-detector.patch
-2bafe0433583f14d5e99502e11ac9a9ee75c99f8f466480e569b7ef15a95529f799a3c87348020df07ff8103a4bcc42d6f4274c842d44b97620d6d6337c2b541  fix-go-sum.patch
+sha512sums="9c6f9f82b0d3f5147cef8cc933ab9d7854065782f83b9821d4ae394a5101c45de6c8e8fcdc53d076af0c8683c47030557ec8e2bd27386a81a815d714e0f88987  node_exporter-0.18.0.tar.gz
+36952039e5db39aa06a2ca16fa5d318f22eb967e3e9b1363508b2f3d3d0b14e5df111c77ce951bea2f65dd2be0a0a1582be245acfe4641623381a940204e53d9  disable-go-race-detector.patch
 592d3f17a3cf487d97a14c803dded07d2dfb112b159ab1a3575310fc0176fc3255ddad6657f16a8d6d3c161bfb03c203a6271ec6e6395b75716a14b0de8baced  node-exporter.confd
 df006b184c3b2d5e773044838db7143dc3a64e621f4da6b106f41915a07d5cef32933ab9bb44464f10c132f86997ae7753ae19627afd4ba6cfb125161786dfe0  node-exporter.initd"
diff --git a/testing/prometheus-node-exporter/disable-go-race-detector.patch b/testing/prometheus-node-exporter/disable-go-race-detector.patch
index 99c146d037..ba3c4cf571 100644
--- a/testing/prometheus-node-exporter/disable-go-race-detector.patch
+++ b/testing/prometheus-node-exporter/disable-go-race-detector.patch
@@ -1,33 +1,33 @@
-From 3c66e043f16c833214a10b3aaf36a16c7c1af834 Mon Sep 17 00:00:00 2001
+From 5136eb5266b2ff022a44a3316a07d02b4dcc9e08 Mon Sep 17 00:00:00 2001
 From: Tiago Ilieve <tiago.myhro@gmail.com>
-Date: Fri, 25 Jan 2019 14:50:25 +0100
+Date: Sun, 12 May 2019 11:21:01 +0200
 Subject: [PATCH] Disable Go race detector
 
 Go race detector is not supported on musl[1].
 
 [1]: https://github.com/golang/go/issues/14481
 ---
- Makefile | 7 -------
+ Makefile.common | 7 -------
  1 file changed, 7 deletions(-)
 
-diff --git a/Makefile b/Makefile
-index d6d138c..b61484b 100644
---- a/Makefile
-+++ b/Makefile
-@@ -33,13 +33,6 @@ else
- 	OS_detected := $(shell uname -s)
- endif
+diff --git a/Makefile.common b/Makefile.common
+index 4f18ea5..18085e4 100644
+--- a/Makefile.common
++++ b/Makefile.common
+@@ -94,13 +94,6 @@ BUILD_DOCKER_ARCHS = $(addprefix common-docker-,$(DOCKER_ARCHS))
+ PUBLISH_DOCKER_ARCHS = $(addprefix common-docker-publish-,$(DOCKER_ARCHS))
+ TAG_DOCKER_ARCHS = $(addprefix common-docker-tag-latest-,$(DOCKER_ARCHS))
  
 -ifeq ($(GOHOSTARCH),amd64)
--	ifeq ($(OS_detected),$(filter $(OS_detected),Linux FreeBSD Darwin Windows))
--		# Only supported on amd64
--		test-flags := -race
--	endif
+-        ifeq ($(GOHOSTOS),$(filter $(GOHOSTOS),linux freebsd darwin windows))
+-                # Only supported on amd64
+-                test-flags := -race
+-        endif
 -endif
 -
- ifeq ($(OS_detected), Linux)
- 	test-e2e := test-e2e
- else
+ # This rule is used to forward a target like "build" to "common-build".  This
+ # allows a new "build" target to be defined in a Makefile which includes this
+ # one and override "common-build" without override warnings.
 -- 
-2.18.1
+2.17.1
 
diff --git a/testing/prometheus-node-exporter/fix-go-sum.patch b/testing/prometheus-node-exporter/fix-go-sum.patch
deleted file mode 100644
index 45c35fa162..0000000000
--- a/testing/prometheus-node-exporter/fix-go-sum.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 2fdbf50c525a0ac7ed169b8ca838327ba70c89a4 Mon Sep 17 00:00:00 2001
-From: Tiago Ilieve <tiago.myhro@gmail.com>
-Date: Fri, 25 Jan 2019 14:34:25 +0100
-Subject: [PATCH] Fix 'go.sum' hashes
-
-'github.com/soundcloud/go-runit' was failing with a 'checksum mismatch'
-error message.
----
- go.sum | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/go.sum b/go.sum
-index 5a60f0a..2de8dba 100644
---- a/go.sum
-+++ b/go.sum
-@@ -47,7 +47,7 @@ github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d h1:GoAlyOgbOEIFd
- github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
- github.com/sirupsen/logrus v1.1.1 h1:VzGj7lhU7KEB9e9gMpAV/v5XT2NVSvLJhJLCWbnkgXg=
- github.com/sirupsen/logrus v1.1.1/go.mod h1:zrgwTnHtNr00buQ1vSptGe8m1f/BbgsPukg8qsT7A+A=
--github.com/soundcloud/go-runit v0.0.0-20150630195641-06ad41a06c4a h1:TGsOnmXp0mo82KbjaDcsTibGxWIdZNXbKJB18gFn1RM=
-+github.com/soundcloud/go-runit v0.0.0-20150630195641-06ad41a06c4a h1:os5OBNhwOwybXZMNLqT96XqtjdTtwRFw2w08uluvNeI=
- github.com/soundcloud/go-runit v0.0.0-20150630195641-06ad41a06c4a/go.mod h1:LeFCbQYJ3KJlPs/FvPz2dy1tkpxyeNESVyCNNzRXFR0=
- github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
- github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
--- 
-2.18.1
-