diff --git a/www/grafana/Makefile b/www/grafana/Makefile
index 143041334760..bc04caaf9c08 100644
--- a/www/grafana/Makefile
+++ b/www/grafana/Makefile
@@ -1,118 +1,122 @@
 PORTNAME=	grafana
 DISTVERSIONPREFIX=	v
-DISTVERSION=	11.4.0
-PORTREVISION=	1
+DISTVERSION=	11.5.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/alerting/notifications/go.mod:gomod \
+		apps/investigation/go.mod:gomod \
 		apps/playlist/go.mod:gomod \
+		kindsv2/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/plugins/codegen/go.mod:gomod \
 		pkg/promlib/go.mod:gomod \
 		pkg/semconv/go.mod:gomod \
 		pkg/storage/unified/apistore/go.mod:gomod \
 		pkg/storage/unified/resource/go.mod:gomod \
 		pkg/util/xorm/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 i386 riscv64
 
 RUN_DEPENDS=	ca_root_nss>=0:security/ca_root_nss
 
 USES=		cpe go:1.23,modules
 
 USE_GITHUB=	yes
 
 USE_RC_SUBR=	grafana
-TAG=		b587018
+TAG=		c6c701c
 
 GO_MODULE=	github.com/grafana/grafana
 GO_MOD_DIST=	github
 GO_TARGET=	./pkg/cmd/grafana \
 		./pkg/cmd/grafana-server \
 		./pkg/cmd/grafana-cli
 GO_BUILDFLAGS=	-ldflags="-w -X main.version=${PORTVERSION} -X main.commit=${TAG}"
 
 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?=	grafana
 GRAFANA_GROUP?=	grafana
 
 USERS=		${GRAFANA_USER}
 GROUPS=		${GRAFANA_GROUP}
 
 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
 
 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}
 	${MKDIR} ${STAGEDIR}${GRAFANA_HOMEDIR}/conf
 	${MKDIR} ${STAGEDIR}${GRAFANA_DATADIR}
 	${MKDIR} ${STAGEDIR}${GRAFANA_PLUGINDIR}
 .for dir in access-control alerting dashboards datasources plugins
 	${MKDIR} ${STAGEDIR}${GRAFANA_PROVISIONINGDIR}/${dir}
 .endfor
 	${MKDIR} ${STAGEDIR}${GRAFANA_LOGDIR}
 	(cd ${WRKDIR}/${PORTNAME}-${DISTVERSIONPREFIX}${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 197fd525db30..1a7ffc33aa53 100644
--- a/www/grafana/distinfo
+++ b/www/grafana/distinfo
@@ -1,31 +1,41 @@
-TIMESTAMP = 1733432116
-SHA256 (go/www_grafana/grafana-grafana-v11.4.0_GH0/grafana-11.4.0.linux-amd64.tar.gz) = 3550c73f4455435642976e82cc89aa354f076a75b766a408781107f4f5d4744c
-SIZE (go/www_grafana/grafana-grafana-v11.4.0_GH0/grafana-11.4.0.linux-amd64.tar.gz) = 132819399
-SHA256 (go/www_grafana/grafana-grafana-v11.4.0_GH0/go.mod) = 1e3af2adb03612b98d67b3ba45c64ab53603e73b1a62abab9124a8d00560cc42
-SIZE (go/www_grafana/grafana-grafana-v11.4.0_GH0/go.mod) = 31518
-SHA256 (go/www_grafana/grafana-grafana-v11.4.0_GH0/go.work) = 2e3d410e51ed1eaa0d96f01ecc297b01ef88b2fcfde32bc7aac06bf657ea3366
-SIZE (go/www_grafana/grafana-grafana-v11.4.0_GH0/go.work) = 986
-SHA256 (go/www_grafana/grafana-grafana-v11.4.0_GH0/apps/playlist/go.mod) = 6740589796c3cac1a765d7013aa9734357c2446900b77dfa4cca5e6b5da1bd36
-SIZE (go/www_grafana/grafana-grafana-v11.4.0_GH0/apps/playlist/go.mod) = 1485
-SHA256 (go/www_grafana/grafana-grafana-v11.4.0_GH0/pkg/aggregator/go.mod) = 39574ebd7fbd1cbe05a98006a2d47598ec530c7a771ef451d77d27ce3b74bfc7
-SIZE (go/www_grafana/grafana-grafana-v11.4.0_GH0/pkg/aggregator/go.mod) = 8188
-SHA256 (go/www_grafana/grafana-grafana-v11.4.0_GH0/pkg/apimachinery/go.mod) = 0d42d7150cd806d4e5d8af093deb932aa40048d23e042c77809850336cf4ea87
-SIZE (go/www_grafana/grafana-grafana-v11.4.0_GH0/pkg/apimachinery/go.mod) = 2324
-SHA256 (go/www_grafana/grafana-grafana-v11.4.0_GH0/pkg/apiserver/go.mod) = 0303d70af8d9bc60ab2cd3b971676d8e14abd7430b4a148b4a360e7c82fce345
-SIZE (go/www_grafana/grafana-grafana-v11.4.0_GH0/pkg/apiserver/go.mod) = 4692
-SHA256 (go/www_grafana/grafana-grafana-v11.4.0_GH0/pkg/build/go.mod) = 03478623b24fe0f074b35173798741851575eb5fa98447954f2e090e09348709
-SIZE (go/www_grafana/grafana-grafana-v11.4.0_GH0/pkg/build/go.mod) = 7628
-SHA256 (go/www_grafana/grafana-grafana-v11.4.0_GH0/pkg/build/wire/go.mod) = 1fcb6b958df4f7522519deaeb38e94706b126ee9f2b68a4cf7c84ef34f56c8a2
-SIZE (go/www_grafana/grafana-grafana-v11.4.0_GH0/pkg/build/wire/go.mod) = 329
-SHA256 (go/www_grafana/grafana-grafana-v11.4.0_GH0/pkg/promlib/go.mod) = 67006ed88d6fb7ff339b5d96b521773cba02925e713d0e79aae346cc997d88ad
-SIZE (go/www_grafana/grafana-grafana-v11.4.0_GH0/pkg/promlib/go.mod) = 6919
-SHA256 (go/www_grafana/grafana-grafana-v11.4.0_GH0/pkg/semconv/go.mod) = 0b51a8e6324569216cf7b45e937f9bb8b6a27ebddf32fcf5ddf082ba682d6248
-SIZE (go/www_grafana/grafana-grafana-v11.4.0_GH0/pkg/semconv/go.mod) = 269
-SHA256 (go/www_grafana/grafana-grafana-v11.4.0_GH0/pkg/storage/unified/apistore/go.mod) = 645a6bdafac17f30d4d84b2e9bec8dbf5ef6174e7b1b32cd789a4315b822d51b
-SIZE (go/www_grafana/grafana-grafana-v11.4.0_GH0/pkg/storage/unified/apistore/go.mod) = 5393
-SHA256 (go/www_grafana/grafana-grafana-v11.4.0_GH0/pkg/storage/unified/resource/go.mod) = f95741501ff65a2d53f4e579e5410961d4db6589a882cdc4f2f80dafe64be937
-SIZE (go/www_grafana/grafana-grafana-v11.4.0_GH0/pkg/storage/unified/resource/go.mod) = 4231
-SHA256 (go/www_grafana/grafana-grafana-v11.4.0_GH0/pkg/util/xorm/go.mod) = 4f68d456ac4893fd6111b282fbc59a677b22574df085a797dedb37b475f7aa92
-SIZE (go/www_grafana/grafana-grafana-v11.4.0_GH0/pkg/util/xorm/go.mod) = 610
-SHA256 (go/www_grafana/grafana-grafana-v11.4.0_GH0/grafana-grafana-v11.4.0_GH0.tar.gz) = c3a63aade2a86aa360c9b46f4963e60673fc51bb6c54a088d44dfab5a8fb465e
-SIZE (go/www_grafana/grafana-grafana-v11.4.0_GH0/grafana-grafana-v11.4.0_GH0.tar.gz) = 34329942
+TIMESTAMP = 1738711483
+SHA256 (go/www_grafana/grafana-grafana-v11.5.1_GH0/grafana-11.5.1.linux-amd64.tar.gz) = a999fc4897b3d7dbbd1b8cba4a6fb7a6b37f9c2fd371804d2959839ed54e1746
+SIZE (go/www_grafana/grafana-grafana-v11.5.1_GH0/grafana-11.5.1.linux-amd64.tar.gz) = 146449605
+SHA256 (go/www_grafana/grafana-grafana-v11.5.1_GH0/go.mod) = 51d23267a7551c7cb90a2b3a8da5953ffb7f55564da46831862df9f9083e9812
+SIZE (go/www_grafana/grafana-grafana-v11.5.1_GH0/go.mod) = 33754
+SHA256 (go/www_grafana/grafana-grafana-v11.5.1_GH0/go.work) = 56bfc9f712b80a03c210d1e6b077096518fcab4ff6217f30b92ebf9a12509bfb
+SIZE (go/www_grafana/grafana-grafana-v11.5.1_GH0/go.work) = 1186
+SHA256 (go/www_grafana/grafana-grafana-v11.5.1_GH0/apps/alerting/notifications/go.mod) = 5842c157858ac0c7939053cf95aa2dd5d7c260cab9bfbf72d5d06bd526e86c35
+SIZE (go/www_grafana/grafana-grafana-v11.5.1_GH0/apps/alerting/notifications/go.mod) = 4783
+SHA256 (go/www_grafana/grafana-grafana-v11.5.1_GH0/apps/investigation/go.mod) = 1004e431ae64c57ca3282231a0f7355008d50ce0098b8b44a62d8eb8b51e58b9
+SIZE (go/www_grafana/grafana-grafana-v11.5.1_GH0/apps/investigation/go.mod) = 3889
+SHA256 (go/www_grafana/grafana-grafana-v11.5.1_GH0/apps/playlist/go.mod) = 78e6f08a27af2d6b2f673add05ec0079c48da00fb716b69409a13a4d3f892b56
+SIZE (go/www_grafana/grafana-grafana-v11.5.1_GH0/apps/playlist/go.mod) = 3872
+SHA256 (go/www_grafana/grafana-grafana-v11.5.1_GH0/kindsv2/go.mod) = a156716e377781ce6af0dc6f4818bf43b3c1e60dc009baa631a3b2978514411d
+SIZE (go/www_grafana/grafana-grafana-v11.5.1_GH0/kindsv2/go.mod) = 2050
+SHA256 (go/www_grafana/grafana-grafana-v11.5.1_GH0/pkg/aggregator/go.mod) = 041d0f13f14fd480b8602ecc5867958d526314d6a87ee8ba93074457adb03dc7
+SIZE (go/www_grafana/grafana-grafana-v11.5.1_GH0/pkg/aggregator/go.mod) = 8088
+SHA256 (go/www_grafana/grafana-grafana-v11.5.1_GH0/pkg/apimachinery/go.mod) = 59e64e58560209430b6634ff9a45f6b9db695f109d4e13a78b2d1468b4299add
+SIZE (go/www_grafana/grafana-grafana-v11.5.1_GH0/pkg/apimachinery/go.mod) = 2429
+SHA256 (go/www_grafana/grafana-grafana-v11.5.1_GH0/pkg/apiserver/go.mod) = 87f10f05a60166e519acab01cab1dd7e559aad300ca68c0e00cad533f6606f2e
+SIZE (go/www_grafana/grafana-grafana-v11.5.1_GH0/pkg/apiserver/go.mod) = 4910
+SHA256 (go/www_grafana/grafana-grafana-v11.5.1_GH0/pkg/build/go.mod) = 6ef68aacb6e2082a45e01728d6ab62cec48f749f37fa50470d8f7091df6b679d
+SIZE (go/www_grafana/grafana-grafana-v11.5.1_GH0/pkg/build/go.mod) = 7501
+SHA256 (go/www_grafana/grafana-grafana-v11.5.1_GH0/pkg/build/wire/go.mod) = ccb05089308ce4cedaf43269aeac3755f1739c777a66648f7d6c943737956e4a
+SIZE (go/www_grafana/grafana-grafana-v11.5.1_GH0/pkg/build/wire/go.mod) = 330
+SHA256 (go/www_grafana/grafana-grafana-v11.5.1_GH0/pkg/codegen/go.mod) = 161277c48b8528d3b65d2102818583d21c172505ac6926f248a6af51636bdae0
+SIZE (go/www_grafana/grafana-grafana-v11.5.1_GH0/pkg/codegen/go.mod) = 2537
+SHA256 (go/www_grafana/grafana-grafana-v11.5.1_GH0/pkg/plugins/codegen/go.mod) = 8d502ab57653242e194784b00b1e658f91467d6943dacac17e79c880dd355688
+SIZE (go/www_grafana/grafana-grafana-v11.5.1_GH0/pkg/plugins/codegen/go.mod) = 2151
+SHA256 (go/www_grafana/grafana-grafana-v11.5.1_GH0/pkg/promlib/go.mod) = 7786e3585303078efdce36956477f96356d33cf33ec1d6d6f27210bb9fa060d8
+SIZE (go/www_grafana/grafana-grafana-v11.5.1_GH0/pkg/promlib/go.mod) = 6527
+SHA256 (go/www_grafana/grafana-grafana-v11.5.1_GH0/pkg/semconv/go.mod) = f921d07351e3176c86e2ad95930d6194aaacdcb75e09491a08c03b8f69e74900
+SIZE (go/www_grafana/grafana-grafana-v11.5.1_GH0/pkg/semconv/go.mod) = 269
+SHA256 (go/www_grafana/grafana-grafana-v11.5.1_GH0/pkg/storage/unified/apistore/go.mod) = 4b0cd65f4aacb5ced180edd3064664c5c9d7e625065fb8c12cec1f8d524067fa
+SIZE (go/www_grafana/grafana-grafana-v11.5.1_GH0/pkg/storage/unified/apistore/go.mod) = 19676
+SHA256 (go/www_grafana/grafana-grafana-v11.5.1_GH0/pkg/storage/unified/resource/go.mod) = 8596786da5e8c1147fc3bda4c810dfda516bbe97e283ba75cda97a3e95fe84d3
+SIZE (go/www_grafana/grafana-grafana-v11.5.1_GH0/pkg/storage/unified/resource/go.mod) = 13040
+SHA256 (go/www_grafana/grafana-grafana-v11.5.1_GH0/pkg/util/xorm/go.mod) = 8dcf8020b038c86d9966814c90dad244e15ec42a1d74bee5f5ddde77300c2ff0
+SIZE (go/www_grafana/grafana-grafana-v11.5.1_GH0/pkg/util/xorm/go.mod) = 628
+SHA256 (go/www_grafana/grafana-grafana-v11.5.1_GH0/grafana-grafana-v11.5.1_GH0.tar.gz) = f8f593871c432b300a531ab240fc3946aca5c559108e22e9a657feeb809c8527
+SIZE (go/www_grafana/grafana-grafana-v11.5.1_GH0/grafana-grafana-v11.5.1_GH0.tar.gz) = 34708203