git: a53efc77beaf - main - sysutils/loki: Update to 2.6.0

From: Dmitri Goutnik <dmgk_at_FreeBSD.org>
Date: Mon, 18 Jul 2022 12:19:21 UTC
The branch main has been updated by dmgk:

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

commit a53efc77beaf0df89f1f9e9d3cfacb862140edeb
Author:     Christopher Beppler <freebsd@funzi.org>
AuthorDate: 2022-07-18 12:14:07 +0000
Commit:     Dmitri Goutnik <dmgk@FreeBSD.org>
CommitDate: 2022-07-18 12:14:07 +0000

    sysutils/loki: Update to 2.6.0
    
    - Update to 2.6.0
    - Add logcli, loki-canary and promtail
    
    Changes:        https://github.com/grafana/loki/releases/tag/v2.6.0
    
    PR:             265295
    PR:             256031
    PR:             265231
---
 sysutils/loki/Makefile      | 43 ++++++++++++++-----------
 sysutils/loki/distinfo      | 78 +++++++++++++++++++++++++++------------------
 sysutils/loki/files/loki.in |  3 --
 sysutils/loki/pkg-plist     |  3 ++
 4 files changed, 74 insertions(+), 53 deletions(-)

diff --git a/sysutils/loki/Makefile b/sysutils/loki/Makefile
index abb14e5eb886..067e60ca9eda 100644
--- a/sysutils/loki/Makefile
+++ b/sysutils/loki/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	loki
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.5.0
-PORTREVISION=	2
+DISTVERSION=	2.6.0
 CATEGORIES=	sysutils
 PKGNAMEPREFIX=	grafana-
 
@@ -11,7 +10,7 @@ COMMENT=	Scalable, highly-available, multi-tenant log aggregation system
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-ONLY_FOR_ARCHS=	aarch64 amd64 i386
+ONLY_FOR_ARCHS=	aarch64 armv7 armv6 amd64 i386
 USES=		go:modules cpe
 USE_GITHUB=	yes
 
@@ -50,6 +49,7 @@ GH_TUPLE=	\
 		armon:go-metrics:v0.3.9:armon_go_metrics/vendor/github.com/armon/go-metrics \
 		asaskevich:govalidator:7a23bdc65eef:asaskevich_govalidator/vendor/github.com/asaskevich/govalidator \
 		aws:aws-sdk-go:v1.43.10:aws_aws_sdk_go/vendor/github.com/aws/aws-sdk-go \
+		baidubce:bce-sdk-go:v0.9.81:baidubce_bce_sdk_go/vendor/github.com/baidubce/bce-sdk-go \
 		beorn7:perks:v1.0.1:beorn7_perks/vendor/github.com/beorn7/perks \
 		bmatcuk:doublestar:v1.2.2:bmatcuk_doublestar/vendor/github.com/bmatcuk/doublestar \
 		buger:jsonparser:v1.1.1:buger_jsonparser/vendor/github.com/buger/jsonparser \
@@ -115,11 +115,11 @@ GH_TUPLE=	\
 		go-redis:redis:v8.11.4:go_redis_redis_v8/vendor/github.com/go-redis/redis/v8 \
 		go-stack:stack:v1.8.0:go_stack_stack/vendor/github.com/go-stack/stack \
 		go-tomb:tomb:dd632973f1e7:go_tomb_tomb/vendor/gopkg.in/tomb.v1 \
-		go-yaml:yaml:496545a6307b:go_yaml_yaml_1/vendor/gopkg.in/yaml.v3 \
 		go-yaml:yaml:v2.4.0:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
+		go-yaml:yaml:v3.0.1:go_yaml_yaml_1/vendor/gopkg.in/yaml.v3 \
 		go-zookeeper:zk:v1.0.2:go_zookeeper_zk/vendor/github.com/go-zookeeper/zk \
-		go4org:go4:d4a079459e60:go4org_go4_1/vendor/go4.org/unsafe/assume-no-moving-gc \
 		go4org:go4:d4a079459e60:go4org_go4/vendor/go4.org/intern \
+		go4org:go4:d4a079459e60:go4org_go4_1/vendor/go4.org/unsafe/assume-no-moving-gc \
 		gofrs:flock:v0.7.1:gofrs_flock/vendor/github.com/gofrs/flock \
 		gogo:googleapis:v1.4.0:gogo_googleapis/vendor/github.com/gogo/googleapis \
 		gogo:protobuf:v1.3.2:gogo_protobuf/vendor/github.com/gogo/protobuf \
@@ -149,7 +149,7 @@ GH_TUPLE=	\
 		google:renameio:v2.0.0:google_renameio_v2/vendor/github.com/google/renameio/v2 \
 		google:uuid:v1.2.0:google_uuid/vendor/github.com/google/uuid \
 		googleapis:gax-go:v2.1.1:googleapis_gax_go_v2/vendor/github.com/googleapis/gax-go \
