diff options
Diffstat (limited to 'www/grafana')
| -rw-r--r-- | www/grafana/Makefile | 32 | ||||
| -rw-r--r-- | www/grafana/distinfo | 104 | ||||
| -rw-r--r-- | www/grafana/pkg-plist | 1 |
3 files changed, 55 insertions, 82 deletions
diff --git a/www/grafana/Makefile b/www/grafana/Makefile index a2e8e10c5fc8..52a5a979709e 100644 --- a/www/grafana/Makefile +++ b/www/grafana/Makefile @@ -1,23 +1,18 @@ PORTNAME= grafana DISTVERSIONPREFIX= v -DISTVERSION= 12.0.1 +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 @@ -52,7 +44,7 @@ USES= cpe go:modules USE_GITHUB= yes USE_RC_SUBR= grafana -TAG= 80658a7 +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 63ddcffa2202..d9b4687f92a6 100644 --- a/www/grafana/distinfo +++ b/www/grafana/distinfo @@ -1,61 +1,43 @@ -TIMESTAMP = 1747985167 -SHA256 (go/www_grafana/grafana-grafana-v12.0.1_GH0/grafana-12.0.1.linux-amd64.tar.gz) = f4c2ae6478981a69744f5ce778488382cf29072aabcbd07d56a570941bb93de8 -SIZE (go/www_grafana/grafana-grafana-v12.0.1_GH0/grafana-12.0.1.linux-amd64.tar.gz) = 183864425 -SHA256 (go/www_grafana/grafana-grafana-v12.0.1_GH0/go.mod) = 784c73f021c1a93e483b5c394fcfec121b7b88975c8ee14bd54eea3570e2366b -SIZE (go/www_grafana/grafana-grafana-v12.0.1_GH0/go.mod) = 39023 -SHA256 (go/www_grafana/grafana-grafana-v12.0.1_GH0/go.work) = 35aefdeace1a98516cb3210eb72984fb958f7d82aca3a60fc6f701fb8e784cdf -SIZE (go/www_grafana/grafana-grafana-v12.0.1_GH0/go.work) = 1339 -SHA256 (go/www_grafana/grafana-grafana-v12.0.1_GH0/.citools/bra/go.mod) = 990228a453855a5c2e622c023ef23e481f682a1f71d133f4e478ed8566d879d4 -SIZE (go/www_grafana/grafana-grafana-v12.0.1_GH0/.citools/bra/go.mod) = 845 -SHA256 (go/www_grafana/grafana-grafana-v12.0.1_GH0/.citools/cog/go.mod) = 69847f98468f95826dd7604ee38c4aec3fac899bd8685d4d338543a1d93975de -SIZE (go/www_grafana/grafana-grafana-v12.0.1_GH0/.citools/cog/go.mod) = 2256 -SHA256 (go/www_grafana/grafana-grafana-v12.0.1_GH0/.citools/cue/go.mod) = 823fd27b50b6586036d513a13e58731f8baca688ccd92830ad9be4e97d50db4f -SIZE (go/www_grafana/grafana-grafana-v12.0.1_GH0/.citools/cue/go.mod) = 1533 -SHA256 (go/www_grafana/grafana-grafana-v12.0.1_GH0/.citools/golangci-lint/go.mod) = e9521ff6d113e7c04b29f3741928fdf3053ffcb743291275a900ac7c59d1c9e4 -SIZE (go/www_grafana/grafana-grafana-v12.0.1_GH0/.citools/golangci-lint/go.mod) = 10303 -SHA256 (go/www_grafana/grafana-grafana-v12.0.1_GH0/.citools/jb/go.mod) = 80b4e83b3e02964a93a0eb271aceb0a6e94bd4ffa203093c3bc0aa1f558ed904 -SIZE (go/www_grafana/grafana-grafana-v12.0.1_GH0/.citools/jb/go.mod) = 788 -SHA256 (go/www_grafana/grafana-grafana-v12.0.1_GH0/.citools/lefthook/go.mod) = dd64d1d630dab4eb9ce1380c9ad3b816cfaf62feda7fa912a70cec28e3e0c6a2 -SIZE (go/www_grafana/grafana-grafana-v12.0.1_GH0/.citools/lefthook/go.mod) = 2482 -SHA256 (go/www_grafana/grafana-grafana-v12.0.1_GH0/.citools/swagger/go.mod) = 091fdbfcc85c72a1b70922f65b6f675483515fddf52e07b58a0c4513edb8df69 -SIZE (go/www_grafana/grafana-grafana-v12.0.1_GH0/.citools/swagger/go.mod) = 2735 -SHA256 (go/www_grafana/grafana-grafana-v12.0.1_GH0/apps/advisor/go.mod) = 4bcbfa7d45183d646435f253ad7e96ccb950a84c271be40361903de8ed0d17fa -SIZE (go/www_grafana/grafana-grafana-v12.0.1_GH0/apps/advisor/go.mod) = 4146 -SHA256 (go/www_grafana/grafana-grafana-v12.0.1_GH0/apps/alerting/notifications/go.mod) = 6e68ada16dacb337ccdb17a2cbc7088637b026793967c096350449f2214054cc -SIZE (go/www_grafana/grafana-grafana-v12.0.1_GH0/apps/alerting/notifications/go.mod) = 4787 -SHA256 (go/www_grafana/grafana-grafana-v12.0.1_GH0/apps/dashboard/go.mod) = 4161ebd7eb6d5e52c08c4827de456cf7747dc3b0e540c53d5b956fe8c0e65944 -SIZE (go/www_grafana/grafana-grafana-v12.0.1_GH0/apps/dashboard/go.mod) = 6587 -SHA256 (go/www_grafana/grafana-grafana-v12.0.1_GH0/apps/folder/go.mod) = ace6423e1e8e46522ddc31b86139dcbc5f08d5714e492d6dc1e1a0f8fd995491 -SIZE (go/www_grafana/grafana-grafana-v12.0.1_GH0/apps/folder/go.mod) = 2698 -SHA256 (go/www_grafana/grafana-grafana-v12.0.1_GH0/apps/investigations/go.mod) = 38e38c223192fb9dc009e32f65d5a338509cbbcc5db3b2153ca0c89d26b56fbc -SIZE (go/www_grafana/grafana-grafana-v12.0.1_GH0/apps/investigations/go.mod) = 4340 -SHA256 (go/www_grafana/grafana-grafana-v12.0.1_GH0/apps/playlist/go.mod) = df6253e8dd3e673fdd904a5da7c2f2ff4833660f482ec2779eef7da7d74e801e -SIZE (go/www_grafana/grafana-grafana-v12.0.1_GH0/apps/playlist/go.mod) = 4322 -SHA256 (go/www_grafana/grafana-grafana-v12.0.1_GH0/pkg/aggregator/go.mod) = 9154c20e3c0105fa66c5aa3957f144a8f3b11cdd68836e673a762180f83b8494 -SIZE (go/www_grafana/grafana-grafana-v12.0.1_GH0/pkg/aggregator/go.mod) = 8433 -SHA256 (go/www_grafana/grafana-grafana-v12.0.1_GH0/pkg/apimachinery/go.mod) = 4cf1da84d72f8d6475a3b429f5959447f255212fb05211f00fa2e859625bbdf3 -SIZE (go/www_grafana/grafana-grafana-v12.0.1_GH0/pkg/apimachinery/go.mod) = 2472 -SHA256 (go/www_grafana/grafana-grafana-v12.0.1_GH0/pkg/apis/secret/go.mod) = a7781c9263593c2d73a118dd263b84d8ed24601ef82107fc012d15677919574b -SIZE (go/www_grafana/grafana-grafana-v12.0.1_GH0/pkg/apis/secret/go.mod) = 5011 -SHA256 (go/www_grafana/grafana-grafana-v12.0.1_GH0/pkg/apiserver/go.mod) = 025b4e40d4f28f3e3c9a1b8e79ec4deb70604557ae34f5919100eb2bf9187c7d -SIZE (go/www_grafana/grafana-grafana-v12.0.1_GH0/pkg/apiserver/go.mod) = 5183 -SHA256 (go/www_grafana/grafana-grafana-v12.0.1_GH0/pkg/build/go.mod) = ed329addedf61d37fd40db62a4eb9dfa8b2f5943a261d6b4e08d29c704d48dd4 -SIZE (go/www_grafana/grafana-grafana-v12.0.1_GH0/pkg/build/go.mod) = 8074 -SHA256 (go/www_grafana/grafana-grafana-v12.0.1_GH0/pkg/build/wire/go.mod) = acd9ac4e6d6abdc9826743e410ba1a2328806046871b5eb2123fbfb63057aa0c -SIZE (go/www_grafana/grafana-grafana-v12.0.1_GH0/pkg/build/wire/go.mod) = 330 -SHA256 (go/www_grafana/grafana-grafana-v12.0.1_GH0/pkg/codegen/go.mod) = b4c473d8198a2b4d923ee7bbbb71aa3c73dad4067d77e27290e08b95b6a6e091 -SIZE (go/www_grafana/grafana-grafana-v12.0.1_GH0/pkg/codegen/go.mod) = 2490 -SHA256 (go/www_grafana/grafana-grafana-v12.0.1_GH0/pkg/plugins/codegen/go.mod) = 3b954219027bc4b41a8f4c898c2c7dc5c502675493845ff6b56d909d064128df -SIZE (go/www_grafana/grafana-grafana-v12.0.1_GH0/pkg/plugins/codegen/go.mod) = 2233 -SHA256 (go/www_grafana/grafana-grafana-v12.0.1_GH0/pkg/promlib/go.mod) = 220a0edc9fd5f62bd3de88d85d01438312dbaa9bfcdb11c413625fcf641fdfd2 -SIZE (go/www_grafana/grafana-grafana-v12.0.1_GH0/pkg/promlib/go.mod) = 7078 -SHA256 (go/www_grafana/grafana-grafana-v12.0.1_GH0/pkg/semconv/go.mod) = 7a6322fdd8537f7ae1f677434b908725aaab60e8d6bfc3faf7f6974e3f368658 -SIZE (go/www_grafana/grafana-grafana-v12.0.1_GH0/pkg/semconv/go.mod) = 269 -SHA256 (go/www_grafana/grafana-grafana-v12.0.1_GH0/pkg/storage/unified/apistore/go.mod) = 27b3059cf30f13dd199a3e18f04ac093d08475205e30661424dacadae42e54b2 -SIZE (go/www_grafana/grafana-grafana-v12.0.1_GH0/pkg/storage/unified/apistore/go.mod) = 23555 -SHA256 (go/www_grafana/grafana-grafana-v12.0.1_GH0/pkg/storage/unified/resource/go.mod) = 85a7c13bfd4ac71738d7bb947446563dd061c2e54a0266b5ea5b5cdb286b0fad -SIZE (go/www_grafana/grafana-grafana-v12.0.1_GH0/pkg/storage/unified/resource/go.mod) = 11621 -SHA256 (go/www_grafana/grafana-grafana-v12.0.1_GH0/pkg/util/xorm/go.mod) = e7ea7a05e33b4ca39993861287fa43409e1419f2d67eeffc81814ded147ddc7f -SIZE (go/www_grafana/grafana-grafana-v12.0.1_GH0/pkg/util/xorm/go.mod) = 3278 -SHA256 (go/www_grafana/grafana-grafana-v12.0.1_GH0/grafana-grafana-v12.0.1_GH0.tar.gz) = 50d6d65c2538c7533cb09722cf721a79769ac1c9bda03e951db614aaba5395d8 -SIZE (go/www_grafana/grafana-grafana-v12.0.1_GH0/grafana-grafana-v12.0.1_GH0.tar.gz) = 37736202 +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 |