git: 5e1c19abe5d6 - main - net-mgmt/{victoria-metrics,vmutils}: update both ports to version 1.70.0.

From: Alexey Dokuchaev <danfe_at_FreeBSD.org>
Date: Tue, 07 Dec 2021 11:27:29 UTC
The branch main has been updated by danfe:

URL: https://cgit.FreeBSD.org/ports/commit/?id=5e1c19abe5d68237b60b8fce32e0ecf73af8c041

commit 5e1c19abe5d68237b60b8fce32e0ecf73af8c041
Author:     Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2021-12-07 11:26:44 +0000
Commit:     Alexey Dokuchaev <danfe@FreeBSD.org>
CommitDate: 2021-12-07 11:26:44 +0000

    net-mgmt/{victoria-metrics,vmutils}: update both ports to version 1.70.0.
---
 net-mgmt/victoria-metrics/Makefile      |  4 ++--
 net-mgmt/victoria-metrics/Makefile.deps | 18 +++++++-------
 net-mgmt/victoria-metrics/distinfo      | 42 ++++++++++++++++-----------------
 net-mgmt/victoria-metrics/pkg-plist     |  2 ++
 net-mgmt/vmutils/pkg-plist              |  4 ++++
 5 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/net-mgmt/victoria-metrics/Makefile b/net-mgmt/victoria-metrics/Makefile
index 975fabd15232..d95a20e88563 100644
--- a/net-mgmt/victoria-metrics/Makefile
+++ b/net-mgmt/victoria-metrics/Makefile
@@ -1,7 +1,7 @@
 # Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
 
 PORTNAME?=	victoria-metrics
-PORTVERSION=	1.69.0		# don't forget to update BUILDINFO_TAG
+PORTVERSION=	1.70.0		# don't forget to update BUILDINFO_TAG
 DISTVERSIONPREFIX=	v
 CATEGORIES=	net-mgmt
 
@@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 USES=		gmake go:modules,no_targets
 USE_RC_SUBR?=	${PORTNAME}
 MAKE_ENV=	PKG_TAG=${DISTVERSIONPREFIX}${DISTVERSION} \
-		GOOS=${OPSYS:tl} BUILDINFO_TAG=69e655b \
+		GOOS=${OPSYS:tl} BUILDINFO_TAG=7f2f26b \
 		DATEINFO_TAG=${_GET_DATE:sh}
 ALL_TARGET=	${PORTNAME}-pure
 
diff --git a/net-mgmt/victoria-metrics/Makefile.deps b/net-mgmt/victoria-metrics/Makefile.deps
index 47076fbfbcaf..dee065248ab0 100644
--- a/net-mgmt/victoria-metrics/Makefile.deps
+++ b/net-mgmt/victoria-metrics/Makefile.deps
@@ -1,20 +1,20 @@
 # Generated with `make gomod-vendor'
 GH_TUPLE=	\
-		VictoriaMetrics:fastcache:v1.7.0:victoriametrics_fastcache/vendor/github.com/VictoriaMetrics/fastcache \
+		VictoriaMetrics:fastcache:v1.8.0:victoriametrics_fastcache/vendor/github.com/VictoriaMetrics/fastcache \
 		VictoriaMetrics:fasthttp:v1.1.0:victoriametrics_fasthttp/vendor/github.com/VictoriaMetrics/fasthttp \
 		VictoriaMetrics:metrics:v1.18.1:victoriametrics_metrics/vendor/github.com/VictoriaMetrics/metrics \
-		VictoriaMetrics:metricsql:v0.30.0:victoriametrics_metricsql/vendor/github.com/VictoriaMetrics/metricsql \
+		VictoriaMetrics:metricsql:v0.31.0:victoriametrics_metricsql/vendor/github.com/VictoriaMetrics/metricsql \
 		VividCortex:ewma:v1.2.0:vividcortex_ewma/vendor/github.com/VividCortex/ewma \
