git: c3bbfa88f0b6 - main - sysutils/loki: Update to 2.6.1

From: Fernando Apesteguía <fernape_at_FreeBSD.org>
Date: Thu, 21 Jul 2022 15:22:00 UTC
The branch main has been updated by fernape:

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

commit c3bbfa88f0b608f03d73e907c385450670ef60ae
Author:     Christopher Beppler <freebsd@funzi.org>
AuthorDate: 2022-07-21 14:45:54 +0000
Commit:     Fernando Apesteguía <fernape@FreeBSD.org>
CommitDate: 2022-07-21 15:19:10 +0000

    sysutils/loki: Update to 2.6.1
    
    ChangeLog: https://github.com/grafana/loki/releases/tag/v2.6.1
    
    PR:     265326
    Reported by:    freebsd@funzi.org (maintainer)
---
 sysutils/loki/Makefile | 12 ++++++------
 sysutils/loki/distinfo | 30 +++++++++++-------------------
 2 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/sysutils/loki/Makefile b/sysutils/loki/Makefile
index 067e60ca9eda..a5b284644d65 100644
--- a/sysutils/loki/Makefile
+++ b/sysutils/loki/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	loki
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.6.0
+DISTVERSION=	2.6.1
 CATEGORIES=	sysutils
 PKGNAMEPREFIX=	grafana-
 
@@ -12,9 +12,9 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	aarch64 armv7 armv6 amd64 i386
 USES=		go:modules cpe
+CPE_VENDOR=	grafana
 USE_GITHUB=	yes
 
-CPE_VENDOR=	grafana
 
 GH_ACCOUNT=	grafana
 GH_PROJECT=	loki
@@ -161,10 +161,10 @@ GH_TUPLE=	\
 		gophercloud:gophercloud:v0.24.0:gophercloud_gophercloud/vendor/github.com/gophercloud/gophercloud \
 		gorilla:mux:v1.8.0:gorilla_mux/vendor/github.com/gorilla/mux \
 		gorilla:websocket:v1.4.2:gorilla_websocket/vendor/github.com/gorilla/websocket \
-		grafana:dskit:49faf69f72ca:grafana_dskit/vendor/github.com/grafana/dskit \
+		grafana:dskit:99f3d0043c23:grafana_dskit/vendor/github.com/grafana/dskit \
 		grafana:go-gelf:v2.0.1:grafana_go_gelf_v2/vendor/github.com/grafana/go-gelf/v2 \
 		grafana:gocql:ba5dc39ece85:grafana_gocql/vendor/github.com/gocql/gocql \
-		grafana:memberlist:6b97a09b7167:grafana_memberlist/vendor/github.com/hashicorp/memberlist \
+		grafana:memberlist:bd88e10a3d91:grafana_memberlist/vendor/github.com/hashicorp/memberlist \
 		grafana:regexp:149c8afcd6cb:grafana_regexp/vendor/github.com/grafana/regexp \
 		grafana:tail:98e8eb28ea4c:grafana_tail/vendor/github.com/hpcloud/tail \
 		grpc-ecosystem:go-grpc-middleware:9f6bf00c00a7:grpc_ecosystem_go_grpc_middleware_v2/vendor/github.com/grpc-ecosystem/go-grpc-middleware/v2 \
@@ -256,7 +256,7 @@ GH_TUPLE=	\
 		prometheus:client_model:v0.2.0:prometheus_client_model/vendor/github.com/prometheus/client_model \
 		prometheus:common:v0.1.0:prometheus_common_sigv4/vendor/github.com/prometheus/common/sigv4 \
 		prometheus:common:v0.32.1:prometheus_common/vendor/github.com/prometheus/common \
-		prometheus:node_exporter:01054558c289:prometheus_node_exporter/vendor/github.com/prometheus/node_exporter \
+		prometheus:exporter-toolkit:v0.7.1:prometheus_exporter_toolkit/vendor/github.com/prometheus/exporter-toolkit \
 		prometheus:procfs:v0.7.3:prometheus_procfs/vendor/github.com/prometheus/procfs \
 		prometheus:prometheus:edfe657b5405:prometheus_prometheus/vendor/github.com/prometheus/prometheus \
 		protocolbuffers:protobuf-go:v1.27.1:protocolbuffers_protobuf_go/vendor/google.golang.org/protobuf \
