diff options
Diffstat (limited to 'www/grafana')
| -rw-r--r-- | www/grafana/Makefile | 31 | ||||
| -rw-r--r-- | www/grafana/distinfo | 104 | ||||
| -rw-r--r-- | www/grafana/pkg-plist | 1 |
3 files changed, 54 insertions, 82 deletions
diff --git a/www/grafana/Makefile b/www/grafana/Makefile index d3f5f8a19551..1b1ee5ddcf20 100644 --- a/www/grafana/Makefile +++ b/www/grafana/Makefile @@ -1,6 +1,6 @@ PORTNAME= grafana DISTVERSIONPREFIX= v -DISTVERSION= 12.0.2 +DISTVERSION= 12.1.0 PORTREVISION= 1 CATEGORIES= www MASTER_SITES= https://dl.grafana.com/oss/release/ \ @@ -8,17 +8,11 @@ MASTER_SITES= https://dl.grafana.com/oss/release/ \ 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 \ @@ -30,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 @@ -53,7 +44,7 @@ USES= cpe go:modules USE_GITHUB= yes USE_RC_SUBR= grafana -TAG= 5bda17e +TAG= ccd7b6c GO_MOD_DIST= github GO_MODULE= github.com/grafana/grafana @@ -88,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"; @@ -112,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 b35ec91bba09..d9b4687f92a6 100644 --- a/www/grafana/distinfo +++ b/www/grafana/distinfo @@ -1,61 +1,43 @@ -TIMESTAMP = 1750230363 -SHA256 (go/www_grafana/grafana-grafana-v12.0.2_GH0/grafana-12.0.2.linux-amd64.tar.gz) = c1755b4da918edfd298d5c8d5f1ffce35982ad10e1640ec356570cfb8c34b3e8 -SIZE (go/www_grafana/grafana-grafana-v12.0.2_GH0/grafana-12.0.2.linux-amd64.tar.gz) = 183911552 -SHA256 (go/www_grafana/grafana-grafana-v12.0.2_GH0/go.mod) = 29f00d3557735d4affcc4b713ed1a7c85a47560fbc602666668ef0d77925c48a -SIZE (go/www_grafana/grafana-grafana-v12.0.2_GH0/go.mod) = 38980 -SHA256 (go/www_grafana/grafana-grafana-v12.0.2_GH0/go.work) = ecf260450eb9590351078f01276308243c068cf2f20e537662d763c3945e85e0 -SIZE (go/www_grafana/grafana-grafana-v12.0.2_GH0/go.work) = 1339 -SHA256 (go/www_grafana/grafana-grafana-v12.0.2_GH0/.citools/bra/go.mod) = 02f99ed827227c22e32a26102be74f25ae422a6009c06dd89e1c3fdd25276882 -SIZE (go/www_grafana/grafana-grafana-v12.0.2_GH0/.citools/bra/go.mod) = 845 -SHA256 (go/www_grafana/grafana-grafana-v12.0.2_GH0/.citools/cog/go.mod) = d0f28b5cd843e592576bab22ed4e18cbb683f580832573761d9992c5a431d4fe -SIZE (go/www_grafana/grafana-grafana-v12.0.2_GH0/.citools/cog/go.mod) = 2256 -SHA256 (go/www_grafana/grafana-grafana-v12.0.2_GH0/.citools/cue/go.mod) = e7229da4595f4b1b1240effbe8f409f6676ef427e30cfa0bcc2fc96deb834c5f -SIZE (go/www_grafana/grafana-grafana-v12.0.2_GH0/.citools/cue/go.mod) = 1533 -SHA256 (go/www_grafana/grafana-grafana-v12.0.2_GH0/.citools/golangci-lint/go.mod) = 90cf5d2d65a918b6c6ddecdf70f969b94a0f947208270ee3733703b10ca4fca4 -SIZE (go/www_grafana/grafana-grafana-v12.0.2_GH0/.citools/golangci-lint/go.mod) = 10265 -SHA256 (go/www_grafana/grafana-grafana-v12.0.2_GH0/.citools/jb/go.mod) = 525b92e74e4ecf49bba3f7a3af24cbb66936bdc3218d08d548c63fa7d7d5e89a -SIZE (go/www_grafana/grafana-grafana-v12.0.2_GH0/.citools/jb/go.mod) = 788 -SHA256 (go/www_grafana/grafana-grafana-v12.0.2_GH0/.citools/lefthook/go.mod) = 84f4100c41f2060ad82f1f2ddb0e2ce965a3bb020fa1b932127679830756835b -SIZE (go/www_grafana/grafana-grafana-v12.0.2_GH0/.citools/lefthook/go.mod) = 2442 -SHA256 (go/www_grafana/grafana-grafana-v12.0.2_GH0/.citools/swagger/go.mod) = c7286e7d0c5d4d708a3dc97d902bf5ad8e64c402581796bfc222fe58c78b8a31 -SIZE (go/www_grafana/grafana-grafana-v12.0.2_GH0/.citools/swagger/go.mod) = 2735 -SHA256 (go/www_grafana/grafana-grafana-v12.0.2_GH0/apps/advisor/go.mod) = 9396e0e1326f85d7732c378564d7d3ec4d268a6ce1b69e63b655b3ce999af43b -SIZE (go/www_grafana/grafana-grafana-v12.0.2_GH0/apps/advisor/go.mod) = 4146 -SHA256 (go/www_grafana/grafana-grafana-v12.0.2_GH0/apps/alerting/notifications/go.mod) = e93445036ce12a3214ab1bbcea7f91ea5b317f1ef4edc46398c179b70d4d66c6 -SIZE (go/www_grafana/grafana-grafana-v12.0.2_GH0/apps/alerting/notifications/go.mod) = 4831 -SHA256 (go/www_grafana/grafana-grafana-v12.0.2_GH0/apps/dashboard/go.mod) = 57f7155e41bedc5bafc4b848472faa9008f72f5e6d055ad42bd2f89a0defdfb3 -SIZE (go/www_grafana/grafana-grafana-v12.0.2_GH0/apps/dashboard/go.mod) = 6587 -SHA256 (go/www_grafana/grafana-grafana-v12.0.2_GH0/apps/folder/go.mod) = 8cc8fb2c54d3d9c0452e53710a0729dd64c0710664d3d3c93f85912c9ddc3edc -SIZE (go/www_grafana/grafana-grafana-v12.0.2_GH0/apps/folder/go.mod) = 2698 -SHA256 (go/www_grafana/grafana-grafana-v12.0.2_GH0/apps/investigations/go.mod) = 4145c46883cd4e7d31907e30c5793f7808ecd1b01589d3180dcab4174486a28f -SIZE (go/www_grafana/grafana-grafana-v12.0.2_GH0/apps/investigations/go.mod) = 4340 -SHA256 (go/www_grafana/grafana-grafana-v12.0.2_GH0/apps/playlist/go.mod) = 7c2e0662ab1a0f6ebc49a3f930fad584c90ecfcb940b02cb988d406c8b81eac7 -SIZE (go/www_grafana/grafana-grafana-v12.0.2_GH0/apps/playlist/go.mod) = 4322 -SHA256 (go/www_grafana/grafana-grafana-v12.0.2_GH0/pkg/aggregator/go.mod) = 65e59de7b4cef99716130fe41e333818c27af9cc90156370d49707a6fbe11551 -SIZE (go/www_grafana/grafana-grafana-v12.0.2_GH0/pkg/aggregator/go.mod) = 8433 -SHA256 (go/www_grafana/grafana-grafana-v12.0.2_GH0/pkg/apimachinery/go.mod) = b3fb5b0a09bd79a899479f433ef0664c2d2cd6e32d01fbd4b4a84d3169384e76 -SIZE (go/www_grafana/grafana-grafana-v12.0.2_GH0/pkg/apimachinery/go.mod) = 2472 -SHA256 (go/www_grafana/grafana-grafana-v12.0.2_GH0/pkg/apis/secret/go.mod) = 164a8e3690be60b5a8958a1f10c8d0cbc5fbc3325409d1c49ec33056888a7e5d -SIZE (go/www_grafana/grafana-grafana-v12.0.2_GH0/pkg/apis/secret/go.mod) = 5011 -SHA256 (go/www_grafana/grafana-grafana-v12.0.2_GH0/pkg/apiserver/go.mod) = 7e0dbe464201f3277fe4e54b5ea6a4f787933882b0d59647f4fc817ab9a5e67c -SIZE (go/www_grafana/grafana-grafana-v12.0.2_GH0/pkg/apiserver/go.mod) = 5183 -SHA256 (go/www_grafana/grafana-grafana-v12.0.2_GH0/pkg/build/go.mod) = 1341425db0b376fb1a03f7c55eb1ac62cfec737610d3aba5722977025161e6f2 -SIZE (go/www_grafana/grafana-grafana-v12.0.2_GH0/pkg/build/go.mod) = 8074 -SHA256 (go/www_grafana/grafana-grafana-v12.0.2_GH0/pkg/build/wire/go.mod) = ddaf0e8bb8fbf36114f4e8d33b8e33f6a253ca6137fa9951f38118e1e0ac1b82 -SIZE (go/www_grafana/grafana-grafana-v12.0.2_GH0/pkg/build/wire/go.mod) = 330 -SHA256 (go/www_grafana/grafana-grafana-v12.0.2_GH0/pkg/codegen/go.mod) = c5988b4d0102ea3cd9d8a8fd97d0410a033050d5a615ab773da435cc655509b8 -SIZE (go/www_grafana/grafana-grafana-v12.0.2_GH0/pkg/codegen/go.mod) = 2490 -SHA256 (go/www_grafana/grafana-grafana-v12.0.2_GH0/pkg/plugins/codegen/go.mod) = 98db7c91ee1144b4258a775314ce32904c3e68ccd6ad33414b8aed3ad7bf9db4 -SIZE (go/www_grafana/grafana-grafana-v12.0.2_GH0/pkg/plugins/codegen/go.mod) = 2233 -SHA256 (go/www_grafana/grafana-grafana-v12.0.2_GH0/pkg/promlib/go.mod) = af8b1de353d784d8cc809bbc949ff7ceafe8048f47c86d2e9700c46e3b9fbc55 -SIZE (go/www_grafana/grafana-grafana-v12.0.2_GH0/pkg/promlib/go.mod) = 7078 -SHA256 (go/www_grafana/grafana-grafana-v12.0.2_GH0/pkg/semconv/go.mod) = af87874a65797de2c4648402142f15518417b0a2b86cab61a82ad662b561610f -SIZE (go/www_grafana/grafana-grafana-v12.0.2_GH0/pkg/semconv/go.mod) = 269 -SHA256 (go/www_grafana/grafana-grafana-v12.0.2_GH0/pkg/storage/unified/apistore/go.mod) = 9a4416566c2ecb5c87502441e338b368909fedca3399bcc88477354d0974fc97 -SIZE (go/www_grafana/grafana-grafana-v12.0.2_GH0/pkg/storage/unified/apistore/go.mod) = 23556 -SHA256 (go/www_grafana/grafana-grafana-v12.0.2_GH0/pkg/storage/unified/resource/go.mod) = c179f8f634359f6493167eae5e5f4b183e075924d667b0108da11f54f64003a5 -SIZE (go/www_grafana/grafana-grafana-v12.0.2_GH0/pkg/storage/unified/resource/go.mod) = 11621 -SHA256 (go/www_grafana/grafana-grafana-v12.0.2_GH0/pkg/util/xorm/go.mod) = da74d73b680931ab1c6b9ee921d13846b16ad3b2c5fd6700d3517244b922d366 -SIZE (go/www_grafana/grafana-grafana-v12.0.2_GH0/pkg/util/xorm/go.mod) = 3278 -SHA256 (go/www_grafana/grafana-grafana-v12.0.2_GH0/grafana-grafana-v12.0.2_GH0.tar.gz) = 8524498289e7d1900626ea7c0763fd923cf7bd1effa48cda476e63b299acfe2d -SIZE (go/www_grafana/grafana-grafana-v12.0.2_GH0/grafana-grafana-v12.0.2_GH0.tar.gz) = 37751009 +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 |