diff --git a/www/grafana/Makefile b/www/grafana/Makefile
index b509fc11ad32..f01828e3d37e 100644
--- a/www/grafana/Makefile
+++ b/www/grafana/Makefile
@@ -1,142 +1,139 @@
 PORTNAME=	grafana
 DISTVERSIONPREFIX=	v
-DISTVERSION=	12.4.2
-PORTREVISION=	1
+DISTVERSION=	13.0.1
 CATEGORIES=	www
 MASTER_SITES=	https://dl.grafana.com/oss/release/ \
 		https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${DISTVERSIONFULL}/:gomod
 DISTFILES=	grafana-${DISTVERSION}.linux-amd64${EXTRACT_SUFX} \
 		go.mod:gomod \
 		go.work:gomod \
 		apps/advisor/go.mod:gomod \
 		apps/alerting/alertenrichment/go.mod:gomod \
 		apps/alerting/historian/go.mod:gomod \
 		apps/alerting/notifications/go.mod:gomod \
 		apps/alerting/rules/go.mod:gomod \
 		apps/annotation/go.mod:gomod \
 		apps/collections/go.mod:gomod \
 		apps/correlations/go.mod:gomod \
 		apps/dashboard/go.mod:gomod \
 		apps/dashvalidator/go.mod:gomod \
 		apps/example/go.mod:gomod \
 		apps/folder/go.mod:gomod \
 		apps/iam/go.mod:gomod \
 		apps/live/go.mod:gomod \
 		apps/logsdrilldown/go.mod:gomod \
 		apps/playlist/go.mod:gomod \
 		apps/plugins/go.mod:gomod \
 		apps/preferences/go.mod:gomod \
 		apps/provisioning/go.mod:gomod \
 		apps/quotas/go.mod:gomod \
 		apps/scope/go.mod:gomod \
 		apps/secret/go.mod:gomod \
 		apps/shorturl/go.mod:gomod \
 		pkg/aggregator/go.mod:gomod \
 		pkg/apimachinery/go.mod:gomod \
 		pkg/apiserver/go.mod:gomod \
 		pkg/build/go.mod:gomod \
 		pkg/build/wire/go.mod:gomod \
 		pkg/codegen/go.mod:gomod \
+		pkg/infra/features/go.mod:gomod \
 		pkg/plugins/codegen/go.mod:gomod \
 		pkg/plugins/go.mod:gomod \