@@ -287,7 +287,7 @@ GH_TUPLE=	\
 		uber:jaeger-client-go:v2.30.0:uber_jaeger_client_go/vendor/github.com/uber/jaeger-client-go \
 		uber:jaeger-lib:v2.4.1:uber_jaeger_lib/vendor/github.com/uber/jaeger-lib \
 		ugorji:go:v1.1.7:ugorji_go_codec/vendor/github.com/ugorji/go \
-		weaveworks:common:ebe5bdc2c89e:weaveworks_common/vendor/github.com/weaveworks/common \
+		weaveworks:common:e3b70df0f08b:weaveworks_common/vendor/github.com/weaveworks/common \
 		weaveworks:promrus:v1.2.0:weaveworks_promrus/vendor/github.com/weaveworks/promrus \
 		willf:bitset:v1.1.11:willf_bitset/vendor/github.com/willf/bitset \
 		willf:bloom:v2.0.3:willf_bloom/vendor/github.com/willf/bloom \
diff --git a/sysutils/loki/distinfo b/sysutils/loki/distinfo
index 3eab61881101..52b60cffe8e6 100644
--- a/sysutils/loki/distinfo
+++ b/sysutils/loki/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1658134683
-SHA256 (grafana-loki-v2.6.0_GH0.tar.gz) = a5a380fdbae26d93d6ad14ce74d5d4a1fd2c2134ea290d9fd6c478dea8f77160
-SIZE (grafana-loki-v2.6.0_GH0.tar.gz) = 29335139
+TIMESTAMP = 1658302472
+SHA256 (grafana-loki-v2.6.1_GH0.tar.gz) = 4b41175e552dd198bb9cae213df3c0d9ca8cacd0b673f79d26419cea7cfb2df7
+SIZE (grafana-loki-v2.6.1_GH0.tar.gz) = 29347388
 SHA256 (Azure-azure-pipeline-go-v0.2.3_GH0.tar.gz) = 99bd58f4a07dd02d9615e3638b3bb6dbfad80ef678ccdb8e17e3fa2b0fef343e
 SIZE (Azure-azure-pipeline-go-v0.2.3_GH0.tar.gz) = 17102
 SHA256 (Azure-azure-sdk-for-go-v36.2.0_GH0.tar.gz) = 1de6b4d2d0a015e91513acde2d0705a908e50f7efd9f832de22cbd4ef2976341
@@ -133,10 +133,6 @@ SHA256 (etcd-io-etcd-v3.3.25_GH0.tar.gz) = 5d0f09fab4105effa96f37302cfe95e843efe
 SIZE (etcd-io-etcd-v3.3.25_GH0.tar.gz) = 6518893
 SHA256 (etcd-io-etcd-v3.5.0_GH0.tar.gz) = f30f68c52a7547af08be7d166884c94885ea8a593c1c1e814c89b24148ee1921
 SIZE (etcd-io-etcd-v3.5.0_GH0.tar.gz) = 4020010
-SHA256 (etcd-io-etcd-v3.5.0_GH0.tar.gz) = f30f68c52a7547af08be7d166884c94885ea8a593c1c1e814c89b24148ee1921
-SIZE (etcd-io-etcd-v3.5.0_GH0.tar.gz) = 4020010
-SHA256 (etcd-io-etcd-v3.5.0_GH0.tar.gz) = f30f68c52a7547af08be7d166884c94885ea8a593c1c1e814c89b24148ee1921
-SIZE (etcd-io-etcd-v3.5.0_GH0.tar.gz) = 4020010
 SHA256 (facette-natsort-2cd4dd1e2dcb_GH0.tar.gz) = aa65ea416cb4c72d672c7207afdda9c4dc5a535b5c72781636cc5dc82411eacb
 SIZE (facette-natsort-2cd4dd1e2dcb_GH0.tar.gz) = 2881
 SHA256 (fatih-color-v1.13.0_GH0.tar.gz) = 326ff785bc0cb5171c17be2a65959e83ee7889ba39412ba4c53c062e2df3ffec
@@ -201,8 +197,6 @@ SHA256 (go-zookeeper-zk-v1.0.2_GH0.tar.gz) = b752c97a44f5dbfc01a156c7a8c3de76d46
 SIZE (go-zookeeper-zk-v1.0.2_GH0.tar.gz) = 43406
 SHA256 (go4org-go4-d4a079459e60_GH0.tar.gz) = d00030ca56b072e908fec5e16bddf7d8379c48d659335ae0ce6a63379e9886b0
 SIZE (go4org-go4-d4a079459e60_GH0.tar.gz) = 150608
