Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 29 Mar 2021 18:54:00 +0000 (UTC)
From:      Neel Chauhan <nc@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r569497 - in head/www/grafana7: . files
Message-ID:  <202103291854.12TIs0lY006943@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: nc
Date: Mon Mar 29 18:53:59 2021
New Revision: 569497
URL: https://svnweb.freebsd.org/changeset/ports/569497

Log:
  www/grafana7: Update to 7.5.1
  
  Changes: https://grafana.com/docs/grafana/latest/whatsnew/whats-new-in-v7-5/
  
  PR:		254575
  Submitted by:	Boris Korzun <drtr0jan AT yandex DOT ru>
  Approved by:	robsonmantovani AT gmail DOT com (maintainer)

Modified:
  head/www/grafana7/Makefile
  head/www/grafana7/distinfo
  head/www/grafana7/files/grafana.conf.in
  head/www/grafana7/pkg-plist

Modified: head/www/grafana7/Makefile
==============================================================================
--- head/www/grafana7/Makefile	Mon Mar 29 18:50:27 2021	(r569496)
+++ head/www/grafana7/Makefile	Mon Mar 29 18:53:59 2021	(r569497)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	grafana
-PORTVERSION=	7.4.0
+PORTVERSION=	7.5.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www
 MASTER_SITES+=	https://dl.grafana.com/oss/release/:public \
@@ -12,7 +12,7 @@ PKGNAMESUFFIX=	${PORTVERSION:C/([0-9]).*/\1/1}
 DISTFILES=	grafana-${PORTVERSION}.linux-amd64${EXTRACT_SUFX}:public \
 		v0.3.6${EXTRACT_SUFX}:builder \
 		v0.7.3${EXTRACT_SUFX}:core \
-		v0.8.1${EXTRACT_SUFX}:xorm
+		v0.8.2${EXTRACT_SUFX}:xorm
 
 MAINTAINER=	robsonmantovani@gmail.com
 COMMENT=	Dashboard and graph editor for multiple data stores
@@ -25,11 +25,6 @@ ONLY_FOR_ARCHS=	aarch64 amd64 i386
 USES=		go:modules
 
 USE_GITHUB=	yes
-TAG=		aee1438
-
-GO_TARGET=	./pkg/cmd/grafana-server \
-		./pkg/cmd/grafana-cli
-GO_BUILDFLAGS=	-ldflags="-w -X main.version=${PORTVERSION} -X main.commit=${TAG}"
 GH_TUPLE=	\
 		BurntSushi:toml:v0.3.1:burntsushi_toml/vendor/github.com/BurntSushi/toml \
 		FZambia:eagle:v0.0.1:fzambia_eagle/vendor/github.com/FZambia/eagle \
@@ -37,7 +32,8 @@ GH_TUPLE=	\
 		VividCortex:mysqlerr:6c6b55f8796f:vividcortex_mysqlerr/vendor/github.com/VividCortex/mysqlerr \
 		alexcesaro:quotedprintable:2caba252f4dc:alexcesaro_quotedprintable/vendor/gopkg.in/alexcesaro/quotedprintable.v3 \
 		apache:arrow:68b1273cbbf7:apache_arrow_arrow/vendor/github.com/apache/arrow \
-		aws:aws-sdk-go:v1.35.5:aws_aws_sdk_go/vendor/github.com/aws/aws-sdk-go \
+		apache:thrift:v0.13.0:apache_thrift/vendor/github.com/apache/thrift \
+		aws:aws-sdk-go:v1.37.20:aws_aws_sdk_go/vendor/github.com/aws/aws-sdk-go \
 		beevik:etree:v1.1.0:beevik_etree/vendor/github.com/beevik/etree \
 		benbjohnson:clock:7dc76406b6d3:benbjohnson_clock/vendor/github.com/benbjohnson/clock \
 		beorn7:perks:v1.0.1:beorn7_perks/vendor/github.com/beorn7/perks \
@@ -55,6 +51,8 @@ GH_TUPLE=	\
 		davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
 		deepmap:oapi-codegen:v1.3.13:deepmap_oapi_codegen/vendor/github.com/deepmap/oapi-codegen \
 		denisenkom:go-mssqldb:1e08a3fab204:denisenkom_go_mssqldb_1/vendor/github.com/denisenkom/go-mssqldb \
+		dustin:go-humanize:v1.0.0:dustin_go_humanize/vendor/github.com/dustin/go-humanize \
+		edsrzf:mmap-go:v1.0.0:edsrzf_mmap_go/vendor/github.com/edsrzf/mmap-go \
 		facebookgo:ensure:b4ab57deab51:facebookgo_ensure/vendor/github.com/facebookgo/ensure \
 		facebookgo:inject:f23751cae28b:facebookgo_inject/vendor/github.com/facebookgo/inject \
 		facebookgo:stack:751773369052:facebookgo_stack/vendor/github.com/facebookgo/stack \
@@ -63,63 +61,66 @@ GH_TUPLE=	\
 		fatih:color:v1.10.0:fatih_color/vendor/github.com/fatih/color \
 		felixge:httpsnoop:v1.0.1:felixge_httpsnoop/vendor/github.com/felixge/httpsnoop \
 		gchaincl:sqlhooks:v1.3.0:gchaincl_sqlhooks/vendor/github.com/gchaincl/sqlhooks \
-		getsentry:sentry-go:v0.9.0:getsentry_sentry_go/vendor/github.com/getsentry/sentry-go \
+		getsentry:sentry-go:v0.10.0:getsentry_sentry_go/vendor/github.com/getsentry/sentry-go \
 		go-asn1-ber:asn1-ber:f715ec2f112d:go_asn1_ber_asn1_ber/vendor/gopkg.in/asn1-ber.v1 \
-		go-ini:ini:v1.57.0:go_ini_ini/vendor/gopkg.in/ini.v1 \
+		go-ini:ini:v1.62.0:go_ini_ini/vendor/gopkg.in/ini.v1 \
 		go-ldap:ldap:v3.0.2:go_ldap_ldap/vendor/gopkg.in/ldap.v3 \
 		go-kit:kit:v0.10.0:go_kit_kit/vendor/github.com/go-kit/kit \
 		go-logfmt:logfmt:v0.5.0:go_logfmt_logfmt/vendor/github.com/go-logfmt/logfmt \
 		go-macaron:binding:0b4f37bab25b:go_macaron_binding/vendor/github.com/go-macaron/binding \
 		go-macaron:gzip:cad1c6580a07:go_macaron_gzip/vendor/github.com/go-macaron/gzip \
 		go-macaron:inject:d8a0b8677191:go_macaron_inject/vendor/github.com/go-macaron/inject \
-		go-macaron:macaron:v1.3.9:go_macaron_macaron/vendor/gopkg.in/macaron.v1 \
+		go-macaron:macaron:v1.4.0:go_macaron_macaron/vendor/gopkg.in/macaron.v1 \
 		go-mail:mail:v2.3.1:go_mail_mail/vendor/gopkg.in/mail.v2 \
 		go-redis:redis:v5.2.9:go_redis_redis/vendor/gopkg.in/redis.v5 \
+		go-sourcemap:sourcemap:v2.1.3:go_sourcemap_sourcemap/vendor/github.com/go-sourcemap/sourcemap \
 		go-sql-driver:mysql:v1.5.0:go_sql_driver_mysql/vendor/github.com/go-sql-driver/mysql \
 		go-stack:stack:v1.8.0:go_stack_stack/vendor/github.com/go-stack/stack \
 		go-yaml:yaml:eeeca48fe776:go_yaml_yaml_1/vendor/gopkg.in/yaml.v3 \
-		go-yaml:yaml:v2.3.0:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
+		go-yaml:yaml:v2.4.0:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
 		gobwas:glob:v0.2.3:gobwas_glob/vendor/github.com/gobwas/glob \
 		gogo:googleapis:v1.4.0:gogo_googleapis/vendor/github.com/gogo/googleapis \
 		gogo:protobuf:v1.3.1:gogo_protobuf/vendor/github.com/gogo/protobuf \
 		gogo:status:v1.1.0:gogo_status/vendor/github.com/gogo/status \
 		golang-sql:civil:cb61b32ac6fe:golang_sql_civil/vendor/github.com/golang-sql/civil \
 		golang:appengine:v1.6.7:golang_appengine/vendor/google.golang.org/appengine \
-		golang:crypto:5f87f3452ae9:golang_crypto/vendor/golang.org/x/crypto \
+		golang:crypto:eec23a3978ad:golang_crypto/vendor/golang.org/x/crypto \
 		golang:groupcache:8c9f03a8e57e:golang_groupcache/vendor/github.com/golang/groupcache \
 		golang:lint:738671d3881b:golang_lint/vendor/golang.org/x/lint \
 		golang:mod:v0.3.0:golang_mod/vendor/golang.org/x/mod \
-		golang:net:08b38378de70:golang_net/vendor/golang.org/x/net \
-		golang:oauth2:5d25da1a8d43:golang_oauth2/vendor/golang.org/x/oauth2 \
+		golang:net:5f4716e94777:golang_net/vendor/golang.org/x/net \
+		golang:oauth2:d3ed898aa8a3:golang_oauth2/vendor/golang.org/x/oauth2 \
 		golang:protobuf:v1.4.3:golang_protobuf/vendor/github.com/golang/protobuf \
 		golang:snappy:v0.0.1:golang_snappy/vendor/github.com/golang/snappy \
-		golang:sync:67f06af15bc9:golang_sync/vendor/golang.org/x/sync \
+		golang:sync:09787c993a3a:golang_sync/vendor/golang.org/x/sync \
 		golang:sys:fb209a7c41cd:golang_sys/vendor/golang.org/x/sys \
 		golang:text:v0.3.3:golang_text/vendor/golang.org/x/text \
 		golang:time:3af7569d3a1e:golang_time/vendor/golang.org/x/time \
 		golang:tools:102e7d357031:golang_tools/vendor/golang.org/x/tools \
 		golang:xerrors:9bdfabe68543:golang_xerrors/vendor/golang.org/x/xerrors \
 		gomodule:redigo:v2.0.0:gomodule_redigo/vendor/github.com/gomodule/redigo \
-		gonum:gonum:v0.6.0:gonum_gonum/vendor/gonum.org/v1/gonum \
+		gonum:gonum:v0.8.2:gonum_gonum/vendor/gonum.org/v1/gonum \
 		google:flatbuffers:v1.11.0:google_flatbuffers/vendor/github.com/google/flatbuffers \
 		google:go-cmp:v0.5.4:google_go_cmp/vendor/github.com/google/go-cmp \
 		google:go-genproto:0ff5f38871d5:google_go_genproto/vendor/google.golang.org/genproto \
-		google:uuid:v1.1.1:google_uuid/vendor/github.com/google/uuid \
+		google:uuid:v1.2.0:google_uuid/vendor/github.com/google/uuid \
 		googleapis:gax-go:v2.0.5:googleapis_gax_go_v2/vendor/github.com/googleapis/gax-go \
-		googleapis:google-api-go-client:v0.33.0:googleapis_google_api_go_client/vendor/google.golang.org/api \
-		googleapis:google-cloud-go:storage/v1.12.0:googleapis_google_cloud_go_storage \
+		googleapis:google-api-go-client:v0.40.0:googleapis_google_api_go_client/vendor/google.golang.org/api \
+		googleapis:google-cloud-go:storage/v1.13.0:googleapis_google_cloud_go_storage \
 		googleapis:google-cloud-go:v0.60.0:googleapis_google_cloud_go/vendor/cloud.google.com/go \
 		gopherjs:gopherjs:ce3c9ade29de:gopherjs_gopherjs/vendor/github.com/gopherjs/gopherjs \
 		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 \
+		grafana:grafana-aws-sdk:v0.2.0:grafana_grafana_aws_sdk/vendor/github.com/grafana/grafana-aws-sdk \
 		grafana:grafana-plugin-model:1fc953a61fb4:grafana_grafana_plugin_model/vendor/github.com/grafana/grafana-plugin-model \
-		grafana:grafana-plugin-sdk-go:v0.83.0:grafana_grafana_plugin_sdk_go/vendor/github.com/grafana/grafana-plugin-sdk-go \
+		grafana:grafana-plugin-sdk-go:v0.88.0:grafana_grafana_plugin_sdk_go/vendor/github.com/grafana/grafana-plugin-sdk-go \
 		grafana:loki:6978ee5d7387:grafana_loki/vendor/github.com/grafana/loki \