-		pkg/promlib/go.mod:gomod \
 		pkg/semconv/go.mod:gomod \
 		pkg/storage/unified/resource/kv/go.mod:gomod
 EXTRACT_ONLY=	${DISTFILES:N*.mod\:*:N*.mod:C/:.*//:Ngo.work}
 
 MAINTAINER=	drtr0jan@yandex.ru
 COMMENT=	Dashboard and graph editor for multiple data stores
 WWW=		https://grafana.com/grafana/ \
 		https://github.com/grafana/grafana
 
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	aarch64 amd64 armv6 armv7 riscv64
 
 USES=		cpe go:modules
 
 USE_GITHUB=	yes
 
 USE_RC_SUBR=	grafana
-TAG=		ebade4c
+TAG=		a100054
 
 GO_MOD_DIST=	github
 GO_MODULE=	github.com/grafana/grafana
-GO_TARGET=	./pkg/cmd/grafana \
-		./pkg/cmd/grafana-server \
-		./pkg/cmd/grafana-cli
+GO_TARGET=	./pkg/cmd/grafana
 GO_BUILDFLAGS=	-ldflags="-w -X main.version=${DISTVERSION} -X main.commit=${TAG} \
 		-X main.buildstamp=$$(${STAT} -f %Sm -t %s ${WRKSRC}/.gitignore)"
 
 CONFLICTS_INSTALL=	grafana*
 
 SUB_LIST=	GRAFANA_USER=${GRAFANA_USER} \
 		GRAFANA_GROUP=${GRAFANA_GROUP} \
 		GRAFANA_DATADIR=${GRAFANA_DATADIR} \
 		GRAFANA_HOMEDIR=${GRAFANA_HOMEDIR} \
 		GRAFANA_LOGDIR=${GRAFANA_LOGDIR} \
 		GRAFANA_PLUGINDIR=${GRAFANA_PLUGINDIR} \
 		GRAFANA_PROVISIONINGDIR=${GRAFANA_PROVISIONINGDIR}
 # Disable some master port targets
 TARGET_ORDER_OVERRIDE=	-1:go-post-extract
 
 GRAFANA_USER?=	${PORTNAME}
 GRAFANA_GROUP?=	${PORTNAME}
 
 .if ${GRAFANA_USER} == ${PORTNAME}
 USERS=		${GRAFANA_USER}
 .endif
 .if ${GRAFANA_GROUP} == ${PORTNAME}
 GROUPS=		${GRAFANA_GROUP}
 .endif
 
 PLIST_SUB=	${SUB_LIST}
 
 GRAFANA_DATADIR?=		/var/db/${PORTNAME}
 GRAFANA_HOMEDIR?=		${DATADIR}
 GRAFANA_LOGDIR?=		/var/log/${PORTNAME}
 GRAFANA_PLUGINDIR?=		${GRAFANA_DATADIR}/plugins
 GRAFANA_PROVISIONINGDIR?=	${ETCDIR}/provisioning
 GRAFANA_PROVISIONING=		access-control alerting dashboards datasources plugins sample
 
 post-extract:
 	@${ECHO_MSG} "===> Tidying ${GO_MODNAME} dependencies";
 	@(cd ${GO_WRKSRC}; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${GO_ENV} \
 		GOPROXY=${GO_MODCACHE} ${GO_CMD} mod tidy -e)
 	@${ECHO_MSG} "===> Vendoring ${GO_MODNAME} dependencies";
 	@(cd ${GO_WRKSRC}; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${GO_ENV} \
 		GOPROXY=${GO_MODCACHE} ${GO_CMD} work vendor -e)
 
 post-patch:
 	@${REINPLACE_CMD} \
 		-e 's|;data = /var/lib/grafana|data = ${GRAFANA_DATADIR}|g' \
 		-e 's|;logs = /var/log/grafana|logs = ${GRAFANA_LOGDIR}|g' \
 		-e 's|;plugins = /var/lib/grafana/plugins|plugins = ${GRAFANA_PLUGINDIR}|g' \
 		-e 's|;provisioning = conf/provisioning|provisioning = ${GRAFANA_PROVISIONINGDIR}|g' \
 		 ${WRKSRC}/conf/sample.ini
 
 pre-build:
 	@(cd ${GO_WRKSRC}; \
 	${ECHO_MSG} "===>  Generating wire_gen.go"; \
 	${SETENV} ${MAKE_ENV} ${GO_ENV} GOPROXY=off ${GO_CMD} run \
 		./pkg/build/wire/cmd/wire/main.go gen -tags "oss" ./pkg/server)
 
 post-install:
 	${MKDIR} ${STAGEDIR}${GRAFANA_HOMEDIR}/conf \
 		 ${STAGEDIR}${GRAFANA_DATADIR} \
 		 ${STAGEDIR}${GRAFANA_PLUGINDIR} \
 		 ${STAGEDIR}${GRAFANA_LOGDIR} \
 		 ${GRAFANA_PROVISIONING:M*:C|^|${STAGEDIR}${GRAFANA_PROVISIONINGDIR}/|}
 	(cd ${WRKDIR}/${PORTNAME}-${DISTVERSION}${DISTVERSIONSUFFIX} \
 		&& ${COPYTREE_SHARE} public ${STAGEDIR}${GRAFANA_HOMEDIR})
 	${INSTALL_DATA} ${WRKSRC}/conf/defaults.ini \
 		${STAGEDIR}${GRAFANA_HOMEDIR}/conf/defaults.ini
 	${INSTALL_DATA} ${WRKSRC}/conf/sample.ini \
 		${STAGEDIR}${ETCDIR}/grafana.ini.sample
 	${INSTALL_DATA} ${WRKSRC}/conf/ldap.toml \
 		${STAGEDIR}${ETCDIR}/ldap.toml.sample
 	${FIND} ${STAGEDIR}${DATADIR}/public -type f | \
 		${SED} "s,^${STAGEDIR}${DATADIR},${DATADIR}," >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/www/grafana/distinfo b/www/grafana/distinfo
index d537aa8e3606..20cf92a6e62f 100644
--- a/www/grafana/distinfo
+++ b/www/grafana/distinfo
@@ -1,77 +1,77 @@
-TIMESTAMP = 1774555555
-SHA256 (go/www_grafana/grafana-grafana-v12.4.2_GH0/grafana-12.4.2.linux-amd64.tar.gz) = f240b200a803bf64592fae645331750c2681df5f07496743d714db12393a591f
-SIZE (go/www_grafana/grafana-grafana-v12.4.2_GH0/grafana-12.4.2.linux-amd64.tar.gz) = 198426054
-SHA256 (go/www_grafana/grafana-grafana-v12.4.2_GH0/go.mod) = 5d61926ed0427648ea36e268cdce8d22ce84280af0000a4e3f3bab880adebe29
-SIZE (go/www_grafana/grafana-grafana-v12.4.2_GH0/go.mod) = 48259
-SHA256 (go/www_grafana/grafana-grafana-v12.4.2_GH0/go.work) = 68cc074944997315b78f2253ba118aa6a54cdafd6623d4d7aebebfbfd0114518
-SIZE (go/www_grafana/grafana-grafana-v12.4.2_GH0/go.work) = 1171
-SHA256 (go/www_grafana/grafana-grafana-v12.4.2_GH0/apps/advisor/go.mod) = 0afaa58629d6992782e0d874f171df4679c2b6790d69aa5edcf015a3571f5c1e
-SIZE (go/www_grafana/grafana-grafana-v12.4.2_GH0/apps/advisor/go.mod) = 18987
-SHA256 (go/www_grafana/grafana-grafana-v12.4.2_GH0/apps/alerting/alertenrichment/go.mod) = eec8d6e9cb6d0ac94219b9d8e53f4e5311e2e13b16ad7b7b143fb1ebc1891791
-SIZE (go/www_grafana/grafana-grafana-v12.4.2_GH0/apps/alerting/alertenrichment/go.mod) = 2117
-SHA256 (go/www_grafana/grafana-grafana-v12.4.2_GH0/apps/alerting/historian/go.mod) = 13486f3b562d5ddc2ceed7d58a63f596947264d4de6a2a04d006248b1ff42713
-SIZE (go/www_grafana/grafana-grafana-v12.4.2_GH0/apps/alerting/historian/go.mod) = 9855
-SHA256 (go/www_grafana/grafana-grafana-v12.4.2_GH0/apps/alerting/notifications/go.mod) = a08c45bfe221e8bbee9f62b4bafc116a77401b3d58df47e73b68be628e72c286
-SIZE (go/www_grafana/grafana-grafana-v12.4.2_GH0/apps/alerting/notifications/go.mod) = 5942
-SHA256 (go/www_grafana/grafana-grafana-v12.4.2_GH0/apps/alerting/rules/go.mod) = 010fd535400b1e2f0752645dfccc0c2628e4e5b766751814ac33cddb7a6e2392
-SIZE (go/www_grafana/grafana-grafana-v12.4.2_GH0/apps/alerting/rules/go.mod) = 4891
-SHA256 (go/www_grafana/grafana-grafana-v12.4.2_GH0/apps/annotation/go.mod) = f0ac8e41c8847777d5874c2058c0360340f3fc11ad3869ddef39198f3e88820f
-SIZE (go/www_grafana/grafana-grafana-v12.4.2_GH0/apps/annotation/go.mod) = 4899
-SHA256 (go/www_grafana/grafana-grafana-v12.4.2_GH0/apps/collections/go.mod) = 3c3bb6b2a8c1581ce2469bed3a626f541865d160e993f98af274e0892bb62067
-SIZE (go/www_grafana/grafana-grafana-v12.4.2_GH0/apps/collections/go.mod) = 3713
-SHA256 (go/www_grafana/grafana-grafana-v12.4.2_GH0/apps/correlations/go.mod) = 61803933b7a7d4a12093627852f53a4de29afb777d9c93733988d7a435949bfe
-SIZE (go/www_grafana/grafana-grafana-v12.4.2_GH0/apps/correlations/go.mod) = 4901
-SHA256 (go/www_grafana/grafana-grafana-v12.4.2_GH0/apps/dashboard/go.mod) = 9852272ca610cd0d92219188538779a539f2a5ae0b6a4eb89a25d53e0b75848a
-SIZE (go/www_grafana/grafana-grafana-v12.4.2_GH0/apps/dashboard/go.mod) = 7434
-SHA256 (go/www_grafana/grafana-grafana-v12.4.2_GH0/apps/dashvalidator/go.mod) = c30f1c85b27224fdec3d2bec55b9c187f6d75deec6462f2b9cd049a7cf98028a
-SIZE (go/www_grafana/grafana-grafana-v12.4.2_GH0/apps/dashvalidator/go.mod) = 12950
-SHA256 (go/www_grafana/grafana-grafana-v12.4.2_GH0/apps/example/go.mod) = ea394eaf45339ba9d0dcbbba7e884dcc3d0be5314bb425d5b27ffdc6cf565a27
-SIZE (go/www_grafana/grafana-grafana-v12.4.2_GH0/apps/example/go.mod) = 5344
-SHA256 (go/www_grafana/grafana-grafana-v12.4.2_GH0/apps/folder/go.mod) = 417e198945dd7c0784fffe9e3e141f80a5724afac0d0c66f8ef0f5543ea35599
-SIZE (go/www_grafana/grafana-grafana-v12.4.2_GH0/apps/folder/go.mod) = 3720
-SHA256 (go/www_grafana/grafana-grafana-v12.4.2_GH0/apps/iam/go.mod) = 668f3ee74eeb6e64a3270fc141ba037be9374fff9077890c3504cdc5949ec8cd
-SIZE (go/www_grafana/grafana-grafana-v12.4.2_GH0/apps/iam/go.mod) = 26381
-SHA256 (go/www_grafana/grafana-grafana-v12.4.2_GH0/apps/live/go.mod) = 2f49b546fc32e47f0716e2d5771cde0c187bce735361086c1ea1cc52abe8da6d
-SIZE (go/www_grafana/grafana-grafana-v12.4.2_GH0/apps/live/go.mod) = 4834
-SHA256 (go/www_grafana/grafana-grafana-v12.4.2_GH0/apps/logsdrilldown/go.mod) = 52e36fa680dca1f3e41fc637fb0e19de50c300ae4dd1334d7d02cc41755c9142
-SIZE (go/www_grafana/grafana-grafana-v12.4.2_GH0/apps/logsdrilldown/go.mod) = 4902
-SHA256 (go/www_grafana/grafana-grafana-v12.4.2_GH0/apps/playlist/go.mod) = 0a1943d8fe0d20eeefe967f1b63fe89e2a42178b534bee6ef7dcc506940536d3
-SIZE (go/www_grafana/grafana-grafana-v12.4.2_GH0/apps/playlist/go.mod) = 4885
-SHA256 (go/www_grafana/grafana-grafana-v12.4.2_GH0/apps/plugins/go.mod) = 69055d556cab744fa4379ddd50f65a9544bf75432a5f1b1478a818be21886d4e
-SIZE (go/www_grafana/grafana-grafana-v12.4.2_GH0/apps/plugins/go.mod) = 12978
-SHA256 (go/www_grafana/grafana-grafana-v12.4.2_GH0/apps/preferences/go.mod) = 7de84d0fa6d166c35f697a9a134cb2584246ff47aed79493661efd0a97b8296e
-SIZE (go/www_grafana/grafana-grafana-v12.4.2_GH0/apps/preferences/go.mod) = 3725
-SHA256 (go/www_grafana/grafana-grafana-v12.4.2_GH0/apps/provisioning/go.mod) = 0d885c4237e390f971d3d0fc06fba4f0a06cacdf118327388758188c8a5b063d
-SIZE (go/www_grafana/grafana-grafana-v12.4.2_GH0/apps/provisioning/go.mod) = 5143
-SHA256 (go/www_grafana/grafana-grafana-v12.4.2_GH0/apps/quotas/go.mod) = 57816a870fd11db82a51ef329c2620e41d53bbfdd0e4f54ad2d27df868612ee5
-SIZE (go/www_grafana/grafana-grafana-v12.4.2_GH0/apps/quotas/go.mod) = 23761
-SHA256 (go/www_grafana/grafana-grafana-v12.4.2_GH0/apps/scope/go.mod) = 86bdf3401fbdf065b969b99c23cb184e78a2bf5afd23fc9b405059361f78352e
-SIZE (go/www_grafana/grafana-grafana-v12.4.2_GH0/apps/scope/go.mod) = 2386
-SHA256 (go/www_grafana/grafana-grafana-v12.4.2_GH0/apps/secret/go.mod) = 8e4e072f3e3ab84202b103724c93134f0c2cac2f79c268e5747bb9f7499613dd
-SIZE (go/www_grafana/grafana-grafana-v12.4.2_GH0/apps/secret/go.mod) = 3846
-SHA256 (go/www_grafana/grafana-grafana-v12.4.2_GH0/apps/shorturl/go.mod) = 21873d7f5b89f32bd6bb4a6fb9c7dd9b623549e17fdb25cd9c29aeb6156c7b9a
-SIZE (go/www_grafana/grafana-grafana-v12.4.2_GH0/apps/shorturl/go.mod) = 5333
-SHA256 (go/www_grafana/grafana-grafana-v12.4.2_GH0/pkg/aggregator/go.mod) = b02bc1bd8ccd0ef51beaec7eab094fd5446ab6647c807434e46c509861cfa6ee
-SIZE (go/www_grafana/grafana-grafana-v12.4.2_GH0/pkg/aggregator/go.mod) = 7551
-SHA256 (go/www_grafana/grafana-grafana-v12.4.2_GH0/pkg/apimachinery/go.mod) = 0020f81b71093f244752f74a0cffcfde42969ef849de8c42d019ae5646b19066
-SIZE (go/www_grafana/grafana-grafana-v12.4.2_GH0/pkg/apimachinery/go.mod) = 3155
-SHA256 (go/www_grafana/grafana-grafana-v12.4.2_GH0/pkg/apiserver/go.mod) = 113ef85b349b6938c195bfef4f3b0939c36df2b7defc27c3d4de6c2285bb6145
-SIZE (go/www_grafana/grafana-grafana-v12.4.2_GH0/pkg/apiserver/go.mod) = 5652
-SHA256 (go/www_grafana/grafana-grafana-v12.4.2_GH0/pkg/build/go.mod) = a1e0f2d1e81962657d5561e7f60830020197cc6a719afa3a47ee3ab92caae8ee
-SIZE (go/www_grafana/grafana-grafana-v12.4.2_GH0/pkg/build/go.mod) = 3964
-SHA256 (go/www_grafana/grafana-grafana-v12.4.2_GH0/pkg/build/wire/go.mod) = ac732ce8a671ef707124619d07b5ae77a82d43232ef72938d7dcd1a176bf17d6
-SIZE (go/www_grafana/grafana-grafana-v12.4.2_GH0/pkg/build/wire/go.mod) = 330
-SHA256 (go/www_grafana/grafana-grafana-v12.4.2_GH0/pkg/codegen/go.mod) = ed43d314be90b3f90e64b7ca07f00e3ecb53714894765e9e863f298ef2909c3c
-SIZE (go/www_grafana/grafana-grafana-v12.4.2_GH0/pkg/codegen/go.mod) = 2690
-SHA256 (go/www_grafana/grafana-grafana-v12.4.2_GH0/pkg/plugins/codegen/go.mod) = dbf3505ab75a04628eb5a7ef664704c0bd2379aaf5f3e363dd67b64033a1b02f
-SIZE (go/www_grafana/grafana-grafana-v12.4.2_GH0/pkg/plugins/codegen/go.mod) = 2343
-SHA256 (go/www_grafana/grafana-grafana-v12.4.2_GH0/pkg/plugins/go.mod) = a9d6115e0cf4a86f5ff22b57a2825922cedf695306d7c6fcf25a0ac8cbe9a7d9
-SIZE (go/www_grafana/grafana-grafana-v12.4.2_GH0/pkg/plugins/go.mod) = 6433
-SHA256 (go/www_grafana/grafana-grafana-v12.4.2_GH0/pkg/promlib/go.mod) = 3ea77d0f48d4eab7eb811f28f189be2620a9689f516ac16abc287b7994a3de13
-SIZE (go/www_grafana/grafana-grafana-v12.4.2_GH0/pkg/promlib/go.mod) = 6860
-SHA256 (go/www_grafana/grafana-grafana-v12.4.2_GH0/pkg/semconv/go.mod) = e69b93ed9c48f15fea18d19614c92a0ccd82e3d3bfb135f8e463d5ea90d309af
-SIZE (go/www_grafana/grafana-grafana-v12.4.2_GH0/pkg/semconv/go.mod) = 318
-SHA256 (go/www_grafana/grafana-grafana-v12.4.2_GH0/pkg/storage/unified/resource/kv/go.mod) = 48ca25a286d4d3846c8f334099e1f1f3c8ca7ed5b4b1a233c92b5932bd44de38
-SIZE (go/www_grafana/grafana-grafana-v12.4.2_GH0/pkg/storage/unified/resource/kv/go.mod) = 1087
-SHA256 (go/www_grafana/grafana-grafana-v12.4.2_GH0/grafana-grafana-v12.4.2_GH0.tar.gz) = f3b5dbc39da14ba072dea00c2b2ec40743f753851e4ad8bd133a7a1441adeb76
-SIZE (go/www_grafana/grafana-grafana-v12.4.2_GH0/grafana-grafana-v12.4.2_GH0.tar.gz) = 42626211
+TIMESTAMP = 1776798896
+SHA256 (go/www_grafana/grafana-grafana-v13.0.1_GH0/grafana-13.0.1.linux-amd64.tar.gz) = 187ddc4badb69aecb7cd3fae2884add7ed21adde7124a6f8093b7b4033d722f2
+SIZE (go/www_grafana/grafana-grafana-v13.0.1_GH0/grafana-13.0.1.linux-amd64.tar.gz) = 332024028
+SHA256 (go/www_grafana/grafana-grafana-v13.0.1_GH0/go.mod) = 66f7f8466a4f6d1ca1829e3f89d1befd32e63c00f0207e6b2a8c27db3ae14a50
+SIZE (go/www_grafana/grafana-grafana-v13.0.1_GH0/go.mod) = 48822
+SHA256 (go/www_grafana/grafana-grafana-v13.0.1_GH0/go.work) = 93c3b9d87f612f5dac7cb0adbbfc824af75a6a4146e0eb9d9c091842bc7c63bb
+SIZE (go/www_grafana/grafana-grafana-v13.0.1_GH0/go.work) = 1178
+SHA256 (go/www_grafana/grafana-grafana-v13.0.1_GH0/apps/advisor/go.mod) = 40ded2a2049bba747b5b525547f18340d8f84e5f429fa4f38b393b6f152839a5
+SIZE (go/www_grafana/grafana-grafana-v13.0.1_GH0/apps/advisor/go.mod) = 19420
+SHA256 (go/www_grafana/grafana-grafana-v13.0.1_GH0/apps/alerting/alertenrichment/go.mod) = bfaa18b0156a62e1da68aa1bf31a5ca14dcdcd569664c5f43367fdf64b849302
+SIZE (go/www_grafana/grafana-grafana-v13.0.1_GH0/apps/alerting/alertenrichment/go.mod) = 2235
+SHA256 (go/www_grafana/grafana-grafana-v13.0.1_GH0/apps/alerting/historian/go.mod) = d7cf261ff8fdd2cb4a7af64665677310fe5ba87d15285b828b780cc96fd0515f
+SIZE (go/www_grafana/grafana-grafana-v13.0.1_GH0/apps/alerting/historian/go.mod) = 9423
+SHA256 (go/www_grafana/grafana-grafana-v13.0.1_GH0/apps/alerting/notifications/go.mod) = 09ba8e1ba2df8730d51d4b0507161012e4d0ba9385823a2c015d7ee7b84a6e4b
+SIZE (go/www_grafana/grafana-grafana-v13.0.1_GH0/apps/alerting/notifications/go.mod) = 6202
+SHA256 (go/www_grafana/grafana-grafana-v13.0.1_GH0/apps/alerting/rules/go.mod) = 76b7e145e0a33f9c90c811942c809ed6485d8ab6595eb0a3a2862de4dd39c216
+SIZE (go/www_grafana/grafana-grafana-v13.0.1_GH0/apps/alerting/rules/go.mod) = 5188
+SHA256 (go/www_grafana/grafana-grafana-v13.0.1_GH0/apps/annotation/go.mod) = b42a3c8712989ac79b675823367a0ab234aa9fbbd357108806471e3679249cdf
+SIZE (go/www_grafana/grafana-grafana-v13.0.1_GH0/apps/annotation/go.mod) = 5159
+SHA256 (go/www_grafana/grafana-grafana-v13.0.1_GH0/apps/collections/go.mod) = 4ea08c37051c5de55e3ab42e8f2f5e6ed75c59469470a76d43bf8c03a8b6935f
+SIZE (go/www_grafana/grafana-grafana-v13.0.1_GH0/apps/collections/go.mod) = 3882
+SHA256 (go/www_grafana/grafana-grafana-v13.0.1_GH0/apps/correlations/go.mod) = fbd2278cf4bfa42c97352b63184125cf7c166eb17a3c55bdb9c038e5ea072735
+SIZE (go/www_grafana/grafana-grafana-v13.0.1_GH0/apps/correlations/go.mod) = 5161
+SHA256 (go/www_grafana/grafana-grafana-v13.0.1_GH0/apps/dashboard/go.mod) = 0fb334438533848adf9a32fbfdc9a8601ffba4ae85ff4af48dde04d71113f622
+SIZE (go/www_grafana/grafana-grafana-v13.0.1_GH0/apps/dashboard/go.mod) = 7724
+SHA256 (go/www_grafana/grafana-grafana-v13.0.1_GH0/apps/dashvalidator/go.mod) = 81043ffb38a13f7884f06daf42eba10f3c3236cd0b6087dc2c4f0629f893372b
+SIZE (go/www_grafana/grafana-grafana-v13.0.1_GH0/apps/dashvalidator/go.mod) = 18653
+SHA256 (go/www_grafana/grafana-grafana-v13.0.1_GH0/apps/example/go.mod) = 56085788d00f01d0aafe92a3e74a325eaa94163b19d65d81b0e429b8113d6088
+SIZE (go/www_grafana/grafana-grafana-v13.0.1_GH0/apps/example/go.mod) = 5604
+SHA256 (go/www_grafana/grafana-grafana-v13.0.1_GH0/apps/folder/go.mod) = c75098e886455b86ee5b200f54f1b12a57dc44faac23cdfd1810c3ae908ad4d9
+SIZE (go/www_grafana/grafana-grafana-v13.0.1_GH0/apps/folder/go.mod) = 3889
+SHA256 (go/www_grafana/grafana-grafana-v13.0.1_GH0/apps/iam/go.mod) = 5272fdcd86b88467595a286375a8c11e7926a765ca19eee03304eb380a3133dd
+SIZE (go/www_grafana/grafana-grafana-v13.0.1_GH0/apps/iam/go.mod) = 7338
+SHA256 (go/www_grafana/grafana-grafana-v13.0.1_GH0/apps/live/go.mod) = 305cc5a7f72252a12bbdc9b5c11147cbc2c149e2971eb5d960c467979cbfc849
+SIZE (go/www_grafana/grafana-grafana-v13.0.1_GH0/apps/live/go.mod) = 4834
+SHA256 (go/www_grafana/grafana-grafana-v13.0.1_GH0/apps/logsdrilldown/go.mod) = 5d6a48b604def2bd1b0a4fecce44c5d1419b407791c98f587b02980ae3c6d774
+SIZE (go/www_grafana/grafana-grafana-v13.0.1_GH0/apps/logsdrilldown/go.mod) = 5162
+SHA256 (go/www_grafana/grafana-grafana-v13.0.1_GH0/apps/playlist/go.mod) = a1d4b01dfb5bdabef6c684a82a51a92d72b174773269fb59a3c56367033f63ae
+SIZE (go/www_grafana/grafana-grafana-v13.0.1_GH0/apps/playlist/go.mod) = 5145
+SHA256 (go/www_grafana/grafana-grafana-v13.0.1_GH0/apps/plugins/go.mod) = 044941320d55f6b28d2932d34d2fb3ec4041b25029951a4177b973aace52387f
+SIZE (go/www_grafana/grafana-grafana-v13.0.1_GH0/apps/plugins/go.mod) = 13548
+SHA256 (go/www_grafana/grafana-grafana-v13.0.1_GH0/apps/preferences/go.mod) = a56459e5742ba16a11ae44b9c216752247c5da8ab3c92efc5a3aa40248b9e50f
+SIZE (go/www_grafana/grafana-grafana-v13.0.1_GH0/apps/preferences/go.mod) = 3894
+SHA256 (go/www_grafana/grafana-grafana-v13.0.1_GH0/apps/provisioning/go.mod) = c18bd23afe07fccd66f5af62ddd0a6ec6696d8b6c967b35e4782e8484938e5ec
+SIZE (go/www_grafana/grafana-grafana-v13.0.1_GH0/apps/provisioning/go.mod) = 5398
+SHA256 (go/www_grafana/grafana-grafana-v13.0.1_GH0/apps/quotas/go.mod) = e890ca6cffacf23a9d9df22d5cd3251308dfc5bf5efdc8924116e2950987d543
+SIZE (go/www_grafana/grafana-grafana-v13.0.1_GH0/apps/quotas/go.mod) = 24094
+SHA256 (go/www_grafana/grafana-grafana-v13.0.1_GH0/apps/scope/go.mod) = 04aca8496e5be78b8876f1e0ebec3bd2e23340f9beeefd555de845b24754208b
+SIZE (go/www_grafana/grafana-grafana-v13.0.1_GH0/apps/scope/go.mod) = 2504
+SHA256 (go/www_grafana/grafana-grafana-v13.0.1_GH0/apps/secret/go.mod) = 9dd8490324ce44f239a3b118f1175d573e651be41321be55072c36a2df1fa5a9
+SIZE (go/www_grafana/grafana-grafana-v13.0.1_GH0/apps/secret/go.mod) = 4072
+SHA256 (go/www_grafana/grafana-grafana-v13.0.1_GH0/apps/shorturl/go.mod) = 3508d4e98dfb5e47bfe4aa398e4f8441d4f5073197ed9447c6d4bd029211a21f
+SIZE (go/www_grafana/grafana-grafana-v13.0.1_GH0/apps/shorturl/go.mod) = 5630
+SHA256 (go/www_grafana/grafana-grafana-v13.0.1_GH0/pkg/aggregator/go.mod) = 6df2b6a1779f3fa9ce3157e99b0eec67f3880d97a96c1a45eb45f6dc58c3c538
+SIZE (go/www_grafana/grafana-grafana-v13.0.1_GH0/pkg/aggregator/go.mod) = 7956
+SHA256 (go/www_grafana/grafana-grafana-v13.0.1_GH0/pkg/apimachinery/go.mod) = 7c080147abc6b14104b8f2e1f8fbea7131568cd41c81e1cabfdd8c1040e1b832
+SIZE (go/www_grafana/grafana-grafana-v13.0.1_GH0/pkg/apimachinery/go.mod) = 3330
+SHA256 (go/www_grafana/grafana-grafana-v13.0.1_GH0/pkg/apiserver/go.mod) = c8ac3da33831b0bb3e9395239774cd0e2c314857b36bd1e38442c0d421315e90
+SIZE (go/www_grafana/grafana-grafana-v13.0.1_GH0/pkg/apiserver/go.mod) = 5809
+SHA256 (go/www_grafana/grafana-grafana-v13.0.1_GH0/pkg/build/go.mod) = e4ecc3803db02006b9c47bfd084cf9ce9f4ff099b576686eb06ca835df410367
+SIZE (go/www_grafana/grafana-grafana-v13.0.1_GH0/pkg/build/go.mod) = 4932
+SHA256 (go/www_grafana/grafana-grafana-v13.0.1_GH0/pkg/build/wire/go.mod) = cce20c87b3f0f551c1e1818f2a762c33540948d3eec4c9b27b38e3c9365f89cd
+SIZE (go/www_grafana/grafana-grafana-v13.0.1_GH0/pkg/build/wire/go.mod) = 330
+SHA256 (go/www_grafana/grafana-grafana-v13.0.1_GH0/pkg/codegen/go.mod) = f4717fa568267a28d4c6c758a77e4c31f2508e876e387f2031246c6edec1fbe8
+SIZE (go/www_grafana/grafana-grafana-v13.0.1_GH0/pkg/codegen/go.mod) = 2901
+SHA256 (go/www_grafana/grafana-grafana-v13.0.1_GH0/pkg/infra/features/go.mod) = 1c8041ef91d08ec6bb40682dcbfae2536f9da0df20cc26c9a68676d9b9b92ddd
+SIZE (go/www_grafana/grafana-grafana-v13.0.1_GH0/pkg/infra/features/go.mod) = 2325
+SHA256 (go/www_grafana/grafana-grafana-v13.0.1_GH0/pkg/plugins/codegen/go.mod) = 0e737c8b399566966ae5249682f6c98f3b20157e101f631c51df816941eb2a98
+SIZE (go/www_grafana/grafana-grafana-v13.0.1_GH0/pkg/plugins/codegen/go.mod) = 2341
+SHA256 (go/www_grafana/grafana-grafana-v13.0.1_GH0/pkg/plugins/go.mod) = 8f2484e08af2a0c79a1c9444e35569166afa4d839aa458042a2a2fc5c0574ba9
+SIZE (go/www_grafana/grafana-grafana-v13.0.1_GH0/pkg/plugins/go.mod) = 6793
+SHA256 (go/www_grafana/grafana-grafana-v13.0.1_GH0/pkg/semconv/go.mod) = bc2729e6285a024dbd639c5c53ee60de36b6909785befa209418b59c907beab2
+SIZE (go/www_grafana/grafana-grafana-v13.0.1_GH0/pkg/semconv/go.mod) = 318
+SHA256 (go/www_grafana/grafana-grafana-v13.0.1_GH0/pkg/storage/unified/resource/kv/go.mod) = 3b399e9531bbfcb5374887616aebbfdb38101a52b00c20bc57887a6e88feb350
+SIZE (go/www_grafana/grafana-grafana-v13.0.1_GH0/pkg/storage/unified/resource/kv/go.mod) = 1126
+SHA256 (go/www_grafana/grafana-grafana-v13.0.1_GH0/grafana-grafana-v13.0.1_GH0.tar.gz) = 0bf4d3275c9fe32184ad6c79004928da7436d8a94e0cfb7ded4216080940b54a
+SIZE (go/www_grafana/grafana-grafana-v13.0.1_GH0/grafana-grafana-v13.0.1_GH0.tar.gz) = 45566554
diff --git a/www/grafana/files/grafana.in b/www/grafana/files/grafana.in
index dc15c9f27405..67a395f357a9 100644
--- a/www/grafana/files/grafana.in
+++ b/www/grafana/files/grafana.in
@@ -1,78 +1,78 @@
 #!/bin/sh
 
 # PROVIDE: grafana
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 
 # Add the following lines to /etc/rc.conf to enable grafana
 # grafana_enable="YES"
 #
 # grafana_enable (bool):
 #     Set it to YES to enable grafana
 #     Set to NO by default
 # grafana_user (str):
 #     Set user that grafana will run under
 #     Default is "%%GRAFANA_USER%%"
 # grafana_group (str):
 #     Set group that own grafana files
 #     Default is "%%GRAFANA_GROUP%%"
 # grafana_config (str):
 #     Set full path to config file
 #     Default is "%%ETCDIR%%/grafana.ini"
 # grafana_homepath (str):
 #     Set full path to homepath dir
 #     Default is "%%GRAFANA_HOMEDIR%%"
 # grafana_syslog_output_enable (bool):
 #     Set it to YES to enable stdout/stderr syslog output
 #     Set to NO by default
 # grafana_syslog_output_tag (str):
 #     Set syslog tag if syslog enabled
 #     Default is "grafana"
-# grafana_args (string):
+# grafana_args (str):
 #     Set additional command line arguments
 #     Default is ""
 
 . /etc/rc.subr
 
 name=grafana
 rcvar=grafana_enable
 
 load_rc_config $name
 
 : ${grafana_enable:="NO"}
 : ${grafana_user:="%%GRAFANA_USER%%"}
 : ${grafana_group:="%%GRAFANA_GROUP%%"}
 : ${grafana_config:="%%ETCDIR%%/grafana.ini"}
 : ${grafana_homepath:="%%GRAFANA_HOMEDIR%%"}
 : ${grafana_syslog_output_enable:="NO"}
 
 if checkyesno grafana_syslog_output_enable; then
 	if [ -n "${grafana_syslog_output_tag}" ]; then
 		grafana_syslog_output_flags="-T ${grafana_syslog_output_tag}"
 	else
 		grafana_syslog_output_flags="-T ${name}"
 	fi
 fi
 
 pidfile="/var/run/${name}/${name}.pid"
 required_files="${grafana_config}"
 
 procname="%%PREFIX%%/bin/grafana"
 command="/usr/sbin/daemon"
 command_args="-f ${grafana_syslog_output_flags} -p ${pidfile} -t ${name} \
 	/usr/bin/env ${grafana_env} ${procname} server \
 	-config=${grafana_config} \
 	-homepath=${grafana_homepath} \
 	${grafana_args}"
 grafana_chdir="${grafana_homepath}"
 
 start_precmd="grafana_start_precmd"
 
 grafana_start_precmd()
 {
 	if [ ! -d "/var/run/${name}" ]; then
 		install -d -m 0750 -o ${grafana_user} -g ${grafana_group} "/var/run/${name}"
 	fi
 }
 
 run_rc_command "$1"
diff --git a/www/grafana/pkg-plist b/www/grafana/pkg-plist
index 841e70e16ec4..97908cf8b59f 100644
--- a/www/grafana/pkg-plist
+++ b/www/grafana/pkg-plist
@@ -1,22 +1,20 @@
 bin/grafana
-bin/grafana-cli
-bin/grafana-server
 @sample %%ETCDIR%%/grafana.ini.sample
 @sample %%ETCDIR%%/ldap.toml.sample
 %%DATADIR%%/conf/defaults.ini
 @owner %%GRAFANA_USER%%
 @group %%GRAFANA_GROUP%%
 @mode 750
 @dir %%GRAFANA_DATADIR%%
 @dir %%GRAFANA_PLUGINDIR%%
 @dir %%GRAFANA_PROVISIONINGDIR%%
 @dir %%GRAFANA_PROVISIONINGDIR%%/access-control
 @dir %%GRAFANA_PROVISIONINGDIR%%/alerting
 @dir %%GRAFANA_PROVISIONINGDIR%%/dashboards
 @dir %%GRAFANA_PROVISIONINGDIR%%/datasources
 @dir %%GRAFANA_PROVISIONINGDIR%%/plugins
 @dir %%GRAFANA_PROVISIONINGDIR%%/sample
 @dir %%GRAFANA_LOGDIR%%
 @mode
 @group
 @owner