Attachment 236515 Details for Bug 266379 – grafana9.diff

[patch] grafana9.diff

grafana9.diff (text/plain), 14.05 KB, created by Boris Korzun on 2022-09-12 11:31:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Boris Korzun

Created: 2022-09-12 11:31:46 UTC

Size: 14.05 KB

patch

obsolete

>diff --git a/www/grafana9/Makefile b/www/grafana9/Makefile
>index 194b76751432..0f51e3b5ab8c 100644
>--- a/www/grafana9/Makefile
>+++ b/www/grafana9/Makefile
>@@ -1,7 +1,6 @@
> PORTNAME=	grafana
> DISTVERSIONPREFIX=	v
>-DISTVERSION=	9.1.2
>-PORTREVISION=	1
>+DISTVERSION=	9.1.4
> 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=		3c13120
>+TAG=		2186d0b
> 
> GO_MODULE=	github.com/grafana/grafana
> GO_TARGET=	./pkg/cmd/grafana-server \
>diff --git a/www/grafana9/distinfo b/www/grafana9/distinfo
>index 8b9babd847f4..eb261954b2c8 100644
>--- a/www/grafana9/distinfo
>+++ b/www/grafana9/distinfo
>@@ -1,7 +1,7 @@
>-TIMESTAMP = 1661937351
>-SHA256 (go/www_grafana9/grafana-grafana-v9.1.2_GH0/grafana-9.1.2.linux-amd64.tar.gz) = 3b082a5cc372eb916d0c97130eb7deddafaae0aef4a7fdfcd23400c5ca26d52e
>-SIZE (go/www_grafana9/grafana-grafana-v9.1.2_GH0/grafana-9.1.2.linux-amd64.tar.gz) = 80934170
>-SHA256 (go/www_grafana9/grafana-grafana-v9.1.2_GH0/go.mod) = 30166787a37273552b62ff68af652c6cf4e28e91b2312b69af6c3c765b2d6231
>-SIZE (go/www_grafana9/grafana-grafana-v9.1.2_GH0/go.mod) = 17684
>-SHA256 (go/www_grafana9/grafana-grafana-v9.1.2_GH0/grafana-grafana-v9.1.2_GH0.tar.gz) = 6d15ba3e34c9dd26d1fdf6358e4e02b06b82fa6abea26029df0f2f6f890ba5fd
>-SIZE (go/www_grafana9/grafana-grafana-v9.1.2_GH0/grafana-grafana-v9.1.2_GH0.tar.gz) = 23647931
>+TIMESTAMP = 1662971926
>+SHA256 (go/www_grafana9/grafana-grafana-v9.1.4_GH0/grafana-9.1.4.linux-amd64.tar.gz) = fbd636ca67650df4af02c6da15c693465edef4d887d86a4d1ef64882cb22effc
>+SIZE (go/www_grafana9/grafana-grafana-v9.1.4_GH0/grafana-9.1.4.linux-amd64.tar.gz) = 80943066
>+SHA256 (go/www_grafana9/grafana-grafana-v9.1.4_GH0/go.mod) = be65fa4d17ad0fb556a68f51467fa959411e53e0288ce79b3ca76e31669cfa2c
>+SIZE (go/www_grafana9/grafana-grafana-v9.1.4_GH0/go.mod) = 17713
>+SHA256 (go/www_grafana9/grafana-grafana-v9.1.4_GH0/grafana-grafana-v9.1.4_GH0.tar.gz) = af56efda33db56d1aad7f1288bcb99e4a3d6bbcfa3f1b3946d1f508da71505bc
>+SIZE (go/www_grafana9/grafana-grafana-v9.1.4_GH0/grafana-grafana-v9.1.4_GH0.tar.gz) = 23656252
>diff --git a/www/grafana9/pkg-plist b/www/grafana9/pkg-plist
>index 9ea34c489a71..d9350084a9d5 100644
>--- a/www/grafana9/pkg-plist
>+++ b/www/grafana9/pkg-plist
>@@ -1468,6 +1468,7 @@ bin/grafana-server
> %%DATADIR%%/public/app/features/plugins/admin/components/PluginDetailsHeaderDependencies.tsx
> %%DATADIR%%/public/app/features/plugins/admin/components/PluginDetailsHeaderSignature.tsx
> %%DATADIR%%/public/app/features/plugins/admin/components/PluginDetailsSignature.tsx
>+%%DATADIR%%/public/app/features/plugins/admin/components/PluginList.test.tsx
> %%DATADIR%%/public/app/features/plugins/admin/components/PluginList.tsx
> %%DATADIR%%/public/app/features/plugins/admin/components/PluginListItem.test.tsx
> %%DATADIR%%/public/app/features/plugins/admin/components/PluginListItem.tsx
>@@ -3542,6 +3543,9 @@ bin/grafana-server
> %%DATADIR%%/public/build/2365.931b414061580460992b.js
> %%DATADIR%%/public/build/2365.931b414061580460992b.js.LICENSE.txt
> %%DATADIR%%/public/build/2365.931b414061580460992b.js.map
>+%%DATADIR%%/public/build/2449.def35241a3dcae812382.js
>+%%DATADIR%%/public/build/2449.def35241a3dcae812382.js.LICENSE.txt
>+%%DATADIR%%/public/build/2449.def35241a3dcae812382.js.map
> %%DATADIR%%/public/build/271.4993138765ef58062ba5.js
> %%DATADIR%%/public/build/271.4993138765ef58062ba5.js.map
> %%DATADIR%%/public/build/2713.323a816f27b26b8d3694.js
>@@ -3655,9 +3659,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.e49e07b89a97cb53c469.js
>-%%DATADIR%%/public/build/4833.e49e07b89a97cb53c469.js.LICENSE.txt
>-%%DATADIR%%/public/build/4833.e49e07b89a97cb53c469.js.map
>+%%DATADIR%%/public/build/4833.a995728058287a4224a5.js
>+%%DATADIR%%/public/build/4833.a995728058287a4224a5.js.LICENSE.txt
>+%%DATADIR%%/public/build/4833.a995728058287a4224a5.js.map
> %%DATADIR%%/public/build/516.8bdd0cc09b6dcbd4bb6a.js
> %%DATADIR%%/public/build/516.8bdd0cc09b6dcbd4bb6a.js.map
> %%DATADIR%%/public/build/5455.0fcfb0d8074e2111fa1c.js
>@@ -3681,9 +3685,9 @@ 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.e6d8219d85d0941f9bf8.js
>-%%DATADIR%%/public/build/6151.e6d8219d85d0941f9bf8.js.LICENSE.txt
>-%%DATADIR%%/public/build/6151.e6d8219d85d0941f9bf8.js.map
>+%%DATADIR%%/public/build/6151.48dd6c99bb323276cd27.js
>+%%DATADIR%%/public/build/6151.48dd6c99bb323276cd27.js.LICENSE.txt
>+%%DATADIR%%/public/build/6151.48dd6c99bb323276cd27.js.map
> %%DATADIR%%/public/build/63.8360bd500aa791ae3403.js
> %%DATADIR%%/public/build/63.8360bd500aa791ae3403.js.LICENSE.txt
> %%DATADIR%%/public/build/63.8360bd500aa791ae3403.js.map
>@@ -3691,9 +3695,6 @@ bin/grafana-server
> %%DATADIR%%/public/build/6324.4a3c3887825551a24ebd.js.map
> %%DATADIR%%/public/build/6350.08edb0f977ea5320f9c4.js
> %%DATADIR%%/public/build/6350.08edb0f977ea5320f9c4.js.map
>-%%DATADIR%%/public/build/6354.1768cf67d93e3edb7654.js
>-%%DATADIR%%/public/build/6354.1768cf67d93e3edb7654.js.LICENSE.txt
>-%%DATADIR%%/public/build/6354.1768cf67d93e3edb7654.js.map
> %%DATADIR%%/public/build/646.34ac7479f4dd3669aef6.js
> %%DATADIR%%/public/build/646.34ac7479f4dd3669aef6.js.LICENSE.txt
> %%DATADIR%%/public/build/646.34ac7479f4dd3669aef6.js.map
>@@ -3726,8 +3727,8 @@ bin/grafana-server
> %%DATADIR%%/public/build/6938.9b3cecde64006967653b.js
> %%DATADIR%%/public/build/6938.9b3cecde64006967653b.js.LICENSE.txt
> %%DATADIR%%/public/build/6938.9b3cecde64006967653b.js.map
>-%%DATADIR%%/public/build/7062.9e1fe6214489802d81d3.js
>-%%DATADIR%%/public/build/7062.9e1fe6214489802d81d3.js.map
>+%%DATADIR%%/public/build/7062.961bdccf5fa3bc105230.js
>+%%DATADIR%%/public/build/7062.961bdccf5fa3bc105230.js.map
> %%DATADIR%%/public/build/7120.e46d1840bca7281781a8.js
> %%DATADIR%%/public/build/7120.e46d1840bca7281781a8.js.LICENSE.txt
> %%DATADIR%%/public/build/7120.e46d1840bca7281781a8.js.map
>@@ -3791,8 +3792,8 @@ 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.a24a3bf7bf5d99ebe955.js
>-%%DATADIR%%/public/build/8814.a24a3bf7bf5d99ebe955.js.map
>+%%DATADIR%%/public/build/8814.34545f816a381cdfb284.js
>+%%DATADIR%%/public/build/8814.34545f816a381cdfb284.js.map
> %%DATADIR%%/public/build/8876.9e5d5dbbe15c12083d92.js
> %%DATADIR%%/public/build/8876.9e5d5dbbe15c12083d92.js.map
> %%DATADIR%%/public/build/8893.aa83759dfd69659e4433.js
>@@ -3833,8 +3834,8 @@ bin/grafana-server
> %%DATADIR%%/public/build/957.2ed581c4e92208ec51e4.js.map
> %%DATADIR%%/public/build/9586.38943810912de4805b87.js
> %%DATADIR%%/public/build/9586.38943810912de4805b87.js.map
>-%%DATADIR%%/public/build/97.e92ec293e84c22efbf0c.js
>-%%DATADIR%%/public/build/97.e92ec293e84c22efbf0c.js.map
>+%%DATADIR%%/public/build/97.ca386972dec4baa10317.js
>+%%DATADIR%%/public/build/97.ca386972dec4baa10317.js.map
> %%DATADIR%%/public/build/9705.5e0913e1227370857d7a.js
> %%DATADIR%%/public/build/9705.5e0913e1227370857d7a.js.map
> %%DATADIR%%/public/build/9725.c7e547022a2d73653f29.js
>@@ -3849,8 +3850,8 @@ bin/grafana-server
> %%DATADIR%%/public/build/AdminListOrgsPage.094b739020660ec1b119.js.map
> %%DATADIR%%/public/build/AdminSettings.f0f4f5bbe4c216ce8892.js
> %%DATADIR%%/public/build/AdminSettings.f0f4f5bbe4c216ce8892.js.map
>-%%DATADIR%%/public/build/AlertAmRoutes.05330d84a7df1b513498.js
>-%%DATADIR%%/public/build/AlertAmRoutes.05330d84a7df1b513498.js.map
>+%%DATADIR%%/public/build/AlertAmRoutes.b4845b566cbc309618a7.js
>+%%DATADIR%%/public/build/AlertAmRoutes.b4845b566cbc309618a7.js.map
> %%DATADIR%%/public/build/AlertGroups.52c3ca67307c3754c2d2.js
> %%DATADIR%%/public/build/AlertGroups.52c3ca67307c3754c2d2.js.map
> %%DATADIR%%/public/build/AlertRuleList.e7505f86ff9c64ae107a.js
>@@ -3876,8 +3877,8 @@ bin/grafana-server
> %%DATADIR%%/public/build/AngularApp.954e9514d7c4a5b92521.js.map
> %%DATADIR%%/public/build/ApiKeysPage.617916b08ac4590b3b38.js
> %%DATADIR%%/public/build/ApiKeysPage.617916b08ac4590b3b38.js.map
>-%%DATADIR%%/public/build/AppRootPage.e1c1d79c12b32791bd41.js
>-%%DATADIR%%/public/build/AppRootPage.e1c1d79c12b32791bd41.js.map
>+%%DATADIR%%/public/build/AppRootPage.2ee44eb5e92b96c988cb.js
>+%%DATADIR%%/public/build/AppRootPage.2ee44eb5e92b96c988cb.js.map
> %%DATADIR%%/public/build/BenchmarksPage.860ee92af2e35d3c92ec.js
> %%DATADIR%%/public/build/BenchmarksPage.860ee92af2e35d3c92ec.js.map
> %%DATADIR%%/public/build/ChangePasswordPage.9657b9d43ea0ad47570e.js
>@@ -3890,10 +3891,10 @@ bin/grafana-server
> %%DATADIR%%/public/build/DashboardImport.4173336038c91a0b172c.js.map
> %%DATADIR%%/public/build/DashboardListPage.0099be6c25a1c7f4ed52.js
> %%DATADIR%%/public/build/DashboardListPage.0099be6c25a1c7f4ed52.js.map
>-%%DATADIR%%/public/build/DashboardPage.5bbef957f179b0dccbbf.js
>-%%DATADIR%%/public/build/DashboardPage.5bbef957f179b0dccbbf.js.map
>-%%DATADIR%%/public/build/DataConnectionsPage.8a67a2237493ec4b0246.js
>-%%DATADIR%%/public/build/DataConnectionsPage.8a67a2237493ec4b0246.js.map
>+%%DATADIR%%/public/build/DashboardPage.79c8a029f064aba11865.js
>+%%DATADIR%%/public/build/DashboardPage.79c8a029f064aba11865.js.map
>+%%DATADIR%%/public/build/DataConnectionsPage.7fa606a4927f119867ef.js
>+%%DATADIR%%/public/build/DataConnectionsPage.7fa606a4927f119867ef.js.map
> %%DATADIR%%/public/build/DataSourceDashboards.010ef8fb1a8393c5f104.js
> %%DATADIR%%/public/build/DataSourceDashboards.010ef8fb1a8393c5f104.js.map
> %%DATADIR%%/public/build/DataSourcesListPage.56a661c1f173f08535c5.js
>@@ -3920,8 +3921,8 @@ bin/grafana-server
> %%DATADIR%%/public/build/MuteTimings.eb780bead6891832c222.js.map
> %%DATADIR%%/public/build/NewDashboardsFolder.7dfede7af3ee66822bed.js
> %%DATADIR%%/public/build/NewDashboardsFolder.7dfede7af3ee66822bed.js.map
>-%%DATADIR%%/public/build/NewDataSourcePage.af40ffb29b55cae66364.js
>-%%DATADIR%%/public/build/NewDataSourcePage.af40ffb29b55cae66364.js.map
>+%%DATADIR%%/public/build/NewDataSourcePage.b0446e89eb941a278be5.js
>+%%DATADIR%%/public/build/NewDataSourcePage.b0446e89eb941a278be5.js.map
> %%DATADIR%%/public/build/NewNotificationChannel.47c0235e0105080a8873.js
> %%DATADIR%%/public/build/NewNotificationChannel.47c0235e0105080a8873.js.map
> %%DATADIR%%/public/build/NewOrgPage.0d96784d78b12cd0c4df.js
>@@ -3942,10 +3943,10 @@ bin/grafana-server
> %%DATADIR%%/public/build/PlaylistPage.b2cd095ca26265355c76.js.map
> %%DATADIR%%/public/build/PlaylistStartPage.be99b491d8305611e7e4.js
> %%DATADIR%%/public/build/PlaylistStartPage.be99b491d8305611e7e4.js.map
>-%%DATADIR%%/public/build/PluginListPage.86ec9565b9edd799564e.js
>-%%DATADIR%%/public/build/PluginListPage.86ec9565b9edd799564e.js.map
>-%%DATADIR%%/public/build/PluginPage.9967c182e1e1530015b1.js
>-%%DATADIR%%/public/build/PluginPage.9967c182e1e1530015b1.js.map
>+%%DATADIR%%/public/build/PluginListPage.64af7699951d4c34a511.js
>+%%DATADIR%%/public/build/PluginListPage.64af7699951d4c34a511.js.map
>+%%DATADIR%%/public/build/PluginPage.7de22694c9e2e34f526e.js
>+%%DATADIR%%/public/build/PluginPage.7de22694c9e2e34f526e.js.map
> %%DATADIR%%/public/build/ProfileFeatureTogglePage.d0ccd43db7353bb396b6.js
> %%DATADIR%%/public/build/ProfileFeatureTogglePage.d0ccd43db7353bb396b6.js.map
> %%DATADIR%%/public/build/PublicDashboardPage.48f38aebffae6415e897.js
>@@ -3988,8 +3989,8 @@ bin/grafana-server
> %%DATADIR%%/public/build/UsersListPage.2a220612f75819771aab.js.map
> %%DATADIR%%/public/build/alertmanagerPlugin.8396ac3a4a41b26a621a.js
> %%DATADIR%%/public/build/alertmanagerPlugin.8396ac3a4a41b26a621a.js.map
>-%%DATADIR%%/public/build/app.2e869d22a62a3c00d02d.js
>-%%DATADIR%%/public/build/app.2e869d22a62a3c00d02d.js.map
>+%%DATADIR%%/public/build/app.40373df184fe8e5ef77b.js
>+%%DATADIR%%/public/build/app.40373df184fe8e5ef77b.js.map
> %%DATADIR%%/public/build/azureMonitorPlugin.93e9bbeebabd360f746b.js
> %%DATADIR%%/public/build/brace.edb33d518abc1f1a9670.js
> %%DATADIR%%/public/build/brace.edb33d518abc1f1a9670.js.map
>@@ -4005,8 +4006,8 @@ bin/grafana-server
> %%DATADIR%%/public/build/elasticsearchPlugin.3828bbf3c8bcb5f0a0d5.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.fb593d6b1bcd93e66c3c.js
>-%%DATADIR%%/public/build/explore.fb593d6b1bcd93e66c3c.js.map
>+%%DATADIR%%/public/build/explore.21457acf38b9a2ae19e8.js
>+%%DATADIR%%/public/build/explore.21457acf38b9a2ae19e8.js.map
> %%DATADIR%%/public/build/fa56cd4c6b700e0392d0.ttf
> %%DATADIR%%/public/build/geomapPanel.240df1bc8098bd4aed3d.js
> %%DATADIR%%/public/build/geomapPanel.240df1bc8098bd4aed3d.js.map
>@@ -4049,8 +4050,8 @@ 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.039659ce7c5e02f11df5.js
>-%%DATADIR%%/public/build/runtime.039659ce7c5e02f11df5.js.map
>+%%DATADIR%%/public/build/runtime.d423f7c47571e0bf2ad8.js
>+%%DATADIR%%/public/build/runtime.d423f7c47571e0bf2ad8.js.map
> %%DATADIR%%/public/build/scenes.41c9d177683f456ac4ea.js
> %%DATADIR%%/public/build/scenes.41c9d177683f456ac4ea.js.map
> %%DATADIR%%/public/build/static/img/codicon.56dba998.ttf
>@@ -4058,8 +4059,8 @@ bin/grafana-server
> %%DATADIR%%/public/build/tableOldPlugin.8cc901e4b2a126e67fa7.js.map
> %%DATADIR%%/public/build/tempoPlugin.5054b4d635f2fb0afb9c.js
> %%DATADIR%%/public/build/tempoPlugin.5054b4d635f2fb0afb9c.js.map
>-%%DATADIR%%/public/build/testDataDSPlugin.2a02c02520a13261ed8a.js
>-%%DATADIR%%/public/build/testDataDSPlugin.2a02c02520a13261ed8a.js.map
>+%%DATADIR%%/public/build/testDataDSPlugin.3df66fa06d01b82a0c34.js
>+%%DATADIR%%/public/build/testDataDSPlugin.3df66fa06d01b82a0c34.js.map
> %%DATADIR%%/public/build/visjs-network.49e3650c1043b686dd5c.js
> %%DATADIR%%/public/build/visjs-network.49e3650c1043b686dd5c.js.LICENSE.txt
> %%DATADIR%%/public/build/visjs-network.49e3650c1043b686dd5c.js.map

Flags:

drtr0jan: maintainer-approval+

Actions: View | Diff

Attachments on bug 266379: 236515