-		googleapis:gnostic:v0.4.1:googleapis_gnostic/vendor/github.com/googleapis/gnostic \
+		googleapis:gnostic:v0.5.5:googleapis_gnostic/vendor/github.com/googleapis/gnostic \
 		googleapis:google-api-go-client:v0.70.0:googleapis_google_api_go_client/vendor/google.golang.org/api \
 		googleapis:google-cloud-go:bigtable/v1.3.0:googleapis_google_cloud_go_bigtable \
 		googleapis:google-cloud-go:compute/v1.3.0:googleapis_google_cloud_go_compute \
@@ -161,11 +161,12 @@ 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:19921f863583:grafana_dskit/vendor/github.com/grafana/dskit \
-		grafana:go-gelf:126646b86de8:grafana_go_gelf/vendor/gopkg.in/Graylog2/go-gelf.v2 \
+		grafana:dskit:49faf69f72ca: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:regexp:149c8afcd6cb:grafana_regexp/vendor/github.com/grafana/regexp \
-		grafana:tail:7aa4e4a91f03:grafana_tail/vendor/github.com/hpcloud/tail \
+		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 \
 		grpc-ecosystem:go-grpc-middleware:v1.3.0:grpc_ecosystem_go_grpc_middleware/vendor/github.com/grpc-ecosystem/go-grpc-middleware \
 		grpc-ecosystem:grpc-opentracing:8e809c8a8645:grpc_ecosystem_grpc_opentracing/vendor/github.com/grpc-ecosystem/grpc-opentracing \
@@ -183,11 +184,10 @@ GH_TUPLE=	\
 		hashicorp:go-sockaddr:v1.0.2:hashicorp_go_sockaddr/vendor/github.com/hashicorp/go-sockaddr \
 		hashicorp:go-uuid:v1.0.2:hashicorp_go_uuid/vendor/github.com/hashicorp/go-uuid \
 		hashicorp:golang-lru:v0.5.4:hashicorp_golang_lru/vendor/github.com/hashicorp/golang-lru \
-		hashicorp:memberlist:v0.3.0:hashicorp_memberlist/vendor/github.com/hashicorp/memberlist \
 		hashicorp:serf:v0.9.6:hashicorp_serf/vendor/github.com/hashicorp/serf \
 		huandu:xstrings:v1.3.1:huandu_xstrings/vendor/github.com/huandu/xstrings \
 		imdario:mergo:v0.3.12:imdario_mergo/vendor/github.com/imdario/mergo \
-		inetaf:netaddr:70468d781e6c:inetaf_netaddr/vendor/inet.af/netaddr \
+		inetaf:netaddr:c74959edd3b6:inetaf_netaddr/vendor/inet.af/netaddr \
 		influxdata:go-syslog:a1889d947b48:influxdata_go_syslog_v3/vendor/github.com/influxdata/go-syslog/v3 \
 		influxdata:telegraf:v1.16.3:influxdata_telegraf/vendor/github.com/influxdata/telegraf \
 		jcmturner:aescts:v2.0.0:jcmturner_aescts_v2/vendor/github.com/jcmturner/aescts \
@@ -204,14 +204,16 @@ GH_TUPLE=	\
 		klauspost:compress:v1.14.1:klauspost_compress/vendor/github.com/klauspost/compress \
 		klauspost:cpuid:v1.3.1:klauspost_cpuid/vendor/github.com/klauspost/cpuid \
 		klauspost:pgzip:v1.2.5:klauspost_pgzip/vendor/github.com/klauspost/pgzip \
-		kubernetes-sigs:structured-merge-diff:v4.1.0:kubernetes_sigs_structured_merge_diff/vendor/sigs.k8s.io/structured-merge-diff/v4 \
+		kubernetes-sigs:json:c049b76a60c6:kubernetes_sigs_json/vendor/sigs.k8s.io/json \
+		kubernetes-sigs:structured-merge-diff:v4.2.1:kubernetes_sigs_structured_merge_diff/vendor/sigs.k8s.io/structured-merge-diff/v4 \
 		kubernetes-sigs:yaml:v1.2.0:kubernetes_sigs_yaml/vendor/sigs.k8s.io/yaml \
