On Mon, Oct 22, 2018 at 05:40:00AM -0500, Abel Abraham Camarillo Ojeda wrote:
> Hi Claudio,
>
> Updates prometheus to 2.4.3, tested in amd64
>
> Allow rc_reload since prometheus correctly handles SIGHUP.
>
> Thoughts?
I'm currently not using prometheus but looks fine to me.
There has been some changes to the TSDB, did you check that the upgrade
works from 2.0 to 2.4? After upgrade reverting back will be impossible.
Can a ports developer have a look as well?
> Thanks
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/sysutils/prometheus/Makefile,v
> retrieving revision 1.2
> diff -u -p -r1.2 Makefile
> --- Makefile 14 Apr 2018 22:53:54 -0000 1.2
> +++ Makefile 22 Oct 2018 04:52:00 -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.4.3
>
> 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 22 Oct 2018 04:52:25 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (prometheus-2.0.0.tar.gz) =
> aUeumy1BTUkwQDSiY18OHs1FrIOk9FkupbzKQNb3lRs=
> -SIZE (prometheus-2.0.0.tar.gz) = 5603884
> +SHA256 (prometheus-2.4.3.tar.gz) =
> T4Rpf3Rqgd9F5DSie0trLCPAh2iqD2i3vPiPTubR2NY=
> +SIZE (prometheus-2.4.3.tar.gz) = 6095284
> 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 22 Oct 2018 05:19:29 -0000
> @@ -0,0 +1,14 @@
> +$OpenBSD$
> +
> +Index: Makefile.common
> +--- Makefile.common.orig
> ++++ Makefile.common
> +@@ -121,7 +121,7 @@ common-docker-tag-latest:
> +
> + .PHONY: promu
> + promu:
> +- GOOS= GOARCH= $(GO) get -u github.com/prometheus/promu
> ++ @true
> +
> + .PHONY: $(STATICCHECK)
> + $(STATICCHECK):
> Index: pkg/prometheus.rc
> ===================================================================
> RCS file: /cvs/ports/sysutils/prometheus/pkg/prometheus.rc,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 prometheus.rc
> --- pkg/prometheus.rc 10 Jan 2018 16:26:19 -0000 1.1.1.1
> +++ pkg/prometheus.rc 22 Oct 2018 09:58:06 -0000
> @@ -11,7 +11,6 @@ daemon_user=_prometheus
>
> pexp="${daemon}.*"
> rc_bg=YES
> -rc_reload=NO
>
> rc_start() {
> ${rcexec} "${daemon} ${daemon_flags} < /dev/null 2>&1 | \
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/sysutils/prometheus/Makefile,v
> retrieving revision 1.2
> diff -u -p -r1.2 Makefile
> --- Makefile 14 Apr 2018 22:53:54 -0000 1.2
> +++ Makefile 22 Oct 2018 04:52:00 -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.4.3
>
> 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 22 Oct 2018 04:52:25 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (prometheus-2.0.0.tar.gz) =
> aUeumy1BTUkwQDSiY18OHs1FrIOk9FkupbzKQNb3lRs=
> -SIZE (prometheus-2.0.0.tar.gz) = 5603884
> +SHA256 (prometheus-2.4.3.tar.gz) =
> T4Rpf3Rqgd9F5DSie0trLCPAh2iqD2i3vPiPTubR2NY=
> +SIZE (prometheus-2.4.3.tar.gz) = 6095284
> 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 22 Oct 2018 05:19:29 -0000
> @@ -0,0 +1,14 @@
> +$OpenBSD$
> +
> +Index: Makefile.common
> +--- Makefile.common.orig
> ++++ Makefile.common
> +@@ -121,7 +121,7 @@ common-docker-tag-latest:
> +
> + .PHONY: promu
> + promu:
> +- GOOS= GOARCH= $(GO) get -u github.com/prometheus/promu
> ++ @true
> +
> + .PHONY: $(STATICCHECK)
> + $(STATICCHECK):
> Index: pkg/prometheus.rc
> ===================================================================
> RCS file: /cvs/ports/sysutils/prometheus/pkg/prometheus.rc,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 prometheus.rc
> --- pkg/prometheus.rc 10 Jan 2018 16:26:19 -0000 1.1.1.1
> +++ pkg/prometheus.rc 22 Oct 2018 09:58:06 -0000
> @@ -11,7 +11,6 @@ daemon_user=_prometheus
>
> pexp="${daemon}.*"
> rc_bg=YES
> -rc_reload=NO
>
> rc_start() {
> ${rcexec} "${daemon} ${daemon_flags} < /dev/null 2>&1 | \
--
:wq Claudio
