diff options
Diffstat (limited to 'www/grafana')
| -rw-r--r-- | www/grafana/Makefile | 36 | ||||
| -rw-r--r-- | www/grafana/distinfo | 104 | ||||
| -rw-r--r-- | www/grafana/pkg-plist | 1 |
3 files changed, 57 insertions, 84 deletions
diff --git a/www/grafana/Makefile b/www/grafana/Makefile index 6f770e49d424..52a5a979709e 100644 --- a/www/grafana/Makefile +++ b/www/grafana/Makefile @@ -1,23 +1,18 @@ PORTNAME= grafana DISTVERSIONPREFIX= v -DISTVERSION= 12.0.0 +DISTVERSION= 12.1.0 +PORTREVISION= 2 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 \ - .citools/bra/go.mod:gomod \ - .citools/cog/go.mod:gomod \ - .citools/cue/go.mod:gomod \ - .citools/golangci-lint/go.mod:gomod \ - .citools/jb/go.mod:gomod \ - .citools/lefthook/go.mod:gomod \ - .citools/swagger/go.mod:gomod \ apps/advisor/go.mod:gomod \ apps/alerting/notifications/go.mod:gomod \ apps/dashboard/go.mod:gomod \ apps/folder/go.mod:gomod \ + apps/iam/go.mod:gomod \ apps/investigations/go.mod:gomod \ apps/playlist/go.mod:gomod \ pkg/aggregator/go.mod:gomod \ @@ -29,10 +24,7 @@ DISTFILES= grafana-${DISTVERSION}.linux-amd64${EXTRACT_SUFX} \ 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 + pkg/semconv/go.mod:gomod EXTRACT_ONLY= ${DISTFILES:N*.mod\:*:N*.mod:C/:.*//:Ngo.work} MAINTAINER= drtr0jan@yandex.ru @@ -43,16 +35,16 @@ WWW= https://grafana.com/grafana/ \ LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -ONLY_FOR_ARCHS= aarch64 amd64 i386 riscv64 +ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 riscv64 RUN_DEPENDS= ca_root_nss>=0:security/ca_root_nss -USES= cpe go:1.24,modules +USES= cpe go:modules USE_GITHUB= yes USE_RC_SUBR= grafana -TAG= 4c0e704 +TAG= ccd7b6c GO_MOD_DIST= github GO_MODULE= github.com/grafana/grafana @@ -87,6 +79,7 @@ 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"; @@ -111,14 +104,11 @@ pre-build: ./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} + ${MKDIR} ${STAGEDIR}${GRAFANA_HOMEDIR}/conf \ + ${STAGEDIR}${GRAFANA_DATADIR} \ + ${STAGEDIR}${GRAFANA_PLUGINDIR} \ + ${STAGEDIR}${GRAFANA_LOGDIR} \ + ${GRAFANA_PROVISIONING:M*:C|^|${STAGEDIR}${GRAFANA_PROVISIONINGDIR}/|} (cd ${WRKDIR}/${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} \ && ${COPYTREE_SHARE} public ${STAGEDIR}${GRAFANA_HOMEDIR}) ${INSTALL_DATA} ${WRKSRC}/conf/defaults.ini \ diff --git a/www/grafana/distinfo b/www/grafana/distinfo index 48c8b409e43a..d9b4687f92a6 100644 --- a/www/grafana/distinfo +++ b/www/grafana/distinfo @@ -1,61 +1,43 @@ -TIMESTAMP = 1746523933 -SHA256 (go/www_grafana/grafana-grafana-v12.0.0_GH0/grafana-12.0.0.linux-amd64.tar.gz) = b5f15e29cb815c24eaf631ebaab1729608d9c44606bdef24e5248ccbeba2e95e -SIZE (go/www_grafana/grafana-grafana-v12.0.0_GH0/grafana-12.0.0.linux-amd64.tar.gz) = 183576101 -SHA256 (go/www_grafana/grafana-grafana-v12.0.0_GH0/go.mod) = 6ceec7e41167dd6ccb862746961e40d0cf31c8526684bfd2c980007f205609cf -SIZE (go/www_grafana/grafana-grafana-v12.0.0_GH0/go.mod) = 38990 -SHA256 (go/www_grafana/grafana-grafana-v12.0.0_GH0/go.work) = 582d313125088d393e9bf0bc3e62d4ce4e01f5bca62d404de61359b32fe624a4 -SIZE (go/www_grafana/grafana-grafana-v12.0.0_GH0/go.work) = 1420 -SHA256 (go/www_grafana/grafana-grafana-v12.0.0_GH0/.citools/bra/go.mod) = 9c26b766b230e220d3a089052ecbbc735c5813503cea96f00b98e2f426f1500b -SIZE (go/www_grafana/grafana-grafana-v12.0.0_GH0/.citools/bra/go.mod) = 845 -SHA256 (go/www_grafana/grafana-grafana-v12.0.0_GH0/.citools/cog/go.mod) = 85c347f1808375367fd14a913af040aaedb179768bbe0f31fb7a511f8f9c3ccb -SIZE (go/www_grafana/grafana-grafana-v12.0.0_GH0/.citools/cog/go.mod) = 2256 -SHA256 (go/www_grafana/grafana-grafana-v12.0.0_GH0/.citools/cue/go.mod) = ce73854fe392b493136dd8585c1d431d72cd82c244bf617073352004648a9471 -SIZE (go/www_grafana/grafana-grafana-v12.0.0_GH0/.citools/cue/go.mod) = 1533 -SHA256 (go/www_grafana/grafana-grafana-v12.0.0_GH0/.citools/golangci-lint/go.mod) = 6697690d3f339916262d3ed0a2f10880823e19db9520e907ee840e551d8ae8ac -SIZE (go/www_grafana/grafana-grafana-v12.0.0_GH0/.citools/golangci-lint/go.mod) = 10518 -SHA256 (go/www_grafana/grafana-grafana-v12.0.0_GH0/.citools/jb/go.mod) = 3c425afcbd554cfb50b6b5595b91cb67d8e990c967a428c3f34186b6de745475 -SIZE (go/www_grafana/grafana-grafana-v12.0.0_GH0/.citools/jb/go.mod) = 788 -SHA256 (go/www_grafana/grafana-grafana-v12.0.0_GH0/.citools/lefthook/go.mod) = 7a722525e0e97bc44608efd3baee778d5a96ed464acae97291ec2f67a287f7f2 -SIZE (go/www_grafana/grafana-grafana-v12.0.0_GH0/.citools/lefthook/go.mod) = 2508 -SHA256 (go/www_grafana/grafana-grafana-v12.0.0_GH0/.citools/swagger/go.mod) = a5a2ca8a1422870edac6a4d5aa94065ddbbf9b769667077fd27a0e1d2f73bfba -SIZE (go/www_grafana/grafana-grafana-v12.0.0_GH0/.citools/swagger/go.mod) = 2983 -SHA256 (go/www_grafana/grafana-grafana-v12.0.0_GH0/apps/advisor/go.mod) = 6c61070df4915b2e6fb69f557bd105c760b941acadd3c66f3fcd57bf7d4d1585 -SIZE (go/www_grafana/grafana-grafana-v12.0.0_GH0/apps/advisor/go.mod) = 4058 -SHA256 (go/www_grafana/grafana-grafana-v12.0.0_GH0/apps/alerting/notifications/go.mod) = d433a9fcbea78026ef8f926b3b10f701568d04ecc9c9d61fba0d199213c592c3 -SIZE (go/www_grafana/grafana-grafana-v12.0.0_GH0/apps/alerting/notifications/go.mod) = 4838 -SHA256 (go/www_grafana/grafana-grafana-v12.0.0_GH0/apps/dashboard/go.mod) = 13786f0addc30cd695e352543e1409c0ffa8857eb69a544007d9c78e218dcc21 -SIZE (go/www_grafana/grafana-grafana-v12.0.0_GH0/apps/dashboard/go.mod) = 6587 -SHA256 (go/www_grafana/grafana-grafana-v12.0.0_GH0/apps/folder/go.mod) = f1b308c3d11835603f93425a59619ac600b74590b16c003bf44ce9a61787e17a -SIZE (go/www_grafana/grafana-grafana-v12.0.0_GH0/apps/folder/go.mod) = 2749 -SHA256 (go/www_grafana/grafana-grafana-v12.0.0_GH0/apps/investigations/go.mod) = 39a2dd9a2655af15232f35fda4656e5a7162dce7a22a02903185d4d8363316c1 -SIZE (go/www_grafana/grafana-grafana-v12.0.0_GH0/apps/investigations/go.mod) = 4319 -SHA256 (go/www_grafana/grafana-grafana-v12.0.0_GH0/apps/playlist/go.mod) = af328216a05802c409348764579c74249af6cc944c0f87ef3f141dcfe01535de -SIZE (go/www_grafana/grafana-grafana-v12.0.0_GH0/apps/playlist/go.mod) = 4301 -SHA256 (go/www_grafana/grafana-grafana-v12.0.0_GH0/pkg/aggregator/go.mod) = 3d7b399ae76ee86858d2555edb186f8b106c1e2860701710914d04c57b773a36 -SIZE (go/www_grafana/grafana-grafana-v12.0.0_GH0/pkg/aggregator/go.mod) = 8310 -SHA256 (go/www_grafana/grafana-grafana-v12.0.0_GH0/pkg/apimachinery/go.mod) = 20cca84623d4bd3bd7c67de6e31fa3f433e99e42df6936ac665f645fe39fbadf -SIZE (go/www_grafana/grafana-grafana-v12.0.0_GH0/pkg/apimachinery/go.mod) = 2472 -SHA256 (go/www_grafana/grafana-grafana-v12.0.0_GH0/pkg/apis/secret/go.mod) = fa225e7fb224a25468dc0f2b247a55db248f65f9b944b7ac0f3ec5f7614de062 -SIZE (go/www_grafana/grafana-grafana-v12.0.0_GH0/pkg/apis/secret/go.mod) = 4939 -SHA256 (go/www_grafana/grafana-grafana-v12.0.0_GH0/pkg/apiserver/go.mod) = 7378a27c0569587d71c6e0323718d21337c8186cf1b93df3093c1583731e5e10 -SIZE (go/www_grafana/grafana-grafana-v12.0.0_GH0/pkg/apiserver/go.mod) = 5111 -SHA256 (go/www_grafana/grafana-grafana-v12.0.0_GH0/pkg/build/go.mod) = 45257f048442b4c6bd7ce660db2cab5d51a76378d1819ffa9ee103e82b0dfeca -SIZE (go/www_grafana/grafana-grafana-v12.0.0_GH0/pkg/build/go.mod) = 7931 -SHA256 (go/www_grafana/grafana-grafana-v12.0.0_GH0/pkg/build/wire/go.mod) = c4bd5ec552b8a78c51631dd0c4e5654481c6ef72d6b897fd8cdadec90d1c3db0 -SIZE (go/www_grafana/grafana-grafana-v12.0.0_GH0/pkg/build/wire/go.mod) = 330 -SHA256 (go/www_grafana/grafana-grafana-v12.0.0_GH0/pkg/codegen/go.mod) = af218f935140c2564403f76d0b4cb2a3867ccb78558ba5f610ea5a106f4ccdbe -SIZE (go/www_grafana/grafana-grafana-v12.0.0_GH0/pkg/codegen/go.mod) = 2490 -SHA256 (go/www_grafana/grafana-grafana-v12.0.0_GH0/pkg/plugins/codegen/go.mod) = 14e17b15ca415ed502b6391b65e0b28a2c2682d52215ad52afe901ba2c3eb480 -SIZE (go/www_grafana/grafana-grafana-v12.0.0_GH0/pkg/plugins/codegen/go.mod) = 2233 -SHA256 (go/www_grafana/grafana-grafana-v12.0.0_GH0/pkg/promlib/go.mod) = 99645974b2fba727e251431f916fc8fb4ecfac110cb4358af5ee0e25442ef383 -SIZE (go/www_grafana/grafana-grafana-v12.0.0_GH0/pkg/promlib/go.mod) = 6945 -SHA256 (go/www_grafana/grafana-grafana-v12.0.0_GH0/pkg/semconv/go.mod) = dffd3c1a8b43a8c1f81c88afc7fabd07551f08a727caa6c81b21cc7f22989500 -SIZE (go/www_grafana/grafana-grafana-v12.0.0_GH0/pkg/semconv/go.mod) = 269 -SHA256 (go/www_grafana/grafana-grafana-v12.0.0_GH0/pkg/storage/unified/apistore/go.mod) = 09bf0410097e19e63fead5f16ab2a493eb000ca8a78102592d4fb07647e0c74f -SIZE (go/www_grafana/grafana-grafana-v12.0.0_GH0/pkg/storage/unified/apistore/go.mod) = 23423 -SHA256 (go/www_grafana/grafana-grafana-v12.0.0_GH0/pkg/storage/unified/resource/go.mod) = ec8255b1d842f1ea1a6fb79d3b10144dc2a066c37c241621825b8e124708e0e1 -SIZE (go/www_grafana/grafana-grafana-v12.0.0_GH0/pkg/storage/unified/resource/go.mod) = 11340 -SHA256 (go/www_grafana/grafana-grafana-v12.0.0_GH0/pkg/util/xorm/go.mod) = efd1c53e50b60912388fa292a66c6c618f3888b28bf1f58767b344fbb5b71285 -SIZE (go/www_grafana/grafana-grafana-v12.0.0_GH0/pkg/util/xorm/go.mod) = 3135 -SHA256 (go/www_grafana/grafana-grafana-v12.0.0_GH0/grafana-grafana-v12.0.0_GH0.tar.gz) = 479b337fc101adfc8386414af053337b567c8d11480aa05499ccd929c4d70601 -SIZE (go/www_grafana/grafana-grafana-v12.0.0_GH0/grafana-grafana-v12.0.0_GH0.tar.gz) = 37646751 +TIMESTAMP = 1753446520 +SHA256 (go/www_grafana/grafana-grafana-v12.1.0_GH0/grafana-12.1.0.linux-amd64.tar.gz) = 69923cf95824008a6a7529f242295ecc2bc6b1dc4e5142c889971e88407d8712 +SIZE (go/www_grafana/grafana-grafana-v12.1.0_GH0/grafana-12.1.0.linux-amd64.tar.gz) = 198804186 +SHA256 (go/www_grafana/grafana-grafana-v12.1.0_GH0/go.mod) = ced873c2fef95afbf4a7087569246808c5fded9c490325338316062da5b21fa8 +SIZE (go/www_grafana/grafana-grafana-v12.1.0_GH0/go.mod) = 40445 +SHA256 (go/www_grafana/grafana-grafana-v12.1.0_GH0/go.work) = cac55fcc92eaf457ba95d1ab73fad10103f3247450835d71c41356ee4f220a36 +SIZE (go/www_grafana/grafana-grafana-v12.1.0_GH0/go.work) = 888 +SHA256 (go/www_grafana/grafana-grafana-v12.1.0_GH0/apps/advisor/go.mod) = 962cca491bf59ec48c8bffd6d50d99f5151cc8a43ba43b541f97989ef2f43446 +SIZE (go/www_grafana/grafana-grafana-v12.1.0_GH0/apps/advisor/go.mod) = 4277 +SHA256 (go/www_grafana/grafana-grafana-v12.1.0_GH0/apps/alerting/notifications/go.mod) = 66bb6a2c23a5b0491a9ed3798657d6331a806edfe5ba97182a23be840aff2bab +SIZE (go/www_grafana/grafana-grafana-v12.1.0_GH0/apps/alerting/notifications/go.mod) = 5520 +SHA256 (go/www_grafana/grafana-grafana-v12.1.0_GH0/apps/dashboard/go.mod) = bfa1c41646cee61989440bf413e8af4e25e8750df469ecaee7c86c465642fb30 +SIZE (go/www_grafana/grafana-grafana-v12.1.0_GH0/apps/dashboard/go.mod) = 6738 +SHA256 (go/www_grafana/grafana-grafana-v12.1.0_GH0/apps/folder/go.mod) = 9626818858fdd607721f8133adb3956abf0df7460f1f2cf261b377d97838cc01 +SIZE (go/www_grafana/grafana-grafana-v12.1.0_GH0/apps/folder/go.mod) = 2871 +SHA256 (go/www_grafana/grafana-grafana-v12.1.0_GH0/apps/iam/go.mod) = d0eac20a1aab91af633ea284c2d182ee73c310a88bd642b65b21a4467e14474f +SIZE (go/www_grafana/grafana-grafana-v12.1.0_GH0/apps/iam/go.mod) = 2868 +SHA256 (go/www_grafana/grafana-grafana-v12.1.0_GH0/apps/investigations/go.mod) = 0ca584f26b13c916060d7167240eabd2df8cf3667bb2b66bf6d5c094f80d996d +SIZE (go/www_grafana/grafana-grafana-v12.1.0_GH0/apps/investigations/go.mod) = 4539 +SHA256 (go/www_grafana/grafana-grafana-v12.1.0_GH0/apps/playlist/go.mod) = e0c86c12e890d2302b8fe6c912983723ff7d15e55ee84ea0e09b723ce59deb78 +SIZE (go/www_grafana/grafana-grafana-v12.1.0_GH0/apps/playlist/go.mod) = 4292 +SHA256 (go/www_grafana/grafana-grafana-v12.1.0_GH0/pkg/aggregator/go.mod) = f6ed3ded9d6eb77f62485cc27d1148a56df426ca76686adb2f953a2da356f1bc +SIZE (go/www_grafana/grafana-grafana-v12.1.0_GH0/pkg/aggregator/go.mod) = 8348 +SHA256 (go/www_grafana/grafana-grafana-v12.1.0_GH0/pkg/apimachinery/go.mod) = 14ae9f9972a261a10ba12029c184545797dd568b40e7dc10fa94c6c4677abf28 +SIZE (go/www_grafana/grafana-grafana-v12.1.0_GH0/pkg/apimachinery/go.mod) = 2655 +SHA256 (go/www_grafana/grafana-grafana-v12.1.0_GH0/pkg/apis/secret/go.mod) = e95b1247e19ccf728dcd0542024f1d89ee3895e6a443c405287c293e6bfa96e7 +SIZE (go/www_grafana/grafana-grafana-v12.1.0_GH0/pkg/apis/secret/go.mod) = 1938 +SHA256 (go/www_grafana/grafana-grafana-v12.1.0_GH0/pkg/apiserver/go.mod) = 3bae51bda65f76845d0a9b8766e996ec6e9e98a954988cf2087cf433333d02d6 +SIZE (go/www_grafana/grafana-grafana-v12.1.0_GH0/pkg/apiserver/go.mod) = 5228 +SHA256 (go/www_grafana/grafana-grafana-v12.1.0_GH0/pkg/build/go.mod) = aa8c00afd01143df056fab379b5c2c3b22a11a16bee5db70369ee296b569a5f4 +SIZE (go/www_grafana/grafana-grafana-v12.1.0_GH0/pkg/build/go.mod) = 7999 +SHA256 (go/www_grafana/grafana-grafana-v12.1.0_GH0/pkg/build/wire/go.mod) = b5cc16940df8ad672c07e44fd3824feed3f14b026dd4a591511d182f474f15b1 +SIZE (go/www_grafana/grafana-grafana-v12.1.0_GH0/pkg/build/wire/go.mod) = 330 +SHA256 (go/www_grafana/grafana-grafana-v12.1.0_GH0/pkg/codegen/go.mod) = a7e2c2c92b4f923a401186c0cb570a2747d92676bc8753c9c93b97972e715355 +SIZE (go/www_grafana/grafana-grafana-v12.1.0_GH0/pkg/codegen/go.mod) = 2522 +SHA256 (go/www_grafana/grafana-grafana-v12.1.0_GH0/pkg/plugins/codegen/go.mod) = a78bd06a4239c3482fe5a27fbb8ba347f9d469ae9329ea3a9c266ed2182d31ea +SIZE (go/www_grafana/grafana-grafana-v12.1.0_GH0/pkg/plugins/codegen/go.mod) = 2233 +SHA256 (go/www_grafana/grafana-grafana-v12.1.0_GH0/pkg/promlib/go.mod) = c6ef66cb6668fd2c144dbe70366a329a0c40126bfe2d1709042f8b32644a79e2 +SIZE (go/www_grafana/grafana-grafana-v12.1.0_GH0/pkg/promlib/go.mod) = 7072 +SHA256 (go/www_grafana/grafana-grafana-v12.1.0_GH0/pkg/semconv/go.mod) = d20f9332c43873474014fac5af7c2b91088897760ccd57602aa9aee2460da1d1 +SIZE (go/www_grafana/grafana-grafana-v12.1.0_GH0/pkg/semconv/go.mod) = 269 +SHA256 (go/www_grafana/grafana-grafana-v12.1.0_GH0/grafana-grafana-v12.1.0_GH0.tar.gz) = 9e2f3f11eff01f8b86c2c232c6a3c3a32fa303589ea9829538ffc867684a4436 +SIZE (go/www_grafana/grafana-grafana-v12.1.0_GH0/grafana-grafana-v12.1.0_GH0.tar.gz) = 40109942 diff --git a/www/grafana/pkg-plist b/www/grafana/pkg-plist index c204406800cc..841e70e16ec4 100644 --- a/www/grafana/pkg-plist +++ b/www/grafana/pkg-plist @@ -15,6 +15,7 @@ bin/grafana-server @dir %%GRAFANA_PROVISIONINGDIR%%/dashboards @dir %%GRAFANA_PROVISIONINGDIR%%/datasources @dir %%GRAFANA_PROVISIONINGDIR%%/plugins +@dir %%GRAFANA_PROVISIONINGDIR%%/sample @dir %%GRAFANA_LOGDIR%% @mode @group |