Attachment 242671 Details for Bug 271893 – grafana9.patch

[patch] grafana9.patch

grafana9.diff (text/plain), 14.64 KB, created by Boris Korzun on 2023-06-07 21:03:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Boris Korzun

Created: 2023-06-07 21:03:44 UTC

Size: 14.64 KB

patch

obsolete

>diff --git a/www/grafana9/Makefile b/www/grafana9/Makefile
>index 48f9106dff86..aec1b01d1289 100644
>--- a/www/grafana9/Makefile
>+++ b/www/grafana9/Makefile
>@@ -1,6 +1,6 @@
> PORTNAME=	grafana
> DISTVERSIONPREFIX=	v
>-DISTVERSION=	9.5.1
>+DISTVERSION=	9.5.3
> CATEGORIES=	www
> MASTER_SITES=	https://dl.grafana.com/oss/release/:public \
> 		https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${DISTVERSIONFULL}/:gomod
>@@ -25,7 +25,7 @@ USES=		cpe go:modules
> USE_GITHUB=	yes
> 
> USE_RC_SUBR=	grafana
>-TAG=		bc353e4
>+TAG=		916d979
> 
> GO_MODULE=	github.com/grafana/grafana
> GO_TARGET=	./pkg/cmd/grafana \
>diff --git a/www/grafana9/distinfo b/www/grafana9/distinfo
>index e5ab1d78fb8e..578aafa7306b 100644
>--- a/www/grafana9/distinfo
>+++ b/www/grafana9/distinfo
>@@ -1,7 +1,7 @@
>-TIMESTAMP = 1682592937
>-SHA256 (go/www_grafana9/grafana-grafana-v9.5.1_GH0/grafana-9.5.1.linux-amd64.tar.gz) = d9b7505cdd4299c1835c36547ffe2e62d3b0ec7600dca2c644a0519572c9c387
>-SIZE (go/www_grafana9/grafana-grafana-v9.5.1_GH0/grafana-9.5.1.linux-amd64.tar.gz) = 78487778
>-SHA256 (go/www_grafana9/grafana-grafana-v9.5.1_GH0/go.mod) = 0275aa05cf64c28c060a262893af0425504b3c49123e5638fc2fb43470d12939
>-SIZE (go/www_grafana9/grafana-grafana-v9.5.1_GH0/go.mod) = 20608
>-SHA256 (go/www_grafana9/grafana-grafana-v9.5.1_GH0/grafana-grafana-v9.5.1_GH0.tar.gz) = ef9d603998465a7c7f87cf7415bfde10856925fef5b3cdd3af9da2fb13c4d3e7
>-SIZE (go/www_grafana9/grafana-grafana-v9.5.1_GH0/grafana-grafana-v9.5.1_GH0.tar.gz) = 26406811
>+TIMESTAMP = 1686126735
>+SHA256 (go/www_grafana9/grafana-grafana-v9.5.3_GH0/grafana-9.5.3.linux-amd64.tar.gz) = 3df7513cc42b11a4f083dc167b2268e88f47b905fab3197525b4fd0938b19f27
>+SIZE (go/www_grafana9/grafana-grafana-v9.5.3_GH0/grafana-9.5.3.linux-amd64.tar.gz) = 78499106
>+SHA256 (go/www_grafana9/grafana-grafana-v9.5.3_GH0/go.mod) = 850819d04b6b5bf4cfbffc66687366c84a9556fe811a3dd16f59558d9c1247d4
>+SIZE (go/www_grafana9/grafana-grafana-v9.5.3_GH0/go.mod) = 20800
>+SHA256 (go/www_grafana9/grafana-grafana-v9.5.3_GH0/grafana-grafana-v9.5.3_GH0.tar.gz) = bd1ee2955591672f822829bcc746272254c632e89ae5f7ec7a4929148d09ad1e
>+SIZE (go/www_grafana9/grafana-grafana-v9.5.3_GH0/grafana-grafana-v9.5.3_GH0.tar.gz) = 26420045
>diff --git a/www/grafana9/pkg-plist b/www/grafana9/pkg-plist
>index 7be6a1a47f6b..c1f47467622c 100644
>--- a/www/grafana9/pkg-plist
>+++ b/www/grafana9/pkg-plist
>@@ -1271,6 +1271,7 @@ bin/grafana-server
> %%DATADIR%%/public/app/features/dashboard/state/utils.test.ts
> %%DATADIR%%/public/app/features/dashboard/state/utils.ts
> %%DATADIR%%/public/app/features/dashboard/utils/dashboard.ts
>+%%DATADIR%%/public/app/features/dashboard/utils/getPanelChromeProps.tsx
> %%DATADIR%%/public/app/features/dashboard/utils/getPanelMenu.test.ts
> %%DATADIR%%/public/app/features/dashboard/utils/getPanelMenu.ts
> %%DATADIR%%/public/app/features/dashboard/utils/getRefreshFromUrl.test.ts
>@@ -4344,14 +4345,14 @@ bin/grafana-server
> %%DATADIR%%/public/build/4601.ff7d3979850cf4080c4d.js.map
> %%DATADIR%%/public/build/4698.4055dd2725a7eb4ad237.js
> %%DATADIR%%/public/build/4698.4055dd2725a7eb4ad237.js.map
>-%%DATADIR%%/public/build/4712.373cf489d418bd8ea4f5.js
>-%%DATADIR%%/public/build/4712.373cf489d418bd8ea4f5.js.map
>+%%DATADIR%%/public/build/4712.d18eb14017efcce56055.js
>+%%DATADIR%%/public/build/4712.d18eb14017efcce56055.js.map
> %%DATADIR%%/public/build/4761.4fc22606fb63ccb3d180.js
> %%DATADIR%%/public/build/4761.4fc22606fb63ccb3d180.js.map
> %%DATADIR%%/public/build/4765.e59c95f8ba7c356288d5.js
> %%DATADIR%%/public/build/4765.e59c95f8ba7c356288d5.js.map
>-%%DATADIR%%/public/build/5001.e48e767dbd11719efd54.js
>-%%DATADIR%%/public/build/5001.e48e767dbd11719efd54.js.map
>+%%DATADIR%%/public/build/5001.c608db11fc550b82e777.js
>+%%DATADIR%%/public/build/5001.c608db11fc550b82e777.js.map
> %%DATADIR%%/public/build/5048.88892cfcb3c03fc5c7a4.js
> %%DATADIR%%/public/build/5048.88892cfcb3c03fc5c7a4.js.map
> %%DATADIR%%/public/build/5331.6fa47f2f5492205834c7.js
>@@ -4360,22 +4361,24 @@ bin/grafana-server
> %%DATADIR%%/public/build/5386.1974876e886f0026da7d.js.map
> %%DATADIR%%/public/build/5436.d2ead59433ecbc65110a.js
> %%DATADIR%%/public/build/5436.d2ead59433ecbc65110a.js.map
>+%%DATADIR%%/public/build/5439.77d9cec6bcd44ee55cd7.js
>+%%DATADIR%%/public/build/5439.77d9cec6bcd44ee55cd7.js.map
> %%DATADIR%%/public/build/5498.533676849aa9b1b982b5.js
> %%DATADIR%%/public/build/5498.533676849aa9b1b982b5.js.map
> %%DATADIR%%/public/build/5510.5d8f006a1e821cf9c24d.js
> %%DATADIR%%/public/build/5510.5d8f006a1e821cf9c24d.js.map
> %%DATADIR%%/public/build/5524.874619dfe248d1146e59.js
> %%DATADIR%%/public/build/5524.874619dfe248d1146e59.js.map
>-%%DATADIR%%/public/build/5644.376542d01ebd29e4e781.js
>-%%DATADIR%%/public/build/5644.376542d01ebd29e4e781.js.map
>+%%DATADIR%%/public/build/5644.0726debaeb76e2fe8f7b.js
>+%%DATADIR%%/public/build/5644.0726debaeb76e2fe8f7b.js.map
> %%DATADIR%%/public/build/5733.9cdc05f48932a2035923.js
> %%DATADIR%%/public/build/5733.9cdc05f48932a2035923.js.map
> %%DATADIR%%/public/build/5757.406f74eebeef874b499d.js
> %%DATADIR%%/public/build/5757.406f74eebeef874b499d.js.map
> %%DATADIR%%/public/build/5771.39c1f9f01f6df091ef69.js
> %%DATADIR%%/public/build/5771.39c1f9f01f6df091ef69.js.map
>-%%DATADIR%%/public/build/6008.24b9bed086b743747459.js
>-%%DATADIR%%/public/build/6008.24b9bed086b743747459.js.map
>+%%DATADIR%%/public/build/6008.7a5a6fd6bebf867814f4.js
>+%%DATADIR%%/public/build/6008.7a5a6fd6bebf867814f4.js.map
> %%DATADIR%%/public/build/6093.f5ab9a18733219487b27.js
> %%DATADIR%%/public/build/6093.f5ab9a18733219487b27.js.map
> %%DATADIR%%/public/build/610.5ac11796a3a762a2e611.js
>@@ -4384,8 +4387,6 @@ bin/grafana-server
> %%DATADIR%%/public/build/613.b77210d2013b5ade3ce4.js.map
> %%DATADIR%%/public/build/615.fa4599f74e04c773935b.js
> %%DATADIR%%/public/build/615.fa4599f74e04c773935b.js.map
>-%%DATADIR%%/public/build/6173.bcfd23ec2eaef56b8c90.js
>-%%DATADIR%%/public/build/6173.bcfd23ec2eaef56b8c90.js.map
> %%DATADIR%%/public/build/6196.4c777004ed5665a4f501.js
> %%DATADIR%%/public/build/6196.4c777004ed5665a4f501.js.map
> %%DATADIR%%/public/build/6233.8e1b5b6c0acfccc00190.js
>@@ -4394,22 +4395,22 @@ bin/grafana-server
> %%DATADIR%%/public/build/6291.cb5ce8837ec621d8b6a1.js.map
> %%DATADIR%%/public/build/6401.dfa9a84bfa6a743648e0.js
> %%DATADIR%%/public/build/6401.dfa9a84bfa6a743648e0.js.map
>-%%DATADIR%%/public/build/6419.9c4d6b35a9c87b11f530.js
>-%%DATADIR%%/public/build/6419.9c4d6b35a9c87b11f530.js.map
>+%%DATADIR%%/public/build/6419.759ff142f7ae4c0c0f82.js
>+%%DATADIR%%/public/build/6419.759ff142f7ae4c0c0f82.js.map
> %%DATADIR%%/public/build/6488.b4fc34371bd3f0fc2b5b.js
> %%DATADIR%%/public/build/6488.b4fc34371bd3f0fc2b5b.js.map
> %%DATADIR%%/public/build/6537.701f150401e6ca1a92f0.js
> %%DATADIR%%/public/build/6537.701f150401e6ca1a92f0.js.map
> %%DATADIR%%/public/build/6577.de63cd08cf5a7d64b1dc.js
> %%DATADIR%%/public/build/6577.de63cd08cf5a7d64b1dc.js.map
>-%%DATADIR%%/public/build/6647.4f58073f759e15c1af0e.js
>-%%DATADIR%%/public/build/6647.4f58073f759e15c1af0e.js.map
>+%%DATADIR%%/public/build/6647.2502b1fba005a5e1a56c.js
>+%%DATADIR%%/public/build/6647.2502b1fba005a5e1a56c.js.map
> %%DATADIR%%/public/build/6694.aa35f234ccbc910da743.js
> %%DATADIR%%/public/build/6694.aa35f234ccbc910da743.js.map
> %%DATADIR%%/public/build/6747.d1b1a44ced46aa134bcc.js
> %%DATADIR%%/public/build/6747.d1b1a44ced46aa134bcc.js.map
>-%%DATADIR%%/public/build/6749.32f81d7fa137df51b539.js
>-%%DATADIR%%/public/build/6749.32f81d7fa137df51b539.js.map
>+%%DATADIR%%/public/build/6749.dcda36f2155b00177c16.js
>+%%DATADIR%%/public/build/6749.dcda36f2155b00177c16.js.map
> %%DATADIR%%/public/build/6797.3fa9657c48903eda5adf.js
> %%DATADIR%%/public/build/6797.3fa9657c48903eda5adf.js.map
> %%DATADIR%%/public/build/6847.7cd0ab849a12fcd296fc.js
>@@ -4432,6 +4433,8 @@ bin/grafana-server
> %%DATADIR%%/public/build/7274.190233426b2fdd13caca.js.map
> %%DATADIR%%/public/build/7336.f8cd2921a98a0db2b203.js
> %%DATADIR%%/public/build/7336.f8cd2921a98a0db2b203.js.map
>+%%DATADIR%%/public/build/7362.f69d65b9f97d6faad0a7.js
>+%%DATADIR%%/public/build/7362.f69d65b9f97d6faad0a7.js.map
> %%DATADIR%%/public/build/7421.89b1903c844bcb51c994.js
> %%DATADIR%%/public/build/7421.89b1903c844bcb51c994.js.map
> %%DATADIR%%/public/build/7428.b4adfe29938bc7782af4.js
>@@ -4452,12 +4455,12 @@ bin/grafana-server
> %%DATADIR%%/public/build/7965.5a362c043746a4c2bf29.js.map
> %%DATADIR%%/public/build/7978.86d2312d74fd74b4ef82.js
> %%DATADIR%%/public/build/7978.86d2312d74fd74b4ef82.js.map
>-%%DATADIR%%/public/build/810.207fe373259c3cb37927.js
>-%%DATADIR%%/public/build/810.207fe373259c3cb37927.js.map
>-%%DATADIR%%/public/build/8186.04725408003e96d0637f.js
>-%%DATADIR%%/public/build/8186.04725408003e96d0637f.js.map
>-%%DATADIR%%/public/build/8232.2825cd18d84351aa1151.js
>-%%DATADIR%%/public/build/8232.2825cd18d84351aa1151.js.map
>+%%DATADIR%%/public/build/810.b152b338150ee8b62393.js
>+%%DATADIR%%/public/build/810.b152b338150ee8b62393.js.map
>+%%DATADIR%%/public/build/8186.0436901b3510457bdb69.js
>+%%DATADIR%%/public/build/8186.0436901b3510457bdb69.js.map
>+%%DATADIR%%/public/build/8232.b4f44d42cc2e1d34c918.js
>+%%DATADIR%%/public/build/8232.b4f44d42cc2e1d34c918.js.map
> %%DATADIR%%/public/build/8273.fa1791f5412772ebff8f.js
> %%DATADIR%%/public/build/8273.fa1791f5412772ebff8f.js.map
> %%DATADIR%%/public/build/8366.dfbd19119f6376b82bce.js
>@@ -4490,22 +4493,20 @@ bin/grafana-server
> %%DATADIR%%/public/build/9221.1acee72efe65585d5ea6.js.map
> %%DATADIR%%/public/build/924.982c554d1b604b07b12b.js
> %%DATADIR%%/public/build/924.982c554d1b604b07b12b.js.map
>-%%DATADIR%%/public/build/9243.e3eef1d85a7cc81e163e.js
>-%%DATADIR%%/public/build/9243.e3eef1d85a7cc81e163e.js.map
>+%%DATADIR%%/public/build/9243.82eba4487833eb1d714d.js
>+%%DATADIR%%/public/build/9243.82eba4487833eb1d714d.js.map
> %%DATADIR%%/public/build/9261.25378ccb7dca64c1061f.js
> %%DATADIR%%/public/build/9261.25378ccb7dca64c1061f.js.map
> %%DATADIR%%/public/build/9285.eb939910ac690ccd8d47.js
> %%DATADIR%%/public/build/9285.eb939910ac690ccd8d47.js.map
>-%%DATADIR%%/public/build/9305.8b8cac7e56f2662109a6.js
>-%%DATADIR%%/public/build/9305.8b8cac7e56f2662109a6.js.map
> %%DATADIR%%/public/build/9405.8966a2834f63a083bc5c.js
> %%DATADIR%%/public/build/9405.8966a2834f63a083bc5c.js.map
>-%%DATADIR%%/public/build/9469.11d2c66c7202aad45b8d.js
>-%%DATADIR%%/public/build/9469.11d2c66c7202aad45b8d.js.map
>+%%DATADIR%%/public/build/9469.6ced368e232b01eb032d.js
>+%%DATADIR%%/public/build/9469.6ced368e232b01eb032d.js.map
> %%DATADIR%%/public/build/9485.7e4fb84205d07621d8c5.js
> %%DATADIR%%/public/build/9485.7e4fb84205d07621d8c5.js.map
>-%%DATADIR%%/public/build/9504.3aabaff89270aae7f744.js
>-%%DATADIR%%/public/build/9504.3aabaff89270aae7f744.js.map
>+%%DATADIR%%/public/build/9504.448256a92cdd3cb53578.js
>+%%DATADIR%%/public/build/9504.448256a92cdd3cb53578.js.map
> %%DATADIR%%/public/build/9544.dae6f6dd2d516ce8a919.js
> %%DATADIR%%/public/build/9544.dae6f6dd2d516ce8a919.js.map
> %%DATADIR%%/public/build/957.d51ea218ae5951ff07fb.js
>@@ -4641,8 +4642,8 @@ bin/grafana-server
> %%DATADIR%%/public/build/SignupInvited.2db1a55ece18726c71ec.js.map
> %%DATADIR%%/public/build/SnapshotListPage.6cd34ec34ebf4b5ab5c4.js
> %%DATADIR%%/public/build/SnapshotListPage.6cd34ec34ebf4b5ab5c4.js.map
>-%%DATADIR%%/public/build/SoloPanelPage.896a78da5489a1c33aa4.js
>-%%DATADIR%%/public/build/SoloPanelPage.896a78da5489a1c33aa4.js.map
>+%%DATADIR%%/public/build/SoloPanelPage.f8faf001da48448bee07.js
>+%%DATADIR%%/public/build/SoloPanelPage.f8faf001da48448bee07.js.map
> %%DATADIR%%/public/build/StoragePage.e93dbd30a7ca3605922e.js
> %%DATADIR%%/public/build/StoragePage.e93dbd30a7ca3605922e.js.map
> %%DATADIR%%/public/build/SupportBundles.7fdbc0821ace690e3a9e.js
>@@ -4686,8 +4687,8 @@ bin/grafana-server
> %%DATADIR%%/public/build/elasticsearchPlugin.33a3fa3a36d580167bc3.js.map
> %%DATADIR%%/public/build/explore-feature-toggle-page.0ab442c4e8a4fe61adaa.js
> %%DATADIR%%/public/build/explore-feature-toggle-page.0ab442c4e8a4fe61adaa.js.map
>-%%DATADIR%%/public/build/explore.9173e5ba8d7434807609.js
>-%%DATADIR%%/public/build/explore.9173e5ba8d7434807609.js.map
>+%%DATADIR%%/public/build/explore.9be9bef96741497b92bf.js
>+%%DATADIR%%/public/build/explore.9be9bef96741497b92bf.js.map
> %%DATADIR%%/public/build/geomapPanel.724ecdb3d3fc8a5fba34.js
> %%DATADIR%%/public/build/geomapPanel.724ecdb3d3fc8a5fba34.js.map
> %%DATADIR%%/public/build/grafana.dark.922c73a268c5f56fe5fe.css
>@@ -4702,8 +4703,8 @@ bin/grafana-server
> %%DATADIR%%/public/build/heatmapPanel.c215e3b6a365c8ca89ff.js.map
> %%DATADIR%%/public/build/iconPanel.28dfc009488e2fe3b120.js
> %%DATADIR%%/public/build/iconPanel.28dfc009488e2fe3b120.js.map
>-%%DATADIR%%/public/build/influxdbPlugin.dad92604861ca604507d.js
>-%%DATADIR%%/public/build/influxdbPlugin.dad92604861ca604507d.js.map
>+%%DATADIR%%/public/build/influxdbPlugin.361180030e1790b4ff10.js
>+%%DATADIR%%/public/build/influxdbPlugin.361180030e1790b4ff10.js.map
> %%DATADIR%%/public/build/jaegerPlugin.4febd58b3862293b3e1e.js
> %%DATADIR%%/public/build/jaegerPlugin.4febd58b3862293b3e1e.js.map
> %%DATADIR%%/public/build/light.aebcbf63275625ca9a4c.js
>@@ -4714,24 +4715,24 @@ bin/grafana-server
> %%DATADIR%%/public/build/mixedPlugin.9c0e1398a7de20e2883c.js
> %%DATADIR%%/public/build/mssqlPlugin.c48c79fed84fa5a79053.js
> %%DATADIR%%/public/build/mssqlPlugin.c48c79fed84fa5a79053.js.map
>-%%DATADIR%%/public/build/mysqlPlugin.44aada404a04ff641ec9.js
>-%%DATADIR%%/public/build/mysqlPlugin.44aada404a04ff641ec9.js.map
>+%%DATADIR%%/public/build/mysqlPlugin.44b499c5619762f44c65.js
>+%%DATADIR%%/public/build/mysqlPlugin.44b499c5619762f44c65.js.map
> %%DATADIR%%/public/build/opentsdbPlugin.9a425c7df68459d90f28.js
> %%DATADIR%%/public/build/opentsdbPlugin.9a425c7df68459d90f28.js.map
> %%DATADIR%%/public/build/parcaPlugin.2344a9b8dd64b2fa674e.js
> %%DATADIR%%/public/build/parcaPlugin.2344a9b8dd64b2fa674e.js.map
> %%DATADIR%%/public/build/phlarePlugin.efa941009cd1c6ed90b9.js
> %%DATADIR%%/public/build/phlarePlugin.efa941009cd1c6ed90b9.js.map
>-%%DATADIR%%/public/build/postgresPlugin.3f45002817fcae2c7a10.js
>-%%DATADIR%%/public/build/postgresPlugin.3f45002817fcae2c7a10.js.map
>+%%DATADIR%%/public/build/postgresPlugin.89dc57c53eabf74155c1.js
>+%%DATADIR%%/public/build/postgresPlugin.89dc57c53eabf74155c1.js.map
> %%DATADIR%%/public/build/prom-query-field.6c540fd3ca7a3c637502.js
> %%DATADIR%%/public/build/prom-query-field.6c540fd3ca7a3c637502.js.map
> %%DATADIR%%/public/build/prometheusPlugin.1f506f69e35af58ff9bc.js
> %%DATADIR%%/public/build/prometheusPlugin.1f506f69e35af58ff9bc.js.map
> %%DATADIR%%/public/build/react-monaco-editor.93c7f2c9bcc12d3cabec.js
> %%DATADIR%%/public/build/react-monaco-editor.93c7f2c9bcc12d3cabec.js.map
>-%%DATADIR%%/public/build/runtime.2434a49086cee1380c4e.js
>-%%DATADIR%%/public/build/runtime.2434a49086cee1380c4e.js.map
>+%%DATADIR%%/public/build/runtime.9bb1d48427c59068187a.js
>+%%DATADIR%%/public/build/runtime.9bb1d48427c59068187a.js.map
> %%DATADIR%%/public/build/scenes.059d9c1ed1753c476a4a.js
> %%DATADIR%%/public/build/scenes.059d9c1ed1753c476a4a.js.map
> %%DATADIR%%/public/build/static/img/codicon.b797181c.ttf

Flags:

drtr0jan: maintainer-approval+

Actions: View | Diff

Attachments on bug 271893: 242670 | 242671 | 242672