-		kubernetes:api:v0.21.0:kubernetes_api/vendor/k8s.io/api \
-		kubernetes:apimachinery:v0.21.0:kubernetes_apimachinery/vendor/k8s.io/apimachinery \
-		kubernetes:client-go:v0.21.0:kubernetes_client_go/vendor/k8s.io/client-go \
+		kubernetes:api:v0.23.6:kubernetes_api/vendor/k8s.io/api \
+		kubernetes:apimachinery:v0.23.6:kubernetes_apimachinery/vendor/k8s.io/apimachinery \
+		kubernetes:client-go:v0.23.6:kubernetes_client_go/vendor/k8s.io/client-go \
 		kubernetes:klog:v1.0.0:kubernetes_klog/vendor/k8s.io/klog \
 		kubernetes:klog:v2.40.1:kubernetes_klog_1/vendor/k8s.io/klog/v2 \
-		kubernetes:utils:67b214c5f920:kubernetes_utils/vendor/k8s.io/utils \
+		kubernetes:kube-openapi:e816edb12b65:kubernetes_kube_openapi/vendor/k8s.io/kube-openapi \
+		kubernetes:utils:6203023598ed:kubernetes_utils/vendor/k8s.io/utils \
 		leodido:ragel-machinery:299bdde78165:leodido_ragel_machinery/vendor/github.com/leodido/ragel-machinery \
 		mailru:easyjson:v0.7.6:mailru_easyjson/vendor/github.com/mailru/easyjson \
 		mattn:go-colorable:v0.1.9:mattn_go_colorable/vendor/github.com/mattn/go-colorable \
@@ -220,7 +222,7 @@ GH_TUPLE=	\
 		matttproud:golang_protobuf_extensions:c182affec369:matttproud_golang_protobuf_extensions/vendor/github.com/matttproud/golang_protobuf_extensions \
 		miekg:dns:v1.1.46:miekg_dns/vendor/github.com/miekg/dns \
 		minio:md5-simd:v1.1.0:minio_md5_simd/vendor/github.com/minio/md5-simd \
-		minio:minio-go:v7.0.10:minio_minio_go_v7/vendor/github.com/minio/minio-go/v7 \
+		minio:minio-go:v7.0.24:minio_minio_go_v7/vendor/github.com/minio/minio-go/v7 \
 		minio:sha256-simd:v0.1.1:minio_sha256_simd/vendor/github.com/minio/sha256-simd \
 		mitchellh:copystructure:v1.0.0:mitchellh_copystructure/vendor/github.com/mitchellh/copystructure \
 		mitchellh:go-homedir:v1.1.0:mitchellh_go_homedir/vendor/github.com/mitchellh/go-homedir \
@@ -269,11 +271,12 @@ GH_TUPLE=	\
 		shurcooL:vfsgen:0d455de96546:shurcool_vfsgen/vendor/github.com/shurcooL/vfsgen \
 		sirupsen:logrus:v1.8.1:sirupsen_logrus/vendor/github.com/sirupsen/logrus \
 		sony:gobreaker:v0.4.1:sony_gobreaker/vendor/github.com/sony/gobreaker \
+		spaolacci:murmur3:f09979ecbc72:spaolacci_murmur3/vendor/github.com/spaolacci/murmur3 \
 		spf13:afero:v1.6.0:spf13_afero/vendor/github.com/spf13/afero \
 		spf13:cast:v1.3.1:spf13_cast/vendor/github.com/spf13/cast \
 		spf13:pflag:v1.0.5:spf13_pflag/vendor/github.com/spf13/pflag \
 		stretchr:objx:v0.2.0:stretchr_objx/vendor/github.com/stretchr/objx \
-		stretchr:testify:v1.7.0:stretchr_testify/vendor/github.com/stretchr/testify \
+		stretchr:testify:v1.7.1:stretchr_testify/vendor/github.com/stretchr/testify \
 		thanos-io:thanos:c5505f5eaa7d:thanos_io_thanos/vendor/github.com/thanos-io/thanos \
 		themihai:gomemcache:24332e2d58ab:themihai_gomemcache/vendor/github.com/bradfitz/gomemcache \
 		tonistiigi:fifo:a9fb20d87448:tonistiigi_fifo/vendor/github.com/tonistiigi/fifo \
@@ -286,6 +289,8 @@ GH_TUPLE=	\
 		ugorji:go:v1.1.7:ugorji_go_codec/vendor/github.com/ugorji/go \
 		weaveworks:common:ebe5bdc2c89e: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 \
 		xdg-go:pbkdf2:v1.0.0:xdg_go_pbkdf2/vendor/github.com/xdg-go/pbkdf2 \
 		xdg-go:scram:v1.0.2:xdg_go_scram/vendor/github.com/xdg-go/scram \
 		xdg-go:stringprep:v1.0.2:xdg_go_stringprep/vendor/github.com/xdg-go/stringprep \
@@ -293,7 +298,7 @@ GH_TUPLE=	\
 
 USE_RC_SUBR=	loki
 