-		grpc-ecosystem:go-grpc-middleware:v1.2.1:grpc_ecosystem_go_grpc_middleware/vendor/github.com/grpc-ecosystem/go-grpc-middleware \
+		grpc-ecosystem:go-grpc-middleware:v1.2.2: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 \
-		grpc:grpc-go:v1.35.0:grpc_grpc_go/vendor/google.golang.org/grpc \
-		hashicorp:go-hclog:v0.14.1:hashicorp_go_hclog/vendor/github.com/hashicorp/go-hclog \
+		grpc-ecosystem:grpc-gateway:v1.16.0:grpc_ecosystem_grpc_gateway/vendor/github.com/grpc-ecosystem/grpc-gateway \
+		grpc:grpc-go:v1.36.0:grpc_grpc_go/vendor/google.golang.org/grpc \
+		hashicorp:go-hclog:v0.15.0:hashicorp_go_hclog/vendor/github.com/hashicorp/go-hclog \
 		hashicorp:go-plugin:v1.4.0:hashicorp_go_plugin/vendor/github.com/hashicorp/go-plugin \
 		hashicorp:go-version:v1.2.1:hashicorp_go_version/vendor/github.com/hashicorp/go-version \
 		hashicorp:yamux:2f1d1f20f75d:hashicorp_yamux/vendor/github.com/hashicorp/yamux \
@@ -127,18 +128,20 @@ GH_TUPLE=	\
 		inconshreveable:log15:67afb5ed74ec:inconshreveable_log15/vendor/github.com/inconshreveable/log15 \
 		influxdata:influxdb-client-go:v2.2.0:influxdata_influxdb_client_go_v2/vendor/github.com/influxdata/influxdb-client-go/v2 \
 		influxdata:line-protocol:2487e7298839:influxdata_line_protocol/vendor/github.com/influxdata/line-protocol \
+		jaegertracing:jaeger:v1.22.0:jaegertracing_jaeger/vendor/github.com/jaegertracing/jaeger \
 		jmespath:go-jmespath:v0.4.0:jmespath_go_jmespath/vendor/github.com/jmespath/go-jmespath \
 		jonboulle:clockwork:v0.2.2:jonboulle_clockwork/vendor/github.com/jonboulle/clockwork \
+		jpillora:backoff:v1.0.0:jpillora_backoff/vendor/github.com/jpillora/backoff \
 		json-iterator:go:v1.1.10:json_iterator_go/vendor/github.com/json-iterator/go \
 		jstemmer:go-junit-report:v0.9.1:jstemmer_go_junit_report/vendor/github.com/jstemmer/go-junit-report \
 		jtolds:gls:v4.20.0:jtolds_gls/vendor/github.com/jtolds/gls \
-		jung-kurt:gofpdf:v1.10.1:jung_kurt_gofpdf/vendor/github.com/jung-kurt/gofpdf \
+		jung-kurt:gofpdf:v1.16.2:jung_kurt_gofpdf/vendor/github.com/jung-kurt/gofpdf \
 		k0kubun:colorstring:9440f1994b88:k0kubun_colorstring/vendor/github.com/k0kubun/colorstring \
 		klauspost:compress:v1.9.5:klauspost_compress/vendor/github.com/klauspost/compress \
 		kubernetes:client-go:v0.18.8:kubernetes_client_go/vendor/k8s.io/client-go \
 		lib:pq:v1.9.0:lib_pq/vendor/github.com/lib/pq \
-		linkedin:goavro:v2.9.7:linkedin_goavro_v2/vendor/github.com/linkedin/goavro/v2 \
-		magefile:mage:v1.10.0:magefile_mage/vendor/github.com/magefile/mage \
+		linkedin:goavro:v2.10.0:linkedin_goavro_v2/vendor/github.com/linkedin/goavro/v2 \
+		magefile:mage:v1.11.0:magefile_mage/vendor/github.com/magefile/mage \
 		mattermost:xml-roundtrip-validator:bcd7e1b9601e:mattermost_xml_roundtrip_validator/vendor/github.com/mattermost/xml-roundtrip-validator \
 		mattetti:filebuffer:v1.0.0:mattetti_filebuffer/vendor/github.com/mattetti/filebuffer \
 		mattn:go-colorable:v0.1.7:mattn_go_colorable/vendor/github.com/mattn/go-colorable \
@@ -150,17 +153,20 @@ GH_TUPLE=	\
 		mna:redisc:v1.1.7:mna_redisc/vendor/github.com/mna/redisc \
 		modern-go:concurrent:bacd9c7ef1dd:modern_go_concurrent/vendor/github.com/modern-go/concurrent \
 		modern-go:reflect2:v1.0.1:modern_go_reflect2/vendor/github.com/modern-go/reflect2 \
+		mwitkow:go-conntrack:2f068394615f:mwitkow_go_conntrack/vendor/github.com/mwitkow/go-conntrack \
 		oklog:run:v1.1.0:oklog_run/vendor/github.com/oklog/run \
+		oklog:ulid:v1.3.1:oklog_ulid/vendor/github.com/oklog/ulid \
 		olekukonko:tablewriter:v0.0.4:olekukonko_tablewriter/vendor/github.com/olekukonko/tablewriter \
+		open-telemetry:opentelemetry-collector:v0.21.0:open_telemetry_opentelemetry_collector/vendor/go.opentelemetry.io/collector \
 		opentracing:opentracing-go:v1.2.0:opentracing_opentracing_go/vendor/github.com/opentracing/opentracing-go \
 		opentracing-contrib:go-grpc:4b5a12d3ff02:opentracing_contrib_go_grpc/vendor/github.com/opentracing-contrib/go-grpc \
 		opentracing-contrib:go-stdlib:v1.0.0:opentracing_contrib_go_stdlib/vendor/github.com/opentracing-contrib/go-stdlib \
 		patrickmn:go-cache:v2.1.0:patrickmn_go_cache/vendor/github.com/patrickmn/go-cache \
 		pkg:errors:v0.9.1:pkg_errors/vendor/github.com/pkg/errors \
 		pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \
-		prometheus:client_golang:v1.8.0:prometheus_client_golang/vendor/github.com/prometheus/client_golang \
+		prometheus:client_golang:v1.9.0:prometheus_client_golang/vendor/github.com/prometheus/client_golang \
 		prometheus:client_model:v0.2.0:prometheus_client_model/vendor/github.com/prometheus/client_model \
-		prometheus:common:v0.15.0:prometheus_common/vendor/github.com/prometheus/common \
+		prometheus:common:v0.18.0:prometheus_common/vendor/github.com/prometheus/common \
 		prometheus:node_exporter:01054558c289:prometheus_node_exporter/vendor/github.com/prometheus/node_exporter \
 		prometheus:procfs:v0.1.3:prometheus_procfs/vendor/github.com/prometheus/procfs \
 		prometheus:prometheus:6f296594a852:prometheus_prometheus/vendor/github.com/prometheus/prometheus \
@@ -177,11 +183,13 @@ GH_TUPLE=	\
 		smartystreets:assertions:v1.0.1:smartystreets_assertions/vendor/github.com/smartystreets/assertions \
 		smartystreets:goconvey:v1.6.4:smartystreets_goconvey/vendor/github.com/smartystreets/goconvey \
 		square:go-jose:v2.5.1:square_go_jose/vendor/gopkg.in/square/go-jose.v2 \
+		stretchr:objx:v0.2.0:stretchr_objx/vendor/github.com/stretchr/objx \
 		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 \
 		uber-go:atomic:v1.6.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.25.0:uber_jaeger_client_go/vendor/github.com/uber/jaeger-client-go \
 		uber:jaeger-lib:v2.2.0:uber_jaeger_lib/vendor/github.com/uber/jaeger-lib \
 		unknwon:com:v1.0.1:unknwon_com/vendor/github.com/unknwon/com \
@@ -195,22 +203,15 @@ GH_TUPLE=	\
 		# Mirrors for the following packages are not currently known, please look them up and handle these tuples manually:
 		#	::v0.3.6:group_name/vendor/xorm.io/builder (from gitea.com/xorm/builder@v0.3.6)
 		#	::v0.7.3:group_name/vendor/xorm.io/core (from gitea.com/xorm/core@v0.7.3)
-		#	::v0.8.1:group_name/vendor/xorm.io/xorm (from gitea.com/xorm/xorm@v0.8.1)
+		#	::v0.8.2:group_name/vendor/xorm.io/xorm (from gitea.com/xorm/xorm@v0.8.2)
 
-GRAFANA_USER?=	grafana
-GRAFANA_GROUP?=	grafana
+USE_RC_SUBR=	grafana
+TAG=		4dffb87
 
-USERS=	${GRAFANA_USER}
-GROUPS=	${GRAFANA_GROUP}
+GO_TARGET=	./pkg/cmd/grafana-server \
+		./pkg/cmd/grafana-cli
+GO_BUILDFLAGS=	-ldflags="-w -X main.version=${PORTVERSION} -X main.commit=${TAG}"
 
-GRAFANA_DATADIR?=		/var/db/${PORTNAME}
-GRAFANA_HOMEDIR?=		${DATADIR}
-GRAFANA_LOGDIR?=		/var/log/${PORTNAME}
-GRAFANA_PLUGINDIR?=		${GRAFANA_DATADIR}/plugins
-# TODO: Move to etc while moving to grafana8
-GRAFANA_PROVISIONINGDIR?=	${GRAFANA_DATADIR}/provisioning
-
-USE_RC_SUBR=	grafana
 SUB_FILES=	grafana.conf
 SUB_LIST=	GRAFANA_USER=${GRAFANA_USER} \
 		GRAFANA_GROUP=${GRAFANA_GROUP} \
@@ -220,8 +221,21 @@ SUB_LIST=	GRAFANA_USER=${GRAFANA_USER} \
 		GRAFANA_PLUGINDIR=${GRAFANA_PLUGINDIR} \
 		GRAFANA_PROVISIONINGDIR=${GRAFANA_PROVISIONINGDIR}
 
+GRAFANA_USER?=	grafana
+GRAFANA_GROUP?=	grafana
+
+USERS=		${GRAFANA_USER}
+GROUPS=		${GRAFANA_GROUP}
+
 PLIST_SUB=	${SUB_LIST}
 
+GRAFANA_DATADIR?=		/var/db/${PORTNAME}
+GRAFANA_HOMEDIR?=		${DATADIR}
+GRAFANA_LOGDIR?=		/var/log/${PORTNAME}
+GRAFANA_PLUGINDIR?=		${GRAFANA_DATADIR}/plugins
+# TODO: Move to etc while moving to grafana8
+GRAFANA_PROVISIONINGDIR?=	${GRAFANA_DATADIR}/provisioning
+
 post-extract:
 	@${RM} -r ${WRKSRC}/public
 	@(cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/grafana-${PORTVERSION}.linux-amd64${EXTRACT_SUFX} ${EXTRACT_AFTER_ARGS} grafana-${PORTVERSION}/public)
@@ -242,7 +256,7 @@ post-install:
 		${COPYTREE_SHARE} public ${STAGEDIR}${GRAFANA_HOMEDIR} )
 	${INSTALL_DATA} ${WRKSRC}/conf/defaults.ini \
 		${STAGEDIR}${GRAFANA_HOMEDIR}/conf/defaults.ini
-	# TODO: Rename to grafana.ini while moving to grafana8
+# TODO: Rename to grafana.ini while moving to grafana8
 	${INSTALL_DATA} ${WRKDIR}/grafana.conf \
 		${STAGEDIR}${PREFIX}/etc/grafana.conf.sample
 

Modified: head/www/grafana7/distinfo
==============================================================================
--- head/www/grafana7/distinfo	Mon Mar 29 18:50:27 2021	(r569496)
+++ head/www/grafana7/distinfo	Mon Mar 29 18:53:59 2021	(r569497)
@@ -1,14 +1,14 @@
-TIMESTAMP = 1612513272
-SHA256 (grafana-7.4.0.linux-amd64.tar.gz) = ed73f98bdb2c4cf90626d5e549519ff4229f11a89d799c69d2c29d074b1b80b5
-SIZE (grafana-7.4.0.linux-amd64.tar.gz) = 51244405
+TIMESTAMP = 1616788300
+SHA256 (grafana-7.5.1.linux-amd64.tar.gz) = f7b8921d020ae021d9f6837d1ec19d227fada13b41b81b9ade6612f62f554ef6
+SIZE (grafana-7.5.1.linux-amd64.tar.gz) = 55420645
 SHA256 (v0.3.6.tar.gz) = 7d79669bf66fab9d3219f5fd31432ec27cdd8f267538fe7d4d18aed2b5b24736
 SIZE (v0.3.6.tar.gz) = 22658
 SHA256 (v0.7.3.tar.gz) = f5df845efbc974835b289cb59dc2c59569f8a3693234e28d811e185667e7699c
 SIZE (v0.7.3.tar.gz) = 21113