-SHA256 (go4org-go4-d4a079459e60_GH0.tar.gz) = d00030ca56b072e908fec5e16bddf7d8379c48d659335ae0ce6a63379e9886b0
-SIZE (go4org-go4-d4a079459e60_GH0.tar.gz) = 150608
 SHA256 (gofrs-flock-v0.7.1_GH0.tar.gz) = d4e33c3923e671fe6288a6dcb6618b7c46834c1a387653f482f5247c5a132dea
 SIZE (gofrs-flock-v0.7.1_GH0.tar.gz) = 7294
 SHA256 (gogo-googleapis-v1.4.0_GH0.tar.gz) = 0f1be0cc87e1f7942091f529dd2669d66fc249d57c6ed6906666d42b6d384497
@@ -285,14 +279,14 @@ SHA256 (gorilla-mux-v1.8.0_GH0.tar.gz) = ea2639259d2ce6f402636655e91eb93ba69c139
 SIZE (gorilla-mux-v1.8.0_GH0.tar.gz) = 45517
 SHA256 (gorilla-websocket-v1.4.2_GH0.tar.gz) = 91937a36bc9e0da3c895c73d4cb74b2cdb1aff54ab21b0d0724000e7b5b85b84
 SIZE (gorilla-websocket-v1.4.2_GH0.tar.gz) = 54101
-SHA256 (grafana-dskit-49faf69f72ca_GH0.tar.gz) = 8987bd0bfe2431399e917f6e9a0f60a83e75d040b3c9c86df5c675ad0d41891a
-SIZE (grafana-dskit-49faf69f72ca_GH0.tar.gz) = 239270
+SHA256 (grafana-dskit-99f3d0043c23_GH0.tar.gz) = aa991bbc3a51ed57155f609c8df0a5b061d67073d05a119f9b38dcdac8b51a45
+SIZE (grafana-dskit-99f3d0043c23_GH0.tar.gz) = 249668
 SHA256 (grafana-go-gelf-v2.0.1_GH0.tar.gz) = 317e61cbf2f1edeb55939570a2e0a9f18e84348fc91517872e29827227023bd5
 SIZE (grafana-go-gelf-v2.0.1_GH0.tar.gz) = 14868
 SHA256 (grafana-gocql-ba5dc39ece85_GH0.tar.gz) = c73fedb7fb31aeadc409c8ad41effa0961f8e316eef8bf5a49e891e1cef2f22a
 SIZE (grafana-gocql-ba5dc39ece85_GH0.tar.gz) = 210348
-SHA256 (grafana-memberlist-6b97a09b7167_GH0.tar.gz) = 2b205da2a76c967e020b0f930c66c7ec34e08ca1d06c50bc3aae0439b5e4a971
-SIZE (grafana-memberlist-6b97a09b7167_GH0.tar.gz) = 103180
+SHA256 (grafana-memberlist-bd88e10a3d91_GH0.tar.gz) = b47666f59ccd79cd44a6e30cd99108e0a966cc56e22274e74f17aa55e48f1f5e
+SIZE (grafana-memberlist-bd88e10a3d91_GH0.tar.gz) = 103142
 SHA256 (grafana-regexp-149c8afcd6cb_GH0.tar.gz) = 8f4e570d16713d76b7680e8f3ddcec15bbb45aca5848e7e1df84dd128ee98481
 SIZE (grafana-regexp-149c8afcd6cb_GH0.tar.gz) = 470219
 SHA256 (grafana-tail-98e8eb28ea4c_GH0.tar.gz) = 7916771fbc5018709715052f4dcfd7b7cb8d18096bd03308ed9c5a84e414218b
@@ -443,8 +437,6 @@ SHA256 (open-telemetry-opentelemetry-go-contrib-zpages-v0.29.0_GH0.tar.gz) = d73
 SIZE (open-telemetry-opentelemetry-go-contrib-zpages-v0.29.0_GH0.tar.gz) = 772437
 SHA256 (open-telemetry-opentelemetry-go-metric-v0.27.0_GH0.tar.gz) = 15c3458c4b250d164d3af80610cbdec7cd734418f4a56d95be0c09468146e3e6
 SIZE (open-telemetry-opentelemetry-go-metric-v0.27.0_GH0.tar.gz) = 813949
