Update prometheus to v2.9.2

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

Update prometheus to v2.9.2

Claudio Jeker
This updates prometheus to v2.9.2, my quick testing shows that it works.
The tests work after a few tries, there is some race when opening port
9090.

--
:wq Claudio

Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/prometheus/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile 4 May 2019 21:46:17 -0000 1.4
+++ Makefile 5 May 2019 09:06:26 -0000
@@ -4,8 +4,7 @@ COMMENT = systems monitoring and alerti
 
 GH_ACCOUNT = prometheus
 GH_PROJECT = prometheus
-GH_TAGNAME = v2.0.0
-REVISION = 0
+GH_TAGNAME = v2.9.2
 
 CATEGORIES = sysutils
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/sysutils/prometheus/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 10 Jan 2018 16:26:19 -0000 1.1.1.1
+++ distinfo 4 May 2019 13:53:14 -0000
@@ -1,2 +1,2 @@
-SHA256 (prometheus-2.0.0.tar.gz) = aUeumy1BTUkwQDSiY18OHs1FrIOk9FkupbzKQNb3lRs=
-SIZE (prometheus-2.0.0.tar.gz) = 5603884
+SHA256 (prometheus-2.9.2.tar.gz) = +gC9/NhoyExhIj3+YOs7xnd3hX5J2yyCaFTHBsXqRVE=
+SIZE (prometheus-2.9.2.tar.gz) = 11477683
Index: patches/patch-Makefile
===================================================================
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- patches/patch-Makefile 10 Jan 2018 16:26:19 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.1.1.1 2018/01/10 16:26:19 claudio Exp $
-
-Index: Makefile
---- Makefile.orig
-+++ Makefile
-@@ -86,11 +86,7 @@ assets:
- @$(GO) fmt ./web/ui
-
- promu:
-- @echo ">> fetching promu"
-- @GOOS=$(shell uname -s | tr A-Z a-z) \
-- GOARCH=$(subst x86_64,amd64,$(patsubst i%86,386,$(shell uname -m))) \
-- GO="$(GO)" \
-- $(GO) get -u github.com/prometheus/promu
-+ @true
-
- $(FIRST_GOPATH)/bin/staticcheck:
- @GOOS= GOARCH= $(GO) get -u honnef.co/go/tools/cmd/staticcheck
Index: patches/patch-Makefile_common
===================================================================
RCS file: patches/patch-Makefile_common
diff -N patches/patch-Makefile_common
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Makefile_common 4 May 2019 14:08:56 -0000
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+Index: Makefile.common
+--- Makefile.common.orig
++++ Makefile.common
+@@ -213,11 +213,7 @@ common-docker-tag-latest:
+ promu: $(PROMU)
+
+ $(PROMU):
+- $(eval PROMU_TMP := $(shell mktemp -d))
+- curl -s -L $(PROMU_URL) | tar -xvzf - -C $(PROMU_TMP)
+- mkdir -p $(FIRST_GOPATH)/bin
+- cp $(PROMU_TMP)/promu-$(PROMU_VERSION).$(GO_BUILD_PLATFORM)/promu $(FIRST_GOPATH)/bin/promu
+- rm -r $(PROMU_TMP)
++ @true
+
+ .PHONY: proto
+ proto:
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/sysutils/prometheus/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 10 Jan 2018 16:26:19 -0000 1.1.1.1
+++ pkg/PLIST 4 May 2019 14:12:26 -0000
@@ -1,13 +1,14 @@
 @comment $OpenBSD: PLIST,v 1.1.1.1 2018/01/10 16:26:19 claudio Exp $
 @newgroup _prometheus:799
 @newuser _prometheus:799:_prometheus:daemon:prometheus:/nonexistent:/sbin/nologin
+@sample ${SYSCONFDIR}/prometheus/
+@rcscript ${RCDIR}/prometheus
 @bin bin/prometheus
 @bin bin/promtool
 share/doc/prometheus/
 share/doc/prometheus/LICENSE
 share/doc/prometheus/NOTICE
 share/examples/prometheus/
-@sample ${SYSCONFDIR}/prometheus/
 share/examples/prometheus/console_libraries/
 share/examples/prometheus/console_libraries/menu.lib
 share/examples/prometheus/console_libraries/prom.lib
@@ -25,7 +26,3 @@ share/examples/prometheus/prometheus.yml
 @owner _prometheus
 @group _prometheus
 @sample ${LOCALSTATEDIR}/prometheus/
-@mode
-@owner
-@group
-@rcscript ${RCDIR}/prometheus