git: f1dfebcd437f - 2022Q1 - www/grafana8: Update to 8.3.4
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 26 Feb 2022 14:26:23 UTC
The branch 2022Q1 has been updated by riggs:
URL: https://cgit.FreeBSD.org/ports/commit/?id=f1dfebcd437f59ba4918efb9b7ccd796955b52cb
commit f1dfebcd437f59ba4918efb9b7ccd796955b52cb
Author: Boris Korzun <drtr0jan@yandex.ru>
AuthorDate: 2022-01-25 05:59:17 +0000
Commit: Thomas Zander <riggs@FreeBSD.org>
CommitDate: 2022-02-26 14:02:23 +0000
www/grafana8: Update to 8.3.4
Changes: https://github.com/grafana/grafana/releases/tag/v8.3.4
PR: 261444
(cherry picked from commit e248e799b480c55544a0b348347cf5da3fdf55de)
---
www/grafana8/Makefile | 28 +++++++++++++++------
www/grafana8/Makefile.modules | 38 +++++++++++++++++------------
www/grafana8/distinfo | 52 ++++++++++++++++++++++-----------------
www/grafana8/pkg-plist | 57 +++++++++++++++++++++----------------------
4 files changed, 101 insertions(+), 74 deletions(-)
diff --git a/www/grafana8/Makefile b/www/grafana8/Makefile
index 5b5672775dba..42aa78782fd9 100644
--- a/www/grafana8/Makefile
+++ b/www/grafana8/Makefile
@@ -1,10 +1,11 @@
PORTNAME= grafana
DISTVERSIONPREFIX= v
-DISTVERSION= 8.3.3
+DISTVERSION= 8.3.4
CATEGORIES= www
MASTER_SITES= https://dl.grafana.com/oss/release/:public
-PKGNAMESUFFIX= ${PORTVERSION:C/([0-9]).*/\1/1}
-DISTFILES= grafana-${PORTVERSION}.linux-amd64${EXTRACT_SUFX}:public
+PKGNAMESUFFIX= ${DISTVERSION:C/([0-9]).*/\1/1}
+DISTFILES= ${GRAFANA_PREBUILT}:public
+EXTRACT_ONLY= ${ALLFILES:N${GRAFANA_PREBUILT}:}
MAINTAINER= drtr0jan@yandex.ru
COMMENT= Dashboard and graph editor for multiple data stores
@@ -21,12 +22,14 @@ USES= cpe go:modules
USE_GITHUB= yes
USE_RC_SUBR= grafana
-TAG= dc57bcd
+TAG= a551d74
GO_TARGET= ./pkg/cmd/grafana-server \
./pkg/cmd/grafana-cli
GO_BUILDFLAGS= -ldflags="-w -X main.version=${PORTVERSION} -X main.commit=${TAG}"
+CONFLICTS_INSTALL= grafana*
+
SUB_LIST= GRAFANA_USER=${GRAFANA_USER} \
GRAFANA_GROUP=${GRAFANA_GROUP} \
GRAFANA_DATADIR=${GRAFANA_DATADIR} \
@@ -34,7 +37,7 @@ SUB_LIST= GRAFANA_USER=${GRAFANA_USER} \
GRAFANA_LOGDIR=${GRAFANA_LOGDIR} \
GRAFANA_PLUGINDIR=${GRAFANA_PLUGINDIR} \
GRAFANA_PROVISIONINGDIR=${GRAFANA_PROVISIONINGDIR} \
- GRAFANA_BUILDHASH=6839ffb2aed352838f3a
+ GRAFANA_BUILDHASH=1322a38d8e955d3d27e7
GRAFANA_USER?= grafana
GRAFANA_GROUP?= grafana
@@ -44,6 +47,7 @@ GROUPS= ${GRAFANA_GROUP}
PLIST_SUB= ${SUB_LIST}
+GRAFANA_PREBUILT= grafana-${DISTVERSION}.linux-amd64${EXTRACT_SUFX}
GRAFANA_DATADIR?= /var/db/${PORTNAME}
GRAFANA_HOMEDIR?= ${DATADIR}
GRAFANA_LOGDIR?= /var/log/${PORTNAME}
@@ -53,8 +57,17 @@ GRAFANA_PROVISIONINGDIR?= ${ETCDIR}/provisioning
# This file includes the GH_TUPLE. Generated by make gomod-vendor.
.include "Makefile.modules"
+post-extract: deps-post-extract
+ @${RM} -r ${WRKSRC}/public
+ @${RM} -r ${WRKSRC}/plugins-bundled
+ @if ! (cd ${EXTRACT_WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${GRAFANA_PREBUILT} ${EXTRACT_AFTER_ARGS});\
+ then \
+ ${ECHO_MSG} "===> Failed to extract \"${_DISTDIR}/${GRAFANA_PREBUILT}\"."; \
+ exit 1; \
+ fi
+
post-patch:
- ${REINPLACE_CMD} \
+ @${REINPLACE_CMD} \
-e 's|;data = /var/lib/grafana|data = ${GRAFANA_DATADIR}|g' \
-e 's|;logs = /var/log/grafana|logs = ${GRAFANA_LOGDIR}|g' \
-e 's|;plugins = /var/lib/grafana/plugins|plugins = ${GRAFANA_PLUGINDIR}|g' \
@@ -62,7 +75,7 @@ post-patch:
${WRKSRC}/conf/sample.ini
pre-build:
- (cd ${GO_WRKSRC}; \
+ @(cd ${GO_WRKSRC}; \
${ECHO_MSG} "===> Building google/wire"; \
${SETENV} ${MAKE_ENV} ${GO_ENV} GOPROXY=off ${GO_CMD} build \
-o wire ./vendor/github.com/google/wire/cmd/wire/main.go; \
@@ -79,6 +92,7 @@ post-install:
.endfor
${MKDIR} ${STAGEDIR}${GRAFANA_LOGDIR}
( cd ${WRKSRC} && ${COPYTREE_SHARE} public ${STAGEDIR}${GRAFANA_HOMEDIR} )
+ ( cd ${WRKSRC} && ${COPYTREE_SHARE} plugins-bundled/internal ${STAGEDIR}${GRAFANA_HOMEDIR} )
${INSTALL_DATA} ${WRKSRC}/conf/defaults.ini ${STAGEDIR}${GRAFANA_HOMEDIR}/conf/defaults.ini
${INSTALL_DATA} ${WRKSRC}/conf/sample.ini ${STAGEDIR}${ETCDIR}/grafana.ini.sample
diff --git a/www/grafana8/Makefile.modules b/www/grafana8/Makefile.modules
index 4d6317cde86a..3a99769edd7a 100644
--- a/www/grafana8/Makefile.modules
+++ b/www/grafana8/Makefile.modules
@@ -6,17 +6,17 @@ DISTFILES+= v0.3.6${EXTRACT_SUFX}:builder \
v0.8.2${EXTRACT_SUFX}:xorm
GH_TUPLE= \
Azure:azure-sdk-for-go:v57.1.0:azure_azure_sdk_for_go/vendor/github.com/Azure/azure-sdk-for-go \
- Azure:azure-sdk-for-go:bbf5386148eb:azure_azure_sdk_for_go_azcore \
- Azure:azure-sdk-for-go:af32bacab1a2:azure_azure_sdk_for_go_azidentity \
- Azure:azure-sdk-for-go:1eb47c16ddfd:azure_azure_sdk_for_go_internal \
+ Azure:azure-sdk-for-go:sdk/azcore/v0.19.0:azure_azure_sdk_for_go_sdk_azcore \
+ Azure:azure-sdk-for-go:sdk/azidentity/v0.10.0:azure_azure_sdk_for_go_sdk_azidentity \
+ Azure:azure-sdk-for-go:sdk/internal/v0.7.0:azure_azure_sdk_for_go_sdk_internal \
Azure:go-autorest:v14.2.0:azure_go_autorest/vendor/github.com/Azure/go-autorest \
- Azure:go-autorest:3ddafdd73fe9:azure_go_autorest_autorest \
- Azure:go-autorest:4e2e1bb52ffb:azure_go_autorest_autorest_adal \
- Azure:go-autorest:b3a0b30a7423:azure_go_autorest_autorest_date \
- Azure:go-autorest:b3a0b30a7423:azure_go_autorest_autorest_to \
- Azure:go-autorest:446f41b7d65b:azure_go_autorest_autorest_validation \
- Azure:go-autorest:820a319d2214:azure_go_autorest_logger \
- Azure:go-autorest:b3a0b30a7423:azure_go_autorest_tracing \
+ Azure:go-autorest:autorest/v0.11.20:azure_go_autorest_autorest \
+ Azure:go-autorest:autorest/adal/v0.9.15:azure_go_autorest_autorest_adal \
+ Azure:go-autorest:autorest/date/v0.3.0:azure_go_autorest_autorest_date \
+ Azure:go-autorest:autorest/to/v0.4.0:azure_go_autorest_autorest_to \
+ Azure:go-autorest:autorest/validation/v0.3.1:azure_go_autorest_autorest_validation \
+ Azure:go-autorest:logger/v0.2.1:azure_go_autorest_logger \
+ Azure:go-autorest:tracing/v0.6.0:azure_go_autorest_tracing \
BurntSushi:toml:v0.3.1:burntsushi_toml/vendor/github.com/BurntSushi/toml \
FZambia:eagle:v0.0.1:fzambia_eagle/vendor/github.com/FZambia/eagle \
FZambia:sentinel:v1.1.0:fzambia_sentinel/vendor/github.com/FZambia/sentinel \
@@ -122,6 +122,7 @@ GH_TUPLE= \
googleapis:gax-go:v2.1.0:googleapis_gax_go_v2/vendor/github.com/googleapis/gax-go \
googleapis:google-api-go-client:v0.57.0:googleapis_google_api_go_client/vendor/google.golang.org/api \
googleapis:google-cloud-go:v0.94.1:googleapis_google_cloud_go/vendor/cloud.google.com/go \
+ googleapis:google-cloud-go:storage/v1.14.0:googleapis_google_cloud_go_storage \
gorilla:mux:v1.8.0:gorilla_mux/vendor/github.com/gorilla/mux \
gorilla:websocket:v1.4.2:gorilla_websocket/vendor/github.com/gorilla/websocket \
gosimple:slug:v1.9.0:gosimple_slug/vendor/github.com/gosimple/slug \
@@ -225,7 +226,7 @@ GH_TUPLE= \
stretchr:testify:v1.7.0:stretchr_testify/vendor/github.com/stretchr/testify \
teris-io:shortid:771a37caa5cf:teris_io_shortid/vendor/github.com/teris-io/shortid \
timberio:go-datemath:74ddef604fff:timberio_go_datemath/vendor/github.com/timberio/go-datemath \
- ua-parser:uap-go:daf92ba38329:ua_parser_uap_go/vendor/github.com/ua-parser/uap-go \
+ ua-parser:uap-go:00c877edfe0f:ua_parser_uap_go/vendor/github.com/ua-parser/uap-go \
uber-go:atomic:v1.9.0:uber_go_atomic/vendor/go.uber.org/atomic \
uber-go:goleak:v1.1.10:uber_go_goleak/vendor/go.uber.org/goleak \
uber:jaeger-client-go:v2.29.1:uber_jaeger_client_go/vendor/github.com/uber/jaeger-client-go \
@@ -239,13 +240,13 @@ GH_TUPLE= \
yudai:gojsondiff:v1.0.0:yudai_gojsondiff/vendor/github.com/yudai/gojsondiff \
yudai:golcs:ecda9a501e82:yudai_golcs/vendor/github.com/yudai/golcs
-post-extract:
+deps-post-extract:
@${RM} -r ${WRKSRC}/vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore
@${RM} -r ${WRKSRC}/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity
@${RM} -r ${WRKSRC}/vendor/github.com/Azure/azure-sdk-for-go/sdk/internal
- @${RLN} ${WRKSRC_azure_azure_sdk_for_go_azcore}/sdk/azcore ${WRKSRC}/vendor/github.com/Azure/azure-sdk-for-go/sdk/
- @${RLN} ${WRKSRC_azure_azure_sdk_for_go_azidentity}/sdk/azidentity ${WRKSRC}/vendor/github.com/Azure/azure-sdk-for-go/sdk/
- @${RLN} ${WRKSRC_azure_azure_sdk_for_go_internal}/sdk/internal ${WRKSRC}/vendor/github.com/Azure/azure-sdk-for-go/sdk/
+ @${RLN} ${WRKSRC_azure_azure_sdk_for_go_sdk_azcore}/sdk/azcore ${WRKSRC}/vendor/github.com/Azure/azure-sdk-for-go/sdk/
+ @${RLN} ${WRKSRC_azure_azure_sdk_for_go_sdk_azidentity}/sdk/azidentity ${WRKSRC}/vendor/github.com/Azure/azure-sdk-for-go/sdk/
+ @${RLN} ${WRKSRC_azure_azure_sdk_for_go_sdk_internal}/sdk/internal ${WRKSRC}/vendor/github.com/Azure/azure-sdk-for-go/sdk/
@${RM} -r ${WRKSRC}/vendor/github.com/Azure/go-autorest/autorest
@${RM} -r ${WRKSRC}/vendor/github.com/Azure/go-autorest/logger
@@ -262,7 +263,14 @@ post-extract:
@${RLN} ${WRKSRC_azure_go_autorest_autorest_to}/autorest/to ${WRKSRC}/vendor/github.com/Azure/go-autorest/autorest/
@${RLN} ${WRKSRC_azure_go_autorest_autorest_validation}/autorest/validation ${WRKSRC}/vendor/github.com/Azure/go-autorest/autorest/
+ @${RM} -r ${WRKSRC}/vendor/cloud.google.com/go/storage
+ @${RLN} ${WRKSRC_googleapis_google_cloud_go_storage}/storage ${WRKSRC}/vendor/cloud.google.com/go/
+
@${MKDIR} ${WRKSRC}/vendor/xorm.io
@${RLN} ${WRKDIR}/builder ${WRKSRC}/vendor/xorm.io/
@${RLN} ${WRKDIR}/core ${WRKSRC}/vendor/xorm.io/
@${RLN} ${WRKDIR}/xorm ${WRKSRC}/vendor/xorm.io/
+
+ @${RLN} ${WRKSRC}/pkg/macaron ${WRKSRC}/vendor/gopkg.in/macaron.v1
+ @${MKDIR} ${WRKSRC}/vendor/github.com/go-macaron
+ @${RLN} ${WRKSRC}/pkg/macaron/binding ${WRKSRC}/vendor/github.com/go-macaron/binding
diff --git a/www/grafana8/distinfo b/www/grafana8/distinfo
index 45fb1a3b6978..03b83f31b553 100644
--- a/www/grafana8/distinfo
+++ b/www/grafana8/distinfo
@@ -1,34 +1,38 @@
-TIMESTAMP = 1639496726
-SHA256 (grafana-8.3.3.linux-amd64.tar.gz) = 89428c520e004bcb9faf7618dd4c81ff62496064cbf2ead3e1b9dbcf476c6f18
-SIZE (grafana-8.3.3.linux-amd64.tar.gz) = 73009152
+TIMESTAMP = 1642616805
+SHA256 (grafana-8.3.4.linux-amd64.tar.gz) = 508f8da2e491c10566020c75f4e1e159ca032e3f4a0f4e71879effd602ef5a60
+SIZE (grafana-8.3.4.linux-amd64.tar.gz) = 72637765
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.3.3_GH0.tar.gz) = c79e19f056b9c2fc6d29c622edfaf8aff4985cec28ea6a9e74dce5eac077e735
-SIZE (grafana-grafana-v8.3.3_GH0.tar.gz) = 15827404
+SHA256 (grafana-grafana-v8.3.4_GH0.tar.gz) = 459f2d53fcaec87ccdeb9c7c26c7b14f2d9fac5fe85e5c93d80238fa5bca00ee
+SIZE (grafana-grafana-v8.3.4_GH0.tar.gz) = 15842435
SHA256 (Azure-azure-sdk-for-go-v57.1.0_GH0.tar.gz) = 3b1214d3ae8568ecba5c03f10b5a1fd700107fe00734d3563e529745ecbc547a
SIZE (Azure-azure-sdk-for-go-v57.1.0_GH0.tar.gz) = 42069618
-SHA256 (Azure-azure-sdk-for-go-bbf5386148eb_GH0.tar.gz) = d42808c32e5ca68fd09d15bb9f8ade356effd783fd66f2b77e6b53dcfa0083f1
-SIZE (Azure-azure-sdk-for-go-bbf5386148eb_GH0.tar.gz) = 41280133
-SHA256 (Azure-azure-sdk-for-go-af32bacab1a2_GH0.tar.gz) = ed9228909e731a7accbf2d8adb0236ae77c8e2ca7a24dc5bc4700e6531818244
-SIZE (Azure-azure-sdk-for-go-af32bacab1a2_GH0.tar.gz) = 42022430
-SHA256 (Azure-azure-sdk-for-go-1eb47c16ddfd_GH0.tar.gz) = 99ff08f5d07dffd4904aee6280f6255f3c3da4c563f3903e3704a1695b94d26c
-SIZE (Azure-azure-sdk-for-go-1eb47c16ddfd_GH0.tar.gz) = 41224090
+SHA256 (Azure-azure-sdk-for-go-sdk-azcore-v0.19.0_GH0.tar.gz) = 0be1c3ee49e6ce8c5607a5aadee2f610a07899db8ff1dd80deb9eb20fce379c0
+SIZE (Azure-azure-sdk-for-go-sdk-azcore-v0.19.0_GH0.tar.gz) = 41282263
+SHA256 (Azure-azure-sdk-for-go-sdk-azidentity-v0.10.0_GH0.tar.gz) = 92d6e3ea7b4401611076678b9f42e5f7fb2eb892effc41ae34c0ddffc79d0956
+SIZE (Azure-azure-sdk-for-go-sdk-azidentity-v0.10.0_GH0.tar.gz) = 42025689
+SHA256 (Azure-azure-sdk-for-go-sdk-internal-v0.7.0_GH0.tar.gz) = 061fb69d552ad72792d22c67e35750c0429e6ef470be1d7f6055f86d6840d448
+SIZE (Azure-azure-sdk-for-go-sdk-internal-v0.7.0_GH0.tar.gz) = 41226094
SHA256 (Azure-go-autorest-v14.2.0_GH0.tar.gz) = d0db0e47112570e3f2bd2e38ae56338f1e74625dd4cb553007082fdad5fd844d
SIZE (Azure-go-autorest-v14.2.0_GH0.tar.gz) = 167851
-SHA256 (Azure-go-autorest-3ddafdd73fe9_GH0.tar.gz) = 1555919ff9dbfa13b68e81dcc45c4bf8bdef5afe1b363fca2c2625def8c07de1
-SIZE (Azure-go-autorest-3ddafdd73fe9_GH0.tar.gz) = 176650
-SHA256 (Azure-go-autorest-4e2e1bb52ffb_GH0.tar.gz) = f490eae213fa67895cee27f8724a64bbc359361233326b5134dfcb3fdd9e91d5
-SIZE (Azure-go-autorest-4e2e1bb52ffb_GH0.tar.gz) = 172343
-SHA256 (Azure-go-autorest-b3a0b30a7423_GH0.tar.gz) = 51b31571a26a5287eb67251aa69407bb6145f58253bdbb2e610b7eab7b0d762f
-SIZE (Azure-go-autorest-b3a0b30a7423_GH0.tar.gz) = 167123
-SHA256 (Azure-go-autorest-446f41b7d65b_GH0.tar.gz) = 883e2603529a907a3da25d5e2389ab6473a80e6d79daf0d9ffc6385494e0da0a
-SIZE (Azure-go-autorest-446f41b7d65b_GH0.tar.gz) = 171840
-SHA256 (Azure-go-autorest-820a319d2214_GH0.tar.gz) = c44aa105a0ea462395888b7c3fb50dcb7be5ae07d74906b23ec4484eacecc27a
-SIZE (Azure-go-autorest-820a319d2214_GH0.tar.gz) = 175097
+SHA256 (Azure-go-autorest-autorest-v0.11.20_GH0.tar.gz) = cc0fc40a942d6f087d52a20dca161dff6f1ef9b538a4c07dc0e19bf9fd566143
+SIZE (Azure-go-autorest-autorest-v0.11.20_GH0.tar.gz) = 176641
+SHA256 (Azure-go-autorest-autorest-adal-v0.9.15_GH0.tar.gz) = f456d55c7c6898ea32e3934986d4ce50ee63d4d6c1775b54f4024677409d037f
+SIZE (Azure-go-autorest-autorest-adal-v0.9.15_GH0.tar.gz) = 172332
+SHA256 (Azure-go-autorest-autorest-date-v0.3.0_GH0.tar.gz) = 1275dc111fca78bd532c4e1d42d6cde1b8adfd9a99b838bdf4b6b6b48cf18cf6
+SIZE (Azure-go-autorest-autorest-date-v0.3.0_GH0.tar.gz) = 167106
+SHA256 (Azure-go-autorest-autorest-to-v0.4.0_GH0.tar.gz) = 6544a80ae31ff5183ef4c258b9d70023b8f1bbfbe83b7965966714e956c81bd6
+SIZE (Azure-go-autorest-autorest-to-v0.4.0_GH0.tar.gz) = 167116
+SHA256 (Azure-go-autorest-autorest-validation-v0.3.1_GH0.tar.gz) = a1c83de4f8aa133d4abed29eebbedadbe72f355b4b85f3365bb35918f90291cb
+SIZE (Azure-go-autorest-autorest-validation-v0.3.1_GH0.tar.gz) = 171808
+SHA256 (Azure-go-autorest-logger-v0.2.1_GH0.tar.gz) = fac35805dc320638a322b407c0cd0c471932a4855e9ef0485c85e533af8146dc
+SIZE (Azure-go-autorest-logger-v0.2.1_GH0.tar.gz) = 175062
+SHA256 (Azure-go-autorest-tracing-v0.6.0_GH0.tar.gz) = b43cd0127dd6e91debe1eb98873e219817b71c10988d0a6c550e4ad19a29a8ea
+SIZE (Azure-go-autorest-tracing-v0.6.0_GH0.tar.gz) = 167113
SHA256 (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 6593da894578ba510a470735ffbdc88ce88033094dc5a8f4d3957ab87e18803f
SIZE (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 42077
SHA256 (FZambia-eagle-v0.0.1_GH0.tar.gz) = dc2dd0e2e582a2c8e8c7fadab6d1456b9ff2d15fe7c5a8e54986c0d961a200f1
@@ -239,6 +243,8 @@ SHA256 (googleapis-google-api-go-client-v0.57.0_GH0.tar.gz) = 65f42dd3c69e17a02a
SIZE (googleapis-google-api-go-client-v0.57.0_GH0.tar.gz) = 22046362
SHA256 (googleapis-google-cloud-go-v0.94.1_GH0.tar.gz) = 75a5df2590374fef8606cb5aa9c8adb3565d0779c48454ab7b66dffe456feef0
SIZE (googleapis-google-cloud-go-v0.94.1_GH0.tar.gz) = 6296927
+SHA256 (googleapis-google-cloud-go-storage-v1.14.0_GH0.tar.gz) = 368e85de49d201a1a7f7da58f597c5904a6665b733315b9b22eee9397dfe9bfe
+SIZE (googleapis-google-cloud-go-storage-v1.14.0_GH0.tar.gz) = 3404588
SHA256 (gorilla-mux-v1.8.0_GH0.tar.gz) = ea2639259d2ce6f402636655e91eb93ba69c139e3cbf80b044ee393ada53757b
SIZE (gorilla-mux-v1.8.0_GH0.tar.gz) = 45517
SHA256 (gorilla-websocket-v1.4.2_GH0.tar.gz) = 91937a36bc9e0da3c895c73d4cb74b2cdb1aff54ab21b0d0724000e7b5b85b84
@@ -445,8 +451,8 @@ SHA256 (teris-io-shortid-771a37caa5cf_GH0.tar.gz) = 79146ef4720e5afc1548c4953e0c
SIZE (teris-io-shortid-771a37caa5cf_GH0.tar.gz) = 8667
SHA256 (timberio-go-datemath-74ddef604fff_GH0.tar.gz) = f588657a4719a9bfeee27c7ef3a92dbec32d29f63dfc093b92f2c6351d5a8863
SIZE (timberio-go-datemath-74ddef604fff_GH0.tar.gz) = 14165
-SHA256 (ua-parser-uap-go-daf92ba38329_GH0.tar.gz) = 459974bd7f40b3fc102843842f0e87e4632da5bc842820e7e75e782df96a2095
-SIZE (ua-parser-uap-go-daf92ba38329_GH0.tar.gz) = 2639501
+SHA256 (ua-parser-uap-go-00c877edfe0f_GH0.tar.gz) = 70146f5f7f1e1f076b6af02e90d4b41d405abca9c3eca752009ba6b03c6256d2
+SIZE (ua-parser-uap-go-00c877edfe0f_GH0.tar.gz) = 2641629
SHA256 (uber-go-atomic-v1.9.0_GH0.tar.gz) = a6b11bb77c479298cdfdfdf2132975dbd975322b619451378cbdf731facd874a
SIZE (uber-go-atomic-v1.9.0_GH0.tar.gz) = 21331
SHA256 (uber-go-goleak-v1.1.10_GH0.tar.gz) = 99ccfd2270aebb09e5c1693094d1da5f47be09689fd515b623657f75e6dc2c40
diff --git a/www/grafana8/pkg-plist b/www/grafana8/pkg-plist
index df80a7849983..7aeae8ab8d7e 100644
--- a/www/grafana8/pkg-plist
+++ b/www/grafana8/pkg-plist
@@ -2,6 +2,13 @@ bin/grafana-cli
bin/grafana-server
@sample %%ETCDIR%%/grafana.ini.sample
%%DATADIR%%/conf/defaults.ini
+%%DATADIR%%/plugins-bundled/internal/input-datasource/MANIFEST.txt
+%%DATADIR%%/plugins-bundled/internal/input-datasource/README.md
+%%DATADIR%%/plugins-bundled/internal/input-datasource/img/input.svg
+%%DATADIR%%/plugins-bundled/internal/input-datasource/module.js
+%%DATADIR%%/plugins-bundled/internal/input-datasource/module.js.LICENSE.txt
+%%DATADIR%%/plugins-bundled/internal/input-datasource/module.js.map
+%%DATADIR%%/plugins-bundled/internal/input-datasource/plugin.json
%%DATADIR%%/public/app/AppWrapper.tsx
%%DATADIR%%/public/app/angular/AngularApp.ts
%%DATADIR%%/public/app/angular/AngularLocationWrapper.test.ts
@@ -96,11 +103,6 @@ bin/grafana-server
%%DATADIR%%/public/app/core/components/ForgottenPassword/ForgottenPassword.tsx
%%DATADIR%%/public/app/core/components/ForgottenPassword/SendResetMailPage.test.tsx
%%DATADIR%%/public/app/core/components/ForgottenPassword/SendResetMailPage.tsx
-%%DATADIR%%/public/app/core/components/Layers/AddLayerButton.tsx
-%%DATADIR%%/public/app/core/components/Layers/LayerDragDropList.tsx
-%%DATADIR%%/public/app/core/components/Layers/LayerName.test.tsx
-%%DATADIR%%/public/app/core/components/Layers/LayerName.tsx
-%%DATADIR%%/public/app/core/components/Layers/types.ts
%%DATADIR%%/public/app/core/components/LocalStorageValueProvider/LocalStorageValueProvider.tsx
%%DATADIR%%/public/app/core/components/LocalStorageValueProvider/index.tsx
%%DATADIR%%/public/app/core/components/Login/LoginCtrl.tsx
@@ -116,10 +118,6 @@ bin/grafana-server
%%DATADIR%%/public/app/core/components/NavBar/NavBarDropdown.tsx
%%DATADIR%%/public/app/core/components/NavBar/NavBarItem.test.tsx
%%DATADIR%%/public/app/core/components/NavBar/NavBarItem.tsx
-%%DATADIR%%/public/app/core/components/NavBar/NavBarItemMenu.tsx
-%%DATADIR%%/public/app/core/components/NavBar/NavBarItemMenuItem.tsx
-%%DATADIR%%/public/app/core/components/NavBar/NavBarItemMenuTrigger.tsx
-%%DATADIR%%/public/app/core/components/NavBar/NavBarItemWithoutMenu.tsx
%%DATADIR%%/public/app/core/components/NavBar/NavBarMenu.test.tsx
%%DATADIR%%/public/app/core/components/NavBar/NavBarMenu.tsx
%%DATADIR%%/public/app/core/components/NavBar/NavBarMenuItem.test.tsx
@@ -127,7 +125,6 @@ bin/grafana-server
%%DATADIR%%/public/app/core/components/NavBar/NavBarNext.test.tsx
%%DATADIR%%/public/app/core/components/NavBar/NavBarNext.tsx
%%DATADIR%%/public/app/core/components/NavBar/NavBarSection.tsx
-%%DATADIR%%/public/app/core/components/NavBar/context.tsx
%%DATADIR%%/public/app/core/components/NavBar/utils.test.ts
%%DATADIR%%/public/app/core/components/NavBar/utils.ts
%%DATADIR%%/public/app/core/components/NodeGraphSettings.tsx
@@ -456,6 +453,8 @@ bin/grafana-server
%%DATADIR%%/public/app/features/alerting/unified/Silences.test.tsx
%%DATADIR%%/public/app/features/alerting/unified/Silences.tsx
%%DATADIR%%/public/app/features/alerting/unified/api/alertmanager.ts
+%%DATADIR%%/public/app/features/alerting/unified/api/annotations.test.ts
+%%DATADIR%%/public/app/features/alerting/unified/api/annotations.ts
%%DATADIR%%/public/app/features/alerting/unified/api/grafana.ts
%%DATADIR%%/public/app/features/alerting/unified/api/preview.ts
%%DATADIR%%/public/app/features/alerting/unified/api/prometheus.ts
@@ -558,7 +557,6 @@ bin/grafana-server
%%DATADIR%%/public/app/features/alerting/unified/components/rules/ActionButton.tsx
%%DATADIR%%/public/app/features/alerting/unified/components/rules/ActionIcon.tsx
%%DATADIR%%/public/app/features/alerting/unified/components/rules/AlertInstanceDetails.tsx
-%%DATADIR%%/public/app/features/alerting/unified/components/rules/AlertInstanceStateFilter.tsx
%%DATADIR%%/public/app/features/alerting/unified/components/rules/AlertInstancesTable.tsx
%%DATADIR%%/public/app/features/alerting/unified/components/rules/AlertStateTag.tsx
%%DATADIR%%/public/app/features/alerting/unified/components/rules/CloudRules.tsx
@@ -581,6 +579,7 @@ bin/grafana-server
%%DATADIR%%/public/app/features/alerting/unified/components/rules/RulesFilter.tsx
%%DATADIR%%/public/app/features/alerting/unified/components/rules/RulesGroup.tsx
%%DATADIR%%/public/app/features/alerting/unified/components/rules/RulesTable.tsx
+%%DATADIR%%/public/app/features/alerting/unified/components/rules/StateHistory.tsx
%%DATADIR%%/public/app/features/alerting/unified/components/silences/AmAlertStateTag.tsx
%%DATADIR%%/public/app/features/alerting/unified/components/silences/Matchers.tsx
%%DATADIR%%/public/app/features/alerting/unified/components/silences/MatchersField.tsx
@@ -606,8 +605,11 @@ bin/grafana-server
%%DATADIR%%/public/app/features/alerting/unified/hooks/useGroupedAlerts.ts
%%DATADIR%%/public/app/features/alerting/unified/hooks/useHasRuler.ts
%%DATADIR%%/public/app/features/alerting/unified/hooks/useIsRuleEditable.ts
+%%DATADIR%%/public/app/features/alerting/unified/hooks/useManagedAlertStateHistory.ts
%%DATADIR%%/public/app/features/alerting/unified/hooks/usePanelCombinedRules.ts
%%DATADIR%%/public/app/features/alerting/unified/hooks/useRuleSourcesWithRuler.ts
+%%DATADIR%%/public/app/features/alerting/unified/hooks/useStateHistoryModal.tsx
+%%DATADIR%%/public/app/features/alerting/unified/hooks/useURLSearchParams.ts
%%DATADIR%%/public/app/features/alerting/unified/hooks/useUnifiedAlertingSelector.ts
%%DATADIR%%/public/app/features/alerting/unified/hooks/useVizHeight.ts
%%DATADIR%%/public/app/features/alerting/unified/mocks.ts
@@ -632,8 +634,8 @@ bin/grafana-server
%%DATADIR%%/public/app/features/alerting/unified/utils/constants.ts
%%DATADIR%%/public/app/features/alerting/unified/utils/datasource.ts
%%DATADIR%%/public/app/features/alerting/unified/utils/dynamicTable.ts
+%%DATADIR%%/public/app/features/alerting/unified/utils/matchers.test.ts
%%DATADIR%%/public/app/features/alerting/unified/utils/matchers.ts
-%%DATADIR%%/public/app/features/alerting/unified/utils/misc.test.ts
%%DATADIR%%/public/app/features/alerting/unified/utils/misc.ts
%%DATADIR%%/public/app/features/alerting/unified/utils/query.test.ts
%%DATADIR%%/public/app/features/alerting/unified/utils/query.ts
@@ -844,7 +846,6 @@ bin/grafana-server
%%DATADIR%%/public/app/features/dashboard/dashgrid/DashboardGrid.test.tsx
%%DATADIR%%/public/app/features/dashboard/dashgrid/DashboardGrid.tsx
%%DATADIR%%/public/app/features/dashboard/dashgrid/DashboardPanel.tsx
-%%DATADIR%%/public/app/features/dashboard/dashgrid/LazyLoader.tsx
%%DATADIR%%/public/app/features/dashboard/dashgrid/PanelChrome.test.tsx
%%DATADIR%%/public/app/features/dashboard/dashgrid/PanelChrome.tsx
%%DATADIR%%/public/app/features/dashboard/dashgrid/PanelChromeAngular.tsx
@@ -1151,6 +1152,7 @@ bin/grafana-server
%%DATADIR%%/public/app/features/manage-dashboards/components/SnapshotListTable.test.tsx
%%DATADIR%%/public/app/features/manage-dashboards/components/SnapshotListTable.tsx
%%DATADIR%%/public/app/features/manage-dashboards/services/ValidationSrv.ts
+%%DATADIR%%/public/app/features/manage-dashboards/state/actions.test.ts
%%DATADIR%%/public/app/features/manage-dashboards/state/actions.ts
%%DATADIR%%/public/app/features/manage-dashboards/state/reducers.test.ts
%%DATADIR%%/public/app/features/manage-dashboards/state/reducers.ts
@@ -1348,7 +1350,6 @@ bin/grafana-server
%%DATADIR%%/public/app/features/query/state/types.ts
%%DATADIR%%/public/app/features/query/state/updateQueries.test.ts
%%DATADIR%%/public/app/features/query/state/updateQueries.ts
-%%DATADIR%%/public/app/features/runtime/init.ts
%%DATADIR%%/public/app/features/sandbox/BenchmarksPage.tsx
%%DATADIR%%/public/app/features/sandbox/TestStuffPage.tsx
%%DATADIR%%/public/app/features/search/components/ActionRow.tsx
@@ -1482,7 +1483,6 @@ bin/grafana-server
%%DATADIR%%/public/app/features/variables/editor/VariableEditorContainer.tsx
%%DATADIR%%/public/app/features/variables/editor/VariableEditorEditor.tsx
%%DATADIR%%/public/app/features/variables/editor/VariableEditorList.tsx
-%%DATADIR%%/public/app/features/variables/editor/VariableEditorListRow.tsx
%%DATADIR%%/public/app/features/variables/editor/VariableHideSelect.tsx
%%DATADIR%%/public/app/features/variables/editor/VariableSectionHeader.tsx
%%DATADIR%%/public/app/features/variables/editor/VariableSelectField.tsx
@@ -1564,6 +1564,8 @@ bin/grafana-server
%%DATADIR%%/public/app/features/variables/state/actions.test.ts
%%DATADIR%%/public/app/features/variables/state/actions.ts
%%DATADIR%%/public/app/features/variables/state/helpers.ts
+%%DATADIR%%/public/app/features/variables/state/initVariableTransaction.test.ts
+%%DATADIR%%/public/app/features/variables/state/migrateVariablesDatasourceNameToRef.test.ts
%%DATADIR%%/public/app/features/variables/state/onTimeRangeUpdated.test.ts
%%DATADIR%%/public/app/features/variables/state/processVariable.test.ts
%%DATADIR%%/public/app/features/variables/state/reducers.test.ts
@@ -2095,6 +2097,7 @@ bin/grafana-server
%%DATADIR%%/public/app/plugins/datasource/influxdb/components/RawInfluxQLEditor.tsx
%%DATADIR%%/public/app/plugins/datasource/influxdb/components/VariableQueryEditor.tsx
%%DATADIR%%/public/app/plugins/datasource/influxdb/components/VisualInfluxQLEditor/AddButton.tsx
+%%DATADIR%%/public/app/plugins/datasource/influxdb/components/VisualInfluxQLEditor/Editor.tags.test.tsx
%%DATADIR%%/public/app/plugins/datasource/influxdb/components/VisualInfluxQLEditor/Editor.test.tsx
%%DATADIR%%/public/app/plugins/datasource/influxdb/components/VisualInfluxQLEditor/Editor.tsx
%%DATADIR%%/public/app/plugins/datasource/influxdb/components/VisualInfluxQLEditor/FormatAsSection.tsx
@@ -2259,6 +2262,7 @@ bin/grafana-server
%%DATADIR%%/public/app/plugins/datasource/opentsdb/types.ts
%%DATADIR%%/public/app/plugins/datasource/postgres/README.md
%%DATADIR%%/public/app/plugins/datasource/postgres/config_ctrl.ts
+%%DATADIR%%/public/app/plugins/datasource/postgres/datasource.test.ts
%%DATADIR%%/public/app/plugins/datasource/postgres/datasource.ts
%%DATADIR%%/public/app/plugins/datasource/postgres/img/postgresql_logo.svg
%%DATADIR%%/public/app/plugins/datasource/postgres/meta_query.ts
@@ -2377,7 +2381,6 @@ bin/grafana-server
%%DATADIR%%/public/app/plugins/datasource/testdata/components/NodeGraphEditor.tsx
%%DATADIR%%/public/app/plugins/datasource/testdata/components/PredictablePulseEditor.tsx
%%DATADIR%%/public/app/plugins/datasource/testdata/components/RandomWalkEditor.tsx
-%%DATADIR%%/public/app/plugins/datasource/testdata/components/RawFrameEditor.tsx
%%DATADIR%%/public/app/plugins/datasource/testdata/components/StreamingClientEditor.tsx
%%DATADIR%%/public/app/plugins/datasource/testdata/components/USAQueryEditor.tsx
%%DATADIR%%/public/app/plugins/datasource/testdata/components/index.ts
@@ -2526,7 +2529,6 @@ bin/grafana-server
%%DATADIR%%/public/app/plugins/panel/geomap/components/ObservablePropsWrapper.tsx
%%DATADIR%%/public/app/plugins/panel/geomap/editor/GazetteerPathEditor.tsx
%%DATADIR%%/public/app/plugins/panel/geomap/editor/GeomapStyleRulesEditor.tsx
-%%DATADIR%%/public/app/plugins/panel/geomap/editor/LayersEditor.tsx
%%DATADIR%%/public/app/plugins/panel/geomap/editor/LayersEditor/AddLayerButton.tsx
%%DATADIR%%/public/app/plugins/panel/geomap/editor/LayersEditor/LayerHeader.test.tsx
%%DATADIR%%/public/app/plugins/panel/geomap/editor/LayersEditor/LayerHeader.tsx
@@ -2944,6 +2946,8 @@ bin/grafana-server
%%DATADIR%%/public/build/2178.%%GRAFANA_BUILDHASH%%.js.map
%%DATADIR%%/public/build/2293.%%GRAFANA_BUILDHASH%%.js
%%DATADIR%%/public/build/2293.%%GRAFANA_BUILDHASH%%.js.map
+%%DATADIR%%/public/build/2502.%%GRAFANA_BUILDHASH%%.js
+%%DATADIR%%/public/build/2502.%%GRAFANA_BUILDHASH%%.js.map
%%DATADIR%%/public/build/2762.%%GRAFANA_BUILDHASH%%.js
%%DATADIR%%/public/build/2762.%%GRAFANA_BUILDHASH%%.js.map
%%DATADIR%%/public/build/2795.%%GRAFANA_BUILDHASH%%.js
@@ -2952,8 +2956,6 @@ bin/grafana-server
%%DATADIR%%/public/build/2907.%%GRAFANA_BUILDHASH%%.js.map
%%DATADIR%%/public/build/2909.%%GRAFANA_BUILDHASH%%.js
%%DATADIR%%/public/build/2909.%%GRAFANA_BUILDHASH%%.js.map
-%%DATADIR%%/public/build/3009.%%GRAFANA_BUILDHASH%%.js
-%%DATADIR%%/public/build/3009.%%GRAFANA_BUILDHASH%%.js.map
%%DATADIR%%/public/build/3020.%%GRAFANA_BUILDHASH%%.js
%%DATADIR%%/public/build/3020.%%GRAFANA_BUILDHASH%%.js.map
%%DATADIR%%/public/build/3038.%%GRAFANA_BUILDHASH%%.js
@@ -2984,6 +2986,8 @@ bin/grafana-server
%%DATADIR%%/public/build/3853.%%GRAFANA_BUILDHASH%%.js.map
%%DATADIR%%/public/build/4017.%%GRAFANA_BUILDHASH%%.js
%%DATADIR%%/public/build/4017.%%GRAFANA_BUILDHASH%%.js.map
+%%DATADIR%%/public/build/4057.%%GRAFANA_BUILDHASH%%.js
+%%DATADIR%%/public/build/4057.%%GRAFANA_BUILDHASH%%.js.map
%%DATADIR%%/public/build/4079.%%GRAFANA_BUILDHASH%%.js
%%DATADIR%%/public/build/4079.%%GRAFANA_BUILDHASH%%.js.map
%%DATADIR%%/public/build/41f151d7bcbd0600c696.ttf
@@ -3014,6 +3018,9 @@ bin/grafana-server
%%DATADIR%%/public/build/487.%%GRAFANA_BUILDHASH%%.js.map
%%DATADIR%%/public/build/4939.%%GRAFANA_BUILDHASH%%.js
%%DATADIR%%/public/build/4939.%%GRAFANA_BUILDHASH%%.js.map
+%%DATADIR%%/public/build/5105.%%GRAFANA_BUILDHASH%%.js
+%%DATADIR%%/public/build/5105.%%GRAFANA_BUILDHASH%%.js.LICENSE.txt
+%%DATADIR%%/public/build/5105.%%GRAFANA_BUILDHASH%%.js.map
%%DATADIR%%/public/build/519.%%GRAFANA_BUILDHASH%%.js
%%DATADIR%%/public/build/519.%%GRAFANA_BUILDHASH%%.js.map
%%DATADIR%%/public/build/5276.%%GRAFANA_BUILDHASH%%.js
@@ -3034,13 +3041,12 @@ bin/grafana-server
%%DATADIR%%/public/build/5902.%%GRAFANA_BUILDHASH%%.js.map
%%DATADIR%%/public/build/6146.%%GRAFANA_BUILDHASH%%.js
%%DATADIR%%/public/build/6146.%%GRAFANA_BUILDHASH%%.js.map
+%%DATADIR%%/public/build/6220.%%GRAFANA_BUILDHASH%%.js
+%%DATADIR%%/public/build/6220.%%GRAFANA_BUILDHASH%%.js.map
%%DATADIR%%/public/build/6223.%%GRAFANA_BUILDHASH%%.js
%%DATADIR%%/public/build/6223.%%GRAFANA_BUILDHASH%%.js.map
%%DATADIR%%/public/build/6278.%%GRAFANA_BUILDHASH%%.js
%%DATADIR%%/public/build/6278.%%GRAFANA_BUILDHASH%%.js.map
-%%DATADIR%%/public/build/633.%%GRAFANA_BUILDHASH%%.js
-%%DATADIR%%/public/build/633.%%GRAFANA_BUILDHASH%%.js.LICENSE.txt
-%%DATADIR%%/public/build/633.%%GRAFANA_BUILDHASH%%.js.map
%%DATADIR%%/public/build/6449.%%GRAFANA_BUILDHASH%%.js
%%DATADIR%%/public/build/6449.%%GRAFANA_BUILDHASH%%.js.map
%%DATADIR%%/public/build/6647.%%GRAFANA_BUILDHASH%%.js
@@ -3058,8 +3064,6 @@ bin/grafana-server
%%DATADIR%%/public/build/686.%%GRAFANA_BUILDHASH%%.js
%%DATADIR%%/public/build/686.%%GRAFANA_BUILDHASH%%.js.LICENSE.txt
%%DATADIR%%/public/build/686.%%GRAFANA_BUILDHASH%%.js.map
-%%DATADIR%%/public/build/6886.%%GRAFANA_BUILDHASH%%.js
-%%DATADIR%%/public/build/6886.%%GRAFANA_BUILDHASH%%.js.map
%%DATADIR%%/public/build/6899.%%GRAFANA_BUILDHASH%%.js
%%DATADIR%%/public/build/6899.%%GRAFANA_BUILDHASH%%.js.map
%%DATADIR%%/public/build/707.%%GRAFANA_BUILDHASH%%.js
@@ -3109,8 +3113,6 @@ bin/grafana-server
%%DATADIR%%/public/build/8631.%%GRAFANA_BUILDHASH%%.js.map
%%DATADIR%%/public/build/8658.%%GRAFANA_BUILDHASH%%.js
%%DATADIR%%/public/build/8658.%%GRAFANA_BUILDHASH%%.js.map
-%%DATADIR%%/public/build/8672.%%GRAFANA_BUILDHASH%%.js
-%%DATADIR%%/public/build/8672.%%GRAFANA_BUILDHASH%%.js.map
%%DATADIR%%/public/build/8841.%%GRAFANA_BUILDHASH%%.js
%%DATADIR%%/public/build/8841.%%GRAFANA_BUILDHASH%%.js.map
%%DATADIR%%/public/build/8970.%%GRAFANA_BUILDHASH%%.js
@@ -3332,7 +3334,6 @@ bin/grafana-server
%%DATADIR%%/public/dashboards/scripted_async.js
%%DATADIR%%/public/dashboards/scripted_templated.js
%%DATADIR%%/public/dashboards/template_vars.json
-%%DATADIR%%/public/dist/tsconfig.tsbuildinfo
%%DATADIR%%/public/emails/README.md
%%DATADIR%%/public/emails/alert_notification.html
%%DATADIR%%/public/emails/alert_notification.txt
@@ -3433,8 +3434,6 @@ bin/grafana-server
%%DATADIR%%/public/img/grafana_mask_icon.svg
%%DATADIR%%/public/img/grafana_mask_icon_white.svg
%%DATADIR%%/public/img/grafana_net_logo.svg
-%%DATADIR%%/public/img/grafana_text_logo-dark.svg
-%%DATADIR%%/public/img/grafana_text_logo-light.svg
%%DATADIR%%/public/img/grafana_typelogo.svg
%%DATADIR%%/public/img/grafanaconline.png
%%DATADIR%%/public/img/graph404.svg