-SHA256 (open-telemetry-opentelemetry-go-metric-v0.27.0_GH0.tar.gz) = 15c3458c4b250d164d3af80610cbdec7cd734418f4a56d95be0c09468146e3e6
-SIZE (open-telemetry-opentelemetry-go-metric-v0.27.0_GH0.tar.gz) = 813949
 SHA256 (open-telemetry-opentelemetry-go-v1.4.1_GH0.tar.gz) = aa6688241d0dcd3ab2977aa2310e6698a6e54dbaad280f2cb69ac3c7e8050569
 SIZE (open-telemetry-opentelemetry-go-v1.4.1_GH0.tar.gz) = 814408
 SHA256 (opencontainers-go-digest-v1.0.0_GH0.tar.gz) = 1e74706d265c92f62793af741e322163f3c08afa66f5a7926c9b9ccb44fed230
@@ -475,8 +467,8 @@ SHA256 (prometheus-common-v0.1.0_GH0.tar.gz) = 5c08a6066883c7043a5cd27a074e763b5
 SIZE (prometheus-common-v0.1.0_GH0.tar.gz) = 87363
 SHA256 (prometheus-common-v0.32.1_GH0.tar.gz) = de06f354e24dec3bfeba9a3bd43bd3170b4231dfff3cd338b688a6e8c8050af6
 SIZE (prometheus-common-v0.32.1_GH0.tar.gz) = 146585
-SHA256 (prometheus-node_exporter-01054558c289_GH0.tar.gz) = 2d8e7a9a1a9d03182d2a0c23a6709d60b8c78c0269ad6b5c4dec88108784fabe
-SIZE (prometheus-node_exporter-01054558c289_GH0.tar.gz) = 2759994
+SHA256 (prometheus-exporter-toolkit-v0.7.1_GH0.tar.gz) = 795c1affebb8b4ba0630462fe9ba7979087558c51f5799ac47db9d361a9b2b0e
+SIZE (prometheus-exporter-toolkit-v0.7.1_GH0.tar.gz) = 51919
 SHA256 (prometheus-procfs-v0.7.3_GH0.tar.gz) = 5514e8b18c38b6376a84c623d59735d4eefb61fb3a14eb1f45e0a4c848f14a2b
 SIZE (prometheus-procfs-v0.7.3_GH0.tar.gz) = 178957
 SHA256 (prometheus-prometheus-edfe657b5405_GH0.tar.gz) = 6741ac8e7468655e7fb6c281feb25bddd04500de4d9a80fab9e348779babfb03
@@ -537,8 +529,8 @@ SHA256 (uber-jaeger-lib-v2.4.1_GH0.tar.gz) = c178bcad325857dba29551c16f40707701a
 SIZE (uber-jaeger-lib-v2.4.1_GH0.tar.gz) = 38010
 SHA256 (ugorji-go-v1.1.7_GH0.tar.gz) = a696a597d24c4743e125a00f771778a3cc8701c8bd9c3e31345524f61b560259
 SIZE (ugorji-go-v1.1.7_GH0.tar.gz) = 293690
-SHA256 (weaveworks-common-ebe5bdc2c89e_GH0.tar.gz) = 83d2ea1e53d03a80decfc4c26cd7bc38f28a6e05ba28966b0c4152f9bd97abef
-SIZE (weaveworks-common-ebe5bdc2c89e_GH0.tar.gz) = 159308
+SHA256 (weaveworks-common-e3b70df0f08b_GH0.tar.gz) = 48b7ea93116ec602b4b0327f5ee7ba0b16fb40194ad99154ff00ae30e2bf6c7a
+SIZE (weaveworks-common-e3b70df0f08b_GH0.tar.gz) = 159413
 SHA256 (weaveworks-promrus-v1.2.0_GH0.tar.gz) = c64ca5530182a9143bdde490f82301b3e1c518aa6db82b86d18be2aa736dd152
 SIZE (weaveworks-promrus-v1.2.0_GH0.tar.gz) = 2860315
 SHA256 (willf-bitset-v1.1.11_GH0.tar.gz) = 380337f3a62b8d579a3afe936d2fc7583e6447897dbb76aa2f1b221e1ef1f861