-GO_TARGET=	./cmd/loki
+GO_TARGET=	./cmd/loki ./cmd/loki-canary ./cmd/logcli ./clients/cmd/promtail
 
 SUB_LIST=	LOKI_USER=${LOKI_USER} \
 		LOKI_GROUP=${LOKI_GROUP} \
diff --git a/sysutils/loki/distinfo b/sysutils/loki/distinfo
index 504afc8980d4..3eab61881101 100644
--- a/sysutils/loki/distinfo
+++ b/sysutils/loki/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1652821753
-SHA256 (grafana-loki-v2.5.0_GH0.tar.gz) = f9ca9e52f4d9125cc31f9a593aba6a46ed6464c9cd99b2be4e35192a0ab4a76e
-SIZE (grafana-loki-v2.5.0_GH0.tar.gz) = 27553540
+TIMESTAMP = 1658134683
+SHA256 (grafana-loki-v2.6.0_GH0.tar.gz) = a5a380fdbae26d93d6ad14ce74d5d4a1fd2c2134ea290d9fd6c478dea8f77160
+SIZE (grafana-loki-v2.6.0_GH0.tar.gz) = 29335139
 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
@@ -61,6 +61,8 @@ SHA256 (asaskevich-govalidator-7a23bdc65eef_GH0.tar.gz) = a8a0ecc0f3f23bef9886a6
 SIZE (asaskevich-govalidator-7a23bdc65eef_GH0.tar.gz) = 60431
 SHA256 (aws-aws-sdk-go-v1.43.10_GH0.tar.gz) = 7bacf7e2103917a1af50a862daf4fb214ea1c0b671c42d5a04be822c764912b5
 SIZE (aws-aws-sdk-go-v1.43.10_GH0.tar.gz) = 22839907
+SHA256 (baidubce-bce-sdk-go-v0.9.81_GH0.tar.gz) = 82f6227506da175ad78ba5dc0a55a3b392c4eafe29f1e7ca910294c3d2696f9b
+SIZE (baidubce-bce-sdk-go-v0.9.81_GH0.tar.gz) = 527441
 SHA256 (beorn7-perks-v1.0.1_GH0.tar.gz) = 98db84bb0224a26094e6adba91b7ee7a1a7ace28cb648d818f8e779e6a19f825
 SIZE (beorn7-perks-v1.0.1_GH0.tar.gz) = 10867
 SHA256 (bmatcuk-doublestar-v1.2.2_GH0.tar.gz) = 95591955a9623abfa2bb048e7d1f12d1242fcaba57e81e0e3d3e9ecca17532be
@@ -191,14 +193,16 @@ SHA256 (go-stack-stack-v1.8.0_GH0.tar.gz) = 3b8987e137d76f4f35db1e8005ec7fb766b6
 SIZE (go-stack-stack-v1.8.0_GH0.tar.gz) = 8039
 SHA256 (go-tomb-tomb-dd632973f1e7_GH0.tar.gz) = b67f4ee9324a78176bc3196fe262388696aeb3f31d9879d498200219f9c4c554
 SIZE (go-tomb-tomb-dd632973f1e7_GH0.tar.gz) = 3631
-SHA256 (go-yaml-yaml-496545a6307b_GH0.tar.gz) = ed0e11dc14bbbd4127031d7e8b9e58dad885e2c44a16359d2f64b71d1d1f692a
-SIZE (go-yaml-yaml-496545a6307b_GH0.tar.gz) = 90156
 SHA256 (go-yaml-yaml-v2.4.0_GH0.tar.gz) = d8e94679e5fff6bd1a35e10241543929a5f3da44f701755babf99b3daf0faac0
 SIZE (go-yaml-yaml-v2.4.0_GH0.tar.gz) = 73209
+SHA256 (go-yaml-yaml-v3.0.1_GH0.tar.gz) = cf05411540d3e6ef8f1fd88434b34f94cedaceb540329031d80e23b74540c4e5
+SIZE (go-yaml-yaml-v3.0.1_GH0.tar.gz) = 91173
 SHA256 (go-zookeeper-zk-v1.0.2_GH0.tar.gz) = b752c97a44f5dbfc01a156c7a8c3de76d461af6686f61f7a01e13162be19c511
 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
@@ -257,8 +261,8 @@ SHA256 (google-uuid-v1.2.0_GH0.tar.gz) = 53ba896ce398435b3ba4f9375f5d4908b09c79d
 SIZE (google-uuid-v1.2.0_GH0.tar.gz) = 14158
 SHA256 (googleapis-gax-go-v2.1.1_GH0.tar.gz) = d90094755c79f84815c5a215edd940ab6ac81a7fa3fa63bc2229e7d7c38171fe
 SIZE (googleapis-gax-go-v2.1.1_GH0.tar.gz) = 70015