-		aws:aws-sdk-go:v1.41.19:aws_aws_sdk_go/vendor/github.com/aws/aws-sdk-go \
+		aws:aws-sdk-go:v1.42.17:aws_aws_sdk_go/vendor/github.com/aws/aws-sdk-go \
 		beorn7:perks:v1.0.1:beorn7_perks/vendor/github.com/beorn7/perks \
 		census-instrumentation:opencensus-go:v0.23.0:census_instrumentation_opencensus_go/vendor/go.opencensus.io \
 		census-instrumentation:opencensus-proto:v0.3.0:census_instrumentation_opencensus_proto/vendor/github.com/census-instrumentation/opencensus-proto \
 		cespare:xxhash:v2.1.2:cespare_xxhash/vendor/github.com/cespare/xxhash/v2 \
 		cheggaaa:pb:v3.0.8:cheggaaa_pb/vendor/github.com/cheggaaa/pb \
 		cncf:udpa:04548b0d99d4:cncf_udpa_go/vendor/github.com/cncf/udpa \
-		cncf:xds:cb28da3451f1:cncf_xds_go/vendor/github.com/cncf/xds \
+		cncf:xds:a8f946100490:cncf_xds_go/vendor/github.com/cncf/xds \
 		cpuguy83:go-md2man:v2.0.1:cpuguy83_go_md2man/vendor/github.com/cpuguy83/go-md2man/v2 \
-		envoyproxy:go-control-plane:v0.10.0:envoyproxy_go_control_plane/vendor/github.com/envoyproxy/go-control-plane \
+		envoyproxy:go-control-plane:v0.10.1:envoyproxy_go_control_plane/vendor/github.com/envoyproxy/go-control-plane \
 		envoyproxy:protoc-gen-validate:v0.6.2:envoyproxy_protoc_gen_validate/vendor/github.com/envoyproxy/protoc-gen-validate \
 		fatih:color:v1.13.0:fatih_color/vendor/github.com/fatih/color \
 		go-kit:kit:v0.12.0:go_kit_kit/vendor/github.com/go-kit/kit \
@@ -23,16 +23,16 @@ GH_TUPLE=	\
 		go-yaml:yaml:v2.4.0:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
 		golang:appengine:v1.6.7:golang_appengine/vendor/google.golang.org/appengine \
 		golang:groupcache:41bb18bfe9da:golang_groupcache/vendor/github.com/golang/groupcache \
-		golang:net:b53810dc28af:golang_net/vendor/golang.org/x/net \
+		golang:net:0a0e4e1bb54c:golang_net/vendor/golang.org/x/net \
 		golang:oauth2:d3ed0bb246c8:golang_oauth2/vendor/golang.org/x/oauth2 \
 		golang:protobuf:v1.5.2:golang_protobuf/vendor/github.com/golang/protobuf \
 		golang:snappy:v0.0.4:golang_snappy/vendor/github.com/golang/snappy \
 		golang:sync:036812b2e83c:golang_sync/vendor/golang.org/x/sync \
-		golang:sys:e0b2ad06fe42:golang_sys/vendor/golang.org/x/sys \
+		golang:sys:fe61309f8881:golang_sys/vendor/golang.org/x/sys \
 		golang:text:v0.3.7:golang_text/vendor/golang.org/x/text \
 		golang:xerrors:5ec99f83aff1:golang_xerrors/vendor/golang.org/x/xerrors \
 		google:go-cmp:v0.5.6:google_go_cmp/vendor/github.com/google/go-cmp \
-		google:go-genproto:4c6863e31247:google_go_genproto/vendor/google.golang.org/genproto \
+		google:go-genproto:f09f9a12af12:google_go_genproto/vendor/google.golang.org/genproto \
 		googleapis:gax-go:v2.1.1:googleapis_gax_go/vendor/github.com/googleapis/gax-go \
 		googleapis:google-api-go-client:v0.60.0:googleapis_google_api_go_client/vendor/google.golang.org/api \
 		googleapis:google-cloud-go:storage/v1.18.2:googleapis_google_cloud_go_storage \
@@ -41,7 +41,7 @@ GH_TUPLE=	\
 		influxdata:influxdb:v1.9.5:influxdata_influxdb/vendor/github.com/influxdata/influxdb \
 		jmespath:go-jmespath:v0.4.0:jmespath_go_jmespath/vendor/github.com/jmespath/go-jmespath \
 		klauspost:compress:v1.13.6:klauspost_compress/vendor/github.com/klauspost/compress \
