From cdd1b0647326e16c98e8bf3a58c4e9ffa3179a3b Mon Sep 17 00:00:00 2001
From: Denis Fondras <github@ggl.ledeuns.net>
Date: Mon, 3 May 2021 13:14:13 +0200
Subject: [PATCH] Update to OpenBSD 6.9 and VictoriaMetrics 1.59 (#1263)

* Update to OpenBSD 6.9 and VictoriaMetrics 1.58

While at it, also build vmagent

* Bump to v1.59 and remove zstd dependency
---
 ports/OpenBSD/README.md                       | 10 ++++----
 ports/OpenBSD/VictoriaMetrics/Makefile        |  6 +++--
 ports/OpenBSD/VictoriaMetrics/distinfo        |  4 ++--
 ports/OpenBSD/VictoriaMetrics/pkg/PLIST       | 23 +++++++++++++++----
 ports/OpenBSD/VictoriaMetrics/pkg/vmetrics.rc |  3 ++-
 5 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/ports/OpenBSD/README.md b/ports/OpenBSD/README.md
index f23a06732b..fd5b9555bc 100644
--- a/ports/OpenBSD/README.md
+++ b/ports/OpenBSD/README.md
@@ -1,11 +1,11 @@
 # OpenBSD ports 
 
-Tested with Release 6.8
+Tested with Release 6.9
 
-The VictoriaMetrics DB must be place in `/usr/ports/sysutils` directory
-and the file `/usr/ports/infrastructure/db/user.list`
-should be modified with a new line
+The VictoriaMetrics DB must be place in `/usr/ports/databases` directory
+and the file `/usr/ports/infrastructure/db/user.list` should be modified
+with a new line
 ```
-862 _vmetrics            _vmetrics       sysutils/VictoriaMetrics
+866 _vmetrics            _vmetrics       databases/VictoriaMetrics
 ```
 
diff --git a/ports/OpenBSD/VictoriaMetrics/Makefile b/ports/OpenBSD/VictoriaMetrics/Makefile
index 0a67fe0f61..c5c29f2a3c 100644
--- a/ports/OpenBSD/VictoriaMetrics/Makefile
+++ b/ports/OpenBSD/VictoriaMetrics/Makefile
@@ -4,9 +4,9 @@ COMMENT =		fast, cost-effective and scalable time series database
 
 GH_ACCOUNT =		VictoriaMetrics
 GH_PROJECT =		VictoriaMetrics
-GH_TAGNAME =		v1.46.0
+GH_TAGNAME =		v1.59.0
 
-CATEGORIES =		sysutils
+CATEGORIES =		databases
 
 HOMEPAGE =		https://victoriametrics.com/
 
@@ -27,10 +27,12 @@ do-build:
 	cd ${WRKSRC} && GOOS=openbsd ${MAKE_ENV} ${MAKE_PROGRAM} victoria-metrics-pure
 	cd ${WRKSRC} && GOOS=openbsd ${MAKE_ENV} ${MAKE_PROGRAM} vmbackup
 	cd ${WRKSRC} && GOOS=openbsd ${MAKE_ENV} ${MAKE_PROGRAM} vmrestore
+	cd ${WRKSRC} && GOOS=openbsd ${MAKE_ENV} ${MAKE_PROGRAM} vmagent-pure
 
 do-install:
 	${INSTALL_PROGRAM} ./pkg/vmlogger.pl ${PREFIX}/bin/vmetricslogger.pl
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/victoria-metrics-pure ${PREFIX}/bin/vmetrics
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/vmagent-pure ${PREFIX}/bin/vmagent
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/vmbackup ${PREFIX}/bin/vmetricsbackup
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/vmrestore ${PREFIX}/bin/vmetricsrestore
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/vmetrics/
diff --git a/ports/OpenBSD/VictoriaMetrics/distinfo b/ports/OpenBSD/VictoriaMetrics/distinfo
index bb1e013a77..045ce1d657 100644
--- a/ports/OpenBSD/VictoriaMetrics/distinfo
+++ b/ports/OpenBSD/VictoriaMetrics/distinfo
@@ -1,2 +1,2 @@
-SHA256 (VictoriaMetrics-1.46.0.tar.gz) = s9wWGc/VTF9LrK7Ingg1qEhD0lN198hfUqXOut6CH3Y=
-SIZE (VictoriaMetrics-1.46.0.tar.gz) = 9101866
+SHA256 (VictoriaMetrics-1.59.0.tar.gz) = /chb4noFxU6OZbLO7kjBfdleMDvN80hqwqAVQ2QJGr0=
+SIZE (VictoriaMetrics-1.59.0.tar.gz) = 11040979
diff --git a/ports/OpenBSD/VictoriaMetrics/pkg/PLIST b/ports/OpenBSD/VictoriaMetrics/pkg/PLIST
index 494d1fda42..2ff4da4c52 100644
--- a/ports/OpenBSD/VictoriaMetrics/pkg/PLIST
+++ b/ports/OpenBSD/VictoriaMetrics/pkg/PLIST
@@ -1,36 +1,49 @@
 @comment $OpenBSD: PLIST,v$
-@newgroup _vmetrics:862
-@newuser _vmetrics:862:_vmetrics:daemon:VictoriaMetrics:${VARBASE}/db/vmetrics:/sbin/nologin
+@newgroup _vmetrics:866
+@newuser _vmetrics:866:_vmetrics:daemon:VictoriaMetrics:${VARBASE}/db/vmetrics:/sbin/nologin
 @sample ${SYSCONFDIR}/prometheus/
 @rcscript ${RCDIR}/vmetrics
+@bin bin/vmagent
 @bin bin/vmetrics
 @bin bin/vmetricsbackup
-@bin bin/vmetricsrestore
 @bin bin/vmetricslogger.pl
+@bin bin/vmetricsrestore
 share/doc/vmetrics/
 share/doc/vmetrics/Articles.md
+share/doc/vmetrics/BestPractices.md
 share/doc/vmetrics/CHANGELOG.md
 share/doc/vmetrics/CaseStudies.md
 share/doc/vmetrics/Cluster-VictoriaMetrics.md
-share/doc/vmetrics/ExtendedPromQL.md
 share/doc/vmetrics/FAQ.md
 share/doc/vmetrics/Home.md
 share/doc/vmetrics/LICENSE
 share/doc/vmetrics/MetricsQL.md
+share/doc/vmetrics/PerTenantStatistic.md
 share/doc/vmetrics/Quick-Start.md
 share/doc/vmetrics/README.md
 share/doc/vmetrics/Release-Guide.md
 share/doc/vmetrics/SampleSizeCalculations.md
 share/doc/vmetrics/Single-server-VictoriaMetrics.md
+share/doc/vmetrics/latest.png
 share/doc/vmetrics/logo.png
+share/doc/vmetrics/per-tenant-stats.jpg
 share/doc/vmetrics/robots.txt
+share/doc/vmetrics/root.png
+share/doc/vmetrics/rp_daily_1.png
+share/doc/vmetrics/rp_daily_2.png
 share/doc/vmetrics/vmagent.md
 share/doc/vmetrics/vmagent.png
 share/doc/vmetrics/vmalert.md
 share/doc/vmetrics/vmauth.md
 share/doc/vmetrics/vmbackup.md
+share/doc/vmetrics/vmbackupmanager.md
+share/doc/vmetrics/vmctl.md
+share/doc/vmetrics/vmgateway-access-control.jpg
+share/doc/vmetrics/vmgateway-overview.jpeg
+share/doc/vmetrics/vmgateway-rate-limiting.jpg
+share/doc/vmetrics/vmgateway.md
 share/doc/vmetrics/vmrestore.md
 @mode 0755
 @owner _vmetrics
 @group _vmetrics
-@sample ${VARBASE}/db/vmetrics
+@sample ${VARBASE}/db/vmetrics/
diff --git a/ports/OpenBSD/VictoriaMetrics/pkg/vmetrics.rc b/ports/OpenBSD/VictoriaMetrics/pkg/vmetrics.rc
index f1cc1048f4..2ef38cc5f3 100644
--- a/ports/OpenBSD/VictoriaMetrics/pkg/vmetrics.rc
+++ b/ports/OpenBSD/VictoriaMetrics/pkg/vmetrics.rc
@@ -15,7 +15,8 @@ rc_reload=NO
 me=`basename $0`
 
 rc_start() {
-	${rcexec} "${daemon} -loggerDisableTimestamps ${daemon_flags} < /dev/null 2>&1 | ${TRUEPREFIX}/bin/vmetricslogger.pl $me"
+	${rcexec} "${daemon} -loggerDisableTimestamps ${daemon_flags} \
+	    < /dev/null 2>&1 | ${TRUEPREFIX}/bin/vmetricslogger.pl $me"
 }
 
 rc_cmd $1