www/grafana8: Update to 8.1.0

Changelog:
https://grafana.com/docs/grafana/latest/whatsnew/whats-new-in-v8-1/

Also small port refactoring:
- Excluded GH_TUPLE to dedicated Makefile.modules file.
- Removed config sample file grafana.ini.in, refactored to
  auto-generation via Makefile (it prevents unnecessary file patching
while update).

PR:		257655
Reported by:	maintainer

4 files changed, 294 insertions, 1307 deletions

diff --git a/www/grafana8/Makefile b/www/grafana8/Makefile
index 83e0696a3153..6507767b1e3a 100644
--- a/www/grafana8/Makefile
+++ b/www/grafana8/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	grafana
-DISTVERSION=	8.0.5
+DISTVERSION=	8.1.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www
 MASTER_SITES+=	https://dl.grafana.com/oss/release/:public \
@@ -25,234 +25,14 @@ RUN_DEPENDS=	ca_root_nss>=0:security/ca_root_nss
 USES=		go:modules
 
 USE_GITHUB=	yes
-GH_TUPLE=	\
-		Azure:azure-sdk-for-go:023238f4c45f:azure_azure_sdk_for_go_azcore/vendor/github.com/Azure/azure-sdk-for-go \
-		Azure:azure-sdk-for-go:2bc7350b1dcd:azure_azure_sdk_for_go_azidentity \
-		Azure:azure-sdk-for-go:aa6ba0a4ce44:azure_azure_sdk_for_go_internal \
-		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 \
-		Masterminds:semver:v1.5.0:masterminds_semver/vendor/github.com/Masterminds/semver \
-		PuerkitoBio:purell:v1.1.1:puerkitobio_purell/vendor/github.com/PuerkitoBio/purell \
-		PuerkitoBio:urlesc:de5bf2ad4578:puerkitobio_urlesc/vendor/github.com/PuerkitoBio/urlesc \
-		VividCortex:mysqlerr:6c6b55f8796f:vividcortex_mysqlerr/vendor/github.com/VividCortex/mysqlerr \
-		alexcesaro:quotedprintable:2caba252f4dc:alexcesaro_quotedprintable/vendor/gopkg.in/alexcesaro/quotedprintable.v3 \
-		apache:arrow:5bea62493d91:apache_arrow_arrow/vendor/github.com/apache/arrow \
-		apache:thrift:v0.14.1:apache_thrift/vendor/github.com/apache/thrift \
-		armon:go-metrics:v0.3.6:armon_go_metrics/vendor/github.com/armon/go-metrics \
-		asaskevich:govalidator:7a23bdc65eef:asaskevich_govalidator/vendor/github.com/asaskevich/govalidator \
-		aws:aws-sdk-go:v1.38.34: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:v1.1.0:benbjohnson_clock/vendor/github.com/benbjohnson/clock \
-		beorn7:perks:v1.0.1:beorn7_perks/vendor/github.com/beorn7/perks \
-		bradfitz:gomemcache:a41fca850d0b:bradfitz_gomemcache/vendor/github.com/bradfitz/gomemcache \
-		c2h5oh:datasize:28bbd4740fee:c2h5oh_datasize/vendor/github.com/c2h5oh/datasize \
-		cenkalti:backoff:v4.1.0:cenkalti_backoff_v4/vendor/github.com/cenkalti/backoff/v4 \
-		census-instrumentation:opencensus-go:v0.23.0:census_instrumentation_opencensus_go/vendor/go.opencensus.io \
-		centrifugal:centrifuge:v0.17.0:centrifugal_centrifuge/vendor/github.com/centrifugal/centrifuge \
-		centrifugal:protocol:v0.5.0:centrifugal_protocol/vendor/github.com/centrifugal/protocol \
-		cespare:xxhash:v1.1.0:cespare_xxhash/vendor/github.com/cespare/xxhash \
-		cespare:xxhash:v2.1.1:cespare_xxhash_v2/vendor/github.com/cespare/xxhash/v2 \
-		cheekybits:genny:v1.0.0:cheekybits_genny/vendor/github.com/cheekybits/genny \
-		cockroachdb:apd:v2.0.1:cockroachdb_apd_v2/vendor/github.com/cockroachdb/apd/v2 \
-		cortexproject:cortex:d382e1d80eaf:cortexproject_cortex/vendor/github.com/cortexproject/cortex \
-		cpuguy83:go-md2man:v2.0.0:cpuguy83_go_md2man_v2/vendor/github.com/cpuguy83/go-md2man/v2 \
-		crewjam:saml:bca570abb2ce:crewjam_saml/vendor/github.com/crewjam/saml \
-		cuelang:cue:v0.3.2:cuelang_cue/vendor/cuelang.org/go \
-		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 \
-		docker:go-units:v0.4.0:docker_go_units/vendor/github.com/docker/go-units \
-		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 \
-		emicklei:proto:v1.6.15:emicklei_proto/vendor/github.com/emicklei/proto \
-		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 \
-		facebookgo:structtag:217e25fb9691:facebookgo_structtag/vendor/github.com/facebookgo/structtag \
-		facebookgo:subset:8dac2c3c4870:facebookgo_subset/vendor/github.com/facebookgo/subset \
-		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.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.62.0:go_ini_ini/vendor/gopkg.in/ini.v1 \
-		go-kit:kit:v0.10.0:go_kit_kit/vendor/github.com/go-kit/kit \
-		go-ldap:ldap:v3.1.0:go_ldap_ldap/vendor/gopkg.in/ldap.v3 \
-		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.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-openapi:analysis:v0.20.0:go_openapi_analysis/vendor/github.com/go-openapi/analysis \
-		go-openapi:errors:v0.20.0:go_openapi_errors/vendor/github.com/go-openapi/errors \
-		go-openapi:jsonpointer:v0.19.5:go_openapi_jsonpointer/vendor/github.com/go-openapi/jsonpointer \
-		go-openapi:jsonreference:v0.19.5:go_openapi_jsonreference/vendor/github.com/go-openapi/jsonreference \
-		go-openapi:loads:v0.20.2:go_openapi_loads/vendor/github.com/go-openapi/loads \
-		go-openapi:runtime:v0.19.28:go_openapi_runtime/vendor/github.com/go-openapi/runtime \
-		go-openapi:spec:v0.20.3:go_openapi_spec/vendor/github.com/go-openapi/spec \
-		go-openapi:strfmt:v0.20.1:go_openapi_strfmt/vendor/github.com/go-openapi/strfmt \
-		go-openapi:swag:v0.19.15:go_openapi_swag/vendor/github.com/go-openapi/swag \
-		go-openapi:validate:v0.20.2:go_openapi_validate/vendor/github.com/go-openapi/validate \
-		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.6.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:496545a6307b:go_yaml_yaml_1/vendor/gopkg.in/yaml.v3 \
-		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 \
-		gofrs:uuid:v4.0.0:gofrs_uuid/vendor/github.com/gofrs/uuid \
-		gogo:googleapis:v1.1.0:gogo_googleapis/vendor/github.com/gogo/googleapis \
-		gogo:protobuf:v1.3.2:gogo_protobuf/vendor/github.com/gogo/protobuf \
-		gogo:status:v1.0.3: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:c07d793c2f9a:golang_crypto/vendor/golang.org/x/crypto \
-		golang:exp:85be41e4509f:golang_exp/vendor/golang.org/x/exp \
-		golang:groupcache:8c9f03a8e57e:golang_groupcache/vendor/github.com/golang/groupcache \
-		golang:lint:83fdc39ff7b5:golang_lint/vendor/golang.org/x/lint \
-		golang:mock:v1.5.0:golang_mock/vendor/github.com/golang/mock \
-		golang:mod:v0.4.1:golang_mod/vendor/golang.org/x/mod \
-		golang:net:fe42d452be8f:golang_net/vendor/golang.org/x/net \
-		golang:oauth2:5e61552d6c78:golang_oauth2/vendor/golang.org/x/oauth2 \
-		golang:protobuf:v1.5.2:golang_protobuf/vendor/github.com/golang/protobuf \
-		golang:snappy:v0.0.3:golang_snappy/vendor/github.com/golang/snappy \
-		golang:sync:036812b2e83c:golang_sync/vendor/golang.org/x/sync \
-		golang:sys:0cec03c779c1:golang_sys/vendor/golang.org/x/sys \
-		golang:text:v0.3.6:golang_text/vendor/golang.org/x/text \
-		golang:time:f8bda1e9f3ba:golang_time/vendor/golang.org/x/time \
-		golang:tools:v0.1.0:golang_tools/vendor/golang.org/x/tools \
-		golang:xerrors:5ec99f83aff1:golang_xerrors/vendor/golang.org/x/xerrors \
-		gomodule:redigo:v2.0.0:gomodule_redigo/vendor/github.com/gomodule/redigo \
-		gonum:gonum:v0.9.1:gonum_gonum/vendor/gonum.org/v1/gonum \
-		google:btree:v1.0.0:google_btree/vendor/github.com/google/btree \
-		google:flatbuffers:v1.11.0:google_flatbuffers/vendor/github.com/google/flatbuffers \
-		google:go-cmp:v0.5.5:google_go_cmp/vendor/github.com/google/go-cmp \
-		google:go-genproto:c14fb6ef47c3:google_go_genproto/vendor/google.golang.org/genproto \
-		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.45.0:googleapis_google_api_go_client/vendor/google.golang.org/api \
-		googleapis:google-cloud-go:storage/v1.14.0:googleapis_google_cloud_go_storage \
-		googleapis:google-cloud-go:v0.81.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:go-mssqldb:d0ce3c521036:grafana_go_mssqldb/vendor/github.com/denisenkom/go-mssqldb \
-		grafana:grafana-aws-sdk:v0.7.0:grafana_grafana_aws_sdk/vendor/github.com/grafana/grafana-aws-sdk \
-		grafana:grafana-live-sdk:v0.0.6:grafana_grafana_live_sdk/vendor/github.com/grafana/grafana-live-sdk \
-		grafana:grafana-plugin-sdk-go:v0.105.0:grafana_grafana_plugin_sdk_go/vendor/github.com/grafana/grafana-plugin-sdk-go \
-		grafana:loki:15d417efe103:grafana_loki/vendor/github.com/grafana/loki \
-		grpc-ecosystem:go-grpc-middleware:v1.3.0:grpc_ecosystem_go_grpc_middleware/vendor/github.com/grpc-ecosystem/go-grpc-middleware \
-		grpc-ecosystem:go-grpc-prometheus:6af20e3a5340:grpc_ecosystem_go_grpc_prometheus/vendor/github.com/grpc-ecosystem/go-grpc-prometheus \
-		grpc-ecosystem:grpc-gateway:v1.16.0:grpc_ecosystem_grpc_gateway/vendor/github.com/grpc-ecosystem/grpc-gateway \
-		grpc:grpc-go:v1.37.1:grpc_grpc_go/vendor/google.golang.org/grpc \
-		hashicorp:errwrap:v1.0.0:hashicorp_errwrap/vendor/github.com/hashicorp/errwrap \
-		hashicorp:go-hclog:v0.16.0:hashicorp_go_hclog/vendor/github.com/hashicorp/go-hclog \
-		hashicorp:go-immutable-radix:v1.2.0:hashicorp_go_immutable_radix/vendor/github.com/hashicorp/go-immutable-radix \
-		hashicorp:go-msgpack:v0.5.5:hashicorp_go_msgpack/vendor/github.com/hashicorp/go-msgpack \
-		hashicorp:go-multierror:v1.1.0:hashicorp_go_multierror/vendor/github.com/hashicorp/go-multierror \
-		hashicorp:go-plugin:v1.4.0:hashicorp_go_plugin/vendor/github.com/hashicorp/go-plugin \
-		hashicorp:go-sockaddr:v1.0.2:hashicorp_go_sockaddr/vendor/github.com/hashicorp/go-sockaddr \
-		hashicorp:go-version:v1.3.0:hashicorp_go_version/vendor/github.com/hashicorp/go-version \
-		hashicorp:golang-lru:v0.5.4:hashicorp_golang_lru/vendor/github.com/hashicorp/golang-lru \
-		hashicorp:memberlist:v0.2.3:hashicorp_memberlist/vendor/github.com/hashicorp/memberlist \
-		hashicorp:yamux:df201c70410d:hashicorp_yamux/vendor/github.com/hashicorp/yamux \
-		igm:sockjs-go:v3.0.0:igm_sockjs_go_v3/vendor/github.com/igm/sockjs-go \
-		inconshreveable:log15:67afb5ed74ec:inconshreveable_log15/vendor/github.com/inconshreveable/log15 \
-		influxdata:influxdb-client-go:v2.2.3:influxdata_influxdb_client_go_v2/vendor/github.com/influxdata/influxdb-client-go/v2 \
-		influxdata:line-protocol:9aa0e372d097:influxdata_line_protocol/vendor/github.com/influxdata/line-protocol \
-		jessevdk:go-flags:v1.5.0:jessevdk_go_flags/vendor/github.com/jessevdk/go-flags \
-		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 \
-		josharian:intern:v1.0.0:josharian_intern/vendor/github.com/josharian/intern \
-		jpillora:backoff:v1.0.0:jpillora_backoff/vendor/github.com/jpillora/backoff \
-		json-iterator:go:v1.1.11: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.16.2:jung_kurt_gofpdf/vendor/github.com/jung-kurt/gofpdf \
-		klauspost:compress:v1.12.2:klauspost_compress/vendor/github.com/klauspost/compress \
-		kubernetes:client-go:v0.18.8:kubernetes_client_go/vendor/k8s.io/client-go \
-		lib:pq:v1.10.0:lib_pq/vendor/github.com/lib/pq \
-		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 \
-		mailru:easyjson:v0.7.6:mailru_easyjson/vendor/github.com/mailru/easyjson \
-		mattermost:xml-roundtrip-validator:bcd7e1b9601e:mattermost_xml_roundtrip_validator/vendor/github.com/mattermost/xml-roundtrip-validator \
-		mattetti:filebuffer:v1.0.1:mattetti_filebuffer/vendor/github.com/mattetti/filebuffer \
-		mattn:go-colorable:v0.1.8:mattn_go_colorable/vendor/github.com/mattn/go-colorable \
-		mattn:go-isatty:v0.0.12:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
-		mattn:go-runewidth:v0.0.9:mattn_go_runewidth/vendor/github.com/mattn/go-runewidth \
-		mattn:go-sqlite3:v1.14.7:mattn_go_sqlite3/vendor/github.com/mattn/go-sqlite3 \
-		matttproud:golang_protobuf_extensions:v1.0.1:matttproud_golang_protobuf_extensions/vendor/github.com/matttproud/golang_protobuf_extensions \
-		miekg:dns:v1.1.41:miekg_dns/vendor/github.com/miekg/dns \
-		mitchellh:go-testing-interface:v1.0.0:mitchellh_go_testing_interface/vendor/github.com/mitchellh/go-testing-interface \
-		mitchellh:mapstructure:v1.4.1:mitchellh_mapstructure/vendor/github.com/mitchellh/mapstructure \
-		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 \
-		mongodb:mongo-go-driver:v1.5.1:mongodb_mongo_go_driver/vendor/go.mongodb.org/mongo-driver \
-		mpvl:unique:cbe035fff7de:mpvl_unique/vendor/github.com/mpvl/unique \
-		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.5:olekukonko_tablewriter/vendor/github.com/olekukonko/tablewriter \
-		open-telemetry:opentelemetry-collector:v0.27.0:open_telemetry_opentelemetry_collector/vendor/go.opentelemetry.io/collector \
-		opentracing-contrib:go-grpc:73cb765af46e: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 \
-		opentracing:opentracing-go:v1.2.0:opentracing_opentracing_go/vendor/github.com/opentracing/opentracing-go \
-		patrickmn:go-cache:v2.1.0:patrickmn_go_cache/vendor/github.com/patrickmn/go-cache \
-		pkg:browser:ce105d075bb4:pkg_browser/vendor/github.com/pkg/browser \
-		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:alertmanager:v0.22.0:prometheus_alertmanager/vendor/github.com/prometheus/alertmanager \
-		prometheus:client_golang:v1.10.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.24.0:prometheus_common/vendor/github.com/prometheus/common \
-		prometheus:node_exporter:01054558c289:prometheus_node_exporter/vendor/github.com/prometheus/node_exporter \
-		prometheus:procfs:v0.6.0:prometheus_procfs/vendor/github.com/prometheus/procfs \
-		prometheus:prometheus:2a4b8e12bbf2:prometheus_prometheus/vendor/github.com/prometheus/prometheus \
-		protocolbuffers:protobuf-go:v1.26.0:protocolbuffers_protobuf_go/vendor/google.golang.org/protobuf \
-		rainycape:unidecode:cb7f23ec59be:rainycape_unidecode/vendor/github.com/rainycape/unidecode \
-		robfig:cron:b41be1df6967:robfig_cron/vendor/github.com/robfig/cron \
-		robfig:cron:v3.0.1:robfig_cron_v3/vendor/github.com/robfig/cron/v3 \
-		rs:cors:v1.7.0:rs_cors/vendor/github.com/rs/cors \
-		russellhaering:goxmldsig:v1.1.0:russellhaering_goxmldsig/vendor/github.com/russellhaering/goxmldsig \
-		russross:blackfriday:v2.0.1:russross_blackfriday_v2/vendor/github.com/russross/blackfriday/v2 \
-		sean-:seed:e2103e2c3529:sean__seed/vendor/github.com/sean-/seed \
-		sercand:kuberesolver:v2.4.0:sercand_kuberesolver/vendor/github.com/sercand/kuberesolver \
-		sergi:go-diff:v1.0.0:sergi_go_diff/vendor/github.com/sergi/go-diff \
-		shurcooL:httpfs:8d4bc4ba7749:shurcool_httpfs/vendor/github.com/shurcooL/httpfs \
-		shurcooL:sanitized_anchor_name:v1.0.0:shurcool_sanitized_anchor_name/vendor/github.com/shurcooL/sanitized_anchor_name \
-		shurcooL:vfsgen:0d455de96546:shurcool_vfsgen/vendor/github.com/shurcooL/vfsgen \
-		sirupsen:logrus:v1.7.0:sirupsen_logrus/vendor/github.com/sirupsen/logrus \
-		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.7.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.27.0:uber_jaeger_client_go/vendor/github.com/uber/jaeger-client-go \
-		uber:jaeger-lib:v2.4.1:uber_jaeger_lib/vendor/github.com/uber/jaeger-lib \
-		unknwon:com:v1.0.1:unknwon_com/vendor/github.com/unknwon/com \
-		urfave:cli:v2.3.0:urfave_cli_v2/vendor/github.com/urfave/cli/v2 \
-		weaveworks:common:009d1eebd624:weaveworks_common/vendor/github.com/weaveworks/common \
-		weaveworks:promrus:v1.2.0:weaveworks_promrus/vendor/github.com/weaveworks/promrus \
-		xorcare:pointer:v1.1.0:xorcare_pointer/vendor/github.com/xorcare/pointer \
-		yudai:gojsondiff:v1.0.0:yudai_gojsondiff/vendor/github.com/yudai/gojsondiff \
-		yudai:golcs:ecda9a501e82:yudai_golcs/vendor/github.com/yudai/golcs
 
 USE_RC_SUBR=	grafana
