diff --git a/www/grafana/Makefile b/www/grafana/Makefile
index 26712fff8e36..657a392b7bda 100644
--- a/www/grafana/Makefile
+++ b/www/grafana/Makefile
@@ -1,123 +1,122 @@
 PORTNAME=	grafana
 DISTVERSIONPREFIX=	v
-DISTVERSION=	11.5.2
-PORTREVISION=	1
+DISTVERSION=	11.6.0
 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/notifications/go.mod:gomod \
-		apps/investigation/go.mod:gomod \
+		apps/investigations/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=		598e033
+TAG=		d2fdff9
 
 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 ed5e39082ef5..e4d6d08b74cb 100644
--- a/www/grafana/distinfo
+++ b/www/grafana/distinfo
@@ -1,41 +1,41 @@
-TIMESTAMP = 1740469223
-SHA256 (go/www_grafana/grafana-grafana-v11.5.2_GH0/grafana-11.5.2.linux-amd64.tar.gz) = 205b16da72842143a6fa1849126b7bd74b5d12a609387d3d037fb104440ea349
-SIZE (go/www_grafana/grafana-grafana-v11.5.2_GH0/grafana-11.5.2.linux-amd64.tar.gz) = 146480729
-SHA256 (go/www_grafana/grafana-grafana-v11.5.2_GH0/go.mod) = 51d23267a7551c7cb90a2b3a8da5953ffb7f55564da46831862df9f9083e9812
-SIZE (go/www_grafana/grafana-grafana-v11.5.2_GH0/go.mod) = 33754
-SHA256 (go/www_grafana/grafana-grafana-v11.5.2_GH0/go.work) = 56bfc9f712b80a03c210d1e6b077096518fcab4ff6217f30b92ebf9a12509bfb
-SIZE (go/www_grafana/grafana-grafana-v11.5.2_GH0/go.work) = 1186
-SHA256 (go/www_grafana/grafana-grafana-v11.5.2_GH0/apps/alerting/notifications/go.mod) = 5842c157858ac0c7939053cf95aa2dd5d7c260cab9bfbf72d5d06bd526e86c35
-SIZE (go/www_grafana/grafana-grafana-v11.5.2_GH0/apps/alerting/notifications/go.mod) = 4783
-SHA256 (go/www_grafana/grafana-grafana-v11.5.2_GH0/apps/investigation/go.mod) = 1004e431ae64c57ca3282231a0f7355008d50ce0098b8b44a62d8eb8b51e58b9
-SIZE (go/www_grafana/grafana-grafana-v11.5.2_GH0/apps/investigation/go.mod) = 3889
-SHA256 (go/www_grafana/grafana-grafana-v11.5.2_GH0/apps/playlist/go.mod) = 78e6f08a27af2d6b2f673add05ec0079c48da00fb716b69409a13a4d3f892b56
-SIZE (go/www_grafana/grafana-grafana-v11.5.2_GH0/apps/playlist/go.mod) = 3872
-SHA256 (go/www_grafana/grafana-grafana-v11.5.2_GH0/kindsv2/go.mod) = a156716e377781ce6af0dc6f4818bf43b3c1e60dc009baa631a3b2978514411d
-SIZE (go/www_grafana/grafana-grafana-v11.5.2_GH0/kindsv2/go.mod) = 2050
-SHA256 (go/www_grafana/grafana-grafana-v11.5.2_GH0/pkg/aggregator/go.mod) = 041d0f13f14fd480b8602ecc5867958d526314d6a87ee8ba93074457adb03dc7
-SIZE (go/www_grafana/grafana-grafana-v11.5.2_GH0/pkg/aggregator/go.mod) = 8088
-SHA256 (go/www_grafana/grafana-grafana-v11.5.2_GH0/pkg/apimachinery/go.mod) = 59e64e58560209430b6634ff9a45f6b9db695f109d4e13a78b2d1468b4299add
-SIZE (go/www_grafana/grafana-grafana-v11.5.2_GH0/pkg/apimachinery/go.mod) = 2429
-SHA256 (go/www_grafana/grafana-grafana-v11.5.2_GH0/pkg/apiserver/go.mod) = 87f10f05a60166e519acab01cab1dd7e559aad300ca68c0e00cad533f6606f2e
-SIZE (go/www_grafana/grafana-grafana-v11.5.2_GH0/pkg/apiserver/go.mod) = 4910
-SHA256 (go/www_grafana/grafana-grafana-v11.5.2_GH0/pkg/build/go.mod) = 6ef68aacb6e2082a45e01728d6ab62cec48f749f37fa50470d8f7091df6b679d
-SIZE (go/www_grafana/grafana-grafana-v11.5.2_GH0/pkg/build/go.mod) = 7501
-SHA256 (go/www_grafana/grafana-grafana-v11.5.2_GH0/pkg/build/wire/go.mod) = ccb05089308ce4cedaf43269aeac3755f1739c777a66648f7d6c943737956e4a
-SIZE (go/www_grafana/grafana-grafana-v11.5.2_GH0/pkg/build/wire/go.mod) = 330
-SHA256 (go/www_grafana/grafana-grafana-v11.5.2_GH0/pkg/codegen/go.mod) = 161277c48b8528d3b65d2102818583d21c172505ac6926f248a6af51636bdae0
-SIZE (go/www_grafana/grafana-grafana-v11.5.2_GH0/pkg/codegen/go.mod) = 2537
-SHA256 (go/www_grafana/grafana-grafana-v11.5.2_GH0/pkg/plugins/codegen/go.mod) = 8d502ab57653242e194784b00b1e658f91467d6943dacac17e79c880dd355688
-SIZE (go/www_grafana/grafana-grafana-v11.5.2_GH0/pkg/plugins/codegen/go.mod) = 2151
-SHA256 (go/www_grafana/grafana-grafana-v11.5.2_GH0/pkg/promlib/go.mod) = 7786e3585303078efdce36956477f96356d33cf33ec1d6d6f27210bb9fa060d8
-SIZE (go/www_grafana/grafana-grafana-v11.5.2_GH0/pkg/promlib/go.mod) = 6527
-SHA256 (go/www_grafana/grafana-grafana-v11.5.2_GH0/pkg/semconv/go.mod) = f921d07351e3176c86e2ad95930d6194aaacdcb75e09491a08c03b8f69e74900
-SIZE (go/www_grafana/grafana-grafana-v11.5.2_GH0/pkg/semconv/go.mod) = 269
-SHA256 (go/www_grafana/grafana-grafana-v11.5.2_GH0/pkg/storage/unified/apistore/go.mod) = 4b0cd65f4aacb5ced180edd3064664c5c9d7e625065fb8c12cec1f8d524067fa
-SIZE (go/www_grafana/grafana-grafana-v11.5.2_GH0/pkg/storage/unified/apistore/go.mod) = 19676
-SHA256 (go/www_grafana/grafana-grafana-v11.5.2_GH0/pkg/storage/unified/resource/go.mod) = 8596786da5e8c1147fc3bda4c810dfda516bbe97e283ba75cda97a3e95fe84d3
-SIZE (go/www_grafana/grafana-grafana-v11.5.2_GH0/pkg/storage/unified/resource/go.mod) = 13040
-SHA256 (go/www_grafana/grafana-grafana-v11.5.2_GH0/pkg/util/xorm/go.mod) = 8dcf8020b038c86d9966814c90dad244e15ec42a1d74bee5f5ddde77300c2ff0
-SIZE (go/www_grafana/grafana-grafana-v11.5.2_GH0/pkg/util/xorm/go.mod) = 628
-SHA256 (go/www_grafana/grafana-grafana-v11.5.2_GH0/grafana-grafana-v11.5.2_GH0.tar.gz) = 222e3c9394d9526efe0e4d1789c5f2ede095df36c36ce578260566259bc7f19b
-SIZE (go/www_grafana/grafana-grafana-v11.5.2_GH0/grafana-grafana-v11.5.2_GH0.tar.gz) = 34731858
+TIMESTAMP = 1742976032
+SHA256 (go/www_grafana/grafana-grafana-v11.6.0_GH0/grafana-11.6.0.linux-amd64.tar.gz) = 043fa7b8c634ff060a70e2d069d0beee9300e5b259d8125c456d6b8cae35169f
+SIZE (go/www_grafana/grafana-grafana-v11.6.0_GH0/grafana-11.6.0.linux-amd64.tar.gz) = 177393269
+SHA256 (go/www_grafana/grafana-grafana-v11.6.0_GH0/go.mod) = 7789e209139eded6c4a2fc389a4bcb03fef490005d83b6b0c7f5eea0d13130ae
+SIZE (go/www_grafana/grafana-grafana-v11.6.0_GH0/go.mod) = 37750
+SHA256 (go/www_grafana/grafana-grafana-v11.6.0_GH0/go.work) = d866ccf50a182cafb744cbceb2fc4bc33a24b1446b3f162c7db207814ea40335
+SIZE (go/www_grafana/grafana-grafana-v11.6.0_GH0/go.work) = 1462
+SHA256 (go/www_grafana/grafana-grafana-v11.6.0_GH0/apps/advisor/go.mod) = 7d7bb89246fd2953889480c91e5d2738867008babd5c9c5bc18e4a88253e997a
+SIZE (go/www_grafana/grafana-grafana-v11.6.0_GH0/apps/advisor/go.mod) = 4058
+SHA256 (go/www_grafana/grafana-grafana-v11.6.0_GH0/apps/alerting/notifications/go.mod) = a6f8409ee1c0f3b093eb2e1de5c8f060efde365117ed4ec3efafa413702af167
+SIZE (go/www_grafana/grafana-grafana-v11.6.0_GH0/apps/alerting/notifications/go.mod) = 4797
+SHA256 (go/www_grafana/grafana-grafana-v11.6.0_GH0/apps/investigations/go.mod) = ddba05fa3fd7893513c4a748736110f923a57fe0b338bdb733105cbcbf2c9b84
+SIZE (go/www_grafana/grafana-grafana-v11.6.0_GH0/apps/investigations/go.mod) = 4257
+SHA256 (go/www_grafana/grafana-grafana-v11.6.0_GH0/apps/playlist/go.mod) = 45af00281f9733a55e020b7657edaaf58c5edf95a8cb33db9fc1a15ea3889970
+SIZE (go/www_grafana/grafana-grafana-v11.6.0_GH0/apps/playlist/go.mod) = 4239
+SHA256 (go/www_grafana/grafana-grafana-v11.6.0_GH0/pkg/aggregator/go.mod) = 28be0dea834b6b7a0b7322831513d9a543b52e0d9fc031dd63723560ed52eb72
+SIZE (go/www_grafana/grafana-grafana-v11.6.0_GH0/pkg/aggregator/go.mod) = 8280
+SHA256 (go/www_grafana/grafana-grafana-v11.6.0_GH0/pkg/apimachinery/go.mod) = a6dad1958ddcd34a7a5be193924259d7e6c3e2ba2386e0d4db4dc80d85d17f97
+SIZE (go/www_grafana/grafana-grafana-v11.6.0_GH0/pkg/apimachinery/go.mod) = 2516
+SHA256 (go/www_grafana/grafana-grafana-v11.6.0_GH0/pkg/apiserver/go.mod) = 26a5d8343979bcb0234aaf3bd99d582e57b94ee20441d6fa414a1e8b200f90a8
+SIZE (go/www_grafana/grafana-grafana-v11.6.0_GH0/pkg/apiserver/go.mod) = 5052
+SHA256 (go/www_grafana/grafana-grafana-v11.6.0_GH0/pkg/build/go.mod) = 3ae1786b4e3846d0b560a307626d5d2179f1cff4936140176d14bd8d15a30491
+SIZE (go/www_grafana/grafana-grafana-v11.6.0_GH0/pkg/build/go.mod) = 7764
+SHA256 (go/www_grafana/grafana-grafana-v11.6.0_GH0/pkg/build/wire/go.mod) = ad054d77f0f72d63735930a75e17f4d05d7d32ac5f5891397e39430042537bc3
+SIZE (go/www_grafana/grafana-grafana-v11.6.0_GH0/pkg/build/wire/go.mod) = 330
+SHA256 (go/www_grafana/grafana-grafana-v11.6.0_GH0/pkg/codegen/go.mod) = 735defe81e70a06b62511c8f5c3b602ce86a23ef23dd651056f4085cf89d8d5e
+SIZE (go/www_grafana/grafana-grafana-v11.6.0_GH0/pkg/codegen/go.mod) = 2437
+SHA256 (go/www_grafana/grafana-grafana-v11.6.0_GH0/pkg/plugins/codegen/go.mod) = e8f55a48609d6ed1f1cc42333cdaa7243d2a375c135f50a621298a73a49d1594
+SIZE (go/www_grafana/grafana-grafana-v11.6.0_GH0/pkg/plugins/codegen/go.mod) = 2233
+SHA256 (go/www_grafana/grafana-grafana-v11.6.0_GH0/pkg/promlib/go.mod) = e4fc8480f1c6f284730dccb6600074fd46adaee1e3feeb5096a3e7202e71ada6
+SIZE (go/www_grafana/grafana-grafana-v11.6.0_GH0/pkg/promlib/go.mod) = 6812
+SHA256 (go/www_grafana/grafana-grafana-v11.6.0_GH0/pkg/semconv/go.mod) = 5f56ec9b5fbb263d3b7d025ea21ae61e2a71ae8703f65acf0038cf58467366e8
+SIZE (go/www_grafana/grafana-grafana-v11.6.0_GH0/pkg/semconv/go.mod) = 314
+SHA256 (go/www_grafana/grafana-grafana-v11.6.0_GH0/pkg/storage/unified/apistore/go.mod) = 5c4fa4c1f6efce3bceaff72d154099932c703982631a448e64f4bc15bfb7f321
+SIZE (go/www_grafana/grafana-grafana-v11.6.0_GH0/pkg/storage/unified/apistore/go.mod) = 23405
+SHA256 (go/www_grafana/grafana-grafana-v11.6.0_GH0/pkg/storage/unified/resource/go.mod) = 15a604f841bf3a0652ef41ec779c64ee398d76af50372804d5d830f19d3d10a2
+SIZE (go/www_grafana/grafana-grafana-v11.6.0_GH0/pkg/storage/unified/resource/go.mod) = 14537
+SHA256 (go/www_grafana/grafana-grafana-v11.6.0_GH0/pkg/util/xorm/go.mod) = d45096480e4d31e06c534befcded3bdebcfb06f906aa569c341dab9e7f9b1686
+SIZE (go/www_grafana/grafana-grafana-v11.6.0_GH0/pkg/util/xorm/go.mod) = 3150
+SHA256 (go/www_grafana/grafana-grafana-v11.6.0_GH0/grafana-grafana-v11.6.0_GH0.tar.gz) = 8077170956237668050914bd9583582c1592629081e1281845b76ed441a6976e
+SIZE (go/www_grafana/grafana-grafana-v11.6.0_GH0/grafana-grafana-v11.6.0_GH0.tar.gz) = 36530317