-		mattn:go-colorable:v0.1.11:mattn_go_colorable/vendor/github.com/mattn/go-colorable \
+		mattn:go-colorable:v0.1.12:mattn_go_colorable/vendor/github.com/mattn/go-colorable \
 		mattn:go-isatty:v0.0.14:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
 		mattn:go-runewidth:v0.0.13:mattn_go_runewidth/vendor/github.com/mattn/go-runewidth \
 		matttproud:golang_protobuf_extensions:v1.0.1:matttproud_golang_protobuf_extensions/vendor/github.com/matttproud/golang_protobuf_extensions \
diff --git a/net-mgmt/victoria-metrics/distinfo b/net-mgmt/victoria-metrics/distinfo
index 5539c3ae66f9..2fe0cb660eb8 100644
--- a/net-mgmt/victoria-metrics/distinfo
+++ b/net-mgmt/victoria-metrics/distinfo
@@ -1,18 +1,18 @@
-TIMESTAMP = 1636379256
-SHA256 (VictoriaMetrics-VictoriaMetrics-v1.69.0_GH0.tar.gz) = 88f512fcbdb78acd4abd476063812bf1d855034b9342d1d3a1a1d24b36e8cc32
-SIZE (VictoriaMetrics-VictoriaMetrics-v1.69.0_GH0.tar.gz) = 16163747
-SHA256 (VictoriaMetrics-fastcache-v1.7.0_GH0.tar.gz) = 6e9fb81e9bd50f17888abf298feb6e0e872a62ecb1b4101602e547110ba213ca
-SIZE (VictoriaMetrics-fastcache-v1.7.0_GH0.tar.gz) = 874964
+TIMESTAMP = 1638450085
+SHA256 (VictoriaMetrics-VictoriaMetrics-v1.70.0_GH0.tar.gz) = 0782c2e49dc2c9e55b38e42b3a99b77cb368e0dc3dd1521c2b71b9b71a474bad
+SIZE (VictoriaMetrics-VictoriaMetrics-v1.70.0_GH0.tar.gz) = 17045383
+SHA256 (VictoriaMetrics-fastcache-v1.8.0_GH0.tar.gz) = ae802514cee8cd30c8a405d26b09e9cb797f238cdeb963c62e13e96d856c4fbe
+SIZE (VictoriaMetrics-fastcache-v1.8.0_GH0.tar.gz) = 875028
 SHA256 (VictoriaMetrics-fasthttp-v1.1.0_GH0.tar.gz) = 87accfed9443475db2c7556108c3caa941143f523164841ca70cf5e1ef2fe122
 SIZE (VictoriaMetrics-fasthttp-v1.1.0_GH0.tar.gz) = 204351
 SHA256 (VictoriaMetrics-metrics-v1.18.1_GH0.tar.gz) = f77c4d00467bb3bc41ca01ef7ee041edde964d64a5a6082a01aab9974041c4ae
 SIZE (VictoriaMetrics-metrics-v1.18.1_GH0.tar.gz) = 25975
-SHA256 (VictoriaMetrics-metricsql-v0.30.0_GH0.tar.gz) = a0c53ccc46e3817cd0c9d69038ef3cd0b24f2c96b3edf2368eee825d779775c5
-SIZE (VictoriaMetrics-metricsql-v0.30.0_GH0.tar.gz) = 48019
+SHA256 (VictoriaMetrics-metricsql-v0.31.0_GH0.tar.gz) = 1850e8d997fc819ea61dd1b6022c184c3e17100d3ba7c369e01babe7ad2d4f69
+SIZE (VictoriaMetrics-metricsql-v0.31.0_GH0.tar.gz) = 47914
 SHA256 (VividCortex-ewma-v1.2.0_GH0.tar.gz) = 2f26521a9207b91dfbca3d28e5545bc11cb098888ecf3e9ba8e5936387b06a33
 SIZE (VividCortex-ewma-v1.2.0_GH0.tar.gz) = 6683
