git: 4f27b315fb98 - main - www/grafana8: Update to 8.5.4

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Dmitri Goutnik <dmgk_at_FreeBSD.org>
Date: Sat, 04 Jun 2022 12:58:41 UTC
The branch main has been updated by dmgk:

URL: https://cgit.FreeBSD.org/ports/commit/?id=4f27b315fb98fe8574a59345bdb3dde1c8326c2a

commit 4f27b315fb98fe8574a59345bdb3dde1c8326c2a
Author:     Boris Korzun <drtr0jan@yandex.ru>
AuthorDate: 2022-06-04 12:05:21 +0000
Commit:     Dmitri Goutnik <dmgk@FreeBSD.org>
CommitDate: 2022-06-04 12:58:17 +0000

    www/grafana8: Update to 8.5.4
    
    Changes:        https://github.com/grafana/grafana/releases/tag/v8.5.4
    
    PR:             264446
---
 www/grafana8/Makefile  |  8 ++++----
 www/grafana8/distinfo  | 10 +++++-----
 www/grafana8/pkg-plist | 19 ++++++++++++++-----
 3 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/www/grafana8/Makefile b/www/grafana8/Makefile
index c5fec86a3c57..b69a4e62e897 100644
--- a/www/grafana8/Makefile
+++ b/www/grafana8/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	grafana
 DISTVERSIONPREFIX=	v
-DISTVERSION=	8.5.2
+DISTVERSION=	8.5.4
 CATEGORIES=	www
 MASTER_SITES=	https://dl.grafana.com/oss/release/:public
 PKGNAMESUFFIX=	${DISTVERSION:C/([0-9]).*/\1/1}
@@ -22,7 +22,7 @@ USES=		cpe go:modules
 USE_GITHUB=	yes
 
 USE_RC_SUBR=	grafana
-TAG=		90701be
+TAG=		78ee958
 
 GO_TARGET=	./pkg/cmd/grafana-server \
 		./pkg/cmd/grafana-cli
@@ -37,7 +37,7 @@ SUB_LIST=	GRAFANA_USER=${GRAFANA_USER} \
 		GRAFANA_LOGDIR=${GRAFANA_LOGDIR} \
 		GRAFANA_PLUGINDIR=${GRAFANA_PLUGINDIR} \
 		GRAFANA_PROVISIONINGDIR=${GRAFANA_PROVISIONINGDIR} \
-		GRAFANA_BUILDHASH=b208037f6b1954dc031d
+		GRAFANA_BUILDHASH=af8f3a231daca19ff375
 
 GRAFANA_USER?=	grafana
 GRAFANA_GROUP?=	grafana
@@ -80,7 +80,7 @@ pre-build:
 	${SETENV} ${MAKE_ENV} ${GO_ENV} GOPROXY=off ${GO_CMD} build \
 		-o wire ./vendor/github.com/google/wire/cmd/wire/main.go; \
 	${ECHO_MSG} "===>  Generating wire_gen.go"; \
-	${SETENV} XDG_CACHE_HOME=${WRKDIR}/.cache ${GO_ENV} ./wire gen -tags "oss" ./pkg/server ./pkg/cmd/grafana-cli/runner )
+	${SETENV} ${MAKE_ENV} ${GO_ENV} ./wire gen -tags "oss" ./pkg/server ./pkg/cmd/grafana-cli/runner )
 
 post-install:
 	${MKDIR} ${STAGEDIR}${GRAFANA_HOMEDIR}
diff --git a/www/grafana8/distinfo b/www/grafana8/distinfo
index 5813ee52ad89..63f0c63545d9 100644
--- a/www/grafana8/distinfo
+++ b/www/grafana8/distinfo
@@ -1,14 +1,14 @@
-TIMESTAMP = 1651666502
-SHA256 (grafana-8.5.2.linux-amd64.tar.gz) = 321f0c8647cf088dd927b109baaa85ec74d823b78d3486fecaecb077b1e700bf
-SIZE (grafana-8.5.2.linux-amd64.tar.gz) = 77679732
+TIMESTAMP = 1654067985
+SHA256 (grafana-8.5.4.linux-amd64.tar.gz) = 062abce1489c68c950476d8e3e92481f8ab51f43fa63814daadbc2f94bcfc57b
+SIZE (grafana-8.5.4.linux-amd64.tar.gz) = 77784707
 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.5.2_GH0.tar.gz) = fd7b391b6f1641cb945cd942de39173b2bdbf537ff894ac322895a43a25e7c37