-SHA256 (googleapis-gnostic-v0.4.1_GH0.tar.gz) = cc20ab94cf800fdfe377778aa0e2c640045c80193a873253e97605297801733f
-SIZE (googleapis-gnostic-v0.4.1_GH0.tar.gz) = 362548
+SHA256 (googleapis-gnostic-v0.5.5_GH0.tar.gz) = c5d122e458409053b48ef9fc2c350c97e1c1f90b478b850df2b2f7ee49dd8f69
+SIZE (googleapis-gnostic-v0.5.5_GH0.tar.gz) = 461734
 SHA256 (googleapis-google-api-go-client-v0.70.0_GH0.tar.gz) = b833edc2332d60286b9defe367ef0224d28ed5f8d67bade2b2f947616267caf4
 SIZE (googleapis-google-api-go-client-v0.70.0_GH0.tar.gz) = 23870757
 SHA256 (googleapis-google-cloud-go-bigtable-v1.3.0_GH0.tar.gz) = 0a85e2b1d057a103e83852e8e032e77d5d61d447d35c525f9946f1d1b9333f3c
@@ -281,16 +285,18 @@ 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-19921f863583_GH0.tar.gz) = 521b16e61b9a021839d79714c2e1240859a96776365500ffbd40bd4525a5c549
-SIZE (grafana-dskit-19921f863583_GH0.tar.gz) = 235834
-SHA256 (grafana-go-gelf-126646b86de8_GH0.tar.gz) = dd13c5229c117aa6ebe00e99e0b2b7fafdf9d3fe856942c208636bb7c5b91883
-SIZE (grafana-go-gelf-126646b86de8_GH0.tar.gz) = 11449
+SHA256 (grafana-dskit-49faf69f72ca_GH0.tar.gz) = 8987bd0bfe2431399e917f6e9a0f60a83e75d040b3c9c86df5c675ad0d41891a
+SIZE (grafana-dskit-49faf69f72ca_GH0.tar.gz) = 239270
+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-regexp-149c8afcd6cb_GH0.tar.gz) = 8f4e570d16713d76b7680e8f3ddcec15bbb45aca5848e7e1df84dd128ee98481
 SIZE (grafana-regexp-149c8afcd6cb_GH0.tar.gz) = 470219
-SHA256 (grafana-tail-7aa4e4a91f03_GH0.tar.gz) = 1245ee33e41d861bf4e91fdbe7c430ad9238acb8e0f35f34776fe78acbe30f7d
-SIZE (grafana-tail-7aa4e4a91f03_GH0.tar.gz) = 1268835
+SHA256 (grafana-tail-98e8eb28ea4c_GH0.tar.gz) = 7916771fbc5018709715052f4dcfd7b7cb8d18096bd03308ed9c5a84e414218b
+SIZE (grafana-tail-98e8eb28ea4c_GH0.tar.gz) = 1268884
 SHA256 (grpc-ecosystem-go-grpc-middleware-9f6bf00c00a7_GH0.tar.gz) = 518bf5d8fc4bfb2397b1a699d58a7bc9e2ef8f317d7966ac1ba9ddfb841625f8
 SIZE (grpc-ecosystem-go-grpc-middleware-9f6bf00c00a7_GH0.tar.gz) = 105248
 SHA256 (grpc-ecosystem-go-grpc-middleware-v1.3.0_GH0.tar.gz) = c9b908202c05a7f821b03ee49cd678e7e71469519054629770e0565d78275cbc
@@ -325,16 +331,14 @@ SHA256 (hashicorp-go-uuid-v1.0.2_GH0.tar.gz) = 2dee0f810c3e3a2cd3d49a075d0a64a88
 SIZE (hashicorp-go-uuid-v1.0.2_GH0.tar.gz) = 7058
 SHA256 (hashicorp-golang-lru-v0.5.4_GH0.tar.gz) = d50c188af0cc8b22e7e4b79e9071694fa06428a9964b22d68dc997fa787a177a
 SIZE (hashicorp-golang-lru-v0.5.4_GH0.tar.gz) = 13428
-SHA256 (hashicorp-memberlist-v0.3.0_GH0.tar.gz) = 327309a33054f10fef47c9b02403259fa2a86eea19032f02ffeeb7c5eaaed872
-SIZE (hashicorp-memberlist-v0.3.0_GH0.tar.gz) = 101658
 SHA256 (hashicorp-serf-v0.9.6_GH0.tar.gz) = e04103e5701ea0dcb72226cf22bb18d13317c1fb55e5a38bd6b9b37b7606e275
 SIZE (hashicorp-serf-v0.9.6_GH0.tar.gz) = 445015
 SHA256 (huandu-xstrings-v1.3.1_GH0.tar.gz) = d399f03735391073441145bac6b8d06b36f3b59e005db77ebafde130ddf215bf
 SIZE (huandu-xstrings-v1.3.1_GH0.tar.gz) = 17797
 SHA256 (imdario-mergo-v0.3.12_GH0.tar.gz) = f0ad95fe47f1a9c15545fe3e8abf4364b8163a0f872ce25d6f6ae85e7c885302
 SIZE (imdario-mergo-v0.3.12_GH0.tar.gz) = 22319