-SHA256 (aws-aws-sdk-go-v1.41.19_GH0.tar.gz) = b79a9c5b7beec37a8eb9303da379dd349bc747fbb3b83b4b08eacc45d5b437f8
-SIZE (aws-aws-sdk-go-v1.41.19_GH0.tar.gz) = 21295153
+SHA256 (aws-aws-sdk-go-v1.42.17_GH0.tar.gz) = 4479468b005c999ecbaf146682eff4b96d012b2a14c251c825fde87831528ed1
+SIZE (aws-aws-sdk-go-v1.42.17_GH0.tar.gz) = 22367841
 SHA256 (beorn7-perks-v1.0.1_GH0.tar.gz) = 98db84bb0224a26094e6adba91b7ee7a1a7ace28cb648d818f8e779e6a19f825
 SIZE (beorn7-perks-v1.0.1_GH0.tar.gz) = 10867
 SHA256 (census-instrumentation-opencensus-go-v0.23.0_GH0.tar.gz) = cc9dc0234de1baacf1855cf19615b381ca2f2adb83a2871e7a9b8b74e46818cf
@@ -25,12 +25,12 @@ SHA256 (cheggaaa-pb-v3.0.8_GH0.tar.gz) = 17cb166dfe931ccdf3742271442dcfb2b886099
 SIZE (cheggaaa-pb-v3.0.8_GH0.tar.gz) = 31487
 SHA256 (cncf-udpa-04548b0d99d4_GH0.tar.gz) = 30d87780df8c93070d8c5c5e870b1c638eaac35789b6febb7a2695829abbb290
 SIZE (cncf-udpa-04548b0d99d4_GH0.tar.gz) = 20518
-SHA256 (cncf-xds-cb28da3451f1_GH0.tar.gz) = e5b585c02479759719649b82779109bc7aa2adf9a3a9153b48df71972d703ae0
-SIZE (cncf-xds-cb28da3451f1_GH0.tar.gz) = 79245
+SHA256 (cncf-xds-a8f946100490_GH0.tar.gz) = 3728ab1f4803ec2b27c236ae6708f946953c0ef5a8c8c5ba65acb135f0971e4f
+SIZE (cncf-xds-a8f946100490_GH0.tar.gz) = 79238
 SHA256 (cpuguy83-go-md2man-v2.0.1_GH0.tar.gz) = 889309ecf43e40d3a76d666b0259dcd71b340ea0fad003784ff3fe0b6c21990e
 SIZE (cpuguy83-go-md2man-v2.0.1_GH0.tar.gz) = 64220
-SHA256 (envoyproxy-go-control-plane-v0.10.0_GH0.tar.gz) = b2137327ebb127689632d9ed0e2a990df5eadf8a86f734cfbd3f2aa776f9c22f
-SIZE (envoyproxy-go-control-plane-v0.10.0_GH0.tar.gz) = 2240440
+SHA256 (envoyproxy-go-control-plane-v0.10.1_GH0.tar.gz) = efbf2bf6969d191f01a95e85fe6c5f8e797b41319bd27a7b5ef32e98fa3fb0bc
+SIZE (envoyproxy-go-control-plane-v0.10.1_GH0.tar.gz) = 2248825
 SHA256 (envoyproxy-protoc-gen-validate-v0.6.2_GH0.tar.gz) = b02da533c77023238c556982507b9a71afc850478b637a7a13ec13f311efa5c0
 SIZE (envoyproxy-protoc-gen-validate-v0.6.2_GH0.tar.gz) = 151332
 SHA256 (fatih-color-v1.13.0_GH0.tar.gz) = 326ff785bc0cb5171c17be2a65959e83ee7889ba39412ba4c53c062e2df3ffec
@@ -47,8 +47,8 @@ SHA256 (golang-appengine-v1.6.7_GH0.tar.gz) = c623d81235f7c9699e299b328191d81333
 SIZE (golang-appengine-v1.6.7_GH0.tar.gz) = 333007
 SHA256 (golang-groupcache-41bb18bfe9da_GH0.tar.gz) = 1e89795970d6593affdafe1d09dcf947681ca1ea82528e8e4fb9974a77f2e394
 SIZE (golang-groupcache-41bb18bfe9da_GH0.tar.gz) = 26101
