Attachment 226417 Details for Bug 257152 – grafana8.0.5.diff

[patch] grafana8.0.5.diff

grafana8.diff (text/plain), 11.67 KB, created by Boris Korzun on 2021-07-13 08:34:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Boris Korzun

Created: 2021-07-13 08:34:33 UTC

Size: 11.67 KB

patch

obsolete

>diff --git a/www/grafana8/Makefile b/www/grafana8/Makefile
>index 1c8dc3cc455e..83e0696a3153 100644
>--- a/www/grafana8/Makefile
>+++ b/www/grafana8/Makefile
>@@ -1,5 +1,5 @@
> PORTNAME=	grafana
>-DISTVERSION=	8.0.2
>+DISTVERSION=	8.0.5
> DISTVERSIONPREFIX=	v
> CATEGORIES=	www
> MASTER_SITES+=	https://dl.grafana.com/oss/release/:public \
>@@ -139,7 +139,7 @@ GH_TUPLE=	\
> 		gorilla:websocket:v1.4.2:gorilla_websocket/vendor/github.com/gorilla/websocket \
> 		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.4.0:grafana_grafana_aws_sdk/vendor/github.com/grafana/grafana-aws-sdk \
>+		grafana:grafana-aws-sdk:v0.7.0:grafana_grafana_aws_sdk/vendor/github.com/grafana/grafana-aws-sdk \
> 		grafana:grafana-live-sdk:v0.0.6:grafana_grafana_live_sdk/vendor/github.com/grafana/grafana-live-sdk \
> 		grafana:grafana-plugin-sdk-go:v0.105.0:grafana_grafana_plugin_sdk_go/vendor/github.com/grafana/grafana-plugin-sdk-go \
> 		grafana:loki:15d417efe103:grafana_loki/vendor/github.com/grafana/loki \
>@@ -246,7 +246,7 @@ GH_TUPLE=	\
> 		yudai:golcs:ecda9a501e82:yudai_golcs/vendor/github.com/yudai/golcs
> 
> USE_RC_SUBR=	grafana
>-TAG=		5c5d45e
>+TAG=		cbb2aa5
> 
> GO_TARGET=	./pkg/cmd/grafana-server \
> 		./pkg/cmd/grafana-cli
>@@ -260,7 +260,7 @@ SUB_LIST=	GRAFANA_USER=${GRAFANA_USER} \
> 		GRAFANA_LOGDIR=${GRAFANA_LOGDIR} \
> 		GRAFANA_PLUGINDIR=${GRAFANA_PLUGINDIR} \
> 		GRAFANA_PROVISIONINGDIR=${GRAFANA_PROVISIONINGDIR} \
>-		GRAFANA_BUILDHASH=7f5a241f55df4a1c66ae
>+		GRAFANA_BUILDHASH=cb577348e5e011d82919
> 
> GRAFANA_USER?=	grafana
> GRAFANA_GROUP?=	grafana
>diff --git a/www/grafana8/distinfo b/www/grafana8/distinfo
>index cdb47269d3ef..28daf02490c1 100644
>--- a/www/grafana8/distinfo
>+++ b/www/grafana8/distinfo
>@@ -1,14 +1,14 @@
>-TIMESTAMP = 1623789808
>-SHA256 (grafana-8.0.2.linux-amd64.tar.gz) = 4013062cddcc8d825cbf6bdbb3d1877eb0a2c5c57b9c7f8ec77a3afd8b5161a9
>-SIZE (grafana-8.0.2.linux-amd64.tar.gz) = 55512802
>+TIMESTAMP = 1625776511
>+SHA256 (grafana-8.0.5.linux-amd64.tar.gz) = 6956694d0e0446b255dd8378534bffb49a1891383bbe54157bab0820ad8d1349
>+SIZE (grafana-8.0.5.linux-amd64.tar.gz) = 55588076
> 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.0.2_GH0.tar.gz) = 2262c8ac65bc18e8bfb60cf7c363edf1911cf4a6a54722c27cd54a71c98ebb8b
>-SIZE (grafana-grafana-v8.0.2_GH0.tar.gz) = 11564916
>+SHA256 (grafana-grafana-v8.0.5_GH0.tar.gz) = ca2bed2f2832928bbf4e3ff81f93bdb36896b3a22dd931f12332e8d3eccfb576
>+SIZE (grafana-grafana-v8.0.5_GH0.tar.gz) = 11580051
> 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
>@@ -235,8 +235,8 @@ SHA256 (gosimple-slug-v1.9.0_GH0.tar.gz) = 19a319c470e404a392037529e66ead28b58ca
> SIZE (gosimple-slug-v1.9.0_GH0.tar.gz) = 13228
> SHA256 (grafana-go-mssqldb-d0ce3c521036_GH0.tar.gz) = a3a62b4964fee10a698852dea6f59570ff2ec3320652e8c1a8b1e5d310641b3f
> SIZE (grafana-go-mssqldb-d0ce3c521036_GH0.tar.gz) = 522960
>-SHA256 (grafana-grafana-aws-sdk-v0.4.0_GH0.tar.gz) = ece54565dbf1f670d82e88e1b966b013123fda7d0bca232cfc34baad4d37aaf3
>-SIZE (grafana-grafana-aws-sdk-v0.4.0_GH0.tar.gz) = 247515
>+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-live-sdk-v0.0.6_GH0.tar.gz) = 9d975230c2e124c5abe290aea520a7b7a6e1392321ef2c83cb4deb97b2340c5e
> SIZE (grafana-grafana-live-sdk-v0.0.6_GH0.tar.gz) = 37093
> SHA256 (grafana-grafana-plugin-sdk-go-v0.105.0_GH0.tar.gz) = 2312770d2ef3271391cac468e7b54ec20aca55d1b5e504ff2147b4eb3db0bca9
>diff --git a/www/grafana8/files/grafana.ini.in b/www/grafana8/files/grafana.ini.in
>index cbbc5c4c9a7a..b6da0c1df956 100644
>--- a/www/grafana8/files/grafana.ini.in
>+++ b/www/grafana8/files/grafana.ini.in
>@@ -873,7 +873,7 @@ provisioning = %%GRAFANA_PROVISIONINGDIR%%
> [plugins]
> ;enable_alpha = false
> ;app_tls_skip_verify_insecure = false
>-# Enter a comma-separated list of plugin identifiers to identify plugins that are allowed to be loaded even if they lack a valid signature.
>+# Enter a comma-separated list of plugin identifiers to identify plugins to load even if they are unsigned. Plugins with modified signatures are never loaded.
> ;allow_loading_unsigned_plugins =
> # Enable or disable installing plugins directly from within Grafana.
> ;plugin_admin_enabled = false
>@@ -887,6 +887,10 @@ provisioning = %%GRAFANA_PROVISIONINGDIR%%
> # tuning. 0 disables Live, -1 means unlimited connections.
> ;max_connections = 100
> 
>+# allowed_origins is a comma-separated list of origins that can establish connection with Grafana Live.
>+# If not set then origin will be matched over root_url. Supports wildcard symbol "*".
>+allowed_origins =
>+
> #################################### Grafana Image Renderer Plugin ##########################
> [plugin.grafana-image-renderer]
> # Instruct headless browser instance to use a default timezone when not provided by Grafana, e.g. when rendering panel image of alert.
>diff --git a/www/grafana8/pkg-plist b/www/grafana8/pkg-plist
>index f80df86fec51..fe1356114d48 100644
>--- a/www/grafana8/pkg-plist
>+++ b/www/grafana8/pkg-plist
>@@ -558,7 +558,6 @@ bin/grafana-server
> %%DATADIR%%/public/app/features/dashboard/components/AddPanelWidget/AddPanelWidget.test.tsx
> %%DATADIR%%/public/app/features/dashboard/components/AddPanelWidget/AddPanelWidget.tsx
> %%DATADIR%%/public/app/features/dashboard/components/AddPanelWidget/_AddPanelWidget.scss
>-%%DATADIR%%/public/app/features/dashboard/components/AddPanelWidget/__snapshots__/AddPanelWidget.test.tsx.snap
> %%DATADIR%%/public/app/features/dashboard/components/AddPanelWidget/index.ts
> %%DATADIR%%/public/app/features/dashboard/components/AnnotationSettings/AngularEditorLoader.tsx
> %%DATADIR%%/public/app/features/dashboard/components/AnnotationSettings/AnnotationSettingsEdit.tsx
>@@ -586,6 +585,7 @@ bin/grafana-server
> %%DATADIR%%/public/app/features/dashboard/components/DashboardSettings/AutoRefreshIntervals.tsx
> %%DATADIR%%/public/app/features/dashboard/components/DashboardSettings/DashboardSettings.tsx
> %%DATADIR%%/public/app/features/dashboard/components/DashboardSettings/DashboardSettingsHeader.tsx
>+%%DATADIR%%/public/app/features/dashboard/components/DashboardSettings/GeneralSettings.test.tsx
> %%DATADIR%%/public/app/features/dashboard/components/DashboardSettings/GeneralSettings.tsx
> %%DATADIR%%/public/app/features/dashboard/components/DashboardSettings/JsonEditorSettings.tsx
> %%DATADIR%%/public/app/features/dashboard/components/DashboardSettings/LinksSettings.test.tsx
>@@ -1503,12 +1503,14 @@ bin/grafana-server
> %%DATADIR%%/public/app/plugins/datasource/elasticsearch/components/IconButton.tsx
> %%DATADIR%%/public/app/plugins/datasource/elasticsearch/components/MetricPicker.tsx
> %%DATADIR%%/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/BucketAggregationEditor.tsx
>+%%DATADIR%%/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/SettingsEditor/DateHistogramSettingsEditor.tsx
> %%DATADIR%%/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/SettingsEditor/FiltersSettingsEditor/index.tsx
> %%DATADIR%%/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/SettingsEditor/FiltersSettingsEditor/state/actions.ts
> %%DATADIR%%/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/SettingsEditor/FiltersSettingsEditor/state/reducer.test.ts
> %%DATADIR%%/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/SettingsEditor/FiltersSettingsEditor/state/reducer.ts
> %%DATADIR%%/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/SettingsEditor/FiltersSettingsEditor/state/types.ts
> %%DATADIR%%/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/SettingsEditor/FiltersSettingsEditor/utils.ts
>+%%DATADIR%%/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/SettingsEditor/TermsSettingsEditor.tsx
> %%DATADIR%%/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/SettingsEditor/index.tsx
> %%DATADIR%%/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/SettingsEditor/useDescription.ts
> %%DATADIR%%/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/aggregations.ts
>@@ -1549,6 +1551,8 @@ bin/grafana-server
> %%DATADIR%%/public/app/plugins/datasource/elasticsearch/components/QueryEditor/state.test.ts
> %%DATADIR%%/public/app/plugins/datasource/elasticsearch/components/QueryEditor/state.ts
> %%DATADIR%%/public/app/plugins/datasource/elasticsearch/components/QueryEditor/styles.ts
>+%%DATADIR%%/public/app/plugins/datasource/elasticsearch/components/hooks/useCreatableSelectPersistedBehaviour.test.tsx
>+%%DATADIR%%/public/app/plugins/datasource/elasticsearch/components/hooks/useCreatableSelectPersistedBehaviour.ts
> %%DATADIR%%/public/app/plugins/datasource/elasticsearch/components/types.ts
> %%DATADIR%%/public/app/plugins/datasource/elasticsearch/configuration/ConfigEditor.test.tsx
> %%DATADIR%%/public/app/plugins/datasource/elasticsearch/configuration/ConfigEditor.tsx
>@@ -1584,6 +1588,7 @@ bin/grafana-server
> %%DATADIR%%/public/app/plugins/datasource/elasticsearch/specs/index_pattern.test.ts
> %%DATADIR%%/public/app/plugins/datasource/elasticsearch/specs/query_builder.test.ts
> %%DATADIR%%/public/app/plugins/datasource/elasticsearch/specs/query_def.test.ts
>+%%DATADIR%%/public/app/plugins/datasource/elasticsearch/test-helpers/render.tsx
> %%DATADIR%%/public/app/plugins/datasource/elasticsearch/types.ts
> %%DATADIR%%/public/app/plugins/datasource/elasticsearch/utils.test.ts
> %%DATADIR%%/public/app/plugins/datasource/elasticsearch/utils.ts
>@@ -2333,6 +2338,7 @@ bin/grafana-server
> %%DATADIR%%/public/app/plugins/panel/timeseries/LineStyleEditor.tsx
> %%DATADIR%%/public/app/plugins/panel/timeseries/README.md
> %%DATADIR%%/public/app/plugins/panel/timeseries/SpanNullsEditor.tsx
>+%%DATADIR%%/public/app/plugins/panel/timeseries/ThresholdsStyleEditor.tsx
> %%DATADIR%%/public/app/plugins/panel/timeseries/TimeSeriesPanel.tsx
> %%DATADIR%%/public/app/plugins/panel/timeseries/__snapshots__/migrations.test.ts.snap
> %%DATADIR%%/public/app/plugins/panel/timeseries/config.ts
>@@ -2370,6 +2376,7 @@ bin/grafana-server
> %%DATADIR%%/public/app/plugins/panel/xychart/plugin.json
> %%DATADIR%%/public/app/plugins/panel/xychart/types.ts
> %%DATADIR%%/public/app/plugins/sdk.ts
>+%%DATADIR%%/public/app/polyfills/old-mediaquerylist.ts
> %%DATADIR%%/public/app/routes/GrafanaCtrl.ts
> %%DATADIR%%/public/app/routes/routes.tsx
> %%DATADIR%%/public/app/store/configureStore.ts
>@@ -2410,6 +2417,8 @@ bin/grafana-server
> %%DATADIR%%/public/build/101.%%GRAFANA_BUILDHASH%%.js.map
> %%DATADIR%%/public/build/102.%%GRAFANA_BUILDHASH%%.js
> %%DATADIR%%/public/build/102.%%GRAFANA_BUILDHASH%%.js.map
>+%%DATADIR%%/public/build/103.%%GRAFANA_BUILDHASH%%.js
>+%%DATADIR%%/public/build/103.%%GRAFANA_BUILDHASH%%.js.map
> %%DATADIR%%/public/build/87.%%GRAFANA_BUILDHASH%%.js
> %%DATADIR%%/public/build/87.%%GRAFANA_BUILDHASH%%.js.map
> %%DATADIR%%/public/build/88.%%GRAFANA_BUILDHASH%%.js

Flags:

drtr0jan: maintainer-approval+

Actions: View | Diff

Attachments on bug 257152: 226417