Attachment 227378 Details for Bug 258006 – grafana8.diff

[patch] grafana8.diff

grafana8.diff (text/plain), 6.08 KB, created by Boris Korzun on 2021-08-23 13:42:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Boris Korzun

Created: 2021-08-23 13:42:08 UTC

Size: 6.08 KB

patch

obsolete

>diff --git a/www/grafana8/Makefile b/www/grafana8/Makefile
>index b74380bd7739..a5c8e64cfd54 100644
>--- a/www/grafana8/Makefile
>+++ b/www/grafana8/Makefile
>@@ -1,5 +1,5 @@
> PORTNAME=	grafana
>-DISTVERSION=	8.1.0
>+DISTVERSION=	8.1.2
> DISTVERSIONPREFIX=	v
> PORTREVISION=	1
> CATEGORIES=	www
>@@ -28,7 +28,7 @@ USES=		go:modules
> USE_GITHUB=	yes
> 
> USE_RC_SUBR=	grafana
>-TAG=		62e720c
>+TAG=		103f8fa
> 
> GO_TARGET=	./pkg/cmd/grafana-server \
> 		./pkg/cmd/grafana-cli
>@@ -41,7 +41,7 @@ SUB_LIST=	GRAFANA_USER=${GRAFANA_USER} \
> 		GRAFANA_LOGDIR=${GRAFANA_LOGDIR} \
> 		GRAFANA_PLUGINDIR=${GRAFANA_PLUGINDIR} \
> 		GRAFANA_PROVISIONINGDIR=${GRAFANA_PROVISIONINGDIR} \
>-		GRAFANA_BUILDHASH=d7cfb4e56c8be9229275
>+		GRAFANA_BUILDHASH=8ea303538f79ee32b68a
> 
> GRAFANA_USER?=	grafana
> GRAFANA_GROUP?=	grafana
>diff --git a/www/grafana8/Makefile.modules b/www/grafana8/Makefile.modules
>index 8188fe5773dc..e529a704787b 100644
>--- a/www/grafana8/Makefile.modules
>+++ b/www/grafana8/Makefile.modules
>@@ -114,7 +114,7 @@ GH_TUPLE=	\
> 		gosimple:slug:v1.9.0:gosimple_slug/vendor/github.com/gosimple/slug \
> 		grafana:go-mssqldb:d0ce3c521036:grafana_go_mssqldb/vendor/github.com/denisenkom/go-mssqldb \
> 		grafana:grafana-aws-sdk:v0.7.0:grafana_grafana_aws_sdk/vendor/github.com/grafana/grafana-aws-sdk \
>-		grafana:grafana-plugin-sdk-go:v0.111.0:grafana_grafana_plugin_sdk_go/vendor/github.com/grafana/grafana-plugin-sdk-go \
>+		grafana:grafana-plugin-sdk-go:v0.112.0:grafana_grafana_plugin_sdk_go/vendor/github.com/grafana/grafana-plugin-sdk-go \
> 		grafana:loki:15d417efe103:grafana_loki/vendor/github.com/grafana/loki \
> 		grpc-ecosystem:go-grpc-middleware:v1.3.0:grpc_ecosystem_go_grpc_middleware/vendor/github.com/grpc-ecosystem/go-grpc-middleware \
> 		grpc-ecosystem:go-grpc-prometheus:6af20e3a5340:grpc_ecosystem_go_grpc_prometheus/vendor/github.com/grpc-ecosystem/go-grpc-prometheus \
>diff --git a/www/grafana8/distinfo b/www/grafana8/distinfo
>index 7bb939f099bd..e44bd1485a0f 100644
>--- a/www/grafana8/distinfo
>+++ b/www/grafana8/distinfo
>@@ -1,14 +1,14 @@
>-TIMESTAMP = 1628237187
>-SHA256 (grafana-8.1.0.linux-amd64.tar.gz) = 3ac8c82bd34e5395f29f350e2f29ed4eab87d143f02ff12ac3d5e3683b123be8
>-SIZE (grafana-8.1.0.linux-amd64.tar.gz) = 57174165
>+TIMESTAMP = 1629702792
>+SHA256 (grafana-8.1.2.linux-amd64.tar.gz) = d1fcc2c24547ac116248ac6fc932b45eef301e9ca8e7cbbe6bd73b75a69409cd
>+SIZE (grafana-8.1.2.linux-amd64.tar.gz) = 57186805
> SHA256 (v0.3.6.tar.gz) = af49dbe70ab6b0eb31d69afd89c3260b82cb662607b66eac41b65d642faee6bb
> SIZE (v0.3.6.tar.gz) = 22747
> SHA256 (v0.7.3.tar.gz) = 9709c0e8eec3045832f9da81c7bcacf1a32774cb674efcd5662dd8b4d82f70c1
> SIZE (v0.7.3.tar.gz) = 21163
> SHA256 (v0.8.2.tar.gz) = 871cec6861f88b22fe36879e854872f960fae58a4e87d93c6c43d90558c8fc84
> SIZE (v0.8.2.tar.gz) = 413897
>-SHA256 (grafana-grafana-v8.1.0_GH0.tar.gz) = 5ab5456b3bdf79a48ad6e5cb6ba3c7c8418f2ab01540e34c77f8fe561c1812ec
>-SIZE (grafana-grafana-v8.1.0_GH0.tar.gz) = 11893577
>+SHA256 (grafana-grafana-v8.1.2_GH0.tar.gz) = 068c4944089298cf30ebcf0da2a9f9e896ba690a78866c007ce7e54447d6b40a
>+SIZE (grafana-grafana-v8.1.2_GH0.tar.gz) = 11910424
> SHA256 (Azure-azure-sdk-for-go-023238f4c45f_GH0.tar.gz) = 7fc283310c39645475503e4388f96cbc721cca5d35de57bc17282188b70ce69c
> SIZE (Azure-azure-sdk-for-go-023238f4c45f_GH0.tar.gz) = 36528192
> SHA256 (Azure-azure-sdk-for-go-2bc7350b1dcd_GH0.tar.gz) = a385b24461c2dd73a3e32e130f9bf51940cbd263d5abaa2486aab6a37b27b079
>@@ -239,8 +239,8 @@ SHA256 (grafana-go-mssqldb-d0ce3c521036_GH0.tar.gz) = a3a62b4964fee10a698852dea6
> SIZE (grafana-go-mssqldb-d0ce3c521036_GH0.tar.gz) = 522960
> SHA256 (grafana-grafana-aws-sdk-v0.7.0_GH0.tar.gz) = 8134e3424fe2f22707d4aefbe8bbbe00ecd9da00fa86ea75691e6d9061f0a026
> SIZE (grafana-grafana-aws-sdk-v0.7.0_GH0.tar.gz) = 247569
>-SHA256 (grafana-grafana-plugin-sdk-go-v0.111.0_GH0.tar.gz) = 19beb65361c52156f6dcdcd4e181162cb38462d00b7be17257b205bf660cdbea
>-SIZE (grafana-grafana-plugin-sdk-go-v0.111.0_GH0.tar.gz) = 169593
>+SHA256 (grafana-grafana-plugin-sdk-go-v0.112.0_GH0.tar.gz) = a2e8138a99cf74cea3130b9fc0589f99f5f54e7851f9be2d0bbe1aa652934b67
>+SIZE (grafana-grafana-plugin-sdk-go-v0.112.0_GH0.tar.gz) = 170128
> SHA256 (grafana-loki-15d417efe103_GH0.tar.gz) = 5bbd4caedfd9e57ffb64102abc992e9de3d672d387e4d6fede76f15ddc704889
> SIZE (grafana-loki-15d417efe103_GH0.tar.gz) = 25278521
> SHA256 (grpc-ecosystem-go-grpc-middleware-v1.3.0_GH0.tar.gz) = c9b908202c05a7f821b03ee49cd678e7e71469519054629770e0565d78275cbc
>diff --git a/www/grafana8/pkg-plist b/www/grafana8/pkg-plist
>index f49f9a0dd87b..0250799f6b2d 100644
>--- a/www/grafana8/pkg-plist
>+++ b/www/grafana8/pkg-plist
>@@ -176,8 +176,6 @@ bin/grafana-server
> %%DATADIR%%/public/app/core/components/sidemenu/__snapshots__/BottomSection.test.tsx.snap
> %%DATADIR%%/public/app/core/components/sidemenu/__snapshots__/DropDownChild.test.tsx.snap
> %%DATADIR%%/public/app/core/components/sidemenu/__snapshots__/SideMenuDropDown.test.tsx.snap
>-%%DATADIR%%/public/app/core/components/sidemenu/__snapshots__/TopSection.test.tsx.snap
>-%%DATADIR%%/public/app/core/components/sidemenu/__snapshots__/TopSectionItem.test.tsx.snap
> %%DATADIR%%/public/app/core/components/sidemenu/utils.test.ts
> %%DATADIR%%/public/app/core/components/sidemenu/utils.ts
> %%DATADIR%%/public/app/core/components/sql_part/sql_part.ts
>@@ -1423,6 +1421,7 @@ bin/grafana-server
> %%DATADIR%%/public/app/features/variables/state/setOptionFromUrl.test.ts
> %%DATADIR%%/public/app/features/variables/state/sharedReducer.test.ts
> %%DATADIR%%/public/app/features/variables/state/sharedReducer.ts
>+%%DATADIR%%/public/app/features/variables/state/templateVarsChangedInUrl.test.ts
> %%DATADIR%%/public/app/features/variables/state/transactionReducer.test.ts
> %%DATADIR%%/public/app/features/variables/state/transactionReducer.ts
> %%DATADIR%%/public/app/features/variables/state/types.ts
>@@ -2534,6 +2533,8 @@ bin/grafana-server
> %%DATADIR%%/public/app/polyfills/old-mediaquerylist.ts
> %%DATADIR%%/public/app/routes/GrafanaCtrl.ts
> %%DATADIR%%/public/app/routes/routes.tsx
>+%%DATADIR%%/public/app/routes/utils.test.ts
>+%%DATADIR%%/public/app/routes/utils.ts
> %%DATADIR%%/public/app/store/configureStore.ts
> %%DATADIR%%/public/app/store/store.ts
> %%DATADIR%%/public/app/types/accessControl.ts

Flags:

drtr0jan: maintainer-approval+

Actions: View | Diff

Attachments on bug 258006: 227378 | 227383