Attachment 237126 Details for Bug 266872 – grafana9.diff

[patch] grafana9.diff

grafana9.diff (text/plain), 11.33 KB, created by Boris Korzun on 2022-10-06 20:23:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Boris Korzun

Created: 2022-10-06 20:23:47 UTC

Size: 11.33 KB

patch

obsolete

>diff --git a/www/grafana9/Makefile b/www/grafana9/Makefile
>index b9c2dad51c31..77a93c84ef14 100644
>--- a/www/grafana9/Makefile
>+++ b/www/grafana9/Makefile
>@@ -1,7 +1,6 @@
> PORTNAME=	grafana
> DISTVERSIONPREFIX=	v
>-DISTVERSION=	9.1.6
>-PORTREVISION=	1
>+DISTVERSION=	9.1.7
> CATEGORIES=	www
> MASTER_SITES=	https://dl.grafana.com/oss/release/:public \
> 		https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${DISTVERSIONFULL}/:gomod
>@@ -26,7 +25,7 @@ USES=		cpe go:modules
> USE_GITHUB=	yes
> 
> USE_RC_SUBR=	grafana
>-TAG=		92461d8
>+TAG=		0cbb792
> 
> GO_MODULE=	github.com/grafana/grafana
> GO_TARGET=	./pkg/cmd/grafana-server \
>diff --git a/www/grafana9/distinfo b/www/grafana9/distinfo
>index 1340ac8c8327..6ad3effec412 100644
>--- a/www/grafana9/distinfo
>+++ b/www/grafana9/distinfo
>@@ -1,7 +1,7 @@
>-TIMESTAMP = 1663687240
>-SHA256 (go/www_grafana9/grafana-grafana-v9.1.6_GH0/grafana-9.1.6.linux-amd64.tar.gz) = 7ed2c49eb1c4dfab90fcb8fa84d3e500de0ac8d9b83f99b773b1fc7ab267915b
>-SIZE (go/www_grafana9/grafana-grafana-v9.1.6_GH0/grafana-9.1.6.linux-amd64.tar.gz) = 81057482
>-SHA256 (go/www_grafana9/grafana-grafana-v9.1.6_GH0/go.mod) = be65fa4d17ad0fb556a68f51467fa959411e53e0288ce79b3ca76e31669cfa2c
>-SIZE (go/www_grafana9/grafana-grafana-v9.1.6_GH0/go.mod) = 17713
>-SHA256 (go/www_grafana9/grafana-grafana-v9.1.6_GH0/grafana-grafana-v9.1.6_GH0.tar.gz) = 97b65fe9d9500bfba03d8a0e2316758b950fea76601c66bde4438db404b9ec1a
>-SIZE (go/www_grafana9/grafana-grafana-v9.1.6_GH0/grafana-grafana-v9.1.6_GH0.tar.gz) = 23702122
>+TIMESTAMP = 1664897355
>+SHA256 (go/www_grafana9/grafana-grafana-v9.1.7_GH0/grafana-9.1.7.linux-amd64.tar.gz) = 8a85dcf547db351cff44276715f6840d1c6d6a647cb2df567352d0eb0765f121
>+SIZE (go/www_grafana9/grafana-grafana-v9.1.7_GH0/grafana-9.1.7.linux-amd64.tar.gz) = 82327926
>+SHA256 (go/www_grafana9/grafana-grafana-v9.1.7_GH0/go.mod) = be65fa4d17ad0fb556a68f51467fa959411e53e0288ce79b3ca76e31669cfa2c
>+SIZE (go/www_grafana9/grafana-grafana-v9.1.7_GH0/go.mod) = 17713
>+SHA256 (go/www_grafana9/grafana-grafana-v9.1.7_GH0/grafana-grafana-v9.1.7_GH0.tar.gz) = dac3d154901a9d5e0d1a21f3b3a5b06ea62e86aa03c4e2fa1fe38257887f3439
>+SIZE (go/www_grafana9/grafana-grafana-v9.1.7_GH0/grafana-grafana-v9.1.7_GH0.tar.gz) = 23702284
>diff --git a/www/grafana9/pkg-plist b/www/grafana9/pkg-plist
>index 40e49c5d7184..3a72a0486275 100644
>--- a/www/grafana9/pkg-plist
>+++ b/www/grafana9/pkg-plist
>@@ -612,6 +612,7 @@ bin/grafana-server
> %%DATADIR%%/public/app/features/alerting/unified/components/rule-editor/NotificationsStep.tsx
> %%DATADIR%%/public/app/features/alerting/unified/components/rule-editor/PreviewRule.tsx
> %%DATADIR%%/public/app/features/alerting/unified/components/rule-editor/PreviewRuleResult.tsx
>+%%DATADIR%%/public/app/features/alerting/unified/components/rule-editor/QueryEditor.test.tsx
> %%DATADIR%%/public/app/features/alerting/unified/components/rule-editor/QueryEditor.tsx
> %%DATADIR%%/public/app/features/alerting/unified/components/rule-editor/QueryRows.tsx
> %%DATADIR%%/public/app/features/alerting/unified/components/rule-editor/QueryWrapper.tsx
>@@ -911,6 +912,7 @@ bin/grafana-server
> %%DATADIR%%/public/app/features/dashboard/components/RowOptions/RowOptionsModal.tsx
> %%DATADIR%%/public/app/features/dashboard/components/SaveDashboard/SaveDashboardButton.tsx
> %%DATADIR%%/public/app/features/dashboard/components/SaveDashboard/SaveDashboardDiff.tsx
>+%%DATADIR%%/public/app/features/dashboard/components/SaveDashboard/SaveDashboardDrawer.test.tsx
> %%DATADIR%%/public/app/features/dashboard/components/SaveDashboard/SaveDashboardDrawer.tsx
> %%DATADIR%%/public/app/features/dashboard/components/SaveDashboard/SaveDashboardErrorProxy.tsx
> %%DATADIR%%/public/app/features/dashboard/components/SaveDashboard/UnsavedChangesModal.tsx
>@@ -3676,9 +3678,9 @@ bin/grafana-server
> %%DATADIR%%/public/build/474.750597ccc4879f01446e.js
> %%DATADIR%%/public/build/474.750597ccc4879f01446e.js.LICENSE.txt
> %%DATADIR%%/public/build/474.750597ccc4879f01446e.js.map
>-%%DATADIR%%/public/build/4833.e20c1a6965c66ff99f68.js
>-%%DATADIR%%/public/build/4833.e20c1a6965c66ff99f68.js.LICENSE.txt
>-%%DATADIR%%/public/build/4833.e20c1a6965c66ff99f68.js.map
>+%%DATADIR%%/public/build/4833.858a8b0319e6e5fb0902.js
>+%%DATADIR%%/public/build/4833.858a8b0319e6e5fb0902.js.LICENSE.txt
>+%%DATADIR%%/public/build/4833.858a8b0319e6e5fb0902.js.map
> %%DATADIR%%/public/build/5103.fa6fc7260986cd396343.js
> %%DATADIR%%/public/build/5103.fa6fc7260986cd396343.js.map
> %%DATADIR%%/public/build/516.69ad368b878b67a31639.js
>@@ -3686,8 +3688,8 @@ bin/grafana-server
> %%DATADIR%%/public/build/5455.0fcfb0d8074e2111fa1c.js
> %%DATADIR%%/public/build/5455.0fcfb0d8074e2111fa1c.js.LICENSE.txt
> %%DATADIR%%/public/build/5455.0fcfb0d8074e2111fa1c.js.map
>-%%DATADIR%%/public/build/5477.8056e5fb663fca104b68.js
>-%%DATADIR%%/public/build/5477.8056e5fb663fca104b68.js.map
>+%%DATADIR%%/public/build/5477.a1ad9c911e843d6ee683.js
>+%%DATADIR%%/public/build/5477.a1ad9c911e843d6ee683.js.map
> %%DATADIR%%/public/build/569.e42835b2a71723fc7019.js
> %%DATADIR%%/public/build/569.e42835b2a71723fc7019.js.LICENSE.txt
> %%DATADIR%%/public/build/569.e42835b2a71723fc7019.js.map
>@@ -3704,16 +3706,16 @@ bin/grafana-server
> %%DATADIR%%/public/build/6127.4f97b46bb73a0a5702ac.js
> %%DATADIR%%/public/build/6127.4f97b46bb73a0a5702ac.js.LICENSE.txt
> %%DATADIR%%/public/build/6127.4f97b46bb73a0a5702ac.js.map
>-%%DATADIR%%/public/build/6151.7d1ac5707e3d0fa69758.js
>-%%DATADIR%%/public/build/6151.7d1ac5707e3d0fa69758.js.LICENSE.txt
>-%%DATADIR%%/public/build/6151.7d1ac5707e3d0fa69758.js.map
>+%%DATADIR%%/public/build/6151.dc17e0f9e7316871658f.js
>+%%DATADIR%%/public/build/6151.dc17e0f9e7316871658f.js.LICENSE.txt
>+%%DATADIR%%/public/build/6151.dc17e0f9e7316871658f.js.map
> %%DATADIR%%/public/build/63.8360bd500aa791ae3403.js
> %%DATADIR%%/public/build/63.8360bd500aa791ae3403.js.LICENSE.txt
> %%DATADIR%%/public/build/63.8360bd500aa791ae3403.js.map
> %%DATADIR%%/public/build/6324.4a3c3887825551a24ebd.js
> %%DATADIR%%/public/build/6324.4a3c3887825551a24ebd.js.map
>-%%DATADIR%%/public/build/6350.48261cc8338a8e85128a.js
>-%%DATADIR%%/public/build/6350.48261cc8338a8e85128a.js.map
>+%%DATADIR%%/public/build/6350.cf9d25753a00a3c18d25.js
>+%%DATADIR%%/public/build/6350.cf9d25753a00a3c18d25.js.map
> %%DATADIR%%/public/build/646.34ac7479f4dd3669aef6.js
> %%DATADIR%%/public/build/646.34ac7479f4dd3669aef6.js.LICENSE.txt
> %%DATADIR%%/public/build/646.34ac7479f4dd3669aef6.js.map
>@@ -3723,8 +3725,8 @@ bin/grafana-server
> %%DATADIR%%/public/build/6535.6ef40ec90144e6c45384.js
> %%DATADIR%%/public/build/6535.6ef40ec90144e6c45384.js.LICENSE.txt
> %%DATADIR%%/public/build/6535.6ef40ec90144e6c45384.js.map
>-%%DATADIR%%/public/build/6549.b753dd4af219c39bac3d.js
>-%%DATADIR%%/public/build/6549.b753dd4af219c39bac3d.js.map
>+%%DATADIR%%/public/build/6549.df1c2ae88b5069f02af5.js
>+%%DATADIR%%/public/build/6549.df1c2ae88b5069f02af5.js.map
> %%DATADIR%%/public/build/6619.44dd5c55b69dfcde0b5b.js
> %%DATADIR%%/public/build/6619.44dd5c55b69dfcde0b5b.js.LICENSE.txt
> %%DATADIR%%/public/build/6619.44dd5c55b69dfcde0b5b.js.map
>@@ -3809,12 +3811,12 @@ bin/grafana-server
> %%DATADIR%%/public/build/8683.e8e950030315b5a81926.js
> %%DATADIR%%/public/build/8683.e8e950030315b5a81926.js.LICENSE.txt
> %%DATADIR%%/public/build/8683.e8e950030315b5a81926.js.map
>-%%DATADIR%%/public/build/8814.4f7b6473ed54541f9b8c.js
>-%%DATADIR%%/public/build/8814.4f7b6473ed54541f9b8c.js.map
>+%%DATADIR%%/public/build/8814.1a5fad441065f86407d9.js
>+%%DATADIR%%/public/build/8814.1a5fad441065f86407d9.js.map
> %%DATADIR%%/public/build/8876.9e5d5dbbe15c12083d92.js
> %%DATADIR%%/public/build/8876.9e5d5dbbe15c12083d92.js.map
>-%%DATADIR%%/public/build/8893.aa83759dfd69659e4433.js
>-%%DATADIR%%/public/build/8893.aa83759dfd69659e4433.js.map
>+%%DATADIR%%/public/build/8893.97a0b38f0fe3e506c6e0.js
>+%%DATADIR%%/public/build/8893.97a0b38f0fe3e506c6e0.js.map
> %%DATADIR%%/public/build/8940.f35fdd9cc60f8ec061af.js
> %%DATADIR%%/public/build/8940.f35fdd9cc60f8ec061af.js.LICENSE.txt
> %%DATADIR%%/public/build/8940.f35fdd9cc60f8ec061af.js.map
>@@ -3992,8 +3994,8 @@ bin/grafana-server
> %%DATADIR%%/public/build/TeamList.5dca57f9048c87342095.js.map
> %%DATADIR%%/public/build/TeamPages.8e7c7a3f1e7a29340238.js
> %%DATADIR%%/public/build/TeamPages.8e7c7a3f1e7a29340238.js.map
>-%%DATADIR%%/public/build/TestStuffPage.48200a58380b524a56f6.js
>-%%DATADIR%%/public/build/TestStuffPage.48200a58380b524a56f6.js.map
>+%%DATADIR%%/public/build/TestStuffPage.1aaba8413333957713d6.js
>+%%DATADIR%%/public/build/TestStuffPage.1aaba8413333957713d6.js.map
> %%DATADIR%%/public/build/UserCreatePage.20297896737a6ab5c87a.js
> %%DATADIR%%/public/build/UserCreatePage.20297896737a6ab5c87a.js.map
> %%DATADIR%%/public/build/UserInvitePage.2e7e4ba80ec3449671ad.js
>@@ -4022,8 +4024,8 @@ bin/grafana-server
> %%DATADIR%%/public/build/elasticsearchPlugin.a324897c556a570bfcac.js.map
> %%DATADIR%%/public/build/explore-feature-toggle-page.b8b746f6de1cca70d16b.js
> %%DATADIR%%/public/build/explore-feature-toggle-page.b8b746f6de1cca70d16b.js.map
>-%%DATADIR%%/public/build/explore.21457acf38b9a2ae19e8.js
>-%%DATADIR%%/public/build/explore.21457acf38b9a2ae19e8.js.map
>+%%DATADIR%%/public/build/explore.5d6e17f41b2bcb3dee96.js
>+%%DATADIR%%/public/build/explore.5d6e17f41b2bcb3dee96.js.map
> %%DATADIR%%/public/build/fa56cd4c6b700e0392d0.ttf
> %%DATADIR%%/public/build/geomapPanel.240df1bc8098bd4aed3d.js
> %%DATADIR%%/public/build/geomapPanel.240df1bc8098bd4aed3d.js.map
>@@ -4033,10 +4035,10 @@ bin/grafana-server
> %%DATADIR%%/public/build/grafanaPlugin.63ddd9cf95fa996dd9f5.js.map
> %%DATADIR%%/public/build/graphPlugin.96dc70448c0f8bd45ae7.js
> %%DATADIR%%/public/build/graphPlugin.96dc70448c0f8bd45ae7.js.map
>-%%DATADIR%%/public/build/graphitePlugin.f77eb9f6debf75053fdf.js
>-%%DATADIR%%/public/build/graphitePlugin.f77eb9f6debf75053fdf.js.map
>-%%DATADIR%%/public/build/heatmapPanel.a3aa275091c4efe6a511.js
>-%%DATADIR%%/public/build/heatmapPanel.a3aa275091c4efe6a511.js.map
>+%%DATADIR%%/public/build/graphitePlugin.c785647a2d8f40ff3565.js
>+%%DATADIR%%/public/build/graphitePlugin.c785647a2d8f40ff3565.js.map
>+%%DATADIR%%/public/build/heatmapPanel.eef7b9651ae5342f877f.js
>+%%DATADIR%%/public/build/heatmapPanel.eef7b9651ae5342f877f.js.map
> %%DATADIR%%/public/build/heatmapPanelOLD.eb85bb00f42ab0401703.js
> %%DATADIR%%/public/build/heatmapPanelOLD.eb85bb00f42ab0401703.js.map
> %%DATADIR%%/public/build/iconPanel.f9129614ef572cb76841.js
>@@ -4066,15 +4068,15 @@ bin/grafana-server
> %%DATADIR%%/public/build/rst2html.3d128ffac9ac95da6ce0.js
> %%DATADIR%%/public/build/rst2html.3d128ffac9ac95da6ce0.js.LICENSE.txt
> %%DATADIR%%/public/build/rst2html.3d128ffac9ac95da6ce0.js.map
>-%%DATADIR%%/public/build/runtime.10b9e549f1d6b1514058.js
>-%%DATADIR%%/public/build/runtime.10b9e549f1d6b1514058.js.map
>+%%DATADIR%%/public/build/runtime.400ebff6bafffb4fcd0f.js
>+%%DATADIR%%/public/build/runtime.400ebff6bafffb4fcd0f.js.map
> %%DATADIR%%/public/build/scenes.41c9d177683f456ac4ea.js
> %%DATADIR%%/public/build/scenes.41c9d177683f456ac4ea.js.map
> %%DATADIR%%/public/build/static/img/codicon.56dba998.ttf
> %%DATADIR%%/public/build/tableOldPlugin.8cc901e4b2a126e67fa7.js
> %%DATADIR%%/public/build/tableOldPlugin.8cc901e4b2a126e67fa7.js.map
>-%%DATADIR%%/public/build/tempoPlugin.5054b4d635f2fb0afb9c.js
>-%%DATADIR%%/public/build/tempoPlugin.5054b4d635f2fb0afb9c.js.map
>+%%DATADIR%%/public/build/tempoPlugin.2244e0ac2521a3284cb7.js
>+%%DATADIR%%/public/build/tempoPlugin.2244e0ac2521a3284cb7.js.map
> %%DATADIR%%/public/build/testDataDSPlugin.3df66fa06d01b82a0c34.js
> %%DATADIR%%/public/build/testDataDSPlugin.3df66fa06d01b82a0c34.js.map
> %%DATADIR%%/public/build/visjs-network.49e3650c1043b686dd5c.js

Flags:

drtr0jan: maintainer-approval+

Actions: View | Diff

Attachments on bug 266872: 237126