-SIZE (grafana-grafana-v8.5.2_GH0.tar.gz) = 18730158
+SHA256 (grafana-grafana-v8.5.4_GH0.tar.gz) = cdcfe87834a6fd4bdaab73ada4765b1ee80fc8bf157321ae90ce9bc23c15642b
+SIZE (grafana-grafana-v8.5.4_GH0.tar.gz) = 18790859
 SHA256 (Azure-azure-sdk-for-go-v59.3.0_GH0.tar.gz) = 219e6cdb7b26dcb4bdac35de2f06abf9caa71810fe88395e692f42729c8e55f5
 SIZE (Azure-azure-sdk-for-go-v59.3.0_GH0.tar.gz) = 46199521
 SHA256 (Azure-azure-sdk-for-go-sdk-azcore-v0.22.0_GH0.tar.gz) = 7375ac472dc4a19c5ce4eb9e646c20d97a9802e68790dc968b49c7874177b331
diff --git a/www/grafana8/pkg-plist b/www/grafana8/pkg-plist
index be49f21ac519..7164ab2211a6 100644
--- a/www/grafana8/pkg-plist
+++ b/www/grafana8/pkg-plist
@@ -182,6 +182,7 @@ bin/grafana-server
 %%DATADIR%%/public/app/core/components/RolePicker/UserRolePicker.tsx
 %%DATADIR%%/public/app/core/components/RolePicker/ValueContainer.tsx
 %%DATADIR%%/public/app/core/components/RolePicker/api.ts
+%%DATADIR%%/public/app/core/components/RolePicker/constants.ts
 %%DATADIR%%/public/app/core/components/Select/DashboardPicker.tsx
 %%DATADIR%%/public/app/core/components/Select/FolderPicker.test.tsx
 %%DATADIR%%/public/app/core/components/Select/FolderPicker.tsx
@@ -476,6 +477,7 @@ bin/grafana-server
 %%DATADIR%%/public/app/features/alerting/unified/components/EmptyArea.tsx
 %%DATADIR%%/public/app/features/alerting/unified/components/EmptyAreaWithCTA.tsx
 %%DATADIR%%/public/app/features/alerting/unified/components/Expression.tsx
+%%DATADIR%%/public/app/features/alerting/unified/components/NoAlertManagerWarning.tsx
 %%DATADIR%%/public/app/features/alerting/unified/components/PanelPluginsButtonGroup.tsx
 %%DATADIR%%/public/app/features/alerting/unified/components/RuleLocation.tsx
 %%DATADIR%%/public/app/features/alerting/unified/components/StateColoredText.tsx
@@ -618,7 +620,9 @@ bin/grafana-server
 %%DATADIR%%/public/app/features/alerting/unified/components/silences/SilencesEditor.tsx
 %%DATADIR%%/public/app/features/alerting/unified/components/silences/SilencesFilter.tsx
 %%DATADIR%%/public/app/features/alerting/unified/components/silences/SilencesTable.tsx
+%%DATADIR%%/public/app/features/alerting/unified/hooks/useAlertManagerSourceName.test.tsx
 %%DATADIR%%/public/app/features/alerting/unified/hooks/useAlertManagerSourceName.ts
+%%DATADIR%%/public/app/features/alerting/unified/hooks/useAlertManagerSources.ts
 %%DATADIR%%/public/app/features/alerting/unified/hooks/useAlertQueriesStatus.ts
 %%DATADIR%%/public/app/features/alerting/unified/hooks/useCombinedRule.ts
 %%DATADIR%%/public/app/features/alerting/unified/hooks/useCombinedRuleNamespaces.test.ts
