Attachment 238444 Details for Bug 268078 – grafana9.diff

[patch] grafana9.diff

grafana9.diff (text/plain), 9.67 KB, created by Boris Korzun on 2022-11-30 11:47:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Boris Korzun

Created: 2022-11-30 11:47:46 UTC

Size: 9.67 KB

patch

obsolete

>diff --git a/www/grafana9/Makefile b/www/grafana9/Makefile
>index 6603ca0e8c2a..9fe1af873dc0 100644
>--- a/www/grafana9/Makefile
>+++ b/www/grafana9/Makefile
>@@ -1,6 +1,6 @@
> PORTNAME=	grafana
> DISTVERSIONPREFIX=	v
>-DISTVERSION=	9.2.6
>+DISTVERSION=	9.2.7
> 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=		8ba6f0f
>+TAG=		fe17b64
> 
> GO_MODULE=	github.com/grafana/grafana
> GO_TARGET=	./pkg/cmd/grafana-server \
>diff --git a/www/grafana9/distinfo b/www/grafana9/distinfo
>index 12f3fdc6db24..dc47ef62bb2c 100644
>--- a/www/grafana9/distinfo
>+++ b/www/grafana9/distinfo
>@@ -1,7 +1,7 @@
>-TIMESTAMP = 1669338292
>-SHA256 (go/www_grafana9/grafana-grafana-v9.2.6_GH0/grafana-9.2.6.linux-amd64.tar.gz) = 690f0ebf10a548df5f76877156a9ea1610d8469737f2bb31dc7f288dad8f5780
>-SIZE (go/www_grafana9/grafana-grafana-v9.2.6_GH0/grafana-9.2.6.linux-amd64.tar.gz) = 97201427
>-SHA256 (go/www_grafana9/grafana-grafana-v9.2.6_GH0/go.mod) = fc9128d1a814a1c931f146a799e3a33e348ce7d18feba314831839cf074b970b
>-SIZE (go/www_grafana9/grafana-grafana-v9.2.6_GH0/go.mod) = 18432
>-SHA256 (go/www_grafana9/grafana-grafana-v9.2.6_GH0/grafana-grafana-v9.2.6_GH0.tar.gz) = 0feab1513b45cab9fdd77c68fbc974e6897c156a5bbc22e0da4c005027814987
>-SIZE (go/www_grafana9/grafana-grafana-v9.2.6_GH0/grafana-grafana-v9.2.6_GH0.tar.gz) = 25257815
>+TIMESTAMP = 1669802121
>+SHA256 (go/www_grafana9/grafana-grafana-v9.2.7_GH0/grafana-9.2.7.linux-amd64.tar.gz) = 17794cc438e61acc3070e13b74eef4a3fac0f68d6d85b18840649837f3051722
>+SIZE (go/www_grafana9/grafana-grafana-v9.2.7_GH0/grafana-9.2.7.linux-amd64.tar.gz) = 97192376
>+SHA256 (go/www_grafana9/grafana-grafana-v9.2.7_GH0/go.mod) = fc9128d1a814a1c931f146a799e3a33e348ce7d18feba314831839cf074b970b
>+SIZE (go/www_grafana9/grafana-grafana-v9.2.7_GH0/go.mod) = 18432
>+SHA256 (go/www_grafana9/grafana-grafana-v9.2.7_GH0/grafana-grafana-v9.2.7_GH0.tar.gz) = 057164b8901c89d009b4d7181b88cd4b1be92710b8c843043961a0943b437e19
>+SIZE (go/www_grafana9/grafana-grafana-v9.2.7_GH0/grafana-grafana-v9.2.7_GH0.tar.gz) = 25259268
>diff --git a/www/grafana9/pkg-plist b/www/grafana9/pkg-plist
>index 8fd422970b3b..fec26d15ed52 100644
>--- a/www/grafana9/pkg-plist
>+++ b/www/grafana9/pkg-plist
>@@ -1655,6 +1655,7 @@ bin/grafana-server
> %%DATADIR%%/public/app/features/plugins/sql/index.ts
> %%DATADIR%%/public/app/features/plugins/sql/types.ts
> %%DATADIR%%/public/app/features/plugins/sql/utils/formatSQL.ts
>+%%DATADIR%%/public/app/features/plugins/sql/utils/migration.test.ts
> %%DATADIR%%/public/app/features/plugins/sql/utils/migration.ts
> %%DATADIR%%/public/app/features/plugins/sql/utils/sql.utils.ts
> %%DATADIR%%/public/app/features/plugins/sql/utils/useSqlChange.ts
>@@ -2863,7 +2864,6 @@ bin/grafana-server
> %%DATADIR%%/public/app/plugins/datasource/mysql/README.md
> %%DATADIR%%/public/app/plugins/datasource/mysql/configuration/ConfigurationEditor.tsx
> %%DATADIR%%/public/app/plugins/datasource/mysql/fields.ts
>-%%DATADIR%%/public/app/plugins/datasource/mysql/functions.ts
> %%DATADIR%%/public/app/plugins/datasource/mysql/img/mysql_logo.svg
> %%DATADIR%%/public/app/plugins/datasource/mysql/module.ts
> %%DATADIR%%/public/app/plugins/datasource/mysql/mySqlMetaQuery.ts
>@@ -3695,9 +3695,9 @@ bin/grafana-server
> %%DATADIR%%/public/build/1568.7ef72622bec051ee71c7.js
> %%DATADIR%%/public/build/1568.7ef72622bec051ee71c7.js.LICENSE.txt
> %%DATADIR%%/public/build/1568.7ef72622bec051ee71c7.js.map
>-%%DATADIR%%/public/build/1641.353a4f2899f7f7b305d5.js
>-%%DATADIR%%/public/build/1641.353a4f2899f7f7b305d5.js.LICENSE.txt
>-%%DATADIR%%/public/build/1641.353a4f2899f7f7b305d5.js.map
>+%%DATADIR%%/public/build/1641.3638727604654b10e8e2.js
>+%%DATADIR%%/public/build/1641.3638727604654b10e8e2.js.LICENSE.txt
>+%%DATADIR%%/public/build/1641.3638727604654b10e8e2.js.map
> %%DATADIR%%/public/build/1716.976a5d889838c7410b59.js
> %%DATADIR%%/public/build/1716.976a5d889838c7410b59.js.map
> %%DATADIR%%/public/build/1730.89db0656c7806953c9fa.js
>@@ -3732,8 +3732,8 @@ bin/grafana-server
> %%DATADIR%%/public/build/2656.063ff3ebe38fd2661946.js
> %%DATADIR%%/public/build/2656.063ff3ebe38fd2661946.js.LICENSE.txt
> %%DATADIR%%/public/build/2656.063ff3ebe38fd2661946.js.map
>-%%DATADIR%%/public/build/266.8b15c3a14edd091baf9d.js
>-%%DATADIR%%/public/build/266.8b15c3a14edd091baf9d.js.map
>+%%DATADIR%%/public/build/266.8213e343aef41086ebee.js
>+%%DATADIR%%/public/build/266.8213e343aef41086ebee.js.map
> %%DATADIR%%/public/build/2677.2e3be619cf740401d96f.js
> %%DATADIR%%/public/build/2677.2e3be619cf740401d96f.js.LICENSE.txt
> %%DATADIR%%/public/build/2677.2e3be619cf740401d96f.js.map
>@@ -3772,14 +3772,14 @@ bin/grafana-server
> %%DATADIR%%/public/build/3419.b897ba5e0f6fd6560af6.js
> %%DATADIR%%/public/build/3419.b897ba5e0f6fd6560af6.js.LICENSE.txt
> %%DATADIR%%/public/build/3419.b897ba5e0f6fd6560af6.js.map
>-%%DATADIR%%/public/build/3499.cdd66e7ab1c06d0d350f.js
>-%%DATADIR%%/public/build/3499.cdd66e7ab1c06d0d350f.js.map
>+%%DATADIR%%/public/build/3499.3a57ba9485684d30dc56.js
>+%%DATADIR%%/public/build/3499.3a57ba9485684d30dc56.js.map
> %%DATADIR%%/public/build/3590.380638a235539199c060.js
> %%DATADIR%%/public/build/3590.380638a235539199c060.js.LICENSE.txt
> %%DATADIR%%/public/build/3590.380638a235539199c060.js.map
>-%%DATADIR%%/public/build/3593.164472f018379033ff0f.js
>-%%DATADIR%%/public/build/3593.164472f018379033ff0f.js.LICENSE.txt
>-%%DATADIR%%/public/build/3593.164472f018379033ff0f.js.map
>+%%DATADIR%%/public/build/3593.210578717848c470b500.js
>+%%DATADIR%%/public/build/3593.210578717848c470b500.js.LICENSE.txt
>+%%DATADIR%%/public/build/3593.210578717848c470b500.js.map
> %%DATADIR%%/public/build/3675.c3a9877e14ba507c42f3.js
> %%DATADIR%%/public/build/3675.c3a9877e14ba507c42f3.js.map
> %%DATADIR%%/public/build/3711.57bcf19ff85eb67f09ad.js
>@@ -3828,9 +3828,9 @@ bin/grafana-server
> %%DATADIR%%/public/build/4698.cc7ca7982a5ea4a99688.js
> %%DATADIR%%/public/build/4698.cc7ca7982a5ea4a99688.js.LICENSE.txt
> %%DATADIR%%/public/build/4698.cc7ca7982a5ea4a99688.js.map
>-%%DATADIR%%/public/build/4713.8a8cb5e884bc8a897819.js
>-%%DATADIR%%/public/build/4713.8a8cb5e884bc8a897819.js.LICENSE.txt
>-%%DATADIR%%/public/build/4713.8a8cb5e884bc8a897819.js.map
>+%%DATADIR%%/public/build/4713.466c6fa0370b24c0c58e.js
>+%%DATADIR%%/public/build/4713.466c6fa0370b24c0c58e.js.LICENSE.txt
>+%%DATADIR%%/public/build/4713.466c6fa0370b24c0c58e.js.map
> %%DATADIR%%/public/build/4765.6983380023b1bbe1d5c0.js
> %%DATADIR%%/public/build/4765.6983380023b1bbe1d5c0.js.LICENSE.txt
> %%DATADIR%%/public/build/4765.6983380023b1bbe1d5c0.js.map
>@@ -3891,8 +3891,8 @@ bin/grafana-server
> %%DATADIR%%/public/build/702.250ff978916dcf67d7b3.js
> %%DATADIR%%/public/build/702.250ff978916dcf67d7b3.js.LICENSE.txt
> %%DATADIR%%/public/build/702.250ff978916dcf67d7b3.js.map
>-%%DATADIR%%/public/build/7062.5ec1c4d918175e7b8ce4.js
>-%%DATADIR%%/public/build/7062.5ec1c4d918175e7b8ce4.js.map
>+%%DATADIR%%/public/build/7062.fcada9f7f3d34448f01f.js
>+%%DATADIR%%/public/build/7062.fcada9f7f3d34448f01f.js.map
> %%DATADIR%%/public/build/7117.7087b0ae4870a094b505.js
> %%DATADIR%%/public/build/7117.7087b0ae4870a094b505.js.LICENSE.txt
> %%DATADIR%%/public/build/7117.7087b0ae4870a094b505.js.map
>@@ -3944,8 +3944,8 @@ bin/grafana-server
> %%DATADIR%%/public/build/7978.82e87dd750040fc348d3.js.map
> %%DATADIR%%/public/build/8074.427c8eb7ecb4f81708cf.js
> %%DATADIR%%/public/build/8074.427c8eb7ecb4f81708cf.js.map
>-%%DATADIR%%/public/build/8186.05020a6ae6ca76944bce.js
>-%%DATADIR%%/public/build/8186.05020a6ae6ca76944bce.js.map
>+%%DATADIR%%/public/build/8186.809ad54fb93d1e6b8e5e.js
>+%%DATADIR%%/public/build/8186.809ad54fb93d1e6b8e5e.js.map
> %%DATADIR%%/public/build/8250.4d38b3d3a4f4d0cd5427.js
> %%DATADIR%%/public/build/8250.4d38b3d3a4f4d0cd5427.js.map
> %%DATADIR%%/public/build/8273.e9df3a88af49edf7c7a0.js
>@@ -4222,14 +4222,14 @@ bin/grafana-server
> %%DATADIR%%/public/build/lokiPlugin.7065db7173a32134f732.js
> %%DATADIR%%/public/build/lokiPlugin.7065db7173a32134f732.js.map
> %%DATADIR%%/public/build/mixedPlugin.d34f3b0fb2ffc4b01ebe.js
>-%%DATADIR%%/public/build/mssqlPlugin.ea6426e8ac757a6fc64d.js
>-%%DATADIR%%/public/build/mssqlPlugin.ea6426e8ac757a6fc64d.js.map
>-%%DATADIR%%/public/build/mysqlPlugin.2edf69b3514b97ef3c8f.js
>-%%DATADIR%%/public/build/mysqlPlugin.2edf69b3514b97ef3c8f.js.map
>+%%DATADIR%%/public/build/mssqlPlugin.76f2301a75bb8f45bad1.js
>+%%DATADIR%%/public/build/mssqlPlugin.76f2301a75bb8f45bad1.js.map
>+%%DATADIR%%/public/build/mysqlPlugin.c236cae756b3ab66d304.js
>+%%DATADIR%%/public/build/mysqlPlugin.c236cae756b3ab66d304.js.map
> %%DATADIR%%/public/build/opentsdbPlugin.8af1ac5ad4a499e0f5cc.js
> %%DATADIR%%/public/build/opentsdbPlugin.8af1ac5ad4a499e0f5cc.js.map
>-%%DATADIR%%/public/build/postgresPlugin.0fe841f0c289ee1cf341.js
>-%%DATADIR%%/public/build/postgresPlugin.0fe841f0c289ee1cf341.js.map
>+%%DATADIR%%/public/build/postgresPlugin.c2b648ba98875a269b82.js
>+%%DATADIR%%/public/build/postgresPlugin.c2b648ba98875a269b82.js.map
> %%DATADIR%%/public/build/prom-query-field.c291116a0d6f1677cf0e.js
> %%DATADIR%%/public/build/prom-query-field.c291116a0d6f1677cf0e.js.map
> %%DATADIR%%/public/build/prometheusPlugin.99db139794fbc505a288.js
>@@ -4239,8 +4239,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.aae83af842a1625c374e.js
>-%%DATADIR%%/public/build/runtime.aae83af842a1625c374e.js.map
>+%%DATADIR%%/public/build/runtime.98d552444ac85c6a5963.js
>+%%DATADIR%%/public/build/runtime.98d552444ac85c6a5963.js.map
> %%DATADIR%%/public/build/scenes.d32cfb92881b6c3671d9.js
> %%DATADIR%%/public/build/scenes.d32cfb92881b6c3671d9.js.map
> %%DATADIR%%/public/build/static/img/codicon.b797181c.ttf

Flags:

drtr0jan: maintainer-approval+

Actions: View | Diff

Attachments on bug 268078: 238444 | 238445 | 238446 | 238568