-SHA256 (golang-net-b53810dc28af_GH0.tar.gz) = 6e1f0e73271c960eebf4eeed34c85678d69d897123eec20ce43f9a0917720452
-SIZE (golang-net-b53810dc28af_GH0.tar.gz) = 1262776
+SHA256 (golang-net-0a0e4e1bb54c_GH0.tar.gz) = 27bdf164a9f840b2e724b0c5abd2bdecd82ba1102296dc9ba6d4ae0f98befcd7
+SIZE (golang-net-0a0e4e1bb54c_GH0.tar.gz) = 1226468
 SHA256 (golang-oauth2-d3ed0bb246c8_GH0.tar.gz) = 17989d348e2fd423992005229d92c9fc5e25ad5358f72d31361dbf1cdd7c505c
 SIZE (golang-oauth2-d3ed0bb246c8_GH0.tar.gz) = 87604
 SHA256 (golang-protobuf-v1.5.2_GH0.tar.gz) = 088cc0f3ba18fb8f9d00319568ff0af5a06d8925a6e6cb983bb837b4efb703b3
@@ -57,16 +57,16 @@ SHA256 (golang-snappy-v0.0.4_GH0.tar.gz) = 77df678795596f9dfecb5744deb984633d780
 SIZE (golang-snappy-v0.0.4_GH0.tar.gz) = 66129
 SHA256 (golang-sync-036812b2e83c_GH0.tar.gz) = 75ac8fc16bdceb2496c4a9cc98584b70c29032d91a9e57a624acb073e3232fda
 SIZE (golang-sync-036812b2e83c_GH0.tar.gz) = 18752
-SHA256 (golang-sys-e0b2ad06fe42_GH0.tar.gz) = b77a2fdf27abf35746f7dce3c00b6afbae5d70809d9091a11b233c8cb97f8999
-SIZE (golang-sys-e0b2ad06fe42_GH0.tar.gz) = 1221703
+SHA256 (golang-sys-fe61309f8881_GH0.tar.gz) = 246a4b2f59ab8d7b4434b15d973e7d86ccb65c3dd3e616e4784d4ab9b50c9898
+SIZE (golang-sys-fe61309f8881_GH0.tar.gz) = 1253640
 SHA256 (golang-text-v0.3.7_GH0.tar.gz) = 7cab2f6c3133ac1d422edd952b0dd2082fa55a73c2663fb2defd9bf83d649b26
 SIZE (golang-text-v0.3.7_GH0.tar.gz) = 8354718
 SHA256 (golang-xerrors-5ec99f83aff1_GH0.tar.gz) = 71975d658357e170fd6a41f92539cde8b39c9cd8bfe5931b6311bc5f5c0da0d7
 SIZE (golang-xerrors-5ec99f83aff1_GH0.tar.gz) = 13664
 SHA256 (google-go-cmp-v0.5.6_GH0.tar.gz) = cba2118596f694c135b3f3d6fe49b73ca2a7882aa4d7f346e341cb106afce5f1
 SIZE (google-go-cmp-v0.5.6_GH0.tar.gz) = 104421
-SHA256 (google-go-genproto-4c6863e31247_GH0.tar.gz) = 48b89ae60cfd595852b0de28a43a7e1956ada69ff7b3958b9f11014837ce7847
-SIZE (google-go-genproto-4c6863e31247_GH0.tar.gz) = 12006014
+SHA256 (google-go-genproto-f09f9a12af12_GH0.tar.gz) = 7b7dc28e8c29dbae0760dc13f922a21baab29f483c0a3d1f2bd43346bb6f01d8
+SIZE (google-go-genproto-f09f9a12af12_GH0.tar.gz) = 12150113
 SHA256 (googleapis-gax-go-v2.1.1_GH0.tar.gz) = d90094755c79f84815c5a215edd940ab6ac81a7fa3fa63bc2229e7d7c38171fe
 SIZE (googleapis-gax-go-v2.1.1_GH0.tar.gz) = 70015
 SHA256 (googleapis-google-api-go-client-v0.60.0_GH0.tar.gz) = d0ef128fe886ecacf003902b104584dc71ee744c822259614c57f0207d8a93ed