-TAG=		cbb2aa5
+TAG=		62e720c
 
 GO_TARGET=	./pkg/cmd/grafana-server \
 		./pkg/cmd/grafana-cli
 GO_BUILDFLAGS=	-ldflags="-w -X main.version=${PORTVERSION} -X main.commit=${TAG}"
 
-SUB_FILES=	grafana.ini
 SUB_LIST=	GRAFANA_USER=${GRAFANA_USER} \
 		GRAFANA_GROUP=${GRAFANA_GROUP} \
 		GRAFANA_DATADIR=${GRAFANA_DATADIR} \
@@ -260,7 +40,7 @@ SUB_LIST=	GRAFANA_USER=${GRAFANA_USER} \
 		GRAFANA_LOGDIR=${GRAFANA_LOGDIR} \
 		GRAFANA_PLUGINDIR=${GRAFANA_PLUGINDIR} \
 		GRAFANA_PROVISIONINGDIR=${GRAFANA_PROVISIONINGDIR} \
-		GRAFANA_BUILDHASH=cb577348e5e011d82919
+		GRAFANA_BUILDHASH=d7cfb4e56c8be9229275
 
 GRAFANA_USER?=	grafana
 GRAFANA_GROUP?=	grafana
@@ -276,6 +56,9 @@ GRAFANA_LOGDIR?=		/var/log/${PORTNAME}
 GRAFANA_PLUGINDIR?=		${GRAFANA_DATADIR}/plugins
 GRAFANA_PROVISIONINGDIR?=	${ETCDIR}/provisioning
 
+# This file includes the GH_TUPLE. Generated by make gomod-vendor.
+.include "Makefile.modules"
+
 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)
@@ -297,7 +80,13 @@ post-install:
 		${COPYTREE_SHARE} public ${STAGEDIR}${GRAFANA_HOMEDIR} )
 	${INSTALL_DATA} ${WRKSRC}/conf/defaults.ini \
 		${STAGEDIR}${GRAFANA_HOMEDIR}/conf/defaults.ini
-	${INSTALL_DATA} ${WRKDIR}/grafana.ini \
-		${STAGEDIR}${ETCDIR}/grafana.ini.sample
+
+	${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' \
+		-e 's|;provisioning = conf/provisioning|provisioning = ${GRAFANA_PROVISIONINGDIR}|g' \
+		 ${WRKSRC}/conf/sample.ini
+	${INSTALL_DATA} ${WRKSRC}/conf/sample.ini ${STAGEDIR}${ETCDIR}/grafana.ini.sample
 
 .include <bsd.port.mk>
diff --git a/www/grafana8/distinfo b/www/grafana8/distinfo
index 28daf02490c1..7bb939f099bd 100644
--- a/www/grafana8/distinfo
+++ b/www/grafana8/distinfo
@@ -1,14 +1,14 @@
-TIMESTAMP = 1625776511
-SHA256 (grafana-8.0.5.linux-amd64.tar.gz) = 6956694d0e0446b255dd8378534bffb49a1891383bbe54157bab0820ad8d1349
-SIZE (grafana-8.0.5.linux-amd64.tar.gz) = 55588076
+TIMESTAMP = 1628237187
+SHA256 (grafana-8.1.0.linux-amd64.tar.gz) = 3ac8c82bd34e5395f29f350e2f29ed4eab87d143f02ff12ac3d5e3683b123be8
+SIZE (grafana-8.1.0.linux-amd64.tar.gz) = 57174165
 SHA256 (v0.3.6.tar.gz) = af49dbe70ab6b0eb31d69afd89c3260b82cb662607b66eac41b65d642faee6bb
 SIZE (v0.3.6.tar.gz) = 22747
 SHA256 (v0.7.3.tar.gz) = 9709c0e8eec3045832f9da81c7bcacf1a32774cb674efcd5662dd8b4d82f70c1
 SIZE (v0.7.3.tar.gz) = 21163
 SHA256 (v0.8.2.tar.gz) = 871cec6861f88b22fe36879e854872f960fae58a4e87d93c6c43d90558c8fc84
 SIZE (v0.8.2.tar.gz) = 413897
-SHA256 (grafana-grafana-v8.0.5_GH0.tar.gz) = ca2bed2f2832928bbf4e3ff81f93bdb36896b3a22dd931f12332e8d3eccfb576
-SIZE (grafana-grafana-v8.0.5_GH0.tar.gz) = 11580051
+SHA256 (grafana-grafana-v8.1.0_GH0.tar.gz) = 5ab5456b3bdf79a48ad6e5cb6ba3c7c8418f2ab01540e34c77f8fe561c1812ec
+SIZE (grafana-grafana-v8.1.0_GH0.tar.gz) = 11893577
 SHA256 (Azure-azure-sdk-for-go-023238f4c45f_GH0.tar.gz) = 7fc283310c39645475503e4388f96cbc721cca5d35de57bc17282188b70ce69c
 SIZE (Azure-azure-sdk-for-go-023238f4c45f_GH0.tar.gz) = 36528192
 SHA256 (Azure-azure-sdk-for-go-2bc7350b1dcd_GH0.tar.gz) = a385b24461c2dd73a3e32e130f9bf51940cbd263d5abaa2486aab6a37b27b079
@@ -39,8 +39,8 @@ SHA256 (armon-go-metrics-v0.3.6_GH0.tar.gz) = c4f5898a817bcbbc68aea6de0ce0b1a2d4
 SIZE (armon-go-metrics-v0.3.6_GH0.tar.gz) = 34592
 SHA256 (asaskevich-govalidator-7a23bdc65eef_GH0.tar.gz) = a8a0ecc0f3f23bef9886a6b798d7a61d5c4b24e1aa8065a0de0173a4b39f7f5d
 SIZE (asaskevich-govalidator-7a23bdc65eef_GH0.tar.gz) = 60431
-SHA256 (aws-aws-sdk-go-v1.38.34_GH0.tar.gz) = 95a84e99858740ac822aea0a7273804fd614989950a01382c903116d96cb6b84
-SIZE (aws-aws-sdk-go-v1.38.34_GH0.tar.gz) = 18961954
+SHA256 (aws-aws-sdk-go-v1.38.68_GH0.tar.gz) = 78c240654b607c291f17817cd7271bc36415e84b1d0574533606cdf3390051a0
+SIZE (aws-aws-sdk-go-v1.38.68_GH0.tar.gz) = 19544729
 SHA256 (beevik-etree-v1.1.0_GH0.tar.gz) = d1b424a126ce5c46d8e9ba42217e7997cc992bef56d17cc39d1d91525c0dc1de
 SIZE (beevik-etree-v1.1.0_GH0.tar.gz) = 26390
 SHA256 (benbjohnson-clock-v1.1.0_GH0.tar.gz) = 43d7a7d4d1cfe92831ecaabdf005f5ae3495739f726cc5af67614d2837b8bcb7
@@ -55,8 +55,8 @@ SHA256 (cenkalti-backoff-v4.1.0_GH0.tar.gz) = 8911c7834acfa7795271db561cfafd8a4b
 SIZE (cenkalti-backoff-v4.1.0_GH0.tar.gz) = 9834
 SHA256 (census-instrumentation-opencensus-go-v0.23.0_GH0.tar.gz) = cc9dc0234de1baacf1855cf19615b381ca2f2adb83a2871e7a9b8b74e46818cf
 SIZE (census-instrumentation-opencensus-go-v0.23.0_GH0.tar.gz) = 176498
-SHA256 (centrifugal-centrifuge-v0.17.0_GH0.tar.gz) = 481e3fd652d3b603ac210dbd8bea234d84c6f46070405a8649314c9a9f27ec84
-SIZE (centrifugal-centrifuge-v0.17.0_GH0.tar.gz) = 398849
+SHA256 (centrifugal-centrifuge-v0.17.1_GH0.tar.gz) = bb532436710f77d4bf4f47567e42f338a5930e48465cb016141fe6576762a33d
+SIZE (centrifugal-centrifuge-v0.17.1_GH0.tar.gz) = 399621
 SHA256 (centrifugal-protocol-v0.5.0_GH0.tar.gz) = 6a09bc7aab085ae594edb68bb2abbb4d90323caf2a9e54f43c53405db53ce85f
 SIZE (centrifugal-protocol-v0.5.0_GH0.tar.gz) = 34594
 SHA256 (cespare-xxhash-v1.1.0_GH0.tar.gz) = 9418be390574092f0ca989b9ae2f5450270ead8125a635a100850b28c8c9c495
@@ -109,8 +109,10 @@ SHA256 (go-asn1-ber-asn1-ber-f715ec2f112d_GH0.tar.gz) = 084d4021bd3a9ae361fff6c5
 SIZE (go-asn1-ber-asn1-ber-f715ec2f112d_GH0.tar.gz) = 13199
 SHA256 (go-ini-ini-v1.62.0_GH0.tar.gz) = 926ca2ff49018dc5c0991f3a790bc2083a3c52c470167d42f0f0bcd6642ff64e
 SIZE (go-ini-ini-v1.62.0_GH0.tar.gz) = 50314
-SHA256 (go-kit-kit-v0.10.0_GH0.tar.gz) = c0fac2e37b981e4c18e4f210b92e1393bd59dadd7c7fc043ec46d1c9834eba85
-SIZE (go-kit-kit-v0.10.0_GH0.tar.gz) = 274801
+SHA256 (go-kit-kit-v0.11.0_GH0.tar.gz) = b73d4ed2f4fb8bdf54241af41d443ab14faef427afcfcb93d7c4f009cc65c0c7
+SIZE (go-kit-kit-v0.11.0_GH0.tar.gz) = 215787
+SHA256 (go-kit-log-v0.1.0_GH0.tar.gz) = 8850c5fb4c143ec830a85dd99085d77591de453ce66c26ecc97eca911f785665
+SIZE (go-kit-log-v0.1.0_GH0.tar.gz) = 28979
 SHA256 (go-ldap-ldap-v3.1.0_GH0.tar.gz) = d92a365629f2df40216e5d637ef2c5a3984d40ba219f55dc34af59ad659e3ab4
 SIZE (go-ldap-ldap-v3.1.0_GH0.tar.gz) = 41634
 SHA256 (go-logfmt-logfmt-v0.5.0_GH0.tar.gz) = 76727000951c187d058289d8e83d3e2ad480a5d44c7c83b025b78b7eb6bf0258
@@ -171,8 +173,8 @@ SHA256 (golang-sql-civil-cb61b32ac6fe_GH0.tar.gz) = ebc100d46719b1374b59e59bc63b
 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-c07d793c2f9a_GH0.tar.gz) = bd1e0856c43287c6ebd20d59e2b4f2ffa91c5cc275dbb02bb2cfc822e6dc18a4
-SIZE (golang-crypto-c07d793c2f9a_GH0.tar.gz) = 1732023
+SHA256 (golang-crypto-5ff15b29337e_GH0.tar.gz) = 094d3a6563b4e2d7ce5e4ac2ff5f79bc14a4a7111a3310270e63505705a43cb6
+SIZE (golang-crypto-5ff15b29337e_GH0.tar.gz) = 1732042
 SHA256 (golang-exp-85be41e4509f_GH0.tar.gz) = 6fb18daada899f426f0b689b00c495035e7dbb9269f4d4d4017a154f9e6c5c8d
 SIZE (golang-exp-85be41e4509f_GH0.tar.gz) = 1526135
 SHA256 (golang-groupcache-8c9f03a8e57e_GH0.tar.gz) = b92f918daa48048fd360f14d1a4aed6e70c1176ae6b00b0dc04094bb088e9865
@@ -183,10 +185,10 @@ SHA256 (golang-mock-v1.5.0_GH0.tar.gz) = 7a8212b8332072626d1ce440883929a28ab1845
 SIZE (golang-mock-v1.5.0_GH0.tar.gz) = 66429
 SHA256 (golang-mod-v0.4.1_GH0.tar.gz) = 548935751dbc1c29a27bf1b1de6d7ffe58b752d6ad7bc1f254e6ea89ae2ddd59
 SIZE (golang-mod-v0.4.1_GH0.tar.gz) = 102751
-SHA256 (golang-net-fe42d452be8f_GH0.tar.gz) = c7e6cff40e77036dde500b7293aaeddcb36e6f61647cedeb3a13678ff129ac1b
-SIZE (golang-net-fe42d452be8f_GH0.tar.gz) = 1251727
-SHA256 (golang-oauth2-5e61552d6c78_GH0.tar.gz) = 01ea885d501ffceaecaef9a91a433c3391583f4ee6cae16115ebb2ccafcc90c9
-SIZE (golang-oauth2-5e61552d6c78_GH0.tar.gz) = 78982
+SHA256 (golang-net-04defd469f4e_GH0.tar.gz) = 6009a6f0989341df975799276ff1c49af650d4a4ed3fd6db3501b91eb601810d
+SIZE (golang-net-04defd469f4e_GH0.tar.gz) = 1252122
+SHA256 (golang-oauth2-f6687ab2804c_GH0.tar.gz) = 27c3e0a310558e28bb92068320ea50b5c03c75a06312d37a7fa5e517e1e79f8d
+SIZE (golang-oauth2-f6687ab2804c_GH0.tar.gz) = 79618
 SHA256 (golang-protobuf-v1.5.2_GH0.tar.gz) = 088cc0f3ba18fb8f9d00319568ff0af5a06d8925a6e6cb983bb837b4efb703b3
 SIZE (golang-protobuf-v1.5.2_GH0.tar.gz) = 171702
 SHA256 (golang-snappy-v0.0.3_GH0.tar.gz) = c22541bf48b252b55ea0e618a5887e3d4f95c6ec5e46bbd60d1020366ffa2580
@@ -197,10 +199,10 @@ SHA256 (golang-sys-0cec03c779c1_GH0.tar.gz) = 3f02c01a4394b5c6868065916b40a2d3ec
 SIZE (golang-sys-0cec03c779c1_GH0.tar.gz) = 1197020
 SHA256 (golang-text-v0.3.6_GH0.tar.gz) = f66bebcf21985b0a713d67c6c35dfc9800d3b6d00d62b83ed0ce5b2ed4cb9760
 SIZE (golang-text-v0.3.6_GH0.tar.gz) = 8351095
-SHA256 (golang-time-f8bda1e9f3ba_GH0.tar.gz) = e068a34e54894c9c189ba2c2e5b7ea9116ed661f6a7c0d0e744d8e0066017ebb
-SIZE (golang-time-f8bda1e9f3ba_GH0.tar.gz) = 9656
-SHA256 (golang-tools-v0.1.0_GH0.tar.gz) = 88f66c1a7ff0f7fce20c0808d2769baa977f56f74197c9681cd864d0977e97a2
-SIZE (golang-tools-v0.1.0_GH0.tar.gz) = 2683055
+SHA256 (golang-time-38a9dc6acbc6_GH0.tar.gz) = 2988d124069c25520c6389d823f6f3985fafe86a0355ba8d2ee33040dca085dc
+SIZE (golang-time-38a9dc6acbc6_GH0.tar.gz) = 9663
+SHA256 (golang-tools-v0.1.3_GH0.tar.gz) = 2deb87ad7b920308820245a3d6a20889558d14ea4ad6505ace798f391da57b8a
+SIZE (golang-tools-v0.1.3_GH0.tar.gz) = 2813072
 SHA256 (golang-xerrors-5ec99f83aff1_GH0.tar.gz) = 71975d658357e170fd6a41f92539cde8b39c9cd8bfe5931b6311bc5f5c0da0d7
 SIZE (golang-xerrors-5ec99f83aff1_GH0.tar.gz) = 13664
 SHA256 (gomodule-redigo-v2.0.0_GH0.tar.gz) = b97a9b0298c371c80b4ba141cb683eaa003c8825a5b02526a03435f6e7568289
@@ -211,16 +213,16 @@ SHA256 (google-btree-v1.0.0_GH0.tar.gz) = 9f53e0e1330a4dbe92100d516606791f7196bf
 SIZE (google-btree-v1.0.0_GH0.tar.gz) = 15292
 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.5_GH0.tar.gz) = 8f1a0041f484812ae219e7548a13d5269c947cfcdea6031d40cdc85cd0663b3e
-SIZE (google-go-cmp-v0.5.5_GH0.tar.gz) = 102358
+SHA256 (google-go-cmp-v0.5.6_GH0.tar.gz) = cba2118596f694c135b3f3d6fe49b73ca2a7882aa4d7f346e341cb106afce5f1
+SIZE (google-go-cmp-v0.5.6_GH0.tar.gz) = 104421
 SHA256 (google-go-genproto-c14fb6ef47c3_GH0.tar.gz) = 26b5114e119b8945b16a7205d55e1dbd3c006940ac4568d670081690ef7210a8
 SIZE (google-go-genproto-c14fb6ef47c3_GH0.tar.gz) = 8642924