-SHA256 (inetaf-netaddr-70468d781e6c_GH0.tar.gz) = 05a2234c0769e10026a63f52739420c65c1f2d3dc75d648474b136f7cd7cadd9
-SIZE (inetaf-netaddr-70468d781e6c_GH0.tar.gz) = 48995
+SHA256 (inetaf-netaddr-c74959edd3b6_GH0.tar.gz) = 08cb0c2a25196090d3b064d3a4b35a55e7e2e8b3f19ef27a022b40b2a9cc3d75
+SIZE (inetaf-netaddr-c74959edd3b6_GH0.tar.gz) = 50514
 SHA256 (influxdata-go-syslog-a1889d947b48_GH0.tar.gz) = af19a3f6e15879cb363e68ab698cc15dee1dc66918777a4089e3489fc0eba1e7
 SIZE (influxdata-go-syslog-a1889d947b48_GH0.tar.gz) = 155476
 SHA256 (influxdata-telegraf-v1.16.3_GH0.tar.gz) = 576c9cade0ed12d055e3cd3deced35936c96a5a4785dd915463fd1282fcdca09
@@ -367,22 +371,26 @@ SHA256 (klauspost-cpuid-v1.3.1_GH0.tar.gz) = 3bf2da7358c8ed33c05bac2ca733749ade0
 SIZE (klauspost-cpuid-v1.3.1_GH0.tar.gz) = 367144
 SHA256 (klauspost-pgzip-v1.2.5_GH0.tar.gz) = a64bad5981a232f6b5a40e488708b19a0551e83465f6792b7925f90829d7a830
 SIZE (klauspost-pgzip-v1.2.5_GH0.tar.gz) = 125923
-SHA256 (kubernetes-sigs-structured-merge-diff-v4.1.0_GH0.tar.gz) = 64c3e052b06e12048c38f218eae418e02ff20bb3222ff15e297dff4ae5cf0038
-SIZE (kubernetes-sigs-structured-merge-diff-v4.1.0_GH0.tar.gz) = 286781
+SHA256 (kubernetes-sigs-json-c049b76a60c6_GH0.tar.gz) = 02671a119dd26d8c1c99dd6c79bacf090ee67a2ce434ab3bd7f5c9a7d7a8e3d4
+SIZE (kubernetes-sigs-json-c049b76a60c6_GH0.tar.gz) = 207005
+SHA256 (kubernetes-sigs-structured-merge-diff-v4.2.1_GH0.tar.gz) = 3fcfc288f7f94c1ed1cea1f003fa40cb6caab4164c5a0fb74db137080934a520
+SIZE (kubernetes-sigs-structured-merge-diff-v4.2.1_GH0.tar.gz) = 289952
 SHA256 (kubernetes-sigs-yaml-v1.2.0_GH0.tar.gz) = 80612b8cc63863556906f04df7eca89179bf81e5b3d1133c082bd7e5e35d5514
 SIZE (kubernetes-sigs-yaml-v1.2.0_GH0.tar.gz) = 92574
-SHA256 (kubernetes-api-v0.21.0_GH0.tar.gz) = 59fb671f5538489945360f4fdc2b6f6511ca19a5505890c32e0f63b4321617a0
-SIZE (kubernetes-api-v0.21.0_GH0.tar.gz) = 3240716
-SHA256 (kubernetes-apimachinery-v0.21.0_GH0.tar.gz) = e2d18adb4a5e503eb65aca6f5d296bc08257c100e8b65e7aa390bcbed157d150
-SIZE (kubernetes-apimachinery-v0.21.0_GH0.tar.gz) = 545713
-SHA256 (kubernetes-client-go-v0.21.0_GH0.tar.gz) = d281002d177b446e25360b56ee4d3468bced17d4a3178e1d22d627aa1820ae82
-SIZE (kubernetes-client-go-v0.21.0_GH0.tar.gz) = 930797
+SHA256 (kubernetes-api-v0.23.6_GH0.tar.gz) = 820e278a2a38aeb1f2a34e6f44b6636049f337421327daf35159f82bfea21b50
+SIZE (kubernetes-api-v0.23.6_GH0.tar.gz) = 3040160
+SHA256 (kubernetes-apimachinery-v0.23.6_GH0.tar.gz) = 78b081d602af8c9efb75a70558b4cbe07cd74927780101fb82e7c5f4be722596
+SIZE (kubernetes-apimachinery-v0.23.6_GH0.tar.gz) = 561518
+SHA256 (kubernetes-client-go-v0.23.6_GH0.tar.gz) = b2f87f29d7034cf7048705ad69fc90ed73f6be3188e7a701e83f6756be7bfccc
+SIZE (kubernetes-client-go-v0.23.6_GH0.tar.gz) = 1011099
 SHA256 (kubernetes-klog-v1.0.0_GH0.tar.gz) = eb84fc7a8051175f2da4a428360ce70703c8ccdd0e987fddc2f9d5c8fd97cd00
 SIZE (kubernetes-klog-v1.0.0_GH0.tar.gz) = 32366
 SHA256 (kubernetes-klog-v2.40.1_GH0.tar.gz) = 9b644b5417c4f73dbef48674f4d1c9cc1b6bf34785376e64dc36cfa094afa61b
 SIZE (kubernetes-klog-v2.40.1_GH0.tar.gz) = 56454