@@ -83,8 +83,8 @@ SHA256 (jmespath-go-jmespath-v0.4.0_GH0.tar.gz) = aa86d00b6836345eee196c13df2df0
 SIZE (jmespath-go-jmespath-v0.4.0_GH0.tar.gz) = 128861
 SHA256 (klauspost-compress-v1.13.6_GH0.tar.gz) = 32aa15674decc1ceeb5c5e43dd2335fea54bafa4021832248134ef47b665754d
 SIZE (klauspost-compress-v1.13.6_GH0.tar.gz) = 15481179
-SHA256 (mattn-go-colorable-v0.1.11_GH0.tar.gz) = b88eae3c846d3c9bee375bfb72b535b726755a06d8e972c937820aba45d2f5e0
-SIZE (mattn-go-colorable-v0.1.11_GH0.tar.gz) = 9800
+SHA256 (mattn-go-colorable-v0.1.12_GH0.tar.gz) = 32493594aee411896ffe13aaed14df4a23c3006866c46c1a908af79eacd102b2
+SIZE (mattn-go-colorable-v0.1.12_GH0.tar.gz) = 9801
 SHA256 (mattn-go-isatty-v0.0.14_GH0.tar.gz) = e6460325edf600297cf2ef68834938fb1c5b8d5f234b3b24ec7c0a29a2d70b39
 SIZE (mattn-go-isatty-v0.0.14_GH0.tar.gz) = 4710
 SHA256 (mattn-go-runewidth-v0.0.13_GH0.tar.gz) = 9b2aeafa5d95a40b32067ba22accdf42cc83414ec5b433ea7de330791beaa196
diff --git a/net-mgmt/victoria-metrics/pkg-plist b/net-mgmt/victoria-metrics/pkg-plist
index 34d2a6fa5ac6..6630485a58d0 100644
--- a/net-mgmt/victoria-metrics/pkg-plist
+++ b/net-mgmt/victoria-metrics/pkg-plist
@@ -36,6 +36,8 @@ bin/victoria-metrics
 %%PORTDOCS%%%%DOCSDIR%%/guides/guide-vmcluster-k8s-via-vm-operator-grafana1.png
 %%PORTDOCS%%%%DOCSDIR%%/guides/guide-vmcluster-k8s-via-vm-operator-grafana2.png
 %%PORTDOCS%%%%DOCSDIR%%/guides/guide-vmcluster-k8s-via-vm-operator.png
+%%PORTDOCS%%%%DOCSDIR%%/guides/guide-vmcluster-multiple-retention-scheme.png
+%%PORTDOCS%%%%DOCSDIR%%/guides/guide-vmcluster-multiple-retention-setup.md
 %%PORTDOCS%%%%DOCSDIR%%/guides/guide-vmcluster-vmagent-grafana-dash.png
 %%PORTDOCS%%%%DOCSDIR%%/guides/guide-vmcluster-vmagent-values.yaml
 %%PORTDOCS%%%%DOCSDIR%%/guides/guide-vmsingle-grafana-dashboards.png
diff --git a/net-mgmt/vmutils/pkg-plist b/net-mgmt/vmutils/pkg-plist
index 3bab9b1446ce..c938c10ad8b3 100644
--- a/net-mgmt/vmutils/pkg-plist
+++ b/net-mgmt/vmutils/pkg-plist
@@ -8,6 +8,10 @@ bin/vmrestore
 %%PORTDOCS%%%%DOCSDIR%%/vmagent.md
 %%PORTDOCS%%%%DOCSDIR%%/vmagent.png
 %%PORTDOCS%%%%DOCSDIR%%/vmalert.md
+%%PORTDOCS%%%%DOCSDIR%%/vmalert_cluster.png
+%%PORTDOCS%%%%DOCSDIR%%/vmalert_ha.png
+%%PORTDOCS%%%%DOCSDIR%%/vmalert_multicluster.png
+%%PORTDOCS%%%%DOCSDIR%%/vmalert_single.png
 %%PORTDOCS%%%%DOCSDIR%%/vmauth.md
 %%PORTDOCS%%%%DOCSDIR%%/vmbackup.md
 %%PORTDOCS%%%%DOCSDIR%%/vmbackupmanager.md