-SHA256 (google-uuid-v1.2.0_GH0.tar.gz) = 53ba896ce398435b3ba4f9375f5d4908b09c79daaa54ecd4e5000b7bef984380
-SIZE (google-uuid-v1.2.0_GH0.tar.gz) = 14158
+SHA256 (google-uuid-v1.3.0_GH0.tar.gz) = 7f7f37c47980e0afcc178a9ffc390bec29ed2371919b4c07658eb01791a7f921
+SIZE (google-uuid-v1.3.0_GH0.tar.gz) = 16210
 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.45.0_GH0.tar.gz) = 628120c26b3db51e218d50b3555eb552a12993e5c1096b4ed8ad200bae925985
-SIZE (googleapis-google-api-go-client-v0.45.0_GH0.tar.gz) = 20020236
+SHA256 (googleapis-google-api-go-client-v0.48.0_GH0.tar.gz) = 3b74d780082aab813e45abdec66e25d1609431cca8b5a3b0c6c7fc8a73907994
+SIZE (googleapis-google-api-go-client-v0.48.0_GH0.tar.gz) = 20721037
 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 (googleapis-google-cloud-go-v0.81.0_GH0.tar.gz) = 307f191f0ebcd71b96ec66554670eb3cf0398c64a427e43651472b5d9616f1ae
@@ -237,10 +239,8 @@ SHA256 (grafana-go-mssqldb-d0ce3c521036_GH0.tar.gz) = a3a62b4964fee10a698852dea6
 SIZE (grafana-go-mssqldb-d0ce3c521036_GH0.tar.gz) = 522960
 SHA256 (grafana-grafana-aws-sdk-v0.7.0_GH0.tar.gz) = 8134e3424fe2f22707d4aefbe8bbbe00ecd9da00fa86ea75691e6d9061f0a026
 SIZE (grafana-grafana-aws-sdk-v0.7.0_GH0.tar.gz) = 247569
-SHA256 (grafana-grafana-live-sdk-v0.0.6_GH0.tar.gz) = 9d975230c2e124c5abe290aea520a7b7a6e1392321ef2c83cb4deb97b2340c5e
-SIZE (grafana-grafana-live-sdk-v0.0.6_GH0.tar.gz) = 37093
-SHA256 (grafana-grafana-plugin-sdk-go-v0.105.0_GH0.tar.gz) = 2312770d2ef3271391cac468e7b54ec20aca55d1b5e504ff2147b4eb3db0bca9
-SIZE (grafana-grafana-plugin-sdk-go-v0.105.0_GH0.tar.gz) = 168228
+SHA256 (grafana-grafana-plugin-sdk-go-v0.111.0_GH0.tar.gz) = 19beb65361c52156f6dcdcd4e181162cb38462d00b7be17257b205bf660cdbea
+SIZE (grafana-grafana-plugin-sdk-go-v0.111.0_GH0.tar.gz) = 169593
 SHA256 (grafana-loki-15d417efe103_GH0.tar.gz) = 5bbd4caedfd9e57ffb64102abc992e9de3d672d387e4d6fede76f15ddc704889
 SIZE (grafana-loki-15d417efe103_GH0.tar.gz) = 25278521
 SHA256 (grpc-ecosystem-go-grpc-middleware-v1.3.0_GH0.tar.gz) = c9b908202c05a7f821b03ee49cd678e7e71469519054629770e0565d78275cbc
@@ -249,20 +249,20 @@ SHA256 (grpc-ecosystem-go-grpc-prometheus-6af20e3a5340_GH0.tar.gz) = e37a815659a
 SIZE (grpc-ecosystem-go-grpc-prometheus-6af20e3a5340_GH0.tar.gz) = 30606
 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.37.1_GH0.tar.gz) = 66e9c38c6785214e2cd4256d87652d79b4af32f8f5028dbe0c06df7aa97127ff
-SIZE (grpc-grpc-go-v1.37.1_GH0.tar.gz) = 1237043
+SHA256 (grpc-grpc-go-v1.39.0_GH0.tar.gz) = 25ae4269a19c5ab7e1396e2a50c18c323b79ecc1356f36773bfc433a93139840
+SIZE (grpc-grpc-go-v1.39.0_GH0.tar.gz) = 1287021
 SHA256 (hashicorp-errwrap-v1.0.0_GH0.tar.gz) = 26afc0e5895c6ce87c881c5c02c682ccc9a08174a9c27ca26d4a1e72dbf78128
 SIZE (hashicorp-errwrap-v1.0.0_GH0.tar.gz) = 8346
-SHA256 (hashicorp-go-hclog-v0.16.0_GH0.tar.gz) = 9c07cb9963a3db3a286971bc7a6d5e17612105770d0a82c441c397202bbc61ae
-SIZE (hashicorp-go-hclog-v0.16.0_GH0.tar.gz) = 26817
+SHA256 (hashicorp-go-hclog-v0.16.1_GH0.tar.gz) = 85ea26ef079ec299731bd3894c599e7bf429343ceec6611f9d53b12c762b91cb
+SIZE (hashicorp-go-hclog-v0.16.1_GH0.tar.gz) = 27028
 SHA256 (hashicorp-go-immutable-radix-v1.2.0_GH0.tar.gz) = 06a814791893c19e98bd48623eedeefd966faa9b53403ec9a8d102d978b7aa6e
 SIZE (hashicorp-go-immutable-radix-v1.2.0_GH0.tar.gz) = 23037
 SHA256 (hashicorp-go-msgpack-v0.5.5_GH0.tar.gz) = a6a95afd348ce6f0be9183266d9479d8b8738097ff82b16345a78c7e26a37e13
 SIZE (hashicorp-go-msgpack-v0.5.5_GH0.tar.gz) = 50069
 SHA256 (hashicorp-go-multierror-v1.1.0_GH0.tar.gz) = 466a1f3596417a35b407d06d2dc2cb87dba46b025af4f77d30f82aa6e0e6d4d4
 SIZE (hashicorp-go-multierror-v1.1.0_GH0.tar.gz) = 12084
-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-plugin-v1.4.2_GH0.tar.gz) = a5be5283976cbb7e50d639bc5a0ec9c2af6c2ff9ce604b536286524f869ad07f
+SIZE (hashicorp-go-plugin-v1.4.2_GH0.tar.gz) = 86680
 SHA256 (hashicorp-go-sockaddr-v1.0.2_GH0.tar.gz) = ce70228b6c0ac432b97c2a98697600668bf7ac8b4cd21e7c6767bed1e755ae7f
 SIZE (hashicorp-go-sockaddr-v1.0.2_GH0.tar.gz) = 663049
 SHA256 (hashicorp-go-version-v1.3.0_GH0.tar.gz) = a459b2d8a3ca4d67fc13869a7869fa6c8aff6491d465b2cbe2842b56df87cfba
@@ -349,8 +349,8 @@ SHA256 (oklog-ulid-v1.3.1_GH0.tar.gz) = 499a6ee77ca473a44ad9f11425a8f87f6c02ff12
 SIZE (oklog-ulid-v1.3.1_GH0.tar.gz) = 55582
 SHA256 (olekukonko-tablewriter-v0.0.5_GH0.tar.gz) = 14a1294a8267facc9bc99a230b8871517e6db284ccc7e39030313befa124677f
 SIZE (olekukonko-tablewriter-v0.0.5_GH0.tar.gz) = 19568
-SHA256 (open-telemetry-opentelemetry-collector-v0.27.0_GH0.tar.gz) = bcc43ab6d966abf788bb6884f64194dfb751d55024c04fa07ff50692bf1e0e4f
-SIZE (open-telemetry-opentelemetry-collector-v0.27.0_GH0.tar.gz) = 5973269
+SHA256 (open-telemetry-opentelemetry-collector-v0.31.0_GH0.tar.gz) = d43e1be9fac8ff2a2b6d586443bf0ca59692531d26e2204d065f3bbb1747d012
+SIZE (open-telemetry-opentelemetry-collector-v0.31.0_GH0.tar.gz) = 6026411
 SHA256 (opentracing-contrib-go-grpc-73cb765af46e_GH0.tar.gz) = b62989b2baf39fc21dc677df58744aed15e4a8f94ba3afad7765b1f738edb7c5
 SIZE (opentracing-contrib-go-grpc-73cb765af46e_GH0.tar.gz) = 15912
 SHA256 (opentracing-contrib-go-stdlib-v1.0.0_GH0.tar.gz) = 9b9f3acf86ffe123b4c67f780aa2cfb2203891bacc2da3b6344112c4d0a18e1a
@@ -365,22 +365,22 @@ SHA256 (pkg-errors-v0.9.1_GH0.tar.gz) = 56bfd893023daa498508bfe161de1be83299fcf1
 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-alertmanager-v0.22.0_GH0.tar.gz) = 8435abadccc31bec2de20e1c90a47e77f58b6271e2b0a03e2b031446b8963226
-SIZE (prometheus-alertmanager-v0.22.0_GH0.tar.gz) = 2087676
-SHA256 (prometheus-client_golang-v1.10.0_GH0.tar.gz) = e7305f84aa6553d9dd4bfd148d29289df36a9df82dae7be3c6eda62feb56f3d1
-SIZE (prometheus-client_golang-v1.10.0_GH0.tar.gz) = 176316
+SHA256 (prometheus-alertmanager-v0.22.2_GH0.tar.gz) = 68ec391b706c4a0a401190adc855097d9a0a06064d51b39c2d81932c69b00fde
+SIZE (prometheus-alertmanager-v0.22.2_GH0.tar.gz) = 2089680
+SHA256 (prometheus-client_golang-v1.11.0_GH0.tar.gz) = a3bc3312bde4182e507042ca0e7ca88aac6656bbf8d516d732e34c3f14bb612a
+SIZE (prometheus-client_golang-v1.11.0_GH0.tar.gz) = 168706
 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.24.0_GH0.tar.gz) = 899b359d81ff272cf546301841c485c90270c4e8694f75b975e182d999652bfd
-SIZE (prometheus-common-v0.24.0_GH0.tar.gz) = 127737
+SHA256 (prometheus-common-v0.29.0_GH0.tar.gz) = 61d6756202f3e313ca6e4e1ba1545e8e5def31a03a7bb81fca1ee2db5f3008d5
+SIZE (prometheus-common-v0.29.0_GH0.tar.gz) = 124111
 SHA256 (prometheus-node_exporter-01054558c289_GH0.tar.gz) = 2d8e7a9a1a9d03182d2a0c23a6709d60b8c78c0269ad6b5c4dec88108784fabe
 SIZE (prometheus-node_exporter-01054558c289_GH0.tar.gz) = 2759994
 SHA256 (prometheus-procfs-v0.6.0_GH0.tar.gz) = 6ad7a23cf4db9fa5dbf2c5d8fbd0fbf5ffe48e3ddb7bf15f9359813d764ce73c
 SIZE (prometheus-procfs-v0.6.0_GH0.tar.gz) = 169898
-SHA256 (prometheus-prometheus-2a4b8e12bbf2_GH0.tar.gz) = 2936521cd57e3f3f8c532533924f3d5473effa51f1277406eb72abb265cf417f
-SIZE (prometheus-prometheus-2a4b8e12bbf2_GH0.tar.gz) = 5639603
-SHA256 (protocolbuffers-protobuf-go-v1.26.0_GH0.tar.gz) = 26218474bcf776ecf32d7d194c6bfaca8e7b4f0c087e5b595fd50fbb31409676
-SIZE (protocolbuffers-protobuf-go-v1.26.0_GH0.tar.gz) = 1270215
+SHA256 (prometheus-prometheus-ff58416a0b02_GH0.tar.gz) = a18b1520eeb6d941daad231506d8ac3684e4c16bed70e873a3213295b4b2f781
+SIZE (prometheus-prometheus-ff58416a0b02_GH0.tar.gz) = 5672649
+SHA256 (protocolbuffers-protobuf-go-v1.27.1_GH0.tar.gz) = 3ec41a8324431e72f85e0dc0c2c098cc14c3cb1ee8820996c8f46afca2d65609
+SIZE (protocolbuffers-protobuf-go-v1.27.1_GH0.tar.gz) = 1278521
 SHA256 (rainycape-unidecode-cb7f23ec59be_GH0.tar.gz) = cd66a7ee66c8061c2d05585058323d0bcc6692761db94885511762428acfef96
 SIZE (rainycape-unidecode-cb7f23ec59be_GH0.tar.gz) = 387823
 SHA256 (robfig-cron-b41be1df6967_GH0.tar.gz) = d1fe0b58e76e916940d9f088f76b7f894cab754769c3fed56f64f0f0c29e0a92
@@ -427,8 +427,8 @@ SHA256 (uber-go-atomic-v1.7.0_GH0.tar.gz) = 4d655e90a23d023b36607e2ce94c3b7bf650
 SIZE (uber-go-atomic-v1.7.0_GH0.tar.gz) = 18566
 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.27.0_GH0.tar.gz) = 7590acdefcbbf9553bd3415bc7e5ec977731646363c5350d56faba31a097d996
-SIZE (uber-jaeger-client-go-v2.27.0_GH0.tar.gz) = 210139
+SHA256 (uber-jaeger-client-go-v2.29.1_GH0.tar.gz) = 853bd485d5d2bd0ff6d779d2e1196568ee9bf1ce6d529f4430c117cfecc1c849
+SIZE (uber-jaeger-client-go-v2.29.1_GH0.tar.gz) = 232269
 SHA256 (uber-jaeger-lib-v2.4.1_GH0.tar.gz) = c178bcad325857dba29551c16f40707701adf6e3a9e01e1ca3e5edfc3c6de8bc
 SIZE (uber-jaeger-lib-v2.4.1_GH0.tar.gz) = 38010
 SHA256 (unknwon-com-v1.0.1_GH0.tar.gz) = 3113324f2249e9a135eea008c75f56b7cb39e9625e0a3e0bff5e764211c5f76a