-SHA256 (kubernetes-utils-67b214c5f920_GH0.tar.gz) = b02055c087582fc66e876ea319d61efb81d09a2433b00a33a03221667c0214d9
-SIZE (kubernetes-utils-67b214c5f920_GH0.tar.gz) = 96505
+SHA256 (kubernetes-kube-openapi-e816edb12b65_GH0.tar.gz) = 636def79941e011c8f16593aad4802ceb161077438318b873222f6bef6add84c
+SIZE (kubernetes-kube-openapi-e816edb12b65_GH0.tar.gz) = 877450
+SHA256 (kubernetes-utils-6203023598ed_GH0.tar.gz) = 745090e0c6009cbe26f04b8d4b330c423611de554fd844de7b2ade937826fe4d
+SIZE (kubernetes-utils-6203023598ed_GH0.tar.gz) = 107725
 SHA256 (leodido-ragel-machinery-299bdde78165_GH0.tar.gz) = 8782d5149f5b2bb61634cac07573c07a83bae4e16257fc8f9039fd0688b1b874
 SIZE (leodido-ragel-machinery-299bdde78165_GH0.tar.gz) = 7274
 SHA256 (mailru-easyjson-v0.7.6_GH0.tar.gz) = 36849ef77dc92330e2d9f006a4fb2ef871e11abfddcedec771b84ebfc2380ecc
@@ -399,8 +407,8 @@ SHA256 (miekg-dns-v1.1.46_GH0.tar.gz) = 621516f09dfc32b214cf0bf670554739b25e95c7
 SIZE (miekg-dns-v1.1.46_GH0.tar.gz) = 204183
 SHA256 (minio-md5-simd-v1.1.0_GH0.tar.gz) = f4565eeff59db2fa45fb5f49936381d9a5fad8bd621be33cf96ffd30077111c0
 SIZE (minio-md5-simd-v1.1.0_GH0.tar.gz) = 99235
-SHA256 (minio-minio-go-v7.0.10_GH0.tar.gz) = f16d2b1173752a0c50f82832b917bc4c4b7a0295fc954aa320872147ce5c1ffe
-SIZE (minio-minio-go-v7.0.10_GH0.tar.gz) = 235983
+SHA256 (minio-minio-go-v7.0.24_GH0.tar.gz) = 18aca59d0695e8b3f183c1b0e440a093ceecc4800531ec47d0995389ed237175
+SIZE (minio-minio-go-v7.0.24_GH0.tar.gz) = 264140
 SHA256 (minio-sha256-simd-v0.1.1_GH0.tar.gz) = bc1f1e80dc1291f6d26933658155488cc895f6b8a4944479d462cf5a79112109
 SIZE (minio-sha256-simd-v0.1.1_GH0.tar.gz) = 65024
 SHA256 (mitchellh-copystructure-v1.0.0_GH0.tar.gz) = 0e04d8fe1065459ab234507b9a4b7164b05eda970fee6ffdf0219423c357fda8
@@ -435,6 +443,8 @@ 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
@@ -495,6 +505,8 @@ SHA256 (sirupsen-logrus-v1.8.1_GH0.tar.gz) = e9492c08ac8f202b438ccfb992bf81b7860
 SIZE (sirupsen-logrus-v1.8.1_GH0.tar.gz) = 47161
 SHA256 (sony-gobreaker-v0.4.1_GH0.tar.gz) = 8de92be4bd7358db3cc89a8ddc80fcdc2d05619dc0871fa2824c753cb0e80163
 SIZE (sony-gobreaker-v0.4.1_GH0.tar.gz) = 6842