-SHA256 (v0.8.1.tar.gz) = 36f0aeeb8a4564ea3140077ef96eec2ea9b80b4ab1137755d60be23391a0860d
-SIZE (v0.8.1.tar.gz) = 409745
-SHA256 (grafana-grafana-v7.4.0_GH0.tar.gz) = 524138e0befc77b7ac474c7fe34fc7c54a568c07bf22058f315f15641f289d19
-SIZE (grafana-grafana-v7.4.0_GH0.tar.gz) = 10747097
+SHA256 (v0.8.2.tar.gz) = 871cec6861f88b22fe36879e854872f960fae58a4e87d93c6c43d90558c8fc84
+SIZE (v0.8.2.tar.gz) = 413897
+SHA256 (grafana-grafana-v7.5.1_GH0.tar.gz) = fa8f88738cfaf731e4799716fdf6dea32b525ce8225e28eae7d9f13c07f39dfb
+SIZE (grafana-grafana-v7.5.1_GH0.tar.gz) = 10888945
 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
@@ -21,8 +21,10 @@ SHA256 (alexcesaro-quotedprintable-2caba252f4dc_GH0.ta
 SIZE (alexcesaro-quotedprintable-2caba252f4dc_GH0.tar.gz) = 10425
 SHA256 (apache-arrow-68b1273cbbf7_GH0.tar.gz) = 8889441ec526dd451e0b98225e0d5ceabed66c6486b5a642d7f08458a0aed423
 SIZE (apache-arrow-68b1273cbbf7_GH0.tar.gz) = 6198586
-SHA256 (aws-aws-sdk-go-v1.35.5_GH0.tar.gz) = 09e509917ea69589df86a1d071a59ea8674b214dc1d5de88a539a308276be6f8
-SIZE (aws-aws-sdk-go-v1.35.5_GH0.tar.gz) = 16312681
+SHA256 (apache-thrift-v0.13.0_GH0.tar.gz) = 5da60088e60984f4f0801deeea628d193c33cec621e78c8a43a5d8c4055f7ad9
+SIZE (apache-thrift-v0.13.0_GH0.tar.gz) = 3202365
+SHA256 (aws-aws-sdk-go-v1.37.20_GH0.tar.gz) = 2b00892527f3daf6c55104660b5311ff219539bcfbe38a0f83b3dc2f7897c82e
+SIZE (aws-aws-sdk-go-v1.37.20_GH0.tar.gz) = 18263547
 SHA256 (beevik-etree-v1.1.0_GH0.tar.gz) = d1b424a126ce5c46d8e9ba42217e7997cc992bef56d17cc39d1d91525c0dc1de
 SIZE (beevik-etree-v1.1.0_GH0.tar.gz) = 26390
 SHA256 (benbjohnson-clock-7dc76406b6d3_GH0.tar.gz) = 57057ebe896b3120137fffdef8b8ec5354f5a43a9faf6c68616adc1da5f79baa
@@ -57,6 +59,10 @@ SHA256 (deepmap-oapi-codegen-v1.3.13_GH0.tar.gz) = c20
 SIZE (deepmap-oapi-codegen-v1.3.13_GH0.tar.gz) = 135335
 SHA256 (denisenkom-go-mssqldb-1e08a3fab204_GH0.tar.gz) = db2f3f09919b1f2f8858d8c2e77cfa72a137698f138768615d9cc5221553cdcd
 SIZE (denisenkom-go-mssqldb-1e08a3fab204_GH0.tar.gz) = 522580
+SHA256 (dustin-go-humanize-v1.0.0_GH0.tar.gz) = e4540bd50ac855143b4f2e509313079c50cf5d8774f09cc10dbca5ae9803d8ba
+SIZE (dustin-go-humanize-v1.0.0_GH0.tar.gz) = 17260
+SHA256 (edsrzf-mmap-go-v1.0.0_GH0.tar.gz) = 49c502c28de1e36f12005a70543ae62e15dcd85565572df4e973beb5812587bf
+SIZE (edsrzf-mmap-go-v1.0.0_GH0.tar.gz) = 5463
 SHA256 (facebookgo-ensure-b4ab57deab51_GH0.tar.gz) = 228a9f93d69255a4bb82bf058c97f1bde71c595e94da5a3b421026210275b959
 SIZE (facebookgo-ensure-b4ab57deab51_GH0.tar.gz) = 6412
 SHA256 (facebookgo-inject-f23751cae28b_GH0.tar.gz) = edaf2ed132818f18b2f0ce9d6358f1358c0b44f7715634fc1e6b725281e3454b
@@ -73,12 +79,12 @@ SHA256 (felixge-httpsnoop-v1.0.1_GH0.tar.gz) = 02f5066
 SIZE (felixge-httpsnoop-v1.0.1_GH0.tar.gz) = 10725
 SHA256 (gchaincl-sqlhooks-v1.3.0_GH0.tar.gz) = 49ea2c5cb8e84251e1df2a6f58b4bc9a78804b3a39c6a38341831a26ba8f8585
 SIZE (gchaincl-sqlhooks-v1.3.0_GH0.tar.gz) = 11900
-SHA256 (getsentry-sentry-go-v0.9.0_GH0.tar.gz) = 34e40e3c20ad3f35db069ce4b9ca3708d76b76da9735b1503585020968992451
-SIZE (getsentry-sentry-go-v0.9.0_GH0.tar.gz) = 108605
+SHA256 (getsentry-sentry-go-v0.10.0_GH0.tar.gz) = 2afd6ccb3a8f6e9998313a99456760d8cf7260994cefd285fba17a32598595e1
+SIZE (getsentry-sentry-go-v0.10.0_GH0.tar.gz) = 111875
 SHA256 (go-asn1-ber-asn1-ber-f715ec2f112d_GH0.tar.gz) = 084d4021bd3a9ae361fff6c59910d83227116dee977ec09bfe9322db43020b0d
 SIZE (go-asn1-ber-asn1-ber-f715ec2f112d_GH0.tar.gz) = 13199
-SHA256 (go-ini-ini-v1.57.0_GH0.tar.gz) = e612924cffa395825f32e65db18cff0366705952433e52c6efc81fc1c3adfd2a
-SIZE (go-ini-ini-v1.57.0_GH0.tar.gz) = 48424
+SHA256 (go-ini-ini-v1.62.0_GH0.tar.gz) = 926ca2ff49018dc5c0991f3a790bc2083a3c52c470167d42f0f0bcd6642ff64e
+SIZE (go-ini-ini-v1.62.0_GH0.tar.gz) = 50314
 SHA256 (go-ldap-ldap-v3.0.2_GH0.tar.gz) = 7e5244c2f1d7b0a4a4927206d278325b61312934a16cf64fa9f1f8a9b9e954d1
 SIZE (go-ldap-ldap-v3.0.2_GH0.tar.gz) = 41053
 SHA256 (go-kit-kit-v0.10.0_GH0.tar.gz) = c0fac2e37b981e4c18e4f210b92e1393bd59dadd7c7fc043ec46d1c9834eba85
@@ -91,20 +97,22 @@ SHA256 (go-macaron-gzip-cad1c6580a07_GH0.tar.gz) = c12
 SIZE (go-macaron-gzip-cad1c6580a07_GH0.tar.gz) = 6443
 SHA256 (go-macaron-inject-d8a0b8677191_GH0.tar.gz) = c7606f032ed7cb6c465c6b41ab19d0742514f3365baed9b4b00249f79ef006a7
 SIZE (go-macaron-inject-d8a0b8677191_GH0.tar.gz) = 8050
-SHA256 (go-macaron-macaron-v1.3.9_GH0.tar.gz) = ab2fac393a8ad65052c1073e39e7456761714548d73c13781a505be2fe61469a
-SIZE (go-macaron-macaron-v1.3.9_GH0.tar.gz) = 132910
+SHA256 (go-macaron-macaron-v1.4.0_GH0.tar.gz) = 41399efdc8469b69215ac16aba367a5d00b728b2a593ededd2aee62d2002446b
+SIZE (go-macaron-macaron-v1.4.0_GH0.tar.gz) = 133118
 SHA256 (go-mail-mail-v2.3.1_GH0.tar.gz) = 264a42278757b9153338e618b2c98109d88f8ae8599a804f291e17bba9bb8969
 SIZE (go-mail-mail-v2.3.1_GH0.tar.gz) = 19878
 SHA256 (go-redis-redis-v5.2.9_GH0.tar.gz) = 494f474925e89749124445cdebc5affd741f7532d2a4d6e4e2069b17d74f4fd2
 SIZE (go-redis-redis-v5.2.9_GH0.tar.gz) = 69991
+SHA256 (go-sourcemap-sourcemap-v2.1.3_GH0.tar.gz) = 9e5d9e6f1b7facedd58ef8bb2af86ddf906bfc0c3f377934603e900b21490956
+SIZE (go-sourcemap-sourcemap-v2.1.3_GH0.tar.gz) = 6479
 SHA256 (go-sql-driver-mysql-v1.5.0_GH0.tar.gz) = 9d98b46623037447a26a51a203540bf605b6e6220d31f2efc7396242fcb660b5
 SIZE (go-sql-driver-mysql-v1.5.0_GH0.tar.gz) = 90474
 SHA256 (go-stack-stack-v1.8.0_GH0.tar.gz) = 3b8987e137d76f4f35db1e8005ec7fb766b68eed8cac0ca0b795ac43cd72b319
 SIZE (go-stack-stack-v1.8.0_GH0.tar.gz) = 8039
 SHA256 (go-yaml-yaml-eeeca48fe776_GH0.tar.gz) = 77e421545f853bf0b0431ed5026f10ebeeadd436334ac156169b78f82e86bdf5
 SIZE (go-yaml-yaml-eeeca48fe776_GH0.tar.gz) = 88787
-SHA256 (go-yaml-yaml-v2.3.0_GH0.tar.gz) = 42027002bf258009d498600b04b8c9cbb29d2193185ea7bfa8fefe194fe72a07
-SIZE (go-yaml-yaml-v2.3.0_GH0.tar.gz) = 72816
+SHA256 (go-yaml-yaml-v2.4.0_GH0.tar.gz) = d8e94679e5fff6bd1a35e10241543929a5f3da44f701755babf99b3daf0faac0
+SIZE (go-yaml-yaml-v2.4.0_GH0.tar.gz) = 73209
 SHA256 (gobwas-glob-v0.2.3_GH0.tar.gz) = 325026fc78bcebcf31151b6e060f4e1c3321b04ded3dab63b63610b323c10850
 SIZE (gobwas-glob-v0.2.3_GH0.tar.gz) = 25962
 SHA256 (gogo-googleapis-v1.4.0_GH0.tar.gz) = 0f1be0cc87e1f7942091f529dd2669d66fc249d57c6ed6906666d42b6d384497
@@ -117,24 +125,24 @@ SHA256 (golang-sql-civil-cb61b32ac6fe_GH0.tar.gz) = eb
 SIZE (golang-sql-civil-cb61b32ac6fe_GH0.tar.gz) = 8359
 SHA256 (golang-appengine-v1.6.7_GH0.tar.gz) = c623d81235f7c9699e299b328191d813337dd57dcc800d7afdb5130e8c321a8f
 SIZE (golang-appengine-v1.6.7_GH0.tar.gz) = 333007
-SHA256 (golang-crypto-5f87f3452ae9_GH0.tar.gz) = 8e905a4ce396416a8c8afd8075b93da404f77a9ec1475ad2814d289a1e21a0ee
-SIZE (golang-crypto-5f87f3452ae9_GH0.tar.gz) = 1721681
+SHA256 (golang-crypto-eec23a3978ad_GH0.tar.gz) = bd882536660d6b65619c9d9b9334e9a5c55557613e56e1b485323a2293dfa2f8
+SIZE (golang-crypto-eec23a3978ad_GH0.tar.gz) = 1725798
 SHA256 (golang-groupcache-8c9f03a8e57e_GH0.tar.gz) = b92f918daa48048fd360f14d1a4aed6e70c1176ae6b00b0dc04094bb088e9865
 SIZE (golang-groupcache-8c9f03a8e57e_GH0.tar.gz) = 26047
 SHA256 (golang-lint-738671d3881b_GH0.tar.gz) = c3c30939f0592da3a4b470afd40cdf2924a2749e251b4188f53a918445fb67b4
 SIZE (golang-lint-738671d3881b_GH0.tar.gz) = 31848
 SHA256 (golang-mod-v0.3.0_GH0.tar.gz) = bc97bb300928a00cfe64d97b3240c760668060cda0767e0d0b413e506fc3fa0a
 SIZE (golang-mod-v0.3.0_GH0.tar.gz) = 93941
-SHA256 (golang-net-08b38378de70_GH0.tar.gz) = d06255f867fca204411fdcb8ce29eb25babc589466c4aff586039b0931ec3904
-SIZE (golang-net-08b38378de70_GH0.tar.gz) = 1178371
-SHA256 (golang-oauth2-5d25da1a8d43_GH0.tar.gz) = 359a1ce0493a717f0d30e964d6ebfedca99becdd188383c4853a5010ffc36feb
-SIZE (golang-oauth2-5d25da1a8d43_GH0.tar.gz) = 59450
+SHA256 (golang-net-5f4716e94777_GH0.tar.gz) = 987ec0774e8480615daf0664cd9c9ec9eb25cf6e553e32ae38697515629714b6
+SIZE (golang-net-5f4716e94777_GH0.tar.gz) = 1251426
+SHA256 (golang-oauth2-d3ed898aa8a3_GH0.tar.gz) = cd788f64d394f5d002c9cbb5018b05910ee2186c614b0068149b87b42a87d9ad
+SIZE (golang-oauth2-d3ed898aa8a3_GH0.tar.gz) = 67321
 SHA256 (golang-protobuf-v1.4.3_GH0.tar.gz) = 5736f943f8647362f5559689df6154f3c85d261fb088867c8a68494e2a767610
 SIZE (golang-protobuf-v1.4.3_GH0.tar.gz) = 171969
 SHA256 (golang-snappy-v0.0.1_GH0.tar.gz) = b1d97f47fcb61cb0cdd54bc424eda980c47838effb0ec9e322506514a50fee85
 SIZE (golang-snappy-v0.0.1_GH0.tar.gz) = 62605
-SHA256 (golang-sync-67f06af15bc9_GH0.tar.gz) = 1d77987f36d54a2918aa7d62555a3801776c6c182a5f643c9dd01d93064fd5a2
-SIZE (golang-sync-67f06af15bc9_GH0.tar.gz) = 18701
+SHA256 (golang-sync-09787c993a3a_GH0.tar.gz) = e533f53d11330b61d7e9bcbec255699992ab47636f1b45403db6f9b09c3d0aba
+SIZE (golang-sync-09787c993a3a_GH0.tar.gz) = 18734
 SHA256 (golang-sys-fb209a7c41cd_GH0.tar.gz) = ee15b63e3a42001774c8e70ab0933db005e5e57886c9991d93a02977020529d2
 SIZE (golang-sys-fb209a7c41cd_GH0.tar.gz) = 1072084
 SHA256 (golang-text-v0.3.3_GH0.tar.gz) = 1604233637e3593749fbbb13b5069b08e6feba6d2b55a02fd3148793d5871185
@@ -147,22 +155,22 @@ SHA256 (golang-xerrors-9bdfabe68543_GH0.tar.gz) = 54bb
 SIZE (golang-xerrors-9bdfabe68543_GH0.tar.gz) = 13657
 SHA256 (gomodule-redigo-v2.0.0_GH0.tar.gz) = b97a9b0298c371c80b4ba141cb683eaa003c8825a5b02526a03435f6e7568289
 SIZE (gomodule-redigo-v2.0.0_GH0.tar.gz) = 42976
-SHA256 (gonum-gonum-v0.6.0_GH0.tar.gz) = 6f9d64a0dd94b57bebd7aff64ee10257d423be2fa40dc53f82e2ab57c2adc4f8
-SIZE (gonum-gonum-v0.6.0_GH0.tar.gz) = 4658392
+SHA256 (gonum-gonum-v0.8.2_GH0.tar.gz) = a2aad1ac038d36d568939910f39eb0c58cae3c6f0b18df3ca74a8daa954d1663
+SIZE (gonum-gonum-v0.8.2_GH0.tar.gz) = 3226037
 SHA256 (google-flatbuffers-v1.11.0_GH0.tar.gz) = 3f4a286642094f45b1b77228656fbd7ea123964f19502f9ecfd29933fd23a50b
 SIZE (google-flatbuffers-v1.11.0_GH0.tar.gz) = 894944
 SHA256 (google-go-cmp-v0.5.4_GH0.tar.gz) = 1e4a881d0bc4974107218d08834e2815f634a8bd9b76633fd30ace36d8a6c72b
 SIZE (google-go-cmp-v0.5.4_GH0.tar.gz) = 101019
 SHA256 (google-go-genproto-0ff5f38871d5_GH0.tar.gz) = b0b60f8a0d63a230c7392b1cd8070534ea10c83278b25592ac2ab23e4c2a02d3
 SIZE (google-go-genproto-0ff5f38871d5_GH0.tar.gz) = 13483038
-SHA256 (google-uuid-v1.1.1_GH0.tar.gz) = bebd4b0b4ea152a9793615ef23c83f688876d8c284a2092264d20a4bf4ffc423
-SIZE (google-uuid-v1.1.1_GH0.tar.gz) = 13543
+SHA256 (google-uuid-v1.2.0_GH0.tar.gz) = 53ba896ce398435b3ba4f9375f5d4908b09c79daaa54ecd4e5000b7bef984380
+SIZE (google-uuid-v1.2.0_GH0.tar.gz) = 14158
 SHA256 (googleapis-gax-go-v2.0.5_GH0.tar.gz) = 3089affe6f5e27f7a6d494cb399aa6baf232384f763f548ad5ddfbea0e88e59c
 SIZE (googleapis-gax-go-v2.0.5_GH0.tar.gz) = 15328
-SHA256 (googleapis-google-api-go-client-v0.33.0_GH0.tar.gz) = c73839f4146fd47bc211629ee9f42069456e4621d641bdff4791b7cb14bfbf74
-SIZE (googleapis-google-api-go-client-v0.33.0_GH0.tar.gz) = 16652265
-SHA256 (googleapis-google-cloud-go-storage-v1.12.0_GH0.tar.gz) = be05508276b43e3dcf899605f1b1bf36385c3c4cbb6827ce73402aca07edc50f
-SIZE (googleapis-google-cloud-go-storage-v1.12.0_GH0.tar.gz) = 3011763
+SHA256 (googleapis-google-api-go-client-v0.40.0_GH0.tar.gz) = 8a68a9610e660b2fa2d81ed509595efd54a3951dbf8f35eaff1805a7c8417b57
+SIZE (googleapis-google-api-go-client-v0.40.0_GH0.tar.gz) = 18599253
+SHA256 (googleapis-google-cloud-go-storage-v1.13.0_GH0.tar.gz) = 42d88b5f9fbeadf368ee1e9dd78b46e1105f503057bcf2be40e47ebc0ab25b1c
+SIZE (googleapis-google-cloud-go-storage-v1.13.0_GH0.tar.gz) = 3351779
 SHA256 (googleapis-google-cloud-go-v0.60.0_GH0.tar.gz) = f47dd36e8a53e155dc5549f1aaba84bd0b85f69a427b0cbc20531c6ce7d4d95a
 SIZE (googleapis-google-cloud-go-v0.60.0_GH0.tar.gz) = 2783634
 SHA256 (gopherjs-gopherjs-ce3c9ade29de_GH0.tar.gz) = b839dad26fe66a8c99b892da92ca418bc021c532583667df33252986942be434
@@ -173,20 +181,24 @@ SHA256 (gorilla-websocket-v1.4.2_GH0.tar.gz) = 91937a3
 SIZE (gorilla-websocket-v1.4.2_GH0.tar.gz) = 54101
 SHA256 (gosimple-slug-v1.9.0_GH0.tar.gz) = 19a319c470e404a392037529e66ead28b58ca5059a17245c2331a1986c4759cd
 SIZE (gosimple-slug-v1.9.0_GH0.tar.gz) = 13228
+SHA256 (grafana-grafana-aws-sdk-v0.2.0_GH0.tar.gz) = 4d6a203f663cc138e574d04308c8e0cd7322a595908140a2e50cbe973244ef61
+SIZE (grafana-grafana-aws-sdk-v0.2.0_GH0.tar.gz) = 79733
 SHA256 (grafana-grafana-plugin-model-1fc953a61fb4_GH0.tar.gz) = 4b37af38bdfad78b17add2d2f9b5ada90dafbb45ef906e704da70abe2ecd2bc6
 SIZE (grafana-grafana-plugin-model-1fc953a61fb4_GH0.tar.gz) = 1882690
-SHA256 (grafana-grafana-plugin-sdk-go-v0.83.0_GH0.tar.gz) = 053fa688edec19704755d7e358f96b37136557515b1184ff538829826d25775f
-SIZE (grafana-grafana-plugin-sdk-go-v0.83.0_GH0.tar.gz) = 111069
+SHA256 (grafana-grafana-plugin-sdk-go-v0.88.0_GH0.tar.gz) = 4794a04c4de1299a76cf499c699971f0a424b1480528b7d3599e8bd671b64325
+SIZE (grafana-grafana-plugin-sdk-go-v0.88.0_GH0.tar.gz) = 126815
 SHA256 (grafana-loki-6978ee5d7387_GH0.tar.gz) = cbb5a3dc3eefe450b534900fab7ef83ae3a760ed0dd3dcabb7bc6e78894c6a36
 SIZE (grafana-loki-6978ee5d7387_GH0.tar.gz) = 23162660
-SHA256 (grpc-ecosystem-go-grpc-middleware-v1.2.1_GH0.tar.gz) = 27f0e2bb8c983f8c6dde5495d77d74ee57ebb1d1deb5848839a3d88616927dac
-SIZE (grpc-ecosystem-go-grpc-middleware-v1.2.1_GH0.tar.gz) = 102217
+SHA256 (grpc-ecosystem-go-grpc-middleware-v1.2.2_GH0.tar.gz) = 58ace93df5406bb6f1e3e5d49f72f916f99ad6fe0c63cd4dacc6017dbdf7ef76
+SIZE (grpc-ecosystem-go-grpc-middleware-v1.2.2_GH0.tar.gz) = 99696
 SHA256 (grpc-ecosystem-go-grpc-prometheus-6af20e3a5340_GH0.tar.gz) = e37a815659a20ccb6baf26a48cc51efe39b9651ceb0857178f6f2eaa2c47ae75
 SIZE (grpc-ecosystem-go-grpc-prometheus-6af20e3a5340_GH0.tar.gz) = 30606
-SHA256 (grpc-grpc-go-v1.35.0_GH0.tar.gz) = d6ad74f8f48f957e81e86130931ddc9e9ec4f358ef14d5a5982ecc7260d503e8
-SIZE (grpc-grpc-go-v1.35.0_GH0.tar.gz) = 1164449
-SHA256 (hashicorp-go-hclog-v0.14.1_GH0.tar.gz) = 4bf58078d853a3e798b0841bf989f76a757318f169590c3fef54d35858d92643
-SIZE (hashicorp-go-hclog-v0.14.1_GH0.tar.gz) = 25390
+SHA256 (grpc-ecosystem-grpc-gateway-v1.16.0_GH0.tar.gz) = 20ba8f2aeb4a580109357fffaa42f8400aba1155b95c8845e412287907e64379
+SIZE (grpc-ecosystem-grpc-gateway-v1.16.0_GH0.tar.gz) = 521578
+SHA256 (grpc-grpc-go-v1.36.0_GH0.tar.gz) = d460c8f379ff240f6169924ec399080351e4a03a0492fbb5a761f4e2d14d4fda
+SIZE (grpc-grpc-go-v1.36.0_GH0.tar.gz) = 1166422
+SHA256 (hashicorp-go-hclog-v0.15.0_GH0.tar.gz) = 03e8bd42481801d49a2b0c798e631d5d448360310d96ed4b914d40f7ba0b7c12
+SIZE (hashicorp-go-hclog-v0.15.0_GH0.tar.gz) = 25948
 SHA256 (hashicorp-go-plugin-v1.4.0_GH0.tar.gz) = fb6349d5dcae78637dfc68b7b8858ec3dbc94e5cb947e0b4d7bc6b984177223d
 SIZE (hashicorp-go-plugin-v1.4.0_GH0.tar.gz) = 86479
 SHA256 (hashicorp-go-version-v1.2.1_GH0.tar.gz) = 9c63e2107ca0cf4e78ddba1128c73adfdfcdd45faa90c3bf7c6feda7d2326cc5
@@ -201,18 +213,22 @@ SHA256 (influxdata-influxdb-client-go-v2.2.0_GH0.tar.g
 SIZE (influxdata-influxdb-client-go-v2.2.0_GH0.tar.gz) = 176820
 SHA256 (influxdata-line-protocol-2487e7298839_GH0.tar.gz) = e8b6eb7eaa6601d5f8b4b3d2dfadb358fe4cd30fdd55fdcf2f41bcfeb72226e7
 SIZE (influxdata-line-protocol-2487e7298839_GH0.tar.gz) = 67036
+SHA256 (jaegertracing-jaeger-v1.22.0_GH0.tar.gz) = 8858e008857b9855ce3d584f59760db1e7e232fa891c8e43b5e6cf3ce91070b4
+SIZE (jaegertracing-jaeger-v1.22.0_GH0.tar.gz) = 865860
 SHA256 (jmespath-go-jmespath-v0.4.0_GH0.tar.gz) = aa86d00b6836345eee196c13df2df084a18e0b1159935de9289f2ef6a7fe375d
 SIZE (jmespath-go-jmespath-v0.4.0_GH0.tar.gz) = 128861
 SHA256 (jonboulle-clockwork-v0.2.2_GH0.tar.gz) = 79ac7c0e53dfa48aac0622745f133b2438542f1c11d2c09ec1c98affbd62e1f0
 SIZE (jonboulle-clockwork-v0.2.2_GH0.tar.gz) = 9588
+SHA256 (jpillora-backoff-v1.0.0_GH0.tar.gz) = 611b29ce95acfa2997e3449762a3df68fcaa773db045535f26eb5c686106351f
+SIZE (jpillora-backoff-v1.0.0_GH0.tar.gz) = 3507
 SHA256 (json-iterator-go-v1.1.10_GH0.tar.gz) = 15e761079f413a9edcf86ea628998e328c12aaed92af462363191fa76e9809a6
 SIZE (json-iterator-go-v1.1.10_GH0.tar.gz) = 83384
 SHA256 (jstemmer-go-junit-report-v0.9.1_GH0.tar.gz) = 4999e6d8feefe5b89eb9c2b3845a3c0ecdb6f0b0ba4e9785567a43f8952fff15
 SIZE (jstemmer-go-junit-report-v0.9.1_GH0.tar.gz) = 17764
 SHA256 (jtolds-gls-v4.20.0_GH0.tar.gz) = 5223a689f315fc53c5bc271b3a8259032cc74f5311a6d7c1f700a1c65d40c2b2
 SIZE (jtolds-gls-v4.20.0_GH0.tar.gz) = 7306
-SHA256 (jung-kurt-gofpdf-v1.10.1_GH0.tar.gz) = 71cfe3bf7f5dffc7e9fec9259b0a22f1164222d16cf86686ebd65fec85cfb094
-SIZE (jung-kurt-gofpdf-v1.10.1_GH0.tar.gz) = 2788982
+SHA256 (jung-kurt-gofpdf-v1.16.2_GH0.tar.gz) = a3139d090d12a13d7020dfbe2097c53f7ba6fa529d72531f600b799aed6375d6
+SIZE (jung-kurt-gofpdf-v1.16.2_GH0.tar.gz) = 2795841
 SHA256 (k0kubun-colorstring-9440f1994b88_GH0.tar.gz) = 8a8b7c4bfc362722139afceb014225fbde2b464c78c7d864f3436a12fa732bd0
 SIZE (k0kubun-colorstring-9440f1994b88_GH0.tar.gz) = 3627
 SHA256 (klauspost-compress-v1.9.5_GH0.tar.gz) = bd67257f8bffa81c49cf55102dbd629c2b71ea504cb68c9f2abfd739755404d0
@@ -221,10 +237,10 @@ SHA256 (kubernetes-client-go-v0.18.8_GH0.tar.gz) = c1a
 SIZE (kubernetes-client-go-v0.18.8_GH0.tar.gz) = 727659
 SHA256 (lib-pq-v1.9.0_GH0.tar.gz) = 9c60e717d83c717de9eae5b71497e546a4c3a384179b2f776fd86e01b8545637
 SIZE (lib-pq-v1.9.0_GH0.tar.gz) = 103393
-SHA256 (linkedin-goavro-v2.9.7_GH0.tar.gz) = 0a31deb3ed32fd3f8c5556ba37ee3e20d099565a14835bd3bef3f503a34394ee
-SIZE (linkedin-goavro-v2.9.7_GH0.tar.gz) = 136547
-SHA256 (magefile-mage-v1.10.0_GH0.tar.gz) = 7d7f46f62df9dfb1a3a03173a1c14d77fdc53b3c99821da02d32a4ba730838fe
-SIZE (magefile-mage-v1.10.0_GH0.tar.gz) = 8792150
+SHA256 (linkedin-goavro-v2.10.0_GH0.tar.gz) = e80c3db8c209629dbeb84e90a303c4016bc6fc06969ee362c68a47e177d5f24e
+SIZE (linkedin-goavro-v2.10.0_GH0.tar.gz) = 137250
+SHA256 (magefile-mage-v1.11.0_GH0.tar.gz) = 8c7209e8b58a9f946e3d61912c4f02e97699485a5c6e1d8d19dff5fa8ccd891f
+SIZE (magefile-mage-v1.11.0_GH0.tar.gz) = 8795144
 SHA256 (mattermost-xml-roundtrip-validator-bcd7e1b9601e_GH0.tar.gz) = 8b029207467e5b27f79a85a61224c2767d552bc064a5486ac9eeaf664b12e8ac
 SIZE (mattermost-xml-roundtrip-validator-bcd7e1b9601e_GH0.tar.gz) = 13116
 SHA256 (mattetti-filebuffer-v1.0.0_GH0.tar.gz) = e40b1353837f5fee7d71510b25da302b540ff7043c51eb1dbee2bd7937d20648
@@ -247,10 +263,16 @@ SHA256 (modern-go-concurrent-bacd9c7ef1dd_GH0.tar.gz) 
 SIZE (modern-go-concurrent-bacd9c7ef1dd_GH0.tar.gz) = 7526
 SHA256 (modern-go-reflect2-v1.0.1_GH0.tar.gz) = d24e856d9aa8fd51b9e6c2cdd712a44c8d18cb8b72802f1bd16e0470322363fd
 SIZE (modern-go-reflect2-v1.0.1_GH0.tar.gz) = 14394
+SHA256 (mwitkow-go-conntrack-2f068394615f_GH0.tar.gz) = 5bb72eaf9a4ffd7d0353fa6944951d244df89d879ac36d4b9860fd159162dd81
+SIZE (mwitkow-go-conntrack-2f068394615f_GH0.tar.gz) = 17140
 SHA256 (oklog-run-v1.1.0_GH0.tar.gz) = 00c8e2d2071fca7db49027aaaf1e846fa863c4d8a5be33b49898d828ba88cdb5
 SIZE (oklog-run-v1.1.0_GH0.tar.gz) = 7991
+SHA256 (oklog-ulid-v1.3.1_GH0.tar.gz) = 499a6ee77ca473a44ad9f11425a8f87f6c02ff1221b11f24d13bee13ce632640
+SIZE (oklog-ulid-v1.3.1_GH0.tar.gz) = 55582
 SHA256 (olekukonko-tablewriter-v0.0.4_GH0.tar.gz) = a86028430fb4dd99ce0030a7c4d37915337c3b9a9efbfd2698b375f3e3488bd0
 SIZE (olekukonko-tablewriter-v0.0.4_GH0.tar.gz) = 19252
+SHA256 (open-telemetry-opentelemetry-collector-v0.21.0_GH0.tar.gz) = 93fda93371476292bae89ac5ac5d2bae5fa3856bdd06cc61bbe9bdf5c3e23a55
+SIZE (open-telemetry-opentelemetry-collector-v0.21.0_GH0.tar.gz) = 5756997
 SHA256 (opentracing-opentracing-go-v1.2.0_GH0.tar.gz) = cb32b383422a9aae11d260657d52a3789bd799802881b9ced3ee82c370be6f76
 SIZE (opentracing-opentracing-go-v1.2.0_GH0.tar.gz) = 35914
 SHA256 (opentracing-contrib-go-grpc-4b5a12d3ff02_GH0.tar.gz) = 491785b3fab3d069d332a789f6b8c16cd641efda920b5cac1fc0deb7adc53bfe
@@ -263,12 +285,12 @@ SHA256 (pkg-errors-v0.9.1_GH0.tar.gz) = 56bfd893023daa
 SIZE (pkg-errors-v0.9.1_GH0.tar.gz) = 13415
 SHA256 (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 28f3dc1b5c0efd61203ab07233f774740d3bf08da4d8153fb5310db6cea0ebda
 SIZE (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 11398
-SHA256 (prometheus-client_golang-v1.8.0_GH0.tar.gz) = 90ffc935a71704c5c53c6a6f878a5195754a441267a338783fb747fb987714c3
-SIZE (prometheus-client_golang-v1.8.0_GH0.tar.gz) = 175641
+SHA256 (prometheus-client_golang-v1.9.0_GH0.tar.gz) = 92ccfb35268ce2de6beeb45d4b5639e4bce78111b8629bcde5727165f7e1afb1
+SIZE (prometheus-client_golang-v1.9.0_GH0.tar.gz) = 177330
 SHA256 (prometheus-client_model-v0.2.0_GH0.tar.gz) = 4ab1be9cdfa702d7f49beeb09a256bcc6a2aad55e8a0a37e7732a46934264e12
 SIZE (prometheus-client_model-v0.2.0_GH0.tar.gz) = 10986
-SHA256 (prometheus-common-v0.15.0_GH0.tar.gz) = f0957de56c09431076239d27bb85e07841bb832d0c99210087bc6da63a0b2cb6
-SIZE (prometheus-common-v0.15.0_GH0.tar.gz) = 124369
+SHA256 (prometheus-common-v0.18.0_GH0.tar.gz) = 64b0963add6f1945d8da40452d9bf796db263e4d8aba26cf17fdcc3f76b8f940
+SIZE (prometheus-common-v0.18.0_GH0.tar.gz) = 123693
 SHA256 (prometheus-node_exporter-01054558c289_GH0.tar.gz) = 2d8e7a9a1a9d03182d2a0c23a6709d60b8c78c0269ad6b5c4dec88108784fabe
 SIZE (prometheus-node_exporter-01054558c289_GH0.tar.gz) = 2759994
 SHA256 (prometheus-procfs-v0.1.3_GH0.tar.gz) = 0b0872058bfdef11d9942535c992420150724c3b5a912a48a8d2ea26ac39efa6
@@ -301,6 +323,8 @@ SHA256 (smartystreets-goconvey-v1.6.4_GH0.tar.gz) = 88
 SIZE (smartystreets-goconvey-v1.6.4_GH0.tar.gz) = 1478622
 SHA256 (square-go-jose-v2.5.1_GH0.tar.gz) = 74c65592183c542b254eb2933f7a99ee869abdf9e7ac02aad4d9f0dce980ace8
 SIZE (square-go-jose-v2.5.1_GH0.tar.gz) = 309860
+SHA256 (stretchr-objx-v0.2.0_GH0.tar.gz) = be7dce02798cdc24cee6bd2d95bfcf6976b1521ef735349bf5e7dfe6d147746f
+SIZE (stretchr-objx-v0.2.0_GH0.tar.gz) = 79981
 SHA256 (stretchr-testify-v1.7.0_GH0.tar.gz) = 560c0984072cb436b17bbce5699b205d5aa2beb58ef7a94530d7724b5739a8d6
 SIZE (stretchr-testify-v1.7.0_GH0.tar.gz) = 91073
 SHA256 (teris-io-shortid-771a37caa5cf_GH0.tar.gz) = 79146ef4720e5afc1548c4953e0cc07988efbce613cb00c2938b0b69edf60e3b
@@ -311,6 +335,8 @@ SHA256 (ua-parser-uap-go-daf92ba38329_GH0.tar.gz) = 45
 SIZE (ua-parser-uap-go-daf92ba38329_GH0.tar.gz) = 2639501
 SHA256 (uber-go-atomic-v1.6.0_GH0.tar.gz) = 34abb632809f28d4106660d0211dfa624968c4d021717a2e16e1c6bf2606f34a
 SIZE (uber-go-atomic-v1.6.0_GH0.tar.gz) = 9678
+SHA256 (uber-go-goleak-v1.1.10_GH0.tar.gz) = 99ccfd2270aebb09e5c1693094d1da5f47be09689fd515b623657f75e6dc2c40
+SIZE (uber-go-goleak-v1.1.10_GH0.tar.gz) = 12098
 SHA256 (uber-jaeger-client-go-v2.25.0_GH0.tar.gz) = 92e34f0d49830c4a15c232a652a55128b0513d1c942195377a1dad4e3f382b99
 SIZE (uber-jaeger-client-go-v2.25.0_GH0.tar.gz) = 207404
 SHA256 (uber-jaeger-lib-v2.2.0_GH0.tar.gz) = 5ea76c211b8b005c17dd32c8286005973b264e00d559c75f55acbc7001aa2fd9

Modified: head/www/grafana7/files/grafana.conf.in
==============================================================================
--- head/www/grafana7/files/grafana.conf.in	Mon Mar 29 18:50:27 2021	(r569496)
+++ head/www/grafana7/files/grafana.conf.in	Mon Mar 29 18:53:59 2021	(r569497)
@@ -70,6 +70,10 @@ provisioning = %%GRAFANA_PROVISIONINGDIR%%
 # CDN Url
 ;cdn_url =
 
+# Sets the maximum time using a duration format (5s/5m/5ms) before timing out read of an incoming request and closing idle connections.
+# `0` means there is no timeout for reading the request.
+;read_timeout = 0
+
 #################################### Database ####################################
 [database]
 # You can configure the database connection by specifying type, host, name, user and password
@@ -168,6 +172,9 @@ provisioning = %%GRAFANA_PROVISIONINGDIR%%
 # Change this option to false to disable reporting.
 ;reporting_enabled = true
 
+# The name of the distributor of the Grafana instance. Ex hosted-grafana, grafana-labs
+;reporting_distributor = grafana-labs
+
 # Set to false to disable all checks to https://grafana.net
 # for new versions (grafana itself and plugins), check is used
 # in some UI views to notify that grafana or plugin update exists
@@ -492,6 +499,16 @@ provisioning = %%GRAFANA_PROVISIONINGDIR%%
 ;sync_cron = "0 0 1 * * *"
 ;active_sync_enabled = true
 
+#################################### AWS ###########################
+[aws]
+# Enter a comma-separated list of allowed AWS authentication providers. 
+# Options are: default (AWS SDK Default), keys (Access && secret key), credentials (Credentials field), ec2_iam_role (EC2 IAM Role)
+; allowed_auth_providers = default,keys,credentials
+
+# Allow AWS users to assume a role using temporary security credentials. 
+# If true, assume role will be enabled for all AWS authentication providers that are specified in aws_auth_providers
+; assume_role_enabled = true
+
 #################################### SMTP / Emailing ##########################
 [smtp]
 ;enabled = false
@@ -662,6 +679,9 @@ provisioning = %%GRAFANA_PROVISIONINGDIR%%
 ;max_annotations_to_keep =
 
 #################################### Annotations #########################
+[annotations]
+# Configures the batch size for the annotation clean-up job. This setting is used for dashboard, API, and alert annotations.
+;cleanupjob_batchsize = 100
 
 [annotations.dashboard]
 # Dashboard annotations means that annotations are associated with the dashboard they are created on.
@@ -886,6 +906,10 @@ provisioning = %%GRAFANA_PROVISIONINGDIR%%
 
 # Default timezone for user preferences. Options are 'browser' for the browser local timezone or a timezone name from IANA Time Zone database, e.g. 'UTC' or 'Europe/Amsterdam' etc.
 ;default_timezone = browser
+
+[expressions]
+# Enable or disable the expressions functionality.
+;enabled = true
 
 [expressions]
 # Enable or disable the expressions functionality.

Modified: head/www/grafana7/pkg-plist
==============================================================================
--- head/www/grafana7/pkg-plist	Mon Mar 29 18:50:27 2021	(r569496)
+++ head/www/grafana7/pkg-plist	Mon Mar 29 18:53:59 2021	(r569497)
@@ -11,7 +11,6 @@ bin/grafana-server
 %%DATADIR%%/public/app/core/components/Animations/SlideDown.tsx
 %%DATADIR%%/public/app/core/components/AppNotifications/AppNotificationItem.tsx
 %%DATADIR%%/public/app/core/components/AppNotifications/AppNotificationList.tsx
-%%DATADIR%%/public/app/core/components/BackButton/BackButton.tsx
 %%DATADIR%%/public/app/core/components/Branding/Branding.tsx
 %%DATADIR%%/public/app/core/components/Card/Card.tsx
 %%DATADIR%%/public/app/core/components/CopyToClipboard/CopyToClipboard.tsx
@@ -45,7 +44,6 @@ bin/grafana-server
 %%DATADIR%%/public/app/core/components/PageHeader/PageHeader.test.tsx
 %%DATADIR%%/public/app/core/components/PageHeader/PageHeader.tsx
 %%DATADIR%%/public/app/core/components/PageLoader/PageLoader.tsx
-%%DATADIR%%/public/app/core/components/PageToolbar/PageToolbar.tsx
 %%DATADIR%%/public/app/core/components/PermissionList/AddPermission.tsx
 %%DATADIR%%/public/app/core/components/PermissionList/DisabledPermissionListItem.tsx
 %%DATADIR%%/public/app/core/components/PermissionList/PermissionList.tsx
@@ -246,6 +244,7 @@ bin/grafana-server
 %%DATADIR%%/public/app/core/utils/UserProvider.tsx
 %%DATADIR%%/public/app/core/utils/acl.ts
 %%DATADIR%%/public/app/core/utils/applyStateChanges.ts
+%%DATADIR%%/public/app/core/utils/arrayMove.ts
 %%DATADIR%%/public/app/core/utils/browser.test.ts
 %%DATADIR%%/public/app/core/utils/browser.ts
 %%DATADIR%%/public/app/core/utils/colors.ts
@@ -301,7 +300,6 @@ bin/grafana-server
 %%DATADIR%%/public/app/features/admin/UserPermissions.tsx
 %%DATADIR%%/public/app/features/admin/UserProfile.tsx
 %%DATADIR%%/public/app/features/admin/UserSessions.tsx
-%%DATADIR%%/public/app/features/admin/UserSyncInfo.tsx
 %%DATADIR%%/public/app/features/admin/index.ts
 %%DATADIR%%/public/app/features/admin/ldap/LdapConnectionStatus.tsx
 %%DATADIR%%/public/app/features/admin/ldap/LdapPage.tsx
@@ -324,6 +322,7 @@ bin/grafana-server
 %%DATADIR%%/public/app/features/alerting/AlertRuleList.test.tsx
 %%DATADIR%%/public/app/features/alerting/AlertRuleList.tsx
 %%DATADIR%%/public/app/features/alerting/AlertTab.tsx
+%%DATADIR%%/public/app/features/alerting/AlertTabCtrl.test.ts
 %%DATADIR%%/public/app/features/alerting/AlertTabCtrl.ts
 %%DATADIR%%/public/app/features/alerting/EditNotificationChannelPage.tsx
 %%DATADIR%%/public/app/features/alerting/NewNotificationChannelPage.tsx
@@ -333,7 +332,6 @@ bin/grafana-server
 %%DATADIR%%/public/app/features/alerting/StateHistory.tsx
 %%DATADIR%%/public/app/features/alerting/TestRuleResult.test.tsx
 %%DATADIR%%/public/app/features/alerting/TestRuleResult.tsx
-%%DATADIR%%/public/app/features/alerting/__snapshots__/AlertRuleList.test.tsx.snap
 %%DATADIR%%/public/app/features/alerting/__snapshots__/TestRuleResult.test.tsx.snap
 %%DATADIR%%/public/app/features/alerting/components/AlertDefinitionItem.tsx
 %%DATADIR%%/public/app/features/alerting/components/AlertDefinitionOptions.tsx
@@ -378,13 +376,16 @@ bin/grafana-server
 %%DATADIR%%/public/app/features/annotations/standardAnnotationSupport.test.ts
 %%DATADIR%%/public/app/features/annotations/standardAnnotationSupport.ts
 %%DATADIR%%/public/app/features/annotations/types.ts
+%%DATADIR%%/public/app/features/api-keys/ApiKeysActionBar.tsx
 %%DATADIR%%/public/app/features/api-keys/ApiKeysAddedModal.test.tsx
 %%DATADIR%%/public/app/features/api-keys/ApiKeysAddedModal.tsx
+%%DATADIR%%/public/app/features/api-keys/ApiKeysController.tsx
+%%DATADIR%%/public/app/features/api-keys/ApiKeysForm.tsx
 %%DATADIR%%/public/app/features/api-keys/ApiKeysPage.test.tsx
 %%DATADIR%%/public/app/features/api-keys/ApiKeysPage.tsx
+%%DATADIR%%/public/app/features/api-keys/ApiKeysTable.tsx
 %%DATADIR%%/public/app/features/api-keys/__mocks__/apiKeysMock.ts
 %%DATADIR%%/public/app/features/api-keys/__snapshots__/ApiKeysAddedModal.test.tsx.snap
-%%DATADIR%%/public/app/features/api-keys/__snapshots__/ApiKeysPage.test.tsx.snap
 %%DATADIR%%/public/app/features/api-keys/state/actions.ts
 %%DATADIR%%/public/app/features/api-keys/state/reducers.test.ts
 %%DATADIR%%/public/app/features/api-keys/state/reducers.ts
@@ -398,9 +399,6 @@ bin/grafana-server
 %%DATADIR%%/public/app/features/dashboard/components/DashExportModal/DashboardExporter.test.ts
 %%DATADIR%%/public/app/features/dashboard/components/DashExportModal/DashboardExporter.ts
 %%DATADIR%%/public/app/features/dashboard/components/DashExportModal/index.ts
-%%DATADIR%%/public/app/features/dashboard/components/DashLinks/DashLinksEditorCtrl.ts
-%%DATADIR%%/public/app/features/dashboard/components/DashLinks/editor.html
-%%DATADIR%%/public/app/features/dashboard/components/DashLinks/index.ts
 %%DATADIR%%/public/app/features/dashboard/components/DashNav/DashNav.tsx
 %%DATADIR%%/public/app/features/dashboard/components/DashNav/DashNavButton.tsx
 %%DATADIR%%/public/app/features/dashboard/components/DashNav/DashNavTimeControls.tsx
@@ -415,29 +413,24 @@ bin/grafana-server
 %%DATADIR%%/public/app/features/dashboard/components/DashboardSettings/DashboardSettings.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
 %%DATADIR%%/public/app/features/dashboard/components/DashboardSettings/LinksSettings.tsx
-%%DATADIR%%/public/app/features/dashboard/components/DashboardSettings/SettingsCtrl.ts
 %%DATADIR%%/public/app/features/dashboard/components/DashboardSettings/TimePickerSettings.tsx
 %%DATADIR%%/public/app/features/dashboard/components/DashboardSettings/VersionsSettings.test.tsx
 %%DATADIR%%/public/app/features/dashboard/components/DashboardSettings/VersionsSettings.tsx
 %%DATADIR%%/public/app/features/dashboard/components/DashboardSettings/__mocks__/versions.ts
 %%DATADIR%%/public/app/features/dashboard/components/DashboardSettings/index.ts
-%%DATADIR%%/public/app/features/dashboard/components/DashboardSettings/template.html
+%%DATADIR%%/public/app/features/dashboard/components/DeleteDashboard/DeleteDashboardButton.tsx
+%%DATADIR%%/public/app/features/dashboard/components/DeleteDashboard/DeleteDashboardModal.tsx
+%%DATADIR%%/public/app/features/dashboard/components/DeleteDashboard/useDashboardDelete.tsx
 %%DATADIR%%/public/app/features/dashboard/components/FolderPicker/FolderPickerCtrl.ts
-%%DATADIR%%/public/app/features/dashboard/components/Inspector/DetailText.tsx
 %%DATADIR%%/public/app/features/dashboard/components/Inspector/InspectContent.tsx
-%%DATADIR%%/public/app/features/dashboard/components/Inspector/InspectDataTab.tsx
-%%DATADIR%%/public/app/features/dashboard/components/Inspector/InspectErrorTab.tsx
-%%DATADIR%%/public/app/features/dashboard/components/Inspector/InspectJSONTab.tsx
-%%DATADIR%%/public/app/features/dashboard/components/Inspector/InspectMetadataTab.tsx
-%%DATADIR%%/public/app/features/dashboard/components/Inspector/InspectStatsTab.tsx
-%%DATADIR%%/public/app/features/dashboard/components/Inspector/InspectStatsTable.tsx
-%%DATADIR%%/public/app/features/dashboard/components/Inspector/InspectSubtitle.tsx
 %%DATADIR%%/public/app/features/dashboard/components/Inspector/PanelInspector.tsx
-%%DATADIR%%/public/app/features/dashboard/components/Inspector/QueryInspector.tsx
 %%DATADIR%%/public/app/features/dashboard/components/Inspector/hooks.ts
-%%DATADIR%%/public/app/features/dashboard/components/Inspector/styles.ts
-%%DATADIR%%/public/app/features/dashboard/components/Inspector/types.ts
+%%DATADIR%%/public/app/features/dashboard/components/LinksSettings/LinkSettingsEdit.tsx
+%%DATADIR%%/public/app/features/dashboard/components/LinksSettings/LinkSettingsHeader.tsx
+%%DATADIR%%/public/app/features/dashboard/components/LinksSettings/LinkSettingsList.tsx
+%%DATADIR%%/public/app/features/dashboard/components/LinksSettings/index.tsx
 %%DATADIR%%/public/app/features/dashboard/components/PanelEditor/AngularPanelOptions.tsx
 %%DATADIR%%/public/app/features/dashboard/components/PanelEditor/DefaultFieldConfigEditor.test.tsx
 %%DATADIR%%/public/app/features/dashboard/components/PanelEditor/DefaultFieldConfigEditor.tsx
@@ -535,8 +528,14 @@ bin/grafana-server
 %%DATADIR%%/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeader.tsx
 %%DATADIR%%/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderCorner.test.tsx
 %%DATADIR%%/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderCorner.tsx
+%%DATADIR%%/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderLoadingIndicator.tsx
 %%DATADIR%%/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderMenu.tsx
 %%DATADIR%%/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderMenuItem.tsx
+%%DATADIR%%/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderMenuProvider.tsx
+%%DATADIR%%/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderMenuTrigger.tsx
+%%DATADIR%%/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderMenuWrapper.tsx
+%%DATADIR%%/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderNotice.tsx
+%%DATADIR%%/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderNotices.tsx
 %%DATADIR%%/public/app/features/dashboard/dashgrid/PanelPluginError.tsx
 %%DATADIR%%/public/app/features/dashboard/dashgrid/PanelResizer.tsx
 %%DATADIR%%/public/app/features/dashboard/dashgrid/__snapshots__/DashboardGrid.test.tsx.snap
@@ -567,6 +566,8 @@ bin/grafana-server
 %%DATADIR%%/public/app/features/dashboard/state/selectors.ts
 %%DATADIR%%/public/app/features/dashboard/utils/getPanelMenu.test.ts
 %%DATADIR%%/public/app/features/dashboard/utils/getPanelMenu.ts
+%%DATADIR%%/public/app/features/dashboard/utils/getRefreshFromUrl.test.ts
+%%DATADIR%%/public/app/features/dashboard/utils/getRefreshFromUrl.ts
 %%DATADIR%%/public/app/features/dashboard/utils/loadSnapshotData.ts
 %%DATADIR%%/public/app/features/dashboard/utils/panel.test.ts
 %%DATADIR%%/public/app/features/dashboard/utils/panel.ts
@@ -576,16 +577,12 @@ bin/grafana-server
 %%DATADIR%%/public/app/features/datasources/DataSourceDashboards.tsx
 %%DATADIR%%/public/app/features/datasources/DataSourceList.test.tsx
 %%DATADIR%%/public/app/features/datasources/DataSourcesList.tsx
-%%DATADIR%%/public/app/features/datasources/DataSourcesListItem.test.tsx
-%%DATADIR%%/public/app/features/datasources/DataSourcesListItem.tsx
 %%DATADIR%%/public/app/features/datasources/DataSourcesListPage.test.tsx
 %%DATADIR%%/public/app/features/datasources/DataSourcesListPage.tsx
 %%DATADIR%%/public/app/features/datasources/NewDataSourcePage.tsx
 %%DATADIR%%/public/app/features/datasources/__mocks__/dataSourcesMocks.ts
 %%DATADIR%%/public/app/features/datasources/__snapshots__/DashboardsTable.test.tsx.snap
 %%DATADIR%%/public/app/features/datasources/__snapshots__/DataSourceDashboards.test.tsx.snap
-%%DATADIR%%/public/app/features/datasources/__snapshots__/DataSourceList.test.tsx.snap
-%%DATADIR%%/public/app/features/datasources/__snapshots__/DataSourcesListItem.test.tsx.snap
 %%DATADIR%%/public/app/features/datasources/__snapshots__/DataSourcesListPage.test.tsx.snap
 %%DATADIR%%/public/app/features/datasources/mocks.ts
 %%DATADIR%%/public/app/features/datasources/partials/http_settings.html
@@ -626,6 +623,7 @@ bin/grafana-server
 %%DATADIR%%/public/app/features/explore/ExploreDrawer.tsx
 %%DATADIR%%/public/app/features/explore/ExploreGraphNGPanel.tsx
 %%DATADIR%%/public/app/features/explore/ExploreGraphPanel.tsx
+%%DATADIR%%/public/app/features/explore/ExplorePaneContainer.tsx
 %%DATADIR%%/public/app/features/explore/ExploreQueryInspector.test.tsx
 %%DATADIR%%/public/app/features/explore/ExploreQueryInspector.tsx
 %%DATADIR%%/public/app/features/explore/ExploreTimeControls.tsx
@@ -648,7 +646,6 @@ bin/grafana-server
 %%DATADIR%%/public/app/features/explore/QueryRows.tsx
 %%DATADIR%%/public/app/features/explore/QueryStatus.test.tsx
 %%DATADIR%%/public/app/features/explore/QueryStatus.tsx
-%%DATADIR%%/public/app/features/explore/ResponsiveButton.tsx
 %%DATADIR%%/public/app/features/explore/ReturnToDashboardButton.test.tsx
 %%DATADIR%%/public/app/features/explore/ReturnToDashboardButton.tsx
 %%DATADIR%%/public/app/features/explore/RichHistory/RichHistory.test.tsx
@@ -729,11 +726,42 @@ bin/grafana-server
 %%DATADIR%%/public/app/features/folders/FolderSettingsPage.tsx
 %%DATADIR%%/public/app/features/folders/__snapshots__/FolderSettingsPage.test.tsx.snap
 %%DATADIR%%/public/app/features/folders/components/NewDashboardsFolder.tsx
-%%DATADIR%%/public/app/features/folders/services/FolderPageLoader.ts
 %%DATADIR%%/public/app/features/folders/state/actions.ts
 %%DATADIR%%/public/app/features/folders/state/navModel.ts
 %%DATADIR%%/public/app/features/folders/state/reducers.test.ts
 %%DATADIR%%/public/app/features/folders/state/reducers.ts
+%%DATADIR%%/public/app/features/inspector/DetailText.tsx
+%%DATADIR%%/public/app/features/inspector/InspectDataTab.test.tsx
+%%DATADIR%%/public/app/features/inspector/InspectDataTab.tsx
+%%DATADIR%%/public/app/features/inspector/InspectErrorTab.tsx
+%%DATADIR%%/public/app/features/inspector/InspectJSONTab.tsx
+%%DATADIR%%/public/app/features/inspector/InspectMetadataTab.tsx
+%%DATADIR%%/public/app/features/inspector/InspectStatsTab.tsx
+%%DATADIR%%/public/app/features/inspector/InspectStatsTable.tsx
+%%DATADIR%%/public/app/features/inspector/InspectSubtitle.tsx
+%%DATADIR%%/public/app/features/inspector/QueryInspector.tsx
+%%DATADIR%%/public/app/features/inspector/styles.ts
+%%DATADIR%%/public/app/features/inspector/types.ts
+%%DATADIR%%/public/app/features/library-panels/components/AddLibraryPanelModal/AddLibraryPanelModal.tsx
+%%DATADIR%%/public/app/features/library-panels/components/DeleteLibraryPanelModal/DeleteLibraryPanelModal.tsx
+%%DATADIR%%/public/app/features/library-panels/components/DeleteLibraryPanelModal/actions.ts
+%%DATADIR%%/public/app/features/library-panels/components/DeleteLibraryPanelModal/reducer.test.ts
+%%DATADIR%%/public/app/features/library-panels/components/DeleteLibraryPanelModal/reducer.ts
+%%DATADIR%%/public/app/features/library-panels/components/LibraryPanelCard/LibraryPanelCard.tsx
+%%DATADIR%%/public/app/features/library-panels/components/LibraryPanelInfo/LibraryPanelInfo.tsx
+%%DATADIR%%/public/app/features/library-panels/components/LibraryPanelsView/LibraryPanelsView.tsx
+%%DATADIR%%/public/app/features/library-panels/components/LibraryPanelsView/actions.ts
+%%DATADIR%%/public/app/features/library-panels/components/LibraryPanelsView/reducer.test.ts
+%%DATADIR%%/public/app/features/library-panels/components/LibraryPanelsView/reducer.ts
+%%DATADIR%%/public/app/features/library-panels/components/PanelLibraryOptionsGroup/PanelLibraryOptionsGroup.tsx
+%%DATADIR%%/public/app/features/library-panels/components/SaveLibraryPanelModal/SaveLibraryPanelModal.tsx
+%%DATADIR%%/public/app/features/library-panels/components/UnlinkModal/UnlinkModal.tsx
+%%DATADIR%%/public/app/features/library-panels/guard.ts
+%%DATADIR%%/public/app/features/library-panels/state/api.ts
+%%DATADIR%%/public/app/features/library-panels/styles.ts
+%%DATADIR%%/public/app/features/library-panels/types.ts
+%%DATADIR%%/public/app/features/library-panels/utils.ts
+%%DATADIR%%/public/app/features/library-panels/utils/usePanelSave.ts
 %%DATADIR%%/public/app/features/live/channel.ts
 %%DATADIR%%/public/app/features/live/dashboard/DashboardChangedModal.tsx
 %%DATADIR%%/public/app/features/live/dashboard/dashboardWatcher.ts
@@ -781,7 +809,6 @@ bin/grafana-server
 %%DATADIR%%/public/app/features/panel/panellinks/module.html
 %%DATADIR%%/public/app/features/panel/panellinks/module.ts
 %%DATADIR%%/public/app/features/panel/panellinks/specs/link_srv.test.ts
-%%DATADIR%%/public/app/features/panel/partials/panelTime.html
 %%DATADIR%%/public/app/features/panel/partials/query_editor_row.html
 %%DATADIR%%/public/app/features/panel/query_ctrl.ts
 %%DATADIR%%/public/app/features/panel/query_editor_row.ts
@@ -933,6 +960,7 @@ bin/grafana-server
 %%DATADIR%%/public/app/features/users/InviteesTable.tsx
 %%DATADIR%%/public/app/features/users/SignupInvited.test.tsx
 %%DATADIR%%/public/app/features/users/SignupInvited.tsx
+%%DATADIR%%/public/app/features/users/TokenRevokedModal.tsx
 %%DATADIR%%/public/app/features/users/UsersActionBar.test.tsx
 %%DATADIR%%/public/app/features/users/UsersActionBar.tsx
 %%DATADIR%%/public/app/features/users/UsersListPage.test.tsx
@@ -1012,6 +1040,8 @@ bin/grafana-server
 %%DATADIR%%/public/app/features/variables/inspect/VariablesDependenciesButton.tsx
 %%DATADIR%%/public/app/features/variables/inspect/VariablesUnknownButton.tsx
 %%DATADIR%%/public/app/features/variables/inspect/VariablesUnknownTable.tsx
+%%DATADIR%%/public/app/features/variables/inspect/reducer.test.ts
+%%DATADIR%%/public/app/features/variables/inspect/reducer.ts
 %%DATADIR%%/public/app/features/variables/inspect/utils.test.ts
 %%DATADIR%%/public/app/features/variables/inspect/utils.ts
 %%DATADIR%%/public/app/features/variables/interval/IntervalVariableEditor.tsx
@@ -1054,6 +1084,7 @@ bin/grafana-server
 %%DATADIR%%/public/app/features/variables/shared/testing/adHocVariableBuilder.ts
 %%DATADIR%%/public/app/features/variables/shared/testing/builders.ts
 %%DATADIR%%/public/app/features/variables/shared/testing/datasourceVariableBuilder.ts
+%%DATADIR%%/public/app/features/variables/shared/testing/helpers.ts
 %%DATADIR%%/public/app/features/variables/shared/testing/intervalVariableBuilder.ts
 %%DATADIR%%/public/app/features/variables/shared/testing/multiVariableBuilder.ts
 %%DATADIR%%/public/app/features/variables/shared/testing/optionsVariableBuilder.ts
@@ -1117,7 +1148,6 @@ bin/grafana-server
 %%DATADIR%%/public/app/plugins/datasource/cloud-monitoring/components/QueryEditor.tsx
 %%DATADIR%%/public/app/plugins/datasource/cloud-monitoring/components/QueryType.tsx
 %%DATADIR%%/public/app/plugins/datasource/cloud-monitoring/components/SLOQueryEditor.tsx
-%%DATADIR%%/public/app/plugins/datasource/cloud-monitoring/components/SimpleSelect.tsx
 %%DATADIR%%/public/app/plugins/datasource/cloud-monitoring/components/VariableQueryEditor.test.tsx
 %%DATADIR%%/public/app/plugins/datasource/cloud-monitoring/components/VariableQueryEditor.tsx
 %%DATADIR%%/public/app/plugins/datasource/cloud-monitoring/components/VisualMetricQueryEditor.tsx
@@ -1247,6 +1277,7 @@ bin/grafana-server
 %%DATADIR%%/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/SettingsEditor/BucketScriptSettingsEditor/utils.ts
 %%DATADIR%%/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/SettingsEditor/MovingAverageSettingsEditor.tsx
 %%DATADIR%%/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/SettingsEditor/SettingField.tsx
+%%DATADIR%%/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/SettingsEditor/index.test.tsx
 %%DATADIR%%/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/SettingsEditor/index.tsx
 %%DATADIR%%/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/SettingsEditor/useDescription.ts
 %%DATADIR%%/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/aggregations.ts
@@ -1259,6 +1290,7 @@ bin/grafana-server
 %%DATADIR%%/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/utils.ts
 %%DATADIR%%/public/app/plugins/datasource/elasticsearch/components/QueryEditor/QueryEditorRow.tsx
 %%DATADIR%%/public/app/plugins/datasource/elasticsearch/components/QueryEditor/SettingsEditorContainer.tsx
+%%DATADIR%%/public/app/plugins/datasource/elasticsearch/components/QueryEditor/index.test.tsx
 %%DATADIR%%/public/app/plugins/datasource/elasticsearch/components/QueryEditor/index.tsx
 %%DATADIR%%/public/app/plugins/datasource/elasticsearch/components/QueryEditor/state.test.ts
 %%DATADIR%%/public/app/plugins/datasource/elasticsearch/components/QueryEditor/state.ts
@@ -1437,12 +1469,19 @@ bin/grafana-server
 %%DATADIR%%/public/app/plugins/datasource/jaeger/img/jaeger_logo.svg
 %%DATADIR%%/public/app/plugins/datasource/jaeger/module.ts
 %%DATADIR%%/public/app/plugins/datasource/jaeger/plugin.json
+%%DATADIR%%/public/app/plugins/datasource/jaeger/responseTransform.test.ts
+%%DATADIR%%/public/app/plugins/datasource/jaeger/responseTransform.ts
+%%DATADIR%%/public/app/plugins/datasource/jaeger/testResponse.ts
+%%DATADIR%%/public/app/plugins/datasource/jaeger/types.ts
 %%DATADIR%%/public/app/plugins/datasource/loki/LokiAnnotationsQueryCtrl.tsx
 %%DATADIR%%/public/app/plugins/datasource/loki/README.md
 %%DATADIR%%/public/app/plugins/datasource/loki/components/AnnotationsQueryEditor.tsx
 %%DATADIR%%/public/app/plugins/datasource/loki/components/LokiCheatSheet.tsx
 %%DATADIR%%/public/app/plugins/datasource/loki/components/LokiExploreQueryEditor.test.tsx
 %%DATADIR%%/public/app/plugins/datasource/loki/components/LokiExploreQueryEditor.tsx
+%%DATADIR%%/public/app/plugins/datasource/loki/components/LokiLabel.tsx
+%%DATADIR%%/public/app/plugins/datasource/loki/components/LokiLabelBrowser.test.tsx
+%%DATADIR%%/public/app/plugins/datasource/loki/components/LokiLabelBrowser.tsx
 %%DATADIR%%/public/app/plugins/datasource/loki/components/LokiOptionFields.test.tsx
 %%DATADIR%%/public/app/plugins/datasource/loki/components/LokiOptionFields.tsx
 %%DATADIR%%/public/app/plugins/datasource/loki/components/LokiQueryEditor.test.tsx
@@ -1451,8 +1490,6 @@ bin/grafana-server
 %%DATADIR%%/public/app/plugins/datasource/loki/components/LokiQueryFieldForm.tsx
 %%DATADIR%%/public/app/plugins/datasource/loki/components/__snapshots__/LokiExploreQueryEditor.test.tsx.snap
 %%DATADIR%%/public/app/plugins/datasource/loki/components/__snapshots__/LokiQueryEditor.test.tsx.snap
-%%DATADIR%%/public/app/plugins/datasource/loki/components/useLokiLabels.test.ts
-%%DATADIR%%/public/app/plugins/datasource/loki/components/useLokiLabels.ts
 %%DATADIR%%/public/app/plugins/datasource/loki/configuration/ConfigEditor.test.tsx
 %%DATADIR%%/public/app/plugins/datasource/loki/configuration/ConfigEditor.tsx
 %%DATADIR%%/public/app/plugins/datasource/loki/configuration/DebugSection.test.tsx
@@ -1568,6 +1605,7 @@ bin/grafana-server
 %%DATADIR%%/public/app/plugins/datasource/prometheus/configuration/ExemplarsSettings.tsx
 %%DATADIR%%/public/app/plugins/datasource/prometheus/configuration/PromSettings.test.tsx
 %%DATADIR%%/public/app/plugins/datasource/prometheus/configuration/PromSettings.tsx
+%%DATADIR%%/public/app/plugins/datasource/prometheus/configuration/mocks.ts
 %%DATADIR%%/public/app/plugins/datasource/prometheus/dashboards/grafana_stats.json
 %%DATADIR%%/public/app/plugins/datasource/prometheus/dashboards/prometheus_2_stats.json
 %%DATADIR%%/public/app/plugins/datasource/prometheus/dashboards/prometheus_stats.json
@@ -1646,7 +1684,10 @@ bin/grafana-server
 %%DATADIR%%/public/app/plugins/panel/alertlist/module.html
 %%DATADIR%%/public/app/plugins/panel/alertlist/module.ts
 %%DATADIR%%/public/app/plugins/panel/alertlist/plugin.json
+%%DATADIR%%/public/app/plugins/panel/annolist/AnnoListPanel.test.tsx
 %%DATADIR%%/public/app/plugins/panel/annolist/AnnoListPanel.tsx
+%%DATADIR%%/public/app/plugins/panel/annolist/AnnotationListItem.tsx
+%%DATADIR%%/public/app/plugins/panel/annolist/AnnotationListItemTags.tsx
 %%DATADIR%%/public/app/plugins/panel/annolist/README.md
 %%DATADIR%%/public/app/plugins/panel/annolist/img/icn-annolist-panel.svg
 %%DATADIR%%/public/app/plugins/panel/annolist/module.tsx
@@ -1782,6 +1823,8 @@ bin/grafana-server
 %%DATADIR%%/public/app/plugins/panel/piechart/PieChartOptionsBox.tsx
 %%DATADIR%%/public/app/plugins/panel/piechart/PieChartPanel.tsx
 %%DATADIR%%/public/app/plugins/panel/piechart/img/icon_piechart.svg
+%%DATADIR%%/public/app/plugins/panel/piechart/migrations.test.ts
+%%DATADIR%%/public/app/plugins/panel/piechart/migrations.ts
 %%DATADIR%%/public/app/plugins/panel/piechart/module.tsx
 %%DATADIR%%/public/app/plugins/panel/piechart/plugin.json
 %%DATADIR%%/public/app/plugins/panel/piechart/types.ts
@@ -1912,192 +1955,197 @@ bin/grafana-server
 %%DATADIR%%/public/app/types/teams.ts
 %%DATADIR%%/public/app/types/templates.ts
 %%DATADIR%%/public/app/types/user.ts
-%%DATADIR%%/public/build/100.43bf9cf1b45c36f23b7a.js
-%%DATADIR%%/public/build/100.43bf9cf1b45c36f23b7a.js.map
-%%DATADIR%%/public/build/101.43bf9cf1b45c36f23b7a.js
-%%DATADIR%%/public/build/101.43bf9cf1b45c36f23b7a.js.map
-%%DATADIR%%/public/build/79.43bf9cf1b45c36f23b7a.js
-%%DATADIR%%/public/build/79.43bf9cf1b45c36f23b7a.js.map
-%%DATADIR%%/public/build/80.43bf9cf1b45c36f23b7a.js
-%%DATADIR%%/public/build/80.43bf9cf1b45c36f23b7a.js.map
-%%DATADIR%%/public/build/81.43bf9cf1b45c36f23b7a.js
-%%DATADIR%%/public/build/81.43bf9cf1b45c36f23b7a.js.map
-%%DATADIR%%/public/build/82.43bf9cf1b45c36f23b7a.js
-%%DATADIR%%/public/build/82.43bf9cf1b45c36f23b7a.js.map
-%%DATADIR%%/public/build/83.43bf9cf1b45c36f23b7a.js
-%%DATADIR%%/public/build/83.43bf9cf1b45c36f23b7a.js.map
-%%DATADIR%%/public/build/84.43bf9cf1b45c36f23b7a.js
-%%DATADIR%%/public/build/84.43bf9cf1b45c36f23b7a.js.map
-%%DATADIR%%/public/build/85.43bf9cf1b45c36f23b7a.js
-%%DATADIR%%/public/build/85.43bf9cf1b45c36f23b7a.js.map
-%%DATADIR%%/public/build/86.43bf9cf1b45c36f23b7a.js
-%%DATADIR%%/public/build/86.43bf9cf1b45c36f23b7a.js.map
-%%DATADIR%%/public/build/87.43bf9cf1b45c36f23b7a.js
-%%DATADIR%%/public/build/87.43bf9cf1b45c36f23b7a.js.map
-%%DATADIR%%/public/build/88.43bf9cf1b45c36f23b7a.js
-%%DATADIR%%/public/build/88.43bf9cf1b45c36f23b7a.js.map
-%%DATADIR%%/public/build/89.43bf9cf1b45c36f23b7a.js
-%%DATADIR%%/public/build/89.43bf9cf1b45c36f23b7a.js.map
-%%DATADIR%%/public/build/90.43bf9cf1b45c36f23b7a.js
-%%DATADIR%%/public/build/90.43bf9cf1b45c36f23b7a.js.map
-%%DATADIR%%/public/build/91.43bf9cf1b45c36f23b7a.js
-%%DATADIR%%/public/build/91.43bf9cf1b45c36f23b7a.js.map
-%%DATADIR%%/public/build/92.43bf9cf1b45c36f23b7a.js
-%%DATADIR%%/public/build/92.43bf9cf1b45c36f23b7a.js.map
-%%DATADIR%%/public/build/93.43bf9cf1b45c36f23b7a.js
-%%DATADIR%%/public/build/93.43bf9cf1b45c36f23b7a.js.map
-%%DATADIR%%/public/build/94.43bf9cf1b45c36f23b7a.js
-%%DATADIR%%/public/build/94.43bf9cf1b45c36f23b7a.js.map
-%%DATADIR%%/public/build/95.43bf9cf1b45c36f23b7a.js
-%%DATADIR%%/public/build/95.43bf9cf1b45c36f23b7a.js.map
-%%DATADIR%%/public/build/96.43bf9cf1b45c36f23b7a.js
-%%DATADIR%%/public/build/96.43bf9cf1b45c36f23b7a.js.map
-%%DATADIR%%/public/build/97.43bf9cf1b45c36f23b7a.js
-%%DATADIR%%/public/build/97.43bf9cf1b45c36f23b7a.js.map
-%%DATADIR%%/public/build/98.43bf9cf1b45c36f23b7a.js
-%%DATADIR%%/public/build/98.43bf9cf1b45c36f23b7a.js.map
-%%DATADIR%%/public/build/99.43bf9cf1b45c36f23b7a.js
-%%DATADIR%%/public/build/99.43bf9cf1b45c36f23b7a.js.map
-%%DATADIR%%/public/build/AdminEditOrgPage.43bf9cf1b45c36f23b7a.js
-%%DATADIR%%/public/build/AdminEditOrgPage.43bf9cf1b45c36f23b7a.js.map
-%%DATADIR%%/public/build/AdminListOrgsPage.43bf9cf1b45c36f23b7a.js
-%%DATADIR%%/public/build/AdminListOrgsPage.43bf9cf1b45c36f23b7a.js.map
-%%DATADIR%%/public/build/AdminSettings.43bf9cf1b45c36f23b7a.js
-%%DATADIR%%/public/build/AdminSettings.43bf9cf1b45c36f23b7a.js.map
-%%DATADIR%%/public/build/AlertRuleList.43bf9cf1b45c36f23b7a.js
-%%DATADIR%%/public/build/AlertRuleList.43bf9cf1b45c36f23b7a.js.map
-%%DATADIR%%/public/build/ApiKeysPage.43bf9cf1b45c36f23b7a.js
-%%DATADIR%%/public/build/ApiKeysPage.43bf9cf1b45c36f23b7a.js.LICENSE.txt
-%%DATADIR%%/public/build/ApiKeysPage.43bf9cf1b45c36f23b7a.js.map
-%%DATADIR%%/public/build/AppRootPage.43bf9cf1b45c36f23b7a.js
-%%DATADIR%%/public/build/AppRootPage.43bf9cf1b45c36f23b7a.js.map
-%%DATADIR%%/public/build/ChangePasswordPage.43bf9cf1b45c36f23b7a.js
-%%DATADIR%%/public/build/ChangePasswordPage.43bf9cf1b45c36f23b7a.js.map
-%%DATADIR%%/public/build/CreateTeam.43bf9cf1b45c36f23b7a.js
-%%DATADIR%%/public/build/CreateTeam.43bf9cf1b45c36f23b7a.js.map
-%%DATADIR%%/public/build/DashboardImport.43bf9cf1b45c36f23b7a.js
-%%DATADIR%%/public/build/DashboardImport.43bf9cf1b45c36f23b7a.js.map
-%%DATADIR%%/public/build/DashboardListPage.43bf9cf1b45c36f23b7a.js
-%%DATADIR%%/public/build/DashboardListPage.43bf9cf1b45c36f23b7a.js.map
-%%DATADIR%%/public/build/DashboardPage.43bf9cf1b45c36f23b7a.js

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202103291854.12TIs0lY006943>