diff --git a/www/grafana8/files/grafana.ini.in b/www/grafana8/files/grafana.ini.in
deleted file mode 100644
index b6da0c1df956..000000000000
--- a/www/grafana8/files/grafana.ini.in
+++ /dev/null
@@ -1,984 +0,0 @@
-##################### Grafana Configuration Example #####################
-#
-# Everything has defaults so you only need to uncomment things you want to
-# change
-
-# possible values : production, development
-;app_mode = production
-
-# instance name, defaults to HOSTNAME environment variable value or hostname if HOSTNAME var is empty
-;instance_name = ${HOSTNAME}
-
-#################################### Paths ####################################
-[paths]
-# Path to where grafana can store temp files, sessions, and the sqlite3 db (if that is used)
-data = %%GRAFANA_DATADIR%%
-
-# Temporary files in `data` directory older than given duration will be removed
-;temp_data_lifetime = 24h
-
-# Directory where grafana can store logs
-logs = %%GRAFANA_LOGDIR%%
-
-# Directory where grafana will automatically scan and look for plugins
-plugins = %%GRAFANA_PLUGINDIR%%
-
-# folder that contains provisioning config files that grafana will apply on startup and while running.
-provisioning = %%GRAFANA_PROVISIONINGDIR%%
-
-#################################### Server ####################################
-[server]
-# Protocol (http, https, h2, socket)
-;protocol = http
-
-# The ip address to bind to, empty will bind to all interfaces
-;http_addr =
-
-# The http port  to use
-;http_port = 3000
-
-# The public facing domain name used to access grafana from a browser
-;domain = localhost
-
-# Redirect to correct domain if host header does not match domain
-# Prevents DNS rebinding attacks
-;enforce_domain = false
-
-# The full public facing url you use in browser, used for redirects and emails
-# If you use reverse proxy and sub path specify full url (with sub path)
-;root_url = %(protocol)s://%(domain)s:%(http_port)s/
-
-# Serve Grafana from subpath specified in `root_url` setting. By default it is set to `false` for compatibility reasons.
-;serve_from_sub_path = false
-
-# Log web requests
-;router_logging = false
-
-# the path relative working path
-;static_root_path = public
-
-# enable gzip
-;enable_gzip = false
-
-# https certs & key file
-;cert_file =
-;cert_key =
-
-# Unix socket path
-;socket =
-
-# 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
-# as separate properties or as on string using the url properties.
-
-# Either "mysql", "postgres" or "sqlite3", it's your choice
-;type = sqlite3
-;host = 127.0.0.1:3306
-;name = grafana
-;user = root
-# If the password contains # or ; you have to wrap it with triple quotes. Ex """#password;"""
-;password =
-
-# Use either URL or the previous fields to configure the database
-# Example: mysql://user:secret@host:port/database
-;url =
-
-# For "postgres" only, either "disable", "require" or "verify-full"
-;ssl_mode = disable
-
-# Database drivers may support different transaction isolation levels.
-# Currently, only "mysql" driver supports isolation levels.
-# If the value is empty - driver's default isolation level is applied.
-# For "mysql" use "READ-UNCOMMITTED", "READ-COMMITTED", "REPEATABLE-READ" or "SERIALIZABLE".
-;isolation_level =
-
-;ca_cert_path =
-;client_key_path =
-;client_cert_path =
-;server_cert_name =
-
-# For "sqlite3" only, path relative to data_path setting
-;path = grafana.db
-
-# Max idle conn setting default is 2
-;max_idle_conn = 2
-
-# Max conn setting default is 0 (mean not set)
-;max_open_conn =
-
-# Connection Max Lifetime default is 14400 (means 14400 seconds or 4 hours)
-;conn_max_lifetime = 14400
-
-# Set to true to log the sql calls and execution times.
-;log_queries =
-
-# For "sqlite3" only. cache mode setting used for connecting to the database. (private, shared)
-;cache_mode = private
-
-################################### Data sources #########################
-[datasources]
-# Upper limit of data sources that Grafana will return. This limit is a temporary configuration and it will be deprecated when pagination will be introduced on the list data sources API.
-;datasource_limit = 5000
-
-#################################### Cache server #############################
-[remote_cache]
-# Either "redis", "memcached" or "database" default is "database"
-;type = database
-
-# cache connectionstring options
-# database: will use Grafana primary database.
-# redis: config like redis server e.g. `addr=127.0.0.1:6379,pool_size=100,db=0,ssl=false`. Only addr is required. ssl may be 'true', 'false', or 'insecure'.
-# memcache: 127.0.0.1:11211
-;connstr =
-
-#################################### Data proxy ###########################
-[dataproxy]
-
-# This enables data proxy logging, default is false
-;logging = false
-
-# How long the data proxy waits to read the headers of the response before timing out, default is 30 seconds.
-# This setting also applies to core backend HTTP data sources where query requests use an HTTP client with timeout set.
-;timeout = 30
-
-# How long the data proxy waits to establish a TCP connection before timing out, default is 10 seconds.
-;dialTimeout = 10
-
-# How many seconds the data proxy waits before sending a keepalive probe request.
-;keep_alive_seconds = 30
-
-# How many seconds the data proxy waits for a successful TLS Handshake before timing out.
-;tls_handshake_timeout_seconds = 10
-
-# How many seconds the data proxy will wait for a server's first response headers after
-# fully writing the request headers if the request has an "Expect: 100-continue"
-# header. A value of 0 will result in the body being sent immediately, without
-# waiting for the server to approve.
-;expect_continue_timeout_seconds = 1
-
-# Optionally limits the total number of connections per host, including connections in the dialing,
-# active, and idle states. On limit violation, dials will block.
-# A value of zero (0) means no limit.
-;max_conns_per_host = 0
-
-# The maximum number of idle connections that Grafana will keep alive.
-;max_idle_connections = 100
-
-# The maximum number of idle connections per host that Grafana will keep alive.
-;max_idle_connections_per_host = 2
-
-# How many seconds the data proxy keeps an idle connection open before timing out.
-;idle_conn_timeout_seconds = 90
-
-# If enabled and user is not anonymous, data proxy will add X-Grafana-User header with username into the request, default is false.
-;send_user_header = false
-
-#################################### Analytics ####################################
-[analytics]
-# Server reporting, sends usage counters to stats.grafana.org every 24 hours.
-# No ip addresses are being tracked, only simple counters to track
-# running instances, dashboard and error counts. It is very helpful to us.
-# 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
-# This option does not cause any auto updates, nor send any information
-# only a GET request to http://grafana.com to get latest versions
-;check_for_updates = true
-
-# Google Analytics universal tracking code, only enabled if you specify an id here
-;google_analytics_ua_id =
-
-# Google Tag Manager ID, only enabled if you specify an id here
-;google_tag_manager_id =
-
-#################################### Security ####################################
-[security]
-# disable creation of admin user on first start of grafana
-;disable_initial_admin_creation = false
-
-# default admin user, created on startup
-;admin_user = admin
-
-# default admin password, can be changed before first start of grafana,  or in profile settings
-;admin_password = admin
-
-# used for signing
-;secret_key = SW2YcwTIb9zpOOhoPsMm
-
-# disable gravatar profile images
-;disable_gravatar = false
-
-# data source proxy whitelist (ip_or_domain:port separated by spaces)
-;data_source_proxy_whitelist =
-
-# disable protection against brute force login attempts
-;disable_brute_force_login_protection = false
-
-# set to true if you host Grafana behind HTTPS. default is false.
-;cookie_secure = false
-
-# set cookie SameSite attribute. defaults to `lax`. can be set to "lax", "strict", "none" and "disabled"
-;cookie_samesite = lax
-
-# set to true if you want to allow browsers to render Grafana in a <frame>, <iframe>, <embed> or <object>. default is false.
-;allow_embedding = false
-
-# Set to true if you want to enable http strict transport security (HSTS) response header.
-# This is only sent when HTTPS is enabled in this configuration.
-# HSTS tells browsers that the site should only be accessed using HTTPS.
-;strict_transport_security = false
-
-# Sets how long a browser should cache HSTS. Only applied if strict_transport_security is enabled.
-;strict_transport_security_max_age_seconds = 86400
-
-# Set to true if to enable HSTS preloading option. Only applied if strict_transport_security is enabled.
-;strict_transport_security_preload = false
-
-# Set to true if to enable the HSTS includeSubDomains option. Only applied if strict_transport_security is enabled.
-;strict_transport_security_subdomains = false
-
-# Set to true to enable the X-Content-Type-Options response header.
-# The X-Content-Type-Options response HTTP header is a marker used by the server to indicate that the MIME types advertised
-# in the Content-Type headers should not be changed and be followed.
-;x_content_type_options = true
-
-# Set to true to enable the X-XSS-Protection header, which tells browsers to stop pages from loading
-# when they detect reflected cross-site scripting (XSS) attacks.
-;x_xss_protection = true
-
-# Enable adding the Content-Security-Policy header to your requests.
-# CSP allows to control resources the user agent is allowed to load and helps prevent XSS attacks.
-;content_security_policy = false
-
-# Set Content Security Policy template used when adding the Content-Security-Policy header to your requests.
-# $NONCE in the template includes a random nonce.
-# $ROOT_PATH is server.root_url without the protocol.
-;content_security_policy_template = """script-src 'self' 'unsafe-eval' 'unsafe-inline' 'strict-dynamic' $NONCE;object-src 'none';font-src 'self';style-src 'self' 'unsafe-inline' blob:;img-src * data:;base-uri 'self';connect-src 'self' grafana.com ws://$ROOT_PATH wss://$ROOT_PATH;manifest-src 'self';media-src 'none';form-action 'self';"""
-
-#################################### Snapshots ###########################
-[snapshots]
-# snapshot sharing options
-;external_enabled = true
-;external_snapshot_url = https://snapshots-origin.raintank.io
-;external_snapshot_name = Publish to snapshot.raintank.io
-
-# Set to true to enable this Grafana instance act as an external snapshot server and allow unauthenticated requests for
-# creating and deleting snapshots.
-;public_mode = false
-
-# remove expired snapshot
-;snapshot_remove_expired = true
-
-#################################### Dashboards History ##################
-[dashboards]
-# Number dashboard versions to keep (per dashboard). Default: 20, Minimum: 1
-;versions_to_keep = 20
-
-# Minimum dashboard refresh interval. When set, this will restrict users to set the refresh interval of a dashboard lower than given interval. Per default this is 5 seconds.
-# The interval string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
-;min_refresh_interval = 5s
-
-# Path to the default home dashboard. If this value is empty, then Grafana uses StaticRootPath + "dashboards/home.json"
-;default_home_dashboard_path =
-
-#################################### Users ###############################
-[users]
-# disable user signup / registration
-;allow_sign_up = true
-
-# Allow non admin users to create organizations
-;allow_org_create = true
-
-# Set to true to automatically assign new users to the default organization (id 1)
-;auto_assign_org = true
-
-# Set this value to automatically add new users to the provided organization (if auto_assign_org above is set to true)
-;auto_assign_org_id = 1
-
-# Default role new users will be automatically assigned (if disabled above is set to true)
-;auto_assign_org_role = Viewer
-
-# Require email validation before sign up completes
-;verify_email_enabled = false
-
-# Background text for the user field on the login page
-;login_hint = email or username
-;password_hint = password
-
-# Default UI theme ("dark" or "light")
-;default_theme = dark
-
-# Path to a custom home page. Users are only redirected to this if the default home dashboard is used. It should match a frontend route and contain a leading slash.
-; home_page =
-
-# External user management, these options affect the organization users view
-;external_manage_link_url =
-;external_manage_link_name =
-;external_manage_info =
-
-# Viewers can edit/inspect dashboard settings in the browser. But not save the dashboard.
-;viewers_can_edit = false
-
-# Editors can administrate dashboard, folders and teams they create
-;editors_can_admin = false
-
-# The duration in time a user invitation remains valid before expiring. This setting should be expressed as a duration. Examples: 6h (hours), 2d (days), 1w (week). Default is 24h (24 hours). The minimum supported duration is 15m (15 minutes).
-;user_invite_max_lifetime_duration = 24h
-
-# Enter a comma-separated list of users login to hide them in the Grafana UI. These users are shown to Grafana admins and themselves.
-; hidden_users =
-
-[auth]
-# Login cookie name
-;login_cookie_name = grafana_session
-
-# The maximum lifetime (duration) an authenticated user can be inactive before being required to login at next visit. Default is 7 days (7d). This setting should be expressed as a duration, e.g. 5m (minutes), 6h (hours), 10d (days), 2w (weeks), 1M (month). The lifetime resets at each successful token rotation.
-;login_maximum_inactive_lifetime_duration =
-
-# The maximum lifetime (duration) an authenticated user can be logged in since login time before being required to login. Default is 30 days (30d). This setting should be expressed as a duration, e.g. 5m (minutes), 6h (hours), 10d (days), 2w (weeks), 1M (month).
-;login_maximum_lifetime_duration =
-
-# How often should auth tokens be rotated for authenticated users when being active. The default is each 10 minutes.
-;token_rotation_interval_minutes = 10
-
-# Set to true to disable (hide) the login form, useful if you use OAuth, defaults to false
-;disable_login_form = false
-
-# Set to true to disable the sign out link in the side menu. Useful if you use auth.proxy or auth.jwt, defaults to false
-;disable_signout_menu = false
-
-# URL to redirect the user to after sign out
-;signout_redirect_url =
-
-# Set to true to attempt login with OAuth automatically, skipping the login screen.
-# This setting is ignored if multiple OAuth providers are configured.
-;oauth_auto_login = false
-
-# OAuth state max age cookie duration in seconds. Defaults to 600 seconds.
-;oauth_state_cookie_max_age = 600
-
-# limit of api_key seconds to live before expiration
-;api_key_max_seconds_to_live = -1
-
-# Set to true to enable SigV4 authentication option for HTTP-based datasources.
-;sigv4_auth_enabled = false
-
-#################################### Anonymous Auth ######################
-[auth.anonymous]
-# enable anonymous access
-;enabled = false
-
-# specify organization name that should be used for unauthenticated users
-;org_name = Main Org.
-
-# specify role for unauthenticated users
-;org_role = Viewer
-
-# mask the Grafana version number for unauthenticated users
-;hide_version = false
-
-#################################### GitHub Auth ##########################
-[auth.github]
-;enabled = false
-;allow_sign_up = true
-;client_id = some_id
-;client_secret = some_secret
-;scopes = user:email,read:org
-;auth_url = https://github.com/login/oauth/authorize
-;token_url = https://github.com/login/oauth/access_token
-;api_url = https://api.github.com/user
-;allowed_domains =
-;team_ids =
-;allowed_organizations =
-
-#################################### GitLab Auth #########################
-[auth.gitlab]
-;enabled = false
-;allow_sign_up = true
-;client_id = some_id
-;client_secret = some_secret
-;scopes = api
-;auth_url = https://gitlab.com/oauth/authorize
-;token_url = https://gitlab.com/oauth/token
-;api_url = https://gitlab.com/api/v4
-;allowed_domains =
-;allowed_groups =
-
-#################################### Google Auth ##########################
-[auth.google]
-;enabled = false
-;allow_sign_up = true
-;client_id = some_client_id
-;client_secret = some_client_secret
-;scopes = https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email
-;auth_url = https://accounts.google.com/o/oauth2/auth
-;token_url = https://accounts.google.com/o/oauth2/token
-;api_url = https://www.googleapis.com/oauth2/v1/userinfo
-;allowed_domains =
-;hosted_domain =
-
-#################################### Grafana.com Auth ####################
-[auth.grafana_com]
-;enabled = false
-;allow_sign_up = true
-;client_id = some_id
-;client_secret = some_secret
-;scopes = user:email
-;allowed_organizations =
-
-#################################### Azure AD OAuth #######################
-[auth.azuread]
-;name = Azure AD
-;enabled = false
-;allow_sign_up = true
-;client_id = some_client_id
-;client_secret = some_client_secret
-;scopes = openid email profile
-;auth_url = https://login.microsoftonline.com/<tenant-id>/oauth2/v2.0/authorize
-;token_url = https://login.microsoftonline.com/<tenant-id>/oauth2/v2.0/token
-;allowed_domains =
-;allowed_groups =
-
-#################################### Okta OAuth #######################
-[auth.okta]
-;name = Okta
-;enabled = false
-;allow_sign_up = true
-;client_id = some_id
-;client_secret = some_secret
-;scopes = openid profile email groups
-;auth_url = https://<tenant-id>.okta.com/oauth2/v1/authorize
-;token_url = https://<tenant-id>.okta.com/oauth2/v1/token
-;api_url = https://<tenant-id>.okta.com/oauth2/v1/userinfo
-;allowed_domains =
-;allowed_groups =
-;role_attribute_path =
-;role_attribute_strict = false
-
-#################################### Generic OAuth ##########################
-[auth.generic_oauth]
-;enabled = false
-;name = OAuth
-;allow_sign_up = true
-;client_id = some_id
-;client_secret = some_secret
-;scopes = user:email,read:org
-;empty_scopes = false
-;email_attribute_name = email:primary
-;email_attribute_path =
-;login_attribute_path =
-;name_attribute_path =
-;id_token_attribute_name =
-;auth_url = https://foo.bar/login/oauth/authorize
-;token_url = https://foo.bar/login/oauth/access_token
-;api_url = https://foo.bar/user
-;allowed_domains =
-;team_ids =
-;allowed_organizations =
-;role_attribute_path =
-;role_attribute_strict = false
-;tls_skip_verify_insecure = false
-;tls_client_cert =
-;tls_client_key =
-;tls_client_ca =
-
-#################################### Basic Auth ##########################
-[auth.basic]
-;enabled = true
-
-#################################### Auth Proxy ##########################
-[auth.proxy]
-;enabled = false
-;header_name = X-WEBAUTH-USER
-;header_property = username
-;auto_sign_up = true
-;sync_ttl = 60
-;whitelist = 192.168.1.1, 192.168.2.1
-;headers = Email:X-User-Email, Name:X-User-Name
-# Read the auth proxy docs for details on what the setting below enables
-;enable_login_token = false
-
-#################################### Auth JWT ##########################
-[auth.jwt]
-;enabled = true
-;header_name = X-JWT-Assertion
-;email_claim = sub
-;username_claim = sub
-;jwk_set_url = https://foo.bar/.well-known/jwks.json
-;jwk_set_file = /path/to/jwks.json
-;cache_ttl = 60m
-;expected_claims = {"aud": ["foo", "bar"]}
-;key_file = /path/to/key/file
-
-#################################### Auth LDAP ##########################
-[auth.ldap]
-;enabled = false
-;config_file = /etc/grafana/ldap.toml
-;allow_sign_up = true
-
-# LDAP background sync (Enterprise only)
-# At 1 am every day
-;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
-
-#################################### Azure ###############################
-[azure]
-# Azure cloud environment where Grafana is hosted
-# Possible values are AzureCloud, AzureChinaCloud, AzureUSGovernment and AzureGermanCloud
-# Default value is AzureCloud (i.e. public cloud)
-;cloud = AzureCloud
-
-# Specifies whether Grafana hosted in Azure service with Managed Identity configured (e.g. Azure Virtual Machines instance)
-# If enabled, the managed identity can be used for authentication of Grafana in Azure services
-# Disabled by default, needs to be explicitly enabled
-;managed_identity_enabled = false
-
-# Client ID to use for user-assigned managed identity
-# Should be set for user-assigned identity and should be empty for system-assigned identity
-;managed_identity_client_id =
-
-#################################### SMTP / Emailing ##########################
-[smtp]
-;enabled = false
-;host = localhost:25
-;user =
-# If the password contains # or ; you have to wrap it with triple quotes. Ex """#password;"""
-;password =
-;cert_file =
-;key_file =
-;skip_verify = false
-;from_address = admin@grafana.localhost
-;from_name = Grafana
-# EHLO identity in SMTP dialog (defaults to instance_name)
-;ehlo_identity = dashboard.example.com
-# SMTP startTLS policy (defaults to 'OpportunisticStartTLS')
-;startTLS_policy = NoStartTLS
-
-[emails]
-;welcome_email_on_sign_up = false
-;templates_pattern = emails/*.html
-
-#################################### Logging ##########################
-[log]
-# Either "console", "file", "syslog". Default is console and  file
-# Use space to separate multiple modes, e.g. "console file"
-;mode = console file
-
-# Either "debug", "info", "warn", "error", "critical", default is "info"
-;level = info
-
-# optional settings to set different levels for specific loggers. Ex filters = sqlstore:debug
-;filters =
-
-# For "console" mode only
-[log.console]
-;level =
-
-# log line format, valid options are text, console and json
-;format = console
-
-# For "file" mode only
-[log.file]
-;level =
-
-# log line format, valid options are text, console and json
-;format = text
-
-# This enables automated log rotate(switch of following options), default is true
-;log_rotate = true
-
-# Max line number of single file, default is 1000000
-;max_lines = 1000000
-
-# Max size shift of single file, default is 28 means 1 << 28, 256MB
-;max_size_shift = 28
-
-# Segment log daily, default is true
-;daily_rotate = true
-
-# Expired days of log file(delete after max days), default is 7
-;max_days = 7
-
-[log.syslog]
-;level =
-
-# log line format, valid options are text, console and json
-;format = text
-
-# Syslog network type and address. This can be udp, tcp, or unix. If left blank, the default unix endpoints will be used.
-;network =
-;address =
-
-# Syslog facility. user, daemon and local0 through local7 are valid.
-;facility =
-
-# Syslog tag. By default, the process' argv[0] is used.
-;tag =
-
-[log.frontend]
-# Should Sentry javascript agent be initialized
-;enabled = false
-
-# Sentry DSN if you want to send events to Sentry.
-;sentry_dsn =
-
-# Custom HTTP endpoint to send events captured by the Sentry agent to. Default will log the events to stdout.
-;custom_endpoint = /log
-
-# Rate of events to be reported between 0 (none) and 1 (all), float
-;sample_rate = 1.0
-
-# Requests per second limit enforced an extended period, for Grafana backend log ingestion endpoint (/log).
-;log_endpoint_requests_per_second_limit = 3
-
-# Max requests accepted per short interval of time for Grafana backend log ingestion endpoint (/log).
-;log_endpoint_burst_limit = 15
-
-#################################### Usage Quotas ########################
-[quota]
-; enabled = false
-
-#### set quotas to -1 to make unlimited. ####
-# limit number of users per Org.
-; org_user = 10
-
-# limit number of dashboards per Org.
-; org_dashboard = 100
-
-# limit number of data_sources per Org.
-; org_data_source = 10
-
-# limit number of api_keys per Org.
-; org_api_key = 10
-
-# limit number of alerts per Org.
-;org_alert_rule = 100
-
-# limit number of orgs a user can create.
-; user_org = 10
-
-# Global limit of users.
-; global_user = -1
-
-# global limit of orgs.
-; global_org = -1
-
-# global limit of dashboards
-; global_dashboard = -1
-
-# global limit of api_keys
-; global_api_key = -1
-
-# global limit on number of logged in users.
-; global_session = -1
-
-# global limit of alerts
-;global_alert_rule = -1
-
-#################################### Alerting ############################
-[alerting]
-# Disable alerting engine & UI features
-;enabled = true
-# Makes it possible to turn off alert rule execution but alerting UI is visible
-;execute_alerts = true
-
-# Default setting for new alert rules. Defaults to categorize error and timeouts as alerting. (alerting, keep_state)
-;error_or_timeout = alerting
-
-# Default setting for how Grafana handles nodata or null values in alerting. (alerting, no_data, keep_state, ok)
-;nodata_or_nullvalues = no_data
-
-# Alert notifications can include images, but rendering many images at the same time can overload the server
-# This limit will protect the server from render overloading and make sure notifications are sent out quickly
-;concurrent_render_limit = 5
-
-
-# Default setting for alert calculation timeout. Default value is 30
-;evaluation_timeout_seconds = 30
-
-# Default setting for alert notification timeout. Default value is 30
-;notification_timeout_seconds = 30
-
-# Default setting for max attempts to sending alert notifications. Default value is 3
-;max_attempts = 3
-
-# Makes it possible to enforce a minimal interval between evaluations, to reduce load on the backend
-;min_interval_seconds = 1
-
-# Configures for how long alert annotations are stored. Default is 0, which keeps them forever.
-# This setting should be expressed as a duration. Examples: 6h (hours), 10d (days), 2w (weeks), 1M (month).
-;max_annotation_age =
-
-# Configures max number of alert annotations that Grafana stores. Default value is 0, which keeps all alert annotations.
-;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.
-
-# Configures how long dashboard annotations are stored. Default is 0, which keeps them forever.
-# This setting should be expressed as a duration. Examples: 6h (hours), 10d (days), 2w (weeks), 1M (month).
-;max_age =
-
-# Configures max number of dashboard annotations that Grafana stores. Default value is 0, which keeps all dashboard annotations.
-;max_annotations_to_keep =
-
-[annotations.api]
-# API annotations means that the annotations have been created using the API without any
-# association with a dashboard.
-
-# Configures how long Grafana stores API annotations. Default is 0, which keeps them forever.
-# This setting should be expressed as a duration. Examples: 6h (hours), 10d (days), 2w (weeks), 1M (month).
-;max_age =
-
-# Configures max number of API annotations that Grafana keeps. Default value is 0, which keeps all API annotations.
-;max_annotations_to_keep =
-
-#################################### Explore #############################
-[explore]
-# Enable the Explore section
-;enabled = true
-
-#################################### Internal Grafana Metrics ##########################
-# Metrics available at HTTP API Url /metrics
-[metrics]
-# Disable / Enable internal metrics
-;enabled           = true
-# Graphite Publish interval
-;interval_seconds  = 10
-# Disable total stats (stat_totals_*) metrics to be generated
-;disable_total_stats = false
-
-#If both are set, basic auth will be required for the metrics endpoint.
-; basic_auth_username =
-; basic_auth_password =
-
-# Metrics environment info adds dimensions to the `grafana_environment_info` metric, which
-# can expose more information about the Grafana instance.
-[metrics.environment_info]
-#exampleLabel1 = exampleValue1
-#exampleLabel2 = exampleValue2
-
-# Send internal metrics to Graphite
-[metrics.graphite]
-# Enable by setting the address setting (ex localhost:2003)
-;address =
-;prefix = prod.grafana.%(instance_name)s.
-
-#################################### Grafana.com integration  ##########################
-# Url used to import dashboards directly from Grafana.com
-[grafana_com]
-;url = https://grafana.com
-
-#################################### Distributed tracing ############
-[tracing.jaeger]
-# Enable by setting the address sending traces to jaeger (ex localhost:6831)
-;address = localhost:6831
-# Tag that will always be included in when creating new spans. ex (tag1:value1,tag2:value2)
-;always_included_tag = tag1:value1
-# Type specifies the type of the sampler: const, probabilistic, rateLimiting, or remote
-;sampler_type = const
-# jaeger samplerconfig param
-# for "const" sampler, 0 or 1 for always false/true respectively
-# for "probabilistic" sampler, a probability between 0 and 1
-# for "rateLimiting" sampler, the number of spans per second
-# for "remote" sampler, param is the same as for "probabilistic"
-# and indicates the initial sampling rate before the actual one
-# is received from the mothership
-;sampler_param = 1
-# sampling_server_url is the URL of a sampling manager providing a sampling strategy.
-;sampling_server_url =
-# Whether or not to use Zipkin propagation (x-b3- HTTP headers).
-;zipkin_propagation = false
-# Setting this to true disables shared RPC spans.
-# Not disabling is the most common setting when using Zipkin elsewhere in your infrastructure.
-;disable_shared_zipkin_spans = false
-
-#################################### External image storage ##########################
-[external_image_storage]
-# Used for uploading images to public servers so they can be included in slack/email messages.
-# you can choose between (s3, webdav, gcs, azure_blob, local)
-;provider =
-
-[external_image_storage.s3]
-;endpoint =
-;path_style_access =
-;bucket =
-;region =
-;path =
-;access_key =
-;secret_key =
-
-[external_image_storage.webdav]
-;url =
-;public_url =
-;username =
-;password =
-
-[external_image_storage.gcs]
-;key_file =
-;bucket =
-;path =
-
-[external_image_storage.azure_blob]
-;account_name =
-;account_key =
-;container_name =
-
-[external_image_storage.local]
-# does not require any configuration
-
-[rendering]
-# Options to configure a remote HTTP image rendering service, e.g. using https://github.com/grafana/grafana-image-renderer.
-# URL to a remote HTTP image renderer service, e.g. http://localhost:8081/render, will enable Grafana to render panels and dashboards to PNG-images using HTTP requests to an external service.
-;server_url =
-# If the remote HTTP image renderer service runs on a different server than the Grafana server you may have to configure this to a URL where Grafana is reachable, e.g. http://grafana.domain/.
-;callback_url =
-# Concurrent render request limit affects when the /render HTTP endpoint is used. Rendering many images at the same time can overload the server,
-# which this setting can help protect against by only allowing a certain amount of concurrent requests.
-;concurrent_render_request_limit = 30
-
-[panels]
-# If set to true Grafana will allow script tags in text panels. Not recommended as it enable XSS vulnerabilities.
-;disable_sanitize_html = false
-
-[plugins]
-;enable_alpha = false
-;app_tls_skip_verify_insecure = false
-# Enter a comma-separated list of plugin identifiers to identify plugins to load even if they are unsigned. Plugins with modified signatures are never loaded.
-;allow_loading_unsigned_plugins =
-# Enable or disable installing plugins directly from within Grafana.
-;plugin_admin_enabled = false
-;plugin_admin_external_manage_enabled = false
-;plugin_catalog_url = https://grafana.com/grafana/plugins/
-
-#################################### Grafana Live ##########################################
-[live]
-# max_connections to Grafana Live WebSocket endpoint per Grafana server instance. See Grafana Live docs
-# if you are planning to make it higher than default 100 since this can require some OS and infrastructure
-# tuning. 0 disables Live, -1 means unlimited connections.
-;max_connections = 100
-
-# allowed_origins is a comma-separated list of origins that can establish connection with Grafana Live.
-# If not set then origin will be matched over root_url. Supports wildcard symbol "*".
-allowed_origins =
-
-#################################### Grafana Image Renderer Plugin ##########################
-[plugin.grafana-image-renderer]
-# Instruct headless browser instance to use a default timezone when not provided by Grafana, e.g. when rendering panel image of alert.
-# See ICU’s metaZones.txt (https://cs.chromium.org/chromium/src/third_party/icu/source/data/misc/metaZones.txt) for a list of supported
-# timezone IDs. Fallbacks to TZ environment variable if not set.
-;rendering_timezone =
-
-# Instruct headless browser instance to use a default language when not provided by Grafana, e.g. when rendering panel image of alert.
-# Please refer to the HTTP header Accept-Language to understand how to format this value, e.g. 'fr-CH, fr;q=0.9, en;q=0.8, de;q=0.7, *;q=0.5'.
-;rendering_language =
-
-# Instruct headless browser instance to use a default device scale factor when not provided by Grafana, e.g. when rendering panel image of alert.
-# Default is 1. Using a higher value will produce more detailed images (higher DPI), but will require more disk space to store an image.
-;rendering_viewport_device_scale_factor =
-
-# Instruct headless browser instance whether to ignore HTTPS errors during navigation. Per default HTTPS errors are not ignored. Due to
-# the security risk it's not recommended to ignore HTTPS errors.
-;rendering_ignore_https_errors =
-
-# Instruct headless browser instance whether to capture and log verbose information when rendering an image. Default is false and will
-# only capture and log error messages. When enabled, debug messages are captured and logged as well.
-# For the verbose information to be included in the Grafana server log you have to adjust the rendering log level to debug, configure
-# [log].filter = rendering:debug.
-;rendering_verbose_logging =
-
-# Instruct headless browser instance whether to output its debug and error messages into running process of remote rendering service.
-# Default is false. This can be useful to enable (true) when troubleshooting.
-;rendering_dumpio =
-
-# Additional arguments to pass to the headless browser instance. Default is --no-sandbox. The list of Chromium flags can be found
-# here (https://peter.sh/experiments/chromium-command-line-switches/). Multiple arguments is separated with comma-character.
-;rendering_args =
-
-# You can configure the plugin to use a different browser binary instead of the pre-packaged version of Chromium.
-# Please note that this is not recommended, since you may encounter problems if the installed version of Chrome/Chromium is not
-# compatible with the plugin.
-;rendering_chrome_bin =
-
-# Instruct how headless browser instances are created. Default is 'default' and will create a new browser instance on each request.
-# Mode 'clustered' will make sure that only a maximum of browsers/incognito pages can execute concurrently.
-# Mode 'reusable' will have one browser instance and will create a new incognito page on each request.
-;rendering_mode =
-
-# When rendering_mode = clustered you can instruct how many browsers or incognito pages can execute concurrently. Default is 'browser'
-# and will cluster using browser instances.
-# Mode 'context' will cluster using incognito pages.
-;rendering_clustering_mode =
-# When rendering_mode = clustered you can define maximum number of browser instances/incognito pages that can execute concurrently..
-;rendering_clustering_max_concurrency =
-
-# Limit the maximum viewport width, height and device scale factor that can be requested.
-;rendering_viewport_max_width =
-;rendering_viewport_max_height =
-;rendering_viewport_max_device_scale_factor =
-
-# Change the listening host and port of the gRPC server. Default host is 127.0.0.1 and default port is 0 and will automatically assign
-# a port not in use.
-;grpc_host =
-;grpc_port =
-
-[enterprise]
-# Path to a valid Grafana Enterprise license.jwt file
-;license_path =
-
-[feature_toggles]
-# enable features, separated by spaces
-;enable =
-
-[date_formats]
-# For information on what formatting patterns that are supported https://momentjs.com/docs/#/displaying/
-
-# Default system date format used in time range picker and other places where full time is displayed
-;full_date = YYYY-MM-DD HH:mm:ss
-
-# Used by graph and other places where we only show small intervals
-;interval_second = HH:mm:ss
-;interval_minute = HH:mm
-;interval_hour = MM/DD HH:mm
-;interval_day = MM/DD
-;interval_month = YYYY-MM
-;interval_year = YYYY
-
-# Experimental feature
-;use_browser_locale = false
-
-# 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
diff --git a/www/grafana8/pkg-plist b/www/grafana8/pkg-plist
index fe1356114d48..f49f9a0dd87b 100644
--- a/www/grafana8/pkg-plist
+++ b/www/grafana8/pkg-plist
@@ -6,7 +6,18 @@ bin/grafana-server
 %%DATADIR%%/public/app/angular/AngularApp.ts
 %%DATADIR%%/public/app/angular/AngularLocationWrapper.test.ts
 %%DATADIR%%/public/app/angular/AngularLocationWrapper.ts
+%%DATADIR%%/public/app/angular/array_join.ts
+%%DATADIR%%/public/app/angular/autofill_event_fix.ts
 %%DATADIR%%/public/app/angular/bridgeReactAngularRouting.ts
+%%DATADIR%%/public/app/angular/diff-view.ts
+%%DATADIR%%/public/app/angular/dropdown_typeahead.ts
+%%DATADIR%%/public/app/angular/give_focus.ts
+%%DATADIR%%/public/app/angular/metric_segment.ts
+%%DATADIR%%/public/app/angular/misc.ts
+%%DATADIR%%/public/app/angular/ng_model_on_blur.ts
+%%DATADIR%%/public/app/angular/rebuild_on_change.ts
+%%DATADIR%%/public/app/angular/services.ts
+%%DATADIR%%/public/app/angular/tags.ts
 %%DATADIR%%/public/app/app.ts
 %%DATADIR%%/public/app/core/actions/cleanUp.ts
 %%DATADIR%%/public/app/core/actions/index.ts
@@ -30,14 +41,17 @@ bin/grafana-server
 %%DATADIR%%/public/app/core/components/FolderFilter/FolderFilter.tsx
 %%DATADIR%%/public/app/core/components/Footer/Footer.tsx
 %%DATADIR%%/public/app/core/components/ForgottenPassword/ChangePassword.tsx
+%%DATADIR%%/public/app/core/components/ForgottenPassword/ChangePasswordPage.test.tsx
 %%DATADIR%%/public/app/core/components/ForgottenPassword/ChangePasswordPage.tsx
 %%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/LocalStorageValueProvider/LocalStorageValueProvider.tsx
 %%DATADIR%%/public/app/core/components/LocalStorageValueProvider/index.tsx
 %%DATADIR%%/public/app/core/components/Login/LoginCtrl.tsx
 %%DATADIR%%/public/app/core/components/Login/LoginForm.tsx
 %%DATADIR%%/public/app/core/components/Login/LoginLayout.tsx
+%%DATADIR%%/public/app/core/components/Login/LoginPage.test.tsx
 %%DATADIR%%/public/app/core/components/Login/LoginPage.tsx
 %%DATADIR%%/public/app/core/components/Login/LoginServiceButtons.tsx
 %%DATADIR%%/public/app/core/components/Login/UserSignup.tsx
@@ -51,12 +65,15 @@ bin/grafana-server
 %%DATADIR%%/public/app/core/components/PageHeader/PageHeader.tsx
 %%DATADIR%%/public/app/core/components/PageLoader/PageLoader.tsx
 %%DATADIR%%/public/app/core/components/PanelTypeFilter/PanelTypeFilter.tsx
+%%DATADIR%%/public/app/core/components/PasswordField/PasswordField.test.tsx
+%%DATADIR%%/public/app/core/components/PasswordField/PasswordField.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
 %%DATADIR%%/public/app/core/components/PermissionList/PermissionListItem.tsx
 %%DATADIR%%/public/app/core/components/PermissionList/PermissionsInfo.tsx
 %%DATADIR%%/public/app/core/components/PluginHelp/PluginHelp.tsx
+%%DATADIR%%/public/app/core/components/QueryOperationRow/OperationRowHelp.tsx
 %%DATADIR%%/public/app/core/components/QueryOperationRow/QueryOperationAction.test.tsx
 %%DATADIR%%/public/app/core/components/QueryOperationRow/QueryOperationAction.tsx
 %%DATADIR%%/public/app/core/components/QueryOperationRow/QueryOperationRow.test.tsx
@@ -74,8 +91,10 @@ bin/grafana-server
 %%DATADIR%%/public/app/core/components/Select/UserPicker.tsx
 %%DATADIR%%/public/app/core/components/Select/__snapshots__/FolderPicker.test.tsx.snap
 %%DATADIR%%/public/app/core/components/SharedPreferences/SharedPreferences.tsx
+%%DATADIR%%/public/app/core/components/Signup/SignupPage.test.tsx
 %%DATADIR%%/public/app/core/components/Signup/SignupPage.tsx
 %%DATADIR%%/public/app/core/components/Signup/VerifyEmail.tsx
+%%DATADIR%%/public/app/core/components/Signup/VerifyEmailPage.test.tsx
 %%DATADIR%%/public/app/core/components/Signup/VerifyEmailPage.tsx
 %%DATADIR%%/public/app/core/components/SplitPaneWrapper/SplitPaneWrapper.tsx
 %%DATADIR%%/public/app/core/components/TagFilter/TagBadge.tsx
@@ -106,6 +125,21 @@ bin/grafana-server
 %%DATADIR%%/public/app/core/components/TransformersUI/SeriesToFieldsTransformerEditor.tsx
 %%DATADIR%%/public/app/core/components/TransformersUI/SeriesToRowsTransformerEditor.tsx
 %%DATADIR%%/public/app/core/components/TransformersUI/SortByTransformerEditor.tsx
+%%DATADIR%%/public/app/core/components/TransformersUI/configFromQuery/ConfigFromQueryTransformerEditor.test.tsx
+%%DATADIR%%/public/app/core/components/TransformersUI/configFromQuery/ConfigFromQueryTransformerEditor.tsx
+%%DATADIR%%/public/app/core/components/TransformersUI/configFromQuery/configFromQuery.test.ts
+%%DATADIR%%/public/app/core/components/TransformersUI/configFromQuery/configFromQuery.ts
+%%DATADIR%%/public/app/core/components/TransformersUI/fieldToConfigMapping/FieldToConfigMappingEditor.test.tsx
+%%DATADIR%%/public/app/core/components/TransformersUI/fieldToConfigMapping/FieldToConfigMappingEditor.tsx
+%%DATADIR%%/public/app/core/components/TransformersUI/fieldToConfigMapping/fieldToConfigMapping.ts
+%%DATADIR%%/public/app/core/components/TransformersUI/prepareTimeSeries/PrepareTimeSeriesEditor.tsx
+%%DATADIR%%/public/app/core/components/TransformersUI/prepareTimeSeries/prepareTimeSeries.test.ts
+%%DATADIR%%/public/app/core/components/TransformersUI/prepareTimeSeries/prepareTimeSeries.ts
+%%DATADIR%%/public/app/core/components/TransformersUI/rowsToFields/RowsToFieldsTransformerEditor.test.tsx
+%%DATADIR%%/public/app/core/components/TransformersUI/rowsToFields/RowsToFieldsTransformerEditor.tsx
+%%DATADIR%%/public/app/core/components/TransformersUI/rowsToFields/rowsToFields.test.ts
+%%DATADIR%%/public/app/core/components/TransformersUI/rowsToFields/rowsToFields.ts
+%%DATADIR%%/public/app/core/components/TransformersUI/utils.ts
 %%DATADIR%%/public/app/core/components/WithFeatureToggle.tsx
 %%DATADIR%%/public/app/core/components/code_editor/brace.d.ts
 %%DATADIR%%/public/app/core/components/code_editor/code_editor.ts
@@ -151,21 +185,9 @@ bin/grafana-server
 %%DATADIR%%/public/app/core/components/switch.ts
 %%DATADIR%%/public/app/core/config.ts
 %%DATADIR%%/public/app/core/constants.ts
-%%DATADIR%%/public/app/core/controllers/all.ts
-%%DATADIR%%/public/app/core/controllers/json_editor_ctrl.ts
 %%DATADIR%%/public/app/core/copy/appNotification.ts
 %%DATADIR%%/public/app/core/core.ts
 %%DATADIR%%/public/app/core/core_module.ts
-%%DATADIR%%/public/app/core/directives/array_join.ts
-%%DATADIR%%/public/app/core/directives/autofill_event_fix.ts
-%%DATADIR%%/public/app/core/directives/diff-view.ts
-%%DATADIR%%/public/app/core/directives/dropdown_typeahead.ts
-%%DATADIR%%/public/app/core/directives/give_focus.ts
-%%DATADIR%%/public/app/core/directives/metric_segment.ts
-%%DATADIR%%/public/app/core/directives/misc.ts
-%%DATADIR%%/public/app/core/directives/ng_model_on_blur.ts
-%%DATADIR%%/public/app/core/directives/rebuild_on_change.ts
-%%DATADIR%%/public/app/core/directives/tags.ts
 %%DATADIR%%/public/app/core/filters/filters.ts
 %%DATADIR%%/public/app/core/hooks/useCleanup.ts
 %%DATADIR%%/public/app/core/hooks/useNavModel.ts
@@ -214,19 +236,21 @@ bin/grafana-server
 %%DATADIR%%/public/app/core/services/__mocks__/search_srv.ts
 %%DATADIR%%/public/app/core/services/alert_srv.ts
 %%DATADIR%%/public/app/core/services/all.ts
-%%DATADIR%%/public/app/core/services/analytics.ts
 %%DATADIR%%/public/app/core/services/backend_srv.ts
 %%DATADIR%%/public/app/core/services/context_srv.ts
 %%DATADIR%%/public/app/core/services/dynamic_directive_srv.ts
 %%DATADIR%%/public/app/core/services/echo/Echo.ts
 %%DATADIR%%/public/app/core/services/echo/EchoSrv.ts
 %%DATADIR%%/public/app/core/services/echo/backends/PerformanceBackend.ts
+%%DATADIR%%/public/app/core/services/echo/backends/analytics/GABackend.ts
+%%DATADIR%%/public/app/core/services/echo/backends/analytics/RudderstackBackend.ts
 %%DATADIR%%/public/app/core/services/echo/backends/sentry/SentryBackend.test.ts
 %%DATADIR%%/public/app/core/services/echo/backends/sentry/SentryBackend.ts
 %%DATADIR%%/public/app/core/services/echo/backends/sentry/transports/CustomEndpointTransport.test.ts
 %%DATADIR%%/public/app/core/services/echo/backends/sentry/transports/CustomEndpointTransport.ts
 %%DATADIR%%/public/app/core/services/echo/backends/sentry/transports/EchoSrvTransport.ts
 %%DATADIR%%/public/app/core/services/echo/backends/sentry/types.ts
+%%DATADIR%%/public/app/core/services/echo/utils.ts
 %%DATADIR%%/public/app/core/services/impression_srv.ts
 %%DATADIR%%/public/app/core/services/keybindingSrv.ts
 %%DATADIR%%/public/app/core/services/ng_react.ts
@@ -361,15 +385,24 @@ bin/grafana-server
 %%DATADIR%%/public/app/features/alerting/state/reducers.ts
 %%DATADIR%%/public/app/features/alerting/state/selectors.test.ts
 %%DATADIR%%/public/app/features/alerting/state/selectors.ts
+%%DATADIR%%/public/app/features/alerting/unified/Admin.test.tsx
+%%DATADIR%%/public/app/features/alerting/unified/Admin.tsx
+%%DATADIR%%/public/app/features/alerting/unified/AmNotifications.test.tsx
+%%DATADIR%%/public/app/features/alerting/unified/AmNotifications.tsx
 %%DATADIR%%/public/app/features/alerting/unified/AmRoutes.test.tsx
 %%DATADIR%%/public/app/features/alerting/unified/AmRoutes.tsx
 %%DATADIR%%/public/app/features/alerting/unified/PanelAlertTab.tsx
 %%DATADIR%%/public/app/features/alerting/unified/PanelAlertTabContent.tsx
 %%DATADIR%%/public/app/features/alerting/unified/Receivers.test.tsx
 %%DATADIR%%/public/app/features/alerting/unified/Receivers.tsx
+%%DATADIR%%/public/app/features/alerting/unified/RedirectToRuleViewer.test.tsx
+%%DATADIR%%/public/app/features/alerting/unified/RedirectToRuleViewer.tsx
+%%DATADIR%%/public/app/features/alerting/unified/RuleEditor.test.tsx
 %%DATADIR%%/public/app/features/alerting/unified/RuleEditor.tsx
 %%DATADIR%%/public/app/features/alerting/unified/RuleList.test.tsx
 %%DATADIR%%/public/app/features/alerting/unified/RuleList.tsx
+%%DATADIR%%/public/app/features/alerting/unified/RuleViewer.test.tsx
+%%DATADIR%%/public/app/features/alerting/unified/RuleViewer.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/grafana.ts
@@ -384,12 +417,18 @@ bin/grafana-server
 %%DATADIR%%/public/app/features/alerting/unified/components/CollapseToggle.tsx
 %%DATADIR%%/public/app/features/alerting/unified/components/DetailsField.tsx
 %%DATADIR%%/public/app/features/alerting/unified/components/DynamicTable.tsx
+%%DATADIR%%/public/app/features/alerting/unified/components/DynamicTableWithGuidelines.tsx
 %%DATADIR%%/public/app/features/alerting/unified/components/EmptyArea.tsx
 %%DATADIR%%/public/app/features/alerting/unified/components/Expression.tsx
+%%DATADIR%%/public/app/features/alerting/unified/components/PanelPluginsButtonGroup.tsx
 %%DATADIR%%/public/app/features/alerting/unified/components/StateColoredText.tsx
 %%DATADIR%%/public/app/features/alerting/unified/components/StateTag.tsx
 %%DATADIR%%/public/app/features/alerting/unified/components/TimeToNow.tsx
 %%DATADIR%%/public/app/features/alerting/unified/components/Well.tsx
+%%DATADIR%%/public/app/features/alerting/unified/components/amnotifications/AmNotificationsAlertDetails.tsx
+%%DATADIR%%/public/app/features/alerting/unified/components/amnotifications/AmNotificationsAlertsTable.tsx
+%%DATADIR%%/public/app/features/alerting/unified/components/amnotifications/AmNotificationsGroup.tsx
+%%DATADIR%%/public/app/features/alerting/unified/components/amnotifications/AmNotificationsGroupHeader.tsx
 %%DATADIR%%/public/app/features/alerting/unified/components/amroutes/AmRootRoute.tsx
 %%DATADIR%%/public/app/features/alerting/unified/components/amroutes/AmRootRouteForm.tsx
 %%DATADIR%%/public/app/features/alerting/unified/components/amroutes/AmRootRouteRead.tsx
@@ -431,11 +470,14 @@ bin/grafana-server
 %%DATADIR%%/public/app/features/alerting/unified/components/rule-editor/AlertTypeStep.tsx
 %%DATADIR%%/public/app/features/alerting/unified/components/rule-editor/AnnotationKeyInput.tsx
 %%DATADIR%%/public/app/features/alerting/unified/components/rule-editor/AnnotationsField.tsx
+%%DATADIR%%/public/app/features/alerting/unified/components/rule-editor/CloudConditionsStep.tsx
+%%DATADIR%%/public/app/features/alerting/unified/components/rule-editor/CloudRulesSourcePicker.tsx
 %%DATADIR%%/public/app/features/alerting/unified/components/rule-editor/ConditionField.tsx
-%%DATADIR%%/public/app/features/alerting/unified/components/rule-editor/ConditionsStep.tsx
 %%DATADIR%%/public/app/features/alerting/unified/components/rule-editor/DetailsStep.tsx
 %%DATADIR%%/public/app/features/alerting/unified/components/rule-editor/ExpressionEditor.tsx
 %%DATADIR%%/public/app/features/alerting/unified/components/rule-editor/GrafanaAlertStatePicker.tsx
+%%DATADIR%%/public/app/features/alerting/unified/components/rule-editor/GrafanaConditionEvalWarning.tsx
+%%DATADIR%%/public/app/features/alerting/unified/components/rule-editor/GrafanaConditionsStep.tsx
 %%DATADIR%%/public/app/features/alerting/unified/components/rule-editor/GroupAndNamespaceFields.tsx
 %%DATADIR%%/public/app/features/alerting/unified/components/rule-editor/LabelsField.tsx
 %%DATADIR%%/public/app/features/alerting/unified/components/rule-editor/PreviewRule.tsx
@@ -448,6 +490,8 @@ bin/grafana-server
 %%DATADIR%%/public/app/features/alerting/unified/components/rule-editor/RuleFolderPicker.tsx
 %%DATADIR%%/public/app/features/alerting/unified/components/rule-editor/SelectWIthAdd.tsx
 %%DATADIR%%/public/app/features/alerting/unified/components/rule-editor/VizWrapper.tsx
+%%DATADIR%%/public/app/features/alerting/unified/components/rule-viewer/RuleViewerLayout.tsx
+%%DATADIR%%/public/app/features/alerting/unified/components/rule-viewer/RuleViewerVisualization.tsx
 %%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
@@ -458,6 +502,10 @@ bin/grafana-server
 %%DATADIR%%/public/app/features/alerting/unified/components/rules/NoRulesCTA.tsx
 %%DATADIR%%/public/app/features/alerting/unified/components/rules/RuleDetails.tsx
 %%DATADIR%%/public/app/features/alerting/unified/components/rules/RuleDetailsActionButtons.tsx
+%%DATADIR%%/public/app/features/alerting/unified/components/rules/RuleDetailsAnnotations.tsx
+%%DATADIR%%/public/app/features/alerting/unified/components/rules/RuleDetailsDataSources.tsx
+%%DATADIR%%/public/app/features/alerting/unified/components/rules/RuleDetailsExpression.tsx
+%%DATADIR%%/public/app/features/alerting/unified/components/rules/RuleDetailsMatchingInstances.tsx
 %%DATADIR%%/public/app/features/alerting/unified/components/rules/RuleHealth.tsx
 %%DATADIR%%/public/app/features/alerting/unified/components/rules/RuleListGroupView.tsx
 %%DATADIR%%/public/app/features/alerting/unified/components/rules/RuleListStateSection.tsx
@@ -479,6 +527,7 @@ bin/grafana-server
 %%DATADIR%%/public/app/features/alerting/unified/components/silences/SilencesEditor.tsx
 %%DATADIR%%/public/app/features/alerting/unified/components/silences/SilencesTable.tsx
 %%DATADIR%%/public/app/features/alerting/unified/hooks/useAlertManagerSourceName.ts
+%%DATADIR%%/public/app/features/alerting/unified/hooks/useCombinedRule.ts
 %%DATADIR%%/public/app/features/alerting/unified/hooks/useCombinedRuleNamespaces.ts
 %%DATADIR%%/public/app/features/alerting/unified/hooks/useControlledFieldArray.ts
 %%DATADIR%%/public/app/features/alerting/unified/hooks/useFilteredRules.ts
@@ -512,11 +561,14 @@ bin/grafana-server
 %%DATADIR%%/public/app/features/alerting/unified/utils/dynamicTable.ts
 %%DATADIR%%/public/app/features/alerting/unified/utils/matchers.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
 %%DATADIR%%/public/app/features/alerting/unified/utils/receiver-form.test.ts
 %%DATADIR%%/public/app/features/alerting/unified/utils/receiver-form.ts
 %%DATADIR%%/public/app/features/alerting/unified/utils/receivers.ts
 %%DATADIR%%/public/app/features/alerting/unified/utils/redux.ts
 %%DATADIR%%/public/app/features/alerting/unified/utils/rule-form.ts
+%%DATADIR%%/public/app/features/alerting/unified/utils/rule-id.ts
 %%DATADIR%%/public/app/features/alerting/unified/utils/rules.ts
 %%DATADIR%%/public/app/features/alerting/unified/utils/templates.ts
 %%DATADIR%%/public/app/features/alerting/unified/utils/time.ts
@@ -706,7 +758,6 @@ bin/grafana-server
 %%DATADIR%%/public/app/features/dashboard/containers/DashboardPage.tsx
 %%DATADIR%%/public/app/features/dashboard/containers/SoloPanelPage.test.tsx
 %%DATADIR%%/public/app/features/dashboard/containers/SoloPanelPage.tsx
-%%DATADIR%%/public/app/features/dashboard/containers/__snapshots__/DashboardPage.test.tsx.snap
 %%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
@@ -1018,8 +1069,6 @@ bin/grafana-server
 %%DATADIR%%/public/app/features/panel/panellinks/linkSuppliers.test.ts
 %%DATADIR%%/public/app/features/panel/panellinks/linkSuppliers.ts
 %%DATADIR%%/public/app/features/panel/panellinks/link_srv.ts
-%%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/query_editor_row.html
 %%DATADIR%%/public/app/features/panel/query_ctrl.ts
@@ -1060,6 +1109,34 @@ bin/grafana-server
 %%DATADIR%%/public/app/features/plugins/__mocks__/pluginMocks.ts
 %%DATADIR%%/public/app/features/plugins/__snapshots__/PluginList.test.tsx.snap
 %%DATADIR%%/public/app/features/plugins/__snapshots__/PluginListItem.test.tsx.snap
+%%DATADIR%%/public/app/features/plugins/admin/api.ts
+%%DATADIR%%/public/app/features/plugins/admin/components/HorizontalGroup.tsx
+%%DATADIR%%/public/app/features/plugins/admin/components/InstallControls.tsx
+%%DATADIR%%/public/app/features/plugins/admin/components/Loader.tsx
+%%DATADIR%%/public/app/features/plugins/admin/components/Page.tsx
+%%DATADIR%%/public/app/features/plugins/admin/components/PluginBadges.test.tsx
+%%DATADIR%%/public/app/features/plugins/admin/components/PluginBadges.tsx
+%%DATADIR%%/public/app/features/plugins/admin/components/PluginDetailsBody.tsx
+%%DATADIR%%/public/app/features/plugins/admin/components/PluginList.tsx
+%%DATADIR%%/public/app/features/plugins/admin/components/PluginListCard.test.tsx
+%%DATADIR%%/public/app/features/plugins/admin/components/PluginListCard.tsx
+%%DATADIR%%/public/app/features/plugins/admin/components/PluginLogo.tsx
+%%DATADIR%%/public/app/features/plugins/admin/components/PluginTypeIcon.tsx
+%%DATADIR%%/public/app/features/plugins/admin/components/SearchField.tsx
+%%DATADIR%%/public/app/features/plugins/admin/components/VersionList.tsx
+%%DATADIR%%/public/app/features/plugins/admin/constants.ts
+%%DATADIR%%/public/app/features/plugins/admin/guards.ts
+%%DATADIR%%/public/app/features/plugins/admin/helpers.ts
+%%DATADIR%%/public/app/features/plugins/admin/hooks/useHistory.tsx
+%%DATADIR%%/public/app/features/plugins/admin/hooks/usePluginDetails.tsx
+%%DATADIR%%/public/app/features/plugins/admin/hooks/usePlugins.tsx
+%%DATADIR%%/public/app/features/plugins/admin/img/logo.svg
+%%DATADIR%%/public/app/features/plugins/admin/pages/Browse.test.tsx
+%%DATADIR%%/public/app/features/plugins/admin/pages/Browse.tsx
+%%DATADIR%%/public/app/features/plugins/admin/pages/NotEnabed.tsx
+%%DATADIR%%/public/app/features/plugins/admin/pages/PluginDetails.test.tsx
+%%DATADIR%%/public/app/features/plugins/admin/pages/PluginDetails.tsx
+%%DATADIR%%/public/app/features/plugins/admin/types.ts
 %%DATADIR%%/public/app/features/plugins/all.ts
 %%DATADIR%%/public/app/features/plugins/built_in_plugins.ts
 %%DATADIR%%/public/app/features/plugins/datasource_srv.ts
@@ -1068,6 +1145,7 @@ bin/grafana-server
 %%DATADIR%%/public/app/features/plugins/plugin_loader.test.ts
 %%DATADIR%%/public/app/features/plugins/plugin_loader.ts
 %%DATADIR%%/public/app/features/plugins/plugin_page_ctrl.ts
+%%DATADIR%%/public/app/features/plugins/routes.ts
 %%DATADIR%%/public/app/features/plugins/specs/datasource_srv.test.ts
 %%DATADIR%%/public/app/features/plugins/state/actions.ts
 %%DATADIR%%/public/app/features/plugins/state/reducers.test.ts
@@ -1077,6 +1155,7 @@ bin/grafana-server
 %%DATADIR%%/public/app/features/plugins/variableQueryEditorLoader.tsx
 %%DATADIR%%/public/app/features/plugins/wrappers/AppConfigWrapper.tsx
 %%DATADIR%%/public/app/features/profile/ChangePasswordForm.tsx
+%%DATADIR%%/public/app/features/profile/ChangePasswordPage.test.tsx
 %%DATADIR%%/public/app/features/profile/ChangePasswordPage.tsx
 %%DATADIR%%/public/app/features/profile/UserOrganizations.tsx
 %%DATADIR%%/public/app/features/profile/UserProfileEditForm.tsx
@@ -1533,6 +1612,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/TopMetricsSettingsEditor.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
@@ -1601,7 +1681,6 @@ bin/grafana-server
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/__mocks__/resourcePickerRows.ts
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/__mocks__/sdk.ts
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/annotations_query_ctrl.ts
-%%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/api/routes.ts
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/app_insights/app_insights_datasource.test.ts
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/app_insights/app_insights_datasource.ts
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/app_insights/response_parser.ts
@@ -1638,7 +1717,6 @@ bin/grafana-server
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/LogsQueryEditor/LogsQueryEditor.tsx
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/LogsQueryEditor/QueryField.tsx
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/LogsQueryEditor/ResourceField.tsx
-%%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/LogsQueryEditor/WorkspaceField.tsx
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/LogsQueryEditor/index.tsx
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/LogsQueryEditor/useMigrations.ts
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/MetricsQueryEditor/AggregationField.tsx
@@ -1669,12 +1747,16 @@ bin/grafana-server
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/ResourcePicker/utils.ts
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/Space.tsx
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/SubscriptionField.tsx
-%%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/__snapshots__/AnalyticsConfig.test.tsx.snap
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/__snapshots__/AzureCredentialsForm.test.tsx.snap
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/__snapshots__/InsightsConfig.test.tsx.snap
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/metrics.ts
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/credentials.ts
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/css/query_editor.css
+%%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/adx.json
+%%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/cosmosdb.json
+%%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/keyvault.json
+%%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/sqldb.json
+%%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/storage.json
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/datasource.ts
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/editor/KustoQueryField.tsx
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/editor/editor_component.tsx
@@ -1709,18 +1791,20 @@ bin/grafana-server
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/time_grain_converter.ts
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/types/index.ts
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/types/logAnalyticsMetadata.ts
+%%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/types/query.ts
+%%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/types/types.ts
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/utils/common.ts
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/utils/messageFromError.test.ts
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/utils/messageFromError.ts
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/utils/useLastError.test.ts
 %%DATADIR%%/public/app/plugins/datasource/grafana-azure-monitor-datasource/utils/useLastError.ts
 %%DATADIR%%/public/app/plugins/datasource/grafana/README.md
-%%DATADIR%%/public/app/plugins/datasource/grafana/annotation_ctrl.ts
+%%DATADIR%%/public/app/plugins/datasource/grafana/components/AnnotationQueryEditor.test.tsx
+%%DATADIR%%/public/app/plugins/datasource/grafana/components/AnnotationQueryEditor.tsx
 %%DATADIR%%/public/app/plugins/datasource/grafana/components/QueryEditor.tsx
 %%DATADIR%%/public/app/plugins/datasource/grafana/datasource.test.ts
 %%DATADIR%%/public/app/plugins/datasource/grafana/datasource.ts
 %%DATADIR%%/public/app/plugins/datasource/grafana/module.ts
-%%DATADIR%%/public/app/plugins/datasource/grafana/partials/annotations.editor.html
 %%DATADIR%%/public/app/plugins/datasource/grafana/plugin.json
 %%DATADIR%%/public/app/plugins/datasource/grafana/types.ts
 %%DATADIR%%/public/app/plugins/datasource/graphite/FunctionEditor.test.tsx
@@ -1728,7 +1812,13 @@ bin/grafana-server
 %%DATADIR%%/public/app/plugins/datasource/graphite/FunctionEditorControls.tsx
 %%DATADIR%%/public/app/plugins/datasource/graphite/MetricTankMetaInspector.tsx
 %%DATADIR%%/public/app/plugins/datasource/graphite/README.md
-%%DATADIR%%/public/app/plugins/datasource/graphite/add_graphite_func.ts
+%%DATADIR%%/public/app/plugins/datasource/graphite/components/AddGraphiteFunction.tsx
+%%DATADIR%%/public/app/plugins/datasource/graphite/components/FunctionParamEditor.tsx
+%%DATADIR%%/public/app/plugins/datasource/graphite/components/GraphiteFunctionEditor.tsx
+%%DATADIR%%/public/app/plugins/datasource/graphite/components/GraphiteTextEditor.tsx
+%%DATADIR%%/public/app/plugins/datasource/graphite/components/PlayButton.tsx
+%%DATADIR%%/public/app/plugins/datasource/graphite/components/helpers.test.ts
+%%DATADIR%%/public/app/plugins/datasource/graphite/components/helpers.ts
 %%DATADIR%%/public/app/plugins/datasource/graphite/configuration/ConfigEditor.tsx
 %%DATADIR%%/public/app/plugins/datasource/graphite/configuration/MappingsConfiguration.tsx
 %%DATADIR%%/public/app/plugins/datasource/graphite/configuration/MappingsHelp.tsx
@@ -1737,7 +1827,6 @@ bin/grafana-server
 %%DATADIR%%/public/app/plugins/datasource/graphite/dashboards/metrictank.json
 %%DATADIR%%/public/app/plugins/datasource/graphite/datasource.test.ts
 %%DATADIR%%/public/app/plugins/datasource/graphite/datasource.ts
-%%DATADIR%%/public/app/plugins/datasource/graphite/func_editor.ts
 %%DATADIR%%/public/app/plugins/datasource/graphite/gfunc.test.ts
 %%DATADIR%%/public/app/plugins/datasource/graphite/gfunc.ts
 %%DATADIR%%/public/app/plugins/datasource/graphite/graphite_query.ts
@@ -1757,6 +1846,10 @@ bin/grafana-server
 %%DATADIR%%/public/app/plugins/datasource/graphite/specs/lexer.test.ts
 %%DATADIR%%/public/app/plugins/datasource/graphite/specs/parser.test.ts
 %%DATADIR%%/public/app/plugins/datasource/graphite/specs/query_ctrl.test.ts
+%%DATADIR%%/public/app/plugins/datasource/graphite/state/actions.ts
+%%DATADIR%%/public/app/plugins/datasource/graphite/state/helpers.ts
+%%DATADIR%%/public/app/plugins/datasource/graphite/state/providers.ts
+%%DATADIR%%/public/app/plugins/datasource/graphite/state/store.ts
 %%DATADIR%%/public/app/plugins/datasource/graphite/types.ts
 %%DATADIR%%/public/app/plugins/datasource/graphite/utils.test.ts
 %%DATADIR%%/public/app/plugins/datasource/graphite/utils.ts
@@ -1795,8 +1888,6 @@ bin/grafana-server
 %%DATADIR%%/public/app/plugins/datasource/influxdb/components/VisualInfluxQLEditor/unwrap.ts
 %%DATADIR%%/public/app/plugins/datasource/influxdb/components/__snapshots__/ConfigEditor.test.tsx.snap
 %%DATADIR%%/public/app/plugins/datasource/influxdb/components/constants.ts
-%%DATADIR%%/public/app/plugins/datasource/influxdb/components/queryUtils.test.ts
-%%DATADIR%%/public/app/plugins/datasource/influxdb/components/queryUtils.ts
 %%DATADIR%%/public/app/plugins/datasource/influxdb/components/useShadowedState.test.ts
 %%DATADIR%%/public/app/plugins/datasource/influxdb/components/useShadowedState.ts
 %%DATADIR%%/public/app/plugins/datasource/influxdb/components/useUniqueId.test.ts
@@ -1810,6 +1901,8 @@ bin/grafana-server
 %%DATADIR%%/public/app/plugins/datasource/influxdb/module.ts
 %%DATADIR%%/public/app/plugins/datasource/influxdb/partials/annotations.editor.html
 %%DATADIR%%/public/app/plugins/datasource/influxdb/plugin.json
+%%DATADIR%%/public/app/plugins/datasource/influxdb/queryUtils.test.ts
+%%DATADIR%%/public/app/plugins/datasource/influxdb/queryUtils.ts
 %%DATADIR%%/public/app/plugins/datasource/influxdb/query_builder.ts
 %%DATADIR%%/public/app/plugins/datasource/influxdb/query_help.md
 %%DATADIR%%/public/app/plugins/datasource/influxdb/query_part.ts
@@ -1853,6 +1946,7 @@ bin/grafana-server
 %%DATADIR%%/public/app/plugins/datasource/loki/components/LokiQueryEditorByApp.test.tsx
 %%DATADIR%%/public/app/plugins/datasource/loki/components/LokiQueryEditorByApp.tsx
 %%DATADIR%%/public/app/plugins/datasource/loki/components/LokiQueryEditorForAlerting.tsx
+%%DATADIR%%/public/app/plugins/datasource/loki/components/LokiQueryField.test.tsx
 %%DATADIR%%/public/app/plugins/datasource/loki/components/LokiQueryField.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
@@ -1874,6 +1968,7 @@ bin/grafana-server
 %%DATADIR%%/public/app/plugins/datasource/loki/importing/importing.test.ts
 %%DATADIR%%/public/app/plugins/datasource/loki/language_provider.test.ts
 %%DATADIR%%/public/app/plugins/datasource/loki/language_provider.ts
+%%DATADIR%%/public/app/plugins/datasource/loki/language_utils.ts
 %%DATADIR%%/public/app/plugins/datasource/loki/live_streams.test.ts
 %%DATADIR%%/public/app/plugins/datasource/loki/live_streams.ts
 %%DATADIR%%/public/app/plugins/datasource/loki/mocks.ts
@@ -1976,11 +2071,17 @@ bin/grafana-server
 %%DATADIR%%/public/app/plugins/datasource/prometheus/components/__snapshots__/PromExploreQueryEditor.test.tsx.snap
 %%DATADIR%%/public/app/plugins/datasource/prometheus/components/__snapshots__/PromQueryEditor.test.tsx.snap
 %%DATADIR%%/public/app/plugins/datasource/prometheus/components/types.ts
+%%DATADIR%%/public/app/plugins/datasource/prometheus/configuration/AzureAuthSettings.tsx
+%%DATADIR%%/public/app/plugins/datasource/prometheus/configuration/AzureCredentials.ts
+%%DATADIR%%/public/app/plugins/datasource/prometheus/configuration/AzureCredentialsConfig.ts
+%%DATADIR%%/public/app/plugins/datasource/prometheus/configuration/AzureCredentialsForm.test.tsx
+%%DATADIR%%/public/app/plugins/datasource/prometheus/configuration/AzureCredentialsForm.tsx
 %%DATADIR%%/public/app/plugins/datasource/prometheus/configuration/ConfigEditor.tsx
 %%DATADIR%%/public/app/plugins/datasource/prometheus/configuration/ExemplarSetting.tsx
 %%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/__snapshots__/AzureCredentialsForm.test.tsx.snap
 %%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
@@ -2033,6 +2134,7 @@ bin/grafana-server
 %%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/StreamingClientEditor.tsx
+%%DATADIR%%/public/app/plugins/datasource/testdata/components/USAQueryEditor.tsx
 %%DATADIR%%/public/app/plugins/datasource/testdata/components/index.ts
 %%DATADIR%%/public/app/plugins/datasource/testdata/constants.ts
 %%DATADIR%%/public/app/plugins/datasource/testdata/dashboards/streaming.json
@@ -2128,6 +2230,53 @@ bin/grafana-server
 %%DATADIR%%/public/app/plugins/panel/gauge/module.tsx
 %%DATADIR%%/public/app/plugins/panel/gauge/plugin.json
 %%DATADIR%%/public/app/plugins/panel/gauge/types.ts
+%%DATADIR%%/public/app/plugins/panel/geomap/GeomapOverlay.tsx
+%%DATADIR%%/public/app/plugins/panel/geomap/GeomapPanel.tsx
+%%DATADIR%%/public/app/plugins/panel/geomap/README.md
+%%DATADIR%%/public/app/plugins/panel/geomap/components/DataHoverView.tsx
+%%DATADIR%%/public/app/plugins/panel/geomap/components/DebugOverlay.tsx
+%%DATADIR%%/public/app/plugins/panel/geomap/components/NumberInput.tsx
+%%DATADIR%%/public/app/plugins/panel/geomap/components/ObservablePropsWrapper.tsx
+%%DATADIR%%/public/app/plugins/panel/geomap/dims/color.ts
+%%DATADIR%%/public/app/plugins/panel/geomap/dims/editors/ColorDimensionEditor.tsx
+%%DATADIR%%/public/app/plugins/panel/geomap/dims/editors/ScaleDimensionEditor.tsx
+%%DATADIR%%/public/app/plugins/panel/geomap/dims/scale.test.ts
+%%DATADIR%%/public/app/plugins/panel/geomap/dims/scale.ts
+%%DATADIR%%/public/app/plugins/panel/geomap/dims/types.ts
+%%DATADIR%%/public/app/plugins/panel/geomap/dims/utils.ts
+%%DATADIR%%/public/app/plugins/panel/geomap/editor/BaseLayerEditor.tsx
+%%DATADIR%%/public/app/plugins/panel/geomap/editor/DataLayersEditor.tsx
+%%DATADIR%%/public/app/plugins/panel/geomap/editor/GazetteerPathEditor.tsx
+%%DATADIR%%/public/app/plugins/panel/geomap/editor/LayerEditor.tsx
+%%DATADIR%%/public/app/plugins/panel/geomap/editor/MapViewEditor.tsx
+%%DATADIR%%/public/app/plugins/panel/geomap/event.ts
+%%DATADIR%%/public/app/plugins/panel/geomap/gazetteer/gazetteer.test.ts
+%%DATADIR%%/public/app/plugins/panel/geomap/gazetteer/gazetteer.ts
+%%DATADIR%%/public/app/plugins/panel/geomap/gazetteer/worldmap.ts
+%%DATADIR%%/public/app/plugins/panel/geomap/globalStyles.ts
+%%DATADIR%%/public/app/plugins/panel/geomap/img/icn-geomap.svg
+%%DATADIR%%/public/app/plugins/panel/geomap/layers/basemaps/carto.ts
+%%DATADIR%%/public/app/plugins/panel/geomap/layers/basemaps/esri.ts
+%%DATADIR%%/public/app/plugins/panel/geomap/layers/basemaps/generic.ts
+%%DATADIR%%/public/app/plugins/panel/geomap/layers/basemaps/index.ts
+%%DATADIR%%/public/app/plugins/panel/geomap/layers/basemaps/osm.ts
+%%DATADIR%%/public/app/plugins/panel/geomap/layers/data/MarkersLegend.tsx
+%%DATADIR%%/public/app/plugins/panel/geomap/layers/data/geojsonMapper.ts
+%%DATADIR%%/public/app/plugins/panel/geomap/layers/data/heatMap.tsx
+%%DATADIR%%/public/app/plugins/panel/geomap/layers/data/index.ts
+%%DATADIR%%/public/app/plugins/panel/geomap/layers/data/lastPointTracker.ts
+%%DATADIR%%/public/app/plugins/panel/geomap/layers/data/markersLayer.tsx
+%%DATADIR%%/public/app/plugins/panel/geomap/layers/registry.ts
+%%DATADIR%%/public/app/plugins/panel/geomap/migrations.test.ts
+%%DATADIR%%/public/app/plugins/panel/geomap/migrations.ts
+%%DATADIR%%/public/app/plugins/panel/geomap/module.tsx
+%%DATADIR%%/public/app/plugins/panel/geomap/plugin.json
+%%DATADIR%%/public/app/plugins/panel/geomap/types.ts
+%%DATADIR%%/public/app/plugins/panel/geomap/utils/geohash.ts
+%%DATADIR%%/public/app/plugins/panel/geomap/utils/location.test.ts
+%%DATADIR%%/public/app/plugins/panel/geomap/utils/location.ts
+%%DATADIR%%/public/app/plugins/panel/geomap/utils/regularShapes.ts
+%%DATADIR%%/public/app/plugins/panel/geomap/view.ts
 %%DATADIR%%/public/app/plugins/panel/gettingstarted/GettingStarted.tsx
 %%DATADIR%%/public/app/plugins/panel/gettingstarted/README.md
 %%DATADIR%%/public/app/plugins/panel/gettingstarted/components/DocsCard.tsx
@@ -2215,6 +2364,7 @@ bin/grafana-server
 %%DATADIR%%/public/app/plugins/panel/live/module.tsx
 %%DATADIR%%/public/app/plugins/panel/live/plugin.json
 %%DATADIR%%/public/app/plugins/panel/live/types.ts
+%%DATADIR%%/public/app/plugins/panel/logs/LogsPanel.test.tsx
 %%DATADIR%%/public/app/plugins/panel/logs/LogsPanel.tsx
 %%DATADIR%%/public/app/plugins/panel/logs/img/icn-logs-panel.svg
 %%DATADIR%%/public/app/plugins/panel/logs/module.tsx
@@ -2352,11 +2502,16 @@ bin/grafana-server
 %%DATADIR%%/public/app/plugins/panel/timeseries/overrides/hideSeriesConfigFactory.test.ts
 %%DATADIR%%/public/app/plugins/panel/timeseries/overrides/hideSeriesConfigFactory.ts
 %%DATADIR%%/public/app/plugins/panel/timeseries/plugin.json
-%%DATADIR%%/public/app/plugins/panel/timeseries/plugins/AnnotationMarker.tsx
+%%DATADIR%%/public/app/plugins/panel/timeseries/plugins/AnnotationEditorPlugin.tsx
 %%DATADIR%%/public/app/plugins/panel/timeseries/plugins/AnnotationsPlugin.tsx
 %%DATADIR%%/public/app/plugins/panel/timeseries/plugins/ContextMenuPlugin.tsx
 %%DATADIR%%/public/app/plugins/panel/timeseries/plugins/ExemplarMarker.tsx
 %%DATADIR%%/public/app/plugins/panel/timeseries/plugins/ExemplarsPlugin.tsx
+%%DATADIR%%/public/app/plugins/panel/timeseries/plugins/annotations/AnnotationEditor.tsx
+%%DATADIR%%/public/app/plugins/panel/timeseries/plugins/annotations/AnnotationEditorForm.tsx
+%%DATADIR%%/public/app/plugins/panel/timeseries/plugins/annotations/AnnotationMarker.tsx
+%%DATADIR%%/public/app/plugins/panel/timeseries/plugins/annotations/AnnotationTooltip.tsx
+%%DATADIR%%/public/app/plugins/panel/timeseries/plugins/styles.ts
 %%DATADIR%%/public/app/plugins/panel/timeseries/plugins/types.ts
 %%DATADIR%%/public/app/plugins/panel/timeseries/types.ts
 %%DATADIR%%/public/app/plugins/panel/timeseries/utils.test.ts
@@ -2419,22 +2574,24 @@ bin/grafana-server
 %%DATADIR%%/public/build/102.%%GRAFANA_BUILDHASH%%.js.map
 %%DATADIR%%/public/build/103.%%GRAFANA_BUILDHASH%%.js
 %%DATADIR%%/public/build/103.%%GRAFANA_BUILDHASH%%.js.map
-%%DATADIR%%/public/build/87.%%GRAFANA_BUILDHASH%%.js
-%%DATADIR%%/public/build/87.%%GRAFANA_BUILDHASH%%.js.map
-%%DATADIR%%/public/build/88.%%GRAFANA_BUILDHASH%%.js
-%%DATADIR%%/public/build/88.%%GRAFANA_BUILDHASH%%.js.map
-%%DATADIR%%/public/build/89.%%GRAFANA_BUILDHASH%%.js
-%%DATADIR%%/public/build/89.%%GRAFANA_BUILDHASH%%.js.map
-%%DATADIR%%/public/build/90.%%GRAFANA_BUILDHASH%%.js
-%%DATADIR%%/public/build/90.%%GRAFANA_BUILDHASH%%.js.map
-%%DATADIR%%/public/build/91.%%GRAFANA_BUILDHASH%%.js
-%%DATADIR%%/public/build/91.%%GRAFANA_BUILDHASH%%.js.map
-%%DATADIR%%/public/build/92.%%GRAFANA_BUILDHASH%%.js
-%%DATADIR%%/public/build/92.%%GRAFANA_BUILDHASH%%.js.map
-%%DATADIR%%/public/build/93.%%GRAFANA_BUILDHASH%%.js
-%%DATADIR%%/public/build/93.%%GRAFANA_BUILDHASH%%.js.map
-%%DATADIR%%/public/build/94.%%GRAFANA_BUILDHASH%%.js
-%%DATADIR%%/public/build/94.%%GRAFANA_BUILDHASH%%.js.map
+%%DATADIR%%/public/build/104.%%GRAFANA_BUILDHASH%%.js
+%%DATADIR%%/public/build/104.%%GRAFANA_BUILDHASH%%.js.map
+%%DATADIR%%/public/build/105.%%GRAFANA_BUILDHASH%%.js
+%%DATADIR%%/public/build/105.%%GRAFANA_BUILDHASH%%.js.map
+%%DATADIR%%/public/build/106.%%GRAFANA_BUILDHASH%%.js
+%%DATADIR%%/public/build/106.%%GRAFANA_BUILDHASH%%.js.map
+%%DATADIR%%/public/build/107.%%GRAFANA_BUILDHASH%%.js
+%%DATADIR%%/public/build/107.%%GRAFANA_BUILDHASH%%.js.map
+%%DATADIR%%/public/build/108.%%GRAFANA_BUILDHASH%%.js
+%%DATADIR%%/public/build/108.%%GRAFANA_BUILDHASH%%.js.map
+%%DATADIR%%/public/build/109.%%GRAFANA_BUILDHASH%%.js
+%%DATADIR%%/public/build/109.%%GRAFANA_BUILDHASH%%.js.map
+%%DATADIR%%/public/build/110.%%GRAFANA_BUILDHASH%%.js
+%%DATADIR%%/public/build/110.%%GRAFANA_BUILDHASH%%.js.map
+%%DATADIR%%/public/build/111.%%GRAFANA_BUILDHASH%%.js
+%%DATADIR%%/public/build/111.%%GRAFANA_BUILDHASH%%.js.map
+%%DATADIR%%/public/build/112.%%GRAFANA_BUILDHASH%%.js
+%%DATADIR%%/public/build/112.%%GRAFANA_BUILDHASH%%.js.map
 %%DATADIR%%/public/build/95.%%GRAFANA_BUILDHASH%%.js
 %%DATADIR%%/public/build/95.%%GRAFANA_BUILDHASH%%.js.map
 %%DATADIR%%/public/build/96.%%GRAFANA_BUILDHASH%%.js
@@ -2453,12 +2610,20 @@ bin/grafana-server
 %%DATADIR%%/public/build/AdminSettings.%%GRAFANA_BUILDHASH%%.js.map
 %%DATADIR%%/public/build/AlertAmRoutes.%%GRAFANA_BUILDHASH%%.js
 %%DATADIR%%/public/build/AlertAmRoutes.%%GRAFANA_BUILDHASH%%.js.map
+%%DATADIR%%/public/build/AlertManagerNotifications.%%GRAFANA_BUILDHASH%%.js
+%%DATADIR%%/public/build/AlertManagerNotifications.%%GRAFANA_BUILDHASH%%.js.map
 %%DATADIR%%/public/build/AlertRuleList.%%GRAFANA_BUILDHASH%%.js
 %%DATADIR%%/public/build/AlertRuleList.%%GRAFANA_BUILDHASH%%.js.map
 %%DATADIR%%/public/build/AlertRuleListIndex.%%GRAFANA_BUILDHASH%%.js
 %%DATADIR%%/public/build/AlertRuleListIndex.%%GRAFANA_BUILDHASH%%.js.map
 %%DATADIR%%/public/build/AlertSilences.%%GRAFANA_BUILDHASH%%.js
 %%DATADIR%%/public/build/AlertSilences.%%GRAFANA_BUILDHASH%%.js.map
+%%DATADIR%%/public/build/AlertingAdmin.%%GRAFANA_BUILDHASH%%.js
+%%DATADIR%%/public/build/AlertingAdmin.%%GRAFANA_BUILDHASH%%.js.map
+%%DATADIR%%/public/build/AlertingRedirectToRule.%%GRAFANA_BUILDHASH%%.js
+%%DATADIR%%/public/build/AlertingRedirectToRule.%%GRAFANA_BUILDHASH%%.js.map
+%%DATADIR%%/public/build/AlertingRule.%%GRAFANA_BUILDHASH%%.js
+%%DATADIR%%/public/build/AlertingRule.%%GRAFANA_BUILDHASH%%.js.map
 %%DATADIR%%/public/build/AlertingRuleForm.%%GRAFANA_BUILDHASH%%.js
 %%DATADIR%%/public/build/AlertingRuleForm.%%GRAFANA_BUILDHASH%%.js.map
 %%DATADIR%%/public/build/ApiKeysPage.%%GRAFANA_BUILDHASH%%.js
@@ -2476,6 +2641,7 @@ bin/grafana-server
 %%DATADIR%%/public/build/DashboardListPage.%%GRAFANA_BUILDHASH%%.js
 %%DATADIR%%/public/build/DashboardListPage.%%GRAFANA_BUILDHASH%%.js.map
 %%DATADIR%%/public/build/DashboardPage.%%GRAFANA_BUILDHASH%%.js
+%%DATADIR%%/public/build/DashboardPage.%%GRAFANA_BUILDHASH%%.js.LICENSE.txt
 %%DATADIR%%/public/build/DashboardPage.%%GRAFANA_BUILDHASH%%.js.map
 %%DATADIR%%/public/build/DataSourceDashboards.%%GRAFANA_BUILDHASH%%.js
 %%DATADIR%%/public/build/DataSourceDashboards.%%GRAFANA_BUILDHASH%%.js.map
@@ -2513,8 +2679,12 @@ bin/grafana-server
 %%DATADIR%%/public/build/PlaylistPage.%%GRAFANA_BUILDHASH%%.js.map
 %%DATADIR%%/public/build/PlaylistStartPage.%%GRAFANA_BUILDHASH%%.js
 %%DATADIR%%/public/build/PlaylistStartPage.%%GRAFANA_BUILDHASH%%.js.map
+%%DATADIR%%/public/build/PluginAdminNotEnabled.%%GRAFANA_BUILDHASH%%.js
+%%DATADIR%%/public/build/PluginAdminNotEnabled.%%GRAFANA_BUILDHASH%%.js.map
 %%DATADIR%%/public/build/PluginListPage.%%GRAFANA_BUILDHASH%%.js
 %%DATADIR%%/public/build/PluginListPage.%%GRAFANA_BUILDHASH%%.js.map
+%%DATADIR%%/public/build/PluginPage.%%GRAFANA_BUILDHASH%%.js
+%%DATADIR%%/public/build/PluginPage.%%GRAFANA_BUILDHASH%%.js.map
 %%DATADIR%%/public/build/SelectOrgPage.%%GRAFANA_BUILDHASH%%.js
 %%DATADIR%%/public/build/SelectOrgPage.%%GRAFANA_BUILDHASH%%.js.map
 %%DATADIR%%/public/build/SendResetMailPage.%%GRAFANA_BUILDHASH%%.js
@@ -2561,8 +2731,8 @@ bin/grafana-server
 %%DATADIR%%/public/build/code-editor.%%GRAFANA_BUILDHASH%%.js.map
 %%DATADIR%%/public/build/dark.%%GRAFANA_BUILDHASH%%.js
 %%DATADIR%%/public/build/dark.%%GRAFANA_BUILDHASH%%.js.map
-%%DATADIR%%/public/build/default~AlertRuleListIndex~DashboardPage.%%GRAFANA_BUILDHASH%%.js
-%%DATADIR%%/public/build/default~AlertRuleListIndex~DashboardPage.%%GRAFANA_BUILDHASH%%.js.map
+%%DATADIR%%/public/build/default~AlertRuleListIndex~AlertingRule~DashboardPage.%%GRAFANA_BUILDHASH%%.js
+%%DATADIR%%/public/build/default~AlertRuleListIndex~AlertingRule~DashboardPage.%%GRAFANA_BUILDHASH%%.js.map
 %%DATADIR%%/public/build/default~DashboardPage~FolderLibraryPanelsPage~LibraryPanelsPage.%%GRAFANA_BUILDHASH%%.js
 %%DATADIR%%/public/build/default~DashboardPage~FolderLibraryPanelsPage~LibraryPanelsPage.%%GRAFANA_BUILDHASH%%.js.map
 %%DATADIR%%/public/build/default~DashboardPage~SoloPanelPage.%%GRAFANA_BUILDHASH%%.js
@@ -2572,6 +2742,8 @@ bin/grafana-server
 %%DATADIR%%/public/build/default~explore~jaegerPlugin.%%GRAFANA_BUILDHASH%%.js
 %%DATADIR%%/public/build/default~explore~jaegerPlugin.%%GRAFANA_BUILDHASH%%.js.LICENSE.txt
 %%DATADIR%%/public/build/default~explore~jaegerPlugin.%%GRAFANA_BUILDHASH%%.js.map
+%%DATADIR%%/public/build/default~geomapPanel.%%GRAFANA_BUILDHASH%%.js
+%%DATADIR%%/public/build/default~geomapPanel.%%GRAFANA_BUILDHASH%%.js.map
 %%DATADIR%%/public/build/default~graphitePlugin~lokiPlugin.%%GRAFANA_BUILDHASH%%.js
 %%DATADIR%%/public/build/default~graphitePlugin~lokiPlugin.%%GRAFANA_BUILDHASH%%.js.map
 %%DATADIR%%/public/build/default~jaegerPlugin.%%GRAFANA_BUILDHASH%%.js
@@ -2583,6 +2755,8 @@ bin/grafana-server
 %%DATADIR%%/public/build/elasticsearchPlugin.%%GRAFANA_BUILDHASH%%.js.map
 %%DATADIR%%/public/build/explore.%%GRAFANA_BUILDHASH%%.js
 %%DATADIR%%/public/build/explore.%%GRAFANA_BUILDHASH%%.js.map
+%%DATADIR%%/public/build/geomapPanel.%%GRAFANA_BUILDHASH%%.js
+%%DATADIR%%/public/build/geomapPanel.%%GRAFANA_BUILDHASH%%.js.map
 %%DATADIR%%/public/build/grafana.dark.%%GRAFANA_BUILDHASH%%.css
 %%DATADIR%%/public/build/grafana.light.%%GRAFANA_BUILDHASH%%.css
 %%DATADIR%%/public/build/grafanaPlugin.%%GRAFANA_BUILDHASH%%.js
@@ -2639,13 +2813,20 @@ bin/grafana-server
 %%DATADIR%%/public/dashboards/template_vars.json
 %%DATADIR%%/public/emails/README.md
 %%DATADIR%%/public/emails/alert_notification.html
+%%DATADIR%%/public/emails/alert_notification.txt
 %%DATADIR%%/public/emails/alert_notification_example.html
 %%DATADIR%%/public/emails/invited_to_org.html
+%%DATADIR%%/public/emails/invited_to_org.txt
 %%DATADIR%%/public/emails/new_user_invite.html
+%%DATADIR%%/public/emails/new_user_invite.txt
 %%DATADIR%%/public/emails/ng_alert_notification.html
+%%DATADIR%%/public/emails/ng_alert_notification.txt
 %%DATADIR%%/public/emails/reset_password.html
+%%DATADIR%%/public/emails/reset_password.txt
 %%DATADIR%%/public/emails/signup_started.html
+%%DATADIR%%/public/emails/signup_started.txt
 %%DATADIR%%/public/emails/welcome_on_signup.html
+%%DATADIR%%/public/emails/welcome_on_signup.txt
 %%DATADIR%%/public/fonts/FontAwesome.otf
 %%DATADIR%%/public/fonts/fontawesome-webfont.eot
 %%DATADIR%%/public/fonts/fontawesome-webfont.svg
@@ -2692,6 +2873,8 @@ bin/grafana-server
 %%DATADIR%%/public/fonts/roboto/rGvHdJnr2l75qb0YND9NyBJtnKITppOI_IvcXXDNrsc.woff2
 %%DATADIR%%/public/fonts/roboto/vPcynSL0qHq_6dX7lKVByfesZW2xOQ-xsNqO47m55DA.woff2
 %%DATADIR%%/public/fonts/roboto/vSzulfKSK0LLjjfeaxcREhTbgVql8nDJpwnrE27mub0.woff2
+%%DATADIR%%/public/gazetteer/countries.json
+%%DATADIR%%/public/gazetteer/usa-states.json
 %%DATADIR%%/public/img/alert_howto_new.png
 %%DATADIR%%/public/img/angle_gradient_light_rev.png
 %%DATADIR%%/public/img/angle_gradient_rev.png
@@ -4280,9 +4463,7 @@ bin/grafana-server
 %%DATADIR%%/public/sass/components/_old_stuff.scss
 %%DATADIR%%/public/sass/components/_page_header.scss
 %%DATADIR%%/public/sass/components/_page_loader.scss
-%%DATADIR%%/public/sass/components/_panel_alertlist.scss
 %%DATADIR%%/public/sass/components/_panel_dashlist.scss
-%%DATADIR%%/public/sass/components/_panel_editor.scss
 %%DATADIR%%/public/sass/components/_panel_gettingstarted.scss
 %%DATADIR%%/public/sass/components/_panel_graph.scss
 %%DATADIR%%/public/sass/components/_panel_header.scss
@@ -4381,6 +4562,7 @@ bin/grafana-server
 %%DATADIR%%/public/test/setupTests.ts
 %%DATADIR%%/public/test/specs/helpers.ts
 %%DATADIR%%/public/testdata/browser_marketshare.csv
+%%DATADIR%%/public/testdata/flight_info_by_state.csv
 %%DATADIR%%/public/testdata/gdp_per_capita.csv
 %%DATADIR%%/public/testdata/js_libraries.csv
 %%DATADIR%%/public/testdata/population_by_state.csv