+SHA256 (spaolacci-murmur3-f09979ecbc72_GH0.tar.gz) = 90d732cef818fec9b17ce4d35d70e6e4b54e0b09199859709ea378d709a2d6ca
+SIZE (spaolacci-murmur3-f09979ecbc72_GH0.tar.gz) = 7391
 SHA256 (spf13-afero-v1.6.0_GH0.tar.gz) = d1942de010ac7932bd21618aaf478b4f1413980449c061032f18beac7805d068
 SIZE (spf13-afero-v1.6.0_GH0.tar.gz) = 62130
 SHA256 (spf13-cast-v1.3.1_GH0.tar.gz) = 4fa8d06903b490ae6f1316e55c5446d5648eea2b450671ebc54d4bbe79bc46b1
@@ -503,8 +515,8 @@ SHA256 (spf13-pflag-v1.0.5_GH0.tar.gz) = 9a2cae1f8e8ab0d2cc8ebe468e871af28d9ac09
 SIZE (spf13-pflag-v1.0.5_GH0.tar.gz) = 50796
 SHA256 (stretchr-objx-v0.2.0_GH0.tar.gz) = be7dce02798cdc24cee6bd2d95bfcf6976b1521ef735349bf5e7dfe6d147746f
 SIZE (stretchr-objx-v0.2.0_GH0.tar.gz) = 79981
-SHA256 (stretchr-testify-v1.7.0_GH0.tar.gz) = 560c0984072cb436b17bbce5699b205d5aa2beb58ef7a94530d7724b5739a8d6
-SIZE (stretchr-testify-v1.7.0_GH0.tar.gz) = 91073
+SHA256 (stretchr-testify-v1.7.1_GH0.tar.gz) = 5a53303e8ae54d0d581895f5bf8aae82f64f53c04c1c0f9e27a0ebeffa579a92
+SIZE (stretchr-testify-v1.7.1_GH0.tar.gz) = 93989
 SHA256 (thanos-io-thanos-c5505f5eaa7d_GH0.tar.gz) = 3bc82d334289619aad63cbe29bf085ea2f467a759a480c665e6bdf4f72d6c885
 SIZE (thanos-io-thanos-c5505f5eaa7d_GH0.tar.gz) = 15135118
 SHA256 (themihai-gomemcache-24332e2d58ab_GH0.tar.gz) = ecb18c358d17f4e29545b82589dbecf6f023930f69f04221813bd15e78108f15
@@ -529,6 +541,10 @@ SHA256 (weaveworks-common-ebe5bdc2c89e_GH0.tar.gz) = 83d2ea1e53d03a80decfc4c26cd
 SIZE (weaveworks-common-ebe5bdc2c89e_GH0.tar.gz) = 159308
 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
+SIZE (willf-bitset-v1.1.11_GH0.tar.gz) = 18698
+SHA256 (willf-bloom-v2.0.3_GH0.tar.gz) = 7fce9eff9ed5d0eff13f07ee3eb37fe34a26208c8d607f4e37c96efcbb57be56
+SIZE (willf-bloom-v2.0.3_GH0.tar.gz) = 10628
 SHA256 (xdg-go-pbkdf2-v1.0.0_GH0.tar.gz) = 2eec55146447215eb58190e04c546c93cad7f369ac9b5aacd9dc11330d756757
 SIZE (xdg-go-pbkdf2-v1.0.0_GH0.tar.gz) = 7758
 SHA256 (xdg-go-scram-v1.0.2_GH0.tar.gz) = e780d1accb4654729844bd7c9cc38a80c438dd6e17bd66f633cc4fed72210054
diff --git a/sysutils/loki/files/loki.in b/sysutils/loki/files/loki.in
index f7a269a77dc4..c2e21fca5d1a 100644
--- a/sysutils/loki/files/loki.in
+++ b/sysutils/loki/files/loki.in
@@ -51,9 +51,6 @@ command_args="-p ${pidfile} -t ${name} -o ${loki_logfile} \
 
 start_precmd="loki_start_precmd"
 
-# required for Go runtime 1.18
-export ASSUME_NO_MOVING_GC_UNSAFE_RISK_IT_WITH=go1.18
-
 loki_start_precmd()
 {
 	if [ ! -d "/var/run/${name}" ]; then
diff --git a/sysutils/loki/pkg-plist b/sysutils/loki/pkg-plist
index 1f86cc137828..b39abf641010 100644
--- a/sysutils/loki/pkg-plist
+++ b/sysutils/loki/pkg-plist
@@ -1,4 +1,7 @@
 bin/loki
+bin/loki-canary
+bin/logcli
+bin/promtail
 @sample etc/loki.yaml.sample
 @owner %%LOKI_USER%%
 @group %%LOKI_GROUP%%