@@ -2099,11 +2103,13 @@ bin/grafana-server
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/__mocks__/datasource.ts
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/__mocks__/errors.ts
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/__mocks__/instanceSettings.ts
+%%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/__mocks__/panelData.ts
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/__mocks__/query.ts
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/__mocks__/query_ctrl.ts
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/__mocks__/resourcePickerData.ts
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/__mocks__/resourcePickerRows.ts
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/__mocks__/sdk.ts
+%%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/__mocks__/utils.ts
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/__mocks__/variables.ts
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/azureMetadata/index.ts
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/azureMetadata/locations.ts
@@ -2136,6 +2142,7 @@ bin/grafana-server
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/LogsQueryEditor/setQueryValue.ts
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/LogsQueryEditor/useMigrations.ts
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/MetricsQueryEditor/AggregationField.tsx
+%%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/MetricsQueryEditor/DimensionFields.test.tsx
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/MetricsQueryEditor/DimensionFields.tsx
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/MetricsQueryEditor/LegendFormatField.tsx
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/MetricsQueryEditor/MetricNameField.tsx
@@ -2148,6 +2155,7 @@ bin/grafana-server
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/MetricsQueryEditor/ResourceTypeField.tsx
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/MetricsQueryEditor/TimeGrainField.tsx
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/MetricsQueryEditor/TopField.tsx
+%%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/MetricsQueryEditor/asyncDataHooks.test.ts
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/MetricsQueryEditor/dataHooks.test.ts
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/MetricsQueryEditor/dataHooks.ts
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/MetricsQueryEditor/index.tsx
@@ -3252,8 +3260,6 @@ bin/grafana-server
 %%DATADIR%%/public/build/1523.%%GRAFANA_BUILDHASH%%.js
 %%DATADIR%%/public/build/1549.%%GRAFANA_BUILDHASH%%.js
 %%DATADIR%%/public/build/1549.%%GRAFANA_BUILDHASH%%.js.map
-%%DATADIR%%/public/build/1602.%%GRAFANA_BUILDHASH%%.js
-%%DATADIR%%/public/build/1602.%%GRAFANA_BUILDHASH%%.js.map
 %%DATADIR%%/public/build/1657.%%GRAFANA_BUILDHASH%%.js
 %%DATADIR%%/public/build/1657.%%GRAFANA_BUILDHASH%%.js.LICENSE.txt
 %%DATADIR%%/public/build/1657.%%GRAFANA_BUILDHASH%%.js.map
@@ -3464,6 +3470,8 @@ bin/grafana-server
 %%DATADIR%%/public/build/6791.%%GRAFANA_BUILDHASH%%.js.map
 %%DATADIR%%/public/build/6847.%%GRAFANA_BUILDHASH%%.js
 %%DATADIR%%/public/build/6847.%%GRAFANA_BUILDHASH%%.js.map
+%%DATADIR%%/public/build/685.%%GRAFANA_BUILDHASH%%.js
+%%DATADIR%%/public/build/685.%%GRAFANA_BUILDHASH%%.js.map
 %%DATADIR%%/public/build/6892.%%GRAFANA_BUILDHASH%%.js
 %%DATADIR%%/public/build/6892.%%GRAFANA_BUILDHASH%%.js.LICENSE.txt
 %%DATADIR%%/public/build/6892.%%GRAFANA_BUILDHASH%%.js.map
@@ -3502,9 +3510,9 @@ bin/grafana-server
 %%DATADIR%%/public/build/7594.%%GRAFANA_BUILDHASH%%.js
 %%DATADIR%%/public/build/7594.%%GRAFANA_BUILDHASH%%.js.LICENSE.txt
 %%DATADIR%%/public/build/7594.%%GRAFANA_BUILDHASH%%.js.map
-%%DATADIR%%/public/build/7809.%%GRAFANA_BUILDHASH%%.js
-%%DATADIR%%/public/build/7809.%%GRAFANA_BUILDHASH%%.js.LICENSE.txt
-%%DATADIR%%/public/build/7809.%%GRAFANA_BUILDHASH%%.js.map
+%%DATADIR%%/public/build/7889.%%GRAFANA_BUILDHASH%%.js
+%%DATADIR%%/public/build/7889.%%GRAFANA_BUILDHASH%%.js.LICENSE.txt
+%%DATADIR%%/public/build/7889.%%GRAFANA_BUILDHASH%%.js.map
 %%DATADIR%%/public/build/7893.%%GRAFANA_BUILDHASH%%.js
 %%DATADIR%%/public/build/7893.%%GRAFANA_BUILDHASH%%.js.LICENSE.txt
 %%DATADIR%%/public/build/7893.%%GRAFANA_BUILDHASH%%.js.map
@@ -5508,6 +5516,7 @@ bin/grafana-server
 %%DATADIR%%/public/img/plugin-default-logo_dark.svg
 %%DATADIR%%/public/img/plugin-default-logo_light.svg
 %%DATADIR%%/public/img/plugins/appdynamics.svg
+%%DATADIR%%/public/img/plugins/azure-devops.png
 %%DATADIR%%/public/img/plugins/datadog.png
 %%DATADIR%%/public/img/plugins/dynatrace.png
 %%DATADIR%%/public/img/